Finish TQt4 port of kpowersave

This enables both Qt3 and Qt4 builds


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1228282 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
pull/1/head
tpearson 13 years ago
parent ba24506b3b
commit 4304e8d9da

@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
0. This License applies to any program or other work which tqcontains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
code means all the source code for all modules it tqcontains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include

@ -164,7 +164,7 @@
* configure.in.in: Don't check any longer for PolicyKit
>= v0.4, simply check if libhal provide the following
function: libhal_device_is_caller_privileged() to check
function: libhal_tqdevice_is_caller_privileged() to check
if KPowersave should use libhal or the old PolicyKit
D-Bus interface.
@ -401,7 +401,7 @@
* configure.in.in: Changed detection if we need to call
new PolicyKit/HAL instead of PolicyKit D-Bus daemon to
check for libhal_device_is_caller_privileged() in libhal.
check for libhal_tqdevice_is_caller_privileged() in libhal.
2007-08-13 Danny Kukawka <danny.kukawka@web.de>
@ -707,17 +707,17 @@
2007-06-13 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.cpp: Remove laptop_panel entry from the
QDict<QString> udis if no device with laptop_panel found. This
should prevent problems if the laptop panel device get removed
QDict<QString> udis if no tqdevice with laptop_panel found. This
should prevent problems if the laptop panel tqdevice get removed
from HAL.
2007-06-13 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.cpp: Added code to react if a latop panel device
get added/remove. Added also all device_type values to the
* src/hardware.cpp: Added code to react if a latop panel tqdevice
get added/remove. Added also all tqdevice_type values to the
switch of the HAL_DEVICE case.
Removed several *.latin1() calls due to new usage of kdDebug().
* src/hardware.h: Added new value to enum device_type for laptop
* src/hardware.h: Added new value to enum tqdevice_type for laptop
panels (for brightness).
2007-06-13 Danny Kukawka <danny.kukawka@web.de>
@ -916,7 +916,7 @@
2007-04-10 Danny Kukawka <danny.kukawka@web.de>
* src/logviewer.cpp: Include moc file. Fixed possible file
* src/logviewer.cpp: Include tqmoc file. Fixed possible file
descriptor leak.
2007-04-10 Laurent Montel <lmontel@mandriva.com>
@ -939,7 +939,7 @@
2007-04-10 Danny Kukawka <danny.kukawka@web.de>
Moved all moc includes to end of cpp-files, added some code
Moved all tqmoc includes to end of cpp-files, added some code
comments and smaller code formatting changes:
* src/autosuspend.[cpp,h]:
@ -955,7 +955,7 @@
2007-04-10 Laurent Montel <lmontel@mandriva.com>
Make moc files being included to speed up build and to fix some
Make tqmoc files being included to speed up build and to fix some
parallel build issues:
* src/autosuspend.cpp:
@ -1010,7 +1010,7 @@
* src/hardware.[cpp,h]: Add new helper functions/SLOTS to
forward the events for Power, Sleep and s2disk buttons and the
lidclose event. Changed current code to emit the signals not
lidclose event. Changed current code to emit the Q_SIGNALS not
directly but to call a QTimer:singleShot() with the new SLOTS
instead. This should make the eventhandling from QT3 D-Bus
bindings independent from the event loop (including may
@ -1255,7 +1255,7 @@
CPU usage. This happen because the QT D-Bus bindings wait for a
result from the related KPowersave filter function (return a
DBUS_HANDLER_RESULT_* to the bus). This happen also because the
signals in QT are only function calls which not are really emitted
Q_SIGNALS in QT are only function calls which not are really emitted
to the QT event loop as assumed (the KMessageBox block the filter-
function).
Fixed this by use QTimer::SingleShot() to call the suspend, in the
@ -1503,7 +1503,7 @@
* src/hardware_battery.cpp: Emit signal to monitor current
rate of battery.
* src/hardware_batteryCollection.[cpp,h]: Added some code to
hold the current rate and the rate unit. Emit signals if the
hold the current rate and the rate unit. Emit Q_SIGNALS if the
current rate change (don't emit general change signal, since
this maybe produce useless calls in other parts of KPowersave
than only in the detailed dialog).
@ -1528,8 +1528,8 @@
2007-01-23 Danny Kukawka <danny.kukawka@web.de>
* src/configure_Dialog.ui: Added new slots to catch changes.
* src/configuredialog.[cpp,h]: Implemented new slots to
* src/configure_Dialog.ui: Added new Q_SLOTS to catch changes.
* src/configuredialog.[cpp,h]: Implemented new Q_SLOTS to
hide/show the QSpinboxes for the brightness settings in the
battery tab of the general settings, depending of the selected
action.
@ -1590,8 +1590,8 @@
2007-01-23 Danny Kukawka <danny.kukawka@web.de>
* src/configure_Dialog.ui: changed param of battery level
QSpinBox slots (no param instead of int)
* src/configuredialog.[cpp,h]: Added slots to set the battery
QSpinBox Q_SLOTS (no param instead of int)
* src/configuredialog.[cpp,h]: Added Q_SLOTS to set the battery
level QSpinBoxes to correct values: warning > low > critical.
2007-01-22 Danny Kukawka <danny.kukawka@web.de>
@ -1667,8 +1667,8 @@
2007-01-21 Danny Kukawka <danny.kukawka@web.de>
* src/configure_Dialog.ui: Fixed layout and (re)added
slots for signals and actions.
* src/configure_Dialog.ui: Fixed tqlayout and (re)added
Q_SLOTS for Q_SIGNALS and actions.
2007-01-21 Danny Kukawka <danny.kukawka@web.de>
@ -2036,7 +2036,7 @@
* src/hardware_battery.cpp: fixed handling if battery
get removed from the system. Don't forget to check the
battery type if reset the battery.
Also fixed emit signals. Emit them first if have read
Also fixed emit Q_SIGNALS. Emit them first if have read
the values from Hardware and filled the related variables.
2006-11-18 Danny Kukawka <danny.kukawka@web.de>
@ -2275,7 +2275,7 @@
all hardware information after a HAL or D-Bus restart.
This should reduce the code and ensure that we do
always the same.
Fixed handling of signals if D-Bus restart related to
Fixed handling of Q_SIGNALS if D-Bus restart related to
HAL and D-Bus itself status.
* src/kpowersave.cpp: added a comment
@ -2327,7 +2327,7 @@
be more generic and can be reused later for other
battery types.
* src/hardware_batteryCollection.[cpp,h]: changed
signals to emit also battery type.
Q_SIGNALS to emit also battery type.
* src/kpowersave.cpp: changed debug msg and set the
battery warning level temporary in the constructor
to HardwareInfo object.
@ -2415,7 +2415,7 @@
2006-11-05 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.cpp: fixed connect to signals from the
* src/hardware.cpp: fixed connect to Q_SIGNALS from the
primary battery collection. This should fix the applet
icon to show the correct battery fill level.
@ -2466,7 +2466,7 @@
allow finder grained and easier refresh/handle of battery
information.
Fixed code to update battery information and connect to
related signals.
related Q_SIGNALS.
2006-11-05 Danny Kukawka <danny.kukawka@web.de>
@ -2546,7 +2546,7 @@
* src/hardware.[cpp,h]: Added some new functions to get access
to battery list and the primary battery collection.
Fixed bug in checkBrightness(), check always if the list of
devices is not empty before use them.
tqdevices is not empty before use them.
Fixed some minor bugs in debug messages
2006-11-02 Danny Kukawka <danny.kukawka@web.de>
@ -2617,10 +2617,10 @@
2006-10-25 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.[cpp,h]: Added new function to check if we should
handle a special device (e.g. on a HAL_DEVICE::DeviceAdded
event) and to get the type of the device (added a new enum
device_type).
Added some new signals for: HAL error handling, data changes and
handle a special tqdevice (e.g. on a HAL_DEVICE::DeviceAdded
event) and to get the type of the tqdevice (added a new enum
tqdevice_type).
Added some new Q_SIGNALS for: HAL error handling, data changes and
if the sleep button was pressed.
2006-10-24 Danny Kukawka <danny.kukawka@web.de>
@ -2676,7 +2676,7 @@
* src/hardware.cpp: removed todo, code comment update
* src/hardware_battery.[cpp,h]: Added variable to check if the
battery is inialised and added event handling including emit
related signals if something changed.
related Q_SIGNALS if something changed.
Set crit_level as default to 2 as in old powersave config.
* src/hardware_batteryCollection.cpp: set crit_level as default
to 2 as in old powersave config
@ -2696,7 +2696,7 @@
call the related function to update the key.
TODO: add code to check if really something was changed and
emit some signals.
emit some Q_SIGNALS.
2006-10-23 Danny Kukawka <danny.kukawka@web.de>
@ -2731,12 +2731,12 @@
2006-10-22 Danny Kukawka <danny.kukawka@web.de>
* src/hardware_batteryCollection.[cpp,h]: emit now also all
the other signals for percentage, minutes, present batteries
the other Q_SIGNALS for percentage, minutes, present batteries
and the charging state.
2006-10-22 Danny Kukawka <danny.kukawka@web.de>
* src/hardware_batteryCollection.[cpp,h]: emit signals for
* src/hardware_batteryCollection.[cpp,h]: emit Q_SIGNALS for
reached battery warning states.
2006-10-22 Danny Kukawka <danny.kukawka@web.de>
@ -2751,7 +2751,7 @@
Added new members to get the number of present batteries and
to get the battery state.
TODO: add signals and emit them.
TODO: add Q_SIGNALS and emit them.
2006-10-20 Danny Kukawka <danny.kukawka@web.de>
@ -2823,9 +2823,9 @@
2006-10-19 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.[cpp,h]: fixed intialiseHWInfo() to use only
one QStringList for the devices. Added new code to the func
one QStringList for the tqdevices. Added new code to the func
to collect the battery UDIs.
Added code to store the UDIs of all devices we handle and
Added code to store the UDIs of all tqdevices we handle and
want to monitor. This should allow us a finer grained filter
functions for HAL events.
* src/hardware_battery.[cpp,h]: Changed one constructor to
@ -3004,7 +3004,7 @@
* src/dbusHAL.[cpp,h]: code comments
* src/hardware.[cpp,h]: addes some empty functions and a QDicr
for udis of devices except batteries (e.g. AC, Lid, buttons ...)
for udis of tqdevices except batteries (e.g. AC, Lid, buttons ...)
* src/pdaemon.cpp: added comments about the state of port code
and functions to class dbusHAL
@ -3054,14 +3054,14 @@
* src/Makefile.am: added dbusHAL class to make
* src/dbusHAL.[cpp,h]: Changed name of the class to dbusHAL and
added connection to HAL and code to hold LibHalContext. The class
contains now mew functions to search for devices and to get device
contains now mew functions to search for tqdevices and to get tqdevice
information from HAL. Also added: new function to call
org.freedesktop.Hal.Device.SystemPowerManagement methodes on HAL
via DBUS.
2006-09-04 Danny Kukawka <danny.kukawka@web.de>
Added new class to monitor HAL signals (DeviceAdded, DeviceRemoved,
Added new class to monitor HAL Q_SIGNALS (DeviceAdded, DeviceRemoved,
PropertyModified, Condition) and Connect/Disconnect events via DBUS.
This class is not used atm in the code, but should replace the class
@ -3787,7 +3787,7 @@
2006-03-13 Danny Kukawka <danny.kukawka@web.de>
* src/detaileddialog.cpp: added slightly adopted patch from Timo
Hoenig <thoenig@suse.de> to replace 'Mhz' with correct 'MHz'
Hoenig <thoenig@suse.de> to tqreplace 'Mhz' with correct 'MHz'
* po/*.po, po/kpowersave.pot: updated translation files for this
changes.
@ -3936,7 +3936,7 @@
lidopen event (now reset screen settings to avoid problems after call
xset on lidclose). Added call screen::forceDPMSOff() on lidclose to set
light on LCD off. Removed notification functions for lidclose and
lidopen signals and merged them to existing functions/slots.
lidopen Q_SIGNALS and merged them to existing functions/Q_SLOTS.
* src/screen.cpp, src/screen.h: added new function forceDPMSOff() to
shutdown the display via DPMS (call xset dpms force off).
* src/settings.cpp, src/settings.h: adde new variable and related
@ -4130,7 +4130,7 @@
2006-02-19 Danny Kukawka <danny.kukawka@web.de>
* src/detaileddialog.cpp, src/detaileddialog.h: replaced layout for
* src/detaileddialog.cpp, src/detaileddialog.h: replaced tqlayout for
battery and processor bars with QGridLayout to be sure all widgets
have the same size. Replaced picture for total battery fuel state
with a string. Cleaned up the code.
@ -4165,7 +4165,7 @@
* src/kpowersave.cppn src/kpowersave.h: Added new KNotify events for:
suspend (3), resume (3), scheme switched (5), lidclosed, lidopened.
Fixed code comments and cleanups.
* src/pdaemon.cpp, src/pdaemon.h: Added new signals for: lidopened,
* src/pdaemon.cpp, src/pdaemon.h: Added new Q_SIGNALS for: lidopened,
each resume type ( resumedFrom(QString) )
2006-02-17 Danny Kukawka <danny.kukawka@web.de>
@ -4539,7 +4539,7 @@
* src/detailed_dialog.ui: reworked detailed dialog after
discussion and welcome criticism from Timo Hönig based on a
mocup from Timo. Thanks!
tqmocup from Timo. Thanks!
* src/detaileddialog.cpp, src/detaileddialog.h: added patch
from Daniel Gollub <dgollub@suse.de> to fix problems if a
CPU is set offline.
@ -4863,7 +4863,7 @@
prevent message on HAL or powersave restart. Changed handling of
display the errormessage.
* src/pdaemon.cpp: Fixed some problems with HAL_ERROR handling. Fixed
problem with set update_info_ac_changed _before_ emit related signals.
problem with set update_info_ac_changed _before_ emit related Q_SIGNALS.
2005-12-21 Danny Kukawka <danny.kukawka@web.de>
@ -4937,7 +4937,7 @@
2005-12-07 Danny Kukawka <danny.kukawka@web.de>
* src/pdaemon.cpp: fixed set applet icon for AC status if no
powersave daemon is running, emit now needed signals. Also
powersave daemon is running, emit now needed Q_SIGNALS. Also
fixed signal for AC sound.
2005-12-03 Danny Kukawka <danny.kukawka@web.de>

@ -125,8 +125,8 @@ Tue Jul 24 15:54:27 CEST 2007 - dkukawka@suse.de
section) to disable call SetPowerSave() on HAL.
- Fixed Segmentation Fault from b.n.c bug #284622.
- added arabic po-file from Youssef Chahibi <chahibi@gmail.com>
- fixed laptop panel/backlight device handling to react if a
device get added/removed to/from HAL
- fixed laptop panel/backlight tqdevice handling to react if a
tqdevice get added/removed to/from HAL
- use now kdebug/kdDebug() functions to debug instead of own
macros, added --dbg-trace option to allow trace function entry
and leave points.
@ -158,7 +158,7 @@ Tue Apr 24 16:53:13 CEST 2007 - dkukawka@suse.de
- updated to current SVN HEAD v0.7.2_SVN20070424:
- changed set CPU Freq governor to reuse code and integrated
patch for b.n.c #229234
- fixed b.n.c #266243: check if info.capability contains
- fixed b.n.c #266243: check if info.capability tqcontains
laptop_panel instead for info.category
-------------------------------------------------------------------
@ -180,7 +180,7 @@ Wed Apr 18 20:38:47 CEST 2007 - dkukawka@suse.de
- changed logic for resume if a timeout happen
- only suspend on button events if we resumed (successful) to
avoid double suspends
- several fixes to make signals from HAL/DBus idependent from
- several fixes to make Q_SIGNALS from HAL/DBus idependent from
the QT eventloop due to problems with the QT3 DBus bindings
(should also fix Debian bug #413811)
- several fixes realated to segfaults/crashes
@ -189,7 +189,7 @@ Wed Apr 18 20:38:47 CEST 2007 - dkukawka@suse.de
- patches from Mandriva (lmontel@mandriva.com):
- fixed problems with formated messages from KDE media manager
- avoid double translate strings/msg
- Make moc files being included to speed up build and to fix
- Make tqmoc files being included to speed up build and to fix
some parallel build issues
- fixed several memory leaks
- fixed bugs:
@ -514,7 +514,7 @@ Mon Feb 6 18:54:20 CET 2006 - dkukawka@suse.de
- updated to new release 0.5.6:
* fixed bugs:
- detailed dialog:
* removed connect setProcessor() to signals from powersave
* removed connect setProcessor() to Q_SIGNALS from powersave
because of excessive CPU usage
* fixed problems write text if CPU Freq Policy not supported
* cleanups (removed unneeded enum defines and replaced with
@ -1000,7 +1000,7 @@ Tue Feb 22 10:45:45 CET 2005 - dkukawka@suse.de
general config section
- changed call of the configure dialog, now kpowersave not blocked
while dialog is open
- added different slots and logic to disable/enable widgets
- added different Q_SLOTS and logic to disable/enable widgets
- added load and store the configuration
- added configoptions and funtions to make 'lock screen'
configureable by user

@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \
is \
provides \
specifies \
contains \
tqcontains \
represents \
a \
an \
@ -113,7 +113,7 @@ FILE_PATTERNS = *.c \
*.dox
RECURSIVE = YES
EXCLUDE = ./src/kpowersave_dummy.cpp \
./src/screen.moc.cpp \
./src/screen.tqmoc.cpp \
./src/kpowersave.la.cpp \
./src/kpowersave_skel.cpp \
./src/info_Dialog.cpp \
@ -128,7 +128,7 @@ EXCLUDE = ./src/kpowersave_dummy.cpp \
./src/configure_Dialog.h \
./src/kdeinit_kpowersave.cpp
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = *.moc.cpp \
EXCLUDE_PATTERNS = *.tqmoc.cpp \
*_dummy.* \
*.la.cpp \
*_la.all_cpp.cpp

@ -113,7 +113,7 @@ pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
In addition, if you use an unusual directory tqlayout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.

@ -51,7 +51,7 @@ Bugfixes:
values to a enum (lead to segfault since enum is a 8bit char object)
- fixed wrong unit for power consumption (removed 'h' from unit)
- only suspend on button events if we resumed to avoid double suspends
- several fixes to make signals from HAL/DBus idependent from the QT
- several fixes to make Q_SIGNALS from HAL/DBus idependent from the QT
eventloop due to problems with the QT3 DBus bindings
- several patches from Mandriva (lmontel@mandriva.com) to fix problems
with translations, format messages, speedup build and memory leaks

@ -147,7 +147,7 @@ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_SOCKET, ["$DBUS_SYSTEM_BUS_SOCKET"],
#check for PolicyKit version
LIBHAL_POLICYCHECK=no
AC_CHECK_LIB([hal], [libhal_device_is_caller_privileged], [LIBHAL_POLICYCHECK=yes], [LIBHAL_POLICYCHECK=no])
AC_CHECK_LIB([hal], [libhal_tqdevice_is_caller_privileged], [LIBHAL_POLICYCHECK=yes], [LIBHAL_POLICYCHECK=no])
if test "x$LIBHAL_POLICYCHECK" = "xyes"; then
AC_DEFINE([USE_LIBHAL_POLICYCHECK],1,[Set if should use libhal to check policy.])
fi

@ -27,7 +27,7 @@ noinst_HEADERS = \
suspenddialog.h
# let automoc handle all of the meta source files (moc)
# let autotqmoc handle all of the meta source files (tqmoc)
METASOURCES = AUTO
KDE_ICON = kpowersave
@ -93,7 +93,7 @@ shellrc_DATA = eventsrc
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) `tqfind . -name \*.h -o -name \*.H -o -name \*.cpp -o -name \*.C` -o $(podir)/kpowersave.pot
rm -f rc.cpp
install-data-local:

@ -32,8 +32,8 @@ autodimm::autodimm() : inactivity() {
lastIdleTime = 0;
checkActivity = new QTimer( this );
connect( checkActivity, SIGNAL(timeout()), this, SLOT(pollActivity()));
checkActivity = new TQTimer( this );
connect( checkActivity, TQT_SIGNAL(timeout()), this, TQT_SLOT(pollActivity()));
kdDebugFuncOut(trace);
}
@ -61,7 +61,7 @@ void autodimm::startCheckForActivity() {
}
/*!
* \b SLOT to call check if the user is active again.
* \b TQT_SLOT to call check if the user is active again.
*/
void autodimm::pollActivity() {
kdDebugFuncIn(trace);

@ -38,6 +38,7 @@
class autodimm : public inactivity
{
Q_OBJECT
TQ_OBJECT
public:
//! default constructor
@ -56,19 +57,19 @@ private:
//! idle time from the last check
unsigned long lastIdleTime;
//! QTimer intervall for the Timer to recheck for user activity
//! TQTimer intervall for the Timer to recheck for user activity
/*!
* The time intervall to recheck for the activity of the user.
* The timeslice is currently 1 sec.
*/
static const int RECHECK_INTERVALL = 1000;
//! QTimer for check activity
//! TQTimer for check activity
/*!
* This timer is used to check if the user get active again.
* The timerinterval is defined trough \ref RECHECK_INTERVALL .
*/
QTimer *checkActivity;
TQTimer *checkActivity;
private slots:
//! to poll X to get info if the user is active again

@ -37,6 +37,7 @@
class autosuspend : public inactivity
{
Q_OBJECT
TQ_OBJECT
public:
//! default constructor

@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>blacklistedit_Dialog</class>
<widget class="QDialog">
<widget class="TQDialog">
<property name="name">
<cstring>blacklistedit_Dialog</cstring>
</property>
<property name="geometry">
<property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@ -22,15 +22,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLayoutWidget" row="1" column="0">
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>layout2</cstring>
<cstring>tqlayout2</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QPushButton" row="0" column="1">
<widget class="TQPushButton" row="0" column="1">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@ -47,7 +47,7 @@
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" row="0" column="3">
<widget class="TQPushButton" row="0" column="3">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>305</width>
<height>20</height>
@ -88,7 +88,7 @@
</spacer>
</grid>
</widget>
<widget class="QButtonGroup" row="0" column="0">
<widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>bG_scheme</cstring>
</property>
@ -107,12 +107,12 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLineEdit" row="0" column="0">
<widget class="TQLineEdit" row="0" column="0">
<property name="name">
<cstring>lE_blacklist</cstring>
</property>
</widget>
<widget class="QPushButton" row="0" column="1" rowspan="1" colspan="2">
<widget class="TQPushButton" row="0" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>pB_add</cstring>
</property>
@ -120,7 +120,7 @@
<string>Add</string>
</property>
</widget>
<widget class="QPushButton" row="1" column="1" rowspan="1" colspan="2">
<widget class="TQPushButton" row="1" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>pB_remove</cstring>
</property>
@ -131,7 +131,7 @@
<string></string>
</property>
</widget>
<widget class="QListBox" row="0" column="3" rowspan="3" colspan="1">
<widget class="TQListBox" row="0" column="3" rowspan="3" colspan="1">
<property name="name">
<cstring>lB_blacklist</cstring>
</property>
@ -143,7 +143,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>0</width>
<height>150</height>
@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>31</width>
<height>20</height>
@ -177,14 +177,14 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>21</width>
<height>140</height>
</size>
</property>
</spacer>
<widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
<widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tLabel_info</cstring>
</property>
@ -196,7 +196,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>220</width>
<height>110</height>
@ -205,7 +205,7 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignBottom</set>
</property>
</widget>
@ -246,7 +246,7 @@
</connection>
<connection>
<sender>lB_blacklist</sender>
<signal>currentChanged(QListBoxItem*)</signal>
<signal>currentChanged(TQListBoxItem*)</signal>
<receiver>blacklistedit_Dialog</receiver>
<slot>lB_blacklist_currentChanged()</slot>
</connection>
@ -259,17 +259,17 @@
<tabstop>pB_remove</tabstop>
<tabstop>lB_blacklist</tabstop>
</tabstops>
<slots>
<Q_SLOTS>
<slot>buttonOk_released()</slot>
<slot>buttonCancel_released()</slot>
<slot>buttonApply_released()</slot>
<slot>pB_remove_released()</slot>
<slot>pB_add_released()</slot>
<slot>lB_blacklist_selected( QListBoxItem * )</slot>
<slot>lB_blacklist_selected( TQListBoxItem * )</slot>
<slot>lE_blacklist_textChanged()</slot>
<slot>lB_blacklist_selected()</slot>
<slot>lB_blacklist_currentChanged(QListBoxItem*)</slot>
<slot>lB_blacklist_currentChanged(TQListBoxItem*)</slot>
<slot>lB_blacklist_currentChanged()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
</UI>

@ -32,20 +32,20 @@
#include <kiconloader.h>
// QT headers:
#include <qbuttongroup.h>
#include <qdialog.h>
#include <qlabel.h>
#include <qlineedit.h>
#include <qlistbox.h>
#include <qpushbutton.h>
#include <qstring.h>
#include <qstringlist.h>
#include <qtooltip.h>
#include <tqbuttongroup.h>
#include <tqdialog.h>
#include <tqlabel.h>
#include <tqlineedit.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqtooltip.h>
/*! This is the default constructor of class blacklistEditDialog . */
blacklistEditDialog::blacklistEditDialog( QStringList blacklisted, QString captionName,
bool initImport, QWidget *parent, const char *name)
:blacklistedit_Dialog(parent, name, false, WDestructiveClose )
blacklistEditDialog::blacklistEditDialog( TQStringList blacklisted, TQString captionName,
bool initImport, TQWidget *tqparent, const char *name)
:blacklistedit_Dialog(tqparent, name, false, WDestructiveClose )
{
blacklist = blacklisted;
@ -61,22 +61,22 @@ blacklistEditDialog::blacklistEditDialog( QStringList blacklisted, QString capti
this->bG_scheme->setTitle(captionName);
else
this->bG_scheme->setTitle( i18n("Scheme: ") + captionName);
this->setIcon(SmallIcon("configure", QIconSet::Automatic));
buttonCancel->setIconSet(SmallIconSet("cancel", QIconSet::Automatic));
buttonOk->setIconSet(SmallIconSet("ok", QIconSet::Automatic));
pB_add->setIconSet(SmallIconSet("forward", QIconSet::Automatic));
pB_remove->setIconSet(SmallIconSet("back", QIconSet::Automatic));
this->setIcon(SmallIcon("configure", TQIconSet::Automatic));
buttonCancel->setIconSet(SmallIconSet("cancel", TQIconSet::Automatic));
buttonOk->setIconSet(SmallIconSet("ok", TQIconSet::Automatic));
pB_add->setIconSet(SmallIconSet("forward", TQIconSet::Automatic));
pB_remove->setIconSet(SmallIconSet("back", TQIconSet::Automatic));
}
/*! This is the default destructor of class blacklistEditDialog . */
blacklistEditDialog::~blacklistEditDialog()
{
// no need to delete child widgets, Qt does it all for us
// no need to delete child widgets, TQt does it all for us
}
/*!
* SLOT: called if the 'ok' button clicked. This SLOT emit
* SLOT: called if the 'ok' button clicked. This TQT_SLOT emit
* \ref config_finished() and close the dialog.
*/
void blacklistEditDialog::buttonOk_released() {
@ -90,7 +90,7 @@ void blacklistEditDialog::buttonOk_released() {
/*!
* SLOT: called if the 'cancel' button clicked. This SLOT close
* SLOT: called if the 'cancel' button clicked. This TQT_SLOT close
* the dialog.
*/
void blacklistEditDialog::buttonCancel_released(){
@ -100,8 +100,8 @@ void blacklistEditDialog::buttonCancel_released(){
/*!
* SLOT: called if the 'remove' button clicked. The SLOT try to remove
* the selected item from the QListBox and the QStringList \ref blacklist .
* SLOT: called if the 'remove' button clicked. The TQT_SLOT try to remove
* the selected item from the TQListBox and the TQStringList \ref blacklist .
*/
void blacklistEditDialog::pB_remove_released(){
@ -120,16 +120,16 @@ void blacklistEditDialog::pB_remove_released(){
/*!
* SLOT: called if the 'add' button clicked. The SLOT try to add the string from
* the QLineEdit lE_blacklist to the QListBox and the QStringList \ref blacklist .
* SLOT: called if the 'add' button clicked. The TQT_SLOT try to add the string from
* the TQLineEdit lE_blacklist to the TQListBox and the TQStringList \ref blacklist .
*/
void blacklistEditDialog::pB_add_released(){
QString text = lE_blacklist->text();
TQString text = lE_blacklist->text();
// remove the whitespaces and check if text is empty
if(text.stripWhiteSpace() != "") {
// check if the entry is already present
if(!lB_blacklist->findItem(text, Qt::ExactMatch)) {
if(!lB_blacklist->tqfindItem(text, TQt::ExactMatch)) {
lB_blacklist->insertItem(text);
lB_blacklist->sort();
blacklist.append(text);
@ -151,7 +151,7 @@ void blacklistEditDialog::pB_add_released(){
/*!
* SLOT: called if a item in the QListBox lB_blacklist is selected.
* SLOT: called if a item in the TQListBox lB_blacklist is selected.
* Here we enable the remove button pB_remove .
*/
void blacklistEditDialog::lB_blacklist_currentChanged(){

@ -37,23 +37,24 @@
class blacklistEditDialog: public blacklistedit_Dialog {
Q_OBJECT
TQ_OBJECT
public:
//! default constructor
blacklistEditDialog(QStringList blacklisted, QString captionName, bool initImport = false,
QWidget *parent = 0, const char *name = 0);
blacklistEditDialog(TQStringList blacklisted, TQString captionName, bool initImport = false,
TQWidget *tqparent = 0, const char *name = 0);
//! default destructor
~blacklistEditDialog();
private:
//! QStringList with the blacklisted processes
//! TQStringList with the blacklisted processes
/*!
* This QStringList contains the given blacklisted processes
* This TQStringList contains the given blacklisted processes
* for edit. If the dialog changed, we change also this list.
*/
QStringList blacklist;
TQStringList blacklist;
//! to tell if the blacklist was changed
/*!
@ -76,7 +77,7 @@ private slots:
void pB_add_released();
//! called if a item of the listbox selected
void lB_blacklist_currentChanged();
//! called if something input in the QLineEdit
//! called if something input in the TQLineEdit
void lE_blacklist_textChanged();
signals:
@ -85,9 +86,9 @@ signals:
/*!
* This signal is emited if the configuration is finished
* and the blacklist was modified-
* \return QStringList (the modified blacklist)
* \return TQStringList (the modified blacklist)
*/
void config_finished( QStringList );
void config_finished( TQStringList );
};

@ -5,5 +5,5 @@ AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
AC_PATH_QT
AC_PATH_QT_MOC_UIC
AC_PATH_QT_TQMOC_UIC

File diff suppressed because it is too large Load Diff

@ -35,28 +35,28 @@
#include <kaccelmanager.h>
// QT - Headers
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qdialog.h>
#include <qgroupbox.h>
#include <qlabel.h>
#include <qlineedit.h>
#include <qlistbox.h>
#include <qpushbutton.h>
#include <qslider.h>
#include <qspinbox.h>
#include <qstringlist.h>
#include <qtabwidget.h>
#include <qtoolbox.h>
#include <qtooltip.h>
#include <qstring.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqdialog.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqlineedit.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
#include <tqslider.h>
#include <tqspinbox.h>
#include <tqstringlist.h>
#include <tqtabwidget.h>
#include <tqtoolbox.h>
#include <tqtooltip.h>
#include <tqstring.h>
#include "configuredialog.h"
/*! This is the default constructor of the class ConfigureDialog. */
ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
QWidget *parent, const char *name)
:configure_Dialog(parent, name, false, WDestructiveClose )
TQWidget *tqparent, const char *name)
:configure_Dialog(tqparent, name, false, WDestructiveClose )
{
kdDebugFuncIn(trace);
@ -65,7 +65,7 @@ ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Setti
hwinfo = _hwinfo;
suspend = hwinfo->getSuspendSupport();
QString session = getenv("DESKTOP_SESSION");
TQString session = getenv("DESKTOP_SESSION");
if(session.startsWith("gnome")) gnome_session = true;
else gnome_session = false;
@ -103,10 +103,10 @@ ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Setti
setInactivityBox();
selectScheme(settings->currentScheme);
tL_valueBrightness->setFrameStyle(QFrame::Panel | QFrame::Sunken);
tL_valueBrightness->setBackgroundMode(Qt::PaletteBase);
tL_valueBrightness->setAlignment(Qt::AlignCenter);
tL_valueBrightness->setFocusPolicy(NoFocus);
tL_valueBrightness->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
tL_valueBrightness->setBackgroundMode(TQt::PaletteBase);
tL_valueBrightness->tqsetAlignment(TQt::AlignCenter);
tL_valueBrightness->setFocusPolicy(TQ_NoFocus);
// hide Lid item if this is not a laptop
if (!hwinfo->isLaptop())
@ -129,13 +129,13 @@ ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Setti
/*! This is the default destructor of the class ConfigureDialog. */
ConfigureDialog::~ConfigureDialog(){
kdDebugFuncIn(trace);
// no need to delete child widgets, Qt does it all for us
// no need to delete child widgets, TQt does it all for us
}
/* ---- START General setup SECTION ---- */
/*!
* This used to fill the QListBox listBox_schemes and the scheme related QComboBoxes
* This used to fill the TQListBox listBox_schemes and the scheme related TQComboBoxes
* with the existing schemes.
*/
void ConfigureDialog::setSchemeList(){
@ -145,30 +145,30 @@ void ConfigureDialog::setSchemeList(){
cB_acScheme->clear();
cB_batteryScheme->clear();
for ( QStringList::Iterator it = schemes.begin(); it != schemes.end(); ++it ) {
for ( TQStringList::Iterator it = schemes.begin(); it != schemes.end(); ++it ) {
const char *_tmp = (*it).ascii();
if(_tmp == "Performance" || _tmp == i18n("Performance")) {
listBox_schemes->insertItem(SmallIcon("scheme_power", QIconSet::Automatic), i18n(_tmp));
listBox_schemes->insertItem(SmallIcon("scheme_power", TQIconSet::Automatic), i18n(_tmp));
cB_acScheme->insertItem(i18n(_tmp));
cB_batteryScheme->insertItem(i18n(_tmp));
} else if(_tmp == "Powersave" || _tmp == i18n("Powersave")) {
listBox_schemes->insertItem(SmallIcon("scheme_powersave", QIconSet::Automatic),
listBox_schemes->insertItem(SmallIcon("scheme_powersave", TQIconSet::Automatic),
i18n(_tmp));
cB_acScheme->insertItem(i18n(_tmp));
cB_batteryScheme->insertItem(i18n(_tmp));
} else if(_tmp == "Presentation" || _tmp == i18n("Presentation")){
listBox_schemes->insertItem(SmallIcon("scheme_presentation", QIconSet::Automatic),
listBox_schemes->insertItem(SmallIcon("scheme_presentation", TQIconSet::Automatic),
i18n(_tmp));
cB_acScheme->insertItem(i18n(_tmp));
cB_batteryScheme->insertItem(i18n(_tmp));
} else if(_tmp == "Acoustic" || _tmp == i18n("Acoustic")) {
listBox_schemes->insertItem(SmallIcon("scheme_acoustic", QIconSet::Automatic),
listBox_schemes->insertItem(SmallIcon("scheme_acoustic", TQIconSet::Automatic),
i18n(_tmp));
cB_acScheme->insertItem(i18n(_tmp));
cB_batteryScheme->insertItem(i18n(_tmp));
} else if(_tmp == "AdvancedPowersave" || _tmp == i18n("Advanced Powersave")) {
listBox_schemes->insertItem(SmallIcon("scheme_advanced_powersave",
QIconSet::Automatic), i18n("Advanced Powersave"));
TQIconSet::Automatic), i18n("Advanced Powersave"));
cB_acScheme->insertItem(i18n("Advanced Powersave"));
cB_batteryScheme->insertItem(i18n("Advanced Powersave"));
} else {
@ -198,14 +198,14 @@ void ConfigureDialog::getSchemeList(){
/*!
* This used to set the current scheme based on the name of the scheme
* \param _scheme QString with the name of the scheme
* \param _scheme TQString with the name of the scheme
*/
void ConfigureDialog::selectScheme (QString _scheme){
void ConfigureDialog::selectScheme (TQString _scheme){
kdDebugFuncIn(trace);
// select the current scheme in the listbox
if(!_scheme.isEmpty()) {
int pos = schemes.findIndex(_scheme);
int pos = schemes.tqfindIndex(_scheme);
if(pos > -1) {
listBox_schemes->setCurrentItem(pos);
currentScheme = pos;
@ -226,37 +226,37 @@ void ConfigureDialog::setIcons(){
kdDebugFuncIn(trace);
/* set all Icons */
this->setIcon(SmallIcon("kpowersave", QIconSet::Automatic));
buttonApply->setIconSet(SmallIconSet("apply", QIconSet::Automatic));
buttonCancel->setIconSet(SmallIconSet("cancel", QIconSet::Automatic));
buttonOk->setIconSet(SmallIconSet("ok", QIconSet::Automatic));
buttonHelp->setIconSet(SmallIconSet("help", QIconSet::Automatic));
pB_editBlacklist->setIconSet(SmallIconSet("configure", QIconSet::Automatic));
pB_editBlacklistDimm->setIconSet(SmallIconSet("configure", QIconSet::Automatic));
pB_editAutosuspendGBlacklist->setIconSet(SmallIconSet("configure", QIconSet::Automatic));
pB_editAutodimmGBlacklist->setIconSet(SmallIconSet("configure", QIconSet::Automatic));
tB_scheme->setItemIconSet( 0 ,SmallIcon("kscreensaver", QIconSet::Automatic));
tB_scheme->setItemIconSet( 1 ,SmallIcon("display", QIconSet::Automatic));
this->setIcon(SmallIcon("kpowersave", TQIconSet::Automatic));
buttonApply->setIconSet(SmallIconSet("apply", TQIconSet::Automatic));
buttonCancel->setIconSet(SmallIconSet("cancel", TQIconSet::Automatic));
buttonOk->setIconSet(SmallIconSet("ok", TQIconSet::Automatic));
buttonHelp->setIconSet(SmallIconSet("help", TQIconSet::Automatic));
pB_editBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic));
pB_editBlacklistDimm->setIconSet(SmallIconSet("configure", TQIconSet::Automatic));
pB_editAutosuspendGBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic));
pB_editAutodimmGBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 0 ,SmallIcon("kscreensaver", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 1 ,SmallIcon("display", TQIconSet::Automatic));
if(actions[0] == "Suspend to Disk")
tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_disk", QIconSet::Automatic));
tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_disk", TQIconSet::Automatic));
else if(actions[0] == "Suspend to RAM")
tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_ram", QIconSet::Automatic));
tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_ram", TQIconSet::Automatic));
else if(actions[0] == "Standby")
tB_scheme->setItemIconSet( 2 ,SmallIcon("stand_by", QIconSet::Automatic));
tB_scheme->setItemIconSet( 2 ,SmallIcon("stand_by", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 3 ,SmallIcon("autodimm", QIconSet::Automatic));
tB_scheme->setItemIconSet( 4 ,SmallIcon("processor", QIconSet::Automatic));
tB_scheme->setItemIconSet( 5 ,SmallIcon("misc", QIconSet::Automatic));
tB_scheme->setItemIconSet( 3 ,SmallIcon("autodimm", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 4 ,SmallIcon("processor", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 5 ,SmallIcon("misc", TQIconSet::Automatic));
tB_general->setItemIconSet( 0, SmallIcon( "scheme_powersave", QIconSet::Automatic));
tB_general->setItemIconSet( 1, SmallIcon( "button", QIconSet::Automatic));
tB_general->setItemIconSet( 2, SmallIcon( "scheme_power", QIconSet::Automatic));
tB_general->setItemIconSet( 3, SmallIcon( "lock", QIconSet::Automatic));
tB_general->setItemIconSet( 4, SmallIcon( "misc", QIconSet::Automatic));
pB_configNotify->setIconSet(SmallIconSet("knotify", QIconSet::Automatic));
tB_general->setItemIconSet( 0, SmallIcon( "scheme_powersave", TQIconSet::Automatic));
tB_general->setItemIconSet( 1, SmallIcon( "button", TQIconSet::Automatic));
tB_general->setItemIconSet( 2, SmallIcon( "scheme_power", TQIconSet::Automatic));
tB_general->setItemIconSet( 3, SmallIcon( "lock", TQIconSet::Automatic));
tB_general->setItemIconSet( 4, SmallIcon( "misc", TQIconSet::Automatic));
pB_configNotify->setIconSet(SmallIconSet("knotify", TQIconSet::Automatic));
kdDebugFuncOut(trace);
}
@ -267,36 +267,36 @@ void ConfigureDialog::setIcons(){
void ConfigureDialog::setTooltips(){
kdDebugFuncIn(trace);
// QToolTip::setWakeUpDelay ( 1000 );
QToolTip::add(cB_specificSettings, i18n("This enables specific screen saver settings. \n"
// 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."));
QToolTip::add(cB_disable_Ss, i18n("This disables the screen saver. \n"
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."));
QToolTip::add(cB_blankScreen, i18n("This blanks the screen instead of using a specific screen saver. \n"
TQToolTip::add(cB_blankScreen, i18n("This blanks the screen instead of using a specific screen saver. \n"
"Note: This may work only with KScreensaver."));
QToolTip::add(cB_SpecificPM, i18n("This enables specific DPMS settings. \n"
TQToolTip::add(cB_SpecificPM, i18n("This enables specific DPMS settings. \n"
"Note: If selected, the global DPMS settings are \n"
"overwritten while kpowersave runs."));
QToolTip::add(cB_disablePM, i18n("This disables DPMS support."));
QToolTip::add(cB_lockSuspend, i18n("If selected, the screen is locked on suspend or standby."));
QToolTip::add(cB_lockLid, i18n("If selected, the screen is locked if the lid close event is triggered."));
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."));
QToolTip::add(cB_autoSuspend, i18n("Check this box to enable or disable automatic suspension of "
TQToolTip::add(cB_autoSuspend, i18n("Check this box to enable or disable automatic suspension of "
"the computer."));
QToolTip::add(cB_autoInactivity, i18n("Activate this action if the user was inactive for the defined "
TQToolTip::add(cB_autoInactivity, i18n("Activate this action if the user was inactive for the defined "
"time \n(greater than 0 minutes). If empty, nothing happens."));
tB_scheme->setItemToolTip ( 0, i18n("All scheme-related screen saver and DPMS settings."));
tB_scheme->setItemToolTip ( 1, i18n("All scheme-related display brightness settings."));
tB_scheme->setItemToolTip ( 2, i18n("All scheme-related automatic suspend settings."));
QToolTip::add(brightnessSlider, i18n("Here you can change the brightness of your display. \n"
TQToolTip::add(brightnessSlider, i18n("Here you can change the brightness of your display. \n"
"Use the slider to change the brightness directly for \n"
"testing. To reset back to previous level, please press \n"
"the 'Reset' button. "));
QToolTip::add(pB_resetBrightness, i18n("Use this button to set back the slider and the "
TQToolTip::add(pB_resetBrightness, i18n("Use this button to set back the slider and the "
"display brightness."));
kdDebugFuncOut(trace);
@ -307,12 +307,12 @@ void ConfigureDialog::setTooltips(){
* This is a workaround for the case if Yast translated the name of the
* scheme In this case is a new config section created and the old settings
* would be lost.
* \param s_scheme QString with the 'current' name of the scheme
* \return QString with the english name of the scheme
* \param s_scheme TQString with the 'current' name of the scheme
* \return TQString with the english name of the scheme
*/
QString ConfigureDialog::getSchemeRealName(QString s_scheme) {
TQString ConfigureDialog::getSchemeRealName(TQString s_scheme) {
kdDebugFuncIn(trace);
QString ret = s_scheme;
TQString ret = s_scheme;
if( s_scheme == "Performance" || s_scheme == i18n("Performance"))
ret = "Performance";
@ -331,14 +331,14 @@ QString ConfigureDialog::getSchemeRealName(QString s_scheme) {
* This function is used to read the settings from configfile and
* set the values to the related dialog elements.
* \param schemeID Integer value, represent the position of the
* scheme in the QListBox and within the pdaemon-list.
* scheme in the TQListBox and within the pdaemon-list.
*/
void ConfigureDialog::setConfigToDialog( int schemeID ){
if (trace) kdDebug() << funcinfo << "IN , scheme: " << schemeID << endl;
initalised = false;
QString s_scheme = getSchemeRealName(schemes[schemeID]);
TQString s_scheme = getSchemeRealName(schemes[schemeID]);
if (kconfig->hasGroup(s_scheme)){
settings->load_general_settings();
@ -349,18 +349,18 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){
!s_scheme.startsWith(settings->battery_scheme)) {
// enable delete button
pB_deleteScheme->setEnabled( true );
QToolTip::add(pB_deleteScheme, i18n("Press this button to delete the "
TQToolTip::add(pB_deleteScheme, i18n("Press this button to delete the "
"selected scheme."));
} else {
// disable button
pB_deleteScheme->setEnabled( false );
QToolTip::add(pB_deleteScheme, i18n("You can't delete the current AC "
TQToolTip::add(pB_deleteScheme, i18n("You can't delete the current AC "
"or battery scheme."));
}
} else {
// disable button, can't delete these scheme, they are default
pB_deleteScheme->setEnabled( false );
QToolTip::add(pB_deleteScheme, i18n("You can't delete this default scheme."));
TQToolTip::add(pB_deleteScheme, i18n("You can't delete this default scheme."));
}
kconfig->setGroup(s_scheme);
@ -449,9 +449,9 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){
cB_disablePM_toggled(kconfig->readBoolEntry("disableDPMS",false));
// set autosuspend related settings
QString _action = kconfig->readEntry("autoInactiveAction", "NULL");
TQString _action = kconfig->readEntry("autoInactiveAction", "NULL");
if( _action != "NULL") {
int _index = actions.findIndex(_action);
int _index = actions.tqfindIndex(_action);
if( _index != -1) {
cB_autoInactivity->setCurrentItem( _index );
cB_autoInactivity_activated( _index );
@ -473,7 +473,7 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){
kconfig->setGroup("default-scheme");
_action = kconfig->readEntry("autoInactiveAction", "NULL");
if(_action != "NULL") {
int _index = actions.findIndex(_action);
int _index = actions.tqfindIndex(_action);
if( _index != -1) {
cB_autoInactivity->setCurrentItem( _index );
tL_autoInactivity_After->setEnabled(true);
@ -536,11 +536,11 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){
int i_brightnessPercent = kconfig->readNumEntry("brightnessPercent", -1);
if(i_brightnessPercent >= 0) {
brightnessSlider->setValue(i_brightnessPercent);
tL_valueBrightness->setText(QString::number(i_brightnessPercent) + " %");
tL_valueBrightness->setText(TQString::number(i_brightnessPercent) + " %");
}
else {
brightnessSlider->setValue(100);
tL_valueBrightness->setText(QString::number(100)+ " %");
tL_valueBrightness->setText(TQString::number(100)+ " %");
}
tL_brightness->setText(i18n("Your hardware supports to change the brightness. The "