More png to svg conversions on qml side

YACReaderLibrary/YACReaderLibrary.pro

@@ -315,9 +315,6 @@ SOURCES += grid_comics_view.cpp \
            comics_view_transition.cpp
 
 RESOURCES += qml.qrc
-win32:RESOURCES += qml_win.qrc
-unix:!macx:RESOURCES += qml_win.qrc
-macx:RESOURCES += qml_osx.qrc
 
 unix:!macx {
 

YACReaderLibrary/qml.qrc

@@ -7,10 +7,10 @@
         <file>qml/InfoFavorites.qml</file>
         <file>qml/InfoRating.qml</file>
         <file>qml/InfoComicsView.qml</file>
-        <file>qml/tick.png</file>
+        <file>qml/tick.svg</file>
-        <file>qml/reading.png</file>
+        <file>qml/reading.svg</file>
-        <file>qml/star_menu.png</file>
+        <file>qml/star.svg</file>
-        <file>qml/star_menu@2x.png</file>
+        <file>qml/page.svg</file>
         <file>qml/info-indicator.png</file>
         <file>qml/info-shadow.png</file>
         <file>qml/info-indicator-light.png</file>

YACReaderLibrary/qml/FlowView.qml

@@ -159,7 +159,7 @@ Rectangle {
                     id: mark
                     width: 23
                     height: 23
-                    source: read_column&&show_marks?"tick.png":has_been_opened&&show_marks?"reading.png":""
+                    source: read_column&&show_marks?"tick.svg":has_been_opened&&show_marks?"reading.svg":""
                     anchors {right: coverElement.right; top: coverElement.top; topMargin: 9; rightMargin: 9}
                     asynchronous : true
                 }

YACReaderLibrary/qml/GridComicsView.qml

@@ -11,6 +11,7 @@ import com.yacreader.ComicInfo 1.0
 import com.yacreader.ComicDB 1.0
 
 import QtQuick.Controls.Basic
+import QtQuick.Controls.impl
 
 SplitView {
     orientation: Qt.Horizontal
@@ -315,7 +316,7 @@ SplitView {
                     id: mark
                     width: 23
                     height: 23
-                    source: read_column&&show_marks?"tick.png":has_been_opened&&show_marks?"reading.png":""
+                    source: read_column&&show_marks?"tick.svg":has_been_opened&&show_marks?"reading.svg":""
                     anchors {right: coverElement.right; top: coverElement.top; topMargin: 9; rightMargin: 9}
                     asynchronous : true
                 }
@@ -347,10 +348,11 @@ SplitView {
                 }
 
                 //page icon
-                Image {
+                ColorImage {
                     id: pageImage
-                    anchors {bottom: realCell.bottom; right: realCell.right; bottomMargin: 5; rightMargin: 4; leftMargin: 4}
+                    anchors {bottom: realCell.bottom; right: realCell.right; bottomMargin: 6; rightMargin: 4; leftMargin: 4}
-                    source: "page.png"
+                    source: "page.svg"
+                    color: textColor
                     width: 8
                     height: 10
                 }
@@ -367,11 +369,12 @@ SplitView {
                 }
 
                 //rating icon
-                Image {
+                ColorImage {
                     id: ratingImage
-                    anchors {bottom: realCell.bottom; right: pageImage.left; bottomMargin: 5; rightMargin: Math.floor(pages.width)+12}
+                    anchors {bottom: realCell.bottom; right: pageImage.left; bottomMargin: 6.5; rightMargin: Math.floor(pages.width)+12}
-                    source: "star.png"
+                    source: "star.svg"
-                    width: 13
+                    color: textColor
+                    width: 11
                     height: 11
 
                     MouseArea  {

YACReaderLibrary/qml/page.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 10">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #f0f;
+        stroke-miterlimit: 10;
+      }
+
+      .cls-2 {
+        fill: #f0f;
+      }
+    </style>
+  </defs>
+  <path class="cls-2" d="M4,1v3h3v5H1V1h3M5,0H0v10h8V3h-3V0h0Z"/>
+  <line class="cls-1" x1="4.5" y1=".5" x2="7.5" y2="3.5"/>
+</svg>

YACReaderLibrary/qml/reading.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 23">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+
+      .cls-2 {
+        opacity: .6;
+      }
+    </style>
+  </defs>
+  <g class="cls-2">
+    <path d="M11.5,22.79C5.27,22.79.21,17.73.21,11.5S5.27.21,11.5.21s11.29,5.07,11.29,11.29-5.07,11.29-11.29,11.29Z"/>
+  </g>
+  <circle class="cls-1" cx="5.5" cy="11.5" r="1.5"/>
+  <circle class="cls-1" cx="11.5" cy="11.5" r="1.5"/>
+  <circle class="cls-1" cx="17.5" cy="11.5" r="1.5"/>
+</svg>

YACReaderLibrary/qml/star.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #f0f;
+        stroke-miterlimit: 10;
+      }
+    </style>
+  </defs>
+  <polygon class="cls-1" points="5.5 2 6.85 4.64 9.78 5.11 7.69 7.21 8.15 10.14 5.5 8.8 2.85 10.14 3.31 7.21 1.22 5.11 4.15 4.64 5.5 2"/>
+</svg>

YACReaderLibrary/qml/tick.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 23">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+
+      .cls-2 {
+        opacity: .6;
+      }
+    </style>
+  </defs>
+  <g class="cls-2">
+    <path d="M11.5,22.79C5.27,22.79.21,17.73.21,11.5S5.27.21,11.5.21s11.29,5.07,11.29,11.29-5.07,11.29-11.29,11.29Z"/>
+  </g>
+  <polygon class="cls-1" points="6.28 11.59 7.61 10.26 10.48 13.13 16.39 7.22 17.72 8.55 10.48 15.78 6.28 11.59"/>
+</svg>

YACReaderLibrary/qml_osx.qrc

@@ -1,8 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file alias="qml/page.png">qml/page-macosx.png</file>
-        <file alias="qml/page.png">qml/page-macosx@2x.png</file>
-        <file alias="qml/star.png">qml/star-macosx.png</file>
-        <file alias="qml/star.png">qml/star-macosx@2x.png</file>
-    </qresource>
-</RCC>

YACReaderLibrary/qml_win.qrc

@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>qml/page.png</file>
-        <file>qml/star.png</file>
-    </qresource>
-</RCC>