From 6e62fc0a0ce4e68f9b0c65b29fc49a43e48d5316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 23 Oct 2022 12:45:50 +0200 Subject: [PATCH] Replace icon in the search edit with SVG versions --- YACReaderLibrary/images_win.qrc | 4 ++-- custom_widgets/yacreader_search_line_edit.cpp | 6 ++++++ images/clearSearchNew.png | Bin 235 -> 0 bytes images/clearSearchNew.svg | Bin 0 -> 301 bytes images/iconSearchNew.png | Bin 382 -> 0 bytes images/iconSearchNew.svg | Bin 0 -> 450 bytes 6 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 images/clearSearchNew.png create mode 100644 images/clearSearchNew.svg delete mode 100644 images/iconSearchNew.png create mode 100644 images/iconSearchNew.svg diff --git a/YACReaderLibrary/images_win.qrc b/YACReaderLibrary/images_win.qrc index d907444a..3fa00b2f 100644 --- a/YACReaderLibrary/images_win.qrc +++ b/YACReaderLibrary/images_win.qrc @@ -23,8 +23,8 @@ ../images/sidebar/renameListIcon.svg ../images/empty_folder.png ../images/empty_search.png - ../images/iconSearchNew.png - ../images/clearSearchNew.png + ../images/iconSearchNew.svg + ../images/clearSearchNew.svg ../images/empty_reading_list.png ../images/viewer_toolbar/close.svg icon.ico diff --git a/custom_widgets/yacreader_search_line_edit.cpp b/custom_widgets/yacreader_search_line_edit.cpp index a7900f6d..aa3936e4 100644 --- a/custom_widgets/yacreader_search_line_edit.cpp +++ b/custom_widgets/yacreader_search_line_edit.cpp @@ -1,4 +1,5 @@ #include "yacreader_search_line_edit.h" +#include "yacreader_global_gui.h" #include #include @@ -12,6 +13,7 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent) clearButton = new QToolButton(this); searchLabel = new QLabel(this); +#ifdef Q_OS_MAC QPixmap clearIcon; QPixmap searchIcon; @@ -29,6 +31,10 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent) clearIcon.load(":/images/clearSearch.png"); searchIcon.load(":/images/iconSearch.png"); } +#else + QPixmap clearIcon = YACReader::hdpiPixmap(":/images/clearSearch.svg", QSize(15, 15)); + QPixmap searchIcon = YACReader::hdpiPixmap(":/images/iconSearch.svg", QSize(15, 15)); +#endif searchLabel->setStyleSheet("QLabel { border: none; padding: 0px; }"); searchLabel->setPixmap(searchIcon); diff --git a/images/clearSearchNew.png b/images/clearSearchNew.png deleted file mode 100644 index 20de2f164047cf75b379fcbe1fccf4901c448863..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1SD^YpWXnZBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%^?JHEhE&|@nXr-ffC3N8dNf(=-0S8rgc ze4^p#-?hW>+x)Y)cW=FB8SZs+pOcEHQ-@*J+U&J13*PO`U%T?2HAjg6yVJ2JbEX=y zNfq)>405XSny(^|rX5tH_$ZC3FvtE;%v`(AKdg(q?%c>z&A4Ca6Vo&2+?`qzopr0JBI`&;S4c diff --git a/images/clearSearchNew.svg b/images/clearSearchNew.svg new file mode 100644 index 0000000000000000000000000000000000000000..9f29aec380d3a0f755a744a576ace5946e73e4dc GIT binary patch literal 301 zcmZ{f!D_=W5JZ1v*`94l?jgmI6zCzR9Gi0p_SzLuq#_B+ru5$<*FBU%*@awItAsPO!DtX}Y-Wt>JZy~5LVp>Pohg>q5hdrBWIV>#zKKi58t ztl^xqa*i+=%CCM_$bo}s%A%G%4Y9p&gdyS>ecVHp0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzAW1|)RCwByk|A$|U<`(VB^VS2a|Zl8 ziiDs@F6Z$iB$!kDjWbAo0Um|HB_^T2>O1%^CdG$622O}N&_bpNxqCks~DQhL<1*uPv8iHZog>8 zSALNk38pFkk#keLWnzzAfq3=Nn(qZB>M+CEc;4?}tZo`&N`-Rv$`w9>?oOhgUvXzj-?4aXtSQVlfM` zgkBHhnbiIeuv?0!1n2lr7NlcJ!#eX^gV70UaE{{}EQ^4WUN6jm)33@vzGenA+7fch zKr5C<+(nj*Bn1;oxETEpwE|<9WEyPF!NfXFr(Qm`M?HaxgDAbf@D&b-zRGG;T*f5N nuwZoU!s2z8fpM6d28l