Fix a few oddities in about dialog

Closes #1272 Signed-off-by: falkTX <falktx@falktx.com>
falkTX · Oct 12, 2020 · c14ec23 · c14ec23
1 parent 8b72031
commit c14ec23
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/resources/resources.qrc b/resources/resources.qrc
@@ -87,11 +87,11 @@
         <file>bitmaps/button_file_down-white.png</file>
         <file>bitmaps/button_file_hover-black.png</file>
         <file>bitmaps/button_file_hover-white.png</file>
-        <!--<file>scalable/button_gui-black.svg</file>-->
+        <file>bitmaps/button_gui-black.png</file>
         <file>scalable/button_gui-white.svg</file>
-        <!--<file>scalable/button_gui_down-black.svg</file>-->
+        <file>bitmaps/button_gui_down-black.png</file>
         <file>scalable/button_gui_down-white.svg</file>
-        <!--<file>scalable/button_gui_hover-black.svg</file>-->
+        <file>bitmaps/button_gui_hover-black.png</file>
         <file>scalable/button_gui_hover-white.svg</file>
 
         <file>scalable/button_off.svg</file>

diff --git a/resources/ui/carla_about.ui b/resources/ui/carla_about.ui
@@ -254,7 +254,10 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap resource="../resources.qrc">:/bitmaps/dial_03.png</pixmap>
+            <pixmap resource="../resources.qrc">:/scalable/dial_03.svg</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
@@ -276,7 +279,10 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap resource="../resources.qrc">:/bitmaps/button_on.png</pixmap>
+            <pixmap resource="../resources.qrc">:/scalable/button_on.svg</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
@@ -298,7 +304,10 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap resource="../resources.qrc">:/bitmaps/button_gui_down-white.png</pixmap>
+            <pixmap resource="../resources.qrc">:/scalable/button_gui_down-white.svg</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
@@ -320,7 +329,10 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap resource="../resources.qrc">:/bitmaps/button_edit_down-white.png</pixmap>
+            <pixmap resource="../resources.qrc">:/scalable/button_edit_down-white.svg</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
@@ -686,6 +698,12 @@
        </item>
        <item row="7" column="0" colspan="4">
         <widget class="Line" name="line_vst2">
+         <property name="lineWidth">
+          <number>0</number>
+         </property>
+         <property name="midLineWidth">
+          <number>1</number>
+         </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -905,6 +923,12 @@
        </item>
        <item row="9" column="0" colspan="4">
         <widget class="Line" name="line_vst3">
+         <property name="lineWidth">
+          <number>0</number>
+         </property>
+         <property name="midLineWidth">
+          <number>1</number>
+         </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>

diff --git a/source/frontend/carla_widgets.py b/source/frontend/carla_widgets.py
@@ -128,7 +128,7 @@ def __init__(self, parent, host):
         if self.ui.about.palette().color(QPalette.Background).blackF() < 0.5:
             self.ui.l_icons.setPixmap(QPixmap(":/bitmaps/carla_about_black.png"))
             self.ui.ico_example_edit.setPixmap(QPixmap(":/bitmaps/button_file-black.png"))
-            self.ui.ico_example_file.setPixmap(QPixmap(":/bitmaps/button_edit-black.png"))
+            self.ui.ico_example_file.setPixmap(QPixmap(":/scalable/button_edit-black.svg"))
             self.ui.ico_example_gui.setPixmap(QPixmap(":/bitmaps/button_gui-black.png"))
 
         if host.isControl:
@@ -207,9 +207,12 @@ def __init__(self, parent, host):
 
         if usingJuce and (MACOS or WINDOWS):
             self.ui.l_vst2.setText(self.tr("Using JUCE host"))
-            self.ui.l_vst3.setText(self.tr("Using JUCE host"))
         else:
             self.ui.l_vst2.setText(self.tr("About 85&#37; complete (missing vst bank/presets and some minor stuff)"))
+
+        if usingJuce:
+            self.ui.l_vst3.setText(self.tr("Using JUCE host"))
+        else:
             self.ui.line_vst2.hide()
             self.ui.l_vst3.hide()
             self.ui.lid_vst3.hide()