diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 18 | ||||
-rw-r--r-- | src/Makefile.am | 28 | ||||
-rw-r--r-- | src/config/tdepowersaverc_default (renamed from src/config/kpowersaverc_default) | 0 | ||||
-rw-r--r-- | src/configure.in.in | 2 | ||||
-rw-r--r-- | src/configure_Dialog.ui | 4 | ||||
-rw-r--r-- | src/configuredialog.cpp | 12 | ||||
-rw-r--r-- | src/configuredialog.h | 4 | ||||
-rw-r--r-- | src/countdowndialog.cpp | 6 | ||||
-rw-r--r-- | src/dbusInterface.cpp | 4 | ||||
-rw-r--r-- | src/dbusInterface.h | 10 | ||||
-rw-r--r-- | src/detailed_Dialog.ui | 2 | ||||
-rw-r--r-- | src/detaileddialog.cpp | 4 | ||||
-rw-r--r-- | src/detaileddialog.h | 2 | ||||
-rw-r--r-- | src/dummy.cpp | 2 | ||||
-rw-r--r-- | src/eventsrc | 28 | ||||
-rw-r--r-- | src/hardware.cpp | 4 | ||||
-rw-r--r-- | src/hardware.h | 4 | ||||
-rw-r--r-- | src/hardware_battery.cpp | 10 | ||||
-rw-r--r-- | src/hardware_cpu.h | 2 | ||||
-rw-r--r-- | src/hi16-app-tdepowersave.png (renamed from src/hi16-app-kpowersave.png) | bin | 922 -> 922 bytes | |||
-rw-r--r-- | src/hi32-app-tdepowersave.png (renamed from src/hi32-app-kpowersave.png) | bin | 2300 -> 2300 bytes | |||
-rw-r--r-- | src/hi48-app-tdepowersave.png (renamed from src/hi48-app-kpowersave.png) | bin | 3975 -> 3975 bytes | |||
-rw-r--r-- | src/inactivity.h | 2 | ||||
-rw-r--r-- | src/infodialog.cpp | 4 | ||||
-rw-r--r-- | src/infodialog.h | 2 | ||||
-rw-r--r-- | src/logviewer.cpp | 2 | ||||
-rw-r--r-- | src/logviewer.h | 2 | ||||
-rw-r--r-- | src/main.cpp | 16 | ||||
-rw-r--r-- | src/pics/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/pics/Makefile.am | 4 | ||||
-rw-r--r-- | src/screen.cpp | 2 | ||||
-rw-r--r-- | src/settings.cpp | 6 | ||||
-rw-r--r-- | src/settings.h | 70 | ||||
-rw-r--r-- | src/suspenddialog.cpp | 4 | ||||
-rw-r--r-- | src/tdepowersave-autostart.desktop (renamed from src/kpowersave-autostart.desktop) | 30 | ||||
-rw-r--r-- | src/tdepowersave.cpp (renamed from src/kpowersave.cpp) | 206 | ||||
-rw-r--r-- | src/tdepowersave.desktop (renamed from src/kpowersave.desktop) | 30 | ||||
-rw-r--r-- | src/tdepowersave.h (renamed from src/kpowersave.h) | 40 | ||||
-rw-r--r-- | src/tdepowersave.lsm (renamed from src/kpowersave.lsm) | 2 | ||||
-rw-r--r-- | src/tdepowersave_debug.h (renamed from src/kpowersave_debug.h) | 8 |
40 files changed, 289 insertions, 289 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 437deba..de98870 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,16 +27,16 @@ link_directories( ##### other data ################################ -tde_install_icons( kpowersave ) -install( FILES kpowersave.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES kpowersave-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) -install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kpowersave ) -install( FILES config/kpowersaverc_default RENAME kpowersaverc DESTINATION ${CONFIG_INSTALL_DIR} ) +tde_install_icons( tdepowersave ) +install( FILES tdepowersave.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tdepowersave-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) +install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/tdepowersave ) +install( FILES config/tdepowersaverc_default RENAME tdepowersaverc DESTINATION ${CONFIG_INSTALL_DIR} ) -##### kpowersave (tdeinit) ###################### +##### tdepowersave (tdeinit) ###################### -tde_add_tdeinit_executable( kpowersave AUTOMOC +tde_add_tdeinit_executable( tdepowersave AUTOMOC SOURCES dummy.cpp autodimm.cpp autosuspend.cpp blacklistedit_Dialog.ui blacklisteditdialog.cpp @@ -44,8 +44,8 @@ tde_add_tdeinit_executable( kpowersave AUTOMOC countdowndialog.cpp dbusInterface.cpp detailed_Dialog.ui detaileddialog.cpp hardware.cpp hardware_battery.cpp hardware_batteryCollection.cpp hardware_cpu.cpp - inactivity.cpp info_Dialog.ui infodialog.cpp kpowersave.cpp - kpowersave.skel log_viewer.ui logviewer.cpp main.cpp + inactivity.cpp info_Dialog.ui infodialog.cpp tdepowersave.cpp + tdepowersave.skel log_viewer.ui logviewer.cpp main.cpp screen.cpp settings.cpp suspenddialog.cpp suspend_Dialog.ui LINK ${DBUS_TQT_LIBRARIES} tdeio-shared ${HAL_LIBRARIES} diff --git a/src/Makefile.am b/src/Makefile.am index 4558d05..dbb26e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = \ hardware_cpu.h \ inactivity.h \ infodialog.h \ - kpowersave.h \ + tdepowersave.h \ logviewer.h \ privileges.h \ screen.h \ @@ -30,7 +30,7 @@ noinst_HEADERS = \ # let automoc handle all of the meta source files (moc) METASOURCES = AUTO -KDE_ICON = kpowersave +KDE_ICON = tdepowersave ######################################################################### # APPLICATION SECTION @@ -40,10 +40,10 @@ KDE_ICON = kpowersave bin_PROGRAMS = lib_LTLIBRARIES = -tdeinit_LTLIBRARIES = kpowersave.la +tdeinit_LTLIBRARIES = tdepowersave.la # the application source, library search path, and link libraries -kpowersave_la_SOURCES = \ +tdepowersave_la_SOURCES = \ dummy.cpp \ autodimm.cpp \ autosuspend.cpp \ @@ -63,8 +63,8 @@ kpowersave_la_SOURCES = \ inactivity.cpp \ info_Dialog.ui \ infodialog.cpp \ - kpowersave.cpp \ - kpowersave.skel \ + tdepowersave.cpp \ + tdepowersave.skel \ log_viewer.ui \ logviewer.cpp \ main.cpp \ @@ -74,30 +74,30 @@ kpowersave_la_SOURCES = \ suspend_Dialog.ui -kpowersave_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -kpowersave_la_LIBADD = $(LIB_KIO) @PACKAGE_LIBS@ -ldbus-tqt-1 -lXss -lXext -lXtst +tdepowersave_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version +tdepowersave_la_LIBADD = $(LIB_KIO) @PACKAGE_LIBS@ -ldbus-tqt-1 -lXss -lXext -lXtst # this is where the desktop file will go -xdg_apps_DATA = kpowersave.desktop +xdg_apps_DATA = tdepowersave.desktop # and for autostart autostartdir = $(prefix)/share/autostart -autostart_DATA = kpowersave-autostart.desktop +autostart_DATA = tdepowersave-autostart.desktop # this is where the shell's XML-GUI resource file goes -shellrcdir = $(kde_datadir)/kpowersave +shellrcdir = $(kde_datadir)/tdepowersave shellrc_DATA = eventsrc -# shellrc_DATA = kpowersaveui.rc +# shellrc_DATA = tdepowersaveui.rc # pics subdir SUBDIRS = pics messages: $(EXTRACTRC) *ui eventsrc >> rc.cpp - $(XGETTEXT) `find . -name \*.h -o -name \*.H -o -name \*.cpp -o -name \*.C` -o $(podir)/kpowersave.pot + $(XGETTEXT) `find . -name \*.h -o -name \*.H -o -name \*.cpp -o -name \*.C` -o $(podir)/tdepowersave.pot rm -f rc.cpp install-data-local: $(mkinstalldirs) $(DESTDIR)$(kde_confdir) - $(INSTALL_DATA) $(top_srcdir)/src/config/kpowersaverc_default $(DESTDIR)$(kde_confdir)/kpowersaverc + $(INSTALL_DATA) $(top_srcdir)/src/config/tdepowersaverc_default $(DESTDIR)$(kde_confdir)/tdepowersaverc diff --git a/src/config/kpowersaverc_default b/src/config/tdepowersaverc_default index 61e6e05..61e6e05 100644 --- a/src/config/kpowersaverc_default +++ b/src/config/tdepowersaverc_default diff --git a/src/configure.in.in b/src/configure.in.in index 9f9bdd1..dfcd1b3 100644 --- a/src/configure.in.in +++ b/src/configure.in.in @@ -1,6 +1,6 @@ #MIN_CONFIG(3.0.0) -AM_INIT_AUTOMAKE(kpowersave, 0.1) +AM_INIT_AUTOMAKE(tdepowersave, 0.1) AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN diff --git a/src/configure_Dialog.ui b/src/configure_Dialog.ui index 2500a62..ba7bfa3 100644 --- a/src/configure_Dialog.ui +++ b/src/configure_Dialog.ui @@ -21,7 +21,7 @@ </sizepolicy> </property> <property name="caption"> - <string>KPowersave Settings</string> + <string>TDEPowersave Settings</string> </property> <property name="sizeGripEnabled"> <bool>true</bool> @@ -1975,7 +1975,7 @@ <cstring>cB_autostart</cstring> </property> <property name="text"> - <string>KPowersave starts automatically on login</string> + <string>TDEPowersave starts automatically on login</string> </property> </widget> <spacer row="1" column="0"> diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index 93843ea..59f0fad 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -19,7 +19,7 @@ /*! \file configuredialog.cpp * All here displayed file members of configureDialog.cpp are related to operations with the - * configure dialog for kpowersave + * configure dialog for tdepowersave * \brief In this file can be found all configure dialog related code. * \author Danny Kukawka, <[email protected]>, <[email protected]> * \date 2005 @@ -226,7 +226,7 @@ void ConfigureDialog::setIcons(){ kdDebugFuncIn(trace); /* set all Icons */ - this->setIcon(SmallIcon("kpowersave", TQIconSet::Automatic)); + this->setIcon(SmallIcon("tdepowersave", TQIconSet::Automatic)); buttonApply->setIconSet(SmallIconSet("apply", TQIconSet::Automatic)); buttonCancel->setIconSet(SmallIconSet("cancel", TQIconSet::Automatic)); buttonOk->setIconSet(SmallIconSet("ok", TQIconSet::Automatic)); @@ -270,15 +270,15 @@ void ConfigureDialog::setTooltips(){ // TQToolTip::setWakeUpDelay ( 1000 ); TQToolTip::add(cB_specificSettings, i18n("This enables specific screen saver settings. \n" "Note: If selected, the global screen saver settings are \n" - "overwritten while kpowersave runs.")); + "overwritten while tdepowersave runs.")); TQToolTip::add(cB_disable_Ss, i18n("This disables the screen saver. \n" "Note: If selected, the global screen saver settings are \n" - "overwritten while kpowersave runs.")); + "overwritten while tdepowersave runs.")); TQToolTip::add(cB_blankScreen, i18n("This blanks the screen instead of using a specific screen saver. \n" "Note: This may work only with KScreensaver.")); TQToolTip::add(cB_SpecificPM, i18n("This enables specific DPMS settings. \n" "Note: If selected, the global DPMS settings are \n" - "overwritten while kpowersave runs.")); + "overwritten while tdepowersave runs.")); TQToolTip::add(cB_disablePM, i18n("This disables DPMS support.")); TQToolTip::add(cB_lockSuspend, i18n("If selected, the screen is locked on suspend or standby.")); TQToolTip::add(cB_lockLid, i18n("If selected, the screen is locked if the lid close event is triggered.")); @@ -1035,7 +1035,7 @@ void ConfigureDialog::pB_newScheme_clicked(){ getSchemeList(); while (!_end) { - _new = KInputDialog::getText( i18n("KPowersave Configuration"), + _new = KInputDialog::getText( i18n("TDEPowersave Configuration"), _error + _text, TQString(), &_ok, this); if (!_ok ) { _end = true; diff --git a/src/configuredialog.h b/src/configuredialog.h index 6deb9b4..837866d 100644 --- a/src/configuredialog.h +++ b/src/configuredialog.h @@ -58,9 +58,9 @@ private: //! pointer to instance of the blacklist edit dialog for Autodimm blacklistEditDialog* blacklistEDlgAD; - //! the pointer to the config of kpowersave, get from constructor + //! the pointer to the config of tdepowersave, get from constructor TDEConfig *tdeconfig; - //! pointer to the KPowersave settings, get from constructor + //! pointer to the TDEPowersave settings, get from constructor Settings *settings; //! pointer to hardware information and actions HardwareInfo *hwinfo; diff --git a/src/countdowndialog.cpp b/src/countdowndialog.cpp index a3d9ac0..0adf891 100644 --- a/src/countdowndialog.cpp +++ b/src/countdowndialog.cpp @@ -25,7 +25,7 @@ // own header #include "countdowndialog.h" -#include "kpowersave_debug.h" +#include "tdepowersave_debug.h" // KDE headers: #include <tdelocale.h> @@ -52,7 +52,7 @@ countDownDialog::countDownDialog( int timeout, TQWidget *parent, const char *nam PROGRESS = new TQTimer(this); connect(PROGRESS, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgress())); - this->setCaption(i18n("KPowersave")); + this->setCaption(i18n("TDEPowersave")); kdDebugFuncOut(trace); } @@ -82,7 +82,7 @@ void countDownDialog::setPixmap( TQString type ) } else if (type.startsWith("standby")) { pixmap = TDEGlobal::iconLoader()->loadIcon("stand_by", TDEIcon::NoGroup, TDEIcon::SizeLarge); } else { - pixmap = TDEGlobal::iconLoader()->loadIcon("kpowersave", TDEIcon::NoGroup, TDEIcon::SizeLarge); + pixmap = TDEGlobal::iconLoader()->loadIcon("tdepowersave", TDEIcon::NoGroup, TDEIcon::SizeLarge); } iconPixmap->setPixmap( pixmap ); } diff --git a/src/dbusInterface.cpp b/src/dbusInterface.cpp index 82cffd6..19e4bc3 100644 --- a/src/dbusInterface.cpp +++ b/src/dbusInterface.cpp @@ -488,7 +488,7 @@ out: /* ---> PolicyKit method call section :: END <--- */ /*! - * Use this TQT_SLOT to emit a reviced messages to the kpowersave. + * Use this TQT_SLOT to emit a reviced messages to the tdepowersave. * NOTE: Because of the filter function this need to be a public function. * Don't use this function in any other place than this class. * \param type enum with the type of the message @@ -515,7 +515,7 @@ void dbusInterface::emitMsgReceived( msg_type type, TQString message, TQString s /*! * This function is needed filter function for the D-Bus connection to filter - * all needed messages from the bus which are needful for KPowersave. + * all needed messages from the bus which are needful for TDEPowersave. * \param connection existing connection to the D-Bus daemon * \param message the recieved message from the D-Bus daemon * \param data void pointer (see dbus bindings for more information) diff --git a/src/dbusInterface.h b/src/dbusInterface.h index 3e9ca94..f5afbd3 100644 --- a/src/dbusInterface.h +++ b/src/dbusInterface.h @@ -48,8 +48,8 @@ #include <dbus/message.h> #include <dbus/connection.h> -// kpowersave - Header -#include "kpowersave_debug.h" +// tdepowersave - Header +#include "tdepowersave_debug.h" #define CK_SERVICE "org.freedesktop.ConsoleKit" #define CK_MANAGER_IFACE "org.freedesktop.ConsoleKit.Manager" @@ -77,7 +77,7 @@ private: //! real connection to D-Bus DBusConnection *dbus_connection; - //! to store information if KPowersave is connected to D-Bus + //! to store information if TDEPowersave is connected to D-Bus /*! * This boolean represent information about the state of the connection to D-Bus * \li true: if connected @@ -87,7 +87,7 @@ private: //! if we could claim the org.freedesktop.Policy.Power interface /*! - * This boolean represent information if KPowersave could claim the + * This boolean represent information if TDEPowersave could claim the * org.freedesktop.Policy.Power interface from the D-Bus * \li true: if acquired * \li false: if not @@ -122,7 +122,7 @@ public: bool isPolicyPowerIfaceOwned(); // --- helper to get private members of the class --- // - //! to get information if KPowersave is connected to D-Bus + //! to get information if TDEPowersave is connected to D-Bus bool isConnectedToDBUS(); //! to get info about claim org.freedesktop.Policy.Power interface bool acquiredPolicyPowerInterface(); diff --git a/src/detailed_Dialog.ui b/src/detailed_Dialog.ui index cb2eac8..0dbabda 100644 --- a/src/detailed_Dialog.ui +++ b/src/detailed_Dialog.ui @@ -21,7 +21,7 @@ </sizepolicy> </property> <property name="caption"> - <string>kpowersave</string> + <string>tdepowersave</string> </property> <property name="sizeGripEnabled"> <bool>true</bool> diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp index 163ff15..6a24349 100644 --- a/src/detaileddialog.cpp +++ b/src/detaileddialog.cpp @@ -58,7 +58,7 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin int batteries = primaryBatteries->getNumBatteries(); numOfCPUs = cpuInfo->getCPUNum(); - this->setCaption(i18n("KPowersave Information Dialog")); + this->setCaption(i18n("TDEPowersave Information Dialog")); // use this as compromise with current translation process // TODO: remove them in the next translation round @@ -423,7 +423,7 @@ void detaileddialog::setInfos() { else if(config->currentScheme == "AdvancedPowersave") InfoPictogram->setPixmap(SmallIcon("scheme_advanced_powersave", 22)); else - InfoPictogram->setPixmap(SmallIcon("kpowersave", 22)); + InfoPictogram->setPixmap(SmallIcon("tdepowersave", 22)); if(hwinfo->isOnline()) { if (hwinfo->supportCPUFreq()) { diff --git a/src/detaileddialog.h b/src/detaileddialog.h index ae38394..5cc6d4e 100644 --- a/src/detaileddialog.h +++ b/src/detaileddialog.h @@ -85,7 +85,7 @@ private: //! pointer to class settinfs to get the current settings Settings *config; - //! pointer to the kpowersave class + //! pointer to the tdepowersave class TQPixmap *pixmap; //! the numbers of CPUs in the system diff --git a/src/dummy.cpp b/src/dummy.cpp index 244ccc4..6a3b72c 100644 --- a/src/dummy.cpp +++ b/src/dummy.cpp @@ -90,7 +90,7 @@ class dummy { dummy = i18n("Try loading the default configuration."); dummy = i18n("Maybe the global configuration file is empty or missing."); - // for kpowersave.cpp: + // for tdepowersave.cpp: dummy = i18n("Cannot connect to D-Bus. The D-Bus daemon may not be running."); dummy = i18n("Scheme switched to %1. \n Deactivate following devices: %2").arg("").arg(""); dummy = i18n("Scheme switched to %1. \n Activate following devices: %2").arg("").arg(""); diff --git a/src/eventsrc b/src/eventsrc index 88ccc0b..8da795e 100644 --- a/src/eventsrc +++ b/src/eventsrc @@ -1,18 +1,18 @@ [!Global!] -IconName=kpowersave -Comment=KPowersave -Comment[cs]=KPowersave -Comment[de]=KPowersave -Comment[es]=KPowersave -Comment[fr]=KPowersave -Comment[it]=KPowersave -Comment[ja]=KPowersave -Comment[pl]=KPowersave -Comment[pt]=KPowersave -Comment[pt_BR]=KPowersave -Comment[ru]=KPowersave -Comment[zh_CN]=KPowersave -Comment[zh_TW]=KPowersave +IconName=tdepowersave +Comment=TDEPowersave +Comment[cs]=TDEPowersave +Comment[de]=TDEPowersave +Comment[es]=TDEPowersave +Comment[fr]=TDEPowersave +Comment[it]=TDEPowersave +Comment[ja]=TDEPowersave +Comment[pl]=TDEPowersave +Comment[pt]=TDEPowersave +Comment[pt_BR]=TDEPowersave +Comment[ru]=TDEPowersave +Comment[zh_CN]=TDEPowersave +Comment[zh_TW]=TDEPowersave [plug_event] Name=PlugEvent diff --git a/src/hardware.cpp b/src/hardware.cpp index 766b30b..d296476 100644 --- a/src/hardware.cpp +++ b/src/hardware.cpp @@ -36,7 +36,7 @@ // include own header #include "hardware.h" -#include "kpowersave_debug.h" +#include "tdepowersave_debug.h" #include "privileges.h" /*! The default constructor of the class HardwareInfo */ @@ -325,7 +325,7 @@ void HardwareInfo::handleResumeSignal (int result) { } /*! - * This function checks the session for the running KPowersave instance + * This function checks the session for the running TDEPowersave instance * \return Boolean with result of operation * \retval true if the query/check could get finished * \retval false on every error diff --git a/src/hardware.h b/src/hardware.h index 3dd048b..a5c7d5e 100644 --- a/src/hardware.h +++ b/src/hardware.h @@ -233,7 +233,7 @@ private: //! if brightness get controled via keyevents in hardware /*! * This boolean represent information if the machine handle brightness button - * and keyevents in hardware. If so KPowersave should ignore key events. + * and keyevents in hardware. If so TDEPowersave should ignore key events. * \li true: if handled in hardware * \li false: else */ @@ -249,7 +249,7 @@ private: //! if the current desktop session is active /*! * This boolean represent information if the current desktop session in - * Which KPowersave runs is marked in ConsoleKit as active or not. + * Which TDEPowersave runs is marked in ConsoleKit as active or not. * \li true: if active * \li false: else */ diff --git a/src/hardware_battery.cpp b/src/hardware_battery.cpp index ee9f0b9..8ae333d 100644 --- a/src/hardware_battery.cpp +++ b/src/hardware_battery.cpp @@ -418,7 +418,7 @@ bool Battery::checkChargeLevelCurrent () { } // FIXME VERIFY CORRECTNESS - // what does kpowersave expect to see in charge_level_current (battery.charge_level.current)? + // what does tdepowersave expect to see in charge_level_current (battery.charge_level.current)? charge_level_current = bdevice->energy(); if (charge_level_current < 0) { //overflow? @@ -455,7 +455,7 @@ bool Battery::checkChargeLevelLastfull () { } // FIXME VERIFY CORRECTNESS - // what does kpowersave expect to see in charge_level_lastfull (battery.charge_level.last_full)? + // what does tdepowersave expect to see in charge_level_lastfull (battery.charge_level.last_full)? charge_level_lastfull = bdevice->maximumEnergy(); if (charge_level_lastfull < charge_level_current ) { //possible overflow? @@ -493,7 +493,7 @@ bool Battery::checkChargeLevelRate () { int _rate = present_rate; // FIXME VERIFY CORRECTNESS - // what does kpowersave expect to see in present_rate (battery.charge_level.rate)? + // what does tdepowersave expect to see in present_rate (battery.charge_level.rate)? present_rate = bdevice->dischargeRate(); if (present_rate < 0 ) present_rate = 0; @@ -532,7 +532,7 @@ bool Battery::checkChargeLevelUnit () { } // FIXME VERIFY CORRECTNESS - // what does kpowersave expect to see in charge_level_unit (battery.charge_level.unit)? + // what does tdepowersave expect to see in charge_level_unit (battery.charge_level.unit)? charge_level_unit = "wH"; //query was not successfull but this is optional kdWarning() << "Couldn't request charge_level.unit for udi: " << udi << endl; @@ -566,7 +566,7 @@ bool Battery::checkChargeLevelDesign () { } // FIXME VERIFY CORRECTNESS - // what does kpowersave expect to see in design_capacity (battery.charge_level.last_full)? + // what does tdepowersave expect to see in design_capacity (battery.charge_level.last_full)? design_capacity = bdevice->maximumDesignEnergy(); if (design_capacity < 0) { design_capacity = 0; diff --git a/src/hardware_cpu.h b/src/hardware_cpu.h index 7d9c94d..62069ac 100644 --- a/src/hardware_cpu.h +++ b/src/hardware_cpu.h @@ -47,7 +47,7 @@ #include <tdehardwaredevices.h> // own headers -#include "kpowersave_debug.h" +#include "tdepowersave_debug.h" class CPUInfo : public TQObject{ diff --git a/src/hi16-app-kpowersave.png b/src/hi16-app-tdepowersave.png Binary files differindex 9353f8c..9353f8c 100644 --- a/src/hi16-app-kpowersave.png +++ b/src/hi16-app-tdepowersave.png diff --git a/src/hi32-app-kpowersave.png b/src/hi32-app-tdepowersave.png Binary files differindex d500a9f..d500a9f 100644 --- a/src/hi32-app-kpowersave.png +++ b/src/hi32-app-tdepowersave.png diff --git a/src/hi48-app-kpowersave.png b/src/hi48-app-tdepowersave.png Binary files differindex 26e2b89..26e2b89 100644 --- a/src/hi48-app-kpowersave.png +++ b/src/hi48-app-tdepowersave.png diff --git a/src/inactivity.h b/src/inactivity.h index 206cfea..8e03fd3 100644 --- a/src/inactivity.h +++ b/src/inactivity.h @@ -43,7 +43,7 @@ #include <X11/Xutil.h> // from project -#include "kpowersave_debug.h" +#include "tdepowersave_debug.h" /*! * \file inactivity.h diff --git a/src/infodialog.cpp b/src/infodialog.cpp index 1205ca0..9837acb 100644 --- a/src/infodialog.cpp +++ b/src/infodialog.cpp @@ -73,9 +73,9 @@ infoDialog::infoDialog( TDEConfig *config, TQString captionName, TQString messag msgText->setText(message); if (!captionName.isEmpty()) - this->setCaption(i18n("KPowersave") + " - " + captionName); + this->setCaption(i18n("TDEPowersave") + " - " + captionName); else - this->setCaption(i18n("KPowersave")); + this->setCaption(i18n("TDEPowersave")); if (dontShowAgainMsg.isEmpty()) { dontShowAgain->setHidden(true); diff --git a/src/infodialog.h b/src/infodialog.h index 305a1a1..85d13dc 100644 --- a/src/infodialog.h +++ b/src/infodialog.h @@ -54,7 +54,7 @@ public: private: - //! the pointer to the settings of kpowersave, get from constructor + //! the pointer to the settings of tdepowersave, get from constructor TDEConfig *settings; //! name of the entry in the settings diff --git a/src/logviewer.cpp b/src/logviewer.cpp index 7d5d7b2..bd2207a 100644 --- a/src/logviewer.cpp +++ b/src/logviewer.cpp @@ -41,7 +41,7 @@ LogViewer::LogViewer( TQString filename, TQWidget *parent, const char *name) :log_viewer(parent, name, false, WDestructiveClose ) { - this->setCaption(i18n("KPowersave Logfile Viewer: %1").arg(filename)); + this->setCaption(i18n("TDEPowersave Logfile Viewer: %1").arg(filename)); if (!TQFile::exists ( filename )) return; diff --git a/src/logviewer.h b/src/logviewer.h index 53b49b7..9bb6274 100644 --- a/src/logviewer.h +++ b/src/logviewer.h @@ -26,7 +26,7 @@ */ /*! * \class LogViewer -* \brief class for view logfiles in KPowersave related funtionality +* \brief class for view logfiles in TDEPowersave related funtionality * \author Danny Kukawka, <[email protected]>, <[email protected]> * \version 0.0.1 * \date 2007 diff --git a/src/main.cpp b/src/main.cpp index ca7ad52..d44b70c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,22 +19,22 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kpowersave.h" +#include "tdepowersave.h" #include <kuniqueapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdelocale.h> #include <kiconloader.h> -#include "kpowersave_debug.h" +#include "tdepowersave_debug.h" /*! * \file main.cpp - * \brief The file with the \ref kdemain class to start kpowersave. + * \brief The file with the \ref kdemain class to start tdepowersave. */ /*! * \class kdemain - * \brief The kpowersave kdemain class, which is the startpoint of KPowersave. + * \brief The tdepowersave kdemain class, which is the startpoint of TDEPowersave. * \author Thomas Renninger, <[email protected]> * \author Danny Kukawka, <[email protected]>, <[email protected]> * \date 2004 - 2007 @@ -52,7 +52,7 @@ bool trace = false; extern "C" int kdemain(int argc, char **argv) { - TDEAboutData about("kpowersave", I18N_NOOP("KPowersave"), version, description, + TDEAboutData about("tdepowersave", I18N_NOOP("TDEPowersave"), version, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 2004-2006, Danny Kukawka\n" "(c) 2004 Thomas Renninger")); @@ -76,16 +76,16 @@ int kdemain(int argc, char **argv) TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (!KUniqueApplication::start()) { - fprintf(stderr, "KPowersave is already running!\n"); + fprintf(stderr, "TDEPowersave is already running!\n"); exit(0); } KUniqueApplication app; app.disableSessionManagement(); - kpowersave *mainWin = 0; + tdepowersave *mainWin = 0; - mainWin = new kpowersave(args->isSet( "force-acpi-check" ), args->isSet( "dbg-trace" )); + mainWin = new tdepowersave(args->isSet( "force-acpi-check" ), args->isSet( "dbg-trace" )); app.setMainWidget( mainWin ); mainWin->show(); diff --git a/src/pics/CMakeLists.txt b/src/pics/CMakeLists.txt index 0e4a84c..9ce88be 100644 --- a/src/pics/CMakeLists.txt +++ b/src/pics/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kpowersave/icons ) +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/tdepowersave/icons ) diff --git a/src/pics/Makefile.am b/src/pics/Makefile.am index c63aa20..213fe82 100644 --- a/src/pics/Makefile.am +++ b/src/pics/Makefile.am @@ -1,3 +1,3 @@ -kpowersaveiconsdir = $(kde_datadir)/kpowersave/icons -kpowersaveicons_ICON = AUTO +tdepowersaveiconsdir = $(kde_datadir)/tdepowersave/icons +tdepowersaveicons_ICON = AUTO diff --git a/src/screen.cpp b/src/screen.cpp index 092c4bd..6bbce76 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -29,7 +29,7 @@ // own headers #include "screen.h" -#include "kpowersave_debug.h" +#include "tdepowersave_debug.h" /* needed for lXext C library linkage */ extern "C" { diff --git a/src/settings.cpp b/src/settings.cpp index ea1aa4a..cf860e0 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -35,7 +35,7 @@ /*! This is the default constructor of the class Settings. */ Settings::Settings() { - tdeconfig = new TDEConfig("kpowersaverc", true ); + tdeconfig = new TDEConfig("tdepowersaverc", true ); kde = new KDE_Settings(); load_kde(); load_general_settings(); @@ -50,7 +50,7 @@ Settings::~Settings() /*! - * Loads the scheme settings from kpowersaverc and fills the related variables. + * Loads the scheme settings from tdepowersaverc and fills the related variables. * \param schemeName TQString with the name (realname not i18n() version) of the * scheme which setting should be load. If the scheme could not * be loaded, this function try to load "default-scheme" @@ -231,7 +231,7 @@ bool Settings::load_scheme_settings(TQString schemeName){ /*! - * Loads the general settings from kpowersaverc and fills the related variables. + * Loads the general settings from tdepowersaverc and fills the related variables. * \return the result of the load * \retval true if the settings could be loaded * \retval false if there was no group named 'General' diff --git a/src/settings.h b/src/settings.h index 9a083a0..0b7cba4 100644 --- a/src/settings.h +++ b/src/settings.h @@ -175,33 +175,33 @@ public: * \li false: if not lock the screen */ bool lockOnLidClose; - //! if kpowersave starts on login + //! if tdepowersave starts on login /*! - * This boolean tells if kpowersave should be start automatically on userlogin. + * This boolean tells if tdepowersave should be start automatically on userlogin. * The value could be changed trough the configuration dialog and if the user - * stop kpowersave. + * stop tdepowersave. * \li true: if autostart * \li false: if not start on login */ bool autostart; - //! if kpowersave ask for the user for autostart + //! if tdepowersave ask for the user for autostart /*! - * This boolean tells if kpowersave ask for autostart settings if user stop kpowersave. + * This boolean tells if tdepowersave ask for autostart settings if user stop tdepowersave. * \li true: if ask on stop * \li false: if never ask */ bool autostartNeverAsk; - //! if kpowersave should force DPMS shutdown for display for lidclose + //! if tdepowersave should force DPMS shutdown for display for lidclose /*! - * This boolean tells if kpowersave should force dpms shutdown for the display if a + * This boolean tells if tdepowersave should force dpms shutdown for the display if a * lidclose event was recieved * \li true: if shutdown display * \li false: if not */ bool forceDpmsOffOnLidClose; - //! if kpowersave should call SetPowerSave() on HAL + //! if tdepowersave should call SetPowerSave() on HAL /*! - * This boolean tells if kpowersave should call SetPowerSave on HAL depending + * This boolean tells if tdepowersave should call SetPowerSave on HAL depending * on the AC state. * \li true: if should call * \li false: if not @@ -210,7 +210,7 @@ public: //! time after resume to fake keyevent /*! - * This integere contains the time after wich kpowersave should fake a keyevent + * This integere contains the time after wich tdepowersave should fake a keyevent * to show the login dialog if the desktop was locked on suspend. Value is in msec. */ int timeToFakeKeyAfterLock; @@ -270,43 +270,43 @@ public: TQString currentScheme; // ---------- Screensaver/DPMS section ------------ // - //! if kpowersave use own screensaver settings + //! if tdepowersave use own screensaver settings /*! - * This boolean represent kpowersave userspecific screensaver settings. If kpowersave + * This boolean represent tdepowersave userspecific screensaver settings. If tdepowersave * use own screensaver settings the KDE or GNOME settings are overwritten. - * \li true: if kpowersave use own settings - * \li false: if kpowersave don't change any screensaver settings + * \li true: if tdepowersave use own settings + * \li false: if tdepowersave don't change any screensaver settings */ bool specSsSettings; - //! if kpowersave should disable the screensaver + //! if tdepowersave should disable the screensaver /*! - * This boolean tells if kpowersave should disable the screensaver. - * \li true: if kpowersave should disable the screensaver + * This boolean tells if tdepowersave should disable the screensaver. + * \li true: if tdepowersave should disable the screensaver * \li false: if not */ bool disableSs; - //! if kpowersave should blank only the screen + //! if tdepowersave should blank only the screen /*! - * This boolean tells if kpowersave should blank only the screen instead of + * This boolean tells if tdepowersave should blank only the screen instead of * using the global selected KDE or GNOME screensaver. - * \li true: if kpowersave should blank only the screen + * \li true: if tdepowersave should blank only the screen * \li false: if not and don't change anything */ bool blankSs; - //! if kpowersave use own DPMS settings + //! if tdepowersave use own DPMS settings /*! - * This boolean tells if kpowersave should use own userspecific settings for - * Display PowerManagement Settings. If this value is true kpowersave overwritte + * This boolean tells if tdepowersave should use own userspecific settings for + * Display PowerManagement Settings. If this value is true tdepowersave overwritte * the KDE or GNOME global settings. - * \li true: if kpowersave use own DPMS settings - * \li false: if kpowersave don't change DPMS settings + * \li true: if tdepowersave use own DPMS settings + * \li false: if tdepowersave don't change DPMS settings */ bool specPMSettings; - //! if kpowersave should disable DPMS + //! if tdepowersave should disable DPMS /*! - * This boolean tells if kpowersave should disable DPMS. If this is used, - * kpowersave overwrite the KDE or GNOME global settings. - * \li true: if kpowersave should disable dpms + * This boolean tells if tdepowersave should disable DPMS. If this is used, + * tdepowersave overwrite the KDE or GNOME global settings. + * \li true: if tdepowersave should disable dpms * \li false: if not */ bool disableDPMS; @@ -364,7 +364,7 @@ public: bool autoInactiveSBlistEnabled; //! time of user inactivity to execute a defined action /*! - * This integer represent the time in minutes after which kpowersave + * This integer represent the time in minutes after which tdepowersave * should execute a specific through \ref autoInactiveAction defined * action. */ @@ -390,9 +390,9 @@ public: TQStringList autoInactiveSBlist; // ------ Autosuspend countdown dialog section -------- // - //! if KPowersave should display a dialog with a warning for autosuspend + //! if TDEPowersave should display a dialog with a warning for autosuspend /*! - * This boolean tells if KPowersave should show a warning dialog + * This boolean tells if TDEPowersave should show a warning dialog * with a countdown before call the autosuspend. * \li true: if show dialog * \li false: if not @@ -425,7 +425,7 @@ public: bool autoDimmSBlistEnabled; //! time of user inactivity to dimm the display /*! - * This integer represent the time in minutes after which kpowersave + * This integer represent the time in minutes after which tdepowersave * should dimm the display to the level defined by \ref autoDimmTo . */ int autoDimmAfter; @@ -468,7 +468,7 @@ public: //! if umount/remount external volumes on suspend /*! - * This boolean tells if KPowersave should umount external partitions + * This boolean tells if TDEPowersave should umount external partitions * before suspend and remount them after resume. * \li true: if umount/remount * \li false: if not @@ -487,7 +487,7 @@ public: private: - //! configuration of kpowersave + //! configuration of tdepowersave TDEConfig *tdeconfig; //! to map a battery action string to the related type diff --git a/src/suspenddialog.cpp b/src/suspenddialog.cpp index 26469da..ff3b04d 100644 --- a/src/suspenddialog.cpp +++ b/src/suspenddialog.cpp @@ -41,7 +41,7 @@ suspendDialog::suspendDialog(TQWidget *parent, const char *name) :suspend_Dialog(parent, name, true, TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ) { - this->setIcon(SmallIcon("kpowersave", TQIconSet::Automatic)); + this->setIcon(SmallIcon("tdepowersave", TQIconSet::Automatic)); } /*! This is the default destructor of the class. */ @@ -65,7 +65,7 @@ void suspendDialog::setPixmap( TQString type ) } else if (type.startsWith("standby")) { pixmap = TDEGlobal::iconLoader()->loadIcon("stand_by", TDEIcon::NoGroup, TDEIcon::SizeLarge); } else { - pixmap = TDEGlobal::iconLoader()->loadIcon("kpowersave", TDEIcon::NoGroup, TDEIcon::SizeLarge); + pixmap = TDEGlobal::iconLoader()->loadIcon("tdepowersave", TDEIcon::NoGroup, TDEIcon::SizeLarge); } setCaption(i18n("Preparing Suspend...")); iconPixmap->setPixmap( pixmap ); diff --git a/src/kpowersave-autostart.desktop b/src/tdepowersave-autostart.desktop index 96bc19f..20cf6e0 100644 --- a/src/kpowersave-autostart.desktop +++ b/src/tdepowersave-autostart.desktop @@ -1,20 +1,20 @@ [Desktop Entry] Encoding=UTF-8 -Name=kpowersave -Name[xx]=xxkpowersavexx -Name[de]=KPowersave -Name[es]=KPowersave -Name[fr]=KPowersave -Name[it]=KPowersave -Name[ja]=KPowersave -Name[pt_BR]=KPowersave -Name[ru]=KPowersave -Name[sv]=KPowersave -Name[zh_CN]=KPowersave -Name[zh_TW]=KPowersave +Name=tdepowersave +Name[xx]=xxtdepowersavexx +Name[de]=TDEPowersave +Name[es]=TDEPowersave +Name[fr]=TDEPowersave +Name[it]=TDEPowersave +Name[ja]=TDEPowersave +Name[pt_BR]=TDEPowersave +Name[ru]=TDEPowersave +Name[sv]=TDEPowersave +Name[zh_CN]=TDEPowersave +Name[zh_TW]=TDEPowersave GenericName=Battery Monitor -Exec=kpowersave -Icon=kpowersave +Exec=tdepowersave +Icon=tdepowersave Type=Application Comment=Battery monitor and general power management Comment[bg]=Монитор за батерията и основно управление на енергията @@ -63,6 +63,6 @@ Comment[zh_TW]=電池監視器和一般電源管理 X-TDE-autostart-after=panel X-TDE-StartupNotify=false X-TDE-UniqueApplet=true -X-TDE-autostart-condition=kpowersaverc:General:Autostart:true +X-TDE-autostart-condition=tdepowersaverc:General:Autostart:true Categories=System;Applet; diff --git a/src/kpowersave.cpp b/src/tdepowersave.cpp index a248da5..da3071a 100644 --- a/src/kpowersave.cpp +++ b/src/tdepowersave.cpp @@ -41,18 +41,18 @@ #include <tqtooltip.h> // own headers: -#include "kpowersave.h" +#include "tdepowersave.h" #include "infodialog.h" /*! -* \file kpowersave.cpp -* \brief This file contains the main functionality of the kpowersave-applet.*/ +* \file tdepowersave.cpp +* \brief This file contains the main functionality of the tdepowersave-applet.*/ /*! - * This is the default constructor of the class kpowersave. + * This is the default constructor of the class tdepowersave. */ -kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0, "kpowersave"), - DCOPObject("KPowersaveIface") { +tdepowersave::tdepowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0, "tdepowersave"), + DCOPObject("tdepowersaveIface") { trace = trace_func; kdDebugFuncIn(trace); @@ -72,13 +72,13 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0 if(!config->readBoolEntry("AlreadyStarted", false) || force_acpi_check){ config->writeEntry("AlreadyStarted", true); // check whether APM, ACPI, PMU, CPUFreq or Suspend2Disk/ram supported, otherwise end up - // and don't start kpowersave ever again until force_acpi_check == true. + // and don't start tdepowersave ever again until force_acpi_check == true. if (!hwinfo->hasACPI() && !hwinfo->hasAPM() && !hwinfo->hasPMU() && !hwinfo->supportCPUFreq() && !suspend.suspend2disk && !suspend.suspend2ram){ config->writeEntry("Autostart", false); config->sync(); kdError() << "This machine does not support ACPI, APM, PMU, CPUFreq, Suspend2Disk nor " - << "Suspend2RAM. Please close KPowersave now." << endl; + << "Suspend2RAM. Please close tdepowersave now." << endl; exit(-1); } } @@ -142,8 +142,8 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0 } -/*! This is the default destructor of class kpowersave. */ -kpowersave::~kpowersave(){ +/*! This is the default destructor of class tdepowersave. */ +tdepowersave::~tdepowersave(){ kdDebugFuncIn(trace); delete hwinfo; @@ -158,11 +158,11 @@ kpowersave::~kpowersave(){ /*! * use this function to initalise the main kicker menu */ -void kpowersave::initMenu() { +void tdepowersave::initMenu() { kdDebugFuncIn(trace); CONFIGURE_ID = this->contextMenu()->insertItem(SmallIcon("configure", TQIconSet::Automatic), - i18n("Configure KPowersave..."), + i18n("Configure TDEPowersave..."), this, TQT_SLOT(showConfigureDialog())); CONFIGURE_EVENTS_ID = this->contextMenu()->insertItem(SmallIcon("knotify", TQIconSet::Automatic), i18n("Configure Notifications..."), @@ -215,12 +215,12 @@ void kpowersave::initMenu() { help_menu = new TQPopupMenu(this, i18n("&Help").ascii()); - help_menu->insertItem( SmallIcon("help", TQIconSet::Automatic), i18n("&KPowersave Handbook"), + 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("kpowersave", TQIconSet::Automatic), - i18n("&About KPowersave"), this, TQT_SLOT(slotAbout())); + 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); @@ -230,7 +230,7 @@ void kpowersave::initMenu() { kdDebugFuncOut(trace); } -void kpowersave::resizeEvent ( TQResizeEvent * ) +void tdepowersave::resizeEvent ( TQResizeEvent * ) { // Honor Free Desktop specifications that allow for arbitrary system tray icon sizes loadIcon(true); @@ -241,7 +241,7 @@ void kpowersave::resizeEvent ( TQResizeEvent * ) * This funtion load and manipulate the icons for the kickerapplet-section. * The redraw interval depends on \ref icon_set_colored and \ref BAT_icon_BG_intervall. */ -void kpowersave::redrawPixmap(){ +void tdepowersave::redrawPixmap(){ kdDebugFuncIn(trace); // if colored icon_background: normal redraw intervall is set off. @@ -261,9 +261,9 @@ void kpowersave::redrawPixmap(){ } /*! - * Starts the configure dialog of kpowersave. + * Starts the configure dialog of tdepowersave. */ -void kpowersave::showConfigureDialog() { +void tdepowersave::showConfigureDialog() { kdDebugFuncIn(trace); if(!config_dialog_shown) { @@ -289,9 +289,9 @@ void kpowersave::showConfigureDialog() { } /*! - * Starts the notification configure dialog of kpowersave. + * Starts the notification configure dialog of tdepowersave. */ -void kpowersave::showConfigureNotificationsDialog() { +void tdepowersave::showConfigureNotificationsDialog() { kdDebugFuncIn(trace); KNotifyDialog::configure(this); @@ -304,7 +304,7 @@ void kpowersave::showConfigureNotificationsDialog() { * To reduce the systemload the icons are only reloaded if \ref pixmap_name * is changed. */ -void kpowersave::loadIcon(bool forceReload){ +void tdepowersave::loadIcon(bool forceReload){ kdDebugFuncIn(trace); TQString pixmap_name_tmp = "NONE"; @@ -371,7 +371,7 @@ void kpowersave::loadIcon(bool forceReload){ * the same and white pixel only in the rectangle of the icon, the white pixel * stored in \ref countWhiteIconPixel only one time. */ -void kpowersave::drawIcon(){ +void tdepowersave::drawIcon(){ kdDebugFuncIn(trace); BatteryCollection *primary = hwinfo->getPrimaryBatteries(); @@ -443,7 +443,7 @@ quit: * should implement this.\n If it is possible we should update the tooltip permanently * while the mouse cursor is over the widget */ -void kpowersave::updateTooltip(){ +void tdepowersave::updateTooltip(){ kdDebugFuncIn(trace); BatteryCollection *primary = hwinfo->getPrimaryBatteries(); @@ -506,7 +506,7 @@ void kpowersave::updateTooltip(){ * with ID \ref YAST_MODULE_MENU_ID, named "Start YaST2 Power Management Module". * It create a new TDEProcess and execute "/sbin/yast2 power-management" with tdesu. */ -void kpowersave::do_config(){ +void tdepowersave::do_config(){ kdDebugFuncIn(trace); #ifdef ENABLE_YAST_ENTRY @@ -531,17 +531,17 @@ void kpowersave::do_config(){ } /*! - * \b TQT_SLOT to open the KPowersave help + * \b TQT_SLOT to open the tdepowersave help */ -void kpowersave::slotHelp() +void tdepowersave::slotHelp() { - kapp->invokeHelp( "", "kpowersave" ); + kapp->invokeHelp( "", "tdepowersave" ); } /*! - * \b TQT_SLOT to open the KPowersave About dialog + * \b TQT_SLOT to open the tdepowersave About dialog */ -void kpowersave::slotAbout() +void tdepowersave::slotAbout() { TDEAboutApplication a( this ); a.exec(); @@ -550,7 +550,7 @@ void kpowersave::slotAbout() /*! * \b TQT_SLOT to open the website to report bugs */ -void kpowersave::slotReportBug() +void tdepowersave::slotReportBug() { #ifdef DISTRO_IS_SUSE #ifdef DISTRO_IS_SLES_SLED @@ -582,7 +582,7 @@ void kpowersave::slotReportBug() * The slot called by the TQTimer \ref BAT_WARN_ICON_Timer . The interval of the timer is defined * trough \ref BAT_icon_BG_intervall and starts here: \ref loadIcon() . */ -void kpowersave::do_setIconBG(){ +void tdepowersave::do_setIconBG(){ kdDebugFuncIn(trace); if (icon_set_colored) icon_state_changed = true; @@ -593,7 +593,7 @@ void kpowersave::do_setIconBG(){ /*! * \b TQT_SLOT to enable/disable the autosuspend. */ -void kpowersave::do_setAutosuspend(){ +void tdepowersave::do_setAutosuspend(){ kdDebugFuncIn(trace); if(!contextMenu()->isItemChecked(AUTOSUSPEND_MENU_ID)) { @@ -620,7 +620,7 @@ void kpowersave::do_setAutosuspend(){ * \ref config_dialog_shown to false. * TODO: check if we maybe should force here the current default scheme depending on the AC/battery state */ -void kpowersave::observeConfigDlg(){ +void tdepowersave::observeConfigDlg(){ kdDebugFuncIn(trace); // reload general settings @@ -645,7 +645,7 @@ void kpowersave::observeConfigDlg(){ * \b TQT_SLOT which called from \ref do_config() if the 'tdesu yast2' TDEProcess exited. * This function control the return value and display if needed a errormessage on failure. */ -void kpowersave::slotConfigProcessExited(TDEProcess *proc){ +void tdepowersave::slotConfigProcessExited(TDEProcess *proc){ kdDebugFuncIn(trace); #ifdef ENABLE_YAST_ENTRY @@ -680,7 +680,7 @@ void kpowersave::slotConfigProcessExited(TDEProcess *proc){ * \retval true if successful * \retval false if command not supported or if powersaved not running */ -bool kpowersave::do_suspend2disk(){ +bool tdepowersave::do_suspend2disk(){ kdDebugFuncIn(trace); if (suspend.suspend2disk) { @@ -736,7 +736,7 @@ bool kpowersave::do_suspend2disk(){ * \retval true if successful * \retval false if command not supported or if powersaved not running */ -bool kpowersave::do_suspend2ram(){ +bool tdepowersave::do_suspend2ram(){ kdDebugFuncIn(trace); if (suspend.suspend2ram) { @@ -792,7 +792,7 @@ bool kpowersave::do_suspend2ram(){ * \retval true if successful * \retval false if command not supported or if powersaved not running */ -bool kpowersave::do_standby(){ +bool tdepowersave::do_standby(){ kdDebugFuncIn(trace); if (suspend.standby) { @@ -844,7 +844,7 @@ bool kpowersave::do_standby(){ * the dialog if needed or call directly autosuspend after the signal * \ref autosuspend::inactivityTimeExpired was recieved. */ -void kpowersave::do_autosuspendWarn() { +void tdepowersave::do_autosuspendWarn() { kdDebugFuncIn(trace); if (settings->autoSuspendCountdown && (settings->autoSuspendCountdownTimeout > 0)) { @@ -861,7 +861,7 @@ void kpowersave::do_autosuspendWarn() { } else if (settings->autoInactiveAction == "Standby") { countdown->setPixmap("standby"); } else { - countdown->setPixmap("kpowersave"); + countdown->setPixmap("tdepowersave"); } // TODO: rework this after translation round for openSUSE 10.3 ! @@ -891,7 +891,7 @@ void kpowersave::do_autosuspendWarn() { * \todo add check if the requested command is supported befor send and * add message for this case to tell that maybe changed config! */ -bool kpowersave::do_autosuspend(bool chancel) { +bool tdepowersave::do_autosuspend(bool chancel) { kdDebugFuncIn(trace); // TODO: check if this is really needed, it get called also on the suspend methodes @@ -931,7 +931,7 @@ bool kpowersave::do_autosuspend(bool chancel) { * \retval true if successful * \retval false else */ -void kpowersave::do_downDimm() { +void tdepowersave::do_downDimm() { kdDebugFuncIn(trace); if (hwinfo->supportBrightness()) { @@ -968,7 +968,7 @@ void kpowersave::do_downDimm() { * \retval true if successful * \retval false else */ -void kpowersave::do_upDimm() { +void tdepowersave::do_upDimm() { kdDebugFuncIn(trace); //NOTE we go back to the value of the scheme and not the last on, to reduce trouble with the scheme @@ -1009,7 +1009,7 @@ void kpowersave::do_upDimm() { * \retval true if successful * \retval false else */ -void kpowersave::do_dimm() { +void tdepowersave::do_dimm() { kdDebugFuncIn(trace); int current = hwinfo->getCurrentBrightnessLevel(); @@ -1047,7 +1047,7 @@ void kpowersave::do_dimm() { * \retval true if all was successful * \retval false if not */ -bool kpowersave::handleMounts( bool suspend ) { +bool tdepowersave::handleMounts( bool suspend ) { if (trace) kdDebug() << funcinfo << "IN: " << "called suspend: " << suspend << endl; bool _ret = false; @@ -1120,7 +1120,7 @@ bool kpowersave::handleMounts( bool suspend ) { /*! * Handle the event for the power button and call the related action. */ -void kpowersave::handlePowerButtonEvent( ) { +void tdepowersave::handlePowerButtonEvent( ) { kdDebugFuncIn(trace); /* Only go to suspend on button event if we already resumed successful. @@ -1136,7 +1136,7 @@ void kpowersave::handlePowerButtonEvent( ) { /*! * Handle the event for the suspend2ram/sleep button and call the related action. */ -void kpowersave::handleSleepButtonEvent() { +void tdepowersave::handleSleepButtonEvent() { kdDebugFuncIn(trace); // Only go to suspend on button event if we already resumed successful. @@ -1150,7 +1150,7 @@ void kpowersave::handleSleepButtonEvent() { /*! * Handle the event for the suspend2disk (hibernater) button and call the related action. */ -void kpowersave::handleS2DiskButtonEvent(){ +void tdepowersave::handleS2DiskButtonEvent(){ kdDebugFuncIn(trace); // Only go to suspend on button event if we already resumed successful. @@ -1166,7 +1166,7 @@ void kpowersave::handleS2DiskButtonEvent(){ * depends on the user specific settings. * \param closed boolean with info if the lid is closed or not */ -void kpowersave::handleLidEvent( bool closed ){ +void tdepowersave::handleLidEvent( bool closed ){ if (trace) kdDebug() << funcinfo << "IN: " << "Lid closed? " << closed << endl; if (closed) { @@ -1222,7 +1222,7 @@ void kpowersave::handleLidEvent( bool closed ){ /*! * \b TQT_SLOT to show the login dialog if the desktop was locked before the suspend. */ -void kpowersave::activateLoginScreen(){ +void tdepowersave::activateLoginScreen(){ kdDebugFuncIn(trace); // get new general settings! This could maybe removed if we @@ -1239,7 +1239,7 @@ void kpowersave::activateLoginScreen(){ /*! * \b TQT_SLOT to set the current suspend type for later use. */ -void kpowersave::setSuspendType( TQString suspendtype){ +void tdepowersave::setSuspendType( TQString suspendtype){ kdDebugFuncIn(trace); suspendType = suspendtype; @@ -1248,11 +1248,11 @@ void kpowersave::setSuspendType( TQString suspendtype){ } /*! - * \b TQT_SLOT which called if kpowersave is exited by the user. In this case the user - * is asked through a yes/no box if "KPowersave start automatically on log in" and the + * \b TQT_SLOT which called if tdepowersave is exited by the user. In this case the user + * is asked through a yes/no box if "tdepowersave start automatically on log in" and the * result is written to the KDE configfile. */ -void kpowersave::_quit (){ +void tdepowersave::_quit (){ kdDebugFuncIn(trace); // set the KDE-Settings back to user default @@ -1281,7 +1281,7 @@ void kpowersave::_quit (){ } if(!settings->autostartNeverAsk) { - TQString tmp1 = i18n ("Start KPowersave automatically when you log in?"); + TQString tmp1 = i18n ("Start tdepowersave automatically when you log in?"); int tmp2 = KMessageBox::questionYesNo ( 0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start")); config->setGroup("General"); @@ -1295,7 +1295,7 @@ void kpowersave::_quit (){ /*! * \b TQT_SLOT called if the user select a 'CPU Frequency Policy' from the menu ( \ref CPUFRETQ_MENU_ID ). */ -void kpowersave::do_setSpeedPolicy(int menu_id){ +void tdepowersave::do_setSpeedPolicy(int menu_id){ if (trace) kdDebug() << funcinfo << "IN: " << "menu_id/set policy to: " << menu_id << endl; if(!hwinfo->setCPUFreq((cpufreq_type)menu_id, settings->cpuFreqDynamicPerformance)) { @@ -1314,7 +1314,7 @@ void kpowersave::do_setSpeedPolicy(int menu_id){ * \b TQT_SLOT called if the user select a scheme from the menu. If there is any errormessage * while try to set the selected scheme, the user get a messagebox with info. */ -void kpowersave::do_setActiveScheme( int i ){ +void tdepowersave::do_setActiveScheme( int i ){ if (trace) kdDebug() << funcinfo << "IN: " << "set scheme to: " << i << endl; if(!settings->schemes[i].isEmpty() && (settings->schemes[i] != settings->currentScheme)) { @@ -1341,7 +1341,7 @@ void kpowersave::do_setActiveScheme( int i ){ * If the battery is in warning state (and powersave set pdaemon->send_battery_state_change_message) * the function pop-up a messagebox. */ -void kpowersave::update(){ +void tdepowersave::update(){ kdDebugFuncIn(trace); int redraw_pixmap = 0; @@ -1440,7 +1440,7 @@ void kpowersave::update(){ /*! * This function is involved if the CPUFreqMenu must be updated. */ -void kpowersave::updateCPUFreqMenu(){ +void tdepowersave::updateCPUFreqMenu(){ kdDebugFuncIn(trace); if (hwinfo->supportCPUFreq() && hwinfo->isOnline() && hwinfo->isCpuFreqAllowed()) { @@ -1493,7 +1493,7 @@ void kpowersave::updateCPUFreqMenu(){ * By this way also set the settings for screensaver and other parameter * related to the selected scheme. */ -void kpowersave::updateSchemeMenu(){ +void tdepowersave::updateSchemeMenu(){ kdDebugFuncIn(trace); if (settings->schemes.count() == 0 || !hwinfo->isOnline()){ @@ -1575,13 +1575,13 @@ void kpowersave::updateSchemeMenu(){ /*! * Reimplemented eventhandler for mouse enterEvent. This is called if the mouse cursor - * enters the widget. In this case if the user move the mouse cursor over the kpowersave + * enters the widget. In this case if the user move the mouse cursor over the tdepowersave * trayicon. \n \n * We use this event to update the Tooltip with all needed information. The time beetween * the event and the automatically popup of the TQToolTip should be long enought to collect * the needed values and add a updated Tooltip. */ -void kpowersave::enterEvent( TQEvent */*qee*/ ){ +void tdepowersave::enterEvent( TQEvent */*qee*/ ){ updateTooltip(); @@ -1593,7 +1593,7 @@ void kpowersave::enterEvent( TQEvent */*qee*/ ){ * this will raise the brightness by one level for wheel up events and lower the * brightness by one level for wheel down events. */ -void kpowersave::wheelEvent (TQWheelEvent *qwe) +void tdepowersave::wheelEvent (TQWheelEvent *qwe) { kdDebugFuncIn(trace); @@ -1617,7 +1617,7 @@ void kpowersave::wheelEvent (TQWheelEvent *qwe) * right and the left mousebutton activate the menu. In the future this can also used * to popup maybe a other menu. */ -void kpowersave::mousePressEvent(TQMouseEvent *qme){ +void tdepowersave::mousePressEvent(TQMouseEvent *qme){ kdDebugFuncIn(trace); KSystemTray::mousePressEvent(qme); @@ -1637,19 +1637,19 @@ void kpowersave::mousePressEvent(TQMouseEvent *qme){ * \b TQT_SLOT called if the detaileddialog is closed. With this we prevent open * the dialog twice, use this function to reset the used variables. */ -void kpowersave::closedetaileddialog() { +void tdepowersave::closedetaileddialog() { detailedIsShown = false; } /*! - * \b TQT_SLOT used to display messeges in kpowersave. This function - * block all messeges which we have in kpowersave! + * \b TQT_SLOT used to display messeges in tdepowersave. This function + * block all messeges which we have in tdepowersave! */ -void kpowersave::showErrorMessage( TQString msg ){ +void tdepowersave::showErrorMessage( TQString msg ){ kdDebugFuncIn(trace); if(settings->psMsgAsPassivePopup) { - KPassivePopup::message("KPowersave", msg, SmallIcon("messagebox_warning", 20), + KPassivePopup::message("tdepowersave", msg, SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 10000); } else { kapp->updateUserTimestamp(); @@ -1666,7 +1666,7 @@ void kpowersave::showErrorMessage( TQString msg ){ * e.g. the screensaver and dpms settings. Don't forget to call this function if * a scheme is changed or if the settings changed. */ -void kpowersave::setSchemeSettings(){ +void tdepowersave::setSchemeSettings(){ kdDebugFuncIn(trace); // --> check if there is a scheme set, if not, use defaults @@ -1788,7 +1788,7 @@ void kpowersave::setSchemeSettings(){ * \param resumed boolean value which represent information if machine * currently back from suspend/standby */ -void kpowersave::setAutoSuspend( bool resumed ){ +void tdepowersave::setAutoSuspend( bool resumed ){ if (trace) kdDebug() << funcinfo << "IN: " << "resumed? " << resumed << endl; if(settings->autoInactiveActionAfter > 0 && settings->autoSuspend) { @@ -1840,7 +1840,7 @@ void kpowersave::setAutoSuspend( bool resumed ){ * \param resumed boolean value which represent information if machine * currently back from suspend/standby */ -void kpowersave::setAutoDimm( bool resumed ){ +void tdepowersave::setAutoDimm( bool resumed ){ if (trace) kdDebug() << funcinfo << "IN: " << "resumed? " << resumed << endl; if(settings->autoDimmAfter > 0 && settings->autoDimm) { @@ -1879,7 +1879,7 @@ void kpowersave::setAutoDimm( bool resumed ){ * \param type integer with the type of the battery * \param state integer represent the reached battery state */ -void kpowersave::notifyBatteryStatusChange ( int type, int state ) { +void tdepowersave::notifyBatteryStatusChange ( int type, int state ) { if (trace) kdDebug() << funcinfo << "IN: " << "type: " << type << "state: " << state << endl; @@ -1888,14 +1888,14 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) { int min = primary->getRemainingMinutes(); if (primary->getChargingState() == CHARGING) { - kdDebug() << "kpowersave::notifyBatteryStatusChange: Battery is charging, ignore event" << endl; + kdDebug() << "tdepowersave::notifyBatteryStatusChange: Battery is charging, ignore event" << endl; return; } if (hwinfo->getAcAdapter()) { // the machine is on AC, no need to inform about battery state, // this is maybe only a race condition with not directly actuall // charge state - kdDebug() << "kpowersave::notifyBatteryStatusChange: Machine is on AC, ignore event" << endl; + kdDebug() << "tdepowersave::notifyBatteryStatusChange: Machine is on AC, ignore event" << endl; kdDebugFuncOut(trace); return; } @@ -1961,7 +1961,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) { * because of TQTimer::singleShot() can't take param ... * NOTE: Use this only for SHUTDOWN atm */ -void kpowersave::handleCriticalBatteryActionCall () { +void tdepowersave::handleCriticalBatteryActionCall () { kdDebugFuncIn(trace); handleActionCall(GO_SHUTDOWN, settings->batteryCriticalLevelActionValue, true, true); @@ -1975,7 +1975,7 @@ void kpowersave::handleCriticalBatteryActionCall () { * \param value integer value of the action as e.g. a brightness level * \param checkAC bool if there should be a check for AC state befor call the action */ -void kpowersave::handleActionCall ( action action, int value , bool checkAC, bool batWarnCall ) { +void tdepowersave::handleActionCall ( action action, int value , bool checkAC, bool batWarnCall ) { if (trace) kdDebug() << funcinfo << "IN: " << "action: " << action << "value: " << value << "checkAC: " << checkAC << endl; @@ -2045,7 +2045,7 @@ void kpowersave::handleActionCall ( action action, int value , bool checkAC, boo * and switch to the AC/battery scheme depending on the state of AC * \param acstate boolean represent the state of AC (true == AC plugged in ...) */ -void kpowersave::handleACStatusChange ( bool acstate , bool notifyEvent ) { +void tdepowersave::handleACStatusChange ( bool acstate , bool notifyEvent ) { if (trace) kdDebug() << funcinfo << "IN: " << "acstate: " << acstate << "notifyEvent: " << notifyEvent << endl; int index; @@ -2082,7 +2082,7 @@ void kpowersave::handleACStatusChange ( bool acstate , bool notifyEvent ) { * \b TQT_SLOT called if scheme switched. Here we emit the related KNotify events * if they are not disabled. */ -void kpowersave::notifySchemeSwitch() { +void tdepowersave::notifySchemeSwitch() { kdDebugFuncIn(trace); if(!settings->disableNotifications) { @@ -2106,7 +2106,7 @@ void kpowersave::notifySchemeSwitch() { * \b TQT_SLOT called if the machine suspend. Here we emit the related KNotify events * if they are not disabled. */ -void kpowersave::notifySuspend( int suspendType ) { +void tdepowersave::notifySuspend( int suspendType ) { kdDebugFuncIn(trace); if(!settings->disableNotifications) { @@ -2138,7 +2138,7 @@ void kpowersave::notifySuspend( int suspendType ) { * \b TQT_SLOT called to independent handleResumeSignal() from event loop and * to avoid problems with the QT3 D-Bus bindings */ -void kpowersave::forwardResumeSignal( int result ) { +void tdepowersave::forwardResumeSignal( int result ) { if (trace) kdDebug() << funcinfo << "IN: " << "result: " << result << endl; resume_result = result; @@ -2152,7 +2152,7 @@ void kpowersave::forwardResumeSignal( int result ) { * \b TQT_SLOT called if the machine suspend. Here we emit the related KNotify events * if they are not disabled. */ -void kpowersave::handleResumeSignal() { +void tdepowersave::handleResumeSignal() { kdDebugFuncIn(trace); // fake key to show the login dialog if we locked the screen @@ -2259,7 +2259,7 @@ void kpowersave::handleResumeSignal() { * TODO: fix scheme handling * TODO: fix critical battery situations (see the todo file in the source) */ -void kpowersave::handleSessionState (bool state) { +void tdepowersave::handleSessionState (bool state) { kdDebugFuncIn(trace); if (state) { @@ -2287,7 +2287,7 @@ void kpowersave::handleSessionState (bool state) { * \param type Integer value with the suspend type * \return TQString with the translated name or NULL if it fail */ -TQString kpowersave::getSuspendString (int type) { +TQString tdepowersave::getSuspendString (int type) { kdDebugFuncIn(trace); switch (type) { @@ -2316,7 +2316,7 @@ TQString kpowersave::getSuspendString (int type) { * \retval true if locking the screen was successful * \retval false if locking the screen failed or the user don't wan't to lock */ -bool kpowersave::lockScreen(){ +bool tdepowersave::lockScreen(){ kdDebugFuncIn(trace); settings->load_general_settings(); @@ -2330,7 +2330,7 @@ bool kpowersave::lockScreen(){ * DCOP Interface funtion to return the name of the current powersave scheme. * \return TQString with the name of the current scheme */ -TQString kpowersave::currentScheme (){ +TQString tdepowersave::currentScheme (){ kdDebugFuncIn(trace); if(hwinfo->isOnline()) { @@ -2346,7 +2346,7 @@ TQString kpowersave::currentScheme (){ * DCOP Interface funtion to return the name of the current cpuFreqPolicy. * \return TQString with the name of the current cpuFreqPolicy */ -TQString kpowersave::currentCPUFreqPolicy() { +TQString tdepowersave::currentCPUFreqPolicy() { kdDebugFuncIn(trace); if(hwinfo->isOnline()) { @@ -2378,7 +2378,7 @@ TQString kpowersave::currentCPUFreqPolicy() { * CPU Frequency states. * \return TQStringList with the supported CPUFreq states */ -TQStringList kpowersave::listCPUFreqPolicies() { +TQStringList tdepowersave::listCPUFreqPolicies() { kdDebugFuncIn(trace); TQStringList ret_list; @@ -2403,7 +2403,7 @@ TQStringList kpowersave::listCPUFreqPolicies() { * \retval true if successful set * \retval false if not supported or any other failure */ -bool kpowersave::do_setCPUFreqPolicy( TQString policy ) { +bool tdepowersave::do_setCPUFreqPolicy( TQString policy ) { if (trace) kdDebug() << funcinfo << "IN: " << "policy: " << policy << endl; @@ -2433,7 +2433,7 @@ bool kpowersave::do_setCPUFreqPolicy( TQString policy ) { * sleeping states. * \return TQStringList with the supported spleeping states */ -TQStringList kpowersave::allowed_sleepingStates(){ +TQStringList tdepowersave::allowed_sleepingStates(){ kdDebugFuncIn(trace); TQStringList sleepList; @@ -2465,7 +2465,7 @@ TQStringList kpowersave::allowed_sleepingStates(){ * DCOP Interface funtion to send a list with the all schemes. * \return TQStringList with all schemes */ -TQStringList kpowersave::listSchemes(){ +TQStringList tdepowersave::listSchemes(){ kdDebugFuncIn(trace); TQStringList _schemeList; @@ -2491,7 +2491,7 @@ TQStringList kpowersave::listSchemes(){ * \param _scheme TQString with the scheme to set, scheme should be * named as list from list_schemes() */ -bool kpowersave::do_setScheme( TQString /*_scheme*/ ) { +bool tdepowersave::do_setScheme( TQString /*_scheme*/ ) { kdDebugFuncIn(trace); /* int index; @@ -2517,7 +2517,7 @@ bool kpowersave::do_setScheme( TQString /*_scheme*/ ) { * \retval true if successful * \retval false if not supported or powersaved not running */ -bool kpowersave::do_suspendToDisk(){ +bool tdepowersave::do_suspendToDisk(){ kdDebugFuncIn(trace); kdDebugFuncOut(trace); return do_suspend2disk(); @@ -2529,7 +2529,7 @@ bool kpowersave::do_suspendToDisk(){ * \retval true if successful * \retval false if not supported or powersaved not running */ -bool kpowersave::do_suspendToRAM(){ +bool tdepowersave::do_suspendToRAM(){ kdDebugFuncIn(trace); kdDebugFuncOut(trace); return do_suspend2ram(); @@ -2541,14 +2541,14 @@ bool kpowersave::do_suspendToRAM(){ * \retval true if successful * \retval false if not supported or powersaved not running */ -bool kpowersave::do_standBy(){ +bool tdepowersave::do_standBy(){ kdDebugFuncIn(trace); kdDebugFuncOut(trace); return do_standby(); } //! dcop function to set the brightness up -bool kpowersave::do_brightnessUp(int percentageStep) { +bool tdepowersave::do_brightnessUp(int percentageStep) { kdDebugFuncIn(trace); bool retval = false; @@ -2562,7 +2562,7 @@ bool kpowersave::do_brightnessUp(int percentageStep) { } //! dcop function to set the brightness down -bool kpowersave::do_brightnessDown(int percentageStep) { +bool tdepowersave::do_brightnessDown(int percentageStep) { kdDebugFuncIn(trace); bool retval = false; @@ -2581,7 +2581,7 @@ bool kpowersave::do_brightnessDown(int percentageStep) { * \param disable boolean which tell if the autosuspend should be stopped (true) * or started (false). */ -void kpowersave::disableAutosuspend( bool disable ){ +void tdepowersave::disableAutosuspend( bool disable ){ kdDebugFuncIn(trace); if(settings->autoSuspend && settings->autoInactiveActionAfter > 0) { @@ -2603,7 +2603,7 @@ void kpowersave::disableAutosuspend( bool disable ){ /*! * DCOP Interface funtion to open/close the detailed dialog. */ -void kpowersave::showDetailedDialog( ){ +void tdepowersave::showDetailedDialog( ){ kdDebugFuncIn(trace); if (detailedIsShown) { @@ -2631,7 +2631,7 @@ void kpowersave::showDetailedDialog( ){ * \retval false if failed (e.g. D-Bus or HAL is not running) * \retval true if correct opend */ -bool kpowersave::openConfigureDialog (){ +bool tdepowersave::openConfigureDialog (){ kdDebugFuncIn(trace); if(hwinfo->isOnline()) { @@ -2651,7 +2651,7 @@ bool kpowersave::openConfigureDialog (){ * \retval false if current scheme does not overwrite DPMS * \retval true if current scheme does */ -bool kpowersave::currentSchemeManagesDPMS () { +bool tdepowersave::currentSchemeManagesDPMS () { kdDebugFuncIn(trace); return settings->specPMSettings; @@ -2661,7 +2661,7 @@ bool kpowersave::currentSchemeManagesDPMS () { //! dcop funtion to get the current brightness level -int kpowersave::brightnessGet() { +int tdepowersave::brightnessGet() { kdDebugFuncIn(trace); int retval = -1; @@ -2675,4 +2675,4 @@ int kpowersave::brightnessGet() { return retval; } -#include "kpowersave.moc" +#include "tdepowersave.moc" diff --git a/src/kpowersave.desktop b/src/tdepowersave.desktop index 08021ab..61ad5b8 100644 --- a/src/kpowersave.desktop +++ b/src/tdepowersave.desktop @@ -1,20 +1,20 @@ [Desktop Entry] Encoding=UTF-8 -Name=kpowersave -Name[xx]=xxkpowersavexx -Name[de]=KPowersave -Name[es]=KPowersave -Name[fr]=KPowersave -Name[it]=KPowersave -Name[ja]=KPowersave -Name[pt_BR]=KPowersave -Name[ru]=KPowersave -Name[sv]=KPowersave -Name[zh_CN]=KPowersave -Name[zh_TW]=KPowersave +Name=tdepowersave +Name[xx]=xxtdepowersavexx +Name[de]=TDEPowersave +Name[es]=TDEPowersave +Name[fr]=TDEPowersave +Name[it]=TDEPowersave +Name[ja]=TDEPowersave +Name[pt_BR]=TDEPowersave +Name[ru]=TDEPowersave +Name[sv]=TDEPowersave +Name[zh_CN]=TDEPowersave +Name[zh_TW]=TDEPowersave GenericName=Battery Monitor -Exec=kpowersave --force-acpi-check -Icon=kpowersave +Exec=tdepowersave --force-acpi-check +Icon=tdepowersave Type=Application Comment=Battery monitor and general power management Comment[bg]=Монитор за батерията и основно управление на енергията @@ -63,6 +63,6 @@ Comment[zh_TW]=電池監視器和一般電源管理 X-TDE-autostart-after=panel X-TDE-StartupNotify=false X-TDE-UniqueApplet=true -X-TDE-autostart-condition=kpowersaverc:General:Autostart:true +X-TDE-autostart-condition=tdepowersaverc:General:Autostart:true Categories=System;Applet; diff --git a/src/kpowersave.h b/src/tdepowersave.h index 0239844..0531561 100644 --- a/src/kpowersave.h +++ b/src/tdepowersave.h @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef _KPOWERSAVE_H_ -#define _KPOWERSAVE_H_ +#ifndef _TDEPOWERSAVE_H_ +#define _TDEPOWERSAVE_H_ // this is needed to avoid typedef clash with X11/Xmd.h (X11/Xproto.h) #ifndef TQT_CLEAN_NAMESPACE @@ -40,32 +40,32 @@ // QT - Header #include <tqpopupmenu.h> -// kpowersave - Header +// tdepowersave - Header #include "autosuspend.h" #include "autodimm.h" #include "configuredialog.h" #include "countdowndialog.h" #include "detaileddialog.h" #include "hardware.h" -#include "kpowersave_debug.h" +#include "tdepowersave_debug.h" #include "logviewer.h" #include "screen.h" #include "settings.h" /*! -* \file kpowersave.h -* \brief Headerfile for kpowersave.cpp and the class \ref kpowersave. +* \file tdepowersave.h +* \brief Headerfile for tdepowersave.cpp and the class \ref tdepowersave. */ /*! - * \class kpowersave - * \brief The central class for the kpowersave-applet + * \class tdepowersave + * \brief The central class for the tdepowersave-applet * \author Danny Kukawka, <[email protected]>, <[email protected]> * \author Thomas Renninger, <[email protected]> * \date 2004 - 2007 */ -class kpowersave : public KSystemTray, public DCOPObject +class tdepowersave : public KSystemTray, public DCOPObject { Q_OBJECT // @@ -74,7 +74,7 @@ class kpowersave : public KSystemTray, public DCOPObject private: // permanent pointers - //! to configure kpowersave + //! to configure tdepowersave TDEConfig *config; //! instance of \ref screen screen *display; @@ -170,7 +170,7 @@ private: int resume_result; //! a menu entry ID - /*! contains the ID of the menuentry for kpowersave configure Dialog */ + /*! contains the ID of the menuentry for tdepowersave configure Dialog */ int CONFIGURE_ID; int CONFIGURE_EVENTS_ID; @@ -331,15 +331,15 @@ private slots: void do_setSpeedPolicy( int ); //! called if there are problems with starting yast module void slotConfigProcessExited( TDEProcess * ); - //! called to open the kpowersave help + //! called to open the tdepowersave help void slotHelp(); - //! called to open the kpowersave About dialog + //! 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 kpowersave + //! called if user exit from tdepowersave void _quit(); //! called if the user get inactive and the display should get dimmed down @@ -384,7 +384,7 @@ private slots: //! handle changes of the session state void handleSessionState (bool state); - //! to show the kpowersave configure_dialog + //! to show the tdepowersave configure_dialog void showConfigureDialog(); //! to show the KNotify config dialog void showConfigureNotificationsDialog(); @@ -402,7 +402,7 @@ private slots: //! this emit the KNotify events if the machine resumed void handleResumeSignal(); - //! this show a blocking dialog from kpowersave with the given message + //! this show a blocking dialog from tdepowersave with the given message void showErrorMessage( TQString msg ); //! this is called when detailed dialog is closed @@ -411,9 +411,9 @@ private slots: public: //! default constructor - kpowersave( bool force_acpi_check = false, bool trace_func = false); + tdepowersave( bool force_acpi_check = false, bool trace_func = false); //! default destructor - virtual ~kpowersave(); + virtual ~tdepowersave(); k_dcop: //! dcop function to lock the screen @@ -441,7 +441,7 @@ k_dcop: //! dcop function to open the configure dialog bool openConfigureDialog(); - //! dcop function to find out if kpowersave manages DPMS + //! dcop function to find out if tdepowersave manages DPMS bool currentSchemeManagesDPMS(); //! dcop funtion to get the current brightness level int brightnessGet(); @@ -462,4 +462,4 @@ protected: void resizeEvent ( TQResizeEvent * ); }; -#endif // _KPOWERSAVE_H_ +#endif // _TDEPOWERSAVE_H_ diff --git a/src/kpowersave.lsm b/src/tdepowersave.lsm index 7cf6dc8..3c08565 100644 --- a/src/kpowersave.lsm +++ b/src/tdepowersave.lsm @@ -1,5 +1,5 @@ Begin4 -Title: kpowersave +Title: tdepowersave Version: R14.0.0 Entered-date: 2010-05-10 Description: Front end for power management for the Trinity Desktop Environment diff --git a/src/kpowersave_debug.h b/src/tdepowersave_debug.h index 20f2c6b..9585a96 100644 --- a/src/kpowersave_debug.h +++ b/src/tdepowersave_debug.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef _KPOWERSAVE_DEBUG_H -#define _KPOWERSAVE_DEBUG_H +#ifndef _TDEPOWERSAVE_DEBUG_H +#define _TDEPOWERSAVE_DEBUG_H // Global Header #ifdef HAVE_CONFIG_H @@ -37,7 +37,7 @@ #include <kdebug.h> /*! -* \file kpowersave_debug.h +* \file tdepowersave_debug.h * \brief Headerfile for debug related defines/macros. Currently this file * contains the myDebug(...) macro. */ @@ -65,4 +65,4 @@ extern bool trace; } while (0) -#endif //_KPOWERSAVE_DEBUG_H +#endif //_TDEPOWERSAVE_DEBUG_H |