diff --git a/src/lib/data/html/about.html b/src/lib/data/html/about.html index 43e8c222a..e2ca71beb 100644 --- a/src/lib/data/html/about.html +++ b/src/lib/data/html/about.html @@ -11,7 +11,7 @@ dl {margin-top: 0px;} dt {display: block;float: %LEFT_STR%;min-width: 24%;margin: 0 0 0.3em 1%} dd {color: black;margin: 0 0 0.3em 28%;} p {margin-%LEFT_STR%: 1%;} -.about-img {float: %RIGHT_STR%;margin-top:10px;width:230px;} +.about-img {float: %RIGHT_STR%;margin-top:10px;width:300px;} diff --git a/src/lib/data/html/config.html b/src/lib/data/html/config.html index 60f179e54..546895eea 100644 --- a/src/lib/data/html/config.html +++ b/src/lib/data/html/config.html @@ -11,7 +11,7 @@ dl {margin-top: 0px;} dt {display: block;float: %LEFT_STR%;min-width: 24%;margin: 0 0 0.3em 1%} dd {color: black;margin: 0 0 0.3em 28%;word-wrap:break-word;} p {margin-%LEFT_STR%: 1%;} -.about-img {float: %RIGHT_STR%;margin-top:10px;width:230px;} +.about-img {float: %RIGHT_STR%;margin-top:10px;width:300px;} table.tbl {width: 100%;margin: 15px 0;border-radius: 4px;padding: 0px;border: 2px solid #aaa;border-collapse: separate;} .tbl th{border-radius: 2px;border: 1px solid #aaa;padding: 1px 3px;background: #eee;font-style:italic;} .tbl th[colspan="2"] {text-align: center;background: #ddd;font-style:normal;} diff --git a/src/lib/data/html/start.html b/src/lib/data/html/start.html index 10322a342..89552d028 100644 --- a/src/lib/data/html/start.html +++ b/src/lib/data/html/start.html @@ -17,7 +17,7 @@ img {margin-bottom:15px;}
- + %PRIVATE-BROWSING%
diff --git a/src/lib/data/icons.qrc b/src/lib/data/icons.qrc index 3b45571ac..b9e1a4e1e 100644 --- a/src/lib/data/icons.qrc +++ b/src/lib/data/icons.qrc @@ -7,8 +7,7 @@ icons/menu/history_entry.svg icons/menu/tab-new.svg icons/menu/window-new.svg - icons/other/about.png - icons/other/about@2x.png + icons/other/about.svg icons/other/bigstar.svg icons/other/bigstar-selected.svg icons/locationbar/safe.png @@ -44,8 +43,7 @@ icons/other/webpage.svg icons/menu/privatebrowsing.png icons/menu/settings.svg - icons/other/startpage.png - icons/other/startpage@2x.png + icons/other/startpage.svg icons/other/audioplaying.svg icons/other/audiomuted.svg icons/preferences/appearance.svg diff --git a/src/lib/data/icons/other/about.png b/src/lib/data/icons/other/about.png deleted file mode 100644 index 71b719648..000000000 Binary files a/src/lib/data/icons/other/about.png and /dev/null differ diff --git a/src/lib/data/icons/other/about.svg b/src/lib/data/icons/other/about.svg new file mode 100644 index 000000000..baae74a10 --- /dev/null +++ b/src/lib/data/icons/other/about.svg @@ -0,0 +1,68 @@ + + + + Icon-256@2x + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lib/data/icons/other/about@2x.png b/src/lib/data/icons/other/about@2x.png deleted file mode 100644 index df0ed52e8..000000000 Binary files a/src/lib/data/icons/other/about@2x.png and /dev/null differ diff --git a/src/lib/data/icons/other/startpage.png b/src/lib/data/icons/other/startpage.png deleted file mode 100644 index 6b6af3a85..000000000 Binary files a/src/lib/data/icons/other/startpage.png and /dev/null differ diff --git a/src/lib/data/icons/other/startpage.svg b/src/lib/data/icons/other/startpage.svg new file mode 100644 index 000000000..c5f8a3fd8 --- /dev/null +++ b/src/lib/data/icons/other/startpage.svg @@ -0,0 +1,70 @@ + + + + Icon-256 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lib/data/icons/other/startpage@2x.png b/src/lib/data/icons/other/startpage@2x.png deleted file mode 100644 index 0d32b010e..000000000 Binary files a/src/lib/data/icons/other/startpage@2x.png and /dev/null differ diff --git a/src/lib/network/schemehandlers/falkonschemehandler.cpp b/src/lib/network/schemehandlers/falkonschemehandler.cpp index f463efea6..8a33ac947 100644 --- a/src/lib/network/schemehandlers/falkonschemehandler.cpp +++ b/src/lib/network/schemehandlers/falkonschemehandler.cpp @@ -149,7 +149,7 @@ QString FalkonSchemeReply::startPage() } sPage.append(QzTools::readAllFileContents(":html/start.html")); - sPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QzTools::dpiAwarePixmap(QSL(":icons/other/startpage.png"))).toString()); + sPage.replace(QLatin1String("%ABOUT-IMG%"), QSL("qrc:icons/other/startpage.svg")); sPage.replace(QLatin1String("%TITLE%"), tr("Start Page")); sPage.replace(QLatin1String("%BUTTON-LABEL%"), tr("Search on Web")); @@ -168,7 +168,7 @@ QString FalkonSchemeReply::aboutPage() if (aPage.isEmpty()) { aPage.append(QzTools::readAllFileContents(":html/about.html")); - aPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QzTools::dpiAwarePixmap(QSL(":icons/other/about.png"))).toString()); + aPage.replace(QLatin1String("%ABOUT-IMG%"), QSL("qrc:icons/other/about.svg")); aPage.replace(QLatin1String("%COPYRIGHT-INCLUDE%"), QzTools::readAllFileContents(":html/copyright").toHtmlEscaped()); aPage.replace(QLatin1String("%TITLE%"), tr("About Falkon")); @@ -279,7 +279,7 @@ QString FalkonSchemeReply::configPage() if (cPage.isEmpty()) { cPage.append(QzTools::readAllFileContents(":html/config.html")); - cPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QzTools::dpiAwarePixmap(QSL(":icons/other/about.png"))).toString()); + cPage.replace(QLatin1String("%ABOUT-IMG%"), QSL("qrc:icons/other/about.svg")); cPage.replace(QLatin1String("%TITLE%"), tr("Configuration Information")); cPage.replace(QLatin1String("%CONFIG%"), tr("Configuration Information")); diff --git a/src/lib/other/aboutdialog.cpp b/src/lib/other/aboutdialog.cpp index 67951082d..9816893fd 100644 --- a/src/lib/other/aboutdialog.cpp +++ b/src/lib/other/aboutdialog.cpp @@ -32,7 +32,7 @@ AboutDialog::AboutDialog(QWidget* parent) setAttribute(Qt::WA_DeleteOnClose); ui->setupUi(this); - ui->label->setPixmap(QIcon(QSL(":icons/other/about.png")).pixmap(300, 130)); + ui->label->setPixmap(QIcon(QSL(":icons/other/about.svg")).pixmap(QSize(256, 100) * 1.1)); showAbout(); } diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp index fade84e55..362448ba4 100644 --- a/src/plugins/TestPlugin/testplugin.cpp +++ b/src/plugins/TestPlugin/testplugin.cpp @@ -114,7 +114,7 @@ void TestPlugin::showSettings(QWidget* parent) QPushButton* b = new QPushButton("Example Plugin v0.0.1"); QPushButton* closeButton = new QPushButton(tr("Close")); QLabel* label = new QLabel(); - label->setPixmap(QPixmap(":icons/other/about.png")); + label->setPixmap(QPixmap(":icons/other/about.svg")); QVBoxLayout* l = new QVBoxLayout(m_settings.data()); l->addWidget(label); diff --git a/src/plugins/TestPlugin/testplugin_sidebar.cpp b/src/plugins/TestPlugin/testplugin_sidebar.cpp index 738dbe9f4..74d04219e 100644 --- a/src/plugins/TestPlugin/testplugin_sidebar.cpp +++ b/src/plugins/TestPlugin/testplugin_sidebar.cpp @@ -50,7 +50,7 @@ QWidget* TestPlugin_Sidebar::createSideBarWidget(BrowserWindow* mainWindow) QWidget* w = new QWidget; QPushButton* b = new QPushButton("Example Plugin v0.0.1"); QLabel* label = new QLabel(); - label->setPixmap(QPixmap(":icons/other/about.png")); + label->setPixmap(QPixmap(":icons/other/about.svg")); QVBoxLayout* l = new QVBoxLayout(w); l->addWidget(label);