Compare commits

...

72 Commits

Author SHA1 Message Date
  TDE Gitea 114d90b383 Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 week ago
  TDE Gitea 722ee1d1e9 Reset submodule main/applications/kpowersave/admin to latest HEAD 1 week ago
  TDE Gitea 584702a6be Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 week ago
  TDE Gitea dfd4fb8d10 Reset submodule main/applications/kpowersave/admin to latest HEAD 1 week ago
  TDE Gitea 8fac6ef525 Reset submodule main/applications/kpowersave/cmake to latest HEAD 2 months ago
  TDE Gitea a751dc0c12 Reset submodule main/applications/kpowersave/cmake to latest HEAD 3 months ago
  TDE Gitea 87e4766342 Reset submodule main/applications/kpowersave/cmake to latest HEAD 3 months ago
  TDE Gitea ef711022e3 Reset submodule main/applications/kpowersave/admin to latest HEAD 3 months ago
  TDE Gitea b493585731 Reset submodule main/applications/kpowersave/cmake to latest HEAD 3 months ago
  TDE Gitea fbd9af3476 Reset submodule main/applications/kpowersave/cmake to latest HEAD 3 months ago
  TDE Gitea 52a35f0b93 Reset submodule main/applications/kpowersave/cmake to latest HEAD 3 months ago
  TDE Gitea 6d5ac6a52c Reset submodule main/applications/kpowersave/cmake to latest HEAD 3 months ago
  TDE Gitea 19191a43a3 Reset submodule main/applications/kpowersave/admin to latest HEAD 3 months ago
  TDE Gitea 78fec4c0d6 Reset submodule main/applications/kpowersave/cmake to latest HEAD 4 months ago
  TDE Gitea c0076c0005 Reset submodule main/applications/kpowersave/cmake to latest HEAD 4 months ago
  TDE Gitea e1527a40c9 Reset submodule main/applications/kpowersave/cmake to latest HEAD 4 months ago
  TDE Gitea 6de84ed705 Reset submodule main/applications/kpowersave/cmake to latest HEAD 4 months ago
  TDE Gitea 014fdaa1c6 Reset submodule main/applications/kpowersave/cmake to latest HEAD 4 months ago
  TDE Gitea bc77a62442 Reset submodule main/applications/kpowersave/cmake to latest HEAD 5 months ago
  TDE Gitea 1b1e2ae17a Reset submodule main/applications/kpowersave/cmake to latest HEAD 5 months ago
  TDE Gitea d311f24f67 Reset submodule main/applications/kpowersave/cmake to latest HEAD 6 months ago
  TDE Gitea c8d83f6f65 Reset submodule main/applications/kpowersave/cmake to latest HEAD 9 months ago
  Slávek Banko 1491b19759
Switch all submodules to https. 9 months ago
  TDE Gitea 6bb34f439e Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea 8816678883 Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea 06b834a858 Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea 4a6854eb4c Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea f86c7ac11e Reset submodule main/applications/kpowersave/admin to latest HEAD 1 year ago
  TDE Gitea 4b0e76f671 Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea 6fc95ba531 Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea 2ac4a993da Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea 0c0a19580d Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea b5fb0ad46e Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea 933ff6244e Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea 3f3d050390 Reset submodule main/applications/kpowersave/admin to latest HEAD 1 year ago
  TDE Gitea f27aa5a5e2 Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea b34bb4afe9 Reset submodule main/applications/kpowersave/cmake to latest HEAD 1 year ago
  TDE Gitea 3afe4b0e16 Reset submodule main/applications/kpowersave/admin to latest HEAD 2 years ago
  Slávek Banko 1fe8c950e2 Reset submodule main/applications/kpowersave/admin to latest HEAD 2 years ago
  Slávek Banko 9cdaa94832 Reset submodule main/applications/kpowersave/admin to latest HEAD 2 years ago
  Slávek Banko 70868b8221 Reset submodule main/applications/kpowersave/admin to latest HEAD 2 years ago
  Slávek Banko 9138b6d56b Reset submodule main/applications/kpowersave/cmake to latest HEAD 3 years ago
  Slávek Banko 3d32959e3f Reset submodule main/applications/kpowersave/admin to latest HEAD 4 years ago
  Slávek Banko a19d016116 Reset submodule main/applications/kpowersave/cmake to latest HEAD 4 years ago
  Slávek Banko 82d2bb7217 Reset submodule main/applications/kpowersave/admin to latest HEAD 4 years ago
  Slávek Banko c3dde41bfb Reset submodule main/applications/kpowersave/admin to latest HEAD 7 years ago
  Darrell Anderson 2b503c0628 Fix typos. 7 years ago
  Slávek Banko 3f5d392aa1 Reset submodule main/applications/kpowersave/admin to latest HEAD 7 years ago
  Slávek Banko 3724462e01 Reset submodule main/applications/kpowersave/cmake to latest HEAD 7 years ago
  Slávek Banko b5ec44f5a9 Reset submodule main/applications/kpowersave/cmake to latest HEAD 7 years ago
  Darrell Anderson 5876d4df83 Fix inadvertent tq changes. 8 years ago
  Darrell Anderson 874d437b8e Fix inadvertent tq changes. 8 years ago
  Darrell Anderson e1f9ff2aaf Remove unnecessary language. 8 years ago
  Timothy Pearson 1817f019c3 Use high quality icons for 16x16 tray size 8 years ago
  Timothy Pearson 6bc71c5141 Reload icon when tray size changes 8 years ago
  Slávek Banko de14cb88f9 Reset submodule main/applications/kpowersave/cmake to latest HEAD 7 years ago
  Slávek Banko 8578f04c84 Reset submodule main/applications/kpowersave/cmake to latest HEAD 7 years ago
  Slávek Banko f9cb7e52aa Reset submodule main/applications/kpowersave/admin to latest HEAD 7 years ago
  Slávek Banko 05ee057691 Reset submodule main/applications/kpowersave/cmake to latest HEAD 8 years ago
  Slávek Banko 61b85f827a Reset submodule main/applications/kpowersave/cmake to latest HEAD 8 years ago
  Slávek Banko e36d439cb3 Reset submodule main/applications/kpowersave/admin to latest HEAD 8 years ago
  Slávek Banko 96c27abc55 Update final HTML install path so all modules are consistent. 8 years ago
  Darrell Anderson 89bc375425 Update HTML install path references. 8 years ago
  Darrell Anderson f15578e489 Fix corrupt png file. 8 years ago
  Darrell Anderson 3fa1fa8123 Fix typos. 8 years ago
  Timothy Pearson bdbe3b3cbf Fix de docbook 8 years ago
  Darrell Anderson ca363c2f4a Update docbook headers. 8 years ago
  Timothy Pearson c01fb4288e Rename a few stragglers 8 years ago
  Timothy Pearson 18e2738fb8 Rename obsolete tq methods to standard names 8 years ago
  Timothy Pearson b76b44bc1d Remove additional unneeded tq method conversions 8 years ago
  Timothy Pearson 3135cedc0f Rename old tq methods that no longer need a unique name 8 years ago
  Slávek Banko f5b40d5c81 Add common directories 8 years ago
53 changed files with 286 additions and 293 deletions
Split View
  1. +6
    -0
      .gitmodules
  2. +26
    -26
      ChangeLog
  3. +4
    -4
      ChangeLog.package
  4. +2
    -2
      Doxyfile
  5. +1
    -1
      INSTALL
  6. +1
    -1
      NEWS
  7. +1
    -0
      admin
  8. +1
    -0
      cmake
  9. +1
    -1
      configure.in.in
  10. +1
    -4
      doc/cs/index.docbook
  11. +1
    -4
      doc/de/index.docbook
  12. +1
    -4
      doc/en/index.docbook
  13. +1
    -4
      doc/fi/index.docbook
  14. +1
    -4
      doc/hu/index.docbook
  15. +1
    -1
      doc/nb/index.docbook
  16. +1
    -1
      packaging/FC4.kpowersave.spec
  17. +1
    -1
      packaging/FC5.kpowersave.spec
  18. +1
    -1
      packaging/mandriva.2006.1.kpowersave.spec
  19. +1
    -1
      src/Makefile.am
  20. +7
    -7
      src/blacklistedit_Dialog.ui
  21. +59
    -59
      src/configure_Dialog.ui
  22. +2
    -2
      src/configuredialog.cpp
  23. +9
    -9
      src/countdown_Dialog.ui
  24. +2
    -2
      src/countdowndialog.cpp
  25. +19
    -19
      src/dbusHAL.cpp
  26. +5
    -5
      src/dbusHAL.h
  27. +31
    -31
      src/detailed_Dialog.ui
  28. +9
    -9
      src/detaileddialog.cpp
  29. +20
    -20
      src/dummy.cpp
  30. +5
    -5
      src/hardware.cpp
  31. +2
    -2
      src/hardware.h
  32. +3
    -3
      src/inactivity.cpp
  33. +12
    -12
      src/info_Dialog.ui
  34. +26
    -26
      src/kpowersave.cpp
  35. +2
    -2
      src/kpowersave.h
  36. +3
    -3
      src/log_viewer.ui
  37. +1
    -1
      src/logviewer.cpp
  38. BIN
      src/pics/cr16-action-laptopbattery.png
  39. BIN
      src/pics/cr16-action-laptopbatteryORANGE.png
  40. BIN
      src/pics/cr16-action-laptopbatteryRED.png
  41. BIN
      src/pics/cr16-action-laptopcharge.png
  42. BIN
      src/pics/cr16-action-laptopnobattery.png
  43. BIN
      src/pics/cr16-action-laptoppower.png
  44. BIN
      src/pics/cr22-action-processor.png
  45. BIN
      src/pics/cr88-action-laptopbattery.png
  46. BIN
      src/pics/cr88-action-laptopbatteryORANGE.png
  47. BIN
      src/pics/cr88-action-laptopbatteryRED.png
  48. BIN
      src/pics/cr88-action-laptopcharge.png
  49. BIN
      src/pics/cr88-action-laptopnobattery.png
  50. BIN
      src/pics/cr88-action-laptoppower.png
  51. +10
    -10
      src/screen.cpp
  52. +2
    -2
      src/screen.h
  53. +4
    -4
      src/suspend_Dialog.ui

+ 6
- 0
.gitmodules View File

@@ -0,0 +1,6 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"]
path = cmake
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake

+ 26
- 26
ChangeLog View File

@@ -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_tqdevice_is_caller_privileged() to check
function: libhal_device_is_caller_privileged() to check
if KPowersave should use libhal or the old PolicyKit
D-Bus interface.

@@ -204,17 +204,17 @@

* src/hardware.cpp: If the desktop session (if detected
via ConsoleKit) get inactive call releasePolicyPowerIface()
and if the session is active again try to aquire the
and if the session is active again try to acquire the
org.freedesktop.Policy.Power interface again.

This should happen:
- the session get inactive:
- release org.freedesktop.Policy.Power:
powersaved or if there is an other desktop session
an other KPowersave instance can aquire the name and
an other KPowersave instance can acquire the name and
handle powermanagement.
- the session get active again:
- the current active KPowersave instance aquire the
- the current active KPowersave instance acquire the
interface/name from powersaved (if there is an other
KPowersave instance holding the name it should release
the name ...) and handle powermanagement again.
@@ -230,7 +230,7 @@

2007-08-20 Danny Kukawka <danny.kukawka@web.de>

* src/dbusHAL.[cpp,h]: Split up the code to aquire the
* src/dbusHAL.[cpp,h]: Split up the code to acquire the
org.freedesktop.Policy.Power name service to a new own
function. Added new function to release the service
name again. Call now dbus_bus_release_name() if close()
@@ -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_tqdevice_is_caller_privileged() in libhal.
check for libhal_device_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 tqdevice with laptop_panel found. This
should prevent problems if the laptop panel tqdevice get removed
QDict<QString> udis if no device with laptop_panel found. This
should prevent problems if the laptop panel device get removed
from HAL.

2007-06-13 Danny Kukawka <danny.kukawka@web.de>

* src/hardware.cpp: Added code to react if a latop panel tqdevice
get added/remove. Added also all tqdevice_type values to the
* src/hardware.cpp: Added code to react if a latop panel device
get added/remove. Added also all device_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 tqdevice_type for laptop
* src/hardware.h: Added new value to enum device_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 tqmoc file. Fixed possible file
* src/logviewer.cpp: Include moc 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 tqmoc includes to end of cpp-files, added some code
Moved all moc 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 tqmoc files being included to speed up build and to fix some
Make moc files being included to speed up build and to fix some
parallel build issues:

* src/autosuspend.cpp:
@@ -1667,7 +1667,7 @@

2007-01-21 Danny Kukawka <danny.kukawka@web.de>

* src/configure_Dialog.ui: Fixed tqlayout and (re)added
* src/configure_Dialog.ui: Fixed layout and (re)added
Q_SLOTS for Q_SIGNALS and actions.

2007-01-21 Danny Kukawka <danny.kukawka@web.de>
@@ -2011,7 +2011,7 @@
2006-11-19 Danny Kukawka <danny.kukawka@web.de>

* TODO: removed done issues
* src/dbusHAL.[cpp,h]: Added code to claim/aquire the
* src/dbusHAL.[cpp,h]: Added code to claim/acquire the
org.freedesktop.Policy.Power interface from D-Bus to stop
the powersave daemon/client and to be allowed to handle
the powermanagement policy.
@@ -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
tqdevices is not empty before use them.
devices is not empty before use them.
Fixed some minor bugs in debug messages

2006-11-02 Danny Kukawka <danny.kukawka@web.de>
@@ -2617,9 +2617,9 @@
2006-10-25 Danny Kukawka <danny.kukawka@web.de>

* src/hardware.[cpp,h]: Added new function to check if we should
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).
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 Q_SIGNALS for: HAL error handling, data changes and
if the sleep button was pressed.

@@ -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 tqdevices. Added new code to the func
one QStringList for the devices. Added new code to the func
to collect the battery UDIs.
Added code to store the UDIs of all tqdevices we handle and
Added code to store the UDIs of all devices 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 tqdevices except batteries (e.g. AC, Lid, buttons ...)
for udis of devices except batteries (e.g. AC, Lid, buttons ...)
* src/pdaemon.cpp: added comments about the state of port code
and functions to class dbusHAL

@@ -3054,7 +3054,7 @@
* 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 tqdevices and to get tqdevice
contains now mew functions to search for devices and to get device
information from HAL. Also added: new function to call
org.freedesktop.Hal.Device.SystemPowerManagement methodes on HAL
via DBUS.
@@ -4130,7 +4130,7 @@

2006-02-19 Danny Kukawka <danny.kukawka@web.de>

* src/detaileddialog.cpp, src/detaileddialog.h: replaced tqlayout for
* src/detaileddialog.cpp, src/detaileddialog.h: replaced layout 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.
@@ -4539,7 +4539,7 @@

* src/detailed_dialog.ui: reworked detailed dialog after
discussion and welcome criticism from Timo Hönig based on a
tqmocup from Timo. Thanks!
mocup 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.


+ 4
- 4
ChangeLog.package View File

@@ -84,7 +84,7 @@ Mon Aug 20 18:10:39 CEST 2007 - dkukawka@suse.de
- added code to check if the current desktop session is avtive
and handle if the session get inactive (for more see Changelog
of the pacakge)
- added code to release/aquire org.freedesktop.Policy.Power if
- added code to release/acquire org.freedesktop.Policy.Power if
the session get inactive/active to allow powersaved or other
active KPowersave instances to handle powermanagement
- fixed parameter types for call of SetPowerSave() on HAL
@@ -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 tqdevice handling to react if a
tqdevice get added/removed to/from HAL
- fixed laptop panel/backlight device handling to react if a
device 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.
@@ -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 tqmoc files being included to speed up build and to fix
- Make moc files being included to speed up build and to fix
some parallel build issues
- fixed several memory leaks
- fixed bugs:


+ 2
- 2
Doxyfile View File

@@ -113,7 +113,7 @@ FILE_PATTERNS = *.c \
*.dox
RECURSIVE = YES
EXCLUDE = ./src/kpowersave_dummy.cpp \
./src/screen.tqmoc.cpp \
./src/screen.moc.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 = *.tqmoc.cpp \
EXCLUDE_PATTERNS = *.moc.cpp \
*_dummy.* \
*.la.cpp \
*_la.all_cpp.cpp


+ 1
- 1
INSTALL View File

@@ -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 tqlayout you can give
In addition, if you use an unusual directory layout 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.


+ 1
- 1
NEWS View File

@@ -17,7 +17,7 @@ Major changes since the last version/release:
the user is privileged (for HAL >= 0.5.10 and related PolicyKit versions)
- added code to check if the current desktop session is avtive and handle
if the session get inactive (via ConsoleKit)
- added code to release/aquire org.freedesktop.Policy.Power if the session
- added code to release/acquire org.freedesktop.Policy.Power if the session
get inactive/active to allow powersaved or other active KPowersave
instances to handle powermanagement
- prepared KPowersave to work also with HAL >= 0.5.10 (handle renamed


+ 1
- 0
admin

@@ -0,0 +1 @@
Subproject commit 9c3a708c04ab11ee9bc511e7fb90b59db5eecf22

+ 1
- 0
cmake

@@ -0,0 +1 @@
Subproject commit adf1b92de6227b1d277e2cc89e70286acd205c39

+ 1
- 1
configure.in.in View File

@@ -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_tqdevice_is_caller_privileged], [LIBHAL_POLICYCHECK=yes], [LIBHAL_POLICYCHECK=no])
AC_CHECK_LIB([hal], [libhal_device_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


+ 1
- 4
doc/cs/index.docbook View File

@@ -1,8 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC
"-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
"dtd/kdex.dtd"
[
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY app "<application>KPowersave</application>">
<!ENTITY apprelease " ">
<!-- chapters in separate docbook files -->


+ 1
- 4
doc/de/index.docbook View File

@@ -1,8 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC
"-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
"dtd/kdex.dtd"
[
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY app "<application>KPowersave</application>">
<!ENTITY apprelease " ">
<!-- chapters in separate docbook files -->


+ 1
- 4
doc/en/index.docbook View File

@@ -1,8 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC
"-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
"dtd/kdex.dtd"
[
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY app "<application>KPowersave</application>">
<!ENTITY apprelease " ">
<!-- chapters in separate docbook files -->


+ 1
- 4
doc/fi/index.docbook View File

@@ -1,8 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC
"-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
"dtd/kdex.dtd"
[
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY app "<application>KPowersave</application>">
<!ENTITY apprelease " ">
<!-- chapters in separate docbook files -->


+ 1
- 4
doc/hu/index.docbook View File

@@ -1,8 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC
"-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
"dtd/kdex.dtd"
[
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY app "<application>KPowersave</application>">
<!ENTITY apprelease " ">
<!-- chapters in separate docbook files -->


+ 1
- 1
doc/nb/index.docbook View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY app "<application>KPowersave</application>">
<!ENTITY apprelease " ">
<!-- chapters in separate docbook files --><!-- book related entities --><!ENTITY kappname "KPowersave">


+ 1
- 1
packaging/FC4.kpowersave.spec View File

@@ -64,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/apps/kpowersave
/usr/share/icons/??color
/usr/share/applications/kde/kpowersave.desktop
/usr/share/doc/HTML/*/kpowersave
/usr/share/doc/tde/HTML/*/kpowersave
/usr/lib*/trinity/kpowersave.*
/usr/lib*/libkdeinit_kpowersave.*
/usr/share/locale/*


+ 1
- 1
packaging/FC5.kpowersave.spec View File

@@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/apps/kpowersave
/usr/share/icons/??color
/usr/share/applications/kde/kpowersave.desktop
/usr/share/doc/HTML/*/kpowersave
/usr/share/doc/tde/HTML/*/kpowersave
/usr/lib*/trinity/kpowersave.*
/usr/lib*/libkdeinit_kpowersave.*
/usr/share/locale/*


+ 1
- 1
packaging/mandriva.2006.1.kpowersave.spec View File

@@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/apps/kpowersave
/usr/share/icons/??color
/usr/share/applications/kde/kpowersave.desktop
/usr/share/doc/HTML/*/kpowersave
/usr/share/doc/tde/HTML/*/kpowersave
/usr/lib*/trinity/kpowersave.*
/usr/lib*/libkdeinit_kpowersave.*
/usr/share/locale/*


+ 1
- 1
src/Makefile.am View File

@@ -27,7 +27,7 @@ noinst_HEADERS = \
suspenddialog.h


# let autotqmoc handle all of the meta source files (tqmoc)
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO

KDE_ICON = kpowersave


+ 7
- 7
src/blacklistedit_Dialog.ui View File

@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>305</width>
<height>20</height>
@@ -143,7 +143,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>150</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -177,7 +177,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>140</height>
@@ -196,7 +196,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>220</width>
<height>110</height>
@@ -205,7 +205,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignBottom</set>
</property>
</widget>


+ 59
- 59
src/configure_Dialog.ui View File

@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>250</width>
<height>20</height>
@@ -223,7 +223,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -284,7 +284,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>160</width>
<height>20</height>
@@ -398,7 +398,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -428,7 +428,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>40</width>
<height>30</height>
@@ -448,7 +448,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>231</width>
<height>31</height>
@@ -465,7 +465,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -521,7 +521,7 @@
<property name="name">
<cstring>tL_brightness</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
@@ -530,7 +530,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -573,13 +573,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>100</width>
<height>20</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
@@ -637,7 +637,7 @@
<property name="text">
<string>after:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -684,7 +684,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>50</height>
@@ -701,7 +701,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>21</height>
@@ -813,7 +813,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -836,7 +836,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -861,7 +861,7 @@
<property name="text">
<string>after:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -919,7 +919,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -941,7 +941,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
@@ -997,7 +997,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>170</height>
@@ -1025,7 +1025,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1066,7 +1066,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>170</height>
@@ -1078,7 +1078,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -1112,7 +1112,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1167,7 +1167,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>75</width>
<height>0</height>
@@ -1179,7 +1179,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -1187,7 +1187,7 @@
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -1204,7 +1204,7 @@
<property name="name">
<cstring>textLabel1_2_2</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -1221,7 +1221,7 @@
<property name="name">
<cstring>textLabel1_2_3</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -1244,7 +1244,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -1288,7 +1288,7 @@
<property name="name">
<cstring>cB_batWarning</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -1299,7 +1299,7 @@
<property name="name">
<cstring>cB_batLow</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -1310,7 +1310,7 @@
<property name="name">
<cstring>cB_batCritical</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -1459,7 +1459,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
@@ -1471,7 +1471,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -1529,7 +1529,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -1546,7 +1546,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -1563,7 +1563,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -1580,7 +1580,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -1591,7 +1591,7 @@
<property name="name">
<cstring>cB_SleepButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -1602,7 +1602,7 @@
<property name="name">
<cstring>cB_LidcloseButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -1613,7 +1613,7 @@
<property name="name">
<cstring>cB_PowerButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -1624,7 +1624,7 @@
<property name="name">
<cstring>cB_S2DiskButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -1641,7 +1641,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1676,7 +1676,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -1688,7 +1688,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -1707,7 +1707,7 @@
<property name="name">
<cstring>cB_acScheme</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>175</width>
<height>0</height>
@@ -1724,7 +1724,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -1741,7 +1741,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -1752,7 +1752,7 @@
<property name="name">
<cstring>cB_batteryScheme</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>175</width>
<height>0</height>
@@ -1780,7 +1780,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>75</height>
@@ -1829,7 +1829,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>163</width>
<height>20</height>
@@ -1865,7 +1865,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>110</height>
@@ -1925,7 +1925,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>
@@ -1942,7 +1942,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>
@@ -1988,7 +1988,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -2034,7 +2034,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>
@@ -2051,7 +2051,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>


+ 2
- 2
src/configuredialog.cpp View File

@@ -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
@@ -1074,7 +1074,7 @@ void ConfigureDialog::pB_deleteScheme_clicked(){

if (pB_deleteScheme->isEnabled()) {
int answer = KMessageBox::questionYesNo( this, i18n("Do you really want to delete the "
"%1 scheme?").tqarg(schemes[currentScheme]),
"%1 scheme?").arg(schemes[currentScheme]),
i18n("Confirm delete scheme"),
i18n("Delete"), i18n("Cancel"));
if (answer == KMessageBox::Yes) {


+ 9
- 9
src/countdown_Dialog.ui View File

@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>142</width>
<height>21</height>
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>144</width>
<height>21</height>
@@ -96,13 +96,13 @@
<property name="name">
<cstring>iconPixmap</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
@@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
@@ -142,7 +142,7 @@
<property name="textFormat">
<enum>AutoText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -156,7 +156,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -175,7 +175,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>200</width>
<height>20</height>


+ 2
- 2
src/countdowndialog.cpp View File

@@ -114,7 +114,7 @@ bool countDownDialog::showDialog() {

if (!textLabel->text().isEmpty() && timeOut > 0) {
// init the progressbar
progressBar->setFormat(i18n("%1 seconds").tqarg(remaining));
progressBar->setFormat(i18n("%1 seconds").arg(remaining));
progressBar->setPercentageVisible(true);
progressBar->setProgress(100);
progressBar->setEnabled(true);
@@ -160,7 +160,7 @@ void countDownDialog::updateProgress() {
int setTo = (int)((100.0/(float)timeOut)*(float)remaining);
// set the progressBar
progressBar->setFormat(i18n("%1 seconds").tqarg(remaining));
progressBar->setFormat(i18n("%1 seconds").arg(remaining));
progressBar->setPercentageVisible(true);
progressBar->setProgress(setTo);
progressBar->setEnabled(true);


+ 19
- 19
src/dbusHAL.cpp View File

@@ -43,7 +43,7 @@ dbusHAL::dbusHAL(){

dbus_is_connected = false;
hal_is_connected = false;
aquiredPolicyPower = false;
acquiredPolicyPower = false;
hal_ctx = NULL;

// add pointer to this for filter_function()
@@ -93,11 +93,11 @@ bool dbusHAL::isConnectedToHAL() {
* This function return information if the org.freedesktop.Policy.Power
* interface was claimed.
* \return boolean with the status of claim the interface
* \retval true if aquired
* \retval true if acquired
* \retval false if not
*/
bool dbusHAL::aquiredPolicyPowerInterface() {
return aquiredPolicyPower;
bool dbusHAL::acquiredPolicyPowerInterface() {
return acquiredPolicyPower;
}

/*!
@@ -161,7 +161,7 @@ bool dbusHAL::initDBUS(){
return false;
}

aquirePolicyPowerIface();
acquirePolicyPowerIface();

dbus_connection_set_exit_on_disconnect( dbus_connection, false );

@@ -205,12 +205,12 @@ bool dbusHAL::initDBUS(){
}

/*!
* This function aquire the org.freedesktop.Policy.Power interface
* This function acquire the org.freedesktop.Policy.Power interface
* \return boolean with the result of the operation
* \retval true if successful aquired the interface
* \retval true if successful acquired the interface
* \retval false if unsuccessful
*/
bool dbusHAL::aquirePolicyPowerIface(){
bool dbusHAL::acquirePolicyPowerIface(){
kdDebugFuncIn(trace);

if (dbus_connection == NULL) {
@@ -222,26 +222,26 @@ bool dbusHAL::aquirePolicyPowerIface(){
DBUS_NAME_FLAG_REPLACE_EXISTING, NULL)) {
case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
kdDebug() << "Acquired org.freedesktop.Policy.Power interface" << endl;
aquiredPolicyPower = true;
acquiredPolicyPower = true;
break;
case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
kdWarning() << "Queued to aquire org.freedesktop.Policy.Power interface" << endl;
aquiredPolicyPower = false;
kdWarning() << "Queued to acquire org.freedesktop.Policy.Power interface" << endl;
acquiredPolicyPower = false;
break;
default:
kdWarning() << "Unknown error while aquire org.freedesktop.Policy.Power interface" << endl;
aquiredPolicyPower = false;
kdWarning() << "Unknown error while acquire org.freedesktop.Policy.Power interface" << endl;
acquiredPolicyPower = false;
break;
}

kdDebugFuncOut(trace);
return aquiredPolicyPower;
return acquiredPolicyPower;
}

/*!
* This function release the org.freedesktop.Policy.Power interface
* \return boolean with the result of the operation
* \retval true if successful aquired the interface
* \retval true if successful acquired the interface
* \retval false if unsuccessful
*/
bool dbusHAL::releasePolicyPowerIface(){
@@ -268,7 +268,7 @@ bool dbusHAL::releasePolicyPowerIface(){
case DBUS_RELEASE_NAME_REPLY_RELEASED:
kdDebug() << "Released org.freedesktop.Policy.Power interface" << endl;
retval = true;
aquiredPolicyPower = false;
acquiredPolicyPower = false;
break;
case DBUS_RELEASE_NAME_REPLY_NOT_OWNER:
kdWarning() << "Couldn't release org.freedesktop.Policy.Power, not the owner" << endl;
@@ -1072,9 +1072,9 @@ void dbusHAL::emitMsgReceived( msg_type type, TQString message, TQString string

if (type == POLICY_POWER_OWNER_CHANGED) {
if (message.startsWith("NOW_OWNER"))
aquiredPolicyPower = true;
acquiredPolicyPower = true;
else
aquiredPolicyPower = false;
acquiredPolicyPower = false;
}

emit msgReceived_withStringString( type, message, string );
@@ -1288,7 +1288,7 @@ filterFunction (DBusConnection *connection, DBusMessage *message, void */*data*/

if (dbus_message_get_args( message, &error, DBUS_TYPE_BOOLEAN, &active, DBUS_TYPE_INVALID )) {
((dbusHAL*) myInstance)->emitMsgReceived( CONSOLEKIT_SESSION_ACTIVE,
session, TQString("%1").tqarg((int)active));
session, TQString("%1").arg((int)active));
} else {
if (dbus_error_is_set( &error )) dbus_error_free( &error );
}


+ 5
- 5
src/dbusHAL.h View File

@@ -106,10 +106,10 @@ private:
/*!
* This boolean represent information if KPowersave could claim the
* org.freedesktop.Policy.Power interface from the D-Bus
* \li true: if aquired
* \li true: if acquired
* \li false: if not
*/
bool aquiredPolicyPower;
bool acquiredPolicyPower;

/* D-Bus helper functions */
//! to initialise the connection to D-Bus
@@ -142,8 +142,8 @@ public:
//! to close the connection to D-Bus and HAL
bool close();

//! to aquire the org.freedesktop.Policy.Power interface
bool aquirePolicyPowerIface();
//! to acquire the org.freedesktop.Policy.Power interface
bool acquirePolicyPowerIface();
//! to release the org.freedesktop.Policy.Power interface
bool releasePolicyPowerIface();
//! to check if the org.freedesktop.Policy.Power interface has an owner
@@ -155,7 +155,7 @@ public:
//! to get information if KPowersave is connected to HAL
bool isConnectedToHAL();
//! to get info about claim org.freedesktop.Policy.Power interface
bool aquiredPolicyPowerInterface();
bool acquiredPolicyPowerInterface();

//! return the current HAL context
LibHalContext *get_HAL_context();


+ 31
- 31
src/detailed_Dialog.ui View File

@@ -66,7 +66,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout17</cstring>
<cstring>layout17</cstring>
</property>
<grid>
<property name="name">
@@ -92,7 +92,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop|AlignRight</set>
</property>
</widget>
@@ -111,7 +111,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>10</width>
<height>50</height>
@@ -137,7 +137,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout18</cstring>
<cstring>layout18</cstring>
</property>
<vbox>
<property name="name">
@@ -155,13 +155,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -205,7 +205,7 @@
</sizepolicy>
</property>
<property name="title">
<string>Battery tqStatus</string>
<string>Battery Status</string>
</property>
<grid>
<property name="name">
@@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>118</height>
@@ -230,7 +230,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@@ -238,7 +238,7 @@
</property>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>tqlayout14</cstring>
<cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -270,7 +270,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
@@ -300,7 +300,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
@@ -309,7 +309,7 @@
</spacer>
<widget class="TQLabel">
<property name="name">
<cstring>LabelACtqStatus</cstring>
<cstring>LabelACStatus</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -322,7 +322,7 @@
<property name="text">
<string>plugged in</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -351,7 +351,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -386,7 +386,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>5</height>
@@ -397,7 +397,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<grid>
<property name="name">
@@ -413,7 +413,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -432,13 +432,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -465,7 +465,7 @@
</sizepolicy>
</property>
<property name="title">
<string>Processor tqStatus</string>
<string>Processor Status</string>
</property>
<grid>
<property name="name">
@@ -473,7 +473,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout12_2</cstring>
<cstring>layout12_2</cstring>
</property>
<grid>
<property name="name">
@@ -489,7 +489,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -508,13 +508,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -543,7 +543,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<grid>
<property name="name">
@@ -580,7 +580,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>10</width>
<height>20</height>
@@ -592,7 +592,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>tqlayout19</cstring>
<cstring>layout19</cstring>
</property>
<grid>
<property name="name">
@@ -608,7 +608,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>230</width>
<height>20</height>


+ 9
- 9
src/detaileddialog.cpp View File

@@ -78,9 +78,9 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
if ((primaryBatteries->getNumBatteries() > 1) && (i == 0))
Label->setText( i18n( "Total:" ));
else if ((primaryBatteries->getNumBatteries() > 1) && (i > 0))
Label->setText( i18n( "Battery %1" ).tqarg(i));
Label->setText( i18n( "Battery %1" ).arg(i));
else
Label->setText( i18n( "Battery %1" ).tqarg(i + 1));
Label->setText( i18n( "Battery %1" ).arg(i + 1));
BatteryGridLayout->addWidget( Label, i , 0);
@@ -111,7 +111,7 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin

for (int i = 0; i < numOfCPUs; i++) {
TQLabel *Label = new TQLabel(ProcessorFrame, "ProcessorLabel");
Label->setText( i18n( "Processor %1" ).tqarg(i + 1));
Label->setText( i18n( "Processor %1" ).arg(i + 1));
ProcessorGridLayout->addWidget( Label, i , 0);

KProgress *CPUPBar = new KProgress(ProcessorFrame, "ProcessorPBar");
@@ -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()));
@@ -242,10 +242,10 @@ void detaileddialog::setBattery() {
// this should fix apm, where we have no time info if charging
BatteryPBar[i]->setFormat("%p% " + i18n("charged"));
} else if (_c_state == CHARGING) {
TQString temp = i18n("%1:%2 h until charged").tqarg(hours).tqarg(minutes);
TQString temp = i18n("%1:%2 h until charged").arg(hours).arg(minutes);
BatteryPBar[i]->setFormat(temp);
} else if (_c_state == DISCHARGING) {
TQString temp = i18n("%1:%2 h remaining").tqarg(hours).tqarg(minutes);
TQString temp = i18n("%1:%2 h remaining").arg(hours).arg(minutes);
BatteryPBar[i]->setFormat(temp);
} else {
@@ -355,7 +355,7 @@ void detaileddialog::setProcessorThrottling() {
if (throttling && cpuInfo->cpufreq_speed[i] > 0 && cpuInfo->cpu_throttling[i] >= 0) {
// get max cpu freq and set it to the max of the progressbar
ProcessorPBar[i]->setTotalSteps(100);
TQString ProgressString = TQString("%1% (%2 MHz)").tqarg(100 - cpuInfo->cpu_throttling[i]).tqarg(cpuInfo->cpufreq_speed[i]);
TQString ProgressString = TQString("%1% (%2 MHz)").arg(100 - cpuInfo->cpu_throttling[i]).arg(cpuInfo->cpufre