diff options
| author | Michele Calgaro <[email protected]> | 2014-08-04 22:14:44 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2014-08-04 22:14:44 +0900 |
| commit | 5002d07dcf051cc5f6bc7c178e95d2ae96a68b29 (patch) | |
| tree | 21f8944fa2f1223c0b972988ede0b751dcdbaef8 | |
| parent | 5049debb7806d5f6e1fa7e69becce2b70957525e (diff) | |
| download | tdenetworkmanager-5002d07dcf051cc5f6bc7c178e95d2ae96a68b29.tar.gz tdenetworkmanager-5002d07dcf051cc5f6bc7c178e95d2ae96a68b29.zip | |
Added Help menu to systray icon popup menu. This resolves bug 1952.
| -rw-r--r-- | tdenetworkmanager/src/tdenetman-tray.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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 @@ class TrayPrivate TQSignalMapper signalMapper; TQMap<int, TQString> act_conn_map; int current_idx; + KHelpMenu *helpMenu; }; Tray* TrayPrivate::tray = NULL; @@ -358,7 +359,8 @@ void Tray::contextMenuAboutToShow (TDEPopupMenu* menu) 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 @@ Tray::Tray() : KSystemTray() 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"]); |