Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

[AdBlockDialog] Options button is now QPushButton

Browse Source 
Qt renders better down icon indicating the button has menu
This commit is contained in:
nowrep 2014-01-22 15:31:42 +01:00
parent 31afc8aee6
commit 8eea60fe6a
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/themes/linux/main.css
View File

@ -279,7 +279,7 @@ RSSManager QTabBar::tab
/*AboutDialog*/ /*AboutDialog*/
AboutDialog #label AboutDialog #label
{ {
background:white; background: white;
} }
AboutDialog #textBrowser AboutDialog #textBrowser

4
src/lib/adblock/adblockdialog.cpp
View File

@ -42,7 +42,7 @@ AdBlockDialog::AdBlockDialog(QWidget* parent)
#endif #endif
adblockCheckBox->setChecked(m_manager->isEnabled()); adblockCheckBox->setChecked(m_manager->isEnabled());
QMenu* menu = new QMenu(buttonMenu); QMenu* menu = new QMenu(buttonOptions);
m_actionAddRule = menu->addAction(tr("Add Rule"), this, SLOT(addRule())); m_actionAddRule = menu->addAction(tr("Add Rule"), this, SLOT(addRule()));
m_actionRemoveRule = menu->addAction(tr("Remove Rule"), this, SLOT(removeRule())); m_actionRemoveRule = menu->addAction(tr("Remove Rule"), this, SLOT(removeRule()));
menu->addSeparator(); menu->addSeparator();
@ -52,7 +52,7 @@ AdBlockDialog::AdBlockDialog(QWidget* parent)
menu->addSeparator(); menu->addSeparator();
menu->addAction(tr("Learn about writing rules..."), this, SLOT(learnAboutRules())); menu->addAction(tr("Learn about writing rules..."), this, SLOT(learnAboutRules()));
buttonMenu->setMenu(menu); buttonOptions->setMenu(menu);
connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowMenu())); connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowMenu()));
connect(adblockCheckBox, SIGNAL(toggled(bool)), this, SLOT(enableAdBlock(bool))); connect(adblockCheckBox, SIGNAL(toggled(bool)), this, SLOT(enableAdBlock(bool)));

8
src/lib/adblock/adblockdialog.ui
View File

@ -63,7 +63,7 @@
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QToolButton" name="buttonMenu"> <widget class="QPushButton" name="buttonOptions">
<property name="text"> <property name="text">
<string>Options</string> <string>Options</string>
</property> </property>
@ -71,12 +71,6 @@
<iconset resource="../data/icons.qrc"> <iconset resource="../data/icons.qrc">
<normaloff>:/icons/other/adblock.png</normaloff>:/icons/other/adblock.png</iconset> <normaloff>:/icons/other/adblock.png</normaloff>:/icons/other/adblock.png</iconset>
</property> </property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>