Added access to handbook from the systray popup menu. This resolves bug 1845.

pull/1/head
Michele Calgaro 11 years ago
parent 4f76b9f747
commit d473c3a225

@ -44,22 +44,35 @@ LMSensorsDock::LMSensorsDock(bool fNoDock, TQObject *parent, const char *name):
LMSensorsDock::~LMSensorsDock() LMSensorsDock::~LMSensorsDock()
{ {
saveConfig(); saveConfig();
if(sensorsWidget) delete sensorsWidget; if(sensorsWidget)
if(sensorsCfg) delete sensorsCfg; delete sensorsWidget;
if(sensorsAlarm) delete sensorsAlarm; if(sensorsCfg)
delete menu; delete sensorsCfg;
if(sensors) delete sensors; if(sensorsAlarm)
delete sensorsAlarm;
if (helpmenu)
{
menu->removeItem(helpmenu_id);
delete helpmenu;
}
delete menu;
if(sensors) delete sensors;
} }
void LMSensorsDock::createMenu() void LMSensorsDock::createMenu()
{ {
helpmenu=new TDEPopupMenu;
helpmenu->insertItem(SmallIcon("help"), i18n("&KSensors Handbook"), this, SLOT(showHandbook()));
helpmenu->insertItem(kapp->miniIcon(), i18n("&About KSensors"), this, SLOT(showAbout()));
menu= new TDEPopupMenu; menu= new TDEPopupMenu;
menu->insertTitle(kapp->miniIcon(),"KSensors"); menu->insertTitle(kapp->miniIcon(),"KSensors");
menu->insertItem(SmallIcon("configure"),i18n("&Configure"), this, SLOT(createConfigWidget() ) ,0,101 ); menu->insertItem(SmallIcon("configure"),i18n("&Configure"), this, SLOT(createConfigWidget() ) ,0,101 );
menu->insertSeparator(); menu->insertSeparator();
menu->insertItem(kapp->miniIcon() ,i18n("&About KSensors"), this, SLOT(showAbout() ) ,0,103 ); helpmenu_id=menu->insertItem(SmallIcon("help"), i18n("&Help"), helpmenu);
menu->insertSeparator(); menu->insertSeparator();
if(!noDock) menu->insertItem(sensorsWidget ? i18n("&Minimize"):i18n("&Restore"), this, SLOT(minimizeRestoreWidget() ) ,0,100 ); if(!noDock) menu->insertItem(sensorsWidget ? i18n("&Minimize"):i18n("&Restore"), this, SLOT(minimizeRestoreWidget() ) ,0,100 );
menu->insertItem(SmallIcon("exit"),i18n("&Exit"), this, SLOT(close()),0,102); menu->insertItem(SmallIcon("exit"),i18n("&Exit"), this, SLOT(close()),0,102);
@ -199,7 +212,6 @@ void LMSensorsDock::updateItemDock(const char *name)
// } // }
} }
void LMSensorsDock::showAbout() void LMSensorsDock::showAbout()
{ {
TDEAboutApplication *dialog; TDEAboutApplication *dialog;
@ -209,3 +221,8 @@ TDEAboutApplication *dialog;
delete dialog; delete dialog;
} }
void LMSensorsDock::showHandbook()
{
kapp->invokeHelp();
}

@ -62,6 +62,7 @@ protected slots:
void createConfigWidget(); void createConfigWidget();
void updateMenu(); void updateMenu();
void showAbout(); void showAbout();
void showHandbook();
void close(); void close();
private: private:
@ -76,6 +77,8 @@ private:
TQGuardedPtr<LMSensorsAlarms> sensorsAlarm; TQGuardedPtr<LMSensorsAlarms> sensorsAlarm;
TDEPopupMenu *menu; TDEPopupMenu *menu;
TDEPopupMenu *helpmenu;
int helpmenu_id;
void createMenu(); void createMenu();
void createWidgets(); void createWidgets();

Loading…
Cancel
Save