summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-05-26 16:43:20 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-05-26 16:43:20 +0900
commitf3ae8d691d43e184c7795582ce5b214c8d5debc2 (patch)
tree9711b4d7344ef3be1d3fbff4118c90aa9c692ea9
parentc383da9dc680e5e79e75b84003eca7bfa08dd991 (diff)
downloadtdebase-f3ae8d691d43e184c7795582ce5b214c8d5debc2.tar.gz
tdebase-f3ae8d691d43e184c7795582ce5b214c8d5debc2.zip
Fixed tderandrtray popup menu Help functionality. This resolves bug 1949.
-rw-r--r--kcontrol/randr/tderandrtray.cpp10
-rw-r--r--kcontrol/randr/tderandrtray.h1
2 files changed, 10 insertions, 1 deletions
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 1e07cea1d..31615b3cd 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -54,7 +54,9 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
, m_popupUp(false)
, m_help(new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()))
{
- setPixmap(KSystemTray::loadSizedIcon("randr", width()));
+ TDEPopupMenu *help = m_help->menu();
+ help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
+ setPixmap(KSystemTray::loadSizedIcon("randr", width()));
setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
TQToolTip::add(this, i18n("Screen resize & rotate"));
@@ -882,3 +884,9 @@ void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) {
applyHotplugRules(locateLocal("config", "/", true));
}
}
+
+void KRandRSystemTray::slotHelpContents()
+{
+ kapp->invokeHelp(TQString::null, "tderandrtray");
+}
+
diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index aee432b4a..542570619 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -58,6 +58,7 @@ protected slots:
void slotOutputChanged(int parameter);
void slotColorProfileChanged(int parameter);
void slotDisplayProfileChanged(int parameter);
+ void slotHelpContents();
protected:
void mousePressEvent( TQMouseEvent *e );