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 8c03b192b..000000000 Binary files a/src/lib/data/icons/other/audiomuted.png and /dev/null differ 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 36a77314e..000000000 Binary files a/src/lib/data/icons/other/audioplaying.png and /dev/null differ 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 34046450e..000000000 Binary files a/src/lib/data/icons/other/empty-page.png and /dev/null differ diff --git a/src/lib/data/icons/other/feed.png b/src/lib/data/icons/other/feed.png deleted file mode 100644 index 1bc5fa047..000000000 Binary files a/src/lib/data/icons/other/feed.png and /dev/null differ diff --git a/src/lib/data/icons/other/webpage.svg b/src/lib/data/icons/other/webpage.svg new file mode 100644 index 000000000..c8a86e23a --- /dev/null +++ b/src/lib/data/icons/other/webpage.svg @@ -0,0 +1,10 @@ + + + + + + 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;