From 8f296c0f514403cc21d5844b891bc72e98ccddc6 Mon Sep 17 00:00:00 2001 From: nowrep Date: Sat, 17 Sep 2011 11:39:25 +0200 Subject: [PATCH] Added multiple sizes for window icon + fixed bookmark all tabs always disabled issue --- src/app/mainapplication.cpp | 2 +- src/app/qupzilla.cpp | 16 ++++++++++++---- src/app/qupzilla.h | 1 + src/bookmarks/bookmarksmanager.cpp | 1 - src/bookmarks/bookmarksmanager.ui | 8 +------- src/cookies/cookiemanager.ui | 18 ++++++------------ src/data/icons.qrc | 7 ++++++- src/downloads/downloadmanager.ui | 8 +------- src/downloads/downloadoptionsdialog.ui | 8 +------- src/history/historymanager.ui | 8 +------- src/other/aboutdialog.ui | 4 ---- src/other/browsinglibrary.ui | 8 +------- src/other/clearprivatedata.ui | 4 ---- src/other/closedialog.ui | 16 +++++++++------- src/preferences/autofillmanager.ui | 8 +------- src/preferences/preferences.ui | 4 ---- src/preferences/sslmanager.ui | 8 +------- src/rss/rssmanager.ui | 8 +------- src/webview/siteinfo.ui | 4 ---- 19 files changed, 43 insertions(+), 98 deletions(-) diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp index d708d231a..38a0a7438 100644 --- a/src/app/mainapplication.cpp +++ b/src/app/mainapplication.cpp @@ -69,7 +69,7 @@ MainApplication::MainApplication(const QList &cm TRANSLATIONSDIR = DATADIR + "locale/"; THEMESDIR = DATADIR + "themes/"; - setWindowIcon(QIcon(":/icons/qupzilla.png")); + setWindowIcon(QupZilla::qupzillaIcon()); bool noAddons = false; QUrl startUrl(""); QString message; diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp index dde61da98..f56094f6d 100644 --- a/src/app/qupzilla.cpp +++ b/src/app/qupzilla.cpp @@ -64,6 +64,18 @@ const QString QupZilla::COPYRIGHT = "2010-2011"; const QString QupZilla::WWWADDRESS = "http://qupzilla.ic.cz"; const QString QupZilla::WEBKITVERSION = qWebKitVersion(); +QIcon QupZilla::qupzillaIcon() +{ + QIcon i; + i.addFile(":icons/exeicons/qupzilla16.png"); + i.addFile(":icons/exeicons/qupzilla32.png"); + i.addFile(":icons/exeicons/qupzilla48.png"); + i.addFile(":icons/exeicons/qupzilla64.png"); + i.addFile(":icons/exeicons/qupzilla128.png"); + i.addFile(":icons/exeicons/qupzilla256.png"); + return i; +} + QupZilla::QupZilla(bool tryRestore, QUrl startUrl) : QMainWindow(0) ,m_tryRestore(tryRestore) @@ -398,8 +410,6 @@ void QupZilla::loadSettings() m_actionPrivateBrowsing->setChecked( mApp->webSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled) ); m_privateBrowsing->setVisible( mApp->webSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled) ); - setWindowIcon(QIcon(":/icons/qupzilla.png")); - if (!makeTransparent) return; //Opacity @@ -475,8 +485,6 @@ void QupZilla::aboutToShowBookmarksMenu() m_menuBookmarks->addAction(tr("Bookmark &All Tabs"), this, SLOT(bookmarkAllTabs())); m_menuBookmarks->addAction(QIcon::fromTheme("user-bookmarks"), tr("Organize &Bookmarks"), this, SLOT(showBookmarksManager()))->setShortcut(QKeySequence("Ctrl+Shift+O")); m_menuBookmarks->addSeparator(); - if (m_tabWidget->count() == 1) - m_menuBookmarks->actions().at(1)->setEnabled(false); QSqlQuery query; query.exec("SELECT title, url, icon FROM bookmarks WHERE folder='bookmarksMenu'"); while(query.next()) { diff --git a/src/app/qupzilla.h b/src/app/qupzilla.h index 58a43d24c..f7a3561f3 100644 --- a/src/app/qupzilla.h +++ b/src/app/qupzilla.h @@ -83,6 +83,7 @@ public: static const QString COPYRIGHT; static const QString WWWADDRESS; static const QString WEBKITVERSION; + static QIcon qupzillaIcon(); explicit QupZilla(bool m_tryRestore=true, QUrl startUrl=QUrl()); ~QupZilla(); diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index d734746cc..6058e7761 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -384,7 +384,6 @@ void BookmarksManager::insertAllTabs() combo->addItem(style()->standardIcon(QStyle::SP_DirIcon), query.value(0).toString()); label->setText(tr("Choose folder for bookmarks:")); - dialog->setWindowIcon(QIcon(":/icons/qupzilla.png")); dialog->setWindowTitle(tr("Bookmark All Tabs")); QSize size = dialog->size(); diff --git a/src/bookmarks/bookmarksmanager.ui b/src/bookmarks/bookmarksmanager.ui index a176a2899..deb87078e 100644 --- a/src/bookmarks/bookmarksmanager.ui +++ b/src/bookmarks/bookmarksmanager.ui @@ -13,10 +13,6 @@ Bookmarks - - - :/icons/qupzilla.png:/icons/qupzilla.png - @@ -98,8 +94,6 @@
clickablelabel.h
- - - + diff --git a/src/cookies/cookiemanager.ui b/src/cookies/cookiemanager.ui index 009cb8c62..68560f0dd 100644 --- a/src/cookies/cookiemanager.ui +++ b/src/cookies/cookiemanager.ui @@ -13,10 +13,6 @@ Cookies - - - :/icons/qupzilla.png:/icons/qupzilla.png - @@ -232,6 +228,11 @@ + + TreeWidget + QTreeWidget +
treewidget.h
+ LineEdit QLineEdit @@ -242,14 +243,7 @@ QLabel
squeezelabelv2.h
 - - TreeWidget - QTreeWidget -
treewidget.h
- - - - + diff --git a/src/data/icons.qrc b/src/data/icons.qrc index 842c713f0..92275f806 100644 --- a/src/data/icons.qrc +++ b/src/data/icons.qrc @@ -57,6 +57,11 @@ icons/menu/dot.png icons/preferences/appereance.png icons/preferences/style-default.png - icons/other/background.png + icons/exeicons/qupzilla16.png + icons/exeicons/qupzilla32.png + icons/exeicons/qupzilla48.png + icons/exeicons/qupzilla64.png + icons/exeicons/qupzilla128.png + icons/exeicons/qupzilla256.png diff --git a/src/downloads/downloadmanager.ui b/src/downloads/downloadmanager.ui index cb183b3e1..0d1a1ae6a 100644 --- a/src/downloads/downloadmanager.ui +++ b/src/downloads/downloadmanager.ui @@ -19,10 +19,6 @@ Download Manager - - - :/icons/qupzilla.png:/icons/qupzilla.png - 0 @@ -127,8 +123,6 @@ - - - + diff --git a/src/downloads/downloadoptionsdialog.ui b/src/downloads/downloadoptionsdialog.ui index 30f59eaf5..6b8ca432e 100644 --- a/src/downloads/downloadoptionsdialog.ui +++ b/src/downloads/downloadoptionsdialog.ui @@ -13,10 +13,6 @@ Opening - - - :/icons/qupzilla.png:/icons/qupzilla.png - @@ -178,9 +174,7 @@ - - - + buttonBox diff --git a/src/history/historymanager.ui b/src/history/historymanager.ui index ccd875d66..6432747d9 100644 --- a/src/history/historymanager.ui +++ b/src/history/historymanager.ui @@ -13,10 +13,6 @@ History - - - :/icons/qupzilla.png:/icons/qupzilla.png - @@ -98,8 +94,6 @@
clickablelabel.h
- - - + diff --git a/src/other/aboutdialog.ui b/src/other/aboutdialog.ui index dd0ca23ac..28761cf90 100644 --- a/src/other/aboutdialog.ui +++ b/src/other/aboutdialog.ui @@ -13,10 +13,6 @@ About QupZilla - - - :/icons/qupzilla.png:/icons/qupzilla.png - 0 diff --git a/src/other/browsinglibrary.ui b/src/other/browsinglibrary.ui index 87c3e0d01..8747b6c28 100644 --- a/src/other/browsinglibrary.ui +++ b/src/other/browsinglibrary.ui @@ -13,10 +13,6 @@ Library - - - :/qupzilla.png:/qupzilla.png - 0 @@ -97,8 +93,6 @@ 1 - - - + diff --git a/src/other/clearprivatedata.ui b/src/other/clearprivatedata.ui index 418f93c56..2765ed6fd 100644 --- a/src/other/clearprivatedata.ui +++ b/src/other/clearprivatedata.ui @@ -13,10 +13,6 @@ Clear Recent History - - - :/icons/qupzilla.png:/icons/qupzilla.png - diff --git a/src/other/closedialog.ui b/src/other/closedialog.ui index 9a0d55795..56e251b02 100644 --- a/src/other/closedialog.ui +++ b/src/other/closedialog.ui @@ -2,13 +2,17 @@ CloseDialog + + + 0 + 0 + 208 + 98 + + There are still open tabs - - - :/icons/qupzilla.png:/icons/qupzilla.png - @@ -46,9 +50,7 @@ - - - + buttonBox diff --git a/src/preferences/autofillmanager.ui b/src/preferences/autofillmanager.ui index 252054b9f..46fb619cc 100644 --- a/src/preferences/autofillmanager.ui +++ b/src/preferences/autofillmanager.ui @@ -13,10 +13,6 @@ - - - :/icons/qupzilla.png:/icons/qupzilla.png - @@ -139,8 +135,6 @@ - - - + diff --git a/src/preferences/preferences.ui b/src/preferences/preferences.ui index 69982fb8f..692824e8d 100644 --- a/src/preferences/preferences.ui +++ b/src/preferences/preferences.ui @@ -13,10 +13,6 @@ Preferences - - - :/icons/qupzilla.png:/icons/qupzilla.png - diff --git a/src/preferences/sslmanager.ui b/src/preferences/sslmanager.ui index 30730fc53..16c878640 100644 --- a/src/preferences/sslmanager.ui +++ b/src/preferences/sslmanager.ui @@ -13,10 +13,6 @@ SSL Manager - - - :/icons/qupzilla.png:/icons/qupzilla.png - @@ -61,8 +57,6 @@ - - - + diff --git a/src/rss/rssmanager.ui b/src/rss/rssmanager.ui index 28cfbd99c..353e6332b 100644 --- a/src/rss/rssmanager.ui +++ b/src/rss/rssmanager.ui @@ -13,10 +13,6 @@ RSS Reader - - - :/icons/qupzilla.png:/icons/qupzilla.png - 6 @@ -119,8 +115,6 @@
clickablelabel.h
- - - + diff --git a/src/webview/siteinfo.ui b/src/webview/siteinfo.ui index 742884eb6..2779fb2b5 100644 --- a/src/webview/siteinfo.ui +++ b/src/webview/siteinfo.ui @@ -13,10 +13,6 @@ Site Info - - - :/icons/qupzilla.png:/icons/qupzilla.png -