summaryrefslogtreecommitdiffstats
path: root/kcontrol/kicker/menutab_impl.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-06-04 20:37:39 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-06-04 20:37:39 +0900
commit8a8b8ce4a43df3cb0a8861207d425c8c12437342 (patch)
tree4f7d351e5ac1877a3f399c38bd652c6963008ba5 /kcontrol/kicker/menutab_impl.cpp
parente5f5e70d8780c4ed7a024a2ebed36b77734fdd0b (diff)
downloadtdebase-8a8b8ce4a43df3cb0a8861207d425c8c12437342.tar.gz
tdebase-8a8b8ce4a43df3cb0a8861207d425c8c12437342.zip
Moved position and improved appearance of "Change TDE menu icon" button
in Configure Panel -> Menus. This resolves bug 1706.
Diffstat (limited to 'kcontrol/kicker/menutab_impl.cpp')
-rw-r--r--kcontrol/kicker/menutab_impl.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 571365a55..6be59c475 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -85,13 +85,12 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged()));
TDEIconLoader * ldr = TDEGlobal::iconLoader();
- TQPixmap kmenu_icon;
m_kmenu_icon = KickerSettings::customKMenuIcon();
if (m_kmenu_icon.isNull() == true) {
m_kmenu_icon = TQString("kmenu");
}
- kmenu_icon = ldr->loadIcon(m_kmenu_icon, TDEIcon::Small, TDEIcon::SizeSmall);
- btnCustomKMenuIcon->setPixmap(kmenu_icon);
+ TQIconSet kmenu_icon = ldr->loadIconSet(m_kmenu_icon, TDEIcon::Small, TDEIcon::SizeSmall);
+ btnCustomKMenuIcon->setIconSet(kmenu_icon);
TDEConfig *config;
config = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false);
@@ -323,10 +322,9 @@ void MenuTab::launchIconEditor()
return;
m_kmenu_icon = newIcon;
- TDEIconLoader * ldr = TDEGlobal::iconLoader();
- TQPixmap kmenu_icon;
- kmenu_icon = ldr->loadIcon(m_kmenu_icon, TDEIcon::Small, TDEIcon::SizeSmall);
- btnCustomKMenuIcon->setPixmap(kmenu_icon);
+ TDEIconLoader * ldr = TDEGlobal::iconLoader();
+ TQIconSet kmenu_icon = ldr->loadIconSet(m_kmenu_icon, TDEIcon::Small, TDEIcon::SizeSmall);
+ btnCustomKMenuIcon->setIconSet(kmenu_icon);
m_kmenu_button_changed = true;
emit changed();