Fixed extraneous error message on suspend

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1113226 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
pull/1/head
tpearson 14 years ago
parent 9068a0fa20
commit 65b5cd4b6c

File diff suppressed because it is too large Load Diff

@ -53,15 +53,15 @@
#include "settings.h" #include "settings.h"
/*! /*!
* \file kpowersave.h * \file kpowersave.h
* \brief Headerfile for kpowersave.cpp and the class \ref kpowersave. * \brief Headerfile for kpowersave.cpp and the class \ref kpowersave.
*/ */
/*! /*!
* \class kpowersave * \class kpowersave
* \brief The central class for the kpowersave-applet * \brief The central class for the kpowersave-applet
* \author Danny Kukawka, <dkukawka@suse.de>, <danny.kukawka@web.de> * \author Danny Kukawka, <dkukawka@suse.de>, <danny.kukawka@web.de>
* \author Thomas Renninger, <trenn@suse.de> * \author Thomas Renninger, <trenn@suse.de>
* \date 2004 - 2007 * \date 2004 - 2007
*/ */
@ -74,7 +74,7 @@ private:
// permanent pointers // permanent pointers
//! to configure kpowersave //! to configure kpowersave
KConfig *config; KConfig *config;
//! instance of \ref screen //! instance of \ref screen
screen *display; screen *display;
//! instance of \ref settings //! instance of \ref settings
@ -97,13 +97,13 @@ private:
//! instance of \ref countDownDialog //! instance of \ref countDownDialog
countDownDialog *countdown; countDownDialog *countdown;
//! struct wth information about suspend states and permissions //! struct wth information about suspend states and permissions
SuspendStates suspend; SuspendStates suspend;
//! enum with the last called suspend, this need to be reset if needed //! enum with the last called suspend, this need to be reset if needed
int calledSuspend; int calledSuspend;
//! instance of \ref detaileddialog //! instance of \ref detaileddialog
detaileddialog *detailedDlg; detaileddialog *detailedDlg;
//! represent the state of opened \ref detailedDlg //! represent the state of opened \ref detailedDlg
@ -132,8 +132,8 @@ private:
bool icon_BG_is_colored; bool icon_BG_is_colored;
//! represent color status of the kickerapplet icon //! represent color status of the kickerapplet icon
/*! /*!
* This boolean represent the state of the kickerapplet icon. It don't display * This boolean represent the state of the kickerapplet icon. It don't display
* information about the icon backgrund like \ref icon_BG_is_colored . It say * information about the icon backgrund like \ref icon_BG_is_colored . It say
* only that the icon is in state to have a blinking background . * only that the icon is in state to have a blinking background .
* \li true: if icon set to be colored * \li true: if icon set to be colored
* \li false: if icon isn't set to be colored * \li false: if icon isn't set to be colored
@ -144,7 +144,7 @@ private:
* This boolean represent information about changing the icon background. It's used to * This boolean represent information about changing the icon background. It's used to
* change the intervall of redraw the kickerapplet icon. * change the intervall of redraw the kickerapplet icon.
* \li true: if the state of icon is changed * \li true: if the state of icon is changed
* \li false: if the state of icon isn't change * \li false: if the state of icon isn't change
*/ */
bool icon_state_changed; bool icon_state_changed;
//! represent the state of the suspend/progress dialog //! represent the state of the suspend/progress dialog
@ -179,10 +179,10 @@ private:
//! a menu entry ID //! a menu entry ID
/*! contains the ID of the menuentry for kpowersave configure Dialog */ /*! contains the ID of the menuentry for kpowersave configure Dialog */
int CONFIGURE_ID; int CONFIGURE_ID;
int CONFIGURE_EVENTS_ID; int CONFIGURE_EVENTS_ID;
//! a menu entry ID //! a menu entry ID
/*! contains the ID of the menuentry for YaST-configuration */ /*! contains the ID of the menuentry for YaST-configuration */
int YAST_MODULE_MENU_ID; int YAST_MODULE_MENU_ID;
//! a menu seperator ID //! a menu seperator ID
@ -221,7 +221,7 @@ private:
//! a menu ID //! a menu ID
/*! contains the ID of the help menu*/ /*! contains the ID of the help menu*/
int HELP_MENU; int HELP_MENU;
//! number of white pixel in the kickerapplet icon //! number of white pixel in the kickerapplet icon
/*! /*!
* This integer value represent the number of white pixel in the icon for * This integer value represent the number of white pixel in the icon for
@ -231,25 +231,25 @@ private:
int countWhiteIconPixel; int countWhiteIconPixel;
//! QTimer-interval for icon background //! QTimer-interval for icon background
/*! /*!
* Time intervall to set the colored background of the batteryicon on/off. * Time intervall to set the colored background of the batteryicon on/off.
* The value is 1000 msec/ 1 sec. * The value is 1000 msec/ 1 sec.
*/ */
static const int BAT_icon_BG_intervall = 1000; static const int BAT_icon_BG_intervall = 1000;
//! QTimer-interval for display HAL error message //! QTimer-interval for display HAL error message
/*! /*!
* Time intervall to delay display the HAL error message to prevent displayed * Time intervall to delay display the HAL error message to prevent displayed
* the message if only HAL or powersave is restarted. The value is 15000 msec/ 15 sec. * the message if only HAL or powersave is restarted. The value is 15000 msec/ 15 sec.
*/ */
static const int HAL_ERROR_MSG_intervall = 15000; static const int HAL_ERROR_MSG_intervall = 15000;
//! type of current running suspend //! type of current running suspend
/*! QString store the name of the current running suspend*/ /*! QString store the name of the current running suspend*/
QString suspendType; QString suspendType;
//! current name of the pixmap //! current name of the pixmap
/*! /*!
* Contains the current name of the icon/pixmap. The value must be a filename of a existing iconfile. * Contains the current name of the icon/pixmap. The value must be a filename of a existing iconfile.
* \sa power_icon, no_battery_icon, charge_icon, battery, battery_RED or battery_ORANGE * \sa power_icon, no_battery_icon, charge_icon, battery, battery_RED or battery_ORANGE
*/ */
@ -259,10 +259,10 @@ private:
/*! /*!
* This list store the real schemenames (not the i18n()-version) * This list store the real schemenames (not the i18n()-version)
* regarding to position in the scheme-menu * regarding to position in the scheme-menu
*/ */
QStringList org_schemenames; QStringList org_schemenames;
//! a sub-menu of the kickerapplet //! a sub-menu of the kickerapplet
/*! QPopupMenu for the cpufreq-entries. */ /*! QPopupMenu for the cpufreq-entries. */
QPopupMenu *speed_menu; QPopupMenu *speed_menu;
//! a sub-menu of the kickerapplet //! a sub-menu of the kickerapplet
@ -279,8 +279,8 @@ private:
//! icon-pixmap //! icon-pixmap
/*! QPixmap with the full draw applet Icon (to be used in other classes) .*/ /*! QPixmap with the full draw applet Icon (to be used in other classes) .*/
QPixmap fullIcon; QPixmap fullIcon;
//! Timer for the blinking Icon background //! Timer for the blinking Icon background
/*! /*!
* This timer is used to let blink the background of a icon in kicker. * This timer is used to let blink the background of a icon in kicker.
@ -295,11 +295,11 @@ private:
QTimer *DISPLAY_HAL_ERROR_Timer; QTimer *DISPLAY_HAL_ERROR_Timer;
//! Timer to dimm down/up the brightness //! Timer to dimm down/up the brightness
/*! /*!
* This timer is used dimm the display up and down. The timerinterval * This timer is used dimm the display up and down. The timerinterval
* depends on calculated timePerStep in the calling function. * depends on calculated timePerStep in the calling function.
*/ */
QTimer *AUTODIMM_Timer; QTimer *AUTODIMM_Timer;
//! draw all icon related things for \ref redrawPixmap() //! draw all icon related things for \ref redrawPixmap()
void drawIcon(); void drawIcon();
//! to intialise the menu for the kickerapplet //! to intialise the menu for the kickerapplet
@ -313,7 +313,7 @@ private:
//! to update the Tooltip of the kickerapplet //! to update the Tooltip of the kickerapplet
void updateTooltip(); void updateTooltip();
//! Eventhandler to catch mouse-press-events and react //! Eventhandler to catch mouse-press-events and react
void mousePressEvent( QMouseEvent *qme ); void mousePressEvent( QMouseEvent *qme );
//! Event handler to catch mouse wheel events and react //! Event handler to catch mouse wheel events and react
void wheelEvent( QWheelEvent *qwe ); void wheelEvent( QWheelEvent *qwe );
@ -334,7 +334,7 @@ private slots:
bool do_suspend2disk(); bool do_suspend2disk();
//! send command for suspend_to_RAM to the HAL daemon //! send command for suspend_to_RAM to the HAL daemon
bool do_suspend2ram(); bool do_suspend2ram();
//! show warning dialog or call autosuspend if signal \ref inactivity::inactivityTimeExpired() recieved //! show warning dialog or call autosuspend if signal \ref inactivity::inactivityTimeExpired() recieved
void do_autosuspendWarn(); void do_autosuspendWarn();
//! execute the autosuspend //! execute the autosuspend
@ -400,7 +400,7 @@ private slots:
void handleSleepButtonEvent(); void handleSleepButtonEvent();
//! handle event for press s2disk button and call action //! handle event for press s2disk button and call action
void handleS2DiskButtonEvent(); void handleS2DiskButtonEvent();
//! handle changes of the session state //! handle changes of the session state
void handleSessionState (bool state); void handleSessionState (bool state);
@ -438,13 +438,13 @@ public:
kpowersave( bool force_acpi_check = false, bool trace_func = false); kpowersave( bool force_acpi_check = false, bool trace_func = false);
//! default destructor //! default destructor
virtual ~kpowersave(); virtual ~kpowersave();
k_dcop: k_dcop:
//! dcop function to lock the screen //! dcop function to lock the screen
bool lockScreen(); bool lockScreen();
//! dcop function to set a scheme //! dcop function to set a scheme
bool do_setScheme( QString ); bool do_setScheme( QString );
//! dcop function to set CPU Freq policy //! dcop function to set CPU Freq policy
bool do_setCPUFreqPolicy( QString ); bool do_setCPUFreqPolicy( QString );
//! dcop function to send 'suspend to disk' command to powersaved //! dcop function to send 'suspend to disk' command to powersaved
bool do_suspendToDisk(); bool do_suspendToDisk();
@ -470,16 +470,16 @@ k_dcop:
//! dcop funtion to get the current brightness level //! dcop funtion to get the current brightness level
int brightnessGet(); int brightnessGet();
//! dcop function to return the name of the current scheme //! dcop function to return the name of the current scheme
QString currentScheme (); QString currentScheme ();
//! dcop function to return the current cpufreqpolicy //! dcop function to return the current cpufreqpolicy
QString currentCPUFreqPolicy(); QString currentCPUFreqPolicy();
//! dcop function to return the supported sleeping states //! dcop function to return the supported sleeping states
QStringList allowed_sleepingStates(); QStringList allowed_sleepingStates();
//! dcop function to return the schemes //! dcop function to return the schemes
QStringList listSchemes(); QStringList listSchemes();
//! dcop function to return the supported CPU //! dcop function to return the supported CPU
QStringList listCPUFreqPolicies(); QStringList listCPUFreqPolicies();
}; };

Loading…
Cancel
Save