Artwork update

resources/resources-theme.qrc

@@ -2,5 +2,7 @@
     <qresource prefix="/">
         <file>bitmaps/style/arrow.png</file>
         <file>bitmaps/style/groupbox.png</file>
+        <file>scalable/carla.svg</file>
+        <file>scalable/distrho.svg</file>
     </qresource>
 </RCC>

resources/resources.qrc

@@ -45,11 +45,15 @@
 
         <file>scalable/carla.svg</file>
         <file>scalable/carla-control.svg</file>
+        <file>scalable/distrho.svg</file>
 
         <file>bitmaps/carla_about.png</file>
         <file>bitmaps/button_edit.png</file>
         <file>bitmaps/button_edit_down.png</file>
         <file>bitmaps/button_edit_hover.png</file>
+        <file>bitmaps/button_file.png</file>
+        <file>bitmaps/button_file_down.png</file>
+        <file>bitmaps/button_file_hover.png</file>
         <file>bitmaps/button_gui.png</file>
         <file>bitmaps/button_gui_down.png</file>
         <file>bitmaps/button_gui_hover.png</file>
@@ -83,6 +87,7 @@
         <file>scalable/pb_hardware.svg</file>
         <file>scalable/pb_audacious.svg</file>
         <file>scalable/pb_clementine.svg</file>
+        <file>scalable/pb_distrho.svg</file>
         <file>scalable/pb_jamin.svg</file>
         <file>scalable/pb_mplayer.svg</file>
         <file>scalable/pb_vlc.svg</file>

resources/scalable/distrho.svg

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Creator: CorelDRAW -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xml:space="preserve"
+   width="13.038269"
+   height="13.038269"
+   style="fill-rule:evenodd"
+   viewBox="0 0 1.0504196 1.050423"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="distrho.svg"><metadata
+   id="metadata32"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1298"
+   inkscape:window-height="646"
+   id="namedview30"
+   showgrid="false"
+   inkscape:zoom="8.8790964"
+   inkscape:cx="22.667459"
+   inkscape:cy="6.4311119"
+   inkscape:window-x="1792"
+   inkscape:window-y="239"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_x0020_1"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0" />
+ <defs
+   id="defs4">
+  <style
+   type="text/css"
+   id="style6">
+   
+    .str0 {stroke:#565656;stroke-width:0.0966867}
+    .str1 {stroke:#4F4F4F;stroke-width:0.193345}
+    .fil0 {fill:none}
+    .fil2 {fill:#2B2A29}
+    .fil1 {fill:#6B6B6B}
+   
+  </style>
+ </defs>
+ <g
+   id="Layer_x0020_1"
+   transform="translate(-1.6191379e-5,-0.08553947)">
+  <metadata
+   id="CorelCorpID_0Corel-Layer" />
+  <circle
+   class="fil0 str0"
+   cx="0.525226"
+   cy="0.61075097"
+   r="0.15916"
+   id="circle10"
+   style="fill:none;stroke:#ffffff;stroke-width:0.09668670000000000;stroke-opacity:1"
+   sodipodi:cx="0.525226"
+   sodipodi:cy="0.61075097"
+   sodipodi:rx="0.15916"
+   sodipodi:ry="0.15916"
+   d="m 0.684386,0.61075097 c 0,0.0879016 -0.0712584,0.15916001 -0.15916,0.15916001 -0.0879016,0 -0.15916001,-0.0712584 -0.15916001,-0.15916001 0,-0.0879016 0.0712584,-0.15916 0.15916001,-0.15916 0.0879016,0 0.15916,0.0712584 0.15916,0.15916 z" />
+  <circle
+   class="fil0 str1"
+   cx="0.525226"
+   cy="0.61075097"
+   r="0.42853901"
+   id="circle12"
+   style="fill:none;stroke:#ffffff;stroke-width:0.19334499999999999;stroke-opacity:1"
+   sodipodi:cx="0.525226"
+   sodipodi:cy="0.61075097"
+   sodipodi:rx="0.42853901"
+   sodipodi:ry="0.42853901"
+   d="m 0.953765,0.61075097 c 0,0.23667556 -0.19186344,0.42853903 -0.428539,0.42853903 -0.23667556,0 -0.42853901,-0.19186347 -0.42853901,-0.42853903 0,-0.23667556 0.19186345,-0.428539 0.42853901,-0.428539 0.23667556,0 0.428539,0.19186344 0.428539,0.428539 z" />
+  
+  
+  
+  
+  
+  
+  
+  
+ </g>
+</svg>

resources/scalable/pb_distrho.svg

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Creator: CorelDRAW -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xml:space="preserve"
+   width="13.038269"
+   height="13.038269"
+   style="fill-rule:evenodd"
+   viewBox="0 0 1.0504196 1.050423"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="distrho.svg"><metadata
+   id="metadata32"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1298"
+   inkscape:window-height="646"
+   id="namedview30"
+   showgrid="false"
+   inkscape:zoom="8.8790964"
+   inkscape:cx="39.730006"
+   inkscape:cy="6.4311119"
+   inkscape:window-x="1792"
+   inkscape:window-y="239"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_x0020_1"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0" />
+ <defs
+   id="defs4">
+  <style
+   type="text/css"
+   id="style6">
+   
+    .str0 {stroke:#565656;stroke-width:0.0966867}
+    .str1 {stroke:#4F4F4F;stroke-width:0.193345}
+    .fil0 {fill:none}
+    .fil2 {fill:#2B2A29}
+    .fil1 {fill:#6B6B6B}
+   
+  </style>
+ </defs>
+ <g
+   id="Layer_x0020_1"
+   transform="translate(-1.6191379e-5,-0.08553947)">
+  <metadata
+   id="CorelCorpID_0Corel-Layer" />
+  <circle
+   class="fil0 str0"
+   cx="0.525226"
+   cy="0.61075097"
+   r="0.15916"
+   id="circle10"
+   style="fill:none;stroke:#808080;stroke-width:0.0966867;stroke-opacity:1"
+   sodipodi:cx="0.525226"
+   sodipodi:cy="0.61075097"
+   sodipodi:rx="0.15916"
+   sodipodi:ry="0.15916"
+   d="m 0.684386,0.61075097 c 0,0.0879016 -0.0712584,0.15916001 -0.15916,0.15916001 -0.0879016,0 -0.15916001,-0.0712584 -0.15916001,-0.15916001 0,-0.0879016 0.0712584,-0.15916 0.15916001,-0.15916 0.0879016,0 0.15916,0.0712584 0.15916,0.15916 z" />
+  <circle
+   class="fil0 str1"
+   cx="0.525226"
+   cy="0.61075097"
+   r="0.42853901"
+   id="circle12"
+   style="fill:none;stroke:#808080;stroke-width:0.193345;stroke-opacity:1"
+   sodipodi:cx="0.525226"
+   sodipodi:cy="0.61075097"
+   sodipodi:rx="0.42853901"
+   sodipodi:ry="0.42853901"
+   d="m 0.953765,0.61075097 c 0,0.23667556 -0.19186344,0.42853903 -0.428539,0.42853903 -0.23667556,0 -0.42853901,-0.19186347 -0.42853901,-0.42853903 0,-0.23667556 0.19186345,-0.428539 0.42853901,-0.428539 0.23667556,0 0.428539,0.19186344 0.428539,0.428539 z" />
+  
+  
+  
+  
+  
+  
+  
+  
+ </g>
+</svg>

source/backend/CarlaBackend.hpp

@@ -59,7 +59,7 @@ const unsigned int PLUGIN_IS_BRIDGE         = 0x001; //!< Plugin is a bridge (ie
 const unsigned int PLUGIN_IS_RTSAFE         = 0x002; //!< Plugin is hard real-time safe.
 const unsigned int PLUGIN_IS_SYNTH          = 0x004; //!< Plugin is a synthesizer (produces sound).
 const unsigned int PLUGIN_HAS_GUI           = 0x010; //!< Plugin has its own custom GUI.
-const unsigned int PLUGIN_HAS_GUI_AS_FILE   = 0x030; //!< Plugin has custom GUI as a single file.
+const unsigned int PLUGIN_HAS_GUI_AS_FILE   = 0x020; //!< Plugin has custom GUI as a single file.
 const unsigned int PLUGIN_HAS_SINGLE_THREAD = 0x040; //!< Plugin needs a single thread for both DSP and UI events.
 const unsigned int PLUGIN_CAN_DRYWET        = 0x100; //!< Plugin can make use of Dry/Wet controls.
 const unsigned int PLUGIN_CAN_VOLUME        = 0x200; //!< Plugin can make use of Volume controls.

source/backend/native/distrho/DistrhoPluginCarla.cpp

@@ -59,6 +59,7 @@ public:
         qtUi->setParent(this);
         setCentralWidget(qtUi);
 #endif
+        setWindowIcon(QIcon(":/scalable/distrho.svg"));
         setWindowTitle(QString("%1 (GUI)").arg(fUi.name()));
 
         uiResize(fUi.width(), fUi.height());

source/backend/native/nekobi/DistrhoArtworkNekobi.hpp

@@ -5,6 +5,11 @@
 
 namespace DistrhoArtworkNekobi
 {
+    extern const char* aboutData;
+    const unsigned int aboutDataSize = 172710;
+    const unsigned int aboutWidth    = 303;
+    const unsigned int aboutHeight   = 190;
+
     extern const char* aboutButtonHoverData;
     const unsigned int aboutButtonHoverDataSize = 5888;
     const unsigned int aboutButtonHoverWidth    = 92;

source/backend/native/nekobi/DistrhoUINekobi.cpp

@@ -33,8 +33,7 @@ DistrhoUINekobi::DistrhoUINekobi()
     // background
     fImgBackground = Image(DistrhoArtworkNekobi::backgroundData, DistrhoArtworkNekobi::backgroundWidth, DistrhoArtworkNekobi::backgroundHeight, GL_BGR);
 
-    // TODO - about png
-    Image imageAbout(DistrhoArtworkNekobi::aboutButtonHoverData, DistrhoArtworkNekobi::aboutButtonHoverWidth, DistrhoArtworkNekobi::aboutButtonHoverHeight, GL_BGRA);
+    Image imageAbout(DistrhoArtworkNekobi::aboutData, DistrhoArtworkNekobi::aboutWidth, DistrhoArtworkNekobi::aboutHeight, GL_BGR);
     fAboutWindow.setImage(imageAbout);
 
     // slider

source/backend/native/stereoenhancer/DistrhoArtworkStereoEnhancer.hpp

@@ -5,6 +5,11 @@
 
 namespace DistrhoArtworkStereoEnhancer
 {
+    extern const char* aboutData;
+    const unsigned int aboutDataSize = 172710;
+    const unsigned int aboutWidth    = 303;
+    const unsigned int aboutHeight   = 190;
+
     extern const char* aboutButtonHoverData;
     const unsigned int aboutButtonHoverDataSize = 9152;
     const unsigned int aboutButtonHoverWidth    = 104;

source/backend/native/stereoenhancer/DistrhoUIStereoEnhancer.cpp

@@ -29,8 +29,7 @@ DistrhoUIStereoEnhancer::DistrhoUIStereoEnhancer()
     // background
     fImgBackground = Image(DistrhoArtworkStereoEnhancer::backgroundData, DistrhoArtworkStereoEnhancer::backgroundWidth, DistrhoArtworkStereoEnhancer::backgroundHeight, GL_BGR);
 
-    // TODO - about png
-    Image imageAbout(DistrhoArtworkStereoEnhancer::aboutButtonHoverData, DistrhoArtworkStereoEnhancer::aboutButtonHoverWidth, DistrhoArtworkStereoEnhancer::aboutButtonHoverHeight, GL_BGRA);
+    Image imageAbout(DistrhoArtworkStereoEnhancer::aboutData, DistrhoArtworkStereoEnhancer::aboutWidth, DistrhoArtworkStereoEnhancer::aboutHeight, GL_BGR);
     fAboutWindow.setImage(imageAbout);
 
     // knobs

source/backend/plugin/NativePlugin.cpp

@@ -1116,6 +1116,8 @@ public:
             fHints |= PLUGIN_IS_SYNTH;
         if (fDescriptor->hints & ::PLUGIN_HAS_GUI)
             fHints |= PLUGIN_HAS_GUI;
+        if (fDescriptor->hints & ::PLUGIN_USES_GUI_AS_FILE)
+            fHints |= PLUGIN_HAS_GUI_AS_FILE;
         if (fDescriptor->hints & ::PLUGIN_USES_SINGLE_THREAD)
             fHints |= PLUGIN_HAS_SINGLE_THREAD;
 

source/backend/standalone/CarlaStandalone.cpp

@@ -439,7 +439,7 @@ const CarlaNativePluginInfo* carla_get_internal_plugin_info(unsigned int interna
      info.category = static_cast<CarlaPluginCategory>(nativePlugin->category);
      info.hints    = 0x0;
 
-    if (nativePlugin->hints & PLUGIN_IS_RTSAFE)
+     if (nativePlugin->hints & PLUGIN_IS_RTSAFE)
          info.hints |= CarlaBackend::PLUGIN_IS_RTSAFE;
      if (nativePlugin->hints & PLUGIN_IS_SYNTH)
          info.hints |= CarlaBackend::PLUGIN_IS_SYNTH;

source/carla_backend.py

@@ -97,7 +97,7 @@ PLUGIN_IS_BRIDGE         = 0x001
 PLUGIN_IS_RTSAFE         = 0x002
 PLUGIN_IS_SYNTH          = 0x004
 PLUGIN_HAS_GUI           = 0x010
-PLUGIN_HAS_GUI_AS_FILE   = 0x030
+PLUGIN_HAS_GUI_AS_FILE   = 0x020
 PLUGIN_HAS_SINGLE_THREAD = 0x040
 PLUGIN_CAN_DRYWET        = 0x100
 PLUGIN_CAN_VOLUME        = 0x200

source/carla_shared.py

@@ -2034,9 +2034,13 @@ class PluginWidget(QFrame):
         }""" % labelColor)
 
         self.ui.b_enable.setPixmaps(":/bitmaps/button_off.png", ":/bitmaps/button_on.png", ":/bitmaps/button_off.png")
-        self.ui.b_gui.setPixmaps(":/bitmaps/button_gui.png", ":/bitmaps/button_gui_down.png", ":/bitmaps/button_gui_hover.png")
         self.ui.b_edit.setPixmaps(":/bitmaps/button_edit.png", ":/bitmaps/button_edit_down.png", ":/bitmaps/button_edit_hover.png")
 
+        if self.fPluginInfo['hints'] & PLUGIN_HAS_GUI_AS_FILE:
+            self.ui.b_gui.setPixmaps(":/bitmaps/button_file.png", ":/bitmaps/button_file_down.png", ":/bitmaps/button_file_hover.png")
+        else:
+            self.ui.b_gui.setPixmaps(":/bitmaps/button_gui.png", ":/bitmaps/button_gui_down.png", ":/bitmaps/button_gui_hover.png")
+
         self.ui.led_control.setColor(self.ui.led_control.YELLOW)
         self.ui.led_control.setEnabled(False)