diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index ce7e7878..4d6d0059 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/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 { diff --git a/YACReaderLibrary/qml.qrc b/YACReaderLibrary/qml.qrc index 29badf8e..d216b4f8 100644 --- a/YACReaderLibrary/qml.qrc +++ b/YACReaderLibrary/qml.qrc @@ -7,10 +7,10 @@ qml/InfoFavorites.qml qml/InfoRating.qml qml/InfoComicsView.qml - qml/tick.png - qml/reading.png - qml/star_menu.png - qml/star_menu@2x.png + qml/tick.svg + qml/reading.svg + qml/star.svg + qml/page.svg qml/info-indicator.png qml/info-shadow.png qml/info-indicator-light.png diff --git a/YACReaderLibrary/qml/FlowView.qml b/YACReaderLibrary/qml/FlowView.qml index 75da010a..9ece421a 100644 --- a/YACReaderLibrary/qml/FlowView.qml +++ b/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 } diff --git a/YACReaderLibrary/qml/GridComicsView.qml b/YACReaderLibrary/qml/GridComicsView.qml index 47c94926..1c5edc01 100644 --- a/YACReaderLibrary/qml/GridComicsView.qml +++ b/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} - source: "page.png" + anchors {bottom: realCell.bottom; right: realCell.right; bottomMargin: 6; rightMargin: 4; leftMargin: 4} + 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} - source: "star.png" - width: 13 + anchors {bottom: realCell.bottom; right: pageImage.left; bottomMargin: 6.5; rightMargin: Math.floor(pages.width)+12} + source: "star.svg" + color: textColor + width: 11 height: 11 MouseArea { diff --git a/YACReaderLibrary/qml/page-macosx.png b/YACReaderLibrary/qml/page-macosx.png deleted file mode 100644 index c8216591..00000000 Binary files a/YACReaderLibrary/qml/page-macosx.png and /dev/null differ diff --git a/YACReaderLibrary/qml/page-macosx@2x.png b/YACReaderLibrary/qml/page-macosx@2x.png deleted file mode 100644 index a69a9428..00000000 Binary files a/YACReaderLibrary/qml/page-macosx@2x.png and /dev/null differ diff --git a/YACReaderLibrary/qml/page.png b/YACReaderLibrary/qml/page.png deleted file mode 100644 index 83e35370..00000000 Binary files a/YACReaderLibrary/qml/page.png and /dev/null differ diff --git a/YACReaderLibrary/qml/page.svg b/YACReaderLibrary/qml/page.svg new file mode 100644 index 00000000..446162fb --- /dev/null +++ b/YACReaderLibrary/qml/page.svg @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/YACReaderLibrary/qml/reading.png b/YACReaderLibrary/qml/reading.png deleted file mode 100644 index a26a81d6..00000000 Binary files a/YACReaderLibrary/qml/reading.png and /dev/null differ diff --git a/YACReaderLibrary/qml/reading.svg b/YACReaderLibrary/qml/reading.svg new file mode 100644 index 00000000..65b5b406 --- /dev/null +++ b/YACReaderLibrary/qml/reading.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/YACReaderLibrary/qml/star-macosx.png b/YACReaderLibrary/qml/star-macosx.png deleted file mode 100644 index 37577a74..00000000 Binary files a/YACReaderLibrary/qml/star-macosx.png and /dev/null differ diff --git a/YACReaderLibrary/qml/star-macosx@2x.png b/YACReaderLibrary/qml/star-macosx@2x.png deleted file mode 100644 index 82e1ae7f..00000000 Binary files a/YACReaderLibrary/qml/star-macosx@2x.png and /dev/null differ diff --git a/YACReaderLibrary/qml/star.png b/YACReaderLibrary/qml/star.png deleted file mode 100644 index 61d8782c..00000000 Binary files a/YACReaderLibrary/qml/star.png and /dev/null differ diff --git a/YACReaderLibrary/qml/star.svg b/YACReaderLibrary/qml/star.svg new file mode 100644 index 00000000..ca56cb9d --- /dev/null +++ b/YACReaderLibrary/qml/star.svg @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/YACReaderLibrary/qml/star_menu.png b/YACReaderLibrary/qml/star_menu.png deleted file mode 100644 index 4472e5a3..00000000 Binary files a/YACReaderLibrary/qml/star_menu.png and /dev/null differ diff --git a/YACReaderLibrary/qml/star_menu@2x.png b/YACReaderLibrary/qml/star_menu@2x.png deleted file mode 100644 index 9e164485..00000000 Binary files a/YACReaderLibrary/qml/star_menu@2x.png and /dev/null differ diff --git a/YACReaderLibrary/qml/tick.png b/YACReaderLibrary/qml/tick.png deleted file mode 100644 index 78a20644..00000000 Binary files a/YACReaderLibrary/qml/tick.png and /dev/null differ diff --git a/YACReaderLibrary/qml/tick.svg b/YACReaderLibrary/qml/tick.svg new file mode 100644 index 00000000..856b4f6a --- /dev/null +++ b/YACReaderLibrary/qml/tick.svg @@ -0,0 +1,18 @@ + + + + + + + + + + \ No newline at end of file diff --git a/YACReaderLibrary/qml_osx.qrc b/YACReaderLibrary/qml_osx.qrc deleted file mode 100644 index 1649991a..00000000 --- a/YACReaderLibrary/qml_osx.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - qml/page-macosx.png - qml/page-macosx@2x.png - qml/star-macosx.png - qml/star-macosx@2x.png - - diff --git a/YACReaderLibrary/qml_win.qrc b/YACReaderLibrary/qml_win.qrc deleted file mode 100644 index 59e2872f..00000000 --- a/YACReaderLibrary/qml_win.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - qml/page.png - qml/star.png - -