diff --git a/.gitignore b/.gitignore index da140d9..0494ac2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build nbproject *kdev4* +*/translations/lxqt-powermanagement diff --git a/AUTHORS b/AUTHORS index fcaabf9..96b08f3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,7 +2,7 @@ Upstream Authors: LXQt team: http://lxqt.org Copyright: - Copyright (c) 2013-2014 LXQt team + Copyright (c) 2013-2016 LXQt team -License: GPL-2 and LGPL-2.1+ +License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..2413613 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,218 @@ + +lxqt-powermanagement-0.11.0 / 2016-09-24 +======================================== + + * README.md: Replace dependency XCB with KIdleTime + * Idleness Watcher: rely on KIdleTime instead of XCB (#33) + * fix indents + * Update and extend README.md + * Add Catalan translation + * Add Arabic Translation for Desktop File + * I18N: Fix Plural Strings (#38) + * Removes the QEventLoop from the Watcher class + * build: Use external translations + * ts-files removal (#34) + * Bump year Fix licenses, lxqt-powermanagement is LGPL only + * Fix source language in Italian translation file + * Italian translation update + * Update Russian translation Remove ru_RU files + * Fix typo in Greek translation + * update: lxqt-powermanagement_hu.ts + * Add German translation + +0.10.0 / 2015-10-31 +=================== + + * Update translations + * Fix LICENSE file + * Add (re)enabling info message + * Rename "On Ac" to "On AC" to have a single string for both + * Fix typo in message + * Remove "LXQt " from .desktop to follow pattern + * Update batteryhelper.cpp + * Fixed typo Unkown -> Unknown + * lidwatcher: don't listen to Changed signal + * Add some missing license headers + * OnlyShowIn=LXQt; + * Add Greek (el) translation Add the 'Comment' key in desktop file + * Add key "Comment" to desktop entry file + * Rename LxQt to LXQt everywhere + * Handles CMake policy CMP0063 + * Use the LXQtCompilerSettings CMake module + * Make built-in icon move clockwise when charging + * Fix red-painting of built-in icon when power low + * Adds Runtime install COMPONENT + * Coding sytle change + * Use GNUInstallDirs + * Removes non existent RESOURCES + * Use CMAKE_AUTOUIC, drop qt5_wrap_ui() + * Remove unneeded include_directories() entries + * Minor strings update + * Updates the build system to the Targets infrastructure + * Remove trailing whitespaces + * Enable screen locking from the idleness watcher + * Prevent a too small value for the idle watcher + * Correctly check for batteries on first run + * re-add notification about missing battery + * Added italian translations + * Hungarian translations added + * Support CMake 2.8.11 again + * Typos: fix "Idle" capitalization and misspelling + * Add icons to the action in the systray icon's menu + * Polish translation updated + * Only show batteries of type PrimaryBattery. Fixes #535 + * Make lxqt-powermanagement tray's tooltip work again + * Fix warning from clang + * Fix some wrong use of Solid::Battery::capacity instead of ..::energy + * Align slots and connects with what signals Solid offers + * Make batterywatcher react to energylevel- and powersupplystate changes + * Port to KF5's Solid + +0.9.0 / 2015-01-26 +================== + + * Portuguese update + * Fix some translation keys + * Small layoutchange in batterysettings + * Fix strings to be easier translatable + * Portuguese update + * Add Japanese translation + * - Unify naming for a unique lxqt. No more suffixes + * Fix battery info dialog's layout + * Small tweak to the built-in icon + * Added semitransparent background to built in icon + * Simplified rendering of built-in icons and added a gradient to them + * Use SingleApplication rather than Application + * Handle more than one battery + * Reordered responsibillities between classes + * Some refactoring + * Some cleanup + * Remove cancel button from batteryinfodialog.ui + * Correct one fontsize in batteryinfo.ui + * Refactor battery info dialog to handle more than one battery + * Cleaned out a lot of old debug statements + * Adjusted how chargelevels are mapped to icons + * Added icon preview to batterywatcher config + * Factor out icon producing in separate class + * Clean up code for picking battery icon from theme + * Add icon to config window + * Fix config gui + * Use the new LXQtTranslate modules. + * Fixes translations not being loaded. + * Updates translations + * Adds and uses QtTranslate cmake module for handling .ts translations + * Add Russian translation + * Include Qt5Gui_PRIVATE_INCLUDE_DIRS for qplatformnativeinterface.h + * Clean up CMakeLists.txt, drop Qt4 support + * Adds option to disable systray icon in preferences and on the icon's context menu + +0.8.0 / 2014-06-29 +================== + + * Fix incorrect lib linking. + * Add initial Qt5 support. + * Add missing lgpl-headers + * Recognize Alec Moskvin as author in 'about' dialog + * Fix includes, hopefuly correct this time + * Clean up includes + * Tell logind to not handle lidswitch when lidwatcher is enabled + * Added contextmenu to battery systemtray icon + * On first run disable lidwatcher/batterywatcher if lid/battery not present + * Add missing ${QTXDG_INCLUDE_DIRS} to include_directories(). + * Use preferred header style + * Temporary fix for #86 + * Corrected badly formed includes. Fix for #81 + +0.7.0 / 2014-05-01 +================== + + * Remove outdated and unused manpage + * Add AUTHORS + * Strings improvements + * Add CPack rules for creating tarball + * Fix .desktop icon (thanks, @agaida) + * Improvements to .desktop file + * Adapt to recent upower api changes + * Update README + * Fix updating of minutes and seconds in idleness settings + * Fix small bugs in idleness-settings, update of seconds + * Fix icons in configure-powermanager + * Slightly more userfriendly idleness-settings-dialog + * Added first-time-run notification with configure-button + * Some cleanup + fix idlenesswatcher to use power + * More code cleanup + * Minor adjustments to config ui's + * cleanup + * Code cleanup + * ui cleanups + * Clean up battery-watcher-settings ui + * Fixed lxqt-config-powermanagement.desktop file + * Renames and cleanup + * Lid, Idleness and Battery merged into one application + * Normalize imports + * Config for idleness and some more options for lidsettings + * Removed CMAKE_SOURCE_DIR usage from CMakeLists.txt files + * Fix renaming bugs, replacing lxqt-qt with lxde-qt + * Finish the crazy razor=>lxqt renaming tasks. + * rename razor to lxqt in some strings + * Replace lxqt with ${LXQT_LIBRARIES} when linking. + * Compile-time dependancy on lxqt library added + * Project name fixed + * Fix build and adopt new APIs of liblxqt. + * Renamed some #ifndef/#define s + * Make powermanagement compile and link with liblxqt and libqtxdg + * Changed prefix from lz to lxqt for all powermanagement apps + * Cleanup of old razor-autosuspend code + * cmake-files cleanup + * Initial commit + * Renames and cleanup in config + * Renames and cleanup in idleness + * Renames and cleanup in battery + * Rename and cleanup in lid + * Split razorautosuspend into lid and battery, make stuff compile + * Moved razorqt-screenlocker into razor-autosuspend + * X-RAZOR changed to Razor in desktop files + * razor-autosuspend handle more battery-icon naming schemes + * Fix underlinking with QtDbus + * Autosuspend: Force icon to update when settings change + * Autosuspend: Add config option to start/stop + * Autosuspend: Perform a first-run check for a battery + * Set battery info dialog title + * Trtanslations + * Fixes to razor-autosuspend trayicon drawing + * New, dynamically generated battery icon for razor-autosuspend + * preliminary manpages primary for razorqt and usefully in venenux + * autosuspend: fix discharging() + * Razor-autosuspend fix missing initialization of Battery + * Rename fields in razor-config-autosuspend to comply with code style + * Rename variables in razor-autosuspend to comply with coding standards + * Now possible to use theme-icons in razor-autosuspend + * Translations updated + * Translations updated + * first part of fixes based on Coverity Scan (code static analysis) + * Fix components missing translations + * Added copyright headers to constants.h, batteryinfo.h and batteryinfo.cpp in razor-autosuspend + * Typos found during translation + * Translations + * Delete bad en_GB translations + * Update translations + * Enable translations for some components that were missing them + * Load setting on startup and fix wrong slot + * razor-autosuspend watch for changes in settings + * Translations updated + * Removed line num from TS files. + * Make razorqt-autosuspend a module + * Generate translations for razorqt-autosuspend + * Use flexible layouts + * Translations + * Deleted old translation methods. + * New translation infrastructure + * Fixes in the debs files for the razor-config-autosuspend.desktop + * razor-autosuspend: When batteryinfo open it closes when trayicon clicked + * Detailed battery info when clicking razor-autosuspend tray icon + * razor-autosuspend registers as dbus-service (org.razor-qt.razor-autosuspend) - fixes #346 + * Razor-autosuspend: power-low-level is now configurable + * Razor-autosuspend: Added shutdown as action on lidclosed or powerlow + * Added config app for razor-autosuspend + * Moved razor-autosuspend sourcefiles to src-dir + * Moved razor-autosuspend to toplevel as it is not really a part of razorqt-power diff --git a/README.md b/README.md index c556f53..648363f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,31 @@ -lxqt-powermanagement -==================== +# lxqt-powermanagement -Power management module for LXQt +## Overview + +This repository is providing tools to monitor power management events and optionally trigger actions like e. g. shut down a system when laptop batteries are low on power. + +The core components are two binaries `lxqt-powermanagement` and `lxqt-config-powermanagement`. +`lxqt-powermanagement` is running in a daemon-like manner as so-called "LXQt Module" and doing the actual work. GUI "Power Management Settings (binary `lxqt-config-powermanagement`) is used to customize settings. + +Warning messages are displayed on the desktop by [lxqt-notificationd](https://github.com/lxde/lxqt-notificationd). + +## Installation + +### Compiling source code + +Runtime dependencies are UPower, KIdleTime, qtsvg and [liblxqt](https://github.com/lxde/liblxqt). +Additional build dependencies are CMake and Solid, optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information. + +Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems. + +To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual. + +### Binary packages + +Official binary packages are provided by all major Linux distributions like Arch Linux, Debian (as of Debian stretch only), Fedora and openSUSE. Just use your package manager to search for string `lxqt-powermanagement`. + +## Configuration, Usage + +Daemon-like `lxqt-powermanagement` can be adjusted from section "Basic Settings" in configuration dialogue "LXQt Session Settings" (binary `lxqt-config-session`) of [lxqt-session](https://github.com/lxde/lxqt-session). + +To customize settings there's configuration dialogue "Power Management Settings" (binary `lxqt-config-powermanagement`). It can be opened from the panel's main menu - Preferences - LXQt Settings - Power Management and is provided by the "Configuration Center" (binary `lxqt-config`) of [lxqt-config](https://github.com/lxde/lxqt-config) as well. diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 6a557ef..616618d 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -36,6 +36,16 @@ lxqt_translate_ts(QM_FILES ${UI_FILES} INSTALL_DIR ${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME} + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + REPO_SUBDIR + "lxqt-powermanagement/${PROJECT_NAME}" ) lxqt_app_translation_loader(config-powermanagement_QM_LOADER ${PROJECT_NAME}) diff --git a/config/translations/lxqt-config-powermanagement.ts b/config/translations/lxqt-config-powermanagement.ts deleted file mode 100644 index 0272723..0000000 --- a/config/translations/lxqt-config-powermanagement.ts +++ /dev/null @@ -1,217 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - - - - - E&nable Battery Watcher - - - - - Warning: - - - - - seconds - - - - - Level is low at: - - - - - % - - - - - Use icons from theme: - - - - - - Preview - - - - - Charging - - - - - Discharging - - - - - When power is low then: - - - - - Show icon: - - - - - built in - - - - - Level: %1% - - - - - IdlenessWatcherSettings - - - Form - - - - - Enab&le Idleness Watcher - - - - - When idle then: - - - - - Idle time: - - - - - minutes - - - - - seconds - - - - - LidWatcherSettings - - - Form - - - - - Enable &Lid Watcher - - - - - Action when lid is closed - - - - - - On Battery - - - - - Nothing - - - - - Suspend - - - - - Hibernate - - - - - Shut down - - - - - - On AC - - - - - When &using external monitor - - - - - MainWindow - - - Power Management Settings - - - - - Battery - - - - - Lid - - - - - Idle - - - - - QObject - - - Nothing - - - - - Lock screen - - - - - Suspend - - - - - Hibernate - - - - - Shutdown - - - - diff --git a/config/translations/lxqt-config-powermanagement_ar.desktop b/config/translations/lxqt-config-powermanagement_ar.desktop new file mode 100644 index 0000000..e1dffc2 --- /dev/null +++ b/config/translations/lxqt-config-powermanagement_ar.desktop @@ -0,0 +1,3 @@ +Name[ar]=إدارة الطّاقة +GenericName[ar]=إعدادات إدارة الطّاقة +Comment[ar]=عدّة إعدادات لإدارة الطّاقة مثل مراقبات البطّاريّة أو الخمول diff --git a/config/translations/lxqt-config-powermanagement_ca.desktop b/config/translations/lxqt-config-powermanagement_ca.desktop new file mode 100644 index 0000000..8bb204a --- /dev/null +++ b/config/translations/lxqt-config-powermanagement_ca.desktop @@ -0,0 +1,3 @@ +Name[ca]=Gestió de l'energia +GenericName[ca]=Ajusts de la gestió de l'energia +Comment[ca]=Diversos ajusts pel que fa a la gestió de l'energia com la bateria o l'observador de l'ociositat diff --git a/config/translations/lxqt-config-powermanagement_de.desktop b/config/translations/lxqt-config-powermanagement_de.desktop new file mode 100644 index 0000000..4357f9d --- /dev/null +++ b/config/translations/lxqt-config-powermanagement_de.desktop @@ -0,0 +1,3 @@ +Name[de]=Energieverwaltung +GenericName[de]=Einstellungen der Energieverwaltung +Comment[de]=Verschiedene Einstellungen zur Energieverwaltung wie Batterie- oder Leerlaufüberwachung diff --git a/config/translations/lxqt-config-powermanagement_el.ts b/config/translations/lxqt-config-powermanagement_el.ts deleted file mode 100644 index 79c19d8..0000000 --- a/config/translations/lxqt-config-powermanagement_el.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - Ρυθμίσεις επόπτη μπαταρίας - - - - E&nable Battery Watcher - &Ενεργοποίηση του επόπτη της μπαταρίας - - - - Warning: - Προειδοποίηση: - - - - seconds - δευτερόλεπτα - - - - Level is low at: - Το επίπεδο είναι χαμηλό στο: - - - - % - % - - - - Use icons from theme: - Χρήση των εικονιδίων από το θέμα: - - - - - Preview - - - - - Charging - - - - - Discharging - - - - - When power is low then: - Όταν η ενέργεια είναι χαμηλά τότε: - - - - Show icon: - Εμφάνιση εικονιδίου: - - - - built in - - - - - Level: %1% - - - - - IdlenessWatcherSettings - - - Form - Φόρμα - - - - Enab&le Idleness Watcher - Ενεργοποίηση του επόπτη α&δράνειας - - - - When idle then: - Όταν είναι αδρανής: - - - - Idle time: - Χρόνος αδράνειας: - - - - minutes - λεπτά - - - - seconds - δευτερόλεπτα - - - - LidWatcherSettings - - - Form - Φόρμα - - - - Enable &Lid Watcher - Ενεργοποίηση του επόπτη &καλύμματος - - - - Action when lid is closed - Ενέργεια κατά το κλείσιμο του καλύμματος - - - - - On Battery - Σε μπαταρία - - - - Nothing - Τίποτα - - - - Suspend - Αναστολή - - - - Hibernate - Νάρκη - - - - Shut down - Τερματισμός - - - - - On AC - Σε τροφοδοτικό AC - - - - When &using external monitor - Όταν χρησιμοποιείται εξωτερική ο&θόνη - - - On Ac - Σε τροφοδοτικό AC - - - - MainWindow - - LXQt Powermanagement Configuration - Διαμόρφωση της διαχείρισης ενέργειας του LXQt - - - - Power Management Settings - - - - - Battery - Μπαταρία - - - - Lid - Κάλυμμα φορητού - - - - Idle - - - - idle - Αδράνεια - - - - QObject - - - Nothing - Τίποτα - - - - Lock screen - Κλείδωμα οθόνης - - - - Suspend - Αναστολή - - - - Hibernate - Νάρκη - - - - Shutdown - Τερματισμός - - - diff --git a/config/translations/lxqt-config-powermanagement_hu.ts b/config/translations/lxqt-config-powermanagement_hu.ts deleted file mode 100644 index c70c814..0000000 --- a/config/translations/lxqt-config-powermanagement_hu.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - Akkumulátor figyelő beállítás - - - - E&nable Battery Watcher - Akkumulátor figyelő e&ngedélyezése - - - - Warning: - Figyelmeztetés: - - - - seconds - másodperc - - - - Level is low at: - Alacsony energiaszint: - - - - % - - - - - Use icons from theme: - Ikonok a témából: - - - - - Preview - - - - - Charging - - - - - Discharging - - - - - When power is low then: - Alacsony energiánál: - - - - Show icon: - Ikon mutatás: - - - - built in - - - - - Level: %1% - - - - - IdlenessWatcherSettings - - - Form - Űrlap - - - - Enab&le Idleness Watcher - Tétle&nségi felügyelet - - - - When idle then: - Tétlenség esetén: - - - - Idle time: - Tétlenségi idő: - - - - minutes - perc - - - - seconds - másodperc - - - - LidWatcherSettings - - - Form - Űrlap - - - - Enable &Lid Watcher - Fedélfelügyelet - - - - Action when lid is closed - Teendő fedélzáráskor - - - - - On Battery - Akkumulátor - - - - Nothing - Semmi - - - - Suspend - Készenlét - - - - Hibernate - Alvás - - - - Shut down - Kikapcsolás - - - - - On AC - Külső táp - - - - When &using external monitor - &Külső monitor használatakor - - - On Ac - Külső táp - - - - MainWindow - - LXQt Powermanagement Configuration - LXQt energiafelügyelet beállítás - - - - Power Management Settings - - - - - Battery - Akkumulátor - - - - Lid - Fedél - - - - Idle - - - - idle - Tétlenség - - - - QObject - - - Nothing - Semmi - - - - Lock screen - Képernyőzár - - - - Suspend - Készenlét - - - - Hibernate - Alvás - - - - Shutdown - Kikapcsolás - - - diff --git a/config/translations/lxqt-config-powermanagement_it.ts b/config/translations/lxqt-config-powermanagement_it.ts deleted file mode 100644 index 468c8d6..0000000 --- a/config/translations/lxqt-config-powermanagement_it.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - Impostazioni monitor batteria - - - - E&nable Battery Watcher - &Attiva il monitor della batteria - - - - Warning: - Tempo di attesa: - - - - seconds - secondi - - - - Level is low at: - Livello basso : - - - - % - - - - - Use icons from theme: - Usa icone del tema: - - - - - Preview - - - - - Charging - - - - - Discharging - - - - - When power is low then: - Quando il livello è basso: - - - - Show icon: - Mostra icona: - - - - built in - - - - - Level: %1% - - - - - IdlenessWatcherSettings - - - Form - - - - - Enab&le Idleness Watcher - &Attiva monitor attività sistema - - - - When idle then: - Quando inattivo: - - - - Idle time: - Tempo di inattività: - - - - minutes - minuti - - - - seconds - secondi - - - - LidWatcherSettings - - - Form - - - - - Enable &Lid Watcher - &Attiva monitor coperchio - - - - Action when lid is closed - Azione a chiusura - - - - - On Battery - Alimentazione a batteria - - - - Nothing - Niente - - - - Suspend - Sospendi - - - - Hibernate - Iberna - - - - Shut down - Spegni - - - - - On AC - Alimentazione di rete - - - - When &using external monitor - Quando è in uso un monitor &esterno - - - On Ac - Alimentazione di rete - - - - MainWindow - - LXQt Powermanagement Configuration - Configurazione gestione energetica di LXQt - - - - Power Management Settings - - - - - Battery - Batteria - - - - Lid - Coperchio - - - - Idle - - - - idle - Inattività - - - - QObject - - - Nothing - Nessuna azione - - - - Lock screen - Blocca schermo - - - - Suspend - Sospendi - - - - Hibernate - Iberna - - - - Shutdown - Spegni - - - diff --git a/config/translations/lxqt-config-powermanagement_ja.ts b/config/translations/lxqt-config-powermanagement_ja.ts deleted file mode 100644 index dc39fe4..0000000 --- a/config/translations/lxqt-config-powermanagement_ja.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - バッテリーの監視設定 - - - - E&nable Battery Watcher - バッテリー監視を有効にする(&N) - - - - Warning: - 警告: - - - - seconds - 秒 - - - - Level is low at: - 低いと判断するレベル: - - - - % - % - - - - Use icons from theme: - テーマのアイコンを用いる: - - - - - Preview - - - - - Charging - - - - - Discharging - - - - - When power is low then: - 電源が低いときには: - - - - Show icon: - アイコンを表示: - - - - built in - - - - - Level: %1% - - - - - IdlenessWatcherSettings - - - Form - フォーム - - - - Enab&le Idleness Watcher - アイドル状態の監視 - - - - When idle then: - アイドル時には: - - - - Idle time: - アイドル状態の時間 - - - - minutes - 分 - - - - seconds - 秒 - - - - LidWatcherSettings - - - Form - フォーム - - - - Enable &Lid Watcher - フタの監視を有効にする - - - - Action when lid is closed - フタが閉じていたときの動作 - - - - - On Battery - バッテリー動作時 - - - - Nothing - 何もしない - - - - Suspend - サスペンド - - - - Hibernate - ハイバネート - - - - Shut down - シャットダウン - - - - - On AC - AC電源時 - - - - When &using external monitor - 外部モニター使用時 - - - On Ac - AC電源時 - - - - MainWindow - - LXQt Powermanagement Configuration - LXQt電源管理の設定 - - - - Power Management Settings - - - - - Battery - バッテリー - - - - Lid - フタ - - - - Idle - - - - idle - アイドル - - - - QObject - - - Nothing - 何もしない - - - - Lock screen - スクリーンをロック - - - - Suspend - サスペンド - - - - Hibernate - ハイバネート - - - - Shutdown - シャットダウン - - - diff --git a/config/translations/lxqt-config-powermanagement_pl_PL.ts b/config/translations/lxqt-config-powermanagement_pl_PL.ts deleted file mode 100644 index 50c4eab..0000000 --- a/config/translations/lxqt-config-powermanagement_pl_PL.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - Ustawienia monitorowania baterii - - - - E&nable Battery Watcher - W&łącz monitorowanie baterii - - - - Warning: - Ostrzeżenie: - - - - seconds - sek - - - - Level is low at: - Poziom niski od: - - - - % - % - - - - Use icons from theme: - Użyj ikon z motywu: - - - - - Preview - - - - - Charging - - - - - Discharging - - - - - When power is low then: - Gdy poziom jest niski: - - - - Show icon: - Pokaż ikonę: - - - - built in - - - - - Level: %1% - - - - - IdlenessWatcherSettings - - - Form - Form - - - - Enab&le Idleness Watcher - W&łącz monitorowanie bezczynności - - - - When idle then: - Gdy bezczynny: - - - - Idle time: - Czas bezczynności: - - - - minutes - min - - - - seconds - sek - - - - LidWatcherSettings - - - Form - Form - - - - Enable &Lid Watcher - W&łącz monitorowanie pokrywy - - - - Action when lid is closed - Reakcja na zamknięcie pokrywy - - - - - On Battery - Na baterii - - - - Nothing - Brak - - - - Suspend - Wstrzymaj - - - - Hibernate - Hibernuj - - - - Shut down - Wyłącz - - - - - On AC - Na zasilaniu - - - - When &using external monitor - Przy używaniu &zewnętrznego monitora - - - On Ac - Na zasilaniu - - - - MainWindow - - LXQt Powermanagement Configuration - LXQt Konfiguracja zarządzania energią - - - - Power Management Settings - - - - - Battery - Bateria - - - - Lid - Pokrywa - - - - Idle - - - - idle - Bezczynność - - - - QObject - - - Nothing - Brak reakcji - - - - Lock screen - Zablokuj ekran - - - - Suspend - Wstrzymaj - - - - Hibernate - Hibernuj - - - - Shutdown - Wyłącz - - - diff --git a/config/translations/lxqt-config-powermanagement_pt.ts b/config/translations/lxqt-config-powermanagement_pt.ts deleted file mode 100644 index bb4bbc9..0000000 --- a/config/translations/lxqt-config-powermanagement_pt.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - Definições do monitorizador de energia - - - - E&nable Battery Watcher - &Ativar monitorizador de energia - - - - Warning: - Aviso: - - - - seconds - segundos - - - - Level is low at: - O nível está baixo em: - - - - % - % - - - - Use icons from theme: - Utilizar ícones do tema: - - - - - Preview - - - - - Charging - - - - - Discharging - - - - - When power is low then: - Se a energia estiver baixa: - - - - Show icon: - Mostrar ícone: - - - - built in - - - - - Level: %1% - - - - - IdlenessWatcherSettings - - - Form - Formulário - - - - Enab&le Idleness Watcher - Ativar monitori&zador de inatividade - - - - When idle then: - Se existir inatividade: - - - - Idle time: - Tempo para inatividade: - - - - minutes - minutos - - - - seconds - segundos - - - - LidWatcherSettings - - - Form - Formulário - - - - Enable &Lid Watcher - Ativar monitori&zador da tampa - - - - Action when lid is closed - Ação ao fechar a tampa - - - - - On Battery - Com bateria - - - - Nothing - Nada fazer - - - - Suspend - Suspender - - - - Hibernate - Hibernar - - - - Shut down - Desligar - - - - - On AC - Com corrente - - - - When &using external monitor - Ao &utilizar monitor externo - - - On Ac - Com corrente - - - - MainWindow - - LXQt Powermanagement Configuration - Configuração do gestor de energia do LXQt - - - - Power Management Settings - - - - - Battery - Bateria - - - - Lid - Tampa - - - - Idle - - - - idle - inatividade - - - - QObject - - - Nothing - Nada fazer - - - - Lock screen - Bloquear ecrã - - - - Suspend - Suspender - - - - Hibernate - Hibernar - - - - Shutdown - Desligar - - - diff --git a/config/translations/lxqt-config-powermanagement_ru.ts b/config/translations/lxqt-config-powermanagement_ru.ts deleted file mode 100644 index ce1ab3a..0000000 --- a/config/translations/lxqt-config-powermanagement_ru.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - Настройки наблюдения за батареей - - - - E&nable Battery Watcher - &Разрешить наблюдение за батареей - - - - Warning: - Предупреждение: - - - - seconds - секунд - - - - Level is low at: - Низкий уровень при: - - - - % - % - - - - Use icons from theme: - Использовать значки из темы: - - - - - Preview - - - - - Charging - - - - - Discharging - - - - - When power is low then: - При низком заряде: - - - - Show icon: - Показывать значок: - - - - built in - - - - - Level: %1% - - - - - IdlenessWatcherSettings - - - Form - - - - - Enab&le Idleness Watcher - Включить наблюдение за простоем - - - - When idle then: - При простое: - - - - Idle time: - Время простоя: - - - - minutes - минут - - - - seconds - секунд - - - - LidWatcherSettings - - - Form - - - - - Enable &Lid Watcher - Включить наблюдение за крышкой - - - - Action when lid is closed - Действие при закрытии крышки - - - - - On Battery - От батареи - - - - Nothing - Ничего - - - - Suspend - Ждущий режим - - - - Hibernate - Спящий режим - - - - Shut down - Выключить - - - - - On AC - От сети - - - - When &using external monitor - При использовании внешнего монитора - - - On Ac - От сети - - - - MainWindow - - LXQt Powermanagement Configuration - Настройка энергопотребления LXQt - - - - Power Management Settings - - - - - Battery - Батарея - - - - Lid - Крышка - - - - Idle - - - - idle - бездействие - - - - QObject - - - Nothing - Ничего - - - - Lock screen - Блокирвать экран - - - - Suspend - Ждущий режим - - - - Hibernate - Спящий режим - - - - Shutdown - Выключить компьютер - - - diff --git a/config/translations/lxqt-config-powermanagement_ru_RU.desktop b/config/translations/lxqt-config-powermanagement_ru_RU.desktop deleted file mode 100644 index 24ab6c4..0000000 --- a/config/translations/lxqt-config-powermanagement_ru_RU.desktop +++ /dev/null @@ -1,3 +0,0 @@ -# Translations -GenericName[ru_RU]=Настройки управления энергопотреблением -Name[ru_RU]=Управление энергопотреблением \ No newline at end of file diff --git a/config/translations/lxqt-config-powermanagement_ru_RU.ts b/config/translations/lxqt-config-powermanagement_ru_RU.ts deleted file mode 100644 index d6087f1..0000000 --- a/config/translations/lxqt-config-powermanagement_ru_RU.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - Настройки наблюдения за батареей - - - - E&nable Battery Watcher - &Разрешить наблюдение за батареей - - - - Warning: - Предупреждение: - - - - seconds - секунд - - - - Level is low at: - Низкий уровень при: - - - - % - % - - - - Use icons from theme: - Использовать значки из темы: - - - - - Preview - - - - - Charging - - - - - Discharging - - - - - When power is low then: - При низком заряде: - - - - Show icon: - Показывать значок: - - - - built in - - - - - Level: %1% - - - - - IdlenessWatcherSettings - - - Form - - - - - Enab&le Idleness Watcher - Включить наблюдение за простоем - - - - When idle then: - При простое: - - - - Idle time: - Время простоя: - - - - minutes - минут - - - - seconds - секунд - - - - LidWatcherSettings - - - Form - - - - - Enable &Lid Watcher - Включить наблюдение за крышкой - - - - Action when lid is closed - Действие при закрытии крышки - - - - - On Battery - От батареи - - - - Nothing - Ничего - - - - Suspend - Ждущий режим - - - - Hibernate - Спящий режим - - - - Shut down - Выключить - - - - - On AC - От сети - - - - When &using external monitor - При использовании внешнего монитора - - - On Ac - От сети - - - - MainWindow - - LXQt Powermanagement Configuration - Настройка энергопотребления LXQt - - - - Power Management Settings - - - - - Battery - Батарея - - - - Lid - Крышка - - - - Idle - - - - idle - бездействие - - - - QObject - - - Nothing - Ничего - - - - Lock screen - Блокирвать экран - - - - Suspend - Ждущий режим - - - - Hibernate - Спящий режим - - - - Shutdown - Выключить компьютер - - - diff --git a/debian/.gitignore b/debian/.gitignore index c9204fc..9e6018f 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,7 +1,7 @@ /*.debhelper /*.log /*.substvars +/debhelper-build-stamp /files /lxqt-powermanagement/ -/lxqt-powermanagement-dbg/ diff --git a/debian/changelog b/debian/changelog index 1cc1793..5ee0960 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +lxqt-powermanagement (0.11.0-2) unstable; urgency=medium + + * Cherry-picking upstream release 0.11.0 + * Synced debian foo with experimental + * Bumped compat to 10 + * Removed --parallel from rules, standard in compat 10 + * Bumped minimum version debhelper to />= 10) + * Bumped minimum version liblxqt0-dev (>= 0.11.0) + * Bumped minimum version libqt5xdg-dev (>= 2.0.0) + * Added build dependency libkf5idletime-dev + * Added build dependency libqt5svg5-dev + * Added Recommends lxqt-powermanagement-l10n + * Added build dependency libqt5xdgiconloader-dev (>= 2.0.0) + * Removed build dependency libx11-xcb-dev + * Removed build dependency libxcb-dpms0-dev + * Removed build dependency libxcb-screensaver0-dev + * Added translation control to rules + * Set CMAKE_BUILD_TYPE=RelWithDebInfo + * Exported LC_ALL=C.UTF-8, make builds reproducible + + -- Alf Gaida Tue, 18 Oct 2016 17:25:42 +0200 + lxqt-powermanagement (0.10.0-4) unstable; urgency=medium * Added Recommends: upower (Closes: #828697) diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 3f591a9..4939dd8 100644 --- a/debian/control +++ b/debian/control @@ -5,24 +5,23 @@ Uploaders: Alf Gaida , Andrew Lee (李健秋) Section: x11 Priority: optional -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), cmake (>= 3.0.2), + libkf5idletime-dev, libkf5solid-dev, libkf5windowsystem-dev, - liblxqt0-dev (>= 0.10.0), + liblxqt0-dev (>= 0.11.0), libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 1.3.0), + libqt5xdg-dev (>= 2.0.0), + libqt5xdgiconloader-dev (>= 2.0.0), libx11-dev, - libx11-xcb-dev, - libxcb-dpms0-dev, - libxcb-screensaver0-dev, pkg-config, qtbase5-private-dev, qttools5-dev, qttools5-dev-tools Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/lxqt-powermanagement.git/?h=debian/sid +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-powermanagement.git/?h=debian/sid Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-powermanagement.git -b debian/sid Homepage: https://github.com/lxde/lxqt-powermanagement @@ -30,7 +29,8 @@ Package: lxqt-powermanagement Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: upower +Recommends: lxqt-powermanagement-l10n, + upower Description: power management module for LXQt The Power management module for LXQt. . diff --git a/debian/copyright b/debian/copyright index 87e96fb..6266ff2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lxqt-powermanagement -Source: https://github.com/lxde/lxqt-openssh-askpass +Source: https://github.com/lxde/lxqt-powermanagement Files: * Copyright: 2013-2016 LXQt team diff --git a/debian/gbp.conf b/debian/gbp.conf index ead668a..7a9f00a 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,3 +2,7 @@ debian-branch = debian/sid upstream-branch = upstream/latest pristine-tar = True + +[import-orig] +# Use git cherrypick -n upstream instead. +merge = False diff --git a/debian/rules b/debian/rules index 54972db..9dbedc2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,15 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export LC_ALL=C.UTF-8 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh ${@} --buildsystem cmake \ - --parallel + dh ${@} --buildsystem cmake + +override_dh_auto_configure: + dh_auto_configure -- \ + -DPULL_TRANSLATIONS=OFF\ + -DUPDATE_TRANSLATIONS=OFF\ + -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 05cd1df..4936633 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -1,63 +1,50 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) -mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U -WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA -Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/ -OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3 -7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE -FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb -ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4 -+Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7 -ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6 -ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC -iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB -tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC -Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a -SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ -OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb -sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF -UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho -P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu -6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn -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 -=fF8P +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 +=h7ww -----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 8f6e6d9..6672509 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 +version=4 opts="pgpsigurlmangle=s/$/.asc/" \ - https://github.com/lxde/lxqt-powermanagement/releases .*/([\d\.]+).tar.gz + https://github.com/lxde/lxqt-powermanagement/releases .*/lxqt-powermanagement-([\d\.]+).tar.xz diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4a819f1..3b5c7b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,7 +15,6 @@ set(SOURCES powermanagementd.cpp trayicon.cpp iconproducer.cpp - x11helper.cpp ../config/powermanagementsettings.cpp ) @@ -28,12 +27,6 @@ set(DESKTOP_FILES_IN lxqt-powermanagement.desktop.in ) -qt5_add_dbus_adaptor(SOURCES - org.freedesktop.ScreenSaver.xml - idlenesswatcher.h - IdlenessWatcher -) - lxqt_translate_ts(QM_FILES UPDATE_TRANSLATIONS ${UPDATE_TRANSLATIONS} SOURCES @@ -41,56 +34,24 @@ lxqt_translate_ts(QM_FILES ${UI_FILES} INSTALL_DIR ${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME} + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + REPO_SUBDIR + "lxqt-powermanagement/${PROJECT_NAME}" ) lxqt_app_translation_loader(lxqt-powermanagement_QM_LOADER ${PROJECT_NAME}) -# XCB stuff (TODO: move into findXCB) -find_package(PkgConfig) - -pkg_check_modules(PKG_XCB xcb) -find_path(XCB_INCLUDE_DIR xcb/xcb.h - ${PKG_XCB_INCLUDE_DIRS} -) -find_library(XCB_LIBRARY NAMES xcb - PATHS - ${PKG_XCB_LIBRARY_DIRS} -) - -pkg_check_modules(PKG_X11_XCB x11-xcb) -find_path(X11_XCB_INCLUDE_DIR X11/Xlib-xcb.h - ${PKG_X11_XCB_INCLUDE_DIRS} -) -find_library(X11_XCB_LIBRARY NAMES X11-xcb - PATHS - ${PKG_X11_XCB_LIBRARY_DIRS} -) - -pkg_check_modules(PKG_XCB_SCREENSAVER xcb-screensaver) -find_path(XCB_SCREENSAVER_INCLUDE_DIR xcb/screensaver.h - ${PKG_XCB_SCREENSAVER_INCLUDE_DIRS} -) -find_library(XCB_SCREENSAVER_LIBRARY NAMES xcb-screensaver - PATHS - ${PKG_XCB_SCREENSAVER_LIBRARY_DIRS} -) - -pkg_check_modules(PKG_XCB_DPMS xcb-dpms) -find_path(XCB_DPMS_INCLUDE_DIR xcb/dpms.h - ${PKG_XCB_SCREENSAVER_INCLUDE_DIRS} -) -find_library(XCB_DPMS_LIBRARY NAMES xcb-dpms - PATHS - ${PKG_XCB_DPMS_LIBRARY_DIRS} -) - +find_package(KF5IdleTime REQUIRED) include_directories( ${Qt5Gui_PRIVATE_INCLUDE_DIRS} - ${XCB_INCLUDE_DIR} - ${X11_XCB_INCLUDE_DIR} - ${XCB_SCREENSAVER_INCLUDE_DIR} - ${XCB_DPMS_INCLUDE_DIR} ) add_executable(lxqt-powermanagement @@ -104,11 +65,8 @@ add_executable(lxqt-powermanagement target_link_libraries(lxqt-powermanagement lxqt ${QTX_LIBRARIES} - ${XCB_LIBRARY} - ${XCB_SCREENSAVER_LIBRARY} - ${XCB_DPMS_LIBRARY} - ${X11_XCB_LIBRARY} KF5::Solid + KF5::IdleTime ) install(TARGETS diff --git a/src/batterywatcher.cpp b/src/batterywatcher.cpp index 3ed56f3..59c46f6 100644 --- a/src/batterywatcher.cpp +++ b/src/batterywatcher.cpp @@ -122,13 +122,13 @@ void BatteryWatcher::batteryChanged() switch (mSettings.getPowerLowAction()) { case LXQt::Power::PowerSuspend: - notification->setBody(tr("Suspending in %1 seconds").arg(secondsToAction)); + notification->setBody(tr("Suspending in %n second(s)", nullptr, secondsToAction).arg(secondsToAction)); break; case LXQt::Power::PowerHibernate: - notification->setBody(tr("Hibernating in %1 seconds").arg(secondsToAction)); + notification->setBody(tr("Hibernating in %n second(s)", nullptr, secondsToAction).arg(secondsToAction)); break; case LXQt::Power::PowerShutdown: - notification->setBody(tr("Shutting down in %1 seconds").arg(secondsToAction)); + notification->setBody(tr("Shutting down in %n second(s)", nullptr, secondsToAction).arg(secondsToAction)); break; } diff --git a/src/iconproducer.cpp b/src/iconproducer.cpp index 6fcf751..e257be8 100644 --- a/src/iconproducer.cpp +++ b/src/iconproducer.cpp @@ -183,18 +183,18 @@ QIcon IconProducer::buildCircleIcon(Solid::Battery::ChargeState state, int charg if (chargeLevel > 99) chargeLevel = 99; - double angle; + double angle; QString sweepFlag; - if (state == Solid::Battery::Discharging) - { - angle = M_PI_2 + 2 * M_PI * chargeLevel/100; - sweepFlag = "0"; - } - else - { - angle = M_PI_2 - 2 *M_PI * chargeLevel/100; - sweepFlag = "1"; - } + if (state == Solid::Battery::Discharging) + { + angle = M_PI_2 + 2 * M_PI * chargeLevel/100; + sweepFlag = "0"; + } + else + { + angle = M_PI_2 - 2 *M_PI * chargeLevel/100; + sweepFlag = "1"; + } double circle_endpoint_x = 80.0 * cos(angle) + 100; double circle_endpoint_y = -80.0 * sin(angle) + 100; diff --git a/src/idlenesswatcher.cpp b/src/idlenesswatcher.cpp index 44b33dc..e669b6a 100644 --- a/src/idlenesswatcher.cpp +++ b/src/idlenesswatcher.cpp @@ -22,262 +22,46 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#include -#include -#include -#include -#include - -#include - -#include "screensaveradaptor.h" #include "idlenesswatcher.h" -#include "x11helper.h" - -/* lockers: - * - * xlock(more) - * i3lock -n - * slock - * alock - * xtrlock - */ +#include +#include +#include IdlenessWatcher::IdlenessWatcher(QObject* parent): - Watcher(parent), - mPSettings(), - mErrorNotification(tr("LXQt Idleness watcher failed to start")), - mDBusWatcher(this), - mInhibitorCookie(0), - mIsLocked(false) + Watcher(parent) { qDebug() << "Starting idlenesswatcher"; - mConn = X11Helper::connection(); - xcb_prefetch_extension_data(mConn, &xcb_screensaver_id); - xcb_prefetch_extension_data(mConn, &xcb_dpms_id); - xcb_screensaver_query_version_cookie_t verCookie = xcb_screensaver_query_version_unchecked(mConn, XCB_SCREENSAVER_MAJOR_VERSION, XCB_SCREENSAVER_MINOR_VERSION); - xcb_dpms_get_version_cookie_t dpmsVerCookie = xcb_dpms_get_version_unchecked(mConn, XCB_DPMS_MAJOR_VERSION, XCB_DPMS_MINOR_VERSION); - // Note that XCB is asynchronous, so we want to make requests ASAP and get the responses as late as possible. - - mScreen = screenOfDisplay(mConn, 0); - mErrorNotification.setUrgencyHint(LXQt::Notification::UrgencyCritical); - mErrorNotification.setIcon("object-unlocked"); - mErrorNotification.setTimeout(0); - - new ScreenSaverAdaptor(this); - QDBusConnection sessionBus = QDBusConnection::sessionBus(); - if (!sessionBus.registerService("org.freedesktop.ScreenSaver") - || !sessionBus.registerObject("/ScreenSaver", this)) - { - mErrorNotification.setBody(tr("D-Bus interface org.freedesktop.ScreenSaver is already registered")); - mErrorNotification.update(); - qWarning() << "ERROR: D-Bus interface org.freedesktop.ScreenSaver is already registered"; - } - - mDBusWatcher.setConnection(QDBusConnection::sessionBus()); - mDBusWatcher.setWatchMode(QDBusServiceWatcher::WatchForUnregistration); - - connect(&mTimer, SIGNAL(timeout()), SLOT(idleTimeout())); - connect(&mPSettings, SIGNAL(settingsChanged()), SLOT(restartTimer())); - connect(this, SIGNAL(done()), this, SLOT(restartTimer())); - connect(&mDBusWatcher, SIGNAL(serviceUnregistered(QString)), SLOT(serviceUnregistered(QString))); - connect(&mLockProcess, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(screenUnlocked(int,QProcess::ExitStatus))); - connect(&mErrorNotification, SIGNAL(actionActivated(int)), SLOT(notificationAction(int))); - - // Get XCB responses ... - const xcb_query_extension_reply_t* extReply = xcb_get_extension_data(mConn, &xcb_screensaver_id); - const xcb_query_extension_reply_t* dpmsExtReply = xcb_get_extension_data(mConn, &xcb_dpms_id); - xcb_screensaver_query_version_reply_t* verReply = xcb_screensaver_query_version_reply(mConn, verCookie, NULL); - xcb_dpms_get_version_reply_t* dpmsVerReply = xcb_dpms_get_version_reply(mConn, dpmsVerCookie, NULL); - - if (mScreen && extReply && extReply->present && dpmsExtReply && dpmsExtReply->present - && verReply && dpmsVerReply - && verReply->server_major_version == XCB_SCREENSAVER_MAJOR_VERSION - && verReply->server_minor_version >= XCB_SCREENSAVER_MINOR_VERSION - //&& dpmsVerReply->server_major_version == XCB_DPMS_MAJOR_VERSION - //&& dpmsVerReply->server_minor_version >= XCB_DPMS_MINOR_VERSION - ) - { - free(verReply); - free(dpmsVerReply); - } - else - { - mErrorNotification.setBody(tr("The X11 Screensaver extension is not usable")); - mErrorNotification.update(); - if (verReply) - free(verReply); - qCritical() << "ERROR: Can't use the X11 Screensaver Extension!"; - } - - mErrorNotification.setActions(QStringList(tr("Configure..."))); - - qDebug() << "LXQt Screenlocker started."; - qDebug() << "timeout:" << getMaxIdleTimeoutMs() << "ms, lock command:" << mLockCommand; - restartTimer(); -} - -xcb_screen_t* IdlenessWatcher::screenOfDisplay(xcb_connection_t* conn, int screen) -{ - xcb_screen_iterator_t iter = xcb_setup_roots_iterator(xcb_get_setup(conn)); - for (; iter.rem; --screen, xcb_screen_next(&iter)) - if (screen == 0) - return iter.data; - return NULL; -} - -uint IdlenessWatcher::getIdleTimeMs() -{ - xcb_screensaver_query_info_cookie_t infoCookie = xcb_screensaver_query_info_unchecked(mConn, mScreen->root); - xcb_screensaver_query_info_reply_t* infoReply = xcb_screensaver_query_info_reply(mConn, infoCookie, NULL); - if (!infoReply) - { - qWarning() << "Bad reply from X11 Screensaver"; - return 0; - } - uint msSinceUserInput = infoReply->ms_since_user_input; - free(infoReply); - return msSinceUserInput; -} - -uint IdlenessWatcher::getMaxIdleTimeoutMs() -{ - return 1000 * mPSettings.getIdlenessTimeSecs(); -} - -void IdlenessWatcher::idleTimeout() -{ - uint msSinceUserInput = getIdleTimeMs(); - if (msSinceUserInput >= getMaxIdleTimeoutMs()) - { - mTimer.stop(); - doAction(mPSettings.getIdlenessAction()); - } - else - mTimer.start(getMaxIdleTimeoutMs() - msSinceUserInput); -} - -void IdlenessWatcher::restartTimer() -{ - qDebug() << ">>> Timer Restarted, waiting: " << getMaxIdleTimeoutMs() << "msecs"; - mTimer.start(getMaxIdleTimeoutMs()); -} - -void IdlenessWatcher::screenUnlocked(int exitCode, QProcess::ExitStatus exitStatus) -{ - - mIsLocked = false; - emit ActiveChanged(false); - - if (exitCode == 0) - { - restartTimer(); - } - else - { - mErrorNotification.setSummary(tr("ERROR: Screen unlocked")); - if (exitStatus == QProcess::NormalExit) - mErrorNotification.setBody(tr("Locking program \"%1\" exited with error code %2").arg(mLockCommand).arg(exitCode)); - else - mErrorNotification.setBody(tr("Locking program \"%1\" crashed with error code %2").arg(mLockCommand).arg(exitCode)); - mErrorNotification.update(); - mTimer.stop(); - connect(&mErrorNotification, SIGNAL(notificationClosed(CloseReason)), SLOT(idleTimeout())); - } -} - -void IdlenessWatcher::notificationAction(int num) -{ - switch (num) - { - case 0: // "Configure" - QProcess::startDetached("lxqt-config-screenlocker"); - } -} - -void IdlenessWatcher::serviceUnregistered(const QString& service) -{ - for (QMutableMapIterator iter(mInhibitors); iter.hasNext();) - { - if (iter.next().value() == service) - { - qDebug() << "Service unregistered:" << iter.value(); - mDBusWatcher.removeWatchedService(iter.value()); - iter.remove(); - } - } - - if (mInhibitors.isEmpty()) - restartTimer(); -} - -/* ---------- D-Bus methods ---------- */ -void IdlenessWatcher::Lock() -{ - // lockScreen(); -} - -uint IdlenessWatcher::GetSessionIdleTime() -{ - return getIdleTimeMs() / 1000; -} + connect(KIdleTime::instance(), + static_cast(&KIdleTime::timeoutReached), + this, + &IdlenessWatcher::timeoutReached); -uint IdlenessWatcher::GetActiveTime() -{ - if (!mIsLocked) - return 0; - return mLockTime.secsTo(QDateTime::currentDateTime()); -} + connect(&mPSettings, &LXQt::Settings::settingsChanged, + this, &IdlenessWatcher::onSettingsChanged); -bool IdlenessWatcher::GetActive() -{ - return mIsLocked; + setup(); } -bool IdlenessWatcher::SetActive(bool activate) +IdlenessWatcher::~IdlenessWatcher() { - //if (!activate) - return false; - //return lockScreen(); + KIdleTime::instance()->removeAllIdleTimeouts(); } -void IdlenessWatcher::SimulateUserActivity() +void IdlenessWatcher::setup() { - restartTimer(); -} - -uint IdlenessWatcher::Inhibit(const QString& applicationName, const QString& reasonForInhibit) -{ - mInhibitorCookie++; - QString service(this->message().service()); - qDebug() << "*** Inhibit by" << applicationName << ":" << reasonForInhibit << ". Service:" << service << "->" << mInhibitorCookie; - mDBusWatcher.addWatchedService(service); - qDebug() << mDBusWatcher.watchedServices(); - mInhibitors.insert(mInhibitorCookie, service); - mTimer.stop(); - return mInhibitorCookie; -} - -void IdlenessWatcher::UnInhibit(uint cookie) -{ - qDebug() << "*** Uninhibit" << cookie; - mDBusWatcher.removeWatchedService(mInhibitors.value(cookie)); - mInhibitors.remove(cookie); - - if (mInhibitors.isEmpty()) - restartTimer(); + int timeout = 1000 * mPSettings.getIdlenessTimeSecs(); + KIdleTime::instance()->addIdleTimeout(timeout); } -uint IdlenessWatcher::Throttle(const QString& applicationName, const QString& reasonForThrottle) +void IdlenessWatcher::timeoutReached(int identifier) { - Q_UNUSED(applicationName); - Q_UNUSED(reasonForThrottle); - return 0; + doAction(mPSettings.getIdlenessAction()); } -void IdlenessWatcher::UnThrottle(uint cookie) +void IdlenessWatcher::onSettingsChanged() { - Q_UNUSED(cookie); + KIdleTime::instance()->removeAllIdleTimeouts(); + setup(); } diff --git a/src/idlenesswatcher.h b/src/idlenesswatcher.h index d88b97e..d402e28 100644 --- a/src/idlenesswatcher.h +++ b/src/idlenesswatcher.h @@ -25,67 +25,24 @@ #ifndef IDLENESSWATCHER_H #define IDLENESSWATCHER_H -#include -#include -#include -#include -#include -#include -#include - -#include -#include - #include "../config/powermanagementsettings.h" #include "watcher.h" -class IdlenessWatcher : public Watcher, protected QDBusContext +class IdlenessWatcher : public Watcher { Q_OBJECT + public: explicit IdlenessWatcher(QObject* parent = 0); - -signals: - void ActiveChanged(bool in0); - -public slots: - void Lock(); - uint GetSessionIdleTime(); - uint GetActiveTime(); - bool GetActive(); - bool SetActive(bool activate); - void SimulateUserActivity(); - uint Inhibit(const QString& applicationName, const QString& reasonForInhibit); - void UnInhibit(uint cookie); - uint Throttle(const QString& applicationName, const QString& reasonForThrottle); - void UnThrottle(uint cookie); + virtual ~IdlenessWatcher(); private slots: - void idleTimeout(); - void screenUnlocked(int exitCode, QProcess::ExitStatus exitStatus); - void notificationAction(int num); - void serviceUnregistered(const QString& service); - void restartTimer(); + void setup(); + void timeoutReached(int identifier); + void onSettingsChanged(); private: - uint getIdleTimeMs(); - uint getMaxIdleTimeoutMs(); - - static xcb_screen_t* screenOfDisplay(xcb_connection_t* mConn, int screen); - PowerManagementSettings mPSettings; - QTimer mTimer; - QProcess mLockProcess; - LXQt::Notification mErrorNotification; - QString mLockCommand; - QDateTime mLockTime; - QMap mInhibitors; - QDBusServiceWatcher mDBusWatcher; - xcb_connection_t* mConn; - xcb_screen_t* mScreen; - uint mInhibitorCookie; - bool mIsLocked; - bool mTurnOffDisplay; }; #endif // IDLENESSWATCHER_H diff --git a/src/org.freedesktop.ScreenSaver.xml b/src/org.freedesktop.ScreenSaver.xml deleted file mode 100644 index 96ad48e..0000000 --- a/src/org.freedesktop.ScreenSaver.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/powermanagementd.cpp b/src/powermanagementd.cpp index c58d398..f0bb570 100644 --- a/src/powermanagementd.cpp +++ b/src/powermanagementd.cpp @@ -25,6 +25,7 @@ #include #include +#include #include "batteryhelper.h" #include "powermanagementd.h" diff --git a/src/translations/lxqt-powermanagement.ts b/src/translations/lxqt-powermanagement.ts deleted file mode 100644 index 5716619..0000000 --- a/src/translations/lxqt-powermanagement.ts +++ /dev/null @@ -1,312 +0,0 @@ - - - - - BatteryHelper - - - Empty - - - - - Discharging - - - - - Fully charged - - - - - Charging - - - - - Lithium ion - - - - - Lithium polymer - - - - - Lithium iron phosphate - - - - - Lead acid - - - - - Nickel cadmium - - - - - Nickel metal hydride - - - - - Unknown - - - - - Personal Digital Assistant's battery - - - - - Uninterruptible Power Supply's battery - - - - - Primary battery - - - - - Mouse battery - - - - - Keyboard battery - - - - - Keyboard and mouse's battery - - - - - Camera battery - - - - - Phone battery - - - - - Monitor battery - - - - - Unknown battery - - - - - BatteryInfoDialog - - - Dialog - - - - - Battery Info - - - - - BatteryInfoFrame - - - Power Management - - - - - Temperature: - - - - - Type: - - - - - State: - - - - - Energy Full Design: - - - - - Energy Full: - - - - - Energy Now: - - - - - Energy rate: - - - - - Technology: - - - - - Voltage: - - - - - Vendor: - - - - - BatteryWatcher - - - No battery! - - - - - LXQt could not find data about any battery - monitoring disabled - - - - - Power low! - - - - - Suspending in %1 seconds - - - - - Hibernating in %1 seconds - - - - - Shutting down in %1 seconds - - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - - - - - The X11 Screensaver extension is not usable - - - - - Configure... - - - - - ERROR: Screen unlocked - - - - - Locking program "%1" exited with error code %2 - - - - - Locking program "%1" crashed with error code %2 - - - - - PowerManagementd - - - Power Management - - - - - You are running LXQt Power Management for the first time. -You can configure it from settings... - - - - - Configure... - - - - - TrayIcon - - - Configure - - - - - - About - - - - - Disable icon - - - - - <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - - - - - LXQt Power Management info - - - - - The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> - - - - - Configure now - - - - diff --git a/src/translations/lxqt-powermanagement_el.ts b/src/translations/lxqt-powermanagement_el.ts deleted file mode 100644 index 97253c0..0000000 --- a/src/translations/lxqt-powermanagement_el.ts +++ /dev/null @@ -1,432 +0,0 @@ - - - - - Battery - - Charging - Φόρτιση - - - Discharging - Αποφόρτιση - - - Empty - Άδεια - - - Fully charged - Γεμάτη - - - Pending charge - Φορτίζεται - - - Pending discharge - Αποφορτίζεται - - - Unknown - Άγνωστο - - - - BatteryHelper - - - Empty - Άδεια - - - - Discharging - Αποφόρτιση - - - - Fully charged - Γεμάτη - - - - Charging - Φόρτιση - - - - Lithium ion - Ιόντων λιθίου - - - - Lithium polymer - Πολυμερούς λιθίου - - - - Lithium iron phosphate - Λίθιου Φωσφορικού άλατος σιδήρου - - - - Lead acid - Μολύβδου οξέος - - - - Nickel cadmium - Νικελίου καδμίου - - - - Nickel metal hydride - Υβριδική νικελίου μετάλλου - - - - Unknown - - - - - Personal Digital Assistant's battery - - - - - Uninterruptible Power Supply's battery - - - - - Primary battery - - - - - Mouse battery - - - - - Keyboard battery - - - - - Keyboard and mouse's battery - - - - - Camera battery - - - - - Phone battery - - - - - Monitor battery - - - - - Unknown battery - - - - - BatteryInfo - - Power Management - Διαχείριση ενέργειας - - - Battery info - Πληροφορίες της μπαταρίας - - - Energy Now: - Η τρέχουσα ενέργεια: - - - Updated: - Ενημερωμένη: - - - Technology: - Τεχνολογία: - - - Model: - Μοντέλο: - - - Energy rate: - Ρυθμός ενέργειας: - - - Voltage: - Τάση: - - - Energy Full, Design: - Πλήρης ενέργεια, σχεδιασμός: - - - Energy Full: - Πλήρης ενέργεια: - - - State: - Κατάσταση: - - - Lithium ion - Ιόντων λιθίου - - - Lithium polymer - Πολυμερούς λιθίου - - - Lithium iron phosphate - Λίθιου Φωσφορικού άλατος σιδήρου - - - Lead acid - Μολύβδου οξέος - - - Nickel cadmium - Νικελίου καδμίου - - - Nickel metal hydride - Υβριδική νικελίου μετάλλου - - - Unknown - Άγνωστη - - - - BatteryInfoDialog - - - Dialog - - - - - Battery Info - - - - - BatteryInfoFrame - - - Power Management - Διαχείριση ενέργειας - - - - Temperature: - - - - - Type: - - - - - State: - Κατάσταση: - - - - Energy Full Design: - - - - - Energy Full: - Πλήρης ενέργεια: - - - - Energy Now: - Η τρέχουσα ενέργεια: - - - - Energy rate: - Ρυθμός ενέργειας: - - - - Technology: - Τεχνολογία: - - - - Voltage: - Τάση: - - - - Vendor: - - - - - BatteryWatcher - - - No battery! - Καμιά μπαταρία! - - - - LXQt could not find data about any battery - monitoring disabled - Το LXQT δεν μπόρεσε να βρει δεδομένα για οποιαδήποτε μπαταρία - η εποπτεία απενεργοποιήθηκε - - - - Power low! - Η ενέργεια είναι χαμηλή! - - - - Suspending in %1 seconds - Αναστολή σε %1 δευτερόλεπτα - - - - Hibernating in %1 seconds - Νάρκωση σε %1 δευτερόλεπτα - - - - Shutting down in %1 seconds - Τερματισμός σε %1 δευτερόλεπτα - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - Η εκκίνηση του επόπτη αδράνειας του LXQt απέτυχε - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - Η διεπαφή του D-Bus org.freedesktop.ScreenSaver έχει καταχωρηθεί ήδη - - - - The X11 Screensaver extension is not usable - Η επέκταση της προστασίας οθόνης X11 δεν μπορεί να χρησιμοποιηθεί - - - - Configure... - Διαμόρφωση... - - - - ERROR: Screen unlocked - ΣΦΑΛΜΑ: Οθόνη ξεκλείδωτη - - - - Locking program "%1" exited with error code %2 - Το πρόγραμμα κλειδώματος «%1» τερματίστηκε με τον κωδικό σφάλματος %2 - - - - Locking program "%1" crashed with error code %2 - Το πρόγραμμα κλειδώματος «%1» κατέρρευσε με τον κωδικό σφάλματος %2 - - - - PowerManagementd - - - Power Management - Διαχείριση ενέργειας - - - - You are running LXQt Power Management for the first time. -You can configure it from settings... - Εκτελείτε την διαχείριση ενέργειας του LXQt για πρώτη φορά. -Μπορείτε να την διαμορφώσετε από τις ρυθμίσεις... - - - - - Configure... - Διαμόρφωση... - - - - TrayIcon - - - Configure - Διαμόρφωση - - - - - About - Σχετικά - - - - Disable icon - Απενεργοποίηση του εικονιδίου - - - - <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - - - - - LXQt Power Management info - - - - - The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> - - - - - Configure now - - - - discharging - αποφορτίζεται - - - charging - φορτίζεται - - - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>Διαχείριση ενέργειας του LXQt</b><br/> - Διαχείριση της ενέργειας για το γραφικό περιβάλλον LXQt</p><p> Συγγραφείς:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - και άλλοι από τα έργα Razor και LXQt</p><p> Πνευματικά δικαιώματα &copy; 2012-2014</p> - - - diff --git a/src/translations/lxqt-powermanagement_hu.ts b/src/translations/lxqt-powermanagement_hu.ts deleted file mode 100644 index d487fac..0000000 --- a/src/translations/lxqt-powermanagement_hu.ts +++ /dev/null @@ -1,431 +0,0 @@ - - - - - Battery - - Charging - Töltés - - - Discharging - Kisütés - - - Empty - Üres - - - Fully charged - Teletöltve - - - Pending charge - Tölthetőség - - - Pending discharge - Kisüthetőség - - - Unknown - Ismeretlen - - - - BatteryHelper - - - Empty - Üres - - - - Discharging - Kisütés - - - - Fully charged - Teletöltve - - - - Charging - Töltés - - - - Lithium ion - Lítium ion - - - - Lithium polymer - Lítium polimer - - - - Lithium iron phosphate - Lítium vasfoszfát - - - - Lead acid - Savas ólom - - - - Nickel cadmium - Nikkel kadmium - - - - Nickel metal hydride - Nikkel fémhidrid - - - - Unknown - Ismeretlen - - - - Personal Digital Assistant's battery - - - - - Uninterruptible Power Supply's battery - - - - - Primary battery - - - - - Mouse battery - - - - - Keyboard battery - - - - - Keyboard and mouse's battery - - - - - Camera battery - - - - - Phone battery - - - - - Monitor battery - - - - - Unknown battery - - - - - BatteryInfo - - Power Management - Energiakezelés - - - Battery info - Akkumulátor információ - - - Energy Now: - Állapot: - - - Updated: - Frissítve: - - - Technology: - Technológia: - - - Model: - Modell: - - - Energy rate: - Energiaállapot: - - - Voltage: - Feszültség: - - - Energy Full, Design: - Névleges kapacitás: - - - Energy Full: - Teljes kapacitás: - - - State: - Állapot: - - - Lithium ion - Lítium ion - - - Lithium polymer - Lítium polimer - - - Lithium iron phosphate - Lítium vasfoszfát - - - Lead acid - Savas ólom - - - Nickel cadmium - Nikkel kadmium - - - Nickel metal hydride - Nikkel fémhidrid - - - Unknown - Ismeretlen - - - - BatteryInfoDialog - - - Dialog - - - - - Battery Info - - - - - BatteryInfoFrame - - - Power Management - Energiakezelés - - - - Temperature: - - - - - Type: - - - - - State: - Állapot: - - - - Energy Full Design: - - - - - Energy Full: - Teljes kapacitás: - - - - Energy Now: - Állapot: - - - - Energy rate: - Energiaállapot: - - - - Technology: - Technológia: - - - - Voltage: - Feszültség: - - - - Vendor: - - - - - BatteryWatcher - - - No battery! - Nincs akku! - - - - LXQt could not find data about any battery - monitoring disabled - Az LXQt nem ismert fel akkut - figyelés tiltva - - - - Power low! - Alacsony feszültség! - - - - Suspending in %1 seconds - %1 másodperc múlva készülség - - - - Hibernating in %1 seconds - %1 másodperc múlva mélykészenlét - - - - Shutting down in %1 seconds - %1 másodperc múlva kikapcsolás - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - Az LXQt tétlenség figyelő indítása sikertelen - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - A D-Bus interface org.freedesktop.ScreenSaver imár regisztrálva van. - - - - The X11 Screensaver extension is not usable - Az X11 képernyővédő bővítmény használhatatlan - - - - Configure... - Beállítás... - - - - ERROR: Screen unlocked - HIBA: A képernyő nem zárolt - - - - Locking program "%1" exited with error code %2 - A"%1" program %2 hibakóddal kilépett - - - - Locking program "%1" crashed with error code %2 - A"%1" program %2 hibakóddal összeomlott - - - - PowerManagementd - - - Power Management - Energiakezelés - - - - You are running LXQt Power Management for the first time. -You can configure it from settings... - Az LXQt energiakezelő első alkalommal fut. -A beállításokban konfigurálható... - - - - Configure... - Beállítás... - - - - TrayIcon - - - Configure - Beállítás - - - - - About - Rólunk - - - - Disable icon - Ikon tiltása - - - - <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - - - - - LXQt Power Management info - - - - - The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> - - - - - Configure now - - - - discharging - kisütés - - - charging - töltés - - - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>LXQt energiakezelő</b><br/> - Energiakezelő az LXQt asztal részére</p><p> Szerzők:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - és még többen a Razor és LXQt fejlesztőiből.</p><p> Copyright &copy; 2012-2014</p> - - - diff --git a/src/translations/lxqt-powermanagement_ja.ts b/src/translations/lxqt-powermanagement_ja.ts deleted file mode 100644 index d89dfdb..0000000 --- a/src/translations/lxqt-powermanagement_ja.ts +++ /dev/null @@ -1,430 +0,0 @@ - - - - - Battery - - Charging - 充電中 - - - Discharging - 放電中 - - - Empty - 空 - - - Fully charged - 満充電 - - - Pending charge - 充電中断中 - - - Pending discharge - 放電中断中 - - - Unknown - 不明 - - - - BatteryHelper - - - Empty - 空 - - - - Discharging - 放電中 - - - - Fully charged - 満充電 - - - - Charging - 充電中 - - - - Lithium ion - リチウムイオン - - - - Lithium polymer - リチウムポリマー - - - - Lithium iron phosphate - リン酸鉄リチウム - - - - Lead acid - 鉛蓄電池 - - - - Nickel cadmium - ニッカド - - - - Nickel metal hydride - ニッケル水素 - - - - Unknown - 不明 - - - - Personal Digital Assistant's battery - - - - - Uninterruptible Power Supply's battery - - - - - Primary battery - - - - - Mouse battery - - - - - Keyboard battery - - - - - Keyboard and mouse's battery - - - - - Camera battery - - - - - Phone battery - - - - - Monitor battery - - - - - Unknown battery - - - - - BatteryInfo - - Power Management - 電源管理 - - - Battery info - バッテリー情報 - - - Energy Now: - 現在の容量: - - - Updated: - 更新: - - - Technology: - 技術: - - - Model: - 型式: - - - Energy rate: - エネルギー率: - - - Voltage: - 電圧: - - - Energy Full, Design: - 満エネルギー、デザイン: - - - Energy Full: - 満エネルギー: - - - State: - 状態: - - - Lithium ion - リチウムイオン - - - Lithium polymer - リチウムポリマー - - - Lithium iron phosphate - リン酸鉄リチウム - - - Lead acid - 鉛蓄電池 - - - Nickel cadmium - ニッカド - - - Nickel metal hydride - ニッケル水素 - - - Unknown - 不明 - - - - BatteryInfoDialog - - - Dialog - - - - - Battery Info - - - - - BatteryInfoFrame - - - Power Management - 電源管理 - - - - Temperature: - - - - - Type: - - - - - State: - 状態: - - - - Energy Full Design: - - - - - Energy Full: - 満エネルギー: - - - - Energy Now: - 現在の容量: - - - - Energy rate: - エネルギー率: - - - - Technology: - 技術: - - - - Voltage: - 電圧: - - - - Vendor: - - - - - BatteryWatcher - - - No battery! - バッテリーがありません! - - - - LXQt could not find data about any battery - monitoring disabled - バッテリーのデーターを見つけられませんので、監視機能は無効です - - - - Power low! - 電源が少なくなっています! - - - - Suspending in %1 seconds - %1秒でサスペンドに入ります - - - - Hibernating in %1 seconds - %1秒でハイバネートに入ります - - - - Shutting down in %1 seconds - %1秒でシャットダウンします - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - LXQtのアイドル状態監視は始動に失敗しました - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - D-Busインターフェース org.freedesktop.ScreenSaver が既に登録されています - - - - The X11 Screensaver extension is not usable - X11スクリーンセーバー拡張を使えません - - - - Configure... - 設定する - - - - ERROR: Screen unlocked - エラー: スクリーンのロックが解除されました - - - - Locking program "%1" exited with error code %2 - ロック用プログラム "%1" は、エラーコード %2 により終了しました - - - - Locking program "%1" crashed with error code %2 - ロック用プログラム "%1" は、エラーコード %2 によりクラッシュしました - - - - PowerManagementd - - - Power Management - 電源管理 - - - - You are running LXQt Power Management for the first time. -You can configure it from settings... - LXQt電源管理は初めて実行されましたので、設定を行ってください - - - - Configure... - 設定する - - - - TrayIcon - - - Configure - 設定 - - - - - About - 情報 - - - - Disable icon - アイコンを無効 - - - - <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - - - - - LXQt Power Management info - - - - - The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> - - - - - Configure now - - - - discharging - 放電中 - - - charging - 充電中 - - - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>LXQt Powermanagement</b><br/> - LXQtデスクトップ環境の電源管理</p><p> 作者:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - その他 Razor-qtおよびLXQtプロジェクトのメンバー</p><p> Copyright &copy; 2012-2014</p> - - - diff --git a/src/translations/lxqt-powermanagement_pl_PL.ts b/src/translations/lxqt-powermanagement_pl_PL.ts deleted file mode 100644 index 1f0d673..0000000 --- a/src/translations/lxqt-powermanagement_pl_PL.ts +++ /dev/null @@ -1,367 +0,0 @@ - - - - - Battery - - Charging - Ładowanie - - - Discharging - Rozładowywanie - - - Empty - Pusta - - - Fully charged - W pełni naładowana - - - Unknown - Nieznana - - - - BatteryHelper - - - Empty - Pusta - - - - Discharging - Rozładowywanie - - - - Fully charged - W pełni naładowana - - - - Charging - Ładowanie - - - - Lithium ion - - - - - Lithium polymer - - - - - Lithium iron phosphate - - - - - Lead acid - - - - - Nickel cadmium - - - - - Nickel metal hydride - - - - - Unknown - Nieznana - - - - Personal Digital Assistant's battery - - - - - Uninterruptible Power Supply's battery - - - - - Primary battery - - - - - Mouse battery - - - - - Keyboard battery - - - - - Keyboard and mouse's battery - - - - - Camera battery - - - - - Phone battery - - - - - Monitor battery - - - - - Unknown battery - - - - - BatteryInfo - - Battery info - Informacje o baterii - - - Technology: - Technologia: - - - Model: - Model: - - - Unknown - Nieznana - - - - BatteryInfoDialog - - - Dialog - - - - - Battery Info - - - - - BatteryInfoFrame - - - Power Management - Zarządzanie zasilaniem - - - - Temperature: - - - - - Type: - - - - - State: - - - - - Energy Full Design: - - - - - Energy Full: - - - - - Energy Now: - - - - - Energy rate: - - - - - Technology: - Technologia: - - - - Voltage: - - - - - Vendor: - - - - - BatteryWatcher - - - No battery! - Brak baterii! - - - - LXQt could not find data about any battery - monitoring disabled - LXQt nie znalazł danych o żadnej baterii - monitorowanie wyłączone - - - - Power low! - Niski poziom zasilania! - - - - Suspending in %1 seconds - Wstrzymanie nastąpi w ciągu %1 sekund - - - - Hibernating in %1 seconds - Hibernacja nastąpi w ciągu %1 sekund - - - - Shutting down in %1 seconds - Wyłączenie systemu nastąpi w ciągu %1 sekund - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - - - - - The X11 Screensaver extension is not usable - - - - - Configure... - Konfiguruj... - - - - ERROR: Screen unlocked - BŁĄD: Ekran odblokowany - - - - Locking program "%1" exited with error code %2 - - - - - Locking program "%1" crashed with error code %2 - - - - - PowerManagementd - - - Power Management - Zarządzanie zasilaniem - - - - You are running LXQt Power Management for the first time. -You can configure it from settings... - Uruchamiasz zarządzanie energią LXQt po raz pierwszy. -Możesz skonfiguroweć jego ustawienia... - - - - Configure... - Konfiguruj... - - - - TrayIcon - - - Configure - Konfiguruj - - - - - About - Info - - - - Disable icon - Wyłącz ikonę - - - - <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - - - - - LXQt Power Management info - - - - - The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> - - - - - Configure now - - - - discharging - rozładowywanie - - - charging - ładowanie - - - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>LXQt Zarządzanie Energią</b><br/> - Zarządzanie energią dla środowiska LXQt</p><p> Autorzy:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - i inni z projektów Razor oraz LXQt</p><p> Copyright &copy; 2012-2014</p> - - - diff --git a/src/translations/lxqt-powermanagement_pt.ts b/src/translations/lxqt-powermanagement_pt.ts deleted file mode 100644 index b9d3c87..0000000 --- a/src/translations/lxqt-powermanagement_pt.ts +++ /dev/null @@ -1,431 +0,0 @@ - - - - - Battery - - Charging - A carregar - - - Discharging - A descarregar - - - Empty - Vazia - - - Fully charged - Totalmente carregada - - - Pending charge - Por carregar - - - Pending discharge - Por descarregar - - - Unknown - Desconhecido - - - - BatteryHelper - - - Empty - Vazia - - - - Discharging - A descarregar - - - - Fully charged - Totalmente carregada - - - - Charging - A carregar - - - - Lithium ion - Ião de lítio - - - - Lithium polymer - Polímero de lítio - - - - Lithium iron phosphate - Fosfato de Ferro-Lítio - - - - Lead acid - Ácido de chumbo - - - - Nickel cadmium - Níquel-Cádmio - - - - Nickel metal hydride - Níquel-Hidreto Metálico - - - - Unknown - Desconhecido - - - - Personal Digital Assistant's battery - - - - - Uninterruptible Power Supply's battery - - - - - Primary battery - - - - - Mouse battery - - - - - Keyboard battery - - - - - Keyboard and mouse's battery - - - - - Camera battery - - - - - Phone battery - - - - - Monitor battery - - - - - Unknown battery - - - - - BatteryInfo - - Power Management - Gestão de energia - - - Battery info - Informações da bateria - - - Energy Now: - Energia atual: - - - Updated: - Atualização: - - - Technology: - Tecnologia: - - - Model: - Modelo: - - - Energy rate: - Taxa de energia: - - - Voltage: - Tensão: - - - Energy Full, Design: - Energia máxima teórica: - - - Energy Full: - Energia máxima: - - - State: - Estado: - - - Lithium ion - Ião de lítio - - - Lithium polymer - Polímero de lítio - - - Lithium iron phosphate - Fosfato de Ferro-Lítio - - - Lead acid - Ácido de chumbo - - - Nickel cadmium - Níquel-Cádmio - - - Nickel metal hydride - Níquel-Hidreto Metálico - - - Unknown - Desconhecido - - - - BatteryInfoDialog - - - Dialog - - - - - Battery Info - - - - - BatteryInfoFrame - - - Power Management - Gestão de energia - - - - Temperature: - - - - - Type: - - - - - State: - Estado: - - - - Energy Full Design: - - - - - Energy Full: - Energia máxima: - - - - Energy Now: - Energia atual: - - - - Energy rate: - Taxa de energia: - - - - Technology: - Tecnologia: - - - - Voltage: - Tensão: - - - - Vendor: - - - - - BatteryWatcher - - - No battery! - Nenhuma bateria! - - - - LXQt could not find data about any battery - monitoring disabled - O LXQt não consegui encontrar qualquer bateria e a monitorização foi desativada - - - - Power low! - Energia baixa! - - - - Suspending in %1 seconds - Suspensão dentro de %1 segundos - - - - Hibernating in %1 seconds - Hibernação dentro de %1 segundos - - - - Shutting down in %1 seconds - A desligar dentro de %1 segundos - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - O monitorizador de inatividade não foi iniciado - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - A interface D-Bus org.freedesktop.ScreenSaver já está registada - - - - The X11 Screensaver extension is not usable - A extensão X 11 Screensaver não pode ser utilizada - - - - Configure... - Configurar... - - - - ERROR: Screen unlocked - Erro: ecrã não bloqueado - - - - Locking program "%1" exited with error code %2 - O bloqueio do programa "%1" terminou com o erro "%2" - - - - Locking program "%1" crashed with error code %2 - O bloqueio do programa "%1" crashou com o erro "%2" - - - - PowerManagementd - - - Power Management - Gestão de energia - - - - You are running LXQt Power Management for the first time. -You can configure it from settings... - Está a executar a gestão de energia do LXQt pela primeira vez. -Pode configurar as opções nas definições... - - - - Configure... - Configurar... - - - - TrayIcon - - - Configure - Configurar - - - - - About - Sobre - - - - Disable icon - Desativar ícone - - - - <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - - - - - LXQt Power Management info - - - - - The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> - - - - - Configure now - - - - discharging - a descarregar - - - charging - a carregar - - - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>Gestor de energia do LXQt</b><br/>Gestão de energia para o ambiente de trabalho LXQt</p><p> Autores:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - e outros colaboradores dos projetos Razor e LXQt</p><p> Direitos de autor &copy; 2012-2015</p> - - - diff --git a/src/translations/lxqt-powermanagement_ru.ts b/src/translations/lxqt-powermanagement_ru.ts deleted file mode 100644 index 8c469c9..0000000 --- a/src/translations/lxqt-powermanagement_ru.ts +++ /dev/null @@ -1,427 +0,0 @@ - - - - - Battery - - Charging - Заряжается - - - Discharging - Разряжается - - - Empty - Пустая - - - Fully charged - Полностью заряжена - - - Pending charge - Ожидает заряда - - - Pending discharge - Ожидает разряда - - - Unknown - Неизвестно - - - - BatteryHelper - - - Empty - Пустая - - - - Discharging - Разряжается - - - - Fully charged - Полностью заряжена - - - - Charging - Заряжается - - - - Lithium ion - Литий-ионная - - - - Lithium polymer - Литий-полимерная - - - - Lithium iron phosphate - Литий-железо-фосфатная - - - - Lead acid - Свинцово-кислотная - - - - Nickel cadmium - Никель-кадмиевая - - - - Nickel metal hydride - Никель-металл-гидридная - - - - Unknown - Неизвестно - - - - Personal Digital Assistant's battery - - - - - Uninterruptible Power Supply's battery - - - - - Primary battery - - - - - Mouse battery - - - - - Keyboard battery - - - - - Keyboard and mouse's battery - - - - - Camera battery - - - - - Phone battery - - - - - Monitor battery - - - - - Unknown battery - - - - - BatteryInfo - - Power Management - Управление энергопотреблением - - - Battery info - Информация о батарее - - - Energy Now: - Заряд сейчас: - - - Updated: - Обновлено: - - - Technology: - Технология: - - - Model: - Модель: - - - Energy rate: - Мощность тока: - - - Voltage: - Напряжение: - - - Energy Full, Design: - Максимальный заряд: - - - State: - Состояние: - - - Lithium ion - Литий-ионная - - - Lithium polymer - Литий-полимерная - - - Lithium iron phosphate - Литий-железо-фосфатная - - - Lead acid - Свинцово-кислотная - - - Nickel cadmium - Никель-кадмиевая - - - Nickel metal hydride - Никель-металл-гидридная - - - Unknown - Неизвестно - - - - BatteryInfoDialog - - - Dialog - - - - - Battery Info - - - - - BatteryInfoFrame - - - Power Management - Управление энергопотреблением - - - - Temperature: - - - - - Type: - - - - - State: - Состояние: - - - - Energy Full Design: - - - - - Energy Full: - - - - - Energy Now: - Заряд сейчас: - - - - Energy rate: - Мощность тока: - - - - Technology: - Технология: - - - - Voltage: - Напряжение: - - - - Vendor: - - - - - BatteryWatcher - - - No battery! - Нет батареи! - - - - LXQt could not find data about any battery - monitoring disabled - LXQt не смог найти информацию о какой-либо батарее - наблюдение отменено - - - - Power low! - Низкий заряд! - - - - Suspending in %1 seconds - Ждущий режим через %1 секунд - - - - Hibernating in %1 seconds - Спящий режим через %1 секунд - - - - Shutting down in %1 seconds - Выключение компьютера через %1 секунд - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - Не удалось запустить наблюдение за простоем LXQt - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - Интерфейс D-Bus org.freedesktop.ScreenSaver уже зарегистрирован - - - - The X11 Screensaver extension is not usable - Расширение X11 Скринсейвер непригодно для использования - - - - Configure... - Настроить… - - - - ERROR: Screen unlocked - ОШИБКА: экран разблокирован - - - - Locking program "%1" exited with error code %2 - Программа блокировки экрана "%1" вышла с кодом ошибки %2 - - - - Locking program "%1" crashed with error code %2 - Программа блокировки экрана "%1" упала с кодом ошибки %2 - - - - PowerManagementd - - - Power Management - Управление энергопотреблением - - - - You are running LXQt Power Management for the first time. -You can configure it from settings... - Вы запускаете управление энергопотреблением LXQt впервые. -Вы можете сконфигурировать его в настройках… - - - - Configure... - Настроить… - - - - TrayIcon - - discharging - разряжается - - - charging - заряжается - - - - - About - О программе - - - - Configure - Настроить - - - - Disable icon - Не показывать значок - - - - <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - - - - - LXQt Power Management info - - - - - The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> - - - - - Configure now - - - - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>Управление энергопотреблением LXQt</b><br/> - Управление энергопотреблением для окружения рабочего стола LXQt</p><p> Авторы:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - и другие из проектов Razor и LXQt</p><p> Copyright &copy; 2012-2014</p> - - - diff --git a/src/translations/lxqt-powermanagement_ru_RU.ts b/src/translations/lxqt-powermanagement_ru_RU.ts deleted file mode 100644 index 2ea24ce..0000000 --- a/src/translations/lxqt-powermanagement_ru_RU.ts +++ /dev/null @@ -1,427 +0,0 @@ - - - - - Battery - - Charging - Заряжается - - - Discharging - Разряжается - - - Empty - Пустая - - - Fully charged - Полностью заряжена - - - Pending charge - Ожидает заряда - - - Pending discharge - Ожидает разряда - - - Unknown - Неизвестно - - - - BatteryHelper - - - Empty - Пустая - - - - Discharging - Разряжается - - - - Fully charged - Полностью заряжена - - - - Charging - Заряжается - - - - Lithium ion - Литий-ионная - - - - Lithium polymer - Литий-полимерная - - - - Lithium iron phosphate - Литий-железо-фосфатная - - - - Lead acid - Свинцово-кислотная - - - - Nickel cadmium - Никель-кадмиевая - - - - Nickel metal hydride - Никель-металл-гидридная - - - - Unknown - Неизвестно - - - - Personal Digital Assistant's battery - - - - - Uninterruptible Power Supply's battery - - - - - Primary battery - - - - - Mouse battery - - - - - Keyboard battery - - - - - Keyboard and mouse's battery - - - - - Camera battery - - - - - Phone battery - - - - - Monitor battery - - - - - Unknown battery - - - - - BatteryInfo - - Power Management - Управление энергопотреблением - - - Battery info - Информация о батарее - - - Energy Now: - Заряд сейчас: - - - Updated: - Обновлено: - - - Technology: - Технология: - - - Model: - Модель: - - - Energy rate: - Мощность тока: - - - Voltage: - Напряжение: - - - Energy Full, Design: - Максимальный заряд: - - - State: - Состояние: - - - Lithium ion - Литий-ионная - - - Lithium polymer - Литий-полимерная - - - Lithium iron phosphate - Литий-железо-фосфатная - - - Lead acid - Свинцово-кислотная - - - Nickel cadmium - Никель-кадмиевая - - - Nickel metal hydride - Никель-металл-гидридная - - - Unknown - Неизвестно - - - - BatteryInfoDialog - - - Dialog - - - - - Battery Info - - - - - BatteryInfoFrame - - - Power Management - Управление энергопотреблением - - - - Temperature: - - - - - Type: - - - - - State: - Состояние: - - - - Energy Full Design: - - - - - Energy Full: - - - - - Energy Now: - Заряд сейчас: - - - - Energy rate: - Мощность тока: - - - - Technology: - Технология: - - - - Voltage: - Напряжение: - - - - Vendor: - - - - - BatteryWatcher - - - No battery! - Нет батареи! - - - - LXQt could not find data about any battery - monitoring disabled - LXQt не смог найти информацию о какой-либо батарее - наблюдение отменено - - - - Power low! - Низкий заряд! - - - - Suspending in %1 seconds - Ждущий режим через %1 секунд - - - - Hibernating in %1 seconds - Спящий режим через %1 секунд - - - - Shutting down in %1 seconds - Выключение компьютера через %1 секунд - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - Не удалось запустить наблюдение за простоем LXQt - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - Интерфейс D-Bus org.freedesktop.ScreenSaver уже зарегистрирован - - - - The X11 Screensaver extension is not usable - Расширение X11 Скринсейвер непригодно для использования - - - - Configure... - Настроить… - - - - ERROR: Screen unlocked - ОШИБКА: экран разблокирован - - - - Locking program "%1" exited with error code %2 - Программа блокировки экрана "%1" вышла с кодом ошибки %2 - - - - Locking program "%1" crashed with error code %2 - Программа блокировки экрана "%1" упала с кодом ошибки %2 - - - - PowerManagementd - - - Power Management - Управление энергопотреблением - - - - You are running LXQt Power Management for the first time. -You can configure it from settings... - Вы запускаете управление энергопотреблением LXQt впервые. -Вы можете сконфигурировать его в настройках… - - - - Configure... - Настроить… - - - - TrayIcon - - discharging - разряжается - - - charging - заряжается - - - - - About - О программе - - - - Configure - Настроить - - - - Disable icon - Не показывать значок - - - - <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - - - - - LXQt Power Management info - - - - - The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> - - - - - Configure now - - - - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>Управление энергопотреблением LXQt</b><br/> - Управление энергопотреблением для окружения рабочего стола LXQt</p><p> Авторы:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - и другие из проектов Razor и LXQt</p><p> Copyright &copy; 2012-2014</p> - - - diff --git a/src/watcher.cpp b/src/watcher.cpp index cf9b632..1fd5cd7 100644 --- a/src/watcher.cpp +++ b/src/watcher.cpp @@ -31,7 +31,6 @@ Watcher::Watcher(QObject *parent) : QObject(parent), mScreenSaver(this) { - connect(&mScreenSaver, SIGNAL(done()), &mLoop, SLOT(quit())); } Watcher::~Watcher() @@ -44,7 +43,6 @@ void Watcher::doAction(int action) if (action == -2) { mScreenSaver.lockScreen(); - mLoop.exec(); } else if (action >= 0) mPower.doAction((LXQt::Power::Action) action); diff --git a/src/watcher.h b/src/watcher.h index 73a6226..0bcdfe3 100644 --- a/src/watcher.h +++ b/src/watcher.h @@ -31,7 +31,6 @@ signals: private: LXQt::Power mPower; LXQt::ScreenSaver mScreenSaver; - QEventLoop mLoop; }; #endif // WATCHER_H diff --git a/src/x11helper.cpp b/src/x11helper.cpp deleted file mode 100644 index ea85023..0000000 --- a/src/x11helper.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright (C) 2012 Alec Moskvin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include "x11helper.h" - -#include -#include - -Display* X11Helper::display() -{ - QPlatformNativeInterface *native = qApp->platformNativeInterface(); - void* display = native->nativeResourceForWindow("display", 0); - return reinterpret_cast(display); -} - -xcb_connection_t* X11Helper::connection() -{ - QPlatformNativeInterface *native = qApp->platformNativeInterface(); - void* connection = native->nativeResourceForWindow("connection", 0); - return reinterpret_cast(connection); -} diff --git a/src/x11helper.h b/src/x11helper.h deleted file mode 100644 index e649fcb..0000000 --- a/src/x11helper.h +++ /dev/null @@ -1,54 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright (C) 2013 Alec Moskvin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef X11HELPER_H -#define X11HELPER_H - -#include - -// Avoid polluting everything with X11/Xlib.h: -typedef struct _XDisplay Display; - -/** - * @brief The X11Helper class is class to get the X11 Display or XCB connection - * - * It's intended to be used as a wrapper/replacement for QX11Info, which is removed in Qt5. - */ -class X11Helper -{ -public: - /** - * @brief display Returns the X11 display - * @return - */ - static Display* display(); - - /** - * @brief connection Returns the XCB connection - * @return - */ - static xcb_connection_t* connection(); -}; - -#endif // X11HELPER_H