From 5762b32fda73adb2d710a6dcfc53e68488b9846c Mon Sep 17 00:00:00 2001 From: luisangelsm Date: Fri, 13 Feb 2026 16:22:28 +0100 Subject: [PATCH] More png to svg conversions on qml side --- YACReaderLibrary/YACReaderLibrary.pro | 3 --- YACReaderLibrary/qml.qrc | 8 ++++---- YACReaderLibrary/qml/FlowView.qml | 2 +- YACReaderLibrary/qml/GridComicsView.qml | 19 +++++++++++-------- YACReaderLibrary/qml/page-macosx.png | Bin 171 -> 0 bytes YACReaderLibrary/qml/page-macosx@2x.png | Bin 218 -> 0 bytes YACReaderLibrary/qml/page.png | Bin 163 -> 0 bytes YACReaderLibrary/qml/page.svg | 18 ++++++++++++++++++ YACReaderLibrary/qml/reading.png | Bin 374 -> 0 bytes YACReaderLibrary/qml/reading.svg | 20 ++++++++++++++++++++ YACReaderLibrary/qml/star-macosx.png | Bin 288 -> 0 bytes YACReaderLibrary/qml/star-macosx@2x.png | Bin 472 -> 0 bytes YACReaderLibrary/qml/star.png | Bin 288 -> 0 bytes YACReaderLibrary/qml/star.svg | 13 +++++++++++++ YACReaderLibrary/qml/star_menu.png | Bin 277 -> 0 bytes YACReaderLibrary/qml/star_menu@2x.png | Bin 468 -> 0 bytes YACReaderLibrary/qml/tick.png | Bin 488 -> 0 bytes YACReaderLibrary/qml/tick.svg | 18 ++++++++++++++++++ YACReaderLibrary/qml_osx.qrc | 8 -------- YACReaderLibrary/qml_win.qrc | 6 ------ 20 files changed, 85 insertions(+), 30 deletions(-) delete mode 100644 YACReaderLibrary/qml/page-macosx.png delete mode 100644 YACReaderLibrary/qml/page-macosx@2x.png delete mode 100644 YACReaderLibrary/qml/page.png create mode 100644 YACReaderLibrary/qml/page.svg delete mode 100644 YACReaderLibrary/qml/reading.png create mode 100644 YACReaderLibrary/qml/reading.svg delete mode 100644 YACReaderLibrary/qml/star-macosx.png delete mode 100644 YACReaderLibrary/qml/star-macosx@2x.png delete mode 100644 YACReaderLibrary/qml/star.png create mode 100644 YACReaderLibrary/qml/star.svg delete mode 100644 YACReaderLibrary/qml/star_menu.png delete mode 100644 YACReaderLibrary/qml/star_menu@2x.png delete mode 100644 YACReaderLibrary/qml/tick.png create mode 100644 YACReaderLibrary/qml/tick.svg delete mode 100644 YACReaderLibrary/qml_osx.qrc delete mode 100644 YACReaderLibrary/qml_win.qrc 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 c8216591679ffb2e0dac358288275c4ce8d539ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^96-#)!3HEdkIOdzDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MZTUcjv*Ddl6d&}|DSK*6bfGxv60~nlO_Wbn*`g(g%*rQ z(i0ExF*Q~=y12A3>9M|ESYq48wBT-!f!T$Y|2{k{46-5{4#+fnGdeUdGC1cdp31NN R!3#8)!PC{xWt~$(697>)GP3{x diff --git a/YACReaderLibrary/qml/page-macosx@2x.png b/YACReaderLibrary/qml/page-macosx@2x.png deleted file mode 100644 index a69a9428dd45c587f92b0bd1f218ef3368832e0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRn!3HE-lJ=GZDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MKzu-jv*Ddl6d&}|DSh|5s2BCbdF5)R@*ySMiN|t>R4};Zjrb&u_ z9QMd(crbErWLwb6%JXINBi1zytsKiA_sVv~8e|<DSr z1<%~X^wgl##FWaylc_d9MXsJMjv*Ddl43R{9j#~cNstf}EMz?66wdI7`D3+$AH&B; zi4Dyz3iJ3wR2sYwR%zTl-*A|>;Png%4hAcYgo9#YCm0kCFdXKQ&D#-lJq2hWgQu&X J%Q~loCIBv)G8X^< 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 a26a81d63a321ff8c73407b041c96b3c22c3576b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmV-+0g3*JP)+7*9lVSQEwMA4ff7z&p)DoQSkRc@A2T3PiBWd_$!B1)`!d-qGqS2G(IqLR zi?D!Q_7E=NlpSM#+PVK79MCDk2DZd!6>tE~=_4HA6@n+eR|M9f6Amy{I~Ttz0WYXO z)KkTMz@#~I9&kQmPw0`yyr%Mv(5pL7@pZE_!!6<3cmIAa4Ep2b$qQ(_6UFN1DJ + + + + + + + + + + + \ 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 37577a74c8a41fc0fefcab1b1fe49c750f2ee8ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmV+*0pI?KP)C24IAC14hUQ z{YySGLN_QQFan?XWQ4LoH)uNnY>?WLi7H4=I{CQR_rj!rre}xA-v7M^7fDX>;cf~LG0Dm%$F|N521bkdXAUS~WA?lm?MZ7#7tIvulm>39y z^0RoR(IeYhR2qTw+usVKMhmq=u>Go$FUqaTSFcB63jr5@3tQ!@qV0MlUxilrY|T!@ m`KRr){7>jM>~=Ii0R{k?6P)oSV53vb0+5-RT_9^Bjd(UDpMV zeczu$aGNOHI*dgK=;Z-5J9ee)Ux>&W%lE3qzBwWVDGgWc=ZtbSJX?{<%@HntdyXPa zO@{FrqUskB4rR~D6I2(^-&hG9+F;)Y4SVt%ITLZYkK`Ag>*NcO0J?0sy(MS5Efdn&H!Ujw O0000HysUm;l(I z-2iUAW&%c_8vqkj+9>x*o!GfVv~63b&ZY@Nf$XLK znaluh=}%0e?m4mo>%N0E+~EWrJgTY+<0K4r*uw#q;3=?4UjLTwRX1L*R5vHX#Xh87 z`A&5%)1i$m>C~XcHhMy%tNGL-o)C29xpG1I + + + + + + \ 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 4472e5a31f0e0cbcd83edaad25020ec221020a18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp@K+Mg-1|*kkVowB8k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XwtKobhE&{2N;trnl9D1N;lb#@%jfV%-X(c*`k{sE*%4FkLg~A%fLcuI0kBv+r zZbP0l+XkKon2l~ diff --git a/YACReaderLibrary/qml/star_menu@2x.png b/YACReaderLibrary/qml/star_menu@2x.png deleted file mode 100644 index 9e1644855ddb8c0e69ec94e4578dca8e89883aea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 468 zcmV;_0W1EAP)B+t_KUJDoB1^W#af$me;^Qmn3P#iQ2x zoPvAF(yhm+Qb3yr)EwB2vVS2WYdz1amdECZ6qGdFt=ARhYIwFHlbaJU4;qf-U*t^0d5=1% zc*Fcg{)sOf?F$OR9A#br+gSL{89D+L2mx=NIBay_HL@!Az-~dp*wI;aSWwu=fHMyG z6N$6DQ^{gTy!XgK)&vAKYb3!73xENI@?_RVA4yDSFd-XcW3?LUVC_xo45+|ws552U zqkFSmc+O={Yvzz$a_GbtPIM3_TMLp5&l+pfnyMJ0tspp|*Hxmi9dkl~Sc|?Gen600RJ2+W`vWoZ?yl0000< KMNUMnLSTZKHO?9U diff --git a/YACReaderLibrary/qml/tick.png b/YACReaderLibrary/qml/tick.png deleted file mode 100644 index 78a20644c27b468c50767aa4a44597662f7253de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmVP)wXM;%Yz~3&g? zC_;UD5u4#56c~&gN1%AQ2I4Rwg|QO@b$}DpJhgt^2k28-cbAj1Q&xen-6dqYD*IeUA1 zMJ6Vu&map(Fc<__K{>P+nl>?9e*E}xKTw#0_9*{be eYPCN=fB^su{-6g#-^-l<0000 + + + + + + + + + \ 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 - -