Added Help menu to systray icon popup menu. This resolves bug 1952.

pull/1/head
Michele Calgaro 10 years ago
parent 5049debb78
commit 5002d07dcf

@ -148,6 +148,7 @@ class TrayPrivate
TQSignalMapper signalMapper; TQSignalMapper signalMapper;
TQMap<int, TQString> act_conn_map; TQMap<int, TQString> act_conn_map;
int current_idx; int current_idx;
KHelpMenu *helpMenu;
}; };
Tray* TrayPrivate::tray = NULL; Tray* TrayPrivate::tray = NULL;
@ -358,7 +359,8 @@ void Tray::contextMenuAboutToShow (TDEPopupMenu* menu)
edit->plug(menu); edit->plug(menu);
// quit // quit
menu->insertSeparator (); menu->insertSeparator();
menu->insertItem(SmallIcon("help"), i18n("&Help"), d->helpMenu->menu());
TDEAction* quitAction = actionCollection ()->action (KStdAction::name (KStdAction::Quit)); TDEAction* quitAction = actionCollection ()->action (KStdAction::name (KStdAction::Quit));
if (quitAction) { if (quitAction) {
quitAction->plug (menu); quitAction->plug (menu);
@ -1036,7 +1038,8 @@ Tray::Tray() : KSystemTray()
updateGraphicsCache(); updateGraphicsCache();
d = new TrayPrivate(TQT_TQOBJECT(this)); 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))); connect(&d->signalMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotDeactivateConnection(int)));
setPixmap (m_pixmapCache["tdenetworkmanager"]); setPixmap (m_pixmapCache["tdenetworkmanager"]);

Loading…
Cancel
Save