Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

Added multiple sizes for window icon + fixed bookmark all tabs always

Browse Source 
disabled issue
This commit is contained in:
nowrep 2011-09-17 11:39:25 +02:00
parent 334348b8db
commit 8f296c0f51
19 changed files with 43 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/mainapplication.cpp
View File

@ -69,7 +69,7 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
TRANSLATIONSDIR = DATADIR + "locale/";
THEMESDIR = DATADIR + "themes/";
setWindowIcon(QIcon(":/icons/qupzilla.png"));
setWindowIcon(QupZilla::qupzillaIcon());
bool noAddons = false;
QUrl startUrl("");
QString message;

16
src/app/qupzilla.cpp
View File

@ -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()) {

1
src/app/qupzilla.h
View File

@ -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();

1
src/bookmarks/bookmarksmanager.cpp
View File

@ -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();

8
src/bookmarks/bookmarksmanager.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Bookmarks</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="6">
<widget class="TreeWidget" name="bookmarksTree">
@ -98,8 +94,6 @@
<header>clickablelabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

18
src/cookies/cookiemanager.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Cookies</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
@ -232,6 +228,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>TreeWidget</class>
<extends>QTreeWidget</extends>
<header>treewidget.h</header>
</customwidget>
<customwidget>
<class>LineEdit</class>
<extends>QLineEdit</extends>
@ -242,14 +243,7 @@
<extends>QLabel</extends>
<header>squeezelabelv2.h</header>
</customwidget>
<customwidget>
<class>TreeWidget</class>
<extends>QTreeWidget</extends>
<header>treewidget.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

7
src/data/icons.qrc
View File

@ -57,6 +57,11 @@
<file>icons/menu/dot.png</file>
<file>icons/preferences/appereance.png</file>
<file>icons/preferences/style-default.png</file>
<file>icons/other/background.png</file>
<file>icons/exeicons/qupzilla16.png</file>
<file>icons/exeicons/qupzilla32.png</file>
<file>icons/exeicons/qupzilla48.png</file>
<file>icons/exeicons/qupzilla64.png</file>
<file>icons/exeicons/qupzilla128.png</file>
<file>icons/exeicons/qupzilla256.png</file>
</qresource>
</RCC>

8
src/downloads/downloadmanager.ui
View File

@ -19,10 +19,6 @@
<property name="windowTitle">
<string>Download Manager</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
@ -127,8 +123,6 @@
</item>
</layout>
</widget>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

8
src/downloads/downloadoptionsdialog.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Opening</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="6">
<widget class="QLabel" name="label">
@ -178,9 +174,7 @@
</item>
</layout>
</widget>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>

8
src/history/historymanager.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>History</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="4">
<widget class="TreeWidget" name="historyTree">
@ -98,8 +94,6 @@
<header>clickablelabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

4
src/other/aboutdialog.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>About QupZilla</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>

8
src/other/browsinglibrary.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Library</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/qupzilla.png</normaloff>:/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
@ -97,8 +93,6 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

4
src/other/clearprivatedata.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Clear Recent History</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="3">
<widget class="QLabel" name="label_2">

16
src/other/closedialog.ui
View File

@ -2,13 +2,17 @@
<ui version="4.0">
<class>CloseDialog</class>
<widget class="QDialog" name="CloseDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>208</width>
<height>98</height>
</rect>
</property>
<property name="windowTitle">
<string>There are still open tabs</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QLabel" name="textLabel">
@ -46,9 +50,7 @@
</item>
</layout>
</widget>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>

8
src/preferences/autofillmanager.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string notr="true"/>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QTabWidget" name="tabWidget">
@ -139,8 +135,6 @@
</item>
</layout>
</widget>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

4
src/preferences/preferences.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Preferences</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0" rowspan="5">
<widget class="QListWidget" name="listWidget">

8
src/preferences/sslmanager.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>SSL Manager</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QListWidget" name="list"/>
@ -61,8 +57,6 @@
</item>
</layout>
</widget>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

8
src/rss/rssmanager.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>RSS Reader</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>6</number>
@ -119,8 +115,6 @@
<header>clickablelabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

4
src/webview/siteinfo.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Site Info</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="6" column="1">
<widget class="QDialogButtonBox" name="buttonBox">