@@ -3,36 +3,35 @@ | |||||
<file>16x16/carla.png</file> | <file>16x16/carla.png</file> | ||||
<file>16x16/carla-control.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.png</file> | ||||
<file>48x48/carla-control.png</file> | <file>48x48/carla-control.png</file> | ||||
@@ -496,7 +496,7 @@ | |||||
<enum>Qt::PlainText</enum> | <enum>Qt::PlainText</enum> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/48x48/carla.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/scalable/carla.svg</pixmap> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -521,7 +521,7 @@ | |||||
<enum>Qt::PlainText</enum> | <enum>Qt::PlainText</enum> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/48x48/carla-control.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/scalable/carla-control.svg</pixmap> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -46,7 +46,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -390,7 +390,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -401,7 +401,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -570,7 +570,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -584,7 +584,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/list-remove.png</normaloff>:/16x16/list-remove.png</iconset> | |||||
<normaloff>:/16x16/list-remove.svgz</normaloff>:/16x16/list-remove.svgz</iconset> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -623,7 +623,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/media-playback-start.png</normaloff>:/16x16/media-playback-start.png</iconset> | |||||
<normaloff>:/16x16/media-playback-start.svgz</normaloff>:/16x16/media-playback-start.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="checkable"> | <property name="checkable"> | ||||
<bool>true</bool> | <bool>true</bool> | ||||
@@ -637,7 +637,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/media-playback-stop.png</normaloff>:/16x16/media-playback-stop.png</iconset> | |||||
<normaloff>:/16x16/media-playback-stop.svgz</normaloff>:/16x16/media-playback-stop.svgz</iconset> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -648,7 +648,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/media-seek-backward.png</normaloff>:/16x16/media-seek-backward.png</iconset> | |||||
<normaloff>:/16x16/media-seek-backward.svgz</normaloff>:/16x16/media-seek-backward.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="autoRepeat"> | <property name="autoRepeat"> | ||||
<bool>true</bool> | <bool>true</bool> | ||||
@@ -662,7 +662,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/media-seek-forward.png</normaloff>:/16x16/media-seek-forward.png</iconset> | |||||
<normaloff>:/16x16/media-seek-forward.svgz</normaloff>:/16x16/media-seek-forward.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="autoRepeat"> | <property name="autoRepeat"> | ||||
<bool>true</bool> | <bool>true</bool> | ||||
@@ -946,7 +946,7 @@ | |||||
<action name="act_file_new"> | <action name="act_file_new"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/document-new.png</normaloff>:/16x16/document-new.png</iconset> | |||||
<normaloff>:/16x16/document-new.svgz</normaloff>:/16x16/document-new.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&New</string> | <string>&New</string> | ||||
@@ -958,7 +958,7 @@ | |||||
<action name="act_file_open"> | <action name="act_file_open"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/document-open.png</normaloff>:/16x16/document-open.png</iconset> | |||||
<normaloff>:/16x16/document-open.svgz</normaloff>:/16x16/document-open.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Open...</string> | <string>&Open...</string> | ||||
@@ -976,7 +976,7 @@ | |||||
<action name="act_file_save"> | <action name="act_file_save"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/document-save.png</normaloff>:/16x16/document-save.png</iconset> | |||||
<normaloff>:/16x16/document-save.svgz</normaloff>:/16x16/document-save.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Save</string> | <string>&Save</string> | ||||
@@ -988,7 +988,7 @@ | |||||
<action name="act_file_save_as"> | <action name="act_file_save_as"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/document-save-as.png</normaloff>:/16x16/document-save-as.png</iconset> | |||||
<normaloff>:/16x16/document-save-as.svgz</normaloff>:/16x16/document-save-as.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Save &As...</string> | <string>Save &As...</string> | ||||
@@ -1006,7 +1006,7 @@ | |||||
<action name="act_file_quit"> | <action name="act_file_quit"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/application-exit.png</normaloff>:/16x16/application-exit.png</iconset> | |||||
<normaloff>:/16x16/application-exit.svgz</normaloff>:/16x16/application-exit.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Quit</string> | <string>&Quit</string> | ||||
@@ -1018,7 +1018,7 @@ | |||||
<action name="act_engine_start"> | <action name="act_engine_start"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/media-playback-start.png</normaloff>:/16x16/media-playback-start.png</iconset> | |||||
<normaloff>:/16x16/media-playback-start.svgz</normaloff>:/16x16/media-playback-start.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Start</string> | <string>&Start</string> | ||||
@@ -1030,7 +1030,7 @@ | |||||
<action name="act_engine_stop"> | <action name="act_engine_stop"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/media-playback-stop.png</normaloff>:/16x16/media-playback-stop.png</iconset> | |||||
<normaloff>:/16x16/media-playback-stop.svgz</normaloff>:/16x16/media-playback-stop.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>St&op</string> | <string>St&op</string> | ||||
@@ -1042,7 +1042,7 @@ | |||||
<action name="act_plugin_add"> | <action name="act_plugin_add"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Add Plugin...</string> | <string>&Add Plugin...</string> | ||||
@@ -1054,7 +1054,7 @@ | |||||
<action name="act_plugin_add2"> | <action name="act_plugin_add2"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Add Plugin...</string> | <string>Add Plugin...</string> | ||||
@@ -1069,7 +1069,7 @@ | |||||
<action name="act_plugin_remove_all"> | <action name="act_plugin_remove_all"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/edit-delete.png</normaloff>:/16x16/edit-delete.png</iconset> | |||||
<normaloff>:/16x16/edit-delete.svgz</normaloff>:/16x16/edit-delete.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Remove All</string> | <string>&Remove All</string> | ||||
@@ -1113,7 +1113,7 @@ | |||||
<action name="act_plugins_panic"> | <action name="act_plugins_panic"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/dialog-warning.png</normaloff>:/16x16/dialog-warning.png</iconset> | |||||
<normaloff>:/16x16/dialog-warning.svgz</normaloff>:/16x16/dialog-warning.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Panic</string> | <string>Panic</string> | ||||
@@ -1125,7 +1125,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/media-playback-start.png</normaloff>:/16x16/media-playback-start.png</iconset> | |||||
<normaloff>:/16x16/media-playback-start.svgz</normaloff>:/16x16/media-playback-start.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Play</string> | <string>&Play</string> | ||||
@@ -1137,7 +1137,7 @@ | |||||
<action name="act_transport_stop"> | <action name="act_transport_stop"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/media-playback-stop.png</normaloff>:/16x16/media-playback-stop.png</iconset> | |||||
<normaloff>:/16x16/media-playback-stop.svgz</normaloff>:/16x16/media-playback-stop.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Stop</string> | <string>&Stop</string> | ||||
@@ -1149,7 +1149,7 @@ | |||||
<action name="act_transport_backwards"> | <action name="act_transport_backwards"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/media-seek-backward.png</normaloff>:/16x16/media-seek-backward.png</iconset> | |||||
<normaloff>:/16x16/media-seek-backward.svgz</normaloff>:/16x16/media-seek-backward.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Backwards</string> | <string>&Backwards</string> | ||||
@@ -1161,7 +1161,7 @@ | |||||
<action name="act_transport_forwards"> | <action name="act_transport_forwards"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/media-seek-forward.png</normaloff>:/16x16/media-seek-forward.png</iconset> | |||||
<normaloff>:/16x16/media-seek-forward.svgz</normaloff>:/16x16/media-seek-forward.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Forwards</string> | <string>&Forwards</string> | ||||
@@ -1173,7 +1173,7 @@ | |||||
<action name="act_canvas_arrange"> | <action name="act_canvas_arrange"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/view-sort-ascending.png</normaloff>:/16x16/view-sort-ascending.png</iconset> | |||||
<normaloff>:/16x16/view-sort-ascending.svgz</normaloff>:/16x16/view-sort-ascending.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Arrange</string> | <string>&Arrange</string> | ||||
@@ -1185,7 +1185,7 @@ | |||||
<action name="act_canvas_refresh"> | <action name="act_canvas_refresh"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Refresh</string> | <string>&Refresh</string> | ||||
@@ -1194,15 +1194,6 @@ | |||||
<string>Ctrl+R</string> | <string>Ctrl+R</string> | ||||
</property> | </property> | ||||
</action> | </action> | ||||
<action name="act_canvas_print"> | |||||
<property name="icon"> | |||||
<iconset resource="../resources.qrc"> | |||||
<normaloff>:/16x16/document-print.png</normaloff>:/16x16/document-print.png</iconset> | |||||
</property> | |||||
<property name="text"> | |||||
<string>&Print...</string> | |||||
</property> | |||||
</action> | |||||
<action name="act_canvas_save_image"> | <action name="act_canvas_save_image"> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Save &Image...</string> | <string>Save &Image...</string> | ||||
@@ -1211,7 +1202,7 @@ | |||||
<action name="act_canvas_zoom_fit"> | <action name="act_canvas_zoom_fit"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/zoom-fit-best.png</normaloff>:/16x16/zoom-fit-best.png</iconset> | |||||
<normaloff>:/16x16/zoom-fit-best.svgz</normaloff>:/16x16/zoom-fit-best.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Auto-Fit</string> | <string>Auto-Fit</string> | ||||
@@ -1223,7 +1214,7 @@ | |||||
<action name="act_canvas_zoom_in"> | <action name="act_canvas_zoom_in"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/zoom-in.png</normaloff>:/16x16/zoom-in.png</iconset> | |||||
<normaloff>:/16x16/zoom-in.svgz</normaloff>:/16x16/zoom-in.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Zoom In</string> | <string>Zoom In</string> | ||||
@@ -1235,7 +1226,7 @@ | |||||
<action name="act_canvas_zoom_out"> | <action name="act_canvas_zoom_out"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/zoom-out.png</normaloff>:/16x16/zoom-out.png</iconset> | |||||
<normaloff>:/16x16/zoom-out.svgz</normaloff>:/16x16/zoom-out.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Zoom Out</string> | <string>Zoom Out</string> | ||||
@@ -1247,7 +1238,7 @@ | |||||
<action name="act_canvas_zoom_100"> | <action name="act_canvas_zoom_100"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/zoom-original.png</normaloff>:/16x16/zoom-original.png</iconset> | |||||
<normaloff>:/16x16/zoom-original.svgz</normaloff>:/16x16/zoom-original.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Zoom 100%</string> | <string>Zoom 100%</string> | ||||
@@ -1267,7 +1258,7 @@ | |||||
<action name="act_settings_configure"> | <action name="act_settings_configure"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/configure.png</normaloff>:/16x16/configure.png</iconset> | |||||
<normaloff>:/16x16/configure.svgz</normaloff>:/16x16/configure.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Configure Carla</string> | <string>&Configure Carla</string> | ||||
@@ -1339,7 +1330,7 @@ | |||||
<action name="act_file_connect"> | <action name="act_file_connect"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/network-connect.png</normaloff>:/16x16/network-connect.png</iconset> | |||||
<normaloff>:/16x16/network-connect.svgz</normaloff>:/16x16/network-connect.svgz</iconset> | |||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Connect...</string> | <string>&Connect...</string> | ||||
@@ -1348,7 +1339,7 @@ | |||||
<action name="act_file_refresh"> | <action name="act_file_refresh"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>&Refresh</string> | <string>&Refresh</string> | ||||
@@ -1392,7 +1383,7 @@ | |||||
<action name="act_add_jack"> | <action name="act_add_jack"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Add &JACK Application</string> | <string>Add &JACK Application</string> | ||||
@@ -1407,7 +1398,7 @@ | |||||
<action name="act_plugin_add_jack"> | <action name="act_plugin_add_jack"> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Add &JACK Application...</string> | <string>Add &JACK Application...</string> | ||||
@@ -250,7 +250,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.svgz</pixmap> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -266,7 +266,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.svgz</pixmap> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -297,7 +297,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.svgz</pixmap> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -313,7 +313,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.svgz</pixmap> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -336,7 +336,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.svgz</pixmap> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -346,7 +346,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-ok-apply.svgz</pixmap> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -480,7 +480,7 @@ You can disable these checks to get a faster scanning time (at your own risk).</ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/arrow-right.png</normaloff>:/16x16/arrow-right.png</iconset> | |||||
<normaloff>:/16x16/arrow-right.svgz</normaloff>:/16x16/arrow-right.svgz</iconset> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -498,7 +498,7 @@ You can disable these checks to get a faster scanning time (at your own risk).</ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/window-close.png</normaloff>:/16x16/window-close.png</iconset> | |||||
<normaloff>:/16x16/window-close.svgz</normaloff>:/16x16/window-close.svgz</iconset> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -1065,7 +1065,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.svgz</pixmap> | |||||
</property> | </property> | ||||
<property name="alignment"> | <property name="alignment"> | ||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
@@ -1239,7 +1239,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.svgz</pixmap> | |||||
</property> | </property> | ||||
<property name="alignment"> | <property name="alignment"> | ||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
@@ -1421,7 +1421,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.svgz</pixmap> | |||||
</property> | </property> | ||||
<property name="alignment"> | <property name="alignment"> | ||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
@@ -1496,7 +1496,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.svgz</pixmap> | |||||
</property> | </property> | ||||
<property name="alignment"> | <property name="alignment"> | ||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
@@ -1552,7 +1552,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-warning.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-warning.svgz</pixmap> | |||||
</property> | </property> | ||||
<property name="alignment"> | <property name="alignment"> | ||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
@@ -1770,7 +1770,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.svgz</pixmap> | |||||
</property> | </property> | ||||
<property name="alignment"> | <property name="alignment"> | ||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
@@ -1849,7 +1849,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <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> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -1860,7 +1860,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/list-remove.png</normaloff>:/16x16/list-remove.png</iconset> | |||||
<normaloff>:/16x16/list-remove.svgz</normaloff>:/16x16/list-remove.svgz</iconset> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -1887,7 +1887,7 @@ | |||||
</property> | </property> | ||||
<property name="icon"> | <property name="icon"> | ||||
<iconset resource="../resources.qrc"> | <iconset resource="../resources.qrc"> | ||||
<normaloff>:/16x16/edit-rename.png</normaloff>:/16x16/edit-rename.png</iconset> | |||||
<normaloff>:/16x16/edit-rename.svgz</normaloff>:/16x16/edit-rename.svgz</iconset> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -129,7 +129,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/16x16/dialog-information.svgz</pixmap> | |||||
</property> | </property> | ||||
<property name="alignment"> | <property name="alignment"> | ||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
@@ -209,6 +209,10 @@ class CarlaApplication(object): | |||||
if MACOS: | if MACOS: | ||||
QApplication.setAttribute(Qt.AA_DontShowIconsInMenus) | QApplication.setAttribute(Qt.AA_DontShowIconsInMenus) | ||||
if QT_VERSION >= 0x50600: | |||||
QApplication.setAttribute(Qt.AA_EnableHighDpiScaling) | |||||
QApplication.setAttribute(Qt.AA_UseHighDpiPixmaps) | |||||
args = sys.argv[:] | args = sys.argv[:] | ||||
if WINDOWS: | if WINDOWS: | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* Carla Style, based on Qt5 fusion style | * Carla Style, based on Qt5 fusion style | ||||
* Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) | * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) | ||||
* Copyright (C) 2013-2018 Filipe Coelho <falktx@falktx.com> | |||||
* Copyright (C) 2013-2019 Filipe Coelho <falktx@falktx.com> | |||||
* | * | ||||
* This program is free software; you can redistribute it and/or | * This program is free software; you can redistribute it and/or | ||||
* modify it under the terms of the GNU Lesser General Public | * modify it under the terms of the GNU Lesser General Public | ||||
@@ -2058,8 +2058,15 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option, | |||||
state = QIcon::On; | state = QIcon::On; | ||||
QPixmap pixmap = button->icon.pixmap(button->iconSize, mode, state); | QPixmap pixmap = button->icon.pixmap(button->iconSize, mode, state); | ||||
int w = pixmap.width(); | |||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) | |||||
const qreal pw = static_cast<qreal>(pixmap.width()) / pixmap.devicePixelRatioF(); | |||||
qreal w = pw; | |||||
qreal h = static_cast<qreal>(pixmap.height()) / pixmap.devicePixelRatioF(); | |||||
#else | |||||
const int pw = pixmap.width(); | |||||
int w = pw; | |||||
int h = pixmap.height(); | int h = pixmap.height(); | ||||
#endif | |||||
if (!button->text.isEmpty()) | if (!button->text.isEmpty()) | ||||
w += button->fontMetrics.boundingRect(option->rect, tf, button->text).width() + 2; | w += button->fontMetrics.boundingRect(option->rect, tf, button->text).width() + 2; | ||||
@@ -2068,14 +2075,14 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option, | |||||
ir.y() + ir.height() / 2 - h / 2); | ir.y() + ir.height() / 2 - h / 2); | ||||
if (button->direction == Qt::RightToLeft) | if (button->direction == Qt::RightToLeft) | ||||
point.rx() += pixmap.width(); | |||||
point.rx() += pw; | |||||
painter->drawPixmap(visualPos(button->direction, button->rect, point), pixmap); | painter->drawPixmap(visualPos(button->direction, button->rect, point), pixmap); | ||||
if (button->direction == Qt::RightToLeft) | if (button->direction == Qt::RightToLeft) | ||||
ir.translate(-point.x() - 2, 0); | ir.translate(-point.x() - 2, 0); | ||||
else | else | ||||
ir.translate(point.x() + pixmap.width(), 0); | |||||
ir.translate(point.x() + pw, 0); | |||||
// left-align text if there is | // left-align text if there is | ||||
if (!button->text.isEmpty()) | if (!button->text.isEmpty()) | ||||
@@ -3832,6 +3839,60 @@ QRect CarlaStyle::subControlRect(ComplexControl control, const QStyleOptionCompl | |||||
return rect; | return rect; | ||||
} | } | ||||
/*! | |||||
\reimp | |||||
*/ | |||||
QPixmap CarlaStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption* opt, const QWidget* widget) const | |||||
{ | |||||
#if 0 // ndef QT_NO_IMAGEFORMAT_XPM | |||||
switch (standardPixmap) { | |||||
case SP_TitleBarNormalButton: | |||||
return QPixmap((const char **)dock_widget_restore_xpm); | |||||
case SP_TitleBarMinButton: | |||||
return QPixmap((const char **)workspace_minimize); | |||||
case SP_TitleBarCloseButton: | |||||
case SP_DockWidgetCloseButton: | |||||
return QPixmap((const char **)dock_widget_close_xpm); | |||||
default: | |||||
break; | |||||
} | |||||
#endif //QT_NO_IMAGEFORMAT_XPM | |||||
QPixmap pixmap = QCommonStyle::standardPixmap(standardPixmap, opt, widget); | |||||
if(!pixmap.isNull()) | |||||
return pixmap; | |||||
#if 0 // ndef QT_NO_IMAGEFORMAT_XPM | |||||
switch (standardPixmap) { | |||||
case SP_TitleBarMenuButton: | |||||
return QPixmap(qt_menu_xpm); | |||||
case SP_TitleBarShadeButton: | |||||
return QPixmap(qt_shade_xpm); | |||||
case SP_TitleBarUnshadeButton: | |||||
return QPixmap(qt_unshade_xpm); | |||||
case SP_TitleBarMaxButton: | |||||
return QPixmap(qt_maximize_xpm); | |||||
case SP_TitleBarCloseButton: | |||||
return QPixmap(qt_close_xpm); | |||||
case SP_TitleBarContextHelpButton: | |||||
return QPixmap(qt_help_xpm); | |||||
case SP_MessageBoxInformation: | |||||
return QPixmap(information_xpm); | |||||
case SP_MessageBoxWarning: | |||||
return QPixmap(warning_xpm); | |||||
case SP_MessageBoxCritical: | |||||
return QPixmap(critical_xpm); | |||||
case SP_MessageBoxQuestion: | |||||
return QPixmap(question_xpm); | |||||
default: | |||||
break; | |||||
} | |||||
#endif //QT_NO_IMAGEFORMAT_XPM | |||||
return QPixmap(); | |||||
} | |||||
/*! | /*! | ||||
\reimp | \reimp | ||||
*/ | */ | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* Carla Style, based on Qt5 fusion style | * Carla Style, based on Qt5 fusion style | ||||
* Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) | * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) | ||||
* Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com> | |||||
* Copyright (C) 2013-2019 Filipe Coelho <falktx@falktx.com> | |||||
* | * | ||||
* This program is free software; you can redistribute it and/or | * This program is free software; you can redistribute it and/or | ||||
* modify it under the terms of the GNU Lesser General Public | * modify it under the terms of the GNU Lesser General Public | ||||
@@ -32,7 +32,14 @@ | |||||
# pragma clang diagnostic push | # pragma clang diagnostic push | ||||
# pragma clang diagnostic ignored "-Wdeprecated-register" | # pragma clang diagnostic ignored "-Wdeprecated-register" | ||||
# endif | # endif | ||||
# if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) | |||||
# pragma GCC diagnostic push | |||||
# pragma GCC diagnostic ignored "-Wclass-memaccess" | |||||
# endif | |||||
# include <QtGui/QCommonStyle> | # include <QtGui/QCommonStyle> | ||||
# if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) | |||||
# pragma GCC diagnostic pop | |||||
# endif | |||||
# ifdef __clang__ | # ifdef __clang__ | ||||
# pragma clang diagnostic pop | # pragma clang diagnostic pop | ||||
# endif | # endif | ||||
@@ -65,6 +72,7 @@ public: | |||||
QRect subElementRect(SubElement r, const QStyleOption* opt, const QWidget* widget = nullptr) const override; | QRect subElementRect(SubElement r, const QStyleOption* opt, const QWidget* widget = nullptr) const override; | ||||
QSize sizeFromContents(ContentsType type, const QStyleOption* option, const QSize& size, const QWidget* widget) const override; | QSize sizeFromContents(ContentsType type, const QStyleOption* option, const QSize& size, const QWidget* widget) const override; | ||||
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex* opt, SubControl sc, const QWidget* widget) const override; | QRect subControlRect(ComplexControl cc, const QStyleOptionComplex* opt, SubControl sc, const QWidget* widget) const override; | ||||
QPixmap standardPixmap(StandardPixmap sp, const QStyleOption* opt = nullptr, const QWidget* widget = nullptr) const override; | |||||
int styleHint(StyleHint hint, const QStyleOption* option = nullptr, const QWidget* widget = nullptr, | int styleHint(StyleHint hint, const QStyleOption* option = nullptr, const QWidget* widget = nullptr, | ||||
QStyleHintReturn* returnData = nullptr) const override; | QStyleHintReturn* returnData = nullptr) const override; | ||||
void drawItemText(QPainter *painter, const QRect& rect, int flags, const QPalette& pal, bool enabled, const QString& text, | void drawItemText(QPainter *painter, const QRect& rect, int flags, const QPalette& pal, bool enabled, const QString& text, | ||||