summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/tdepowersave.cpp46
-rw-r--r--src/tdepowersave.h8
2 files changed, 7 insertions, 47 deletions
diff --git a/src/tdepowersave.cpp b/src/tdepowersave.cpp
index 65550ab..e3f6ce5 100644
--- a/src/tdepowersave.cpp
+++ b/src/tdepowersave.cpp
@@ -31,6 +31,7 @@
#include <kpassivepopup.h>
#include <tdepopupmenu.h>
#include <kglobalaccel.h>
+#include <khelpmenu.h>
// other TQt headers:
#include <tqcursor.h>
@@ -227,17 +228,11 @@ void tdepowersave::initMenu() {
HELP_SEPARATOR_MENU_ID = contextMenu()->insertSeparator();
- help_menu = new TQPopupMenu(this, i18n("&Help").utf8());
-
- help_menu->insertItem( SmallIcon("help", TQIconSet::Automatic), i18n("&TDEPowersave Handbook"),
- this, TQT_SLOT(slotHelp()));
- help_menu->insertSeparator();
- help_menu->insertItem( i18n("&Report a bug ..."), this, TQT_SLOT(slotReportBug()));
- help_menu->insertItem( SmallIcon("tdepowersave", TQIconSet::Automatic),
- i18n("&About TDEPowersave"), this, TQT_SLOT(slotAbout()));
-
- HELP_MENU = contextMenu()->insertItem(SmallIcon("help", TQIconSet::Automatic),
- i18n("&Help"), help_menu);
+ // Create help submenu
+ KHelpMenu *m_help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection());
+ TDEPopupMenu *help = m_help->menu();
+ help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
+ this->contextMenu()->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), help);
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
@@ -565,34 +560,6 @@ void tdepowersave::slotAbout()
}
/*!
- * \b TQT_SLOT to open the website to report bugs
- */
-void tdepowersave::slotReportBug()
-{
-#ifdef DISTRO_IS_SUSE
- #ifdef DISTRO_IS_SLES_SLED
- kapp->invokeBrowser("https://bugzilla.novell.com/");
- #else
- kapp->invokeBrowser("http://en.opensuse.org/Submitting_Bug_Reports");
- #endif
-#else
- #ifdef DISTRO_IS_ALTLINUX
- kapp->invokeBrowser("http://bugzilla.altlinux.org/");
- #else
- #ifdef DISTRO_IS_UBUNTU
- kapp->invokeBrowser("https://launchpad.net/distros/ubuntu/+bugs");
- #else
- #ifdef DISTRO_IS_PARDUS
- kapp->invokeBrowser("http://bugs.pardus.org.tr/");
- #else
- kapp->invokeBrowser("http://sourceforge.net/tracker/?group_id=124576&atid=700009");
- #endif
- #endif
- #endif
-#endif
-}
-
-/*!
* \b TQT_SLOT to set the icon background on/off if battery is in critical, low or warning-state. Within
* this function we set \ref icon_state_changed to true and call \ref redrawPixmap() to redraw the
* kickerapplet icon and create a icon with blinking background. \n \n
@@ -607,6 +574,7 @@ void tdepowersave::do_setIconBG(){
kdDebugFuncOut(trace);
}
+
/*!
* \b TQT_SLOT to enable/disable the autosuspend.
*/
diff --git a/src/tdepowersave.h b/src/tdepowersave.h
index bb46fc0..41e0d9f 100644
--- a/src/tdepowersave.h
+++ b/src/tdepowersave.h
@@ -217,9 +217,6 @@ private:
//! a menu seperator ID
/*! contains the ID of the separator between autosuspend and Help*/
int HELP_SEPARATOR_MENU_ID;
- //! a menu ID
- /*! contains the ID of the help menu*/
- int HELP_MENU;
//! number of white pixel in the kickerapplet icon
/*!
@@ -260,9 +257,6 @@ private:
//! a sub-menu of the kickerapplet
/*! TQPopupMenu for the scheme-entries. */
TQPopupMenu *scheme_menu;
- //! a sub-menu of the kickerapplet
- /*! TQPopupMenu for the help-entries. */
- TQPopupMenu *help_menu;
//! icon-pixmap
@@ -343,8 +337,6 @@ private slots:
void slotHelp();
//! called to open the tdepowersave About dialog
void slotAbout();
- //! called to open website to report bugs
- void slotReportBug();
//! called if the configure dialog is destroyed
void observeConfigDlg();
//! called if user exit from tdepowersave