From 82346276f8ea6c56540c01524858ae1fd0edfe83 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 20 Apr 2020 22:52:39 +0900 Subject: [PATCH] Replaced custom help menu with standard TDE help menu. This relates to bug 3087. Signed-off-by: Michele Calgaro (cherry picked from commit a0e45e83a656cffa30da7ca8ee8559664996f240) --- src/kpowersave.cpp | 46 +++++++--------------------------------------- src/kpowersave.h | 8 -------- 2 files changed, 7 insertions(+), 47 deletions(-) diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp index 6e48666..beebaf0 100644 --- a/src/kpowersave.cpp +++ b/src/kpowersave.cpp @@ -30,6 +30,7 @@ #include #include #include +#include // other TQt headers: #include @@ -219,17 +220,11 @@ void kpowersave::initMenu() { HELP_SEPARATOR_MENU_ID = contextMenu()->insertSeparator(); - help_menu = new TQPopupMenu(this, i18n("&Help").utf8()); - - help_menu->insertItem( SmallIcon("help", TQIconSet::Automatic), i18n("&KPowersave Handbook"), - this, TQT_SLOT(slotHelp())); - help_menu->insertSeparator(); - help_menu->insertItem( i18n("&Report a bug ..."), this, TQT_SLOT(slotReportBug())); - help_menu->insertItem( SmallIcon("kpowersave", TQIconSet::Automatic), - i18n("&About KPowersave"), 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())); @@ -556,34 +551,6 @@ void kpowersave::slotAbout() a.exec(); } -/*! - * \b TQT_SLOT to open the website to report bugs - */ -void kpowersave::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 @@ -599,6 +566,7 @@ void kpowersave::do_setIconBG(){ kdDebugFuncOut(trace); } + /*! * \b TQT_SLOT to enable/disable the autosuspend. */ diff --git a/src/kpowersave.h b/src/kpowersave.h index 74cdb8f..c565930 100644 --- a/src/kpowersave.h +++ b/src/kpowersave.h @@ -219,9 +219,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 /*! @@ -269,9 +266,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 @@ -356,8 +350,6 @@ private slots: void slotHelp(); //! called to open the kpowersave 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 kpowersave