Branch: master

f3ae8d69 2014-05-26 02:43:20 Michele Calgaro
Fixed tderandrtray popup menu Help functionality. This resolves bug 1949.
M kcontrol/randr/tderandrtray.cpp
M kcontrol/randr/tderandrtray.h
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 1e07cea..31615b3 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -54,7 +54,9 @@
 	, 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 @@
 		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 aee432b..5425706 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -58,6 +58,7 @@
 	void slotOutputChanged(int parameter);
 	void slotColorProfileChanged(int parameter);
 	void slotDisplayProfileChanged(int parameter);
+	void slotHelpContents();
 
 protected:
 	void mousePressEvent( TQMouseEvent *e );