TDE
/
tdepowersave
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent d60d44d67f
commit 966b30e320
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

6
src/configuredialog.cpp
Unescape View File

@ -237,7 +237,7 @@ void ConfigureDialog::setIcons(){
pB_editAutosuspendGBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic)); pB_editAutosuspendGBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic));
pB_editAutodimmGBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic)); pB_editAutodimmGBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 0 ,SmallIcon("kscreensaver", TQIconSet::Automatic)); tB_scheme->setItemIconSet( 0 ,SmallIcon("tdescreensaver", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 1 ,SmallIcon("display", TQIconSet::Automatic)); tB_scheme->setItemIconSet( 1 ,SmallIcon("display", TQIconSet::Automatic));
if(actions[0] == "Suspend to Disk") if(actions[0] == "Suspend to Disk")
@ -669,7 +669,7 @@ void ConfigureDialog::setGeneralSettings() {
} }
if (lockmethod == "automatic") comboB_lock->setCurrentItem(0); if (lockmethod == "automatic") comboB_lock->setCurrentItem(0);
else if (lockmethod == "kscreensaver") comboB_lock->setCurrentItem(1); else if (lockmethod == "tdescreensaver") comboB_lock->setCurrentItem(1);
else if (lockmethod == "xscreensaver") comboB_lock->setCurrentItem(2); else if (lockmethod == "xscreensaver") comboB_lock->setCurrentItem(2);
else if (lockmethod == "xlock") comboB_lock->setCurrentItem(3); else if (lockmethod == "xlock") comboB_lock->setCurrentItem(3);
else if (gnome_session && (lockmethod == "gnomescreensaver")) comboB_lock->setCurrentItem(4); else if (gnome_session && (lockmethod == "gnomescreensaver")) comboB_lock->setCurrentItem(4);
@ -832,7 +832,7 @@ void ConfigureDialog::saveGeneralSettings() {
TQString selected_method = ""; TQString selected_method = "";
int _selected = comboB_lock->currentItem(); int _selected = comboB_lock->currentItem();
if(_selected == 0) selected_method = "automatic"; if(_selected == 0) selected_method = "automatic";
else if(_selected == 1) selected_method = "kscreensaver"; else if(_selected == 1) selected_method = "tdescreensaver";
else if(_selected == 2) selected_method = "xscreensaver"; else if(_selected == 2) selected_method = "xscreensaver";
else if(_selected == 3) selected_method = "xlock"; else if(_selected == 3) selected_method = "xlock";
else if(gnome_session && (_selected == 4)) selected_method = "gnomescreensaver"; else if(gnome_session && (_selected == 4)) selected_method = "gnomescreensaver";

4
src/screen.cpp
Unescape View File

@ -479,7 +479,7 @@ xscreensaver:
} }
return status; return status;
} }
// set lock for xlock --> no kscreensaver, no xscreensaver present and // set lock for xlock --> no tdescreensaver, no xscreensaver present and
// the check for gnome screensaver is not finished. This should normaly // the check for gnome screensaver is not finished. This should normaly
// not happen, but in this case we use xlock // not happen, but in this case we use xlock
else if(SCREENSAVER_STATUS == 10 || SCREENSAVER_STATUS == 99){ else if(SCREENSAVER_STATUS == 10 || SCREENSAVER_STATUS == 99){
@ -551,7 +551,7 @@ bool screen::lockScreen( TQString lock_withMethod ) {
// screensaver status known? // screensaver status known?
SCREENSAVER_STATUS = checkScreenSaverStatus(); SCREENSAVER_STATUS = checkScreenSaverStatus();
if (lock_withMethod == "kscreensaver") { if (lock_withMethod == "tdescreensaver") {
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
DCOPReply reply = screen_save_dcop_ref.call("lock"); DCOPReply reply = screen_save_dcop_ref.call("lock");
if ( reply.isValid() ) { if ( reply.isValid() ) {

4
src/settings.h
Unescape View File

@ -145,8 +145,8 @@ public:
//! the name of the lock method //! the name of the lock method
/*! /*!
* This TQString contains a alias to the selected method for lock screen. Possible values: * This TQString contains a alias to the selected method for lock screen. Possible values:
* \li automatic for automatically selected (sequence: kscreensaver, xscreensaver, xlock) * \li automatic for automatically selected (sequence: tdescreensaver, xscreensaver, xlock)
* \li kscreensaver for KDE KScreensaver * \li tdescreensaver for KDE KScreensaver
* \li xscreensaver for XScreensaver (default used on GNOME) * \li xscreensaver for XScreensaver (default used on GNOME)
* \li xlock for xlock * \li xlock for xlock
*/ */

Write Preview
Loading…
Cancel
Save