diff --git a/YACReaderLibrary/qml.qrc b/YACReaderLibrary/qml.qrc
index 8bdd2e31..c5f21e93 100644
--- a/YACReaderLibrary/qml.qrc
+++ b/YACReaderLibrary/qml.qrc
@@ -16,14 +16,10 @@
qml/info-shadow-light@2x.png
qml/info-top-shadow.png
qml/ComicInfoView.qml
- qml/info-favorites.png
- qml/info-favorites@2x.png
- qml/info-rating.png
- qml/info-rating@2x.png
- qml/info-tag.png
- qml/info-tag@2x.png
- qml/info-tick.png
- qml/info-tick@2x.png
+ qml/info-favorites.svg
+ qml/info-rating.svg
+ qml/info-tag.svg
+ qml/info-tick.svg
qml/InfoTick.qml
qml/InfoFavorites.qml
qml/InfoRating.qml
diff --git a/YACReaderLibrary/qml/InfoFavorites.qml b/YACReaderLibrary/qml/InfoFavorites.qml
index 57b43a9a..2b24c0ab 100644
--- a/YACReaderLibrary/qml/InfoFavorites.qml
+++ b/YACReaderLibrary/qml/InfoFavorites.qml
@@ -20,7 +20,7 @@ Item {
Image {
anchors.centerIn: parent
id: favorites_button_compact
- source: "info-favorites.png"
+ source: "info-favorites.svg"
}
ColorOverlay {
diff --git a/YACReaderLibrary/qml/InfoFavorites6.qml b/YACReaderLibrary/qml/InfoFavorites6.qml
index be98fd1d..ce88142c 100644
--- a/YACReaderLibrary/qml/InfoFavorites6.qml
+++ b/YACReaderLibrary/qml/InfoFavorites6.qml
@@ -1,6 +1,6 @@
import QtQuick
-import Qt5Compat.GraphicalEffects
+import QtQuick.Controls.impl
Item {
width: 20
@@ -17,15 +17,10 @@ Item {
}
}
- Image {
+ ColorImage {
anchors.centerIn: parent
id: favorites_button_compact
- source: "info-favorites.png"
- }
-
- ColorOverlay {
- anchors.fill: favorites_button_compact
- source: favorites_button_compact
+ source: "info-favorites.svg"
color: active ? favCheckedColor : favUncheckedColor
}
}
diff --git a/YACReaderLibrary/qml/InfoRating.qml b/YACReaderLibrary/qml/InfoRating.qml
index fd039701..0f20b993 100644
--- a/YACReaderLibrary/qml/InfoRating.qml
+++ b/YACReaderLibrary/qml/InfoRating.qml
@@ -18,7 +18,7 @@ Row {
Image {
id: star
- source: "info-rating.png"
+ source: "info-rating.svg"
}
ColorOverlay {
diff --git a/YACReaderLibrary/qml/InfoRating6.qml b/YACReaderLibrary/qml/InfoRating6.qml
index ca3eda60..2a7b482a 100644
--- a/YACReaderLibrary/qml/InfoRating6.qml
+++ b/YACReaderLibrary/qml/InfoRating6.qml
@@ -1,6 +1,6 @@
import QtQuick
-import Qt5Compat.GraphicalEffects
+import QtQuick.Controls.impl
Row {
spacing: 0
@@ -16,14 +16,9 @@ Row {
width: 25
height: 20
- Image {
+ ColorImage {
id: star
- source: "info-rating.png"
- }
-
- ColorOverlay {
- anchors.fill: star
- source: star
+ source: "info-rating.svg"
color: index < (mouseIndex > 0 ? mouseIndex : rating) ? ratingSelectedColor : ratingUnselectedColor
}
diff --git a/YACReaderLibrary/qml/InfoTick.qml b/YACReaderLibrary/qml/InfoTick.qml
index 7bfe4e83..6659724c 100644
--- a/YACReaderLibrary/qml/InfoTick.qml
+++ b/YACReaderLibrary/qml/InfoTick.qml
@@ -17,7 +17,7 @@ Item {
Image {
id: read_compact
- source: "info-tick.png"
+ source: "info-tick.svg"
}
ColorOverlay {
diff --git a/YACReaderLibrary/qml/InfoTick6.qml b/YACReaderLibrary/qml/InfoTick6.qml
index e7f26067..5b50a31f 100644
--- a/YACReaderLibrary/qml/InfoTick6.qml
+++ b/YACReaderLibrary/qml/InfoTick6.qml
@@ -1,6 +1,6 @@
import QtQuick
-import Qt5Compat.GraphicalEffects
+import QtQuick.Controls.impl
Item {
@@ -15,14 +15,9 @@ Item {
}
}
- Image {
+ ColorImage {
id: read_compact
- source: "info-tick.png"
- }
-
- ColorOverlay {
- anchors.fill: read_compact
- source: read_compact
+ source: "info-tick.svg"
color: read ? readTickCheckedColor : readTickUncheckedColor
}
}
diff --git a/YACReaderLibrary/qml/info-favorites.png b/YACReaderLibrary/qml/info-favorites.png
deleted file mode 100644
index f8b61395..00000000
Binary files a/YACReaderLibrary/qml/info-favorites.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-favorites.svg b/YACReaderLibrary/qml/info-favorites.svg
new file mode 100644
index 00000000..1fe077be
--- /dev/null
+++ b/YACReaderLibrary/qml/info-favorites.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/YACReaderLibrary/qml/info-favorites@2x.png b/YACReaderLibrary/qml/info-favorites@2x.png
deleted file mode 100644
index 19aedd32..00000000
Binary files a/YACReaderLibrary/qml/info-favorites@2x.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-rating.png b/YACReaderLibrary/qml/info-rating.png
deleted file mode 100644
index d65cf2ab..00000000
Binary files a/YACReaderLibrary/qml/info-rating.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-rating.svg b/YACReaderLibrary/qml/info-rating.svg
new file mode 100644
index 00000000..54f4199d
--- /dev/null
+++ b/YACReaderLibrary/qml/info-rating.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/YACReaderLibrary/qml/info-rating@2x.png b/YACReaderLibrary/qml/info-rating@2x.png
deleted file mode 100644
index 01048c80..00000000
Binary files a/YACReaderLibrary/qml/info-rating@2x.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-tag.png b/YACReaderLibrary/qml/info-tag.png
deleted file mode 100644
index b7209c58..00000000
Binary files a/YACReaderLibrary/qml/info-tag.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-tag.svg b/YACReaderLibrary/qml/info-tag.svg
new file mode 100644
index 00000000..5d3b00bb
--- /dev/null
+++ b/YACReaderLibrary/qml/info-tag.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/YACReaderLibrary/qml/info-tag@2x.png b/YACReaderLibrary/qml/info-tag@2x.png
deleted file mode 100644
index 04a995f8..00000000
Binary files a/YACReaderLibrary/qml/info-tag@2x.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-tick.png b/YACReaderLibrary/qml/info-tick.png
deleted file mode 100644
index aa6b80b9..00000000
Binary files a/YACReaderLibrary/qml/info-tick.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-tick.svg b/YACReaderLibrary/qml/info-tick.svg
new file mode 100644
index 00000000..6ff50d94
--- /dev/null
+++ b/YACReaderLibrary/qml/info-tick.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/YACReaderLibrary/qml/info-tick@2x.png b/YACReaderLibrary/qml/info-tick@2x.png
deleted file mode 100644
index 46455b1d..00000000
Binary files a/YACReaderLibrary/qml/info-tick@2x.png and /dev/null differ
diff --git a/YACReaderLibrary/qml6.qrc b/YACReaderLibrary/qml6.qrc
index 6eb3226f..d838abe2 100644
--- a/YACReaderLibrary/qml6.qrc
+++ b/YACReaderLibrary/qml6.qrc
@@ -19,14 +19,10 @@
qml/info-shadow-light@2x.png
qml/info-top-shadow.png
qml/ComicInfoView.qml
- qml/info-favorites.png
- qml/info-favorites@2x.png
- qml/info-rating.png
- qml/info-rating@2x.png
- qml/info-tag.png
- qml/info-tag@2x.png
- qml/info-tick.png
- qml/info-tick@2x.png
+ qml/info-favorites.svg
+ qml/info-rating.svg
+ qml/info-tag.svg
+ qml/info-tick.svg
qml/prerendered_cover_shadow.png