Fix GitHub Issue #36: Loss of icons

- Switch to PNG icons in order to avoid SVG lib dependency issues

Author: juzzlin

CHANGELOG

@@ -13,6 +13,8 @@ New features:
 
 Bug fixes:
 
+* Fix GitHub Issue #36: Loss of icons
+
 Other:
 
 1.6.0

src/CMakeLists.txt

@@ -276,25 +276,25 @@ set(QML_SOURCE_FILES
     ${QML_BASE_DIR}/ToolBar/ToolBarButtonBase.qml
     ${QML_BASE_DIR}/UiService.qml
 )
-set(SVG_SOURCE_FILES
-    ${QML_BASE_DIR}/Graphics/add_box.svg
-    ${QML_BASE_DIR}/Graphics/del_box.svg
-    ${QML_BASE_DIR}/Graphics/delete.svg
-    ${QML_BASE_DIR}/Graphics/icon.svg
-    ${QML_BASE_DIR}/Graphics/mute.svg
-    ${QML_BASE_DIR}/Graphics/play.svg
-    ${QML_BASE_DIR}/Graphics/prev.svg
-    ${QML_BASE_DIR}/Graphics/replay.svg
-    ${QML_BASE_DIR}/Graphics/record.svg
-    ${QML_BASE_DIR}/Graphics/settings.svg
-    ${QML_BASE_DIR}/Graphics/solo.svg
-    ${QML_BASE_DIR}/Graphics/stop.svg
+set(PNG_SOURCE_FILES
+    ${QML_BASE_DIR}/Graphics/add_box.png
+    ${QML_BASE_DIR}/Graphics/del_box.png
+    ${QML_BASE_DIR}/Graphics/delete.png
+    ${QML_BASE_DIR}/Graphics/icon.png
+    ${QML_BASE_DIR}/Graphics/mute.png
+    ${QML_BASE_DIR}/Graphics/play.png
+    ${QML_BASE_DIR}/Graphics/prev.png
+    ${QML_BASE_DIR}/Graphics/replay.png
+    ${QML_BASE_DIR}/Graphics/record.png
+    ${QML_BASE_DIR}/Graphics/settings.png
+    ${QML_BASE_DIR}/Graphics/solo.png
+    ${QML_BASE_DIR}/Graphics/stop.png
 )
 qt_add_qml_module(${BINARY_NAME}
     VERSION 1.0
     URI ${URI}
     QML_FILES ${QML_SOURCE_FILES}
-    RESOURCES ${SVG_SOURCE_FILES}
+    RESOURCES ${PNG_SOURCE_FILES}
 )
 
 target_include_directories(${BINARY_NAME} PRIVATE contrib/SimpleLogger/src)

src/view/qml/Dialogs/AboutDialog.qml

@@ -17,7 +17,7 @@ Dialog {
             width: 256
             sourceSize: Qt.size(height, width)
             fillMode: Image.PreserveAspectFit
-            source: "../Graphics/icon.svg"
+            source: "../Graphics/icon.png"
         }
         ColumnLayout {
             Label {

src/view/qml/Dialogs/EditMidiCcAutomationsDelegate.qml

@@ -303,7 +303,7 @@ GroupBox {
             ToolTip.text: qsTr("Delete")
             Image {
                 id: backgroundImage
-                source: "../Graphics/delete.svg"
+                source: "../Graphics/delete.png"
                 sourceSize: Qt.size(parent.width, parent.height)
                 width: parent.width
                 height: parent.height

src/view/qml/Dialogs/EditPitchBendAutomationsDelegate.qml

@@ -124,7 +124,7 @@ GroupBox {
             ToolTip.text: qsTr("Delete")
             Image {
                 id: backgroundImage
-                source: "../Graphics/delete.svg"
+                source: "../Graphics/delete.png"
                 sourceSize: Qt.size(parent.width, parent.height)
                 width: parent.width
                 height: parent.height

src/view/qml/Editor/AudioWaveView.qml

@@ -136,11 +136,17 @@ Rectangle {
 
             contentItem: Item {
                 Image {
-                    anchors.centerIn: parent
-                    source: "../Graphics/record.svg"
-                    width: Math.min(parent.width, parent.height) * 0.6
+                    source: "../Graphics/record.png"
+                    width: {
+                        const s = Math.min(parent.width, parent.height) * 0.6;
+                        return Math.max(2, Math.floor(s / 2) * 2);
+                    }
                     height: width
+                    sourceSize.width: width
+                    sourceSize.height: height
                     fillMode: Image.PreserveAspectFit
+                    x: Math.floor((parent.width - width) / 2)
+                    y: Math.floor((parent.height - height) / 2)
                 }
             }
         }

src/view/qml/Editor/MuteSoloButtons.qml

@@ -47,7 +47,7 @@ Item {
         ToolTip.text: qsTr("Mute")
         Component.onCompleted: {
             setScale(0.9);
-            setImageSource("../Graphics/mute.svg");
+            setImageSource("../Graphics/mute.png");
             setToggleColor("#ff0000");
         }
     }
@@ -80,7 +80,7 @@ Item {
         ToolTip.text: qsTr("Solo")
         Component.onCompleted: {
             setScale(0.9);
-            setImageSource("../Graphics/solo.svg");
+            setImageSource("../Graphics/solo.png");
             setToggleColor("#00ff00");
         }
     }

src/view/qml/Editor/NoteColumnHeader.qml

@@ -72,7 +72,7 @@ Rectangle {
             ToolTip.text: qsTr("Open column settings")
             Component.onCompleted: {
                 setScale(0.8);
-                setImageSource("../Graphics/settings.svg");
+                setImageSource("../Graphics/settings.png");
             }
         }
         TextField {

src/view/qml/Editor/SongView.qml

@@ -80,7 +80,8 @@ Rectangle {
             Image {
                 id: addPatternIcon
                 anchors.fill: parent
-                source: "../Graphics/add_box.svg"
+                sourceSize: Qt.size(width, height)
+                source: "../Graphics/add_box.png"
                 fillMode: Image.PreserveAspectFit
                 opacity: addPatternMouseArea.containsMouse ? 1.0 : 0.7
             }

src/view/qml/Editor/TrackHeader.qml

@@ -74,7 +74,7 @@ Rectangle {
             ToolTip.text: qsTr("Open track settings")
             Component.onCompleted: {
                 setScale(0.8);
-                setImageSource("../Graphics/settings.svg");
+                setImageSource("../Graphics/settings.png");
             }
         }
         TextField {