From 6afc433ac826a0a35278afb854ea2a5c1d0a0430 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Fri, 30 Dec 2016 16:04:37 +0100 Subject: [PATCH] Another HighDPI icons --- src/lib/data/icons.qrc | 7 +++--- src/lib/data/icons/other/audiomuted.png | Bin 241 -> 0 bytes src/lib/data/icons/other/audiomuted.svg | 22 ++++++++++++++++++ src/lib/data/icons/other/audioplaying.png | Bin 113 -> 0 bytes src/lib/data/icons/other/audioplaying.svg | 13 +++++++++++ src/lib/data/icons/other/empty-page.png | Bin 515 -> 0 bytes src/lib/data/icons/other/feed.png | Bin 1136 -> 0 bytes src/lib/data/icons/other/webpage.svg | 10 ++++++++ .../schemehandlers/qupzillaschemehandler.cpp | 1 - src/lib/tabwidget/tabicon.cpp | 4 ++-- src/lib/tools/iconprovider.cpp | 2 +- 11 files changed, 51 insertions(+), 8 deletions(-) delete mode 100644 src/lib/data/icons/other/audiomuted.png create mode 100644 src/lib/data/icons/other/audiomuted.svg delete mode 100644 src/lib/data/icons/other/audioplaying.png create mode 100644 src/lib/data/icons/other/audioplaying.svg delete mode 100644 src/lib/data/icons/other/empty-page.png delete mode 100644 src/lib/data/icons/other/feed.png create mode 100644 src/lib/data/icons/other/webpage.svg diff --git a/src/lib/data/icons.qrc b/src/lib/data/icons.qrc index 8e8bbcda0..d766cdbc0 100644 --- a/src/lib/data/icons.qrc +++ b/src/lib/data/icons.qrc @@ -13,7 +13,6 @@ icons/menu/window-new.svg icons/other/about.png icons/other/about@2x.png - icons/other/feed.png icons/other/bigstar.png icons/locationbar/safe.png icons/locationbar/unsafe.png @@ -54,13 +53,13 @@ icons/sites/w3.png icons/other/loading.png icons/other/loading@2x.png - icons/other/empty-page.png + icons/other/webpage.svg icons/menu/privatebrowsing.png icons/menu/settings.svg icons/other/startpage.png icons/other/startpage@2x.png - icons/other/audioplaying.png - icons/other/audiomuted.png + icons/other/audioplaying.svg + icons/other/audiomuted.svg icons/preferences/tools-check-spelling.png diff --git a/src/lib/data/icons/other/audiomuted.png b/src/lib/data/icons/other/audiomuted.png deleted file mode 100644 index 8c03b192b4e818e667564cfb880d19ef5e6c5b12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmV zu`UEr6vyE&Q;_XEfG9@@2!iZx6_ka5FwV!@HLPN^BD!Wi%fdGe7SC55G%DVwEQcvK9%E7$9eu rnfo1?5@QfvEreFFL;Ik$ZPNY#ZRAlCGLe{w00000NkvXXu0mjfEz4eQ diff --git a/src/lib/data/icons/other/audiomuted.svg b/src/lib/data/icons/other/audiomuted.svg new file mode 100644 index 000000000..abd93a7d6 --- /dev/null +++ b/src/lib/data/icons/other/audiomuted.svg @@ -0,0 +1,22 @@ + + + + + + + diff --git a/src/lib/data/icons/other/audioplaying.png b/src/lib/data/icons/other/audioplaying.png deleted file mode 100644 index 36a77314e4639cb74f383bf8e7389defbe5dabac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mEIeHtLn;`PC3qGzN~r$t4E!{I zfzXacZ+U87T>3vzF(k#zu*)vU_oB}szWZkmG+(b5VOMjy>A=Lmr)iRZPQ5Y)Xa<9) LtDnm{r-UW|3ELy= diff --git a/src/lib/data/icons/other/audioplaying.svg b/src/lib/data/icons/other/audioplaying.svg new file mode 100644 index 000000000..ed317c21f --- /dev/null +++ b/src/lib/data/icons/other/audioplaying.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/icons/other/empty-page.png b/src/lib/data/icons/other/empty-page.png deleted file mode 100644 index 34046450e9a3ef5113a1f22a0cff0c5a76850628..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 515 zcmV+e0{s1nP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02{9W02{9XUK)`c00007bV*G`2ipMw z5&#uLj+<-%00DzZL_t(I%axPOPQpMC$2WfUqLD!G$`J|W0P(^B^=#t%c=YB?AAu7I zCz>=o15ZFC#2Y4Hpr6n}3#Q}DTAHn}Mko1av%B;EO?P(77)CCaJH?@nYWz`kMN!U~ z5DoZepyy5m+|r^koq{==rDV})7+|4n(*z3@1MYVK+#n=#Sr#}X+fF0}*kr_HTQIne zlW6X`Fvn32hz*puSS-Lp`JM;9?YF)<^Mj28A~hE4vMOyF~~kpn_Bt=DS~AoF-U23^-d(=_OGI?(NQqxaE> z09QMJfB-^us@!U|#P<`?4b`gEhjO`m@GF46#=#qDHk;gOnr8Ic??a_hc`OtPhwMju z9|5awdqB-J@LjaqZC?3pI0RKypDyzGBeo~fO+?ZCPw{E@dcBA`e_1L$XS3N8CW&i) zgxE|VIzIshg8>wa#g|MbqsYt*H_zhV^k$E0xPL73egSd(TaOQ8to#4~002ovPDHLk FV1nBd*8l(j diff --git a/src/lib/data/icons/other/feed.png b/src/lib/data/icons/other/feed.png deleted file mode 100644 index 1bc5fa047881bc0d54e47969038e3b185e970dcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1136 zcmV-$1dscPP)QWB=W$lPJwE=~hi^SJJR(7*C2-92 zxjspBW37c?i5fryOHX2d`l=srfM^3vS&XEoJR24uq^2PvbS-RFuU>QRj$ow_6 zS=Xu^iC!f@F$HC;WN_8oFR;M3b01UE(L;wL#CGe+t_&x)wpI zNI=vr2Kenf6c^#f1vtA0X3jvo3;JJGvH33mpnb5ixIyVysCo|=HNcL;@WKov4{QCy zYXGq6Q5DKw)VghORoGNwm7CB2SfjqGg=!he}*Axb}-dX`J9fOGyJ(TJ5@R0%C z@oMgKqe1}?Dx-`95+g9Nup?fO$_J7K{KfXhYmLqQeK_FQJUB$tmPM@hzM2dE&LHqu z$+wa5W0UcPf?xSqZj8Bn(AyF3*mN>h%xpJ>oRx^9_i9}o#Epe{>MrLpi~Ex&7)L~+ z4WK5j4C5^)aP^Pl-$Ix6cDnbEQlw1q|CiG{Zs0GC+m&AMwHiqP0000 + + + + + diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp index b9c011958..68b769341 100644 --- a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp +++ b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp @@ -272,7 +272,6 @@ QString QupZillaSchemeReply::speeddialPage() if (dPage.isEmpty()) { dPage.append(QzTools::readAllFileContents(":html/speeddial.html")); - dPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/other/empty-page.png")); dPage.replace(QLatin1String("%IMG_PLUS%"), QLatin1String("qrc:html/plus.png")); dPage.replace(QLatin1String("%IMG_CLOSE%"), QLatin1String("qrc:html/close.png")); dPage.replace(QLatin1String("%IMG_EDIT%"), QLatin1String("qrc:html/edit.png")); diff --git a/src/lib/tabwidget/tabicon.cpp b/src/lib/tabwidget/tabicon.cpp index 6ef6f6ef6..28da9f495 100644 --- a/src/lib/tabwidget/tabicon.cpp +++ b/src/lib/tabwidget/tabicon.cpp @@ -40,8 +40,8 @@ TabIcon::TabIcon(QWidget* parent) s_data = new TabIcon::Data; s_data->animationPixmap = QIcon(QSL(":icons/other/loading.png")).pixmap(288, 16); s_data->framesCount = s_data->animationPixmap.width() / s_data->animationPixmap.height(); - s_data->audioPlayingPixmap = QIcon::fromTheme(QSL("audio-volume-high"), QIcon(QSL(":icons/other/audioplaying.png"))).pixmap(16); - s_data->audioMutedPixmap = QIcon::fromTheme(QSL("audio-volume-muted"), QIcon(QSL(":icons/other/audiomuted.png"))).pixmap(16); + s_data->audioPlayingPixmap = QIcon::fromTheme(QSL("audio-volume-high"), QIcon(QSL(":icons/other/audioplaying.svg"))).pixmap(16); + s_data->audioMutedPixmap = QIcon::fromTheme(QSL("audio-volume-muted"), QIcon(QSL(":icons/other/audiomuted.svg"))).pixmap(16); } m_updateTimer = new QTimer(this); diff --git a/src/lib/tools/iconprovider.cpp b/src/lib/tools/iconprovider.cpp index 58bea59fe..06d5dc568 100644 --- a/src/lib/tools/iconprovider.cpp +++ b/src/lib/tools/iconprovider.cpp @@ -166,7 +166,7 @@ QIcon IconProvider::emptyWebIcon() QImage IconProvider::emptyWebImage() { if (instance()->m_emptyWebImage.isNull()) { - instance()->m_emptyWebImage = QPixmap(":icons/other/empty-page.png").toImage(); + instance()->m_emptyWebImage = QPixmap(":icons/other/webpage.svg").toImage(); } return instance()->m_emptyWebImage;