From f6157088bee6c877bbbffa0606833109ec506664 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 8 Aug 2013 23:01:11 -0500 Subject: Update desktop file and string references of KScreensaver->TDEScreensaver. --- src/configuredialog.cpp | 4 ++-- src/dummy.cpp | 2 +- src/screen.cpp | 18 +++++++++--------- src/screen.h | 8 ++++---- src/settings.h | 2 +- src/tdepowersave.desktop | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index 59f0fad..83bd6bb 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -275,7 +275,7 @@ void ConfigureDialog::setTooltips(){ "Note: If selected, the global screen saver settings are \n" "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.")); + "Note: This may work only with TDEScreensaver.")); TQToolTip::add(cB_SpecificPM, i18n("This enables specific DPMS settings. \n" "Note: If selected, the global DPMS settings are \n" "overwritten while tdepowersave runs.")); @@ -662,7 +662,7 @@ void ConfigureDialog::setGeneralSettings() { TQString lockmethod = tdeconfig->readEntry("lockMethod", "NULL"); if(comboB_lock->count() == 0 ){ comboB_lock->insertItem(i18n("Select Automatically"),0); - comboB_lock->insertItem(i18n("KScreensaver"),1); + comboB_lock->insertItem(i18n("TDEScreensaver"),1); comboB_lock->insertItem(i18n("XScreensaver"),2); comboB_lock->insertItem(i18n("xlock"),3); if (gnome_session) comboB_lock->insertItem(i18n("GNOME Screensaver"),4); diff --git a/src/dummy.cpp b/src/dummy.cpp index 6a3b72c..b1381e5 100644 --- a/src/dummy.cpp +++ b/src/dummy.cpp @@ -100,7 +100,7 @@ class dummy { dummy = i18n("Power consumption"); // for screen.cpp - dummy = i18n("KScreensaver not found."); + dummy = i18n("TDEScreensaver not found."); dummy = i18n("Try locking with XScreensaver or xlock."); dummy = i18n("XScreensaver not found."); dummy = i18n("Try locking the screen with xlock."); diff --git a/src/screen.cpp b/src/screen.cpp index 6bbce76..4adb0f4 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -71,7 +71,7 @@ screen::~screen() { } /*! -* To enable/disable the KScreensaver/Xscreensaver. +* To enable/disable the TDEScreensaver/Xscreensaver. * \param enable true: activate/enable screensaver / false: deactivate/disable screensacer * \return the result of try to set the screensaver * \retval true if screensaver set correct @@ -236,8 +236,8 @@ void screen::xscreensaver_ping(){ /*! * Checks if KScreenSaver or XscreenSaver is activated * \return The result of the check as an integer value. -* \retval 0 KScreensaver is disabled -* \retval 1 KScreensaver is activated +* \retval 0 TDEScreensaver is disabled +* \retval 1 TDEScreensaver is activated * \retval 10 Xscreensaver is not found or not running * \retval 11 Xscreensaver is activated * \retval 99 gnome-screensaver check is running @@ -269,9 +269,9 @@ int screen::checkScreenSaverStatus() { if(windowid == 0) { //Xscreensaver not detected check_xscreensaver_timer->stop(); - // KScreensaver activ and no XScreensaver found + // TDEScreensaver active and no XScreensaver found if(kScreenSaver_tmp_status == 0) return 0; - // no KScreensaver and no XScreensaver found + // no TDEScreensaver and no XScreensaver found else check = 10; } else return 11; @@ -434,13 +434,13 @@ bool screen::lockScreen(){ // screensaver status known? if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); - // set lock for KScreensaver + // set lock for TDEScreensaver if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ DCOPReply reply = screen_save_dcop_ref.call("lock"); if ( reply.isValid() ) { return true; } else { - kdWarning() << "Could not lock KScreensaver, try XScreensaver as fallback." << endl; + kdWarning() << "Could not lock TDEScreensaver, try XScreensaver as fallback." << endl; goto xscreensaver; } } @@ -557,7 +557,7 @@ bool screen::lockScreen( TQString lock_withMethod ) { if ( reply.isValid() ) { return true; } else { - kdWarning() << "Could not call lock for KScreensaver, try XScreensaver " + kdWarning() << "Could not call lock for TDEScreensaver, try XScreensaver " << "as fallback." << endl; goto xscreensaver; } @@ -598,7 +598,7 @@ void screen::blankOnlyScreen( bool blankonly ){ kdDebugFuncIn(trace); if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); - // set KScreensaver + // set TDEScreensaver if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ screen_save_dcop_ref.send("setBlankOnly", blankonly); } diff --git a/src/screen.h b/src/screen.h index 14df1eb..56f2acd 100644 --- a/src/screen.h +++ b/src/screen.h @@ -63,7 +63,7 @@ private: //! reference to DCOP /*! * This is the DCOP-reference to the KScreensaverIface. We use this to send - * commandos to the active KScreensaver. + * commandos to the active TDEScreensaver. */ DCOPRef screen_save_dcop_ref; //! TDEProcess to start xlock to lock the screen @@ -87,9 +87,9 @@ private: //! cointains status information about the screensaver /*! * The value of this integer represent statusinformation about the - * screensaver (Xscreensaver and KScreensaver): - * \li (value == 0) if KScreensaver is disabled - * \li (value == 1) if KScreensaver is activated + * screensaver (Xscreensaver and TDEScreensaver): + * \li (value == 0) if TDEScreensaver is disabled + * \li (value == 1) if TDEScreensaver is activated * \li (value == 10) if Xscreensaver is not found or not running * \li (value == 11) if Xscreensaver is activated * \li (value == 20) if gnome-screen-saver is available diff --git a/src/settings.h b/src/settings.h index 0b7cba4..6c8d777 100644 --- a/src/settings.h +++ b/src/settings.h @@ -146,7 +146,7 @@ public: /*! * This TQString contains a alias to the selected method for lock screen. Possible values: * \li automatic for automatically selected (sequence: tdescreensaver, xscreensaver, xlock) - * \li tdescreensaver for KDE KScreensaver + * \li tdescreensaver for TDE TDEScreensaver * \li xscreensaver for XScreensaver (default used on GNOME) * \li xlock for xlock */ diff --git a/src/tdepowersave.desktop b/src/tdepowersave.desktop index 61ad5b8..3a2e230 100644 --- a/src/tdepowersave.desktop +++ b/src/tdepowersave.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 -Name=tdepowersave -Name[xx]=xxtdepowersavexx +Name=TDEPowersave +Name[xx]=xxTDEPowersavexx Name[de]=TDEPowersave Name[es]=TDEPowersave Name[fr]=TDEPowersave -- cgit v1.2.3