Branch: master

5002d07d 2014-08-04 08:14:44 Michele Calgaro
Added Help menu to systray icon popup menu. This resolves bug 1952.
M tdenetworkmanager/src/tdenetman-tray.cpp
diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
index f139454..de0e5de 100644
--- a/tdenetworkmanager/src/tdenetman-tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
@@ -148,6 +148,7 @@
 		TQSignalMapper signalMapper;
 		TQMap<int, TQString> act_conn_map;
 		int current_idx;
+		KHelpMenu *helpMenu;
 };
 
 Tray* TrayPrivate::tray = NULL;
@@ -358,7 +359,8 @@
 	edit->plug(menu);
 
 	// quit
-	menu->insertSeparator ();
+	menu->insertSeparator();
+	menu->insertItem(SmallIcon("help"), i18n("&Help"), d->helpMenu->menu());
 	TDEAction* quitAction = actionCollection ()->action (KStdAction::name (KStdAction::Quit));
 	if (quitAction) {
 		quitAction->plug (menu);
@@ -1036,7 +1038,8 @@
 	updateGraphicsCache();
 
 	d = new TrayPrivate(TQT_TQOBJECT(this));
-
+  d->helpMenu = new KHelpMenu(0, TDEGlobal::instance()->aboutData(), false);
+  
 	connect(&d->signalMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotDeactivateConnection(int)));
 
 	setPixmap (m_pixmapCache["tdenetworkmanager"]);