Merge pull request #868 from falkTX/high-dpi

Initial work for high-dpi display support
falkTX · Mar 25, 2019 · b3af597 · b3af597
2 parents ac20048 + 84fdf40
commit b3af597
Show file tree

Hide file tree

Showing 82 changed files with 377 additions and 168 deletions.
diff --git a/resources/16x16/application-exit.png b/resources/16x16/application-exit.png
diff --git a/resources/16x16/application-exit.svgz b/resources/16x16/application-exit.svgz
diff --git a/resources/16x16/arrow-right.png b/resources/16x16/arrow-right.png
diff --git a/resources/16x16/arrow-right.svgz b/resources/16x16/arrow-right.svgz
diff --git a/resources/16x16/configure.png b/resources/16x16/configure.png
diff --git a/resources/16x16/configure.svgz b/resources/16x16/configure.svgz
diff --git a/resources/16x16/dialog-cancel.png b/resources/16x16/dialog-cancel.png
diff --git a/resources/16x16/dialog-cancel.svgz b/resources/16x16/dialog-cancel.svgz
diff --git a/resources/16x16/dialog-error.png b/resources/16x16/dialog-error.png
diff --git a/resources/16x16/dialog-error.svgz b/resources/16x16/dialog-error.svgz
diff --git a/resources/16x16/dialog-information.png b/resources/16x16/dialog-information.png
diff --git a/resources/16x16/dialog-information.svgz b/resources/16x16/dialog-information.svgz
diff --git a/resources/16x16/dialog-ok-apply.png b/resources/16x16/dialog-ok-apply.png
diff --git a/resources/16x16/dialog-ok-apply.svgz b/resources/16x16/dialog-ok-apply.svgz
diff --git a/resources/16x16/dialog-warning.png b/resources/16x16/dialog-warning.png
diff --git a/resources/16x16/dialog-warning.svgz b/resources/16x16/dialog-warning.svgz
diff --git a/resources/16x16/document-new.png b/resources/16x16/document-new.png
diff --git a/resources/16x16/document-new.svgz b/resources/16x16/document-new.svgz
diff --git a/resources/16x16/document-open.png b/resources/16x16/document-open.png
diff --git a/resources/16x16/document-open.svgz b/resources/16x16/document-open.svgz
diff --git a/resources/16x16/document-print.png b/resources/16x16/document-print.png
diff --git a/resources/16x16/document-save-as.png b/resources/16x16/document-save-as.png
diff --git a/resources/16x16/document-save-as.svgz b/resources/16x16/document-save-as.svgz
diff --git a/resources/16x16/document-save.png b/resources/16x16/document-save.png
diff --git a/resources/16x16/document-save.svgz b/resources/16x16/document-save.svgz
diff --git a/resources/16x16/edit-delete.png b/resources/16x16/edit-delete.png
diff --git a/resources/16x16/edit-delete.svgz b/resources/16x16/edit-delete.svgz
diff --git a/resources/16x16/edit-rename.png b/resources/16x16/edit-rename.png
diff --git a/resources/16x16/edit-rename.svgz b/resources/16x16/edit-rename.svgz
diff --git a/resources/16x16/list-add.png b/resources/16x16/list-add.png
diff --git a/resources/16x16/list-add.svgz b/resources/16x16/list-add.svgz
diff --git a/resources/16x16/list-remove.png b/resources/16x16/list-remove.png
diff --git a/resources/16x16/list-remove.svgz b/resources/16x16/list-remove.svgz
diff --git a/resources/16x16/media-playback-pause.png b/resources/16x16/media-playback-pause.png
diff --git a/resources/16x16/media-playback-pause.svgz b/resources/16x16/media-playback-pause.svgz
diff --git a/resources/16x16/media-playback-start.png b/resources/16x16/media-playback-start.png
diff --git a/resources/16x16/media-playback-start.svgz b/resources/16x16/media-playback-start.svgz
diff --git a/resources/16x16/media-playback-stop.png b/resources/16x16/media-playback-stop.png
diff --git a/resources/16x16/media-playback-stop.svgz b/resources/16x16/media-playback-stop.svgz
diff --git a/resources/16x16/media-seek-backward.png b/resources/16x16/media-seek-backward.png
diff --git a/resources/16x16/media-seek-backward.svgz b/resources/16x16/media-seek-backward.svgz
diff --git a/resources/16x16/media-seek-forward.png b/resources/16x16/media-seek-forward.png
diff --git a/resources/16x16/media-seek-forward.svgz b/resources/16x16/media-seek-forward.svgz
diff --git a/resources/16x16/network-connect.png b/resources/16x16/network-connect.png
diff --git a/resources/16x16/network-connect.svgz b/resources/16x16/network-connect.svgz
diff --git a/resources/16x16/view-refresh.png b/resources/16x16/view-refresh.png
diff --git a/resources/16x16/view-refresh.svgz b/resources/16x16/view-refresh.svgz
diff --git a/resources/16x16/view-sort-ascending.png b/resources/16x16/view-sort-ascending.png
diff --git a/resources/16x16/view-sort-ascending.svgz b/resources/16x16/view-sort-ascending.svgz
diff --git a/resources/16x16/window-close.png b/resources/16x16/window-close.png
diff --git a/resources/16x16/window-close.svgz b/resources/16x16/window-close.svgz
diff --git a/resources/16x16/zoom-fit-best.png b/resources/16x16/zoom-fit-best.png
diff --git a/resources/16x16/zoom-fit-best.svgz b/resources/16x16/zoom-fit-best.svgz
diff --git a/resources/16x16/zoom-in.png b/resources/16x16/zoom-in.png
diff --git a/resources/16x16/zoom-in.svgz b/resources/16x16/zoom-in.svgz
diff --git a/resources/16x16/zoom-original.png b/resources/16x16/zoom-original.png
diff --git a/resources/16x16/zoom-original.svgz b/resources/16x16/zoom-original.svgz
diff --git a/resources/16x16/zoom-out.png b/resources/16x16/zoom-out.png
diff --git a/resources/16x16/zoom-out.svgz b/resources/16x16/zoom-out.svgz
diff --git a/resources/48x48/folder.png b/resources/48x48/folder.png
diff --git a/resources/48x48/osc.png b/resources/48x48/osc.png
diff --git a/resources/48x48/warning.png b/resources/48x48/warning.png
diff --git a/resources/48x48/wine.png b/resources/48x48/wine.png
diff --git a/resources/resources.qrc b/resources/resources.qrc
@@ -3,53 +3,50 @@
         <file>16x16/carla.png</file>
         <file>16x16/carla-control.png</file>
 
-        <file>16x16/application-exit.png</file>
-        <file>16x16/arrow-right.png</file>
-        <file>16x16/configure.png</file>
-        <file>16x16/dialog-cancel.png</file>
-        <file>16x16/dialog-error.png</file>
-        <file>16x16/dialog-information.png</file>
-        <file>16x16/dialog-ok-apply.png</file>
-        <file>16x16/dialog-warning.png</file>
-        <file>16x16/document-new.png</file>
-        <file>16x16/document-open.png</file>
-        <file>16x16/document-print.png</file>
-        <file>16x16/document-save.png</file>
-        <file>16x16/document-save-as.png</file>
-        <file>16x16/edit-delete.png</file>
-        <file>16x16/edit-rename.png</file>
-        <file>16x16/list-add.png</file>
-        <file>16x16/list-remove.png</file>
-        <file>16x16/media-playback-pause.png</file>
-        <file>16x16/media-playback-start.png</file>
-        <file>16x16/media-playback-stop.png</file>
-        <file>16x16/media-seek-backward.png</file>
-        <file>16x16/media-seek-forward.png</file>
-        <file>16x16/network-connect.png</file>
-        <file>16x16/view-refresh.png</file>
-        <file>16x16/view-sort-ascending.png</file>
-        <file>16x16/window-close.png</file>
-        <file>16x16/zoom-fit-best.png</file>
-        <file>16x16/zoom-in.png</file>
-        <file>16x16/zoom-original.png</file>
-        <file>16x16/zoom-out.png</file>
+        <file>16x16/application-exit.svgz</file>
+        <file>16x16/arrow-right.svgz</file>
+        <file>16x16/configure.svgz</file>
+        <file>16x16/dialog-cancel.svgz</file>
+        <file>16x16/dialog-error.svgz</file>
+        <file>16x16/dialog-information.svgz</file>
+        <file>16x16/dialog-ok-apply.svgz</file>
+        <file>16x16/dialog-warning.svgz</file>
+        <file>16x16/document-new.svgz</file>
+        <file>16x16/document-open.svgz</file>
+        <file>16x16/document-save.svgz</file>
+        <file>16x16/document-save-as.svgz</file>
+        <file>16x16/edit-delete.svgz</file>
+        <file>16x16/edit-rename.svgz</file>
+        <file>16x16/list-add.svgz</file>
+        <file>16x16/list-remove.svgz</file>
+        <file>16x16/media-playback-pause.svgz</file>
+        <file>16x16/media-playback-start.svgz</file>
+        <file>16x16/media-playback-stop.svgz</file>
+        <file>16x16/media-seek-backward.svgz</file>
+        <file>16x16/media-seek-forward.svgz</file>
+        <file>16x16/network-connect.svgz</file>
+        <file>16x16/view-refresh.svgz</file>
+        <file>16x16/view-sort-ascending.svgz</file>
+        <file>16x16/window-close.svgz</file>
+        <file>16x16/zoom-fit-best.svgz</file>
+        <file>16x16/zoom-in.svgz</file>
+        <file>16x16/zoom-original.svgz</file>
+        <file>16x16/zoom-out.svgz</file>
 
         <file>48x48/carla.png</file>
         <file>48x48/carla-control.png</file>
 
         <file>48x48/canvas.png</file>
-        <file>48x48/folder.png</file>
         <file>48x48/jack.png</file>
         <file>48x48/juce.png</file>
-        <file>48x48/osc.png</file>
-        <file>48x48/warning.png</file>
-        <file>48x48/wine.png</file>
-
-        <file>48x48/carla.png</file>
-        <file>48x48/carla-control.png</file>
 
         <file>scalable/carla.svg</file>
         <file>scalable/carla-control.svg</file>
+
+        <file>scalable/folder.svgz</file>
+        <file>scalable/osc.svgz</file>
+        <file>scalable/warning.svgz</file>
+        <file>scalable/wine.svgz</file>
 
         <file>bitmaps/carla_about_black.png</file>
         <file>bitmaps/carla_about_white.png</file>

diff --git a/resources/scalable/folder.svgz b/resources/scalable/folder.svgz
diff --git a/resources/scalable/osc.svgz b/resources/scalable/osc.svgz
diff --git a/resources/scalable/warning.svgz b/resources/scalable/warning.svgz
diff --git a/resources/scalable/wine.svgz b/resources/scalable/wine.svgz
diff --git a/resources/ui/carla_about.ui b/resources/ui/carla_about.ui
@@ -496,7 +496,7 @@
             <enum>Qt::PlainText</enum>
            </property>
            <property name="pixmap">
-            <pixmap resource="../resources.qrc">:/48x48/carla.png</pixmap>
+            <pixmap resource="../resources.qrc">:/scalable/carla.svg</pixmap>
            </property>
           </widget>
          </item>
@@ -521,7 +521,7 @@
             <enum>Qt::PlainText</enum>
            </property>
            <property name="pixmap">
-            <pixmap resource="../resources.qrc">:/48x48/carla-control.png</pixmap>
+            <pixmap resource="../resources.qrc">:/scalable/carla-control.svg</pixmap>
            </property>
           </widget>
          </item>

diff --git a/resources/ui/carla_database.ui b/resources/ui/carla_database.ui
@@ -46,7 +46,7 @@
        </property>
        <property name="icon">
         <iconset resource="../resources.qrc">
-         <normaloff>:/16x16/view-refresh.png</normaloff>:/16x16/view-refresh.png</iconset>
+         <normaloff>:/16x16/view-refresh.svgz</normaloff>:/16x16/view-refresh.svgz</iconset>
        </property>
       </widget>
      </item>
@@ -390,7 +390,7 @@
        </property>
        <property name="icon">
         <iconset resource="../resources.qrc">
-         <normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset>
+         <normaloff>:/16x16/list-add.svgz</normaloff>:/16x16/list-add.svgz</iconset>
        </property>
       </widget>
      </item>
@@ -401,7 +401,7 @@
        </property>
        <property name="icon">
         <iconset resource="../resources.qrc">
-         <normaloff>:/16x16/dialog-cancel.png</normaloff>:/16x16/dialog-cancel.png</iconset>
+         <normaloff>:/16x16/dialog-cancel.svgz</normaloff>:/16x16/dialog-cancel.svgz</iconset>
        </property>
       </widget>
      </item>