diff --git a/src/blacklistedit_Dialog.ui b/src/blacklistedit_Dialog.ui index 792b810..3e25290 100644 --- a/src/blacklistedit_Dialog.ui +++ b/src/blacklistedit_Dialog.ui @@ -79,7 +79,7 @@ Expanding - + 305 20 @@ -143,7 +143,7 @@ 0 - + 0 150 @@ -160,7 +160,7 @@ Preferred - + 31 20 @@ -177,7 +177,7 @@ Preferred - + 21 140 @@ -196,7 +196,7 @@ 0 - + 220 110 diff --git a/src/configure_Dialog.ui b/src/configure_Dialog.ui index 8d1b17b..7c49fb1 100644 --- a/src/configure_Dialog.ui +++ b/src/configure_Dialog.ui @@ -101,7 +101,7 @@ Expanding - + 250 20 @@ -223,7 +223,7 @@ Fixed - + 20 20 @@ -284,7 +284,7 @@ MinimumExpanding - + 160 20 @@ -398,7 +398,7 @@ Fixed - + 16 20 @@ -428,7 +428,7 @@ 0 - + 40 30 @@ -448,7 +448,7 @@ Expanding - + 231 31 @@ -465,7 +465,7 @@ MinimumExpanding - + 21 20 @@ -521,7 +521,7 @@ tL_brightness - + 0 50 @@ -573,13 +573,13 @@ 0 - + 100 20 - + 32767 20 @@ -684,7 +684,7 @@ Preferred - + 21 50 @@ -701,7 +701,7 @@ Fixed - + 30 21 @@ -813,7 +813,7 @@ 0 - + 0 0 @@ -836,7 +836,7 @@ Preferred - + 20 40 @@ -919,7 +919,7 @@ Fixed - + 20 21 @@ -941,7 +941,7 @@ 0 - + 32767 20 @@ -997,7 +997,7 @@ Expanding - + 20 170 @@ -1025,7 +1025,7 @@ MinimumExpanding - + 20 20 @@ -1066,7 +1066,7 @@ Expanding - + 20 170 @@ -1112,7 +1112,7 @@ 0 - + 110 0 @@ -1167,7 +1167,7 @@ 0 - + 75 0 @@ -1187,7 +1187,7 @@ textLabel1_2 - + 90 0 @@ -1204,7 +1204,7 @@ textLabel1_2_2 - + 90 0 @@ -1221,7 +1221,7 @@ textLabel1_2_3 - + 90 0 @@ -1244,7 +1244,7 @@ Expanding - + 20 50 @@ -1288,7 +1288,7 @@ cB_batWarning - + 150 0 @@ -1299,7 +1299,7 @@ cB_batLow - + 150 0 @@ -1310,7 +1310,7 @@ cB_batCritical - + 150 0 @@ -1459,7 +1459,7 @@ 0 - + 0 30 @@ -1529,7 +1529,7 @@ Expanding - + 130 20 @@ -1546,7 +1546,7 @@ Expanding - + 130 20 @@ -1563,7 +1563,7 @@ Expanding - + 130 20 @@ -1580,7 +1580,7 @@ Expanding - + 130 20 @@ -1591,7 +1591,7 @@ cB_SleepButton - + 160 0 @@ -1602,7 +1602,7 @@ cB_LidcloseButton - + 160 0 @@ -1613,7 +1613,7 @@ cB_PowerButton - + 160 0 @@ -1624,7 +1624,7 @@ cB_S2DiskButton - + 160 0 @@ -1641,7 +1641,7 @@ Expanding - + 20 20 @@ -1676,7 +1676,7 @@ 0 - + 0 0 @@ -1707,7 +1707,7 @@ cB_acScheme - + 175 0 @@ -1724,7 +1724,7 @@ Expanding - + 110 20 @@ -1741,7 +1741,7 @@ Expanding - + 110 20 @@ -1752,7 +1752,7 @@ cB_batteryScheme - + 175 0 @@ -1780,7 +1780,7 @@ Expanding - + 20 75 @@ -1829,7 +1829,7 @@ Preferred - + 163 20 @@ -1865,7 +1865,7 @@ Expanding - + 20 110 @@ -1925,7 +1925,7 @@ Expanding - + 100 21 @@ -1942,7 +1942,7 @@ Expanding - + 100 21 @@ -1988,7 +1988,7 @@ Fixed - + 16 20 @@ -2034,7 +2034,7 @@ Expanding - + 100 21 @@ -2051,7 +2051,7 @@ Expanding - + 100 21 diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index 892c380..2d49931 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -105,7 +105,7 @@ ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Setti tL_valueBrightness->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); tL_valueBrightness->setBackgroundMode(TQt::PaletteBase); - tL_valueBrightness->tqsetAlignment(TQt::AlignCenter); + tL_valueBrightness->setAlignment(TQt::AlignCenter); tL_valueBrightness->setFocusPolicy(TQ_NoFocus); // hide Lid item if this is not a laptop diff --git a/src/countdown_Dialog.ui b/src/countdown_Dialog.ui index ea0899c..3e4c1ca 100644 --- a/src/countdown_Dialog.ui +++ b/src/countdown_Dialog.ui @@ -40,7 +40,7 @@ Expanding - + 142 21 @@ -68,7 +68,7 @@ Maximum - + 30 20 @@ -85,7 +85,7 @@ Expanding - + 144 21 @@ -96,13 +96,13 @@ iconPixmap - + 48 48 - + 48 48 @@ -125,7 +125,7 @@ Fixed - + 5 20 @@ -156,7 +156,7 @@ Maximum - + 30 20 @@ -175,7 +175,7 @@ 0 - + 200 20 diff --git a/src/detailed_Dialog.ui b/src/detailed_Dialog.ui index 3a8eea5..b34b485 100644 --- a/src/detailed_Dialog.ui +++ b/src/detailed_Dialog.ui @@ -127,7 +127,7 @@ Fixed - + 10 50 @@ -155,13 +155,13 @@ 0 - + 22 22 - + 22 22 @@ -181,7 +181,7 @@ MinimumExpanding - + 20 40 @@ -205,7 +205,7 @@ - Battery tqStatus + Battery Status @@ -221,7 +221,7 @@ Fixed - + 16 118 @@ -270,7 +270,7 @@ Expanding - + 5 20 @@ -300,7 +300,7 @@ Expanding - + 5 20 @@ -309,7 +309,7 @@ - LabelACtqStatus + LabelACStatus @@ -386,7 +386,7 @@ Fixed - + 20 5 @@ -413,7 +413,7 @@ Expanding - + 20 90 @@ -432,13 +432,13 @@ 0 - + 22 22 - + 22 22 @@ -465,7 +465,7 @@ - Processor tqStatus + Processor Status @@ -489,7 +489,7 @@ Expanding - + 20 90 @@ -508,13 +508,13 @@ 0 - + 22 22 - + 22 22 @@ -580,7 +580,7 @@ Fixed - + 10 20 @@ -608,7 +608,7 @@ Expanding - + 230 20 diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp index 56910b1..9f9b0a2 100644 --- a/src/detaileddialog.cpp +++ b/src/detaileddialog.cpp @@ -123,7 +123,7 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin ProcessorFrame->adjustSize(); connect(OkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeDetailedDlg())); - connect(hwinfo, TQT_SIGNAL(ACtqStatus(bool)), this, TQT_SLOT(setAC())); + connect(hwinfo, TQT_SIGNAL(ACStatus(bool)), this, TQT_SLOT(setAC())); // TODO: replace event //connect(pd, TQT_SIGNAL(schemeDataChanged()), this, TQT_SLOT(setInfos())); connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setInfos())); @@ -388,11 +388,11 @@ void detaileddialog::setAC() { kdDebugFuncIn(trace); if (hwinfo->getAcAdapter()) { - LabelACtqStatus->setText( i18n("plugged in") ); + LabelACStatus->setText( i18n("plugged in") ); LedAC->on(); } else { LedAC->off(); - LabelACtqStatus->setText( i18n("unplugged") ); + LabelACStatus->setText( i18n("unplugged") ); } setInfos(); diff --git a/src/hardware.cpp b/src/hardware.cpp index fa37a98..2053180 100644 --- a/src/hardware.cpp +++ b/src/hardware.cpp @@ -866,7 +866,7 @@ void HardwareInfo::checkACAdapterState() { if (_state != acadapter) { acadapter = _state; update_info_ac_changed = true; - emit ACtqStatus( acadapter ); + emit ACStatus( acadapter ); } else { update_info_ac_changed = false; } @@ -891,7 +891,7 @@ void HardwareInfo::checkLidcloseState() { if (dbus_HAL->halGetPropertyBool(*udis["lidclose"] , "button.state.value", &_state )) { if (_state != lidclose) { lidclose = _state; - emit lidclosetqStatus( lidclose ); + emit lidcloseStatus( lidclose ); } } else { lidclose = false; diff --git a/src/hardware.h b/src/hardware.h index 9443675..b3864b8 100644 --- a/src/hardware.h +++ b/src/hardware.h @@ -362,9 +362,9 @@ signals: void currentCPUFreqPolicyChanged(); //! signal the AC adapter - void ACtqStatus( bool ); + void ACStatus( bool ); //! signal for the lidclose button - void lidclosetqStatus ( bool ); + void lidcloseStatus ( bool ); //! signal for pressed the power button void powerButtonPressed (); //! signal for pressed sleep (suspend2ram) button diff --git a/src/info_Dialog.ui b/src/info_Dialog.ui index 71b7c6e..ea2fa91 100644 --- a/src/info_Dialog.ui +++ b/src/info_Dialog.ui @@ -23,7 +23,7 @@ buttonOK - + 90 0 @@ -46,7 +46,7 @@ Expanding - + 171 21 @@ -63,7 +63,7 @@ Expanding - + 151 21 @@ -74,13 +74,13 @@ iconPixmap - + 32 32 - + 32 32 @@ -97,7 +97,7 @@ msgText - + 370 50 @@ -120,7 +120,7 @@ Fixed - + 10 20 @@ -137,7 +137,7 @@ Fixed - + 10 20 @@ -154,7 +154,7 @@ Fixed - + 61 21 @@ -165,7 +165,7 @@ dontShowAgain - + 330 0 @@ -188,7 +188,7 @@ Fixed - + 31 21 diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp index fbbfc17..5afd915 100644 --- a/src/kpowersave.cpp +++ b/src/kpowersave.cpp @@ -97,7 +97,7 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0 // connect to signals for changes connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(update())); connect(hwinfo, TQT_SIGNAL(primaryBatteryChanged()), this, TQT_SLOT(update())); - connect(hwinfo, TQT_SIGNAL(ACtqStatus(bool)), this, TQT_SLOT(handleACStatusChange (bool))); + connect(hwinfo, TQT_SIGNAL(ACStatus(bool)), this, TQT_SLOT(handleACStatusChange (bool))); connect(hwinfo, TQT_SIGNAL(resumed(int)), this, TQT_SLOT(forwardResumeSignal(int))); // connect to error mesages @@ -106,7 +106,7 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0 connect(hwinfo, TQT_SIGNAL(dbusRunning(int)), this, TQT_SLOT(showDBusErrorMsg(int))); // connect to events - connect(hwinfo, TQT_SIGNAL(lidclosetqStatus(bool)), this, TQT_SLOT(handleLidEvent(bool))); + connect(hwinfo, TQT_SIGNAL(lidcloseStatus(bool)), this, TQT_SLOT(handleLidEvent(bool))); connect(hwinfo, TQT_SIGNAL(powerButtonPressed()), this, TQT_SLOT (handlePowerButtonEvent())); connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSleepButtonEvent())); connect(hwinfo, TQT_SIGNAL(s2diskButtonPressed()), this, TQT_SLOT (handleS2DiskButtonEvent())); diff --git a/src/kpowersave.h b/src/kpowersave.h index e6f12ed..62a22eb 100644 --- a/src/kpowersave.h +++ b/src/kpowersave.h @@ -390,7 +390,7 @@ private slots: //! set for a battery status the related actions void handleActionCall ( action action, int value, bool checkAC = false, bool batWarnCall = false ); - //! this lock/reactivate the screen if a lidclosetqStatus() signal is triggered + //! this lock/reactivate the screen if a lidcloseStatus() signal is triggered void handleLidEvent( bool closed ); //! show the login dialog after locked the screen void activateLoginScreen(); diff --git a/src/log_viewer.ui b/src/log_viewer.ui index 74464bd..3af258a 100644 --- a/src/log_viewer.ui +++ b/src/log_viewer.ui @@ -61,7 +61,7 @@ Expanding - + 330 20 diff --git a/src/screen.cpp b/src/screen.cpp index 877583a..8caf48b 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -52,7 +52,7 @@ screen::screen() { xlock = NULL; got_XScreensaver = false; - checkDPMStqStatus(); + checkDPMSStatus(); check_xscreensaver_timer_runs = false; SCREENSAVER_STATUS = -1; @@ -61,7 +61,7 @@ screen::screen() { check_xscreensaver_timer = new TQTimer( this ); connect( check_xscreensaver_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(xscreensaver_ping() )); - SCREENSAVER_STATUS = checkScreenSavertqStatus(); + SCREENSAVER_STATUS = checkScreenSaverStatus(); kdDebugFuncOut(trace); } @@ -80,7 +80,7 @@ screen::~screen() { bool screen::setScreenSaver(bool enable){ kdDebugFuncIn(trace); - if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus(); + if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ screen_save_dcop_ref.send( "enable", enable); kdDebugFuncOut(trace); @@ -243,7 +243,7 @@ void screen::xscreensaver_ping(){ * \retval 99 gnome-screensaver check is running * \retval -1 else */ -int screen::checkScreenSavertqStatus() { +int screen::checkScreenSaverStatus() { kdDebugFuncIn(trace); bool get_reply = false; @@ -326,7 +326,7 @@ void screen::getGSExited (KProcess *gnomecheckcommand) { * \retval 0 if DMPS is disabled * \retval -1 if there is a error */ -int screen::checkDPMStqStatus(){ +int screen::checkDPMSStatus(){ kdDebugFuncIn(trace); CARD16 state; @@ -432,7 +432,7 @@ bool screen::lockScreen(){ kdDebugFuncIn(trace); // screensaver status known? - if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus(); + if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); // set lock for KScreensaver if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ @@ -549,7 +549,7 @@ bool screen::lockScreen( TQString lock_withMethod ) { } else { // screensaver status known? - SCREENSAVER_STATUS = checkScreenSavertqStatus(); + SCREENSAVER_STATUS = checkScreenSaverStatus(); if (lock_withMethod == "kscreensaver") { if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ @@ -597,7 +597,7 @@ xscreensaver: void screen::blankOnlyScreen( bool blankonly ){ kdDebugFuncIn(trace); - if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus(); + if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); // set KScreensaver if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ screen_save_dcop_ref.send("setBlankOnly", blankonly); @@ -620,7 +620,7 @@ bool screen::resetKDEScreensaver(){ kdDebugFuncIn(trace); if(SCREENSAVER_STATUS == -1) - SCREENSAVER_STATUS = checkScreenSavertqStatus(); + SCREENSAVER_STATUS = checkScreenSaverStatus(); // do this only if the screensaver is not running if(SCREENSAVER_STATUS == 0){ @@ -648,7 +648,7 @@ bool screen::resetKDEScreensaver(){ bool screen::resetXScreensaver(){ kdDebugFuncIn(trace); - if(checkScreenSavertqStatus() == 11) { + if(checkScreenSaverStatus() == 11) { delete xscreensaver_reset; diff --git a/src/screen.h b/src/screen.h index 231dd6d..1d28f55 100644 --- a/src/screen.h +++ b/src/screen.h @@ -167,9 +167,9 @@ public: bool setScreenSaver( bool ); //! for check the status of the screensaver - int checkScreenSavertqStatus(); + int checkScreenSaverStatus(); //! for check the actual status of DPMS on the machine - int checkDPMStqStatus(); + int checkDPMSStatus(); //! default constructor screen(); diff --git a/src/suspend_Dialog.ui b/src/suspend_Dialog.ui index 0a0d39b..926a726 100644 --- a/src/suspend_Dialog.ui +++ b/src/suspend_Dialog.ui @@ -20,13 +20,13 @@ 0 - + 300 90 - + 300 90 @@ -73,13 +73,13 @@ 48 - + 48 48 - + 48 48