Remove obsolete setting of CMAKE_MODULE_PATH in cmake files.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

.gitmodules

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

CMakeL10n.txt

@@ -0,0 +1,22 @@
+#################################################
+#
+#  (C) 2018 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+cmake_minimum_required( VERSION 3.1 )
+
+
+##### include our cmake modules #################
+
+include( TDEL10n )
+
+
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )

CMakeLists.txt

@@ -9,7 +9,7 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 2.8 )
+cmake_minimum_required( VERSION 3.1 )
 
 
 ##### general package setup #####################
@@ -19,13 +19,13 @@ project( kpowersave )
 
 ##### include essential cmake modules ###########
 
-include( CheckCXXSourceCompiles )
 include( FindPkgConfig )
+include( CheckSymbolExists )
+include( CheckCXXSourceCompiles )
 
 
 ##### include our cmake modules #################
 
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEMacros )
 
 
@@ -35,6 +35,13 @@ include( TDESetupPaths )
 tde_setup_paths( )
 
 
+##### user requested modules ####################
+
+option( BUILD_ALL "Build all" OFF )
+option( BUILD_DOC "Build doc" ${BUILD_ALL} )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+
+
 ##### configure checks ##########################
 
 include( ConfigureChecks.cmake )
@@ -47,13 +54,15 @@ add_definitions(
 )
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
-set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
-set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
 
 
 ##### source directories ########################
 
 add_subdirectory( src )
+tde_conditional_add_subdirectory( BUILD_DOC doc         )
+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
 
 
 ##### write configure files #####################

ConfigureChecks.cmake

@@ -9,17 +9,23 @@
 #
 #################################################
 
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
 ##### check for gcc visibility support #########
-# FIXME
-# This should check for [T]Qt3 visibility support
 
 if( WITH_GCC_VISIBILITY )
-  if( NOT UNIX )
-    tde_message_fatal(FATAL_ERROR "\ngcc visibility support was requested, but your system is not *NIX" )
-  endif( NOT UNIX )
-  set( __KDE_HAVE_GCC_VISIBILITY 1 )
-  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+  tde_setup_gcc_visibility( )
 endif( )
 
 
@@ -69,8 +75,3 @@ pkg_search_module( DBUS_TQT dbus-tqt )
 if( NOT DBUS_TQT_FOUND )
   tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
 endif( )
-
-
-# required stuff
-find_package( TQt )
-find_package( TDE )

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

cmake

@@ -1 +0,0 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

doc/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_subdirectory( cs )
+add_subdirectory( de )
+add_subdirectory( en )
+add_subdirectory( fi )
+add_subdirectory( hu )
+add_subdirectory( nb )
+add_subdirectory( man )

doc/cs/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( LANG cs DESTINATION ${PROJECT_NAME} )

doc/cs/index.docbook

@@ -520,11 +520,3 @@ Entries which require special treatment are marked with comments starting with '
  </chapter>
 
 </book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-coding: utf-8
-sgml-indent-step: 1
-End:
--->

doc/de/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( LANG de DESTINATION ${PROJECT_NAME} )

doc/de/index.docbook

@@ -597,11 +597,3 @@ Entries which require special treatment are marked with comments starting with '
  </chapter>
  
 </book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-coding: utf-8
-sgml-indent-step: 1
-End:
--->

doc/en/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( LANG en DESTINATION ${PROJECT_NAME} )

doc/en/index.docbook

@@ -517,11 +517,3 @@ Entries which require special treatment are marked with comments starting with '
  </chapter>
  
 </book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-coding: utf-8
-sgml-indent-step: 1
-End:
--->

doc/fi/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( LANG fi DESTINATION ${PROJECT_NAME} )

doc/fi/index.docbook

@@ -511,11 +511,3 @@ Entries which require special treatment are marked with comments starting with '
  </chapter>
  
 </book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-coding: utf-8
-sgml-indent-step: 1
-End:
--->

doc/hu/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( LANG hu DESTINATION ${PROJECT_NAME} )

doc/hu/index.docbook

@@ -537,11 +537,3 @@ felülbírálják az általános feketelista beállításait.
  </chapter>
  
 </book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-coding: utf-8
-sgml-indent-step: 1
-End:
--->

doc/man/CMakeLists.txt

@@ -0,0 +1,5 @@
+INSTALL(
+    FILES ${PROJECT_NAME}.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)

doc/man/kpowersave.1

@@ -0,0 +1,148 @@
+.\" This file was generated by kdemangen.pl
+.TH KPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
+.SH NAME
+kpowersave
+\- A TDE KPart Application
+.SH SYNOPSIS
+kpowersave [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+A TDE KPart Application
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kpowersave/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kpowersave/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Danny Kukawka <dkukawka@suse.de>
+.br
+Thomas Renninger <trenn@suse.de>
+.br
+

doc/nb/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( LANG nb DESTINATION ${PROJECT_NAME} )

packaging/FC4.kpowersave.spec

@@ -1,72 +0,0 @@
-#
-# spec file for package kpowersave (Version 0.6.2)
-#
-# Copyright (c) hmacht@suse,de, danny.kukawka@web.de 
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-
-# norootforbuild
-
-
-Name:         kpowersave
-License:      GPL
-Group:        System/GUI/KDE
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Summary:      KDE Frontend to powersave Package, Battery Monitor and General Power Management Support
-Version:      0.6.2
-Release:      1
-ExclusiveArch: %ix86 x86_64 ia64 ppc
-Requires:     powersave >= 0.12.18 powersave-libs >= 0.12.18 /sbin/pidof /usr/X11R6/bin/xset
-Source:       %{name}-%{version}.tar.bz2
-
-%description
-The package provides battery monitoring and suspend/standby triggers.
-It is based on the powersave package and therefore supports APM and
-ACPI. Together with the powersave package and the YaST Powermanagement
-module it is the preferred package that should be used for battery
-monitoring and control of power management related tasks. See powersave
-package for additional features such as CPU frequency scaling(SpeedStep
-and PowerNow) and more.
-
-
-
-Authors:
---------
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-
-%prep
-%setup -n %{name}-%{version} -q
-
-%build
-make -f admin/Makefile.common cvs
-./configure --prefix=/usr
-  
-make
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install 
-
-%post
-
-%postun
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING INSTALL
-/usr/bin/kpowersave
-/usr/share/config/kpowersaverc
-/usr/share/autostart/kpowersave-autostart.desktop
-/usr/share/apps/kpowersave
-/usr/share/icons/??color
-/usr/share/applications/tde/kpowersave.desktop
-/usr/share/doc/tde/HTML/*/kpowersave
-/usr/lib*/trinity/kpowersave.*
-/usr/lib*/libtdeinit_kpowersave.*
-/usr/share/locale/*
-
-%changelog -n kpowersave

packaging/FC5.kpowersave.spec

@@ -1,74 +0,0 @@
-#
-# spec file for package kpowersave (Version 0.6.2)
-#
-# Copyright (c) hmacht@suse.de, danny.kukawka@web.de
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
-#
-
-# norootforbuild
-
-
-Name:         kpowersave
-License:      GPL
-Group:        System/GUI/KDE
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Summary:      KDE Frontend to powersave Package, Battery Monitor and General Power Management Support
-Version:      0.6.2
-Release:      1
-ExclusiveArch: %ix86 x86_64 ia64 ppc
-Requires:     powersave >= 0.12.18 powersave-libs >= 0.12.18 /sbin/pidof /usr/bin/xset
-Source:       %{name}-%{version}.tar.bz2
-
-%description
-The package provides battery monitoring and suspend/standby triggers.
-It is based on the powersave package and therefore supports APM and
-ACPI. Together with the powersave package and the YaST Powermanagement
-module it is the preferred package that should be used for battery
-monitoring and control of power management related tasks. See powersave
-package for additional features such as CPU frequency scaling(SpeedStep
-and PowerNow) and more.
-
-
-
-Authors:
---------
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-
-%prep
-%setup -n %{name}-%{version} -q
-
-%build
-make -f admin/Makefile.common cvs
-./configure --prefix=/usr
-  
-make
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install 
-
-%post
-
-%postun
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING INSTALL
-/usr/bin/kpowersave
-/usr/share/config/kpowersaverc
-/usr/share/autostart/kpowersave-autostart.desktop
-/usr/share/apps/kpowersave
-/usr/share/icons/??color
-/usr/share/applications/tde/kpowersave.desktop
-/usr/share/doc/tde/HTML/*/kpowersave
-/usr/lib*/trinity/kpowersave.*
-/usr/lib*/libtdeinit_kpowersave.*
-/usr/share/locale/*
-
-%changelog -n kpowersave

packaging/FC6.kpowersave.spec

@@ -1,100 +0,0 @@
-#
-# spec file for package kpowersave (Version 0.7.2)
-#
-# Copyright (c) hmacht@suse.de, danny.kukawka@web.de
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
-#
-
-# norootforbuild
-
-
-Name:         kpowersave
-License:      GPL
-Group:        System/GUI/KDE
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Summary:      KDE Frontend for Power Management, Battery Monitoring and Suspend
-Version:      0.7.2
-Release:      2.FC6%{?dist}
-ExclusiveArch: %ix86 x86_64 ia64 ppc
-Requires:     hal >= 0.5.8.1 dbus-qt /sbin/pidof /usr/bin/xset
-Source:       %{name}-%{version}.tar.bz2
-
-BuildRequires:  tdelibs-devel
-BuildRequires:  gettext
-BuildRequires:  dbus-qt-devel
-BuildRequires:  automake
-BuildRequires:  libXext-devel libXScrnSaver-devel libXtst-devel
-BuildRequires:  hal-devel desktop-file-utils
-
-%description
-KPowersave provides battery monitoring, CPU frequency control and suspend/standby 
-triggers and more power management features for KDE. It uses HAL (formerly the 
-powersave daemon) and supports APM and ACPI for several architectures.
-
-
-Authors:
---------
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-
-%prep
-%setup -n %{name}-%{version} -q
-make -f admin/Makefile.common cvs
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking
-
-make %{?_smp_mflags}
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install 
-
-desktop-file-install \
---dir $RPM_BUILD_ROOT%{_datadir}/applications/tde \
---vendor="" \
-$RPM_BUILD_ROOT%{_datadir}/applications/tde/kpowersave.desktop
-
-## File lists
-# locale's
-%find_lang %{name} || touch %{name}.lang
-# HTML
-HTML_DIR=$(tde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-   lang=$(basename $lang_dir)
-   echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang
-done
-fi
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc README AUTHORS ChangeLog COPYING INSTALL
-%{_bindir}/kpowersave
-%{_libdir}/trinity/kpowersave.*
-%{_libdir}/libtdeinit_kpowersave.*
-%{_datadir}/applications/tde/*kpowersave.desktop
-%{_datadir}/apps/kpowersave/
-%{_datadir}/autostart/kpowersave-autostart.desktop
-%{_datadir}/config/kpowersaverc
-%{_datadir}/icons/hicolor/*/*/*
-
-%changelog -n kpowersave

packaging/SUSE10.0.kpowersave.spec

@@ -1,82 +0,0 @@
-#
-# spec file for package kpowersave (Version 0.6.2)
-#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
-#
-
-# norootforbuild
-# neededforbuild  dbus-1 dbus-1-devel dbus-1-qt3 hal hal-devel trinity-devel-packages tdelibs3 lsb pkgconfig powersave powersave-devel powersave-libs suse-release
-
-Name:           kpowersave
-BuildRequires:  dbus-1-qt3-devel hal-devel tdelibs3-devel powersave-devel lsb suse-release
-License:        GPL
-Group:          System/GUI/KDE
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        KDE Front-End to powersave Package, Battery Monitor, and General Power Management Support
-Version:        0.6.2
-Release:        1
-ExclusiveArch:  %ix86 x86_64 ia64 ppc
-Requires:       powersave >= 0.12.18 powersave-libs >= 0.12.18 yast2-power-management /sbin/pidof /usr/X11R6/bin/xset
-Source:         %{name}-%{version}.tar.bz2
-
-%description
-The package provides battery monitoring and suspend and standby
-triggers. It is based on the powersave package and therefore supports
-APM and ACPI. Together with the powersave package and the YaST power
-management module, it is the preferred package that should be used for
-battery monitoring and control of power management related tasks. See
-the powersave package for additional features, such as CPU frequency
-scaling (SpeedStep and PowerNow).
-
-
-
-Authors:
---------
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-
-%prep
-%setup -n %{name}-%{version} -q
-. /etc/opt/trinity/common_options
-update_admin
-
-%build
-. /etc/opt/trinity/common_options
-./configure --enable-yast-entry
-  
-make
-
-%install
-. /etc/opt/trinity/common_options
-make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
-%suse_update_desktop_file %name Utility TrayIcon
-%find_lang %name
-
-%post
-%{run_ldconfig} 
-
-%postun
-%{run_ldconfig} 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %name.lang
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING INSTALL NEWS
-/opt/trinity/share/doc/*
-/opt/trinity/bin/*
-/opt/trinity/share/config/kpowersaverc
-/opt/trinity/share/autostart/kpowersave-autostart.desktop
-/opt/trinity/share/apps/kpowersave
-/opt/trinity/share/icons/??color
-/opt/trinity/share/applications/tde/kpowersave.desktop
-/opt/trinity/lib*/trinity/kpowersave.*
-/opt/trinity/lib*/libtdeinit_kpowersave.*
-
-%changelog -n kpowersave
-

packaging/SUSE10.1.kpowersave.spec

@@ -1,81 +0,0 @@
-#
-# spec file for package kpowersave (Version 0.6.2)
-#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-Name:           kpowersave
-BuildRequires:  dbus-1-qt3-devel hal-devel tdelibs3-devel powersave-devel lsb suse-release
-License:        GPL
-Group:          System/GUI/KDE
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        KDE Front-End to powersave Package, Battery Monitor, and General Power Management Support
-Version:        0.6.2
-Release:        1
-ExclusiveArch:  %ix86 x86_64 ia64 ppc
-Requires:       powersave >= 0.12.18 powersave-libs >= 0.12.18 yast2-power-management /sbin/pidof /usr/X11R6/bin/xset
-Source:         %{name}-%{version}.tar.bz2
-
-%description
-The package provides battery monitoring and suspend and standby
-triggers. It is based on the powersave package and therefore supports
-APM and ACPI. Together with the powersave package and the YaST power
-management module, it is the preferred package that should be used for
-battery monitoring and control of power management related tasks. See
-the powersave package for additional features, such as CPU frequency
-scaling (SpeedStep and PowerNow).
-
-
-
-Authors:
---------
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-
-%prep
-%setup -n %{name}-%{version} -q
-. /etc/opt/trinity/common_options
-update_admin
-
-%build
-. /etc/opt/trinity/common_options
-./configure --enable-yast-entry
-  
-make
-
-%install
-. /etc/opt/trinity/common_options
-make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
-%suse_update_desktop_file %name Utility TrayIcon
-%find_lang %name
-
-%post
-%{run_ldconfig} 
-
-%postun
-%{run_ldconfig} 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %name.lang
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING INSTALL NEWS
-/opt/trinity/share/doc/*
-/opt/trinity/bin/*
-/opt/trinity/share/config/kpowersaverc
-/opt/trinity/share/autostart/kpowersave-autostart.desktop
-/opt/trinity/share/apps/kpowersave
-/opt/trinity/share/icons/??color
-/opt/trinity/share/applications/tde/kpowersave.desktop
-/opt/trinity/lib*/trinity/kpowersave.*
-/opt/trinity/lib*/libtdeinit_kpowersave.*
-
-%changelog -n kpowersave
-

packaging/SUSE9.2.kpowersave.spec

@@ -1,78 +0,0 @@
-#
-# spec file for package kpowersave (Version 0.3.9)
-#
-# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
-#
-
-# norootforbuild
-# neededforbuild  trinity-devel-packages tdelibs3 powersave
-
-BuildRequires: aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv less libacl libattr libgcc libnscd libselinux libstdc++ libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed strace syslogd sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel arts arts-devel autoconf automake binutils expat fam fam-devel fontconfig fontconfig-devel freeglut freeglut-devel freetype2 freetype2-devel gcc gcc-c++ gdbm gettext glib2 glib2-devel gnome-filesystem jack jack-devel tdelibs3 tdelibs3-devel tdelibs3-doc libart_lgpl libart_lgpl-devel libidn libidn-devel libjpeg libjpeg-devel liblcms liblcms-devel libmng libmng-devel libpng libpng-devel libstdc++-devel libtiff libtiff-devel libtool libxml2 libxml2-devel libxslt libxslt-devel openssl-devel pcre pcre-devel perl powersave qt3 qt3-devel rpm update-desktop-files xorg-x11-Mesa xorg-x11-Mesa-devel xorg-x11-devel xorg-x11-libs
-
-Name:         kpowersave
-License:      LGPL
-Group:        System/GUI/KDE
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Summary:      KDE Frontend to powersave Package, Battery Monitor and General Power Management Support
-Version:      0.3.8
-Release:      2
-Requires:     powersave >= 0.8.14 yast2-power-management
-Source:       %{name}-%{version}.tar.bz2
-
-%description
-The package provides battery monitoring and suspend/standby triggers.
-It is based on the powersave package and therefore supports APM and
-ACPI. Together with the powersave package and the YaST Powermanagement
-module it is the preferred package that should be used for battery
-monitoring and control of power management related tasks. See powersave
-package for additional features such as CPU frequency scaling(SpeedStep
-and PowerNow) and more.
-
-
-
-Authors:
---------
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-
-%prep
-%setup -n %{name}-%{version} -q
-. /etc/opt/trinity/common_options
-update_admin
-
-%build
-. /etc/opt/trinity/common_options
-./configure $configkde
-  
-make
-
-%install
-. /etc/opt/trinity/common_options
-make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
-%suse_update_desktop_file %name Utility TrayIcon
-%find_lang %name
-
-%post
-%{run_ldconfig} 
-
-%postun
-%{run_ldconfig} 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %name.lang
-%defattr(-,root,root)
-/opt/trinity/bin/*
-/opt/trinity/share/autostart/kpowersave.desktop
-/opt/trinity/share/apps/kpowersave
-/opt/trinity/share/icons/??color
-/opt/trinity/share/applications/tde/kpowersave.desktop
-/opt/trinity/lib*/trinity/kpowersave.*
-/opt/trinity/lib*/libtdeinit_kpowersave.*
-
-%changelog -n kpowersave

packaging/SUSE9.3.kpowersave.spec

@@ -1,82 +0,0 @@
-#
-# spec file for package kpowersave (Version 0.4.6)
-#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
-#
-
-# norootforbuild
-# neededforbuild  trinity-devel-packages tdelibs3 powersave resmgr suse-release
-
-BuildRequires: aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libcom_err libgcc libnscd libselinux libstdc++ libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed strace sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel arts arts-devel autoconf automake binutils expat fam fam-devel fontconfig fontconfig-devel freeglut freeglut-devel freetype2 freetype2-devel gcc gcc-c++ gdbm gettext glib2 glib2-devel gnome-filesystem jack jack-devel tdelibs3 tdelibs3-devel tdelibs3-doc libart_lgpl libart_lgpl-devel libgcrypt libgcrypt-devel libgpg-error libgpg-error-devel libidn libidn-devel libjpeg libjpeg-devel liblcms liblcms-devel libmng libmng-devel libpng libpng-devel libstdc++-devel libtiff libtiff-devel libtool libxml2 libxml2-devel libxslt libxslt-devel openssl-devel pcre pcre-devel perl powersave python qt3 qt3-devel resmgr rpm suse-release unsermake update-desktop-files xorg-x11-Mesa xorg-x11-Mesa-devel xorg-x11-devel xorg-x11-libs
-
-Name:         kpowersave
-License:      LGPL
-Group:        System/GUI/KDE
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Summary:      KDE Frontend to powersave Package, Battery Monitor and General Power Management Support
-Version:      0.4.6
-Release:      1
-ExclusiveArch: %ix86 x86_64 ia64 ppc
-Requires:     powersave >= 0.9.25 yast2-power-management /sbin/pidof
-Source:       %{name}-%{version}.tar.bz2
-
-%description
-The package provides battery monitoring and suspend/standby triggers.
-It is based on the powersave package and therefore supports APM and
-ACPI. Together with the powersave package and the YaST Powermanagement
-module it is the preferred package that should be used for battery
-monitoring and control of power management related tasks. See powersave
-package for additional features such as CPU frequency scaling(SpeedStep
-and PowerNow) and more.
-
-
-
-Authors:
---------
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-
-%prep
-%setup -n %{name}-%{version} -q
-. /etc/opt/trinity/common_options
-update_admin
-
-%build
-. /etc/opt/trinity/common_options
-./configure 
-  
-make
-
-%install
-. /etc/opt/trinity/common_options
-make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
-rm $RPM_BUILD_ROOT/opt/trinity/share/doc/ -r
-%suse_update_desktop_file %name Utility TrayIcon
-%find_lang %name
-
-%post
-%{run_ldconfig} 
-
-%postun
-%{run_ldconfig} 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %name.lang
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING INSTALL
-/opt/trinity/bin/*
-/opt/trinity/share/config/kpowersaverc
-/opt/trinity/share/autostart/kpowersave.desktop
-/opt/trinity/share/apps/kpowersave
-/opt/trinity/share/icons/??color
-/opt/trinity/share/applications/tde/kpowersave.desktop
-/opt/trinity/lib*/trinity/kpowersave.*
-/opt/trinity/lib*/libtdeinit_kpowersave.*
-
-%changelog -n kpowersave

packaging/mandriva.2006.1.kpowersave.spec

@@ -1,74 +0,0 @@
-#
-# spec file for package kpowersave (Version 0.6.2)
-#
-# Copyright (c) hmacht@suse.de, danny.kukawka@web.de
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
-#
-
-# norootforbuild
-
-Name:           kpowersave
-License:        GPL
-Group:          System/GUI/KDE
-BuildRequires:  powersave-libs powersave-devel libhal1 libhal1-devel libdbus-qt-1_0-devel libdbus-qt-1_0 libtdecore4-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        KDE Frontend to powersave Package, Battery Monitor and General Power Management Support
-Version:        0.6.2
-Release:        %mkrel 1
-ExclusiveArch:  %ix86 x86_64 ia64 ppc
-Requires:       powersave >= 0.12.18 powersave-libs >= 0.12.18 /sbin/pidof /usr/X11R6/bin/xset
-Source:         %{name}-%{version}.tar.bz2
-
-%description
-The package provides battery monitoring and suspend/standby triggers.
-It is based on the powersave package and therefore supports APM and
-ACPI. Together with the powersave package and the YaST Powermanagement
-module it is the preferred package that should be used for battery
-monitoring and control of power management related tasks. See powersave
-package for additional features such as CPU frequency scaling(SpeedStep
-and PowerNow) and more.
-
-
-
-Authors:
---------
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-
-%prep
-%setup -n %{name}-%{version} -q
-
-%build
-make -f admin/Makefile.common cvs
-./configure --prefix=/usr 
-  
-make
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install 
-
-%post
-
-%postun
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING INSTALL
-/usr/bin/kpowersave
-/usr/share/config/kpowersaverc
-/usr/share/autostart/kpowersave-autostart.desktop
-/usr/share/apps/kpowersave
-/usr/share/icons/??color
-/usr/share/applications/tde/kpowersave.desktop
-/usr/share/doc/tde/HTML/*/kpowersave
-/usr/lib*/trinity/kpowersave.*
-/usr/lib*/libtdeinit_kpowersave.*
-/usr/share/locale/*
-
-%changelog -n kpowersave

packaging/mandriva.2007.1.kpowersave.spec

@@ -1,98 +0,0 @@
-%define name kpowersave
-%define version 0.7.2
-%define release %mkrel 1
-
-Summary: 	KDE power management applet
-Name: 		%{name}
-Version:	%{version}
-Release: 	%{release}
-Source0: 	http://prdownloads.sourceforge.net/powersave/%{name}-%{version}.tar.bz2
-
-License: 	GPL
-Group: 		Graphical desktop/KDE
-Url: 		http://powersave.sourceforge.net/
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: 	hal-devel, libdbus-qt-1-devel, tdelibs-devel
-%ifarch x86_64
-BuildRequires:  lib64qt3-devel, lib64qt3-static-devel lib64gamin-1_0-devel lib64art_lgpl2-devel lib64tdecore4-devel
-%else
-BuildRequires:  libqt3-devel libqt3-static-devel libgamin-1_0-devel libart_lgpl2-devel libtdecore4-devel
-%endif
-BuildRequires: 	autoconf2.5 automake1.8
-%if %mdkversion > 200600
-BuildRequires:	libxscrnsaver-devel libxtst-devel
-%endif
-Requires:     	hal >= 0.5.8.1 /sbin/pidof /usr/bin/xset
-%ifarch x86_64  
-Requires:     	lib64dbus-qt-1_1 
-%else
-Requires:     	libdbus-qt-1_1 
-%endif
-%description
-KPowersave provides battery monitoring, CPU frequency control and suspend/standby
-triggers and more power management features for KDE. It uses HAL (formerly the
-powersave daemon) and supports APM and ACPI for several architectures.
-
-Authors:
---------
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-
-
-#--------------------------------------------------------------------
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-%make -f admin/Makefile.common cvs
-%configure --disable-rpath
-%make
-
-%install
-rm -rf %{buildroot}
-%makeinstall_std
-
-%find_lang %{name}
-
-mkdir -p $RPM_BUILD_ROOT%{_menudir}
-kdedesktop2mdkmenu.pl %{name} "System/Monitoring" $RPM_BUILD_ROOT%{_datadir}/applications/tde/kpowersave.desktop $RPM_BUILD_ROOT%{_menudir}/%{name}
-install -D -m 644 %{buildroot}%{_iconsdir}/hicolor/32x32/apps/%{name}.png %{buildroot}%{_iconsdir}/%{name}.png
-install -D -m 644 %{buildroot}%{_iconsdir}/hicolor/48x48/apps/%{name}.png %{buildroot}%{_liconsdir}/%{name}.png
-install -D -m 644 %{buildroot}%{_iconsdir}/hicolor/16x16/apps/%{name}.png %{buildroot}%{_miconsdir}/%{name}.png
-
-%post
-%{update_menus}
-%if %mdkversion > 200600
-%update_icon_cache hicolor
-%endif
-
-%postun
-%{clean_menus}
-%if %mdkversion > 200600
-%clean_icon_cache hicolor
-%endif
-
-%clean
-rm -rf %{buildroot}
-
-%files -f %{name}.lang
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING INSTALL
-%{_bindir}/%{name}
-%{_datadir}/config/kpowersaverc
-%{_datadir}/autostart/kpowersave-autostart.desktop
-%{_datadir}/apps/%{name}
-%{_iconsdir}/hicolor/*/apps/*.png
-%{_datadir}/icons/*.png
-%{_datadir}/applications/tde/kpowersave.desktop
-%doc %{_docdir}/HTML/*/kpowersave
-%{_libdir}/trinity/*
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_miconsdir}/%{name}.png
-%{_iconsdir}/%{name}.png
-%{_liconsdir}/%{name}.png
-%{_menudir}/%{name}
-
-%changelog

packaging/openSUSE10.2.kpowersave.spec

@@ -1,88 +0,0 @@
-#
-# spec file for package kpowersave (Version 0.7.1)
-#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-Name:           kpowersave
-%if 0%{?sles_version} > 0
-# needed to detect in configure if this is a Enterprise product and set the correct bugzilla website
-BuildRequires:  dbus-1-qt3-devel hal-devel tdelibs3-devel lsb sles-release
-%else
-BuildRequires:  dbus-1-qt3-devel hal-devel tdelibs3-devel lsb openSUSE-release
-%endif
-License:        GNU General Public License (GPL)
-Group:          System/GUI/KDE
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        KDE Front-End to powersave Package, Battery Monitor, and General Power Management Support
-Version:        0.7.1
-Release:        5
-ExclusiveArch:  %ix86 x86_64 ia64 ppc
-Requires:       yast2-power-management /sbin/pidof xorg-x11
-Source:         %{name}-%{version}.tar.bz2
-
-%description
-The package provides battery monitoring and suspend and standby
-triggers. It is based on the powersave package and therefore supports
-APM and ACPI. Together with the powersave package and the YaST power
-management module, it is the preferred package that should be used for
-battery monitoring and control of power management related tasks. See
-the powersave package for additional features, such as CPU frequency
-scaling (SpeedStep and PowerNow).
-
-
-
-Authors:
---------
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-
-%prep
-%setup -n %{name}-%{version} -q
-. /etc/opt/trinity/common_options
-update_admin
-
-%build
-. /etc/opt/trinity/common_options
-%if 0%{?sles_version} > 0
-./configure --enable-yast-entry --enable-suse-sles
-%else
-./configure --enable-yast-entry
-%endif
-make %{?jobs:-j %jobs}
-
-%install
-. /etc/opt/trinity/common_options
-make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
-%suse_update_desktop_file %name Utility TrayIcon
-%find_lang %name
-
-%post
-%{run_ldconfig} 
-
-%postun
-%{run_ldconfig} 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %name.lang
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING INSTALL NEWS
-/opt/trinity/share/doc/*
-/opt/trinity/bin/*
-/opt/trinity/share/config/kpowersaverc
-/opt/trinity/share/autostart/kpowersave-autostart.desktop
-/opt/trinity/share/apps/kpowersave
-/opt/trinity/share/icons/??color
-/opt/trinity/share/applications/tde/kpowersave.desktop
-/opt/trinity/lib*/trinity/kpowersave.*
-/opt/trinity/lib*/libtdeinit_kpowersave.*
-
-%changelog -n kpowersave

packaging/openSUSE10.3.kpowersave.spec

@@ -1,101 +0,0 @@
-#
-# spec file for package kpowersave (Version 0.7.2_SVN20070830)
-#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-Name:           kpowersave
-URL:            http://sourceforge.net/projects/powersave/
-%if 0%{?sles_version} > 0
-# needed to detect in configure if this is a Enterprise product and set the correct bugzilla website
-BuildRequires:  dbus-1-qt3-devel hal-devel tdelibs3-devel lsb sles-release
-%else
-BuildRequires:  dbus-1-qt3-devel hal-devel tdelibs3-devel lsb openSUSE-release
-%endif
-License:        GPL v2 only
-Group:          System/GUI/KDE
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        KDE Frontend for Battery Monitoring, Suspend, CPU Freq and General Power Management Support
-Version:        0.7.3
-Release:        1
-ExclusiveArch:  %ix86 x86_64 ia64 ppc ppc64
-Requires:       /sbin/pidof xorg-x11
-Source:         %{name}-%{version}.tar.bz2
-%if %suse_version > 1020
-Requires:       %{name}-lang = %{version}
-%endif
-
-%description
-KPowersave provides battery monitoring, CPU frequency control and
-suspend/standby triggers, and more power management features for KDE.
-It uses HAL (formerly the powersave daemon) and supports APM and ACPI
-for several architectures. Together with the powersave package and the
-YaST power management module, it is the preferred package that should
-be used for battery monitoring and control of power management related
-tasks.
-
-
-
-Authors:
---------
-    Thomas Renninger (trenn@suse.de, mail@renninger.de)
-    Danny Kukawka (dkukawka@suse.de, danny.kukawka@web.de)
-
-%if %suse_version > 1020
-%lang_package
-%endif
-%prep
-%setup -n %{name}-%{version} -q
-. /etc/opt/trinity/common_options
-update_admin
-
-%build
-. /etc/opt/trinity/common_options
-%if 0%{?sles_version} > 0
-./configure --enable-yast-entry --enable-suse-sles
-%else
-./configure 
-%endif
-make %{?jobs:-j %jobs}
-
-%install
-. /etc/opt/trinity/common_options
-make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
-%suse_update_desktop_file %name Utility TrayIcon
-%find_lang %name
-
-%post
-%{run_ldconfig} 
-
-%postun
-%{run_ldconfig} 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-%if %suse_version > 1020
-
-%files lang -f %name.lang
-
-%files
-%else
-
-%files -f %name.lang
-%endif
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING INSTALL NEWS
-/opt/trinity/bin/*
-/opt/trinity/share/config/kpowersaverc
-/opt/trinity/share/autostart/kpowersave-autostart.desktop
-/opt/trinity/share/apps/kpowersave
-/opt/trinity/share/icons/??color
-/opt/trinity/share/applications/tde/kpowersave.desktop
-/opt/trinity/lib*/trinity/kpowersave.*
-/opt/trinity/lib*/libtdeinit_kpowersave.*
-
-%changelog

po/CMakeLists.txt

@@ -0,0 +1,5 @@
+file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
+
+if( _srcs )
+    tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} )
+endif( )

src/CMakeL10n.txt

@@ -0,0 +1,3 @@
+##### create translation templates ##############
+
+tde_l10n_create_template( "kpowersave" )

src/CMakeLists.txt

@@ -22,6 +22,8 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${DBUS_LIBRARY_DIRS}
+  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 

src/configuredialog.cpp

@@ -146,7 +146,7 @@ void ConfigureDialog::setSchemeList(){
 	cB_batteryScheme->clear();
 
 	for ( TQStringList::Iterator it = schemes.begin(); it != schemes.end(); ++it ) {
-		const char *_tmp = (*it).ascii();
+		const char *_tmp = (*it).utf8();
 		if(_tmp == "Performance" || _tmp == i18n("Performance")) {
 			listBox_schemes->insertItem(SmallIcon("scheme_power", TQIconSet::Automatic), i18n(_tmp));
 			cB_acScheme->insertItem(i18n(_tmp));
@@ -1271,7 +1271,7 @@ void ConfigureDialog::setInactivityBox(){
 	// actions.append("Turn Off Computer");
 	
 	for ( TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it ) {
-		cB_autoInactivity->insertItem( i18n( (*it).ascii() ) );
+		cB_autoInactivity->insertItem( i18n( (*it).utf8() ) );
 	}
 
 	kdDebugFuncOut(trace);

src/countdown_Dialog.ui

@@ -201,4 +201,7 @@
     <slot>pB_cancel_pressed()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
 </UI>

src/detailed_Dialog.ui

@@ -639,4 +639,7 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kled.h</include>
+</includes>
 </UI>

src/detaileddialog.cpp

@@ -356,7 +356,7 @@ void detaileddialog::setProcessorThrottling() {
 			// get max cpu freq and set it to the max of the progressbar
 			ProcessorPBar[i]->setTotalSteps(100);
 			TQString ProgressString = TQString("%1% (%2 MHz)").arg(100 - cpuInfo->cpu_throttling[i]).arg(cpuInfo->cpufreq_speed[i]);
-			ProcessorPBar[i]->setFormat(i18n(ProgressString.ascii()));
+			ProcessorPBar[i]->setFormat(i18n(ProgressString.utf8()));
 			ProcessorPBar[i]->setProgress(100 - cpuInfo->cpu_throttling[i]);
 			ProcessorPBar[i]->setEnabled(true);
 		} else if (cpuInfo->cpufreq_speed[i] < 0) {
@@ -411,7 +411,7 @@ void detaileddialog::setInfos() {
 
 	if(!config->currentScheme.isEmpty())
 		display += i18n("Current Scheme: ") + "\n";
-		displayValue += i18n(config->currentScheme.ascii()) + "\n";
+		displayValue += i18n(config->currentScheme.utf8()) + "\n";
 		if(config->currentScheme == config->ac_scheme)
 			InfoPictogram->setPixmap(SmallIcon("scheme_power", 22));
 		else if(config->currentScheme == config->battery_scheme)

src/kpowersave.cpp

@@ -30,6 +30,7 @@
 #include <knotifydialog.h>
 #include <kpassivepopup.h>
 #include <tdepopupmenu.h>
+#include <khelpmenu.h>
 
 // other TQt headers:
 #include <tqcursor.h>
@@ -191,7 +192,7 @@ void kpowersave::initMenu() {
 	STANDBY_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("stand_by", TQIconSet::Automatic),
 							   i18n("Standby"), this, TQT_SLOT(do_standby()));
 
-	speed_menu = new TQPopupMenu(this, i18n("Set CPU Frequency Policy").ascii());
+	speed_menu = new TQPopupMenu(this, i18n("Set CPU Frequency Policy").utf8());
 	speed_menu->insertItem(i18n("Performance"), PERFORMANCE);
 	speed_menu->insertItem(i18n("Dynamic"), DYNAMIC);
 	speed_menu->insertItem(i18n("Powersave"), POWERSAVE);
@@ -205,7 +206,7 @@ void kpowersave::initMenu() {
 
 	SCHEME_SEPARATOR_MENU_ID = contextMenu()->insertSeparator();
 
-	scheme_menu = new TQPopupMenu(this, i18n("Set Active Scheme").ascii());
+	scheme_menu = new TQPopupMenu(this, i18n("Set Active Scheme").utf8());
 	SCHEME_MENU_ID = contextMenu()->insertItem(i18n("Set Active Scheme"), scheme_menu);
 	connect(scheme_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(do_setActiveScheme(int)));
 
@@ -219,17 +220,11 @@ void kpowersave::initMenu() {
 
 	HELP_SEPARATOR_MENU_ID = contextMenu()->insertSeparator();
 
-	help_menu = new TQPopupMenu(this, i18n("&Help").ascii());
-
-	help_menu->insertItem( SmallIcon("help", TQIconSet::Automatic), i18n("&KPowersave Handbook"),
-			       this, TQT_SLOT(slotHelp()));
-	help_menu->insertSeparator();
-	help_menu->insertItem( i18n("&Report a bug ..."), this, TQT_SLOT(slotReportBug()));
-	help_menu->insertItem( SmallIcon("kpowersave", TQIconSet::Automatic),
-			       i18n("&About KPowersave"), this, TQT_SLOT(slotAbout()));
-
-	HELP_MENU = contextMenu()->insertItem(SmallIcon("help", TQIconSet::Automatic),
-							i18n("&Help"), help_menu);
+	// Create help submenu
+	KHelpMenu *m_help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection());
+	TDEPopupMenu *help = m_help->menu();
+	help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
+	this->contextMenu()->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), help);
 
 	connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
 
@@ -284,7 +279,7 @@ void kpowersave::showConfigureDialog() {
 		else {
 			KPassivePopup::message(i18n("WARNING"), i18n("Cannot find any schemes."),
 					       SmallIcon("messagebox_warning", 20), this,
-					       i18n("Warning").ascii(), 15000);
+					       i18n("Warning").utf8(), 15000);
 		}
 	} else {
 		configDlg->setWindowState(configDlg->windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
@@ -556,34 +551,6 @@ void kpowersave::slotAbout()
         a.exec();
 }
 
-/*!
- * \b TQT_SLOT to open the website to report bugs
- */
-void kpowersave::slotReportBug()
-{
-#ifdef DISTRO_IS_SUSE
- #ifdef DISTRO_IS_SLES_SLED
-	kapp->invokeBrowser("https://bugzilla.novell.com/");
- #else
-	kapp->invokeBrowser("http://en.opensuse.org/Submitting_Bug_Reports");
- #endif
-#else
- #ifdef DISTRO_IS_ALTLINUX
-	kapp->invokeBrowser("http://bugzilla.altlinux.org/");
- #else
-  #ifdef DISTRO_IS_UBUNTU
-	kapp->invokeBrowser("https://launchpad.net/distros/ubuntu/+bugs");
-  #else
-   #ifdef DISTRO_IS_PARDUS
-	kapp->invokeBrowser("http://bugs.pardus.org.tr/");
-   #else
-	kapp->invokeBrowser("http://sourceforge.net/tracker/?group_id=124576&atid=700009");
-   #endif
-  #endif
- #endif
-#endif
-}
-
 /*!
  * \b TQT_SLOT to set the icon background on/off if battery is in critical, low or warning-state. Within
  * this function we set \ref icon_state_changed to true and call \ref redrawPixmap() to redraw the
@@ -599,6 +566,7 @@ void kpowersave::do_setIconBG(){
 
 	kdDebugFuncOut(trace);
 }
+
 /*!
  * \b TQT_SLOT to enable/disable the autosuspend.
  */
@@ -717,7 +685,7 @@ bool kpowersave::do_suspend2disk(){
 			} else {
 				KPassivePopup::message( i18n("WARNING"),i18n("Suspend to disk failed"),
 							SmallIcon("messagebox_warning", 20), this,
-							i18n("Warning").ascii(), 15000);
+							i18n("Warning").utf8(), 15000);
 				kdDebugFuncOut(trace);
 				return false;
 			}
@@ -725,7 +693,7 @@ bool kpowersave::do_suspend2disk(){
 			KPassivePopup::message( i18n("WARNING"),
 						i18n("Suspend to disk disabled by administrator."),
 						SmallIcon("messagebox_warning", 20),
-						this, i18n("Warning").ascii(), 15000);
+						this, i18n("Warning").utf8(), 15000);
 			this->contextMenu()->setItemEnabled(SUSPEND2DISK_MENU_ID, false);
 			kdDebugFuncOut(trace);
 			return false;
@@ -773,7 +741,7 @@ bool kpowersave::do_suspend2ram(){
 			} else {
 				KPassivePopup::message( i18n("WARNING"),i18n("Suspend to RAM failed"),
 							SmallIcon("messagebox_warning", 20), this,
-							i18n("Warning").ascii(), 15000);
+							i18n("Warning").utf8(), 15000);
 				kdDebugFuncOut(trace);
 				return false;
 			}
@@ -781,7 +749,7 @@ bool kpowersave::do_suspend2ram(){
 			KPassivePopup::message( i18n("WARNING"),
 						i18n("Suspend to RAM disabled by administrator."),
 						SmallIcon("messagebox_warning", 20), this,
-						i18n("Warning").ascii(), 15000);
+						i18n("Warning").utf8(), 15000);
 			this->contextMenu()->setItemEnabled(SUSPEND2RAM_MENU_ID, false);
 			kdDebugFuncOut(trace);
 			return false;
@@ -829,14 +797,14 @@ bool kpowersave::do_standby(){
 			} else {
 				KPassivePopup::message( i18n("WARNING"),i18n("Standby failed"),
 							SmallIcon("messagebox_warning", 20), this,
-							i18n("Warning").ascii(), 15000);
+							i18n("Warning").utf8(), 15000);
 				kdDebugFuncOut(trace);
 				return false;
 			}
 		} else {
 			KPassivePopup::message( i18n("WARNING"),i18n("Standby disabled by administrator."),
 						SmallIcon("messagebox_warning", 20), this,
-						i18n("Warning").ascii(), 15000);
+						i18n("Warning").utf8(), 15000);
 			this->contextMenu()->setItemEnabled(STANDBY_MENU_ID, false);
 			kdDebugFuncOut(trace);
 			return false;
@@ -1192,7 +1160,7 @@ void kpowersave::handleLidEvent( bool closed ){
 								     "be a problem with the selected \nlock "
 								     "method or something else."),
 								SmallIcon("messagebox_warning", 20), this,
-								i18n("Warning").ascii(), 10000);
+								i18n("Warning").utf8(), 10000);
 
 				}
 			}
@@ -1310,7 +1278,7 @@ void kpowersave::do_setSpeedPolicy(int menu_id){
 	if(!hwinfo->setCPUFreq((cpufreq_type)menu_id, settings->cpuFreqDynamicPerformance)) {
 		KPassivePopup::message(i18n("WARNING"),
 				 i18n("CPU Freq Policy %1 could not be set.").arg(speed_menu->text(menu_id)),
-				 SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 10000);
+				 SmallIcon("messagebox_warning", 20), this, i18n("Warning").utf8(), 10000);
 	} else {
 		hwinfo->checkCurrentCPUFreqPolicy();
 		update();
@@ -1339,7 +1307,7 @@ void kpowersave::do_setActiveScheme( int i ){
  	} else if (!settings->schemes[i]){
 		KPassivePopup::message( i18n("WARNING"),
 					i18n("Scheme %1 could not be activated.").arg(scheme_menu->text(i)),
-					SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 5000);
+					SmallIcon("messagebox_warning", 20), this, i18n("Warning").utf8(), 5000);
 	}
 
 	kdDebugFuncOut(trace);
@@ -1533,12 +1501,12 @@ void kpowersave::updateSchemeMenu(){
 
 		if ( *it == settings->ac_scheme ){
 			scheme_menu->insertItem( SmallIcon("scheme_power", TQIconSet::Automatic),
-						 i18n( ((TQString)*it).ascii() ), x, x);
+						 i18n( ((TQString)*it).utf8() ), x, x);
 		}
 		else{
 			if ( *it == settings->battery_scheme ){
 				scheme_menu->insertItem(SmallIcon("scheme_powersave", TQIconSet::Automatic),
-							i18n( (*it).ascii() ), x, x);
+							i18n( (*it).utf8() ), x, x);
 			}
 			else{
 				if ((TQString)*it == "Acoustic"){
@@ -1558,7 +1526,7 @@ void kpowersave::updateSchemeMenu(){
 								i18n( "Advanced Powersave" ), x, x);
 				}
 				else {
-					scheme_menu->insertItem(i18n( (*it).ascii() ), x, x);
+					scheme_menu->insertItem(i18n( (*it).utf8() ), x, x);
 				}
 			}
 		}
@@ -1709,7 +1677,7 @@ void kpowersave::showHalErrorMsg() {
 						i18n("Could not get information from HAL. The haldaemon is "
 						     "maybe not running."),
 						SmallIcon("messagebox_warning", 20), this,
-						i18n("Error").ascii(), 5000);
+						i18n("Error").utf8(), 5000);
 		}
 		else if (hwinfo->hal_terminated && !hal_error_shown && !DISPLAY_HAL_ERROR_Timer->isActive()) {
 			hal_error_shown = true;
@@ -1738,7 +1706,7 @@ void kpowersave::showErrorMessage( TQString msg ){
 
 	if(settings->psMsgAsPassivePopup) {
 		KPassivePopup::message("KPowersave", msg, SmallIcon("messagebox_warning", 20),
-				       this, i18n("Warning").ascii(), 10000);
+				       this, i18n("Warning").utf8(), 10000);
 	} else {
 		kapp->updateUserTimestamp();
 		// KMessageBox::error( 0, msg);
@@ -2184,7 +2152,7 @@ void kpowersave::notifySchemeSwitch() {
 			eventType = "scheme_" + _scheme;
 
 		KNotifyClient::event( this->winId(), eventType,
-				      i18n("Switched to scheme: %1").arg(i18n(_scheme.ascii())).ascii());
+				      i18n("Switched to scheme: %1").arg(i18n(_scheme.utf8())));
 	}
 
 	kdDebugFuncOut(trace);
@@ -2293,7 +2261,7 @@ void kpowersave::handleResumeSignal() {
 			KPassivePopup::message( i18n("WARNING"),
 						i18n("Could not remount (all) external storage"
 						" media."), SmallIcon("messagebox_warning", 20),
-						this, i18n("Warning").ascii(), 15000);
+						this, i18n("Warning").utf8(), 15000);
 		}
 	} else {
 		kdError() << "Unknown error while suspend. Errorcode: " << resume_result << endl;

src/kpowersave.h

@@ -219,9 +219,6 @@ private:
 	//! a menu seperator ID
 	/*! contains the ID of the separator between autosuspend and Help*/
 	int HELP_SEPARATOR_MENU_ID;
-	//! a menu ID
-	/*! contains the ID of the help menu*/
-	int HELP_MENU;
 
 	//! number of white pixel in the kickerapplet icon
 	/*!
@@ -269,9 +266,6 @@ private:
 	//! a sub-menu of the kickerapplet
 	/*! TQPopupMenu for the scheme-entries. */
 	TQPopupMenu *scheme_menu;
-	//! a sub-menu of the kickerapplet
-	/*! TQPopupMenu for the help-entries. */
-	TQPopupMenu *help_menu;
 
 
 	//! icon-pixmap
@@ -356,8 +350,6 @@ private slots:
 	void slotHelp();
 	//! called to open the kpowersave About dialog
 	void slotAbout();
-	//! called to open website to report bugs
-	void slotReportBug();
 	//! called if the configure dialog is destroyed
 	void observeConfigDlg();
 	//! called if user exit from kpowersave

src/kpowersave.lsm

@@ -1,14 +0,0 @@
-Begin4
-Title:          kpowersave
-Version:        R14.0.0
-Entered-date:   2010-05-10
-Description:    Front end for power management for the Trinity Desktop Environment
-Keywords:       TDE Qt
-Author:         Thomas Renninger <trenn@suse.de>
-Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site:   http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site:  http://kde-apps.org/content/show.php?content=29295
-Platforms:      Linux and other Unices running TDE
-Copying-policy: GPL
-End

src/kpowersave_debug.h

@@ -48,7 +48,7 @@ extern bool trace;
 /*
  * macro to collect time and k_funcinfo information for kdDebug()
  */
-#define funcinfo "[" << TQString(TQTime::currentTime().toString()).ascii() << 			\
+#define funcinfo "[" << TQString(TQTime::currentTime().toString()) << 			\
 		 ":" << TQTime::currentTime().msec() << "]" <<  k_funcinfo
 
 /*

src/log_viewer.ui

@@ -101,4 +101,7 @@
     <slot>pB_save_clicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>

src/main.cpp

@@ -49,7 +49,7 @@ TDECmdLineOptions options[] = { { "force-acpi-check", I18N_NOOP("Force a new che
 static const char version[] = "0.7.x (0.7.3)";
 bool trace = false;
 
-extern "C"
+extern "C" KDE_EXPORT
 int kdemain(int argc, char **argv)
 {
 	TDEAboutData about("kpowersave", I18N_NOOP("KPowersave"), version, description,