diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index 6bd868d65..93ec1e980 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -97,6 +97,7 @@ MainApplication::MainApplication(int &argc, char** argv) , m_registerQAppAssociation(0) #endif { + setAttribute(Qt::AA_UseHighDpiPixmaps); setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); setApplicationName(QLatin1String("QupZilla")); @@ -111,8 +112,8 @@ MainApplication::MainApplication(int &argc, char** argv) // Set fallback icon theme (eg. on Windows/Mac) if (QIcon::fromTheme(QSL("view-refresh")).isNull()) { - QIcon::setThemeSearchPaths(QStringList() << QL1S(":/oxygen-fallback")); - QIcon::setThemeName(QSL("oxygen-fallback")); + QIcon::setThemeSearchPaths(QStringList() << QL1S(":/breeze-fallback")); + QIcon::setThemeName(QSL("breeze-fallback")); } // QSQLITE database plugin is required diff --git a/src/lib/app/qzcommon.cpp b/src/lib/app/qzcommon.cpp index 61a2173ad..0166389d5 100644 --- a/src/lib/app/qzcommon.cpp +++ b/src/lib/app/qzcommon.cpp @@ -1,6 +1,6 @@ /* ============================================================ -* QupZilla - WebKit based browser -* Copyright (C) 2014-2016 David Rosca +* QupZilla - Qt web browser +* Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ const int bookmarksVersion = 1; QUPZILLA_EXPORT const char* APPNAME = "QupZilla"; QUPZILLA_EXPORT const char* VERSION = QUPZILLA_VERSION; QUPZILLA_EXPORT const char* AUTHOR = "David Rosca"; -QUPZILLA_EXPORT const char* COPYRIGHT = "2010-2016"; +QUPZILLA_EXPORT const char* COPYRIGHT = "2010-2017"; QUPZILLA_EXPORT const char* WWWADDRESS = "https://www.qupzilla.com"; QUPZILLA_EXPORT const char* WIKIADDRESS = "https://github.com/QupZilla/qupzilla/wiki"; } diff --git a/src/lib/bookmarks/bookmarksmenu.cpp b/src/lib/bookmarks/bookmarksmenu.cpp index 355ff8a3b..78202a78b 100644 --- a/src/lib/bookmarks/bookmarksmenu.cpp +++ b/src/lib/bookmarks/bookmarksmenu.cpp @@ -164,8 +164,8 @@ void BookmarksMenu::init() { setTitle(tr("&Bookmarks")); - addAction(QIcon::fromTheme("bookmark-new"), tr("Bookmark &This Page"), this, SLOT(bookmarkPage()))->setShortcut(QKeySequence("Ctrl+D")); - addAction(QIcon::fromTheme("bookmark-new-list"), tr("Bookmark &All Tabs"), this, SLOT(bookmarkAllTabs())); + addAction(tr("Bookmark &This Page"), this, SLOT(bookmarkPage()))->setShortcut(QKeySequence("Ctrl+D")); + addAction(tr("Bookmark &All Tabs"), this, SLOT(bookmarkAllTabs())); addAction(QIcon::fromTheme("bookmarks-organize"), tr("Organize &Bookmarks"), this, SLOT(showBookmarksManager()))->setShortcut(QKeySequence("Ctrl+Shift+O")); addSeparator(); diff --git a/src/lib/data/breeze-fallback.qrc b/src/lib/data/breeze-fallback.qrc new file mode 100644 index 000000000..6af56897f --- /dev/null +++ b/src/lib/data/breeze-fallback.qrc @@ -0,0 +1,35 @@ + + + breeze-fallback/index.theme + breeze-fallback/16x16/bookmark-new.svg + breeze-fallback/16x16/bookmarks-organize.svg + breeze-fallback/16x16/configure.svg + breeze-fallback/16x16/edit-find.svg + breeze-fallback/16x16/go-down.svg + breeze-fallback/16x16/go-home.svg + breeze-fallback/16x16/go-next.svg + breeze-fallback/16x16/go-previous.svg + breeze-fallback/16x16/go-up.svg + breeze-fallback/16x16/list-add.svg + breeze-fallback/16x16/list-remove.svg + breeze-fallback/16x16/process-stop.svg + breeze-fallback/16x16/user-trash-full.svg + breeze-fallback/16x16/view-refresh.svg + breeze-fallback/16x16/view-restore.svg + breeze-fallback/22x22/configure.svg + breeze-fallback/22x22/edit-find.svg + breeze-fallback/22x22/go-down.svg + breeze-fallback/22x22/go-home.svg + breeze-fallback/22x22/go-next.svg + breeze-fallback/22x22/go-previous.svg + breeze-fallback/22x22/go-up.svg + breeze-fallback/22x22/list-add.svg + breeze-fallback/22x22/list-remove.svg + breeze-fallback/22x22/process-stop.svg + breeze-fallback/22x22/user-trash-full.svg + breeze-fallback/22x22/view-refresh.svg + breeze-fallback/22x22/view-restore.svg + breeze-fallback/32x32/preferences-system-network.svg + breeze-fallback/16x16/window-close.svg + + diff --git a/src/lib/data/breeze-fallback/16x16/bookmark-new.svg b/src/lib/data/breeze-fallback/16x16/bookmark-new.svg new file mode 100644 index 000000000..395248ed3 --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/bookmark-new.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/bookmarks-organize.svg b/src/lib/data/breeze-fallback/16x16/bookmarks-organize.svg new file mode 100644 index 000000000..395248ed3 --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/bookmarks-organize.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/configure.svg b/src/lib/data/breeze-fallback/16x16/configure.svg new file mode 100644 index 000000000..d81a0f999 --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/configure.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/edit-find.svg b/src/lib/data/breeze-fallback/16x16/edit-find.svg new file mode 100644 index 000000000..736d8359a --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/edit-find.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/go-down.svg b/src/lib/data/breeze-fallback/16x16/go-down.svg new file mode 100644 index 000000000..0b4a0fba4 --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/go-down.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/go-home.svg b/src/lib/data/breeze-fallback/16x16/go-home.svg new file mode 100644 index 000000000..7079cbb8d --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/go-home.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/go-next.svg b/src/lib/data/breeze-fallback/16x16/go-next.svg new file mode 100644 index 000000000..f9568d173 --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/go-next.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/go-previous.svg b/src/lib/data/breeze-fallback/16x16/go-previous.svg new file mode 100644 index 000000000..9cc1823aa --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/go-previous.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/go-up.svg b/src/lib/data/breeze-fallback/16x16/go-up.svg new file mode 100644 index 000000000..494096bce --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/go-up.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/list-add.svg b/src/lib/data/breeze-fallback/16x16/list-add.svg new file mode 100644 index 000000000..1d51e2447 --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/list-add.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/list-remove.svg b/src/lib/data/breeze-fallback/16x16/list-remove.svg new file mode 100644 index 000000000..405bd4ab3 --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/list-remove.svg @@ -0,0 +1,16 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/process-stop.svg b/src/lib/data/breeze-fallback/16x16/process-stop.svg new file mode 100644 index 000000000..24ed51823 --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/process-stop.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/user-trash-full.svg b/src/lib/data/breeze-fallback/16x16/user-trash-full.svg new file mode 100644 index 000000000..54fdbcdc7 --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/user-trash-full.svg @@ -0,0 +1,17 @@ + + + + + + /> + diff --git a/src/lib/data/breeze-fallback/16x16/view-refresh.svg b/src/lib/data/breeze-fallback/16x16/view-refresh.svg new file mode 100644 index 000000000..b0ab47ad0 --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/view-refresh.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/view-restore.svg b/src/lib/data/breeze-fallback/16x16/view-restore.svg new file mode 100644 index 000000000..27b9f154c --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/view-restore.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/16x16/window-close.svg b/src/lib/data/breeze-fallback/16x16/window-close.svg new file mode 100644 index 000000000..1fc40d94c --- /dev/null +++ b/src/lib/data/breeze-fallback/16x16/window-close.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/configure.svg b/src/lib/data/breeze-fallback/22x22/configure.svg new file mode 100644 index 000000000..ddab8a17e --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/configure.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/edit-find.svg b/src/lib/data/breeze-fallback/22x22/edit-find.svg new file mode 100644 index 000000000..49a697e9c --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/edit-find.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/go-down.svg b/src/lib/data/breeze-fallback/22x22/go-down.svg new file mode 100644 index 000000000..941f9ce35 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/go-down.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/go-home.svg b/src/lib/data/breeze-fallback/22x22/go-home.svg new file mode 100644 index 000000000..096d54938 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/go-home.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/go-next.svg b/src/lib/data/breeze-fallback/22x22/go-next.svg new file mode 100644 index 000000000..c7c71a2e1 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/go-next.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/go-previous.svg b/src/lib/data/breeze-fallback/22x22/go-previous.svg new file mode 100644 index 000000000..06c8f8a95 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/go-previous.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/go-up.svg b/src/lib/data/breeze-fallback/22x22/go-up.svg new file mode 100644 index 000000000..43494b524 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/go-up.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/list-add.svg b/src/lib/data/breeze-fallback/22x22/list-add.svg new file mode 100644 index 000000000..2935b6e85 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/list-add.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/list-remove.svg b/src/lib/data/breeze-fallback/22x22/list-remove.svg new file mode 100644 index 000000000..937ea04a1 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/list-remove.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/lib/data/breeze-fallback/22x22/process-stop.svg b/src/lib/data/breeze-fallback/22x22/process-stop.svg new file mode 100644 index 000000000..172140398 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/process-stop.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/user-trash-full.svg b/src/lib/data/breeze-fallback/22x22/user-trash-full.svg new file mode 100644 index 000000000..4929ba370 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/user-trash-full.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/view-refresh.svg b/src/lib/data/breeze-fallback/22x22/view-refresh.svg new file mode 100644 index 000000000..44b9424e2 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/view-refresh.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/22x22/view-restore.svg b/src/lib/data/breeze-fallback/22x22/view-restore.svg new file mode 100644 index 000000000..27b11e427 --- /dev/null +++ b/src/lib/data/breeze-fallback/22x22/view-restore.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/lib/data/breeze-fallback/32x32/preferences-system-network.svg b/src/lib/data/breeze-fallback/32x32/preferences-system-network.svg new file mode 100644 index 000000000..5ee37b655 --- /dev/null +++ b/src/lib/data/breeze-fallback/32x32/preferences-system-network.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lib/data/oxygen-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme similarity index 79% rename from src/lib/data/oxygen-fallback/index.theme rename to src/lib/data/breeze-fallback/index.theme index a21ab457e..8a68691b0 100644 --- a/src/lib/data/oxygen-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -1,6 +1,6 @@ [Icon Theme] -Name=Oxygen -Comment=Oxygen Team +Name=Breeze +Comment=Breeze Team DisplayDepth=32 Inherits=default Directories=16x16,22x22,32x32 diff --git a/src/lib/data/html/copyright b/src/lib/data/html/copyright index 4452c387b..1dfd236ba 100644 --- a/src/lib/data/html/copyright +++ b/src/lib/data/html/copyright @@ -1,6 +1,6 @@ /* ============================================================ -* QupZilla - QtWebEngine based browser -* Copyright (C) 2010-2015 David Rosca +* QupZilla - Qt web browser +* Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -139,9 +139,8 @@ QtWin class from http://labs.qt.nokia.com/2009/09/15/using-blur-behind-on-windows/ ----------------------------------------------------------------------------- - In application are used also some icons from Oxygen icon set, which are - licensed under the GNU/LGPL license. - More info at http://www.oxygen-icons.org/ + In application are used also some icons from Breeze icon set. + More info at https://cgit.kde.org/breeze-icons.git ----------------------------------------------------------------------------- Speed Dial uses some icons from Faenza icon set, which are licensed under the GNU/GPL license. diff --git a/src/lib/data/oxygen-fallback.qrc b/src/lib/data/oxygen-fallback.qrc deleted file mode 100644 index 97217908d..000000000 --- a/src/lib/data/oxygen-fallback.qrc +++ /dev/null @@ -1,47 +0,0 @@ - - - oxygen-fallback/index.theme - oxygen-fallback/16x16/go-down.png - oxygen-fallback/16x16/go-home.png - oxygen-fallback/16x16/go-jump-locationbar.png - oxygen-fallback/16x16/go-next.png - oxygen-fallback/16x16/go-previous.png - oxygen-fallback/16x16/go-up.png - oxygen-fallback/16x16/list-add.png - oxygen-fallback/16x16/list-remove.png - oxygen-fallback/16x16/process-stop.png - oxygen-fallback/16x16/tab-new.png - oxygen-fallback/16x16/user-trash-full.png - oxygen-fallback/16x16/view-refresh.png - oxygen-fallback/16x16/view-restore.png - oxygen-fallback/16x16/bookmark-new.png - oxygen-fallback/16x16/bookmarks-organize.png - oxygen-fallback/16x16/configure.png - oxygen-fallback/16x16/dialog-close.png - oxygen-fallback/16x16/window-new.png - oxygen-fallback/16x16/bookmark-new-list.png - oxygen-fallback/16x16/edit-find.png - oxygen-fallback/22x22/go-down.png - oxygen-fallback/22x22/go-home.png - oxygen-fallback/22x22/go-jump-locationbar.png - oxygen-fallback/22x22/go-next.png - oxygen-fallback/22x22/go-previous.png - oxygen-fallback/22x22/go-up.png - oxygen-fallback/22x22/list-add.png - oxygen-fallback/22x22/list-remove.png - oxygen-fallback/22x22/process-stop.png - oxygen-fallback/22x22/tab-new.png - oxygen-fallback/22x22/user-trash-full.png - oxygen-fallback/22x22/view-refresh.png - oxygen-fallback/22x22/view-restore.png - oxygen-fallback/22x22/bookmark-new.png - oxygen-fallback/22x22/bookmarks-organize.png - oxygen-fallback/22x22/configure.png - oxygen-fallback/22x22/dialog-close.png - oxygen-fallback/22x22/window-new.png - oxygen-fallback/22x22/bookmark-new-list.png - oxygen-fallback/22x22/edit-find.png - oxygen-fallback/32x32/preferences-desktop.png - oxygen-fallback/32x32/preferences-system-network.png - - diff --git a/src/lib/data/oxygen-fallback/16x16/bookmark-new-list.png b/src/lib/data/oxygen-fallback/16x16/bookmark-new-list.png deleted file mode 100644 index 233c8ba41..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/bookmark-new-list.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/bookmark-new.png b/src/lib/data/oxygen-fallback/16x16/bookmark-new.png deleted file mode 100644 index 858c71a45..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/bookmark-new.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/bookmarks-organize.png b/src/lib/data/oxygen-fallback/16x16/bookmarks-organize.png deleted file mode 100644 index de36f1022..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/bookmarks-organize.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/configure.png b/src/lib/data/oxygen-fallback/16x16/configure.png deleted file mode 100644 index 3fe6bf4d2..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/configure.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/dialog-close.png b/src/lib/data/oxygen-fallback/16x16/dialog-close.png deleted file mode 100644 index 8f5c876f2..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/dialog-close.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/edit-find.png b/src/lib/data/oxygen-fallback/16x16/edit-find.png deleted file mode 100644 index d9d1c7cdf..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/edit-find.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/go-down.png b/src/lib/data/oxygen-fallback/16x16/go-down.png deleted file mode 100644 index 5891219e4..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/go-down.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/go-home.png b/src/lib/data/oxygen-fallback/16x16/go-home.png deleted file mode 100644 index 9ee717c8b..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/go-home.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/go-jump-locationbar.png b/src/lib/data/oxygen-fallback/16x16/go-jump-locationbar.png deleted file mode 100644 index bf92c90c5..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/go-jump-locationbar.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/go-next.png b/src/lib/data/oxygen-fallback/16x16/go-next.png deleted file mode 100644 index a04c99e25..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/go-next.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/go-previous.png b/src/lib/data/oxygen-fallback/16x16/go-previous.png deleted file mode 100644 index 940797b8a..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/go-previous.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/go-up.png b/src/lib/data/oxygen-fallback/16x16/go-up.png deleted file mode 100644 index b3d9cef97..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/go-up.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/list-add.png b/src/lib/data/oxygen-fallback/16x16/list-add.png deleted file mode 100644 index 1e03be9bc..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/list-add.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/list-remove.png b/src/lib/data/oxygen-fallback/16x16/list-remove.png deleted file mode 100644 index 34844cd50..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/list-remove.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/process-stop.png b/src/lib/data/oxygen-fallback/16x16/process-stop.png deleted file mode 100644 index 24e8b8e94..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/process-stop.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/tab-new.png b/src/lib/data/oxygen-fallback/16x16/tab-new.png deleted file mode 100644 index dafcaf92f..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/tab-new.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/user-trash-full.png b/src/lib/data/oxygen-fallback/16x16/user-trash-full.png deleted file mode 100644 index dd9d12db7..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/user-trash-full.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/view-refresh.png b/src/lib/data/oxygen-fallback/16x16/view-refresh.png deleted file mode 100644 index 86b6f82c1..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/view-refresh.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/view-restore.png b/src/lib/data/oxygen-fallback/16x16/view-restore.png deleted file mode 100644 index 7726c3546..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/view-restore.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/16x16/window-new.png b/src/lib/data/oxygen-fallback/16x16/window-new.png deleted file mode 100644 index 74390b01f..000000000 Binary files a/src/lib/data/oxygen-fallback/16x16/window-new.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/bookmark-new-list.png b/src/lib/data/oxygen-fallback/22x22/bookmark-new-list.png deleted file mode 100644 index 6fb444159..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/bookmark-new-list.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/bookmark-new.png b/src/lib/data/oxygen-fallback/22x22/bookmark-new.png deleted file mode 100644 index f28571828..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/bookmark-new.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/bookmarks-organize.png b/src/lib/data/oxygen-fallback/22x22/bookmarks-organize.png deleted file mode 100644 index 5348ec6a4..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/bookmarks-organize.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/configure.png b/src/lib/data/oxygen-fallback/22x22/configure.png deleted file mode 100644 index e64a673be..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/configure.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/dialog-close.png b/src/lib/data/oxygen-fallback/22x22/dialog-close.png deleted file mode 100644 index 5492295e7..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/dialog-close.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/edit-find.png b/src/lib/data/oxygen-fallback/22x22/edit-find.png deleted file mode 100644 index 1b7a25280..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/edit-find.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/go-down.png b/src/lib/data/oxygen-fallback/22x22/go-down.png deleted file mode 100644 index 98f07711b..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/go-down.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/go-home.png b/src/lib/data/oxygen-fallback/22x22/go-home.png deleted file mode 100644 index aab6a883e..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/go-home.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/go-jump-locationbar.png b/src/lib/data/oxygen-fallback/22x22/go-jump-locationbar.png deleted file mode 100644 index 65d058773..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/go-jump-locationbar.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/go-next.png b/src/lib/data/oxygen-fallback/22x22/go-next.png deleted file mode 100644 index aa7cbb91e..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/go-next.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/go-previous.png b/src/lib/data/oxygen-fallback/22x22/go-previous.png deleted file mode 100644 index 8230340bb..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/go-previous.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/go-up.png b/src/lib/data/oxygen-fallback/22x22/go-up.png deleted file mode 100644 index 4459024ea..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/go-up.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/list-add.png b/src/lib/data/oxygen-fallback/22x22/list-add.png deleted file mode 100644 index e029787c7..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/list-add.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/list-remove.png b/src/lib/data/oxygen-fallback/22x22/list-remove.png deleted file mode 100644 index 2bb1a5983..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/list-remove.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/process-stop.png b/src/lib/data/oxygen-fallback/22x22/process-stop.png deleted file mode 100644 index 98d569422..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/process-stop.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/tab-new.png b/src/lib/data/oxygen-fallback/22x22/tab-new.png deleted file mode 100644 index 66bf42723..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/tab-new.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/user-trash-full.png b/src/lib/data/oxygen-fallback/22x22/user-trash-full.png deleted file mode 100644 index ab2d20427..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/user-trash-full.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/view-refresh.png b/src/lib/data/oxygen-fallback/22x22/view-refresh.png deleted file mode 100644 index 45b5535ce..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/view-refresh.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/view-restore.png b/src/lib/data/oxygen-fallback/22x22/view-restore.png deleted file mode 100644 index d5cfa95d3..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/view-restore.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/22x22/window-new.png b/src/lib/data/oxygen-fallback/22x22/window-new.png deleted file mode 100644 index e65ffd8a5..000000000 Binary files a/src/lib/data/oxygen-fallback/22x22/window-new.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/32x32/preferences-desktop.png b/src/lib/data/oxygen-fallback/32x32/preferences-desktop.png deleted file mode 100644 index c60cfd3cc..000000000 Binary files a/src/lib/data/oxygen-fallback/32x32/preferences-desktop.png and /dev/null differ diff --git a/src/lib/data/oxygen-fallback/32x32/preferences-system-network.png b/src/lib/data/oxygen-fallback/32x32/preferences-system-network.png deleted file mode 100644 index 0e16fd703..000000000 Binary files a/src/lib/data/oxygen-fallback/32x32/preferences-system-network.png and /dev/null differ diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 922199993..f02928276 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -454,7 +454,7 @@ RESOURCES += \ data/data.qrc \ data/html.qrc \ data/icons.qrc \ - data/oxygen-fallback.qrc + data/breeze-fallback.qrc !mac:unix { target.path = $$library_folder diff --git a/src/main/main.cpp b/src/main/main.cpp index 84eb2ad22..305cc583e 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -152,8 +152,6 @@ int main(int argc, char* argv[]) argv = args; } - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - MainApplication app(argc, argv); if (app.isClosing())