Request 818 - SailfishOS Open Build Service

Overview

Request 818 (accepted)

Update to Plasma 5.1.90

Created by sebas over 9 years ago
In state accepted

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Submit powerdevil

Submit package home:sebas:bra...el:frameworks / powerdevil to package home:plfiorini...el:frameworks / powerdevil

[-] [+]	Changed	powerdevil.spec
@@ -4,13 +4,12 @@ # Name: powerdevil -VCS: git@github.com:maui-packages/powerdevil#da88e1ec29627fdad5cf11803d7d2b28d6d2eca8 # >> macros # << macros Summary: Manages the power consumption settings of a Plasma Shell -Version: 5.1.0 +Version: 5.1.90 Release: 1 Group: System/Base License: GPLv2+
[-] [+]	Deleted	powerdevil-5.1.0.tar.xz/daemon/backends/upower/dbus/com.ubuntu.Upstart.xml ^
@@ -1,8 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" -"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> -<node name="/com/ubuntu/Upstart"> - <interface name="com.ubuntu.Upstart0_6"> - <property name="version" type="s" access="read"/> - </interface> -</node> -
[-] [+]	Added	powerdevil-5.1.90.tar.xz/.reviewboardrc ^
@@ -0,0 +1,5 @@ +REVIEWBOARD_URL = "https://git.reviewboard.kde.org" +REPOSITORY = 'git://anongit.kde.org/powerdevil' +TARGET_GROUPS = 'solid' + +
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/CMakeLists.txt ^
@@ -1,5 +1,5 @@ project(PowerDevil) -set(PROJECT_VERSION "5.1.0") +set(PROJECT_VERSION "5.1.90") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) @@ -16,8 +16,8 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets DBus X11Extras) find_package(KF5 REQUIRED COMPONENTS Auth IdleTime Config Solid I18n GlobalAccel KIO NotifyConfig KDELibs4Support) -find_package(LibKWorkspace CONFIG) -find_package(ScreenSaverDBusInterface CONFIG) +find_package(LibKWorkspace CONFIG REQUIRED) +find_package(ScreenSaverDBusInterface CONFIG REQUIRED) find_package(UDev) #upower/udev backend
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/BackendConfig.cmake ^
@@ -9,6 +9,7 @@ ${X11_Xrandr_INCLUDE_PATH}) set(powerdevilupowerbackend_SRCS + ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp backends/upower/upowersuspendjob.cpp backends/upower/login1suspendjob.cpp backends/upower/powerdevilupowerbackend.cpp @@ -35,14 +36,10 @@ ${CMAKE_CURRENT_SOURCE_DIR}/backends/upower/dbus/org.freedesktop.UPower.KbdBacklight.xml upower_kbdbacklight_interface) - qt5_add_dbus_interface(powerdevilupowerbackend_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/backends/upower/dbus/com.ubuntu.Upstart.xml - upstart_interface) - - set(powerdevilupowerbackend_LIBS ${X11_LIBRARIES} Qt5::Widgets ${X11_Xrandr_LIB} ${UDEV_LIBS} ${XCB_XCB_LIBRARY} + set(powerdevilupowerbackend_LIBS ${X11_LIBRARIES} Qt5::Widgets KF5::Auth ${X11_Xrandr_LIB} ${UDEV_LIBS} ${XCB_XCB_LIBRARY} ${XCB_RANDR_LIBRARY}) ## backlight helper executable - add_executable(backlighthelper backends/upower/backlighthelper.cpp ${backlighthelper_mocs}) + add_executable(backlighthelper backends/upower/backlighthelper.cpp ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ${backlighthelper_mocs}) target_link_libraries(backlighthelper Qt5::Core KF5::Auth KF5::I18n) install(TARGETS backlighthelper DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) kauth_install_helper_files(backlighthelper org.kde.powerdevil.backlighthelper root) @@ -54,6 +51,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/backends/hal) set(powerdevilhalbackend_SRCS + ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp backends/hal/halsuspendjob.cpp backends/hal/powerdevilhalbackend.cpp )
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/CMakeLists.txt ^
@@ -12,6 +12,7 @@ # Add bundled actions set(powerdevil_bundled_actions_SRCS + powerdevil_debug.cpp actions/bundled/suspendsession.cpp actions/bundled/brightnesscontrol.cpp actions/bundled/keyboardbrightnesscontrol.cpp @@ -22,6 +23,7 @@ # target no.1 - powerdevil core library set(powerdevilcore_SRCS + powerdevil_debug.cpp powerdevilaction.cpp powerdevilactionpool.cpp powerdevilbackendinterface.cpp @@ -54,15 +56,22 @@ # not exported, so just make the deps public target_link_libraries(powerdevilcore PUBLIC - KF5::KDELibs4Support + KF5::ConfigCore + KF5::ConfigGui + KF5::I18n KF5::Solid KF5::IdleTime KF5::GlobalAccel + KF5::Service + KF5::WidgetsAddons + KF5::Notifications + KF5::XmlGui PW::KWorkspace ) # target no.2 - powerdevil kded module set(kded_powerdevil_SRCS + powerdevil_debug.cpp kdedpowerdevil.cpp powerdevilbackendloader.cpp powerdevilfdoconnector.cpp @@ -85,7 +94,9 @@ target_link_libraries(kded_powerdevil ${POWERDEVIL_BACKEND_LIBS} - KF5::KDELibs4Support + KF5::ConfigCore + KF5::CoreAddons + KF5::I18n KF5::DBusAddons powerdevilcore )
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/CMakeLists.txt ^
@@ -5,7 +5,10 @@ target_link_libraries(powerdevil${_name}action_config powerdevilui Qt5::Widgets - KF5::KDELibs4Support + KF5::CoreAddons + KF5::I18n + KF5::ConfigGui + KF5::XmlGui ${ARGN}) install(TARGETS powerdevil${_name}action_config DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES powerdevil${_name}action.desktop DESTINATION ${SERVICES_INSTALL_DIR}) @@ -15,7 +18,7 @@ add_powerdevil_bundled_action(keyboardbrightnesscontrol) add_powerdevil_bundled_action(dimdisplay) add_powerdevil_bundled_action(runscript KF5::KIOCore KF5::KIOWidgets) -add_powerdevil_bundled_action(suspendsession KF5::KIOCore KF5::KIOWidgets KF5::Solid) +add_powerdevil_bundled_action(suspendsession KF5::KIOCore KF5::KIOWidgets KF5::Solid KF5::KDELibs4Support) set(actionconfig_SRCS handlebuttoneventsconfig.cpp) @@ -27,6 +30,11 @@ target_link_libraries(powerdevilhandlebuttoneventsaction_config powerdevilui Qt5::Widgets + KF5::CoreAddons + KF5::I18n + KF5::ConfigGui + KF5::Solid + KF5::XmlGui KF5::KDELibs4Support ) install(TARGETS powerdevilhandlebuttoneventsaction_config DESTINATION ${PLUGIN_INSTALL_DIR})
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/brightnesscontrol.cpp ^
@@ -25,14 +25,14 @@ #include <powerdevilbackendinterface.h> #include <powerdevilcore.h> +#include <powerdevil_debug.h> #include <QDesktopWidget> +#include <QAction> +#include <QDebug> -#include <KApplication> -#include <KAction> #include <KActionCollection> #include <KConfigGroup> -#include <KDebug> #include <KLocalizedString> #include <KGlobalAccel> namespace PowerDevil { @@ -40,7 +40,6 @@ BrightnessControl::BrightnessControl(QObject* parent) : Action(parent) - , m_brightnessOSD(0) { // DBus new BrightnessControlAdaptor(this); @@ -91,7 +90,7 @@ (m_currentProfile == "LowBattery" && (m_lastProfile == "AC" \|\| m_lastProfile == "Battery"))) && m_defaultValue > brightness()) { // We don't want to change anything here - kDebug() << "Not changing brightness, the current one is lower and the profile is more conservative"; + qCDebug(POWERDEVIL) << "Not changing brightness, the current one is lower and the profile is more conservative"; } else if (m_defaultValue >= 0) { QVariantMap args; args["Value"] = QVariant::fromValue((float)m_defaultValue); @@ -108,8 +107,8 @@ } else { backend()->setBrightness(args["Value"].toFloat()); } - if (args["Explicit"].toBool()) { - showBrightnessOSD(backend()->brightness()); + if (args["Explicit"].toBool() && !args["Silent"].toBool()) { + BrightnessOSDWidget::show(brightness()); } } @@ -129,7 +128,7 @@ m_lastProfile = m_currentProfile; m_currentProfile = config.parent().name(); - kDebug() << "Profiles: " << m_currentProfile << m_lastProfile; + qCDebug(POWERDEVIL) << "Profiles: " << m_currentProfile << m_lastProfile; if (config.hasKey("value")) { m_defaultValue = config.readEntry<int>("value", 50); @@ -140,15 +139,6 @@ return true; } -void BrightnessControl::showBrightnessOSD(int brightness) -{ - if (!m_brightnessOSD) { - m_brightnessOSD = new BrightnessOSDWidget(BackendInterface::Screen, this); - } - - m_brightnessOSD->setCurrentBrightness(brightness); -} - void BrightnessControl::onBrightnessChangedFromBackend(const BrightnessLogic::BrightnessInfo &info, BackendInterface::BrightnessControlType type) { if (type == BackendInterface::Screen) { @@ -168,19 +158,29 @@ { QVariantMap args; args["Value"] = QVariant::fromValue<float>((float)percent); + args["Explicit"] = true; + trigger(args); +} + +void BrightnessControl::setBrightnessSilent(int percent) +{ + QVariantMap args; + args["Value"] = QVariant::fromValue<float>((float)percent); + args["Explicit"] = true; + args["Silent"] = true; trigger(args); } void BrightnessControl::increaseBrightness() { backend()->brightnessKeyPressed(BrightnessLogic::Increase); - showBrightnessOSD(brightness()); + BrightnessOSDWidget::show(brightness()); } void BrightnessControl::decreaseBrightness() { backend()->brightnessKeyPressed(BrightnessLogic::Decrease); - showBrightnessOSD(brightness()); + BrightnessOSDWidget::show(brightness()); } int BrightnessControl::brightnessValue() const @@ -197,6 +197,16 @@ { QVariantMap args; args["Value"] = QVariant::fromValue<int>(value); + args["Explicit"] = true; + trigger(args); +} + +void BrightnessControl::setBrightnessValueSilent(int value) +{ + QVariantMap args; + args["Value"] = QVariant::fromValue<int>(value); + args["Explicit"] = true; + args["Silent"] = true; trigger(args); }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/brightnesscontrol.h ^
@@ -24,8 +24,6 @@ #include <powerdevilaction.h> #include <powerdevilbackendinterface.h> -class BrightnessOSDWidget; - namespace PowerDevil { namespace BundledActions { @@ -51,17 +49,17 @@ virtual bool loadAction(const KConfigGroup& config); public Q_SLOTS: - void showBrightnessOSD(int brightness); - // DBus export void increaseBrightness(); void decreaseBrightness(); int brightness() const; void setBrightness(int percent); + void setBrightnessSilent(int percent); int brightnessValue() const; int brightnessValueMax() const; void setBrightnessValue(int value); + void setBrightnessValueSilent(int value); int brightnessStep() const; int brightnessStepMax() const; @@ -77,7 +75,6 @@ private: int m_defaultValue; - BrightnessOSDWidget *m_brightnessOSD; QString m_lastProfile; QString m_currentProfile; };
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/brightnesscontrolconfig.h ^
@@ -23,8 +23,6 @@ #include <powerdevilactionconfig.h> -#include <kdemacros.h> - class QSlider; namespace PowerDevil {
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/dimdisplay.cpp ^
@@ -20,10 +20,12 @@ #include "dimdisplay.h" #include <powerdevilbackendinterface.h> +#include <powerdevil_debug.h> + +#include <QDebug> #include <KConfigGroup> #include <KLocalizedString> -#include <KDebug> namespace PowerDevil { namespace BundledActions { @@ -48,13 +50,13 @@ if (!m_dimmed) { return; } - setBrightnessHelper(m_oldBrightness); + setBrightnessHelper(m_oldScreenBrightnessValue, m_oldKeyboardBrightnessValue); m_dimmed = false; } void DimDisplay::onIdleTimeout(int msec) { - if (qFuzzyIsNull(backend()->brightness())) { + if (backend()->brightnessValue() == 0) { //Some drivers report brightness == 0 when display is off because of DPMS //(especially Intel driver). Don't change brightness in this case, or //backlight won't switch on later. @@ -63,14 +65,16 @@ } if (msec == m_dimOnIdleTime) { - setBrightnessHelper(0); + setBrightnessHelper(0, 0); } else if (msec == (m_dimOnIdleTime * 3 / 4)) { - float newBrightness = backend()->brightness() / 4; - setBrightnessHelper(newBrightness); + const int newBrightness = qRound(m_oldScreenBrightnessValue / 8.0); + setBrightnessHelper(newBrightness, 0); } else if (msec == (m_dimOnIdleTime * 1 / 2)) { - m_oldBrightness = backend()->brightness(); - float newBrightness = backend()->brightness() / 2; - setBrightnessHelper(newBrightness); + m_oldScreenBrightnessValue = backend()->brightnessValue(); + m_oldKeyboardBrightnessValue = backend()->brightnessValue(BackendInterface::Keyboard); + + const int newBrightness = qRound(m_oldScreenBrightnessValue / 2.0); + setBrightnessHelper(newBrightness, 0); } m_dimmed = true; @@ -81,16 +85,22 @@ // } -void DimDisplay::setBrightnessHelper(float brightness) +void DimDisplay::setBrightnessHelper(int screen, int keyboard) { QVariantMap args; - args["_BrightnessValue"] = QVariant::fromValue(brightness); + args["_ScreenBrightnessValue"] = QVariant::fromValue(screen); + args["_KeyboardBrightnessValue"] = QVariant::fromValue(keyboard); trigger(args); } -void DimDisplay::triggerImpl(const QVariantMap& args) +void DimDisplay::triggerImpl(const QVariantMap &args) { - backend()->setBrightness(args["_BrightnessValue"].toFloat()); + backend()->setBrightnessValue(args["_ScreenBrightnessValue"].toInt(), BackendInterface::Screen); + + // don't manipulate keyboard brightness if it's already zero to prevent races with DPMS action + if (m_oldKeyboardBrightnessValue > 0) { + backend()->setBrightnessValue(args["_KeyboardBrightnessValue"].toInt(), BackendInterface::Keyboard); + } } bool DimDisplay::isSupported() @@ -105,10 +115,10 @@ bool DimDisplay::loadAction(const KConfigGroup& config) { - kDebug(); + qCDebug(POWERDEVIL); if (config.hasKey("idleTime")) { m_dimOnIdleTime = config.readEntry<int>("idleTime", 10000000); - kDebug() << "Loading timeouts with " << m_dimOnIdleTime; + qCDebug(POWERDEVIL) << "Loading timeouts with " << m_dimOnIdleTime; registerIdleTimeout(m_dimOnIdleTime * 3 / 4); registerIdleTimeout(m_dimOnIdleTime / 2); registerIdleTimeout(m_dimOnIdleTime);
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/dimdisplay.h ^
@@ -48,10 +48,13 @@ virtual bool loadAction(const KConfigGroup& config); private: - void setBrightnessHelper(float brightness); + void setBrightnessHelper(int screen, int keyboard); int m_dimOnIdleTime; - float m_oldBrightness; + + int m_oldScreenBrightnessValue; + int m_oldKeyboardBrightnessValue; + bool m_dimmed; };
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/dimdisplayconfig.cpp ^
@@ -21,9 +21,9 @@ #include <QHBoxLayout> #include <QLabel> +#include <QSpinBox> #include <KConfig> -#include <KIntSpinBox> #include <KPluginFactory> #include <KSharedConfig> #include <KLocalizedString> @@ -57,7 +57,7 @@ QList< QPair< QString, QWidget* > > DimDisplayConfig::buildUi() { - m_spinBox = new KIntSpinBox(0, 180, 1, 0, 0); + m_spinBox = new QSpinBox; m_spinBox->setMaximumWidth(150); m_spinBox->setMinimum(1); m_spinBox->setMaximum(360);
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/dimdisplayconfig.h ^
@@ -23,7 +23,7 @@ #include <powerdevilactionconfig.h> -class KIntSpinBox; +class QSpinBox; namespace PowerDevil { namespace BundledActions { @@ -41,7 +41,7 @@ virtual QList< QPair< QString, QWidget* > > buildUi(); private: - KIntSpinBox m_spinBox; + QSpinBox m_spinBox; }; }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/handlebuttonevents.cpp ^
@@ -24,7 +24,7 @@ #include <powerdevilactionpool.h> -#include <KAction> +#include <QAction> #include <KActionCollection> #include <KConfigGroup> #include <KLocalizedString>
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/handlebuttoneventsconfig.cpp ^
@@ -29,7 +29,7 @@ #include <KPluginFactory> #include <KSharedConfig> #include <KComboBox> -#include <KIcon> +#include <QIcon> K_PLUGIN_FACTORY(PowerDevilSuspendSessionConfigFactory, registerPlugin<PowerDevil::BundledActions::HandleButtonEventsConfig>(); ) @@ -86,19 +86,19 @@ QSet< Solid::PowerManagement::SleepState > methods = Solid::PowerManagement::supportedSleepStates(); foreach (KComboBox *box, boxes) { - box->addItem(KIcon("dialog-cancel"), i18n("Do nothing"), (uint)SuspendSession::None); + box->addItem(QIcon::fromTheme("dialog-cancel"), i18n("Do nothing"), (uint)SuspendSession::None); if (methods.contains(Solid::PowerManagement::SuspendState)) { - box->addItem(KIcon("system-suspend"), i18n("Sleep"), (uint)SuspendSession::ToRamMode); + box->addItem(QIcon::fromTheme("system-suspend"), i18n("Sleep"), (uint)SuspendSession::ToRamMode); } if (methods.contains(Solid::PowerManagement::HibernateState)) { - box->addItem(KIcon("system-suspend-hibernate"), i18n("Hibernate"), (uint)SuspendSession::ToDiskMode); + box->addItem(QIcon::fromTheme("system-suspend-hibernate"), i18n("Hibernate"), (uint)SuspendSession::ToDiskMode); } - box->addItem(KIcon("system-shutdown"), i18n("Shutdown"), (uint)SuspendSession::ShutdownMode); - box->addItem(KIcon("system-lock-screen"), i18n("Lock screen"), (uint)SuspendSession::LockScreenMode); + box->addItem(QIcon::fromTheme("system-shutdown"), i18n("Shutdown"), (uint)SuspendSession::ShutdownMode); + box->addItem(QIcon::fromTheme("system-lock-screen"), i18n("Lock screen"), (uint)SuspendSession::LockScreenMode); if (box != m_lidCloseCombo) { - box->addItem(KIcon("system-log-out"), i18n("Prompt log out dialog"), (uint)SuspendSession::LogoutDialogMode); + box->addItem(QIcon::fromTheme("system-log-out"), i18n("Prompt log out dialog"), (uint)SuspendSession::LogoutDialogMode); } - box->addItem(KIcon("preferences-desktop-screensaver"), i18n("Turn off screen"), (uint)SuspendSession::TurnOffScreenMode); + box->addItem(QIcon::fromTheme("preferences-desktop-screensaver"), i18n("Turn off screen"), (uint)SuspendSession::TurnOffScreenMode); } }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/keyboardbrightnesscontrol.cpp ^
@@ -21,16 +21,19 @@ #include "keyboardbrightnesscontroladaptor.h" +#include "brightnessosdwidget.h" + #include <powerdevilbackendinterface.h> #include <powerdevilcore.h> +#include <powerdevil_debug.h> #include <QDesktopWidget> #include <QAction> +#include <QDebug> + #include <KActionCollection> -#include <KApplication> #include <KConfigGroup> -#include <KDebug> #include <KLocalizedString> #include <kglobalaccel.h> #include <kglobalaccel.h> @@ -98,7 +101,7 @@ (m_currentProfile == "LowBattery" && (m_lastProfile == "AC" \|\| m_lastProfile == "Battery"))) && m_defaultValue > keyboardBrightness()) { // We don't want to change anything here - kDebug() << "Not changing keyboard brightness, the current one is lower and the profile is more conservative"; + qCDebug(POWERDEVIL) << "Not changing keyboard brightness, the current one is lower and the profile is more conservative"; } else if (m_defaultValue > 0) { QVariantMap args; args["Value"] = QVariant::fromValue((float)m_defaultValue); @@ -115,8 +118,8 @@ } else { backend()->setBrightness(args["Value"].toFloat(), BackendInterface::Keyboard); } - if (args["Explicit"].toBool()) { - showBrightnessOSD(backend()->brightness(BackendInterface::Keyboard)); + if (args["Explicit"].toBool() && !args["Silent"].toBool()) { + BrightnessOSDWidget::show(keyboardBrightness(), BackendInterface::Keyboard); } } @@ -136,7 +139,7 @@ m_lastProfile = m_currentProfile; m_currentProfile = config.parent().name(); - kDebug() << "Profiles: " << m_currentProfile << m_lastProfile; + qCDebug(POWERDEVIL) << "Profiles: " << m_currentProfile << m_lastProfile; if (config.hasKey("value")) { m_defaultValue = config.readEntry<int>("value", 50); @@ -147,25 +150,10 @@ return true; } -void KeyboardBrightnessControl::showBrightnessOSD(int brightness) -{ - QDBusMessage msg = QDBusMessage::createMethodCall( - QLatin1Literal("org.kde.plasmashell"), - QLatin1Literal("/org/kde/osdService"), - QLatin1Literal("org.kde.osdService"), - QLatin1Literal("keyboardBrightnessChanged") - ); - - msg.setArguments(QList<QVariant>() << brightness); - - QDBusConnection::sessionBus().asyncCall(msg); -} - void KeyboardBrightnessControl::onBrightnessChangedFromBackend(const BrightnessLogic::BrightnessInfo &info, BackendInterface::BrightnessControlType type) { if (type == BackendInterface::Keyboard) { int brightness = qRound(info.percentage); - showBrightnessOSD(brightness); Q_EMIT keyboardBrightnessValueChanged(info.value); Q_EMIT keyboardBrightnessStepChanged(info.step); Q_EMIT keyboardBrightnessChanged(brightness); @@ -175,19 +163,19 @@ void KeyboardBrightnessControl::increaseKeyboardBrightness() { backend()->brightnessKeyPressed(BrightnessLogic::Increase, BackendInterface::Keyboard); - showBrightnessOSD(keyboardBrightness()); + BrightnessOSDWidget::show(keyboardBrightness(), BackendInterface::Keyboard); } void KeyboardBrightnessControl::decreaseKeyboardBrightness() { backend()->brightnessKeyPressed(BrightnessLogic::Decrease, BackendInterface::Keyboard); - showBrightnessOSD(keyboardBrightness()); + BrightnessOSDWidget::show(keyboardBrightness(), BackendInterface::Keyboard); } void KeyboardBrightnessControl::toggleKeyboardBacklight() { backend()->brightnessKeyPressed(BrightnessLogic::Toggle, BackendInterface::Keyboard); - showBrightnessOSD(keyboardBrightness()); + BrightnessOSDWidget::show(keyboardBrightness(), BackendInterface::Keyboard); } int KeyboardBrightnessControl::keyboardBrightness() const @@ -199,6 +187,16 @@ { QVariantMap args; args["Value"] = QVariant::fromValue<float>((float)percent); + args["Explicit"] = true; + trigger(args); +} + +void KeyboardBrightnessControl::setKeyboardBrightnessSilent(int percent) +{ + QVariantMap args; + args["Value"] = QVariant::fromValue<float>((float)percent); + args["Explicit"] = true; + args["Silent"] = true; trigger(args); } @@ -216,6 +214,16 @@ { QVariantMap args; args["Value"] = QVariant::fromValue<int>(value); + args["Explicit"] = true; + trigger(args); +} + +void KeyboardBrightnessControl::setKeyboardBrightnessValueSilent(int value) +{ + QVariantMap args; + args["Value"] = QVariant::fromValue<int>(value); + args["Explicit"] = true; + args["Silent"] = true; trigger(args); }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/keyboardbrightnesscontrol.h ^
@@ -24,8 +24,6 @@ #include <powerdevilaction.h> #include <powerdevilbackendinterface.h> -// class BrightnessOSDWidget; - namespace PowerDevil { namespace BundledActions { @@ -51,7 +49,6 @@ virtual bool loadAction(const KConfigGroup& config); public Q_SLOTS: - void showBrightnessOSD(int brightness); void onBrightnessChangedFromBackend(const BrightnessLogic::BrightnessInfo &brightnessInfo, BackendInterface::BrightnessControlType type); // DBus export @@ -61,10 +58,12 @@ int keyboardBrightness() const; void setKeyboardBrightness(int percent); + void setKeyboardBrightnessSilent(int percent); int keyboardBrightnessValue() const; int keyboardBrightnessValueMax() const; void setKeyboardBrightnessValue(int value); + void setKeyboardBrightnessValueSilent(int value); int keyboardBrightnessStep() const; int keyboardBrightnessStepMax() const; @@ -77,7 +76,6 @@ private: int m_defaultValue; -// QWeakPointer< BrightnessOSDWidget > m_brightnessOSD; QString m_lastProfile; QString m_currentProfile; };
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/keyboardbrightnesscontrolconfig.h ^
@@ -23,8 +23,6 @@ #include <powerdevilactionconfig.h> -#include <kdemacros.h> - class QSlider; namespace PowerDevil {
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/org.kde.Solid.PowerManagement.Actions.BrightnessControl.xml ^
@@ -4,6 +4,9 @@ <method name="setBrightness"> <arg type="i" direction="in" /> </method> + <method name="setBrightnessSilent"> + <arg type="i" direction="in" /> + </method> <method name="brightness"> <arg type="i" direction="out" /> </method> @@ -15,6 +18,9 @@ <method name="setBrightnessValue"> <arg type="i" direction="in" /> </method> + <method name="setBrightnessValueSilent"> + <arg type="i" direction="in" /> + </method> <method name="brightnessValue"> <arg type="i" direction="out" /> </method>
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/org.kde.Solid.PowerManagement.Actions.KeyboardBrightnessControl.xml ^
@@ -4,6 +4,9 @@ <method name="setKeyboardBrightness"> <arg type="i" direction="in" /> </method> + <method name="setKeyboardBrightnessSilent"> + <arg type="i" direction="in" /> + </method> <method name="keyboardBrightness"> <arg type="i" direction="out" /> </method> @@ -15,6 +18,9 @@ <method name="setKeyboardBrightnessValue"> <arg type="i" direction="in" /> </method> + <method name="setKeyboardBrightnessValueSilent"> + <arg type="i" direction="in" /> + </method> <method name="keyboardBrightnessValue"> <arg type="i" direction="out" /> </method>
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/org.kde.Solid.PowerManagement.Actions.SuspendSession.xml ^
@@ -8,6 +8,8 @@ <method name="suspendHybrid"> </method> + <signal name="aboutToSuspend"> + </signal> <signal name="resumingFromSuspend"> </signal> </interface>
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/powerdevilbrightnesscontrolaction.desktop ^
@@ -9,6 +9,7 @@ Name[cs]=Jas obrazovky Name[da]=Skærmens lysstyrke Name[de]=Bildschirmhelligkeit +Name[el]=Φωτεινότητα οθόνης Name[en_GB]=Screen brightness Name[es]=Brillo de la pantalla Name[fi]=Näytön kirkkaus @@ -17,6 +18,7 @@ Name[ia]=Brillantia de Schermo Name[id]=Kecerahan layar Name[ko]=화면 밝기 +Name[lt]=Ekrano šviesumas Name[nb]=Skjermlysstyrke Name[nds]=Schirm-Helligkeit Name[nl]=Schermhelderheid @@ -32,6 +34,7 @@ Name[sr@ijekavianlatin]=Osvjetljaj ekrana Name[sr@latin]=Osvetljaj ekrana Name[sv]=Skärmljusstyrka +Name[tr]=Ekran parlaklığı Name[uk]=Яскравість екрана Name[x-test]=xxScreen brightnessxx Name[zh_CN]=屏幕亮度 @@ -42,6 +45,7 @@ Comment[cs]=Základní ovládání jasu Comment[da]=Basal kontrol af lysstyrke Comment[de]=Grundeinstellungen zur Bildschirmhelligkeit +Comment[el]=Βασικά στοιχεία ελέγχου φωτεινότητας Comment[en_GB]=Basic Controls for brightness Comment[es]=Control básico del brillo Comment[fi]=Kirkkauden perussäätimet @@ -49,7 +53,9 @@ Comment[hu]=Alap fényerő-beállítások Comment[ia]=Controlos basic pro brillantia Comment[id]=Kontrol Dasar pada kecerahan +Comment[it]=Controlli fondamentali della luminosità Comment[ko]=기본 밝기 제어 +Comment[lt]=Pagrindiniai šviesumo valdikliai Comment[nb]=Grunnleggende lysstyrkestyring Comment[nds]=Eenfach Helligkeit-Instellen Comment[nl]=Basisbesturing voor helderheid
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/powerdevildimdisplayaction.desktop ^
@@ -9,6 +9,7 @@ Name[cs]=Ztmavit obrazovku Name[da]=Dæmp skærmen Name[de]=Bildschirm abdunkeln +Name[el]=Σκίαση οθόνης Name[en_GB]=Dim screen Name[es]=Oscurecer la pantalla Name[fi]=Näytön himmennys @@ -17,6 +18,7 @@ Name[ia]=Obscura Schermo Name[id]=Layar redup Name[ko]=화면 어둡게 하기 +Name[lt]=Ekrano užtemdymas Name[nb]=Mørklegg skjerm Name[nds]=Schirmafdüüstern Name[nl]=Scherm dimmen @@ -32,6 +34,7 @@ Name[sr@ijekavianlatin]=Priguši ekran Name[sr@latin]=Priguši ekran Name[sv]=Dämpa skärmen +Name[tr]=Ekranı karart Name[uk]=Зменшення яскравості екрана Name[x-test]=xxDim screenxx Name[zh_CN]=暗淡屏幕 @@ -42,6 +45,7 @@ Comment[cs]=Postupné ztmavení obrazovky Comment[da]=Dæmper skærmen gradvist baseret på tid Comment[de]=Dunkelt den Bildschirm zeitgesteuert ab +Comment[el]=Μειώνει σταδιακά τη φωτεινότητα της οθόνης Comment[en_GB]=Dims gradually the display on a time basis Comment[es]=Oscurece la pantalla gradualmente según pasa el tiempo Comment[fi]=Himmentää näyttöä vaiheittain ajan perusteella @@ -49,8 +53,10 @@ Comment[hu]=Arányosan csökkenti a fényerőt egy adott idő után Comment[ia]=Obscura gradualmente le monstrator usante como base le tempore Comment[id]=Meredupkan layar secara bertahap atas dasar waktu +Comment[it]=Scurisce gradualmente lo schermo su base temporale Comment[ja]=ディスプレイを時間とともに徐々に暗くする Comment[ko]=밝기를 단계적으로 어둡게 합니다 +Comment[lt]=Laikui bėgant, dalinai pritamsina ekraną Comment[nb]=Mørklegger skjermen gradvis etter som tiden går Comment[nds]=Maakt de Schirm na en vörinstellt Tiet düüsterer Comment[nl]=Dimt geleidelijk het beeldscherm op basis van tijd
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/powerdevilhandlebuttoneventsaction.desktop ^
@@ -10,6 +10,7 @@ Name[cs]=Řízení událostí tlačítek Name[da]=Håndtering af knaphændelser Name[de]=Knopf-Ereignisbehandlung +Name[el]=Διαχείριση συμβάντων κουμπιού Name[en_GB]=Button events handling Name[es]=Gestión de eventos de botones Name[fi]=Näppäintapahtumien käsittely @@ -17,7 +18,9 @@ Name[hu]=Gombesemények kezelése Name[ia]=Button maneante de eventos Name[id]=Tombol penanganan kejadian +Name[it]=Gestione degli eventi dei pulsanti Name[ko]=단추 이벤트 처리 +Name[lt]=Mygtukų įvykių valdymas Name[nb]=Håndtering av knappehendelser Name[nds]=Knoop för't Ümgahn mit Begeefnissen Name[nl]=Knop voor afhandelen van evenementen @@ -46,6 +49,7 @@ Comment[cs]=Vykoná akci kdykoli je tlačítko stisknuto Comment[da]=Udfører en handling når der trykkes på en knap Comment[de]=Führt eine Aktion aus, sobald ein Knopf gedrückt wird +Comment[el]=Εκτελεί μία ενέργεια όποτε πιέζεται ένα κουμπί Comment[en_GB]=Performs an action whenever a button is pressed Comment[es]=Realiza una acción cada vez que se pulsa un botón Comment[fi]=Suorittaa toiminnon painiketta painettaessa @@ -53,7 +57,9 @@ Comment[hu]=Végrehajt egy műveletet, valahányszor egy gomb megnyomásra kerül Comment[ia]=Il executa un action quando un button es pressate Comment[id]=Melakukan suatu tindakan setiap kali tombol ditekan +Comment[it]=Effettua un'azione ogni volta che viene premuto un pulsante Comment[ko]=단추가 눌렸을 때 동작을 실행합니다 +Comment[lt]=Įvykdo veiksmą kiekvieną kartą paspaudus mygtuką Comment[nb]=Utfører en handling hver gang en knapp trykkes Comment[nds]=Föhrt en Akschoon ut, wenn en Knoop drückt warrt Comment[nl]=Voer een actie uit als er een knop wordt ingedrukt
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/powerdevilkeyboardbrightnesscontrolaction.desktop ^
@@ -9,6 +9,7 @@ Name[cs]=Podsvícení klávesnice Name[da]=Tastaturets baglys Name[de]=Tastatur-Hintergrundbeleuchtung +Name[el]=Φωτισμός πληκτρολογίου Name[en_GB]=Keyboard backlight Name[es]=Luz trasera del teclado Name[fi]=Näppäimistön taustavalo @@ -17,6 +18,7 @@ Name[ia]=Luce de retro (Backlight) de claviero Name[id]=Lampu papan ketik Name[ko]=키보드 백라이트 +Name[lt]=Klaviatūros apšvietimas Name[nb]=Tastaturbaklys Name[nds]=Tastatuur-Achterlicht Name[nl]=Toetsenbordverlichting @@ -32,6 +34,7 @@ Name[sr@ijekavianlatin]=Osvetljenje tastature Name[sr@latin]=Osvetljenje tastature Name[sv]=Bakgrundsbelysning på tangentbord +Name[tr]=Klavye arka-ışığı Name[uk]=Підсвічування клавіатури Name[x-test]=xxKeyboard backlightxx Name[zh_CN]=键盘背光 @@ -42,6 +45,7 @@ Comment[cs]=Základní ovládání jasu podsvícení klávesnice Comment[da]=Basal kontrol af lysstyrke på tastaturets baglys Comment[de]=Grundeinstellungen zur Hintergrundhelligkeit der Tastatur +Comment[el]=Βασικά στοιχεία ελέγχου φωτεινότητας πληκτρολογίου Comment[en_GB]=Basic Controls for the keyboard backlight brightness Comment[es]=Control básico del brillo de la luz trasera del teclado Comment[fi]=Näppäimistön taustavalon kirkkauden perussäätimet @@ -49,7 +53,9 @@ Comment[hu]=Alap vezérlők a billentyűzet háttérvilágításának fényerejéhez Comment[ia]=Controlos basic pro intensitatede illumination de luce de retro de claviero Comment[id]=Kontrol dasar untuk kecerahan lampu papan ketik +Comment[it]=Controlli di base della retro illuminazione della tastiera Comment[ko]=키보드 백라이트 기본 밝기 제어 +Comment[lt]=Pagrindiniai klaviatūros apšvietimo valdikliai Comment[nb]=Enkel styring av lysstyrke for tastaturbaklys Comment[nds]=Helligkeit-Instellen för't Tastatuur-Achterlicht Comment[nl]=Basisbesturing voor helderheid van de toetsenbordverlichting
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/powerdevilrunscriptaction.desktop ^
@@ -8,6 +8,7 @@ Name[cs]=Spustit skript Name[da]=Kør script Name[de]=Skript ausführen +Name[el]=Εκτέλεση σεναρίου Name[en_GB]=Run script Name[es]=Ejecutar script Name[fi]=Suorita skripti @@ -16,6 +17,7 @@ Name[ia]=Exeque Script Name[id]=Menjalankan skrip Name[ko]=스크립트 실행 +Name[lt]=Paleisti scenarijų Name[nb]=Kjør skript Name[nds]=Skript utföhren Name[nl]=Script uitvoeren @@ -31,6 +33,7 @@ Name[sr@ijekavianlatin]=Izvrši skriptu Name[sr@latin]=Izvrši skriptu Name[sv]=Kör skript +Name[tr]=Betik çalıştır Name[uk]=Виконати скрипт Name[x-test]=xxRun scriptxx Name[zh_CN]=运行脚本 @@ -40,6 +43,7 @@ Comment[cs]=Spustit vlastní skript Comment[da]=Kører et brugerdefineret script Comment[de]=Führt ein benutzerdefiniertes Skript aus +Comment[el]=Εκτελεί ένα προσαρμοσμένο σενάριο Comment[en_GB]=Runs a custom script Comment[es]=Ejecuta un script personalizado Comment[fi]=Suorittaa mukautetun skriptin @@ -47,8 +51,10 @@ Comment[hu]=Egyéni parancsfájl futtatása Comment[ia]=Il exeque un script personalisate Comment[id]=Menjalankan sebuah skrip kostum +Comment[it]=Avvia uno script personalizzato Comment[ja]=カスタムスクリプトを実行 Comment[ko]=사용자 정의 스크립트를 실행합니다 +Comment[lt]=Paleisti savo scenarijų Comment[nb]=Kjører et egendefinert skript Comment[nds]=Föhrt en egen Skript ut Comment[nl]=Een eigen script uitvoeren
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/powerdevilsuspendsessionaction.desktop ^
@@ -9,6 +9,7 @@ Name[cs]=Pozastavit sezení Name[da]=Suspendér session Name[de]=Sitzung in den Ruhezustand versetzen +Name[el]=Αναστολή συνεδρίας Name[en_GB]=Suspend session Name[es]=Suspender la sesión Name[fi]=Keskeytä istunto @@ -17,6 +18,7 @@ Name[ia]=Suspende session Name[id]=Suspensi sesi Name[ko]=세션 일시 중지 +Name[lt]=Pristabdyti sesiją Name[nb]=Suspender økt Name[nds]=Törn utsetten Name[nl]=Sessie onderbreken @@ -32,6 +34,7 @@ Name[sr@ijekavianlatin]=Suspenduj sesiju Name[sr@latin]=Suspenduj sesiju Name[sv]=Stoppa tillfälligt session +Name[tr]=Oturumu askıya al Name[uk]=Призупинити сеанс Name[x-test]=xxSuspend sessionxx Name[zh_CN]=挂起会话 @@ -42,6 +45,7 @@ Comment[cs]=Pozastaví sezení Comment[da]=Suspenderer sessionen Comment[de]=Versetzt die Sitzung in den Ruhezustand +Comment[el]=Αναστέλλει τη συνεδρία Comment[en_GB]=Suspends the session Comment[es]=Suspende la sesión Comment[fi]=Keskeyttää istunnon @@ -49,8 +53,10 @@ Comment[hu]=A munkamenet felfüggesztése Comment[ia]=Il suspende le session Comment[id]=Suspen sesi +Comment[it]=Sospende la sessione Comment[ja]=セッションをサスペンドします Comment[ko]=세션을 일시 중단합니다 +Comment[lt]=Užlaiko sesiją Comment[nb]=Suspenderer økta Comment[nds]=Sett den Törn ut Comment[nl]=De sessie onderbreken
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/runscriptconfig.cpp ^
@@ -21,12 +21,12 @@ #include "runscriptconfig.h" #include <QHBoxLayout> +#include <QSpinBox> #include <KConfig> #include <KLocalizedString> #include <KUrlRequester> #include <KComboBox> -#include <KIntSpinBox> #include <KPluginFactory> #include <KSharedConfig> #include <KConfig> @@ -74,10 +74,11 @@ QWidget tempWidget = new QWidget; QHBoxLayout hlay = new QHBoxLayout; m_comboBox = new KComboBox; - m_idleTime = new KIntSpinBox(0, 180, 1, 0, 0); + m_idleTime = new QSpinBox; m_idleTime->setMaximumWidth(150); m_idleTime->setMinimum(1); m_idleTime->setMaximum(360); + m_idleTime->setValue(0); m_idleTime->setDisabled(true); m_idleTime->setSuffix(i18n(" min")); m_comboBox->addItem(i18n("On Profile Load"));
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/runscriptconfig.h ^
@@ -23,7 +23,7 @@ #include <powerdevilactionconfig.h> -class KIntSpinBox; +class QSpinBox; class KComboBox; class KUrlRequester; @@ -46,7 +46,7 @@ private: KUrlRequester m_urlRequester; KComboBox m_comboBox; - KIntSpinBox m_idleTime; + QSpinBox m_idleTime; private Q_SLOTS: void onIndexChanged(const QString&);
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/suspendsession.cpp ^
@@ -21,13 +21,15 @@ #include "powerdevilbackendinterface.h" #include "powerdevilcore.h" +#include <powerdevil_debug.h> #include "suspendsessionadaptor.h" +#include <QDebug> + #include <KConfigGroup> #include <KLocalizedString> #include <KJob> -#include <KDebug> #include <kworkspace.h> @@ -82,7 +84,7 @@ void SuspendSession::triggerImpl(const QVariantMap& args) { - kDebug() << "Triggered with " << args["Type"].toString() << args["SkipLocking"].toBool(); + qCDebug(POWERDEVIL) << "Triggered with " << args["Type"].toString() << args["SkipLocking"].toBool(); // Switch for screen lock QVariantMap recallArgs; @@ -107,12 +109,15 @@ KJob *suspendJob = 0; switch ((Mode) (args["Type"].toUInt())) { case ToRamMode: + Q_EMIT aboutToSuspend(); suspendJob = backend()->suspend(PowerDevil::BackendInterface::ToRam); break; case ToDiskMode: + Q_EMIT aboutToSuspend(); suspendJob = backend()->suspend(PowerDevil::BackendInterface::ToDisk); break; case SuspendHybridMode: + Q_EMIT aboutToSuspend(); suspendJob = backend()->suspend(PowerDevil::BackendInterface::HybridSuspend); break; case ShutdownMode:
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/suspendsession.h ^
@@ -68,6 +68,7 @@ void onResumeFromSuspend(); Q_SIGNALS: + void aboutToSuspend(); void resumingFromSuspend(); private slots:
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/suspendsessionconfig.cpp ^
@@ -21,15 +21,15 @@ #include "suspendsessionconfig.h" #include <QHBoxLayout> +#include <QSpinBox> #include <Solid/PowerManagement> #include <KComboBox> -#include <KIntSpinBox> #include <KLocalizedString> #include <KPluginFactory> #include <KSharedConfig> -#include <KIcon> +#include <QIcon> #include <KConfig> #include "suspendsession.h" @@ -71,22 +71,23 @@ QWidget tempWidget = new QWidget; QHBoxLayout hlay = new QHBoxLayout; m_comboBox = new KComboBox; - m_idleTime = new KIntSpinBox(0, 180, 1, 0, 0); + m_idleTime = new QSpinBox; m_idleTime->setMaximumWidth(150); m_idleTime->setMinimum(1); m_idleTime->setMaximum(360); + m_idleTime->setValue(0); m_idleTime->setSuffix(i18n(" min")); QSet< Solid::PowerManagement::SleepState > methods = Solid::PowerManagement::supportedSleepStates(); if (methods.contains(Solid::PowerManagement::SuspendState)) { - m_comboBox->addItem(KIcon("system-suspend"), i18n("Sleep"), (uint)SuspendSession::ToRamMode); + m_comboBox->addItem(QIcon::fromTheme("system-suspend"), i18n("Sleep"), (uint)SuspendSession::ToRamMode); } if (methods.contains(Solid::PowerManagement::HibernateState)) { - m_comboBox->addItem(KIcon("system-suspend-hibernate"), i18n("Hibernate"), (uint)SuspendSession::ToDiskMode); + m_comboBox->addItem(QIcon::fromTheme("system-suspend-hibernate"), i18n("Hibernate"), (uint)SuspendSession::ToDiskMode); } - m_comboBox->addItem(KIcon("system-shutdown"), i18n("Shutdown"), (uint)SuspendSession::ShutdownMode); - m_comboBox->addItem(KIcon("system-lock-screen"), i18n("Lock screen"), (uint)SuspendSession::LockScreenMode); + m_comboBox->addItem(QIcon::fromTheme("system-shutdown"), i18n("Shutdown"), (uint)SuspendSession::ShutdownMode); + m_comboBox->addItem(QIcon::fromTheme("system-lock-screen"), i18n("Lock screen"), (uint)SuspendSession::LockScreenMode); hlay->addWidget(m_idleTime); hlay->addWidget(m_comboBox);
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/bundled/suspendsessionconfig.h ^
@@ -24,7 +24,7 @@ #include <powerdevilactionconfig.h> class KComboBox; -class KIntSpinBox; +class QSpinBox; namespace PowerDevil { namespace BundledActions { @@ -42,7 +42,7 @@ virtual QList< QPair< QString, QWidget* > > buildUi(); private: - KIntSpinBox m_idleTime; + QSpinBox m_idleTime; KComboBox *m_comboBox; };
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/dpms/CMakeLists.txt ^
@@ -1,14 +1,16 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR} +include_directories(${PowerDevil_SOURCE_DIR}/daemon + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${X11_dpms_INCLUDE_PATH}) -set(powerdevildpmsaction_SRCS powerdevildpmsaction.cpp) +set(powerdevildpmsaction_SRCS ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp powerdevildpmsaction.cpp) add_library(powerdevildpmsaction MODULE ${powerdevildpmsaction_SRCS}) target_link_libraries(powerdevildpmsaction ${X11_LIBRARIES} Qt5::X11Extras - KF5::KDELibs4Support + KF5::CoreAddons + KF5::ConfigGui Qt5::Widgets powerdevilcore) install(TARGETS powerdevildpmsaction DESTINATION ${PLUGIN_INSTALL_DIR}) @@ -19,7 +21,9 @@ add_library(powerdevildpmsaction_config MODULE ${dpmsconfig_SRCS}) target_link_libraries(powerdevildpmsaction_config - KF5::KDELibs4Support + KF5::CoreAddons + KF5::ConfigGui + KF5::I18n Qt5::Widgets powerdevilui) install(TARGETS powerdevildpmsaction_config DESTINATION ${PLUGIN_INSTALL_DIR}) \ No newline at end of file
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/dpms/powerdevildpmsaction.cpp ^
@@ -20,14 +20,16 @@ #include "powerdevildpmsaction.h" +#include <powerdevilbackendinterface.h> #include <powerdevilcore.h> +#include <powerdevil_debug.h> #include <config-workspace.h> #include <QX11Info> +#include <QDebug> #include <KConfigGroup> -#include <KDebug> #include <KPluginFactory> #include <KSharedConfig> @@ -70,6 +72,7 @@ : Action(parent) , m_idleTime(0) , m_inhibitScreen(0) // can't use PowerDevil::PolicyAgent enum because X11/X.h defines None as 0L + , m_oldKeyboardBrightnessValue(0) , d(new Private) { setRequiredPolicies(PowerDevil::PolicyAgent::ChangeScreenSettings); @@ -86,7 +89,7 @@ // Is the action being loaded outside the core? if (args.size() > 0) { if (args.first().toBool()) { - kDebug() << "Action loaded from outside the core, skipping early init"; + qCDebug(POWERDEVIL) << "Action loaded from outside the core, skipping early init"; return; } } @@ -123,19 +126,33 @@ if (!(PolicyAgent::instance()->unavailablePolicies() & PolicyAgent::ChangeScreenSettings)) { DPMSDisable(dpy); } else { - kDebug() << "Not performing DPMS action due to inhibition"; + qCDebug(POWERDEVIL) << "Not performing DPMS action due to inhibition"; } DPMSSetTimeouts(dpy, 0, 0, 0); } void PowerDevilDPMSAction::onWakeupFromIdle() { - // + if (m_oldKeyboardBrightnessValue > 0) { + setKeyboardBrightnessHelper(m_oldKeyboardBrightnessValue); + m_oldKeyboardBrightnessValue = 0; + } } void PowerDevilDPMSAction::onIdleTimeout(int msec) { Q_UNUSED(msec); + + const int brightness = backend()->brightnessValue(PowerDevil::BackendInterface::Keyboard); + if (brightness > 0) { + m_oldKeyboardBrightnessValue = brightness; + setKeyboardBrightnessHelper(0); + } +} + +void PowerDevilDPMSAction::setKeyboardBrightnessHelper(int brightness) +{ + trigger(QVariantMap{ {"KeyboardBrightness", QVariant::fromValue(brightness)} }); } void PowerDevilDPMSAction::onProfileLoad() @@ -145,7 +162,7 @@ if (!(PolicyAgent::instance()->unavailablePolicies() & PolicyAgent::ChangeScreenSettings)) { DPMSEnable(dpy); } else { - kDebug() << "Not performing DPMS action due to inhibition"; + qCDebug(POWERDEVIL) << "Not performing DPMS action due to inhibition"; return; } @@ -163,6 +180,11 @@ void PowerDevilDPMSAction::triggerImpl(const QVariantMap& args) { + if (args.contains("KeyboardBrightness")) { + backend()->setBrightnessValue(args["KeyboardBrightness"].toInt(), PowerDevil::BackendInterface::Keyboard); + return; + } + CARD16 dummy; BOOL enabled; Display dpy = QX11Info::display(); @@ -198,6 +220,9 @@ bool PowerDevilDPMSAction::loadAction(const KConfigGroup& config) { m_idleTime = config.readEntry<int>("idleTime", -1); + if (m_idleTime > 0) { + registerIdleTimeout(m_idleTime 1000); + } return true; } @@ -219,14 +244,14 @@ if (m_inhibitScreen) { // Inhibition triggered: disable DPMS - kDebug() << "Disabling DPMS due to inhibition"; + qCDebug(POWERDEVIL) << "Disabling DPMS due to inhibition"; Display *dpy = QX11Info::display(); DPMSSetTimeouts(dpy, 0, 0, 0); DPMSDisable(dpy); // wakes the screen - do we want this? } else { // Inhibition removed: let's start again onProfileLoad(); - kDebug() << "Restoring DPMS features after inhibition release"; + qCDebug(POWERDEVIL) << "Restoring DPMS features after inhibition release"; } }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/dpms/powerdevildpmsaction.desktop ^
@@ -9,6 +9,7 @@ Name[cs]=Úsporný režim obrazovky Name[da]=Strømbesparelse for skærm Name[de]=Bildschirm-Energieverwaltung +Name[el]=Εξοικονόμηση ενέργειας οθόνης Name[en_GB]=Screen Energy Saving Name[es]=Ahorro de energía de la pantalla Name[fi]=Näytön virransäästö @@ -16,7 +17,9 @@ Name[hu]=Kijelző kikapcsolása Name[ia]=Sparnio de energia de schermo Name[id]=Layar Hemat Energi +Name[it]=Risparmio energetico dello schermo Name[ko]=화면 에너지 절약 +Name[lt]=Ekrano energijos taupymas Name[nb]=Energisparing for skjerm Name[nds]=Monitor-Stroomspoorbedrief Name[nl]=Energiebesparing bij het beeldscherm @@ -43,6 +46,7 @@ Comment[cs]=Ovládání nastavení DPMS Comment[da]=Styrer DPMS-indstillinger Comment[de]=DPMS-Einstellungen +Comment[el]=Ελέγχει τις ρυθμίσεις DPMS Comment[en_GB]=Controls DPMS settings Comment[es]=Controla las preferencias de DPMS Comment[fi]=Hallitsee DPMS-asetuksia @@ -50,8 +54,10 @@ Comment[hu]=DPMS-beállítások irányítása Comment[ia]=Preferentias de controlos DPMS Comment[id]=Kontrol Pengaturan DPMS +Comment[it]=Impostazioni dei controlli DPMS Comment[ja]=DPMS の設定 Comment[ko]=DPMS 설정 +Comment[lt]=Valdo DPMS nustatymus Comment[nb]=Styrer DPMS-innstillinger Comment[nds]=Monitor-Stroomspoorbedrief instellen Comment[nl]=DPMS-instellingen besturen
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/dpms/powerdevildpmsaction.h ^
@@ -48,9 +48,13 @@ void onUnavailablePoliciesChanged(PowerDevil::PolicyAgent::RequiredPolicies policies); private: + void setKeyboardBrightnessHelper(int brightness); + int m_idleTime; PowerDevil::PolicyAgent::RequiredPolicies m_inhibitScreen; + int m_oldKeyboardBrightnessValue; + class Private; Private * const d; };
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/dpms/powerdevildpmsactionconfig.cpp ^
@@ -19,7 +19,8 @@ #include "powerdevildpmsactionconfig.h" -#include <KIntSpinBox> +#include <QSpinBox> + #include <KLocalizedString> #include <KPluginFactory> #include <KSharedConfig> @@ -52,7 +53,7 @@ { QList< QPair< QString, QWidget* > > retlist; - m_spinBox = new KIntSpinBox(0, 180, 1, 0, 0); + m_spinBox = new QSpinBox; m_spinBox->setMaximumWidth(150); m_spinBox->setMinimum(1); m_spinBox->setMaximum(360);
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/dpms/powerdevildpmsactionconfig.h ^
@@ -23,7 +23,7 @@ #include <powerdevilactionconfig.h> -class KIntSpinBox; +class QSpinBox; class PowerDevilDPMSActionConfig : public PowerDevil::ActionConfig { Q_OBJECT @@ -37,7 +37,7 @@ virtual QList< QPair< QString, QWidget* > > buildUi(); private: - KIntSpinBox m_spinBox; + QSpinBox m_spinBox; }; #endif // POWERDEVILDPMSACTIONCONFIG_H
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/actions/powerdevilaction.desktop ^
@@ -8,6 +8,7 @@ Comment[cs]=Rozšiřující akce správy napájení Comment[da]=Udvidelse af strømstyringshandling Comment[de]=Erweiterung für Energieverwaltungs-Aktionen +Comment[el]=Επέκταση ενεργειών διαχείρισης ενέργειας Comment[en_GB]=Power Management Action Extension Comment[es]=Extensión de acciones de ahorro de energía Comment[fi]=Virranhallinnan toimintolaajennus @@ -15,7 +16,9 @@ Comment[hu]=Energiakezelő-műveletek kiterjesztés Comment[ia]=Extension de action de gestion de energia Comment[id]=Ekstensi Aksi Manajemen Daya +Comment[it]=Estensione delle azioni di gestione energetica Comment[ko]=전원 관리 동작 확장 +Comment[lt]=Energijos valdymo veiksmų plėtinys Comment[nb]=Handlingsutvidelse for strømstyring Comment[nds]=Verwiedern för Stroomkuntrullakschonen Comment[nl]=Uitbreiding voor energiebeheeractie
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/hal/powerdevilhalbackend.cpp ^
@@ -20,10 +20,11 @@ #include "powerdevilhalbackend.h" +#include <powerdevil_debug.h> #include <Solid/DeviceNotifier> #include <QtDBus/QDBusReply> #include <QtDBus/QDBusConnectionInterface> -#include <KDebug> +#include <QDebug> #include "halsuspendjob.h" #include <Solid/Device> #include <Solid/Battery> @@ -129,7 +130,7 @@ supported \|= ToRam; } } else { - kDebug() << reply.error().name() << ": " << reply.error().message(); + qCDebug(POWERDEVIL) << reply.error().name() << ": " << reply.error().message(); } reply = m_halComputer.asyncCall("GetPropertyBoolean", "power_management.can_hibernate"); @@ -141,7 +142,7 @@ supported \|= ToDisk; } } else { - kDebug() << reply.error().name() << ": " << reply.error().message(); + qCDebug(POWERDEVIL) << reply.error().name() << ": " << reply.error().message(); } }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/hal/powerdevilhalbackend.desktop ^
@@ -9,6 +9,7 @@ Name[cs]=Podpůrná vrstva HAL PowerDevil Name[da]=HAL-motor til PowerDevil Name[de]=HAL-PowerDevil-Backend +Name[el]=Σύστημα υποστήριξης HAL για το PowerDevil Name[en_GB]=HAL PowerDevil Backend Name[es]=Motor PowerDevil de HAL Name[fi]=HAL PowerDevil-taustaosa @@ -16,8 +17,10 @@ Name[hu]=HAL Powerdevil-modul Name[ia]=HAL PowerDevil Backend (retro-administration de PowerDevil de HAL) Name[id]=Ujung Belakang HAL PowerDevil +Name[it]=Motore PowerDevil per HAL Name[ja]=HAL PowerDevil バックエンド Name[ko]=HAL PowerDevil 백엔드 +Name[lt]=HAL PowerDevil programinė sąsaja Name[nb]=HAL PowerDevil-motor Name[nds]=Hülpprogramm för den HAL-Stroomdüvel Name[nl]=Backend voor HAL PowerDevil @@ -45,6 +48,7 @@ Comment[cs]=Využít démon freedesktop.org HAL pro systém správy napájení KDE Comment[da]=Brug KDE strømstyring via HAL-dæmonen fra freedesktop.org Comment[de]=Das KDE-Energieverwaltungssystem mit Hilfe des HAL-Dienstes von freedesktop.org verwenden +Comment[el]=Διαχείριση ενέργειας του ΚDE με χρήση του δαίμονα HAL του freedesktop.org Comment[en_GB]=Use KDE Power Management system through freedesktop.org HAL daemon Comment[es]=Usar el sistema de ahorro de energía de KDE a través del demonio HAL de freedesktop.org Comment[fi]=KDE:n virranhallintajärjestelmän käyttö freedesktop.org HAL-taustaprosessilla @@ -52,8 +56,10 @@ Comment[hu]=A KDE energiakezelő rendszerének használata a freedesktop.org HAL-démonán keresztül Comment[ia]=Usa systema de gestion de energia de KDE usante demone HAL de freedesktop.org Comment[id]=Gunakan sistem Manajemen Daya KDE melalui freedesktop.org HAL daemon +Comment[it]=Usa il sistema di gestione energetica di KDE attraverso il demone HAL di freedesktop.org Comment[ja]=freedesktop.org の HAL デーモンを介して KDE 電源管理を使用 Comment[ko]=freedesktop.org HAL 데몬을 사용하는 KDE 전원 관리 시스템 +Comment[lt]=Naudoti KDE energijos valdymo sistemą, naudojant freedesktop.org HAL tarnybą Comment[nb]=Bruk KDE strømstyringssystem med HAL-nissen fra freedesktop.org Comment[nds]=Den HAL-Dämoon vun freedesktop.org för de KDE-Stroomkuntrull bruken Comment[nl]=KDE energiebeheer gebruiken via de HAL-daemon van freedesktop.org
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/hal/powerdevilhalbackend.h ^
@@ -26,8 +26,6 @@ #include <QtDBus/QDBusConnection> #include <QtDBus/QDBusInterface> -#include <kdemacros.h> - #include <solid/devicenotifier.h> #include <solid/device.h>
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/upower/backlight_helper_actions.actions ^
@@ -5,6 +5,7 @@ Name[cs]=KDE Name[da]=KDE Name[de]=KDE +Name[el]=KDE Name[en_GB]=KDE Name[es]=KDE Name[fi]=KDE @@ -12,8 +13,10 @@ Name[hu]=KDE Name[ia]=KDE Name[id]=KDE +Name[it]=KDE Name[ja]=KDE Name[ko]=KDE +Name[lt]=KDE Name[nb]=KDE Name[nds]=KDE Name[nl]=KDE @@ -43,12 +46,15 @@ Name[cs]=Získat maximální hodnotu jasu Name[da]=Hent maksimal værdi for lysstyrke Name[de]=Maximale Bildschirmhelligkeit abrufen +Name[el]=Ανάκτηση της μέγιστης τιμής φωτεινότητας Name[en_GB]=Get maximum brightness value Name[es]=Obtener el valor del brillo máximo Name[fi]=Lue kirkkauden enimmäisarvo Name[fr]=Obtenir la luminosité maximale Name[hu]=Maximális fényerősség lekérdezése +Name[id]=Dapatkan nilai kecerahan maksimum Name[ko]=최대 밝기 가져오기 +Name[lt]=Gauti maksimalią šviesumo vertė Name[nb]=Hent største verdi for lysstyrke Name[nds]=Hööchst Helligkeitweert afropen Name[nl]=Waarde van maximale helderheid ophalen @@ -62,8 +68,10 @@ Name[sr@ijekavianlatin]=Dobavi najveću vrednost osvjetljaja Name[sr@latin]=Dobavi najveću vrednost osvetljaja Name[sv]=Hämta maximalt värde på ljusstyrka +Name[tr]=En yüksek parlaklık değerini al Name[uk]=Отримання максимального значення яскравості Name[x-test]=xxGet maximum brightness valuexx +Name[zh_CN]=获取最大亮度 Name[zh_TW]=取得最大亮度值 Description=System policies prevent you from getting the brightness level. Description[ar]=تمنعك سياسات النظام من الحصول على معلومات مستوى السطوع. @@ -71,14 +79,17 @@ Description[cs]=Nastavení systému vám znemožňuje získat úroveň podsvícení. Description[da]=Systempolitikker forhindrer dig i at hente lysstyrkeniveauet. Description[de]=Die Stufe der Bildschirmhelligkeit kann aufgrund einer Systemrichtlinie nicht abgerufen werden. +Description[el]=Οι πολιτικές του συστήματος αποτρέπουν τη λήψη του επίπεδου φωτεινότητας. Description[en_GB]=System policies prevent you from getting the brightness level. Description[es]=Las políticas del sistema le impiden obtener el nivel de brillo. -Description[fi]=Järjestelmämenettelytavat estävät sinua saamasta kirkkauden tasoa selville. +Description[fi]=Järjestelmäkäytäntö estää sinua lukemasta kirkkauden tasoa. Description[fr]=La stratégie système vous empêche d'obtenir le niveau de luminosité. Description[hu]=A rendszer házirendjei nem engedik meg Önnek a fényesség lekérdezését. Description[ia]=Le politicas de systema preveni te ex obtener le nivello de brillantia. Description[id]=Kebijakan sistem mencegah Anda dari mendapatkan tingkat kecerahan. +Description[it]=Le linee guida del sistema impediscono di leggere il livello di luminosità. Description[ko]=시스템 정책 때문에 밝기를 가져올 수 없습니다. +Description[lt]=Sistemos taisyklės neleidžia jums gauti šviesumo lygio. Description[nb]=Systembestemmelser gjør at du ikke kan hente lysstyrkenivået. Description[nds]=De Systeemregeln verlöövt nich, dat Du de Instellen för de Helligkeit afröppst. Description[nl]=Systeembeleid voorkwam dat u het helderheidsniveau kon verkrijgen. @@ -110,6 +121,7 @@ Name[cs]=Získat jas Name[da]=Hent lysstyrke Name[de]=Bildschirmhelligkeit abrufen +Name[el]=Ανάκτηση φωτεινότητας Name[en_GB]=Get brightness Name[es]=Obtener brillo Name[fi]=Lue kirkkaus @@ -117,7 +129,9 @@ Name[hu]=Fényesség lekérdezése Name[ia]=Obtene brillantia Name[id]=Dapatkan kecerahan +Name[it]=Leggi la luminosità Name[ko]=밝기 가져오기 +Name[lt]=Gauti šviesumą Name[nb]=Hent lysstyrke Name[nds]=Helligkeit afropen Name[nl]=Helderheid verkrijgen @@ -145,14 +159,17 @@ Description[cs]=Nastavení systému vám znemožňuje získat úroveň podsvícení. Description[da]=Systempolitikker forhindrer dig i at hente lysstyrkeniveauet. Description[de]=Die Stufe der Bildschirmhelligkeit kann aufgrund einer Systemrichtlinie nicht abgerufen werden. +Description[el]=Οι πολιτικές του συστήματος αποτρέπουν τη λήψη του επίπεδου φωτεινότητας. Description[en_GB]=System policies prevent you from getting the brightness level. Description[es]=Las políticas del sistema le impiden obtener el nivel de brillo. -Description[fi]=Järjestelmämenettelytavat estävät sinua saamasta kirkkauden tasoa selville. +Description[fi]=Järjestelmäkäytäntö estää sinua lukemasta kirkkauden tasoa. Description[fr]=La stratégie système vous empêche d'obtenir le niveau de luminosité. Description[hu]=A rendszer házirendjei nem engedik meg Önnek a fényesség lekérdezését. Description[ia]=Le politicas de systema preveni te ex obtener le nivello de brillantia. Description[id]=Kebijakan sistem mencegah Anda dari mendapatkan tingkat kecerahan. +Description[it]=Le linee guida del sistema impediscono di leggere il livello di luminosità. Description[ko]=시스템 정책 때문에 밝기를 가져올 수 없습니다. +Description[lt]=Sistemos taisyklės neleidžia jums gauti šviesumo lygio. Description[nb]=Systembestemmelser gjør at du ikke kan hente lysstyrkenivået. Description[nds]=De Systeemregeln verlöövt nich, dat Du de Instellen för de Helligkeit afröppst. Description[nl]=Systeembeleid voorkwam dat u het helderheidsniveau kon verkrijgen. @@ -184,6 +201,7 @@ Name[cs]=Nastavit jas Name[da]=Sæt lysstyrke Name[de]=Bildschirmhelligkeit einstellen +Name[el]=Ρύθμιση φωτεινότητας Name[en_GB]=Set brightness Name[es]=Fijar brillo Name[fi]=Aseta kirkkaus @@ -191,8 +209,10 @@ Name[hu]=Fényesség beállítása Name[ia]=Fixa brillantia Name[id]=Atur kecerahan +Name[it]=Imposta la luminosità Name[ja]=明るさを設定 Name[ko]=밝기 설정하기 +Name[lt]=Nustatyti šviesumą Name[nb]=Sett lysstyrke Name[nds]=Helligkeit instellen Name[nl]=Helderheid instellen @@ -220,15 +240,18 @@ Description[cs]=Systémové omezení vám neumožňuje nastavit úroveň podsvícení. Description[da]=Systempolitikker forhindrer dig i at sætte lysstyrkeniveauet. Description[de]=Die Bildschirmhelligkeit kann aufgrund einer Systemrichtlinie nicht geändert werden. +Description[el]=Οι πολιτικές του συστήματος αποτρέπουν τον ορισμό του επίπεδου φωτεινότητας. Description[en_GB]=System policies prevent you from setting the brightness level. Description[es]=Las políticas del sistema le impiden fijar el nivel de brillo. -Description[fi]=Järjestelmämenettelytavat estävät sinua asettamasta kirkkauden tasoa. +Description[fi]=Järjestelmäkäytäntö estää sinua asettamasta kirkkauden tasoa. Description[fr]=La stratégie système vous empêche de fixer le niveau de luminosité. Description[hu]=A rendszer házirendjei nem engedik meg Önnek a fényesség beállítását. Description[ia]=Le politicas de systema preveni te ex fixar le nivello de brillantia. Description[id]=Kebijakan sistem mencegah Anda dari mengatur tingkat kecerahan. +Description[it]=Le linee guida del sistema impediscono di impostare il livello di luminosità. Description[ja]=システムポリシーにより、明るさを設定することができません。 Description[ko]=시스템 정책 때문에 밝기를 지정할 수 없습니다. +Description[lt]=Sistemos taisyklės neleidžia jums nustatyti šviesumo lygio. Description[nb]=Systembestemmelser gjør at du ikke kan sette lysstyrkenivået. Description[nds]=De Systeemregeln verlöövt nich, dat Du de Instellen för de Helligkeit instellst. Description[nl]=Systeembeleid voorkwam dat u het helderheidsniveau kon instellen. @@ -259,6 +282,7 @@ Name[cs]=Získat syspath Name[da]=Hent syspath Name[de]=„syspath“ holen +Name[el]=Λήψη syspath Name[en_GB]=Get syspath Name[es]=Obtener ruta del sistema Name[fi]=Lue järjestelmäpolku @@ -266,7 +290,9 @@ Name[hu]=Rendszerútvonal lekérése Name[ia]=Obtene syspath Name[id]=Dapatkan syspath +Name[it]=Ottieni percorso di sistema Name[ko]=syspath 가져오기 +Name[lt]=Gauti syspath Name[nb]=Hent syspath Name[nds]=Syspadd halen Name[nl]=Systeempad ophalen @@ -294,14 +320,17 @@ Description[cs]=Nastavení systému vám znemožňuje získat syspath Description[da]=Systempolitikker forhindrer dig i at hente syspath Description[de]=Systemrichtlinien verhindern das Holen von „syspath“ +Description[el]=Οι πολιτικές του συστήματος αποτρέπουν τη λήψη του syspath Description[en_GB]=System policies prevent you from getting the syspath Description[es]=Las políticas del sistema le impiden obtener la ruta del sistema. -Description[fi]=Järjestelmämenettelytavat estävät sinua saamasta järjestelmäpolkua selville. +Description[fi]=Järjestelmäkäytäntö estää sinua lukemasta järjestelmäpolkua. Description[fr]=La stratégie système vous empêche d'obtenir « syspath ». Description[hu]=A rendszer házirendjei nem engedik meg Önnek a rendszerútvonal lekérdezését. Description[ia]=Le politicas de systema preveni te ex obtener le syspath Description[id]=Kebijakan sistem mencegah Anda dari mendapatkan syspath. +Description[it]=Le regole del sistema ti impediscono di ottenere il percorso di sistema Description[ko]=시스템 정책 때문에 syspath를 가져올 수 없습니다. +Description[lt]=Sistemos taisyklės neleidžia jums gauti syspath Description[nb]=Systembestemmelser gjør at du ikke kan hente syspath-en Description[nds]=De Systeemregeln verlöövt nich, dat Du den Syspadd afröppst. Description[nl]=Systeembeleid voorkwam dat u het systeempad kon ophalen
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/upower/backlighthelper.cpp ^
@@ -19,6 +19,8 @@ #include "backlighthelper.h" +#include <powerdevil_debug.h> + #include <QtCore/QDir> #include <QtCore/QDebug> #include <KLocalizedString> @@ -57,7 +59,7 @@ initUsingSysctl(); if (m_sysctlDevice.isEmpty() \|\| m_sysctlBrightnessLevels.isEmpty()) { - qWarning() << "no kernel backlight interface found"; + qCWarning(POWERDEVIL) << "no kernel backlight interface found"; return; } } @@ -95,7 +97,7 @@ } else if (buffer == "raw") { raw.append(interface); } else { - qWarning() << "Interface type not handled" << buffer; + qCWarning(POWERDEVIL) << "Interface type not handled" << buffer; } file.close(); @@ -130,10 +132,10 @@ QDir dir; foreach (const QString & interface, interfaces) { dir.setPath(PREFIX + interface); - //qDebug() << "searching dir:" << dir; + //qCDebug(POWERDEVIL) << "searching dir:" << dir; if (dir.exists()) { m_dirname = dir.path(); - //qDebug() << "kernel backlight support found in" << m_dirname; + //qCDebug(POWERDEVIL) << "kernel backlight support found in" << m_dirname; break; } } @@ -257,7 +259,7 @@ if (!file.open(QIODevice::ReadOnly)) { reply = ActionReply(ActionReply::HelperErrorType); reply.setErrorDescription(i18n("Can't open file")); - qWarning() << "reading brightness failed with error code " << file.error() << file.errorString(); + qCWarning(POWERDEVIL) << "reading brightness failed with error code " << file.error() << file.errorString(); return reply; } @@ -266,9 +268,9 @@ file.close(); #endif - //qDebug() << "brightness:" << brightness; + //qCDebug(POWERDEVIL) << "brightness:" << brightness; reply.addData("brightnessvalue", brightness); - //qDebug() << "data contains:" << reply.data()["brightnessvalue"]; + //qCDebug(POWERDEVIL) << "data contains:" << reply.data()["brightnessvalue"]; return reply; } @@ -284,7 +286,7 @@ return reply; } - //qDebug() << "setting brightness:" << actual_brightness; + //qCDebug(POWERDEVIL) << "setting brightness:" << actual_brightness; #ifdef USE_SYSCTL int actual_level = -1; @@ -315,7 +317,7 @@ if (!file.open(QIODevice::WriteOnly)) { reply = ActionReply::HelperErrorReply(); // reply.setErrorCode(ActionReply::ActionReply::UserCancelledError); - qWarning() << "writing brightness failed with error code " << file.error() << file.errorString(); + qCWarning(POWERDEVIL) << "writing brightness failed with error code " << file.error() << file.errorString(); return reply; } @@ -325,7 +327,7 @@ if (result == -1) { reply = ActionReply::HelperErrorReply(); // reply.setErrorCode(file.error()); - qWarning() << "writing brightness failed with error code " << file.error() << file.errorString(); + qCWarning(POWERDEVIL) << "writing brightness failed with error code " << file.error() << file.errorString(); } #endif return reply; @@ -368,7 +370,7 @@ if (!file.open(QIODevice::ReadOnly)) { reply = ActionReply::HelperErrorReply(); // reply.setErrorCode(file.error()); - qWarning() << "reading max brightness failed with error code " << file.error() << file.errorString(); + qCWarning(POWERDEVIL) << "reading max brightness failed with error code " << file.error() << file.errorString(); return reply; } @@ -377,7 +379,7 @@ file.close(); #endif - //qDebug() << "max brightness:" << max_brightness; + //qCDebug(POWERDEVIL) << "max brightness:" << max_brightness; if (max_brightness <= 0) { reply = ActionReply::HelperErrorReply(); @@ -385,7 +387,7 @@ } reply.addData("brightnessvaluemax", max_brightness); - //qDebug() << "data contains:" << reply.data()["brightnessvaluemax"]; + //qCDebug(POWERDEVIL) << "data contains:" << reply.data()["brightnessvaluemax"]; return reply; }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/upower/login1suspendjob.cpp ^
@@ -21,11 +21,12 @@ #include "login1suspendjob.h" +#include <powerdevil_debug.h> + #include <QtDBus/QDBusMessage> #include <QtDBus/QDBusReply> #include <QTimer> -#include <KDebug> -#include <KLocale> +#include <QDebug> #include <KLocalizedString> Login1SuspendJob::Login1SuspendJob(QDBusInterface *login1Interface, @@ -33,7 +34,7 @@ PowerDevil::BackendInterface::SuspendMethods supported) : KJob(), m_login1Interface(login1Interface) { - kDebug() << "Starting Login1 suspend job"; + qCDebug(POWERDEVIL) << "Starting Login1 suspend job"; m_method = method; m_supported = supported; @@ -73,7 +74,7 @@ reply = m_login1Interface->asyncCallWithArgumentList("HybridSleep", args); break; default: - kDebug() << "Unsupported suspend method"; + qCDebug(POWERDEVIL) << "Unsupported suspend method"; setError(1); setErrorText(i18n("Unsupported suspend method")); break; @@ -87,7 +88,7 @@ if (!reply.isError()) { emitResult(); } else { - kWarning() << "Failed to start suspend job" << reply.error().name() << reply.error().message(); + qCWarning(POWERDEVIL) << "Failed to start suspend job" << reply.error().name() << reply.error().message(); } watcher->deleteLater();
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/upower/powerdevilupowerbackend.cpp ^
@@ -22,63 +22,30 @@ #include "powerdevilupowerbackend.h" +#include <powerdevil_debug.h> + #include <qtextstream.h> #include <QtDBus> +#include <QDebug> -#include <KDebug> #include <kauthexecutejob.h> #include <KPluginFactory> #include <KSharedConfig> -#include <KAuth/Action> +#include <KAuthAction> #include "xrandrxcbhelper.h" #include "xrandrbrightness.h" #include "upowersuspendjob.h" #include "login1suspendjob.h" -#include "upstart_interface.h" #include "udevqt.h" #define HELPER_ID "org.kde.powerdevil.backlighthelper" -bool checkSystemdVersion(uint requiredVersion) -{ - - QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", - QDBusConnection::systemBus(), 0); - - const QString reply = systemdIface.property("Version").toString(); - - QRegExp expsd("(systemd )?([0-9]+)"); - - if (expsd.exactMatch(reply)) { - const uint version = expsd.cap(2).toUInt(); - return (version >= requiredVersion); - } - - // Since version 1.11 Upstart user sessions implement the exact same API as logind - // and are going to the maintain the API in future releases. - // Hence, powerdevil can support this init system as well - // This has no effect on systemd integration since the check is done after systemd - ComUbuntuUpstart0_6Interface upstartInterface(QLatin1String("com.ubuntu.Upstart"), - QLatin1String("/com/ubuntu/Upstart"), - QDBusConnection::sessionBus()); - - QRegExp exp("(?:init \$)?upstart ([0-9.]+)(?:\$)?"); - if(exp.exactMatch(upstartInterface.version())) { - // Only keep the X.Y part of a X.Y.Z version - QStringList items = exp.cap(1).split('.').mid(0, 2); - const float upstartVersion = items.join(QString('.')).toFloat(); - return upstartVersion >= 1.1; - } - - kDebug() << "No appropriate systemd version or upstart version found"; - return false; -} - PowerDevilUPowerBackend::PowerDevilUPowerBackend(QObject* parent) : BackendInterface(parent), m_brightnessControl(0), - m_lidIsPresent(false), m_lidIsClosed(false), m_onBattery(false), m_kbdMaxBrightness(0) + m_kbdMaxBrightness(0), + m_lidIsPresent(false), m_lidIsClosed(false), m_onBattery(false) { } @@ -92,7 +59,7 @@ { if (!QDBusConnection::systemBus().interface()->isServiceRegistered(UPOWER_SERVICE)) { // Is it pending activation? - kDebug() << "UPower service, " << UPOWER_SERVICE << ", is not registered on the bus. Trying to find out if it is activated."; + qCDebug(POWERDEVIL) << "UPower service, " << UPOWER_SERVICE << ", is not registered on the bus. Trying to find out if it is activated."; QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", @@ -103,7 +70,7 @@ if (reply.isValid()) { if (reply.value().contains(UPOWER_SERVICE)) { - kDebug() << "UPower was found, activating service..."; + qCDebug(POWERDEVIL) << "UPower was found, activating service..."; QDBusConnection::systemBus().interface()->startService(UPOWER_SERVICE); if (!QDBusConnection::systemBus().interface()->isServiceRegistered(UPOWER_SERVICE)) { // Wait for it @@ -122,7 +89,7 @@ e.exec(); if (!timer->isActive()) { - kDebug() << "Activation of UPower timed out. There is likely a problem with your configuration."; + qCDebug(POWERDEVIL) << "Activation of UPower timed out. There is likely a problem with your configuration."; timer->deleteLater(); return false; } @@ -132,11 +99,11 @@ } return true; } else { - kDebug() << "UPower cannot be found on this system."; + qCDebug(POWERDEVIL) << "UPower cannot be found on this system."; return false; } } else { - kWarning() << "Could not request activatable names to DBus!"; + qCWarning(POWERDEVIL) << "Could not request activatable names to DBus!"; return false; } } else { @@ -165,7 +132,7 @@ m_upowerInterface = new OrgFreedesktopUPowerInterface(UPOWER_SERVICE, "/org/freedesktop/UPower", QDBusConnection::systemBus(), this); m_brightnessControl = new XRandrBrightness(); if (!m_brightnessControl->isSupported()) { - kDebug() << "Using helper"; + qCDebug(POWERDEVIL) << "Using helper"; KAuth::Action action("org.kde.powerdevil.backlighthelper.syspath"); action.setHelperId(HELPER_ID); KAuth::ExecuteJob* job = action.execute(); @@ -178,7 +145,7 @@ screenBrightnessAvailable = true; } } else { - kDebug() << "Using XRandR"; + qCDebug(POWERDEVIL) << "Using XRandR"; m_randrHelper = XRandRXCBHelper::self(); Q_ASSERT(m_randrHelper); connect(m_randrHelper, SIGNAL(brightnessChanged()), this, SLOT(slotScreenBrightnessChanged())); @@ -212,7 +179,7 @@ if (screenBrightnessAvailable) { controls.insert(QLatin1String("LVDS1"), Screen); m_cachedBrightnessMap.insert(Screen, brightnessValue(Screen)); - kDebug() << "current screen brightness value: " << m_cachedBrightnessMap.value(Screen); + qCDebug(POWERDEVIL) << "current screen brightness value: " << m_cachedBrightnessMap.value(Screen); } m_kbdBacklight = new OrgFreedesktopUPowerKbdBacklightInterface(UPOWER_SERVICE, "/org/freedesktop/UPower/KbdBacklight", QDBusConnection::systemBus(), this); @@ -227,14 +194,14 @@ if (m_kbdMaxBrightness) { controls.insert(QLatin1String("KBD"), Keyboard); m_cachedBrightnessMap.insert(Keyboard, brightnessValue(Keyboard)); - kDebug() << "current keyboard backlight brightness value: " << m_cachedBrightnessMap.value(Keyboard); + qCDebug(POWERDEVIL) << "current keyboard backlight brightness value: " << m_cachedBrightnessMap.value(Keyboard); connect(m_kbdBacklight, SIGNAL(BrightnessChanged(int)), this, SLOT(onKeyboardBrightnessChanged(int))); } } // Supported suspend methods SuspendMethods supported = UnknownSuspendMethod; - if (m_login1Interface && checkSystemdVersion(195)) { + if (m_login1Interface) { QDBusPendingReply<QString> canSuspend = m_login1Interface.data()->asyncCall("CanSuspend"); canSuspend.waitForFinished(); if (canSuspend.isValid() && (canSuspend.value() == "yes" \|\| canSuspend.value() == "challenge")) @@ -251,18 +218,18 @@ supported \|= HybridSuspend; } else { if (m_upowerInterface->canSuspend() && m_upowerInterface->SuspendAllowed()) { - kDebug() << "Can suspend"; + qCDebug(POWERDEVIL) << "Can suspend"; supported \|= ToRam; } if (m_upowerInterface->canHibernate() && m_upowerInterface->HibernateAllowed()) { - kDebug() << "Can hibernate"; + qCDebug(POWERDEVIL) << "Can hibernate"; supported \|= ToDisk; } } // "resuming" signal - if (m_login1Interface && checkSystemdVersion(198)) { + if (m_login1Interface) { connect(m_login1Interface.data(), SIGNAL(PrepareForSleep(bool)), this, SLOT(slotLogin1Resuming(bool))); } else { connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend())); @@ -294,7 +261,7 @@ void PowerDevilUPowerBackend::onDeviceChanged(const UdevQt::Device &device) { - kDebug() << "Udev device changed" << m_syspath << device.sysfsPath(); + qCDebug(POWERDEVIL) << "Udev device changed" << m_syspath << device.sysfsPath(); if (device.sysfsPath() != m_syspath) { return; } @@ -342,25 +309,25 @@ if (type == Screen) { if (m_brightnessControl->isSupported()) { - //kDebug() << "Calling xrandr brightness"; + //qCDebug(POWERDEVIL) << "Calling xrandr brightness"; result = (int) m_brightnessControl->brightnessValue(); } else { - //kDebug() << "Falling back to helper to get brightness"; + //qCDebug(POWERDEVIL) << "Falling back to helper to get brightness"; KAuth::Action action("org.kde.powerdevil.backlighthelper.brightnessvalue"); action.setHelperId(HELPER_ID); KAuth::ExecuteJob *job = action.execute(); if (job->exec()) {
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/upower/powerdevilupowerbackend.desktop ^
@@ -9,6 +9,7 @@ Name[cs]=Podpůrná vrstva UPower PowerDevil Name[da]=UPower-motor til PowerDevil Name[de]=UPower-PowerDevil-Modul +Name[el]=Σύστημα υποστήριξης UPower PowerDevil Name[en_GB]=UPower PowerDevil Backend Name[es]=Motor PowerDevil de UPower Name[fi]=UPower PowerDevil-taustaosa @@ -16,8 +17,10 @@ Name[hu]=UPower Powerdevil-modul Name[ia]=UPower PowerDevil Backend (RetroAdministration de Powerdevil de UPower) Name[id]=Ujung Belakang UPower PowerDevil +Name[it]=Motore UPower di PowerDevil Name[ja]=UPower PowerDevil バックエンド Name[ko]=UPower PowerDevil 백엔드 +Name[lt]=UPower PowerDevil programinė sąsaja Name[nb]=UPower PowerDevil-motor Name[nds]=Hülpprogramm för den UPower-Stroomdüvel Name[nl]=Backend voor UPower PowerDevil @@ -45,6 +48,7 @@ Comment[cs]=Využít démon freedesktop.org upower pro systém správy napájení KDE Comment[da]=Brug KDE strømstyring via upower-dæmonen fra freedesktop.org Comment[de]=Das KDE-Energieverwaltungssystem mit Hilfe des upower-Dienstes von freedesktop.org verwenden +Comment[el]=Διαχείριση ενέργειας του ΚDE με χρήση του δαίμονα upower του freedesktop.org Comment[en_GB]=Use KDE Power Management system through freedesktop.org upower daemon Comment[es]=Usar el sistema de ahorro de energía de KDE a través del demonio upower de freedesktop.org Comment[fi]=KDE:n virranhallintajärjestelmän käyttö freedesktop.org upower-taustaprosessilla @@ -52,8 +56,10 @@ Comment[hu]=A KDE energiakezelő rendszerének használata a freedesktop.org upower démonán keresztül Comment[ia]=Usa systema de gestion de energia de KDE usante demone upower de freedesktop.org Comment[id]=Gunakan sistem Manajemen Daya KDE melalui freedesktop.org upower daemon +Comment[it]=Usa il sistema di gestione energetica di KDE attraverso il demone upower di freedesktop.org Comment[ja]=freedesktop.org の upower デーモンを介して KDE 電源管理を使用 Comment[ko]=freedesktop.org UPower 데몬을 사용하는 KDE 전원 관리 시스템 +Comment[lt]=Naudoti KDE energijos valdymo sistemą, naudojant freedesktop.org HAL tarnybą Comment[nb]=Bruk KDE strømstyringssystem med upower-nissen fra freedesktop.org Comment[nds]=Den UPower-Dämoon vun freedesktop.org för de KDE-Stroomkuntrull bruken Comment[nl]=KDE energiebeheer gebruiken via de upower-daemon van freedesktop.org
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/upower/powerdevilupowerbackend.h ^
@@ -27,8 +27,6 @@ #include <QtDBus/QDBusConnection> #include <QtDBus/QDBusInterface> -#include <kdemacros.h> - #include "upower_device_interface.h" #include "upower_interface.h" #include "upower_kbdbacklight_interface.h" @@ -65,6 +63,7 @@ private: void enumerateDevices(); + void addDevice(const QString &); private slots: void updateDeviceProps();
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/upower/udevqtclient.cpp ^
@@ -21,6 +21,8 @@ #include "udevqtclient.h" #include "udevqt_p.h" +#include <powerdevil_debug.h> + #include <QtCore/QSocketNotifier> #include <qplatformdefs.h> @@ -55,7 +57,7 @@ struct udev_monitor *newM = udev_monitor_new_from_netlink(udev, "udev"); if (!newM) { - qWarning("UdevQt: unable to create udev monitor connection"); + qCWarning(POWERDEVIL, "UdevQt: unable to create udev monitor connection"); return; } @@ -112,7 +114,7 @@ } else if (action == "offline") { emit q->deviceOfflined(device); } else { - qWarning("UdevQt: unhandled device action \"%s\"", action.constData()); + qCWarning(POWERDEVIL, "UdevQt: unhandled device action \"%s\"", action.constData()); } }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/upower/upowersuspendjob.cpp ^
@@ -22,11 +22,12 @@ #include "upower_interface.h" +#include <powerdevil_debug.h> + #include <QtDBus/QDBusMessage> #include <QtDBus/QDBusReply> #include <QTimer> -#include <KDebug> -#include <KLocale> +#include <QDebug> #include <KLocalizedString> UPowerSuspendJob::UPowerSuspendJob(OrgFreedesktopUPowerInterface *upowerInterface, @@ -34,7 +35,7 @@ PowerDevil::BackendInterface::SuspendMethods supported) : KJob(), m_upowerInterface(upowerInterface) { - kDebug() << "Starting UPower suspend job"; + qCDebug(POWERDEVIL) << "Starting UPower suspend job"; m_method = method; m_supported = supported; @@ -66,7 +67,7 @@ m_upowerInterface->Hibernate(); break; default: - kDebug() << "This backend doesn't support hybrid mode"; + qCDebug(POWERDEVIL) << "This backend doesn't support hybrid mode"; setError(1); setErrorText(i18n("Unsupported suspend method")); break;
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/backends/upower/xrandrbrightness.cpp ^
@@ -17,6 +17,8 @@ * */ +#include <powerdevil_debug.h> + #include "xrandrbrightness.h" #include <stdio.h> @@ -33,13 +35,13 @@ int major, minor; if (!XRRQueryVersion (QX11Info::display(), &major, &minor)) { - qWarning("RandR extension missing"); + qCWarning(POWERDEVIL, "RandR extension missing"); return; } if (major < 1 \|\| (major == 1 && minor < 2)) { - qWarning("RandR version %d.%d too old", major, minor); + qCWarning(POWERDEVIL, "RandR version %d.%d too old", major, minor); return; } @@ -49,7 +51,7 @@ if (m_backlight == None) { - qWarning("No outputs have backlight property"); + qCWarning(POWERDEVIL, "No outputs have backlight property"); return; } @@ -57,7 +59,7 @@ if (!m_resources) { - qWarning("No available Randr resources"); + qCWarning(POWERDEVIL, "No available Randr resources"); return; } }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/brightnessosdwidget.cpp ^
@@ -5,6 +5,7 @@ * Copyright 2009 Dario Andres Rodriguez <andresbajotierra@gmail.com> * Copyright 2009 Christian Esken <christian.esken@arcor.de> * Copyright 2010 Felix Geyer <debfx-kde@fobos.de> +* Copyright 2015 Kai Uwe Broulik <kde@privat.broulik.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -23,33 +24,31 @@ #include "brightnessosdwidget.h" -// Qt -#include <QObject> #include <QtDBus/QDBusInterface> #include <QtDBus/QDBusPendingCall> -BrightnessOSDWidget::BrightnessOSDWidget(PowerDevil::BackendInterface::BrightnessControlType type, QObject *parent) - : QObject(parent) - , m_type(type) +namespace BrightnessOSDWidget { -} - -BrightnessOSDWidget::~BrightnessOSDWidget() +void show(int percentage, PowerDevil::BackendInterface::BrightnessControlType type) { -} + QString method; + if (type == PowerDevil::BackendInterface::Keyboard) { + method = QLatin1Literal("keyboardBrightnessChanged"); + } else { + method = QLatin1Literal("brightnessChanged"); + } -void BrightnessOSDWidget::setCurrentBrightness(int brightnessLevel) -{ QDBusMessage msg = QDBusMessage::createMethodCall( QLatin1Literal("org.kde.plasmashell"), QLatin1Literal("/org/kde/osdService"), QLatin1Literal("org.kde.osdService"), - QLatin1Literal("brightnessChanged") + method ); - msg.setArguments(QList<QVariant>() << brightnessLevel); + msg << percentage; QDBusConnection::sessionBus().asyncCall(msg); } -#include "brightnessosdwidget.moc" + +}
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/brightnessosdwidget.h ^
@@ -5,6 +5,7 @@ * Copyright 2009 Dario Andres Rodriguez <andresbajotierra@gmail.com> * Copyright 2009 Christian Esken <christian.esken@arcor.de> * Copyright 2010 Felix Geyer <debfx-kde@fobos.de> +* Copyright 2015 Kai Uwe Broulik <kde@privat.broulik.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -21,25 +22,16 @@ * *****************************************************************/ -#ifndef BRIGHTNESSOSDWIDGET__H -#define BRIGHTNESSOSDWIDGET__H +#ifndef BRIGHTNESSOSDWIDGET_H +#define BRIGHTNESSOSDWIDGET_H #include "powerdevilbackendinterface.h" -#include <QDBusInterface> - -class BrightnessOSDWidget : public QObject +namespace BrightnessOSDWidget { -Q_OBJECT -public: - BrightnessOSDWidget(PowerDevil::BackendInterface::BrightnessControlType type, QObject parent = 0); - virtual ~BrightnessOSDWidget(); - - void setCurrentBrightness(int brightnessLevel); - -private: - int m_brightness; - PowerDevil::BackendInterface::BrightnessControlType m_type; -}; -#endif + void show(int percentage, PowerDevil::BackendInterface::BrightnessControlType type = PowerDevil::BackendInterface::Screen); + +} + +#endif // BRIGHTNESSOSDWIDGET_H
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/kdedpowerdevil.cpp ^
@@ -25,14 +25,15 @@ #include "powerdevilbackendloader.h" #include "powerdevilcore.h" +#include "powerdevil_debug.h" #include <QtCore/QTimer> #include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnectionInterface> +#include <QDebug> #include <KAboutData> -#include <KDebug> #include <KPluginFactory> #include <KSharedConfig> #include <KLocalizedString> @@ -67,7 +68,7 @@ if (QDBusConnection::systemBus().interface()->isServiceRegistered("org.freedesktop.PowerManagement") \|\| QDBusConnection::systemBus().interface()->isServiceRegistered("com.novell.powersave") \|\| QDBusConnection::systemBus().interface()->isServiceRegistered("org.freedesktop.Policy.Power")) { - kError() << "KDE Power Management system not initialized, another power manager has been detected"; + qCCritical(POWERDEVIL) << "KDE Power Management system not initialized, another power manager has been detected"; return; } @@ -80,18 +81,18 @@ if (!interface) { // Ouch - kError() << "KDE Power Management System init failed!"; + qCCritical(POWERDEVIL) << "KDE Power Management System init failed!"; m_core->loadCore(0); } else { // Let's go! - kDebug() << "Backend loaded, loading core"; + qCDebug(POWERDEVIL) << "Backend loaded, loading core"; m_core->loadCore(interface); } } void KDEDPowerDevil::onCoreReady() { - kDebug() << "Core is ready, registering various services on the bus..."; + qCDebug(POWERDEVIL) << "Core is ready, registering various services on the bus..."; //DBus logic for the core new PowerManagementAdaptor(m_core); new PowerDevil::FdoConnector(m_core);
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/org.kde.Solid.PowerManagement.xml ^
@@ -19,6 +19,9 @@ <method name="isLidClosed"> <arg type="b" direction="out" /> </method> + <method name="isLidPresent"> + <arg type="b" direction="out" /> + </method> <method name="isActionSupported"> <arg type="s" direction="in" /> <arg type="b" direction="out" />
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevil.desktop ^
@@ -14,6 +14,7 @@ Name[cs]=Správa napájení Name[da]=Strømstyring Name[de]=Energieverwaltung +Name[el]=Διαχείριση ενέργειας Name[en_GB]=Power Management Name[es]=Gestión de energía Name[fi]=Virranhallinta @@ -21,7 +22,9 @@ Name[hu]=Energiakezelés Name[ia]=Gestion de energia Name[id]=Manajemen Daya +Name[it]=Gestione energetica Name[ko]=전원 관리 +Name[lt]=Energijos valdymas Name[nb]=Strømstyring Name[nds]=Stroompleeg Name[nl]=Energiebeheer @@ -50,6 +53,7 @@ Comment[cs]=Správa a oznamování baterie, zobrazení a výkonu CPU Comment[da]=Bekendtgørelser om strømstyring for batteri, skærm og CPU Comment[de]=Akku-, Anzeige- und Prozessorleistungsverwaltung und -benachrichtigung +Comment[el]=Μπαταρία, Εμφάνιση και διαχείριση ενέργειας και ειδοποιήσεων ΚΜΕ Comment[en_GB]=Battery, Display and CPU power management and notification Comment[es]=Gestión de energía y notificaciones de la batería, la pantalla y la CPU Comment[fi]=Akun, näytön ja suorittimen virranhallinta sekä ilmoitukset @@ -57,8 +61,10 @@ Comment[hu]=Akkumulátor-, kijelző- és processzorkezelés és értesítés Comment[ia]=Batteria, monstrator, gestion de energia de CPU e notification Comment[id]=Baterai, Penampil dan manajemen daya CPU dan pemberitahuan +Comment[it]=Gestione e notifica di batteria, schermo e consumo del processore Comment[ja]=バッテリ、ディスプレイ、CPU の電源管理と通知 Comment[ko]=배터리, 디스플레이, CPU 전원 관리 및 알림 +Comment[lt]=Baterijos, Monitoriaus ir CPU energijos valdymas ir pranešimai Comment[nb]=Håndtering og varsling for strømstyring av batteri, skjerm og prosessor Comment[nds]=Batterie-, Schirm- un Perzesser-Stroomkuntrull un -Bescheden Comment[nl]=Energiebeheer voor accu, scherm en CPU en meldingen
[-] [+]	Added	powerdevil-5.1.90.tar.xz/daemon/powerdevil_debug.cpp ^
@@ -0,0 +1,21 @@ +/* This file is part of the KDE project + Copyright (C) 2014 Hrvoje Senjan <hrvoje.senjan@gmail.com> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "powerdevil_debug.h" +Q_LOGGING_CATEGORY(POWERDEVIL, "powerdevil") \ No newline at end of file
[-] [+]	Added	powerdevil-5.1.90.tar.xz/daemon/powerdevil_debug.h ^
@@ -0,0 +1,26 @@ +/* This file is part of the KDE project + Copyright (C) 2014 Hrvoje Senjan <hrvoje.senjan@gmail.com> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef PROCESSCORE_DEBUG_H +#define PROCESSCORE_DEBUG_H + +#include <QLoggingCategory> +Q_DECLARE_LOGGING_CATEGORY(POWERDEVIL) + +#endif \ No newline at end of file
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilaction.cpp ^
@@ -20,8 +20,9 @@ #include "powerdevilaction.h" #include "powerdevilcore.h" +#include "powerdevil_debug.h" -#include <KDebug> +#include <QDebug> namespace PowerDevil { @@ -100,7 +101,7 @@ triggerImpl(args); } else { // TODO: Notify somehow? - kWarning() << "Unsatisfied policies, the action has been aborted"; + qCWarning(POWERDEVIL) << "Unsatisfied policies, the action has been aborted"; } } }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilactionpool.cpp ^
@@ -22,14 +22,14 @@ #include "powerdevilaction.h" #include "powerdevilcore.h" +#include "powerdevil_debug.h" #include <KConfigGroup> -#include <KDebug> -#include <KGlobal> #include <KServiceTypeTrader> #include <KPluginInfo> #include <QtDBus/QDBusConnection> +#include <QDebug> // Bundled actions: #include "actions/bundled/suspendsession.h" @@ -52,7 +52,7 @@ ActionPool q; }; -K_GLOBAL_STATIC(ActionPoolHelper, s_globalActionPool) +Q_GLOBAL_STATIC(ActionPoolHelper, s_globalActionPool) ActionPool ActionPool::instance() { @@ -92,13 +92,13 @@ foreach (KService::Ptr offer, offers) { QString actionId = offer->property("X-KDE-PowerDevil-Action-ID", QVariant::String).toString(); - kDebug() << "Got a valid offer for " << actionId; + qCDebug(POWERDEVIL) << "Got a valid offer for " << actionId; //try to load the specified library PowerDevil::Action *retaction = offer->createInstance< PowerDevil::Action >(parent); if (!retaction) { // Troubles... - kWarning() << "failed to load" << offer->desktopEntryName(); + qCWarning(POWERDEVIL) << "failed to load" << offer->desktopEntryName(); continue; }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilactionpool.h ^
@@ -24,8 +24,6 @@ #include <QtCore/QHash> #include <QtCore/QStringList> -#include <kglobal.h> - class KConfigGroup; namespace PowerDevil {
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilbackendinterface.cpp ^
@@ -20,7 +20,8 @@ #include "powerdevilbackendinterface.h" #include "powerdevilscreenbrightnesslogic.h" #include "powerdevilkeyboardbrightnesslogic.h" -#include <KDebug> +#include "powerdevil_debug.h" +#include <QDebug> namespace PowerDevil { @@ -80,9 +81,9 @@ bool BackendInterface::setBrightness(float brightness, BackendInterface::BrightnessControlType type) { if (type == Screen) { - kDebug() << "set screen brightness percentage: " << brightness; + qCDebug(POWERDEVIL) << "set screen brightness percentage: " << brightness; } else { - kDebug() << "set kbd backlight percentage: " << brightness; + qCDebug(POWERDEVIL) << "set kbd backlight percentage: " << brightness; } return setBrightnessValue(qRound(brightness / 100 * brightnessValueMax(type)), type);
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilbackendinterface.h ^
@@ -24,7 +24,6 @@ #include <QtCore/QObject> #include <QtCore/QHash> -#include <kdemacros.h> #include "powerdevilbrightnesslogic.h" class KJob;
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilbackendloader.cpp ^
@@ -20,13 +20,14 @@ #include <config-powerdevil.h> #include "powerdevilbackendloader.h" +#include "powerdevil_debug.h" #ifdef HAVE_UDEV #include "backends/upower/powerdevilupowerbackend.h" #endif #include "backends/hal/powerdevilhalbackend.h" -#include <KDebug> +#include <QDebug> namespace PowerDevil { namespace BackendLoader { @@ -35,24 +36,24 @@ { #ifdef HAVE_UDEV // Check UPower first - kDebug() << "Loading UPower backend..."; + qCDebug(POWERDEVIL) << "Loading UPower backend..."; if (PowerDevilUPowerBackend::isAvailable()) { - kDebug() << "Success!"; + qCDebug(POWERDEVIL) << "Success!"; return new PowerDevilUPowerBackend(parent); } - kDebug() << "Failed!"; + qCDebug(POWERDEVIL) << "Failed!"; #endif // If we are here, try HAL - kDebug() << "Loading HAL backend..."; + qCDebug(POWERDEVIL) << "Loading HAL backend..."; if (PowerDevilHALBackend::isAvailable()) { - kDebug() << "Success!"; + qCDebug(POWERDEVIL) << "Success!"; return new PowerDevilHALBackend(parent); } // Fail... - kDebug() << "Failed!"; + qCDebug(POWERDEVIL) << "Failed!"; return 0; }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilcore.cpp ^
@@ -27,6 +27,7 @@ #include "powerdevilbackendinterface.h" #include "powerdevilpolicyagent.h" #include "powerdevilprofilegenerator.h" +#include "powerdevil_debug.h" #include "actions/bundled/suspendsession.h" @@ -34,27 +35,28 @@ #include <Solid/Device> #include <Solid/DeviceNotifier> -#include <KDebug> #include <KIdleTime> #include <KLocalizedString> #include <KMessageBox> #include <KNotification> #include <KServiceTypeTrader> -#include <KStandardDirs> // #include <KActivities/Consumer> #include <QtCore/QTimer> #include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnectionInterface> +#include <QtDBus/QDBusServiceWatcher> + +#include <QDebug> namespace PowerDevil { -Core::Core(QObject* parent/, const KComponentData &componentData/) +Core::Core(QObject* parent) : QObject(parent) , m_backend(0) -// , m_applicationData(componentData) + , m_notificationsWatcher(nullptr) , m_criticalBatteryTimer(new QTimer(this)) // , m_activityConsumer(new KActivities::Consumer(this)) , m_pendingWakeupEvent(true) @@ -79,7 +81,7 @@ m_backend = backend; // Async backend init - so that KDED gets a bit of a speed up - kDebug() << "Core loaded, initializing backend"; + qCDebug(POWERDEVIL) << "Core loaded, initializing backend"; connect(m_backend, SIGNAL(backendReady()), this, SLOT(onBackendReady())); connect(m_backend, SIGNAL(backendError(QString)), this, SLOT(onBackendError(QString))); m_backend->init(); @@ -90,7 +92,7 @@ void Core::onBackendReady() { - kDebug() << "Backend is ready, KDE Power Management system initialized"; + qCDebug(POWERDEVIL) << "Backend is ready, KDE Power Management system initialized"; m_profilesConfig = KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::CascadeConfig); @@ -99,12 +101,7 @@ // Generate defaults bool toRam = m_backend->supportedSuspendMethods() & PowerDevil::BackendInterface::ToRam; bool toDisk = m_backend->supportedSuspendMethods() & PowerDevil::BackendInterface::ToDisk; - if (ProfileGenerator::generateProfiles(toRam, toDisk, true) == ProfileGenerator::ResultUpgraded) { - // Notify the user - emitNotification("warningnot", i18n("Your Power Profiles have been updated to be used with the new KDE Power " - "Management System. You can tweak them or generate a new set of defaults from " - "System Settings."), "system-software-update"); - } + ProfileGenerator::generateProfiles(toRam, toDisk); m_profilesConfig->reparseConfiguration(); } @@ -144,8 +141,20 @@ m_criticalBatteryTimer->setInterval(30000); connect(m_criticalBatteryTimer, SIGNAL(timeout()), this, SLOT(onCriticalBatteryTimerExpired())); - // In 30 seconds (so we are sure the user sees eventual notifications), check the battery state - QTimer::singleShot(30000, this, SLOT(checkBatteryStatus())); + // wait until the notification system is set up before firing notifications + // to avoid them showing ontop of ksplash... + if (QDBusConnection::sessionBus().interface()->isServiceRegistered("org.freedesktop.Notifications")) { + onServiceRegistered(QString()); + } else { + m_notificationsWatcher = new QDBusServiceWatcher("org.freedesktop.Notifications", + QDBusConnection::sessionBus(), + QDBusServiceWatcher::WatchForRegistration, + this); + connect(m_notificationsWatcher, SIGNAL(serviceRegistered(QString)), this, SLOT(onServiceRegistered(QString))); + + // ...but fire them after 30s nonetheless to ensure they've been shown + QTimer::singleShot(30000, this, SLOT(onNotificationTimeout())); + } // All systems up Houston, let's go! emit coreReady(); @@ -220,7 +229,7 @@ void Core::reparseConfiguration() { - PowerDevilSettings::self()->readConfig(); + PowerDevilSettings::self()->load(); m_profilesConfig->reparseConfiguration(); // Config reloaded @@ -233,7 +242,7 @@ // Policy check if (PolicyAgent::instance()->requirePolicyCheck(PolicyAgent::ChangeProfile) != PolicyAgent::None) { - kDebug() << "Policy Agent prevention: on"; + qCDebug(POWERDEVIL) << "Policy Agent prevention: on"; return; } @@ -244,9 +253,9 @@ if (activity.isEmpty()) { activity = "default"; } - kDebug() << "We are now into activity " << activity; + qCDebug(POWERDEVIL) << "We are now into activity " << activity; KConfigGroup activitiesConfig(m_profilesConfig, "Activities"); - kDebug() << activitiesConfig.groupList() << activitiesConfig.keyList(); + qCDebug(POWERDEVIL) << activitiesConfig.groupList() << activitiesConfig.keyList(); // Are we mirroring an activity? if (activitiesConfig.group(activity).readEntry("mode", "None") == "ActLike" && @@ -255,17 +264,17 @@ activitiesConfig.group(activity).readEntry("actLike", QString()) != "LowBattery") { // Yes, let's use that then activity = activitiesConfig.group(activity).readEntry("actLike", QString()); - kDebug() << "Activity is a mirror"; + qCDebug(POWERDEVIL) << "Activity is a mirror"; } KConfigGroup activityConfig = activitiesConfig.group(activity); - kDebug() << activityConfig.groupList() << activityConfig.keyList(); + qCDebug(POWERDEVIL) << activityConfig.groupList() << activityConfig.keyList(); // See if this activity has priority if (activityConfig.readEntry("mode", "None") == "SeparateSettings") { // Prioritize this profile over anything config = activityConfig.group("SeparateSettings"); - kDebug() << "Activity is enforcing a different profile"; + qCDebug(POWERDEVIL) << "Activity is enforcing a different profile"; profileId = activity; } else if (activityConfig.readEntry("mode", "None") == "ActLike") { if (activityConfig.readEntry("actLike", QString()) == "AC" \|\| @@ -274,12 +283,12 @@ // Same as above, but with an existing profile config = m_profilesConfig.data()->group(activityConfig.readEntry("actLike", QString())); profileId = activityConfig.readEntry("actLike", QString()); - kDebug() << "Activity is mirroring a different profile"; + qCDebug(POWERDEVIL) << "Activity is mirroring a different profile"; } } else { // It doesn't, let's load the current state's profile if (m_loadedBatteriesUdi.isEmpty()) { - kDebug() << "No batteries found, loading AC"; + qCDebug(POWERDEVIL) << "No batteries found, loading AC"; profileId = "AC"; } else { // Compute the previous and current global percentage @@ -287,18 +296,18 @@ if (backend()->acAdapterState() == BackendInterface::Plugged) { profileId = "AC"; - kDebug() << "Loading profile for plugged AC"; + qCDebug(POWERDEVIL) << "Loading profile for plugged AC"; } else if (percent <= PowerDevilSettings::batteryLowLevel()) { profileId = "LowBattery"; - kDebug() << "Loading profile for low battery"; + qCDebug(POWERDEVIL) << "Loading profile for low battery"; } else { profileId = "Battery"; - kDebug() << "Loading profile for unplugged AC"; + qCDebug(POWERDEVIL) << "Loading profile for unplugged AC"; } } config = m_profilesConfig.data()->group(profileId); - kDebug() << "Activity is not forcing a profile"; + qCDebug(POWERDEVIL) << "Activity is not forcing a profile"; } // Release any special inhibitions @@ -326,7 +335,7 @@ // Check: do we need to change profile at all? if (m_currentProfile == profileId && !force) { // No, let's leave things as they are - kDebug() << "Skipping action reload routine as profile has not changed"; + qCDebug(POWERDEVIL) << "Skipping action reload routine as profile has not changed"; // Do we need to force a wakeup? if (m_pendingWakeupEvent) { @@ -355,7 +364,7 @@ } else { // Ouch, error. But let's just warn and move on anyway //TODO Maybe Remove from the configuration if unsupported - kWarning() << "The profile " << profileId << "tried to activate" + qCWarning(POWERDEVIL) << "The profile " << profileId << "tried to activate"
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilcore.h ^
@@ -26,7 +26,7 @@ #include <QtCore/QWeakPointer> #include <QtCore/QStringList> -#include <KComponentData> +#include <KSharedConfig> namespace KActivities { @@ -35,8 +35,10 @@ typedef QMap< QString, QString > StringStringMap; class KDirWatch; +class QDBusServiceWatcher; class QTimer; class KNotification; + namespace Solid { class Battery; } @@ -54,7 +56,7 @@ Q_CLASSINFO("D-Bus Interface", "org.kde.Solid.PowerManagement") public: - explicit Core(QObject* parent/, const KComponentData &componentData/); + explicit Core(QObject* parent); virtual ~Core(); void reloadProfile(int state); @@ -81,7 +83,8 @@ qulonglong batteryRemainingTime() const; - bool isLidClosed(); + bool isLidClosed() const; + bool isLidPresent() const; bool isActionSupported(const QString &actionName); Q_SIGNALS: @@ -106,7 +109,8 @@ QStringList m_loadedBatteriesUdi; QWeakPointer< KNotification > notification; -// KComponentData m_applicationData; + QDBusServiceWatcher *m_notificationsWatcher; + KSharedConfigPtr m_profilesConfig; QString m_currentProfile; @@ -139,6 +143,8 @@ void onDeviceAdded(const QString &udi); void onDeviceRemoved(const QString &udi); void onCriticalBatteryTimerExpired(); + void onNotificationTimeout(); + void onServiceRegistered(const QString &service); }; }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilkeyboardbrightnesslogic.cpp ^
@@ -18,7 +18,8 @@ ***************************************************************************/ #include "powerdevilkeyboardbrightnesslogic.h" -#include <KDebug> +#include "powerdevil_debug.h" +#include <QDebug> namespace PowerDevil { @@ -47,7 +48,7 @@ return 3; // 29 different maxValue values between 11 and 79 are left at this point. - //kDebug() << "maxValue" << maxValue; + //qCDebug(POWERDEVIL) << "maxValue" << maxValue; // Give up and return 5, there is nothing much we can do here. return 5;
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilpolicyagent.cpp ^
@@ -30,10 +30,8 @@ #include <QtDBus/QDBusConnectionInterface> #include <QtDBus/QDBusServiceWatcher> -#include <KGlobal> -#include <KDebug> - #include "powerdevilpolicyagent.h" +#include "powerdevil_debug.h" #include "screensaver_interface.h" struct NamedDBusObjectPath @@ -75,7 +73,7 @@ PolicyAgent q; }; -K_GLOBAL_STATIC(PolicyAgentHelper, s_globalPolicyAgent) +Q_GLOBAL_STATIC(PolicyAgentHelper, s_globalPolicyAgent) PolicyAgent PolicyAgent::instance() { @@ -185,19 +183,19 @@ session.waitForFinished(); if (!session.isValid()) { - kDebug() << "The session is not registered with systemd"; + qCDebug(POWERDEVIL) << "The session is not registered with systemd"; m_sdAvailable = false; return; } QString sessionPath = session.value().path(); - kDebug() << "Session path:" << sessionPath; + qCDebug(POWERDEVIL) << "Session path:" << sessionPath; m_sdSessionInterface = new QDBusInterface(SYSTEMD_LOGIN1_SERVICE, sessionPath, SYSTEMD_LOGIN1_SESSION_IFACE, QDBusConnection::systemBus(), this); if (!m_sdSessionInterface.data()->isValid()) { // As above - kDebug() << "Can't contact session iface"; + qCDebug(POWERDEVIL) << "Can't contact session iface"; m_sdAvailable = false; delete m_sdSessionInterface.data(); return; @@ -210,7 +208,7 @@ QString seatPath = getNamedPathProperty(sessionPath, SYSTEMD_LOGIN1_SESSION_IFACE, "Seat"); if (seatPath.isEmpty() \|\| seatPath == "/") { - kDebug() << "Unable to associate systemd session with a seat" << seatPath; + qCDebug(POWERDEVIL) << "Unable to associate systemd session with a seat" << seatPath; m_sdAvailable = false; return; } @@ -221,7 +219,7 @@ if (!m_sdSeatInterface.data()->isValid()) { // As above - kDebug() << "Can't contact seat iface"; + qCDebug(POWERDEVIL) << "Can't contact seat iface"; m_sdAvailable = false; delete m_sdSeatInterface.data(); return; @@ -230,7 +228,7 @@ // finally get the active session path and watch for its changes m_activeSessionPath = getNamedPathProperty(seatPath, SYSTEMD_LOGIN1_SEAT_IFACE, "ActiveSession"); - kDebug() << "ACTIVE SESSION PATH:" << m_activeSessionPath; + qCDebug(POWERDEVIL) << "ACTIVE SESSION PATH:" << m_activeSessionPath; QDBusConnection::systemBus().connect(SYSTEMD_LOGIN1_SERVICE, seatPath, "org.freedesktop.DBus.Properties", "PropertiesChanged", this, SLOT(onActiveSessionChanged(QString,QVariantMap,QStringList))); @@ -238,7 +236,7 @@ setupSystemdInhibition(); - kDebug() << "systemd support initialized"; + qCDebug(POWERDEVIL) << "systemd support initialized"; } else if (serviceName == CONSOLEKIT_SERVICE) { m_ckAvailable = true; @@ -251,7 +249,7 @@ sessionPath.waitForFinished(); if (!sessionPath.isValid() \|\| sessionPath.value().path().isEmpty()) { - kDebug() << "The session is not registered with ck"; + qCDebug(POWERDEVIL) << "The session is not registered with ck"; m_ckAvailable = false; return; } @@ -261,7 +259,7 @@ if (!m_ckSessionInterface.data()->isValid()) { // As above - kDebug() << "Can't contact iface"; + qCDebug(POWERDEVIL) << "Can't contact iface"; m_ckAvailable = false; return; } @@ -271,7 +269,7 @@ seatPath.waitForFinished(); if (!seatPath.isValid() \|\| seatPath.value().path().isEmpty()) { - kDebug() << "Unable to associate ck session with a seat"; + qCDebug(POWERDEVIL) << "Unable to associate ck session with a seat"; m_ckAvailable = false; return; } @@ -279,7 +277,7 @@ if (!QDBusConnection::systemBus().connect(CONSOLEKIT_SERVICE, seatPath.value().path(), "org.freedesktop.ConsoleKit.Seat", "ActiveSessionChanged", this, SLOT(onActiveSessionChanged(QString)))) { - kDebug() << "Unable to connect to ActiveSessionChanged"; + qCDebug(POWERDEVIL) << "Unable to connect to ActiveSessionChanged"; m_ckAvailable = false; return; } @@ -292,10 +290,10 @@ onActiveSessionChanged(activeSession.value().path()); - kDebug() << "ConsoleKit support initialized"; + qCDebug(POWERDEVIL) << "ConsoleKit support initialized"; } else - kWarning() << "Unhandled service registered:" << serviceName; + qCWarning(POWERDEVIL) << "Unhandled service registered:" << serviceName; } void PolicyAgent::onSessionHandlerUnregistered(const QString & serviceName) @@ -316,7 +314,7 @@ if (ifaceName == SYSTEMD_LOGIN1_SEAT_IFACE && (changedProps.keys().contains(key) \|\| invalidatedProps.contains(key))) { m_activeSessionPath = getNamedPathProperty(m_sdSeatInterface.data()->path(), SYSTEMD_LOGIN1_SEAT_IFACE, key); - kDebug() << "ACTIVE SESSION PATH CHANGED:" << m_activeSessionPath; + qCDebug(POWERDEVIL) << "ACTIVE SESSION PATH CHANGED:" << m_activeSessionPath; onActiveSessionChanged(m_activeSessionPath); } } @@ -324,14 +322,14 @@ void PolicyAgent::onActiveSessionChanged(const QString& activeSession) { if (activeSession.isEmpty() \|\| activeSession == "/") { - kDebug() << "Switched to inactive session - leaving unchanged"; + qCDebug(POWERDEVIL) << "Switched to inactive session - leaving unchanged"; return; } else if ((!m_sdSessionInterface.isNull() && activeSession == m_sdSessionInterface.data()->path()) \|\| (!m_ckSessionInterface.isNull() && activeSession == m_ckSessionInterface.data()->path())) { - kDebug() << "Current session is now active"; + qCDebug(POWERDEVIL) << "Current session is now active"; m_wasLastActiveSession = true; } else { - kDebug() << "Current session is now inactive"; + qCDebug(POWERDEVIL) << "Current session is now inactive"; m_wasLastActiveSession = false; } } @@ -367,7 +365,7 @@ { if (!m_sdAvailable) { // No way to determine if we are on the current session, simply suppose we are - kDebug() << "Can't contact systemd"; + qCDebug(POWERDEVIL) << "Can't contact systemd"; } else if (!m_sdSessionInterface.isNull()) { bool isActive = m_sdSessionInterface.data()->property("Active").toBool(); @@ -378,7 +376,7 @@ if (!m_ckAvailable) { // No way to determine if we are on the current session, simply suppose we are - kDebug() << "Can't contact ck"; + qCDebug(POWERDEVIL) << "Can't contact ck"; } else if (!m_ckSessionInterface.isNull()) { QDBusPendingReply< bool > rp = m_ckSessionInterface.data()->asyncCall("IsActive"); rp.waitForFinished(); @@ -432,7 +430,7 @@ m_busWatcher.data()->addWatchedService(service); } - kDebug() << "Added inhibition from an explicit DBus service, " << service << ", with cookie " << + qCDebug(POWERDEVIL) << "Added inhibition from an explicit DBus service, " << service << ", with cookie " << m_lastCookie << " from " << appName << " with " << reason; addInhibitionTypeHelper(m_lastCookie, static_cast< PolicyAgent::RequiredPolicies >(types)); @@ -451,13 +449,13 @@ // Retrieve the service, if we've been called from DBus if (calledFromDBus() && !m_busWatcher.isNull()) { if (!message().service().isEmpty()) { - kDebug() << "DBus service " << message().service() << " is requesting inhibition"; + qCDebug(POWERDEVIL) << "DBus service " << message().service() << " is requesting inhibition"; m_cookieToBusService.insert(m_lastCookie, message().service()); m_busWatcher.data()->addWatchedService(message().service()); } } - kDebug() << "Added inhibition with cookie " << m_lastCookie << " from " << + qCDebug(POWERDEVIL) << "Added inhibition with cookie " << m_lastCookie << " from " << appName << " with " << reason; addInhibitionTypeHelper(m_lastCookie, static_cast< PolicyAgent::RequiredPolicies >(types)); @@ -472,14 +470,14 @@
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilpolicyagent.h ^
@@ -29,8 +29,6 @@ #include <QtDBus/QDBusContext> #include <QtDBus/QDBusUnixFileDescriptor> -#include <kdemacros.h> - class QDBusServiceWatcher; class QDBusInterface;
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilprofilegenerator.cpp ^
@@ -21,43 +21,16 @@ #include <PowerDevilSettings.h> -#include <QtCore/QFile> - #include <Solid/Device> #include <Solid/Battery> #include <KConfigGroup> #include <KSharedConfig> -#include <KLocalizedString> -#include <KNotification> -#include <KIcon> -#include <KStandardDirs> -#include <KGlobal> namespace PowerDevil { -ProfileGenerator::GeneratorResult ProfileGenerator::generateProfiles(bool toRam, bool toDisk, bool tryUpgrade) +void ProfileGenerator::generateProfiles(bool toRam, bool toDisk) { - if (tryUpgrade) { - bool isUpgraded = false; - KSharedConfigPtr oldProfilesConfigv1 = KSharedConfig::openConfig("powerdevilprofilesrc", KConfig::SimpleConfig); - if (!oldProfilesConfigv1->groupList().isEmpty()) { - // We can upgrade from v1, let's do that. - upgradeProfilesv1(toRam, toDisk); - isUpgraded = true; - } - KSharedConfigPtr oldProfilesConfigv2 = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig); - if (!oldProfilesConfigv2->groupList().isEmpty()) { - // We can upgrade from v2, let's do that. - upgradeProfilesv2(); - isUpgraded = true; - } - - if (isUpgraded) { - return ResultUpgraded; - } - } - // Let's change some defaults if (!toRam) { if (!toDisk) { @@ -196,165 +169,6 @@ // Save and be happy profilesConfig->sync(); - - return ResultGenerated; -} - -void ProfileGenerator::upgradeProfilesv1(bool toRam, bool toDisk) -{ - // Let's change some defaults - if (!toRam) { - if (!toDisk) { - PowerDevilSettings::setBatteryCriticalAction(None); - } else { - PowerDevilSettings::setBatteryCriticalAction(ToDiskMode); - } - } else { - PowerDevilSettings::setBatteryCriticalAction(ToRamMode); - } - - // Ok, let's get our config file. - KSharedConfigPtr profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig); - KSharedConfigPtr oldProfilesConfig = KSharedConfig::openConfig("powerdevilprofilesrc", KConfig::SimpleConfig); - - // And clear it - foreach (const QString &group, profilesConfig->groupList()) { - profilesConfig->deleteGroup(group); - } - - foreach (const QString &group, oldProfilesConfig->groupList()) { - KConfigGroup oldGroup = oldProfilesConfig->group(group); - KConfigGroup newGroup(profilesConfig, oldGroup.readEntry< QString >("name", QString())); - - // Read stuff - // Brightness. - { - KConfigGroup brightnessControl(&newGroup, "BrightnessControl"); - brightnessControl.writeEntry< int >("value", oldGroup.readEntry< int >("brightness", 100)); - } - // Dim screen - if (oldGroup.readEntry< bool >("dimOnIdle", false)) { - KConfigGroup dimDisplay(&newGroup, "DimDisplay"); - dimDisplay.writeEntry< int >("idleTime", oldGroup.readEntry< int >("dimOnIdleTime", 30) * 60 * 1000); - } - // DPMS - if (oldGroup.readEntry< bool >("DPMSEnabled", false) && oldGroup.readEntry< int >("DPMSPowerOff", 0) > 0) { - KConfigGroup dpmsControl(&newGroup, "DPMSControl"); - dpmsControl.writeEntry< uint >("idleTime", oldGroup.readEntry< int >("DPMSPowerOff", 30) * 60); - } - // Script - if (!oldGroup.readEntry< QString >("scriptpath", QString()).isEmpty()) { - KConfigGroup runScript(&newGroup, "RunScript"); - runScript.writeEntry< QString >("scriptCommand", oldGroup.readEntry< QString >("scriptpath", QString())); - runScript.writeEntry< uint >("scriptPhase", 0); - } - // SuspendSession - if (oldGroup.readEntry< uint >("idleAction", 0) > 0) { - KConfigGroup suspendSession(&newGroup, "SuspendSession"); - suspendSession.writeEntry< uint >("idleTime", oldGroup.readEntry< int >("idleTime", 30) * 60 * 1000); - suspendSession.writeEntry< uint >("suspendType", upgradeOldAction(oldGroup.readEntry< uint >("idleAction", 0))); - } - // Buttons - if (oldGroup.readEntry< uint >("powerButtonAction", 0) > 0 \|\| oldGroup.readEntry< uint >("lidAction", 0) > 0) { - KConfigGroup handleButtons(&newGroup, "HandleButtonEvents"); - handleButtons.writeEntry< uint >("powerButtonAction", upgradeOldAction(oldGroup.readEntry< uint >("powerButtonAction", 0))); - handleButtons.writeEntry< uint >("lidAction", upgradeOldAction(oldGroup.readEntry< uint >("lidAction", 0))); - } - } - - // Save and be happy - profilesConfig->sync(); - - // We also want to backup and erase the old profiles. - QString oldProfilesFile = KGlobal::dirs()->findResource("config", "powerdevilprofilesrc"); - if (!oldProfilesFile.isEmpty()) { - // Backup - QString bkProfilesFile = oldProfilesFile; - bkProfilesFile.append(".old"); - KConfig bkConfig = oldProfilesConfig->copyTo(bkProfilesFile); - if (bkConfig != 0) { - bkConfig->sync(); - delete bkConfig; - - // Delete the old profiles now. - QFile::remove(oldProfilesFile); - } - } -} - -void ProfileGenerator::upgradeProfilesv2() -{ - // Ok, let's get our config file. - KSharedConfigPtr profilesConfig = KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::SimpleConfig); - KSharedConfigPtr oldProfilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig); - - // And clear it - foreach (const QString &group, profilesConfig->groupList()) { - // Don't delete activity-specific settings - if (group != "Activities") { - profilesConfig->deleteGroup(group); - } - } - - // Ok: back in the days, which profile we used for which task? - { - KConfigGroup oldAC = oldProfilesConfig.data()->group(PowerDevilSettings::aCProfile()); - KConfigGroup newGroup(profilesConfig, "AC"); - - oldAC.copyTo(&newGroup); - } - { - KConfigGroup oldBattery = oldProfilesConfig.data()->group(PowerDevilSettings::batteryProfile()); - KConfigGroup newGroup(profilesConfig, "Battery"); - - oldBattery.copyTo(&newGroup); - } - { - KConfigGroup oldLowBattery = oldProfilesConfig.data()->group(PowerDevilSettings::lowProfile()); - KConfigGroup newGroup(profilesConfig, "LowBattery"); - - oldLowBattery.copyTo(&newGroup); - } - - // Save and be happy - profilesConfig->sync(); - - // We also want to backup and erase the old profiles. - QString oldProfilesFile = KGlobal::dirs()->findResource("config", "powerdevil2profilesrc"); - if (!oldProfilesFile.isEmpty()) { - // Backup - QString bkProfilesFile = oldProfilesFile; - bkProfilesFile.append(".old"); - KConfig bkConfig = oldProfilesConfig->copyTo(bkProfilesFile); - if (bkConfig != 0) { - bkConfig->sync(); - delete bkConfig; - - // Delete the old profiles now. - QFile::remove(oldProfilesFile); - } - } -} - -uint ProfileGenerator::upgradeOldAction(uint oldAction) -{ - switch ((OldIdleAction)oldAction) { - case Standby: - case S2Ram: - return ToRamMode; - case S2Disk: - return ToDiskMode; - case Shutdown: - return ShutdownMode; - case Lock:
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilprofilegenerator.h ^
@@ -20,29 +20,11 @@ #ifndef POWERDEVIL_PROFILEGENERATOR_H #define POWERDEVIL_PROFILEGENERATOR_H -class KComponentData; namespace PowerDevil { namespace ProfileGenerator { - enum GeneratorResult { - ResultFailed = 0, - ResultGenerated = 1, - ResultUpgraded = 2 - }; - - enum OldIdleAction { - None = 0, - Standby = 1, - S2Ram = 2, - S2Disk = 4, - Shutdown = 8, - Lock = 16, - ShutdownDialog = 32, - TurnOffScreen = 64 - }; - - enum NewMode { + enum Modes { NoneMode = 0, ToRamMode = 1, ToDiskMode = 2, @@ -53,10 +35,7 @@ TurnOffScreenMode = 64 }; - GeneratorResult generateProfiles(bool toRam, bool toDisk, bool tryUpgrade = false); - void upgradeProfilesv1(bool toRam, bool toDisk); - void upgradeProfilesv2(); - unsigned int upgradeOldAction(unsigned int actionId); + void generateProfiles(bool toRam, bool toDisk); } }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/daemon/powerdevilscreenbrightnesslogic.cpp ^
@@ -18,7 +18,8 @@ ***************************************************************************/ #include "powerdevilscreenbrightnesslogic.h" -#include <KDebug> +#include "powerdevil_debug.h" +#include <QDebug> namespace PowerDevil { @@ -64,7 +65,7 @@ } // 28 different maxValue values between 17 and 79 are left at this point. - //kDebug() << "maxValue" << maxValue; + //qCDebug(POWERDEVIL) << "maxValue" << maxValue; // Give up and return 10, there is nothing much we can do here. return 10;
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/CMakeLists.txt ^
@@ -1,4 +1,5 @@ include_directories ( + ${PowerDevil_SOURCE_DIR}/daemon ${CMAKE_CURRENT_SOURCE_DIR}/common ${CMAKE_CURRENT_BINARY_DIR}/common )
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/activities/activitypage.cpp ^
@@ -22,6 +22,8 @@ #include "activitywidget.h" +#include <powerdevil_debug.h> + #include <ErrorOverlay.h> #include <QScrollArea> @@ -72,7 +74,7 @@ KActivities::Info info = new KActivities::Info(activity, this); QString icon = info->icon(); QString name = info->name(); - qDebug() << activity << info->isValid() << info->availability(); + qCDebug(POWERDEVIL) << activity << info->isValid() << info->availability(); QScrollArea scrollArea = new QScrollArea(); scrollArea->setFrameShape(QFrame::NoFrame);
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/activities/powerdevilactivitiesconfig.desktop ^
@@ -17,6 +17,7 @@ Name[cs]=Nastavení aktivit Name[da]=Aktivitetsindstillinger Name[de]=Aktivitäten-Einstellungen +Name[el]=Ρυθμίσεις δραστηριοτήτων Name[en_GB]=Activity Settings Name[es]=Preferencias de la actividad Name[fi]=Aktiviteettiasetukset @@ -24,7 +25,9 @@ Name[hu]=Tevékenység beállítások Name[ia]=Preferentias de activitate Name[id]=Pengaturan Aktivitas +Name[it]=Impostazioni attività Name[ko]=활동 설정 +Name[lt]=Veiklos nustatymai Name[nb]=Aktivitetsinnstillinger Name[nds]=Aktiviteteninstellen Name[nl]=Instellingen voor activiteiten @@ -53,6 +56,7 @@ Comment[cs]=Správa napájení pro činnost Comment[da]=Strømstyring pr. aktivitet Comment[de]=Energieprofile pro Aktivität einzeln einrichten +Comment[el]=Διαχείριση ενέργειας ανά δραστηριότητα Comment[en_GB]=Per-Activity Power Management Comment[es]=Gestión de energía por actividad Comment[fi]=Aktiviteettikohtainen virranhallinta @@ -61,6 +65,7 @@ Comment[ia]=Gestion de energia per activitate Comment[id]=Manajemen Daya Per-Aktivitas Comment[ko]=활동별 전원 관리 +Comment[lt]=Atskiros veiklos energijos tvarkymas Comment[nb]=Sett opp strømstyring per aktivitet Comment[nds]=Stroompleeg för enkelte Aktiviteten instellen Comment[nl]=Energiebeheer per activiteit instellen @@ -75,6 +80,7 @@ Comment[sr@ijekavianlatin]=Upravljanje napajanjem prema aktivnosti Comment[sr@latin]=Upravljanje napajanjem prema aktivnosti Comment[sv]=Strömhantering per aktivitet +Comment[tr]=Tüm Etkinlik Güç Yönetimi Comment[uk]=Налаштування окремих параметрів керування живленням простору дій Comment[x-test]=xxPer-Activity Power Managementxx Comment[zh_CN]=基于活动的电源管理 @@ -85,6 +91,7 @@ X-KDE-Keywords[ca]=sistema,energia,gestió d'energia,corrent,portàtil,bateria,suspensió,AC,suspendre,hibernació,lluminositat,rendiment,tapa,activitat,activitats X-KDE-Keywords[da]=system,strøm,strømstyring,energi,laptop,bærbar,batteri,suspension,AC,strømforsyning,suspender,slumre,dvale,lysstyrke,ydelse,låg,aktivitet,aktiviteter X-KDE-Keywords[de]=system,energie,energieverwaltung,laptop,notebook,akku,batterie,ruhezustand,tiefschlaf,helligkeit,leistung,deckel,aktivität +X-KDE-Keywords[el]=σύστημα,ενέργεια,διαχείριση ενέργειας,ενέργεια,φορητός,μπαταρία,αναστολή,AC,κοίμηση,νάρκη,φωτεινότητα,επιδόσεις,καπάκι,δραστηριότητα,δραστηριότητες X-KDE-Keywords[en_GB]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,activity,activities X-KDE-Keywords[es]=sistema,energía,gestión de energía,portátil,laptop,batería,suspensión,AC,suspender,hibernar,brillo,rendimiento,tapa,actividad,actividades X-KDE-Keywords[fi]=järjestelmä,virta,virranhallinta,energia,kannettava,tietokone,läppäri,akku,lepotila,valmiustila,keskeytä,AC,virtalähde,kirkkaus,suorituskyky,kansi,aktiviteetti,aktiviteetit @@ -92,6 +99,7 @@ X-KDE-Keywords[hu]=rendszer,energia,energiakezelés,energia,laptop,akkumulátor,AC,felfüggesztés,hibernálás,fényerő,teljesítmény,fedél,aktivitás,aktivitások X-KDE-Keywords[ia]=systema,potentia,gestion de potentia,energia,laptop,batteria,suspension,CA,suspende,hiberna,brillantia,prestation,coperculo,activitate,activitates X-KDE-Keywords[id]=sistem,daya,manajemen daya,energi,laptop,batterai,suspensi,AC,suspen,hibernasi,kecerahan,kinerja,penutup,activitas,kegiatan +X-KDE-Keywords[it]=sistema,energia,gestione energia,energia,laptop,batteria,sospensione,AC,corrente,sospensione,ibernazione,luminosità,prestazioni,coperchio,attività X-KDE-Keywords[ko]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,activity,activities,시스템,전원,전원 관리,에너지,노트북,배터리,어댑터,절전,대기 모드,대기,최대 절전,최대 절전 모드,밝기,성능,덮개,상판,활동 X-KDE-Keywords[nb]=system,strøm,strømstyring,energi,bærbar,batteri,hvilemodus,AC,hvile,dvale,lysstyrke,ytelse,lokk,aktivitet,aktiviteter X-KDE-Keywords[nds]=Systeem,Stroom,Stroompleeg,Energie,Klappreekner,Batterie,utsetten,AC,Wesselstroom,infreren,Helligkeit,Leisten,Aktiviteet,Aktiviteten
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/common/CMakeLists.txt ^
@@ -1,6 +1,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libpowerdevilcommonconfig\") set( powerdevil_config_common_private_SRCS + ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp actionconfigwidget.cpp actioneditwidget.cpp ErrorOverlay.cpp @@ -13,6 +14,8 @@ PUBLIC powerdevilcore powerdevilui + KF5::I18n + KF5::Service ) set_target_properties(powerdevilconfigcommonprivate PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/common/ErrorOverlay.cpp ^
@@ -22,12 +22,9 @@ #include <QtCore/QEvent> #include <QLabel> #include <QVBoxLayout> - #include <QIcon> -#include <KLocalizedString> -#include <kglobal.h> -static const KCatalogLoader loader("libpowerdevilcommonconfig"); +#include <KLocalizedString> ErrorOverlay::ErrorOverlay(QWidget baseWidget, const QString &details, QWidget parent) : QWidget(parent ? parent : baseWidget->window()),
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/common/ErrorOverlay.h ^
@@ -22,8 +22,6 @@ #include <QWidget> -#include <kdemacros.h> - class Q_DECL_EXPORT ErrorOverlay : public QWidget { Q_OBJECT
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/common/actioneditwidget.cpp ^
@@ -25,6 +25,8 @@ #include <powerdevilaction.h> #include <powerdevilactionconfig.h> +#include <powerdevil_debug.h> + #include <QCheckBox> #include <QVBoxLayout> @@ -35,7 +37,6 @@ #include <KConfigGroup> #include <QDebug> #include <KServiceTypeTrader> -#include <QIcon> ActionEditWidget::ActionEditWidget(const QString &configName, QWidget parent) : QWidget(parent) @@ -52,7 +53,7 @@ foreach (const KService::Ptr &offer, offers) { // Does it have a runtime requirement? if (offer->property("X-KDE-PowerDevil-Action-HasRuntimeRequirement", QVariant::Bool).toBool()) { - qDebug() << offer->name() << " has a runtime requirement"; + qCDebug(POWERDEVIL) << offer->name() << " has a runtime requirement"; QDBusMessage call = QDBusMessage::createMethodCall("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement", "org.kde.Solid.PowerManagement", "isActionSupported"); @@ -62,11 +63,11 @@ if (reply.isValid()) { if (!reply.value()) { - qDebug() << "The action " << offer->property("X-KDE-PowerDevil-Action-ID", QVariant::String) << " appears not to be supported by the core."; + qCDebug(POWERDEVIL) << "The action " << offer->property("X-KDE-PowerDevil-Action-ID", QVariant::String) << " appears not to be supported by the core."; continue; } } else { - qDebug() << "There was a problem in contacting DBus!! Assuming the action is ok."; + qCDebug(POWERDEVIL) << "There was a problem in contacting DBus!! Assuming the action is ok."; } } @@ -75,14 +76,14 @@ QVariant::String).toString()).factory(); if (!factory) { - qWarning() << "KPluginFactory could not load the plugin:" << offer->property("X-KDE-PowerDevil-Action-UIComponentLibrary", + qCWarning(POWERDEVIL) << "KPluginFactory could not load the plugin:" << offer->property("X-KDE-PowerDevil-Action-UIComponentLibrary", QVariant::String).toString(); continue; } PowerDevil::ActionConfig actionConfig = factory->create<PowerDevil::ActionConfig>(); if (!actionConfig) { - qWarning() << "KPluginFactory could not load the plugin:" << offer->property("X-KDE-PowerDevil-Action-UIComponentLibrary", + qCWarning(POWERDEVIL) << "KPluginFactory could not load the plugin:" << offer->property("X-KDE-PowerDevil-Action-UIComponentLibrary", QVariant::String).toString(); continue; } @@ -119,12 +120,12 @@ { KConfigGroup group = configGroup(); - qDebug() << m_profilesConfig.data()->entryMap().keys(); + qCDebug(POWERDEVIL) << m_profilesConfig.data()->entryMap().keys(); if (!group.isValid()) { return; } - qDebug() << "Ok, KConfigGroup ready" << group.entryMap().keys(); + qCDebug(POWERDEVIL) << "Ok, KConfigGroup ready" << group.entryMap().keys(); // Iterate over the possible actions for (QHash< QString, QCheckBox* >::const_iterator i = m_actionsHash.constBegin(); i != m_actionsHash.constEnd(); ++i) { @@ -143,7 +144,7 @@ KConfigGroup group = configGroup(); if (!group.isValid()) { - qDebug() << "Could not perform a save operation, group is not valid!"; + qCDebug(POWERDEVIL) << "Could not perform a save operation, group is not valid!"; return; }
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/common/actioneditwidget.h ^
@@ -25,8 +25,6 @@ #include <KSharedConfig> -#include <kdemacros.h> - namespace PowerDevil { class ActionConfig;
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/global/CMakeLists.txt ^
@@ -12,9 +12,11 @@ add_library(kcm_powerdevilglobalconfig MODULE ${kcm_powerdevil_global_SRCS}) target_link_libraries(kcm_powerdevilglobalconfig + KF5::ConfigWidgets KF5::KIOWidgets KF5::Solid KF5::NotifyConfig + KF5::KDELibs4Support powerdevilconfigcommonprivate )
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/global/GeneralPage.cpp ^
@@ -168,7 +168,7 @@ PowerDevilSettings::setBatteryCriticalAction(BatteryCriticalCombo->itemData(BatteryCriticalCombo->currentIndex()).toInt()); - PowerDevilSettings::self()->writeConfig(); + PowerDevilSettings::self()->save(); // Notify Daemon QDBusMessage call = QDBusMessage::createMethodCall("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement",
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/global/generalPage.ui ^
@@ -47,7 +47,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="KIntSpinBox" name="lowSpin"> + <widget class="QSpinBox" name="lowSpin"> <property name="maximumSize"> <size> <width>100</width> @@ -79,7 +79,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="KIntSpinBox" name="criticalSpin"> + <widget class="QSpinBox" name="criticalSpin"> <property name="maximumSize"> <size> <width>100</width> @@ -213,11 +213,6 @@ </widget> <customwidgets> <customwidget> - <class>KIntSpinBox</class> - <extends>QSpinBox</extends> - <header>knuminput.h</header> - </customwidget> - <customwidget> <class>KComboBox</class> <extends>QComboBox</extends> <header>kcombobox.h</header>
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/global/powerdevilglobalconfig.desktop ^
@@ -17,6 +17,7 @@ Name[cs]=Pokročilá nastavení Name[da]=Avancerede indstillinger Name[de]=Erweiterte Einstellungen +Name[el]=Ρυθμίσεις για προχωρημένους Name[en_GB]=Advanced Settings Name[es]=Preferencias avanzadas Name[fi]=Lisäasetukset @@ -24,7 +25,9 @@ Name[hu]=Speciális beállítások Name[ia]=Preferentias Avantiate Name[id]=Pengaturan Tingkat Lanjut +Name[it]=Impostazioni avanzate Name[ko]=고급 설정 +Name[lt]=Išsamesni nustatymai Name[nb]=Avanserte innstillinger Name[nds]=Verwiedert Instellen Name[nl]=Geavanceerde instellingen @@ -53,6 +56,7 @@ Comment[cs]=Pokročilé nastavení správy napájení Comment[da]=Indstil avanceret strømstyring Comment[de]=Erweiterte Energieprofile einrichten +Comment[el]=Ρυθμίσεις διαχείρισης ενέργειας για προχωρημένους Comment[en_GB]=Advanced Power Management Settings Comment[es]=Preferencias avanzadas de la gestión de energía Comment[fi]=Virranhallinnan lisäasetukset @@ -61,6 +65,7 @@ Comment[ia]=Preferentias avantiate de gestion de energia Comment[id]=Pengaturan Manajemen Daya Tingkat Lanjut Comment[ko]=고급 전원 관리 설정 +Comment[lt]=Išsamesni energijos tvarkymo nustatymai Comment[nb]=Avanserte strømstyringsinnstillinger Comment[nds]=Verwiedert Stroompleeginstellen Comment[nl]=Instellingen voor geavanceerd energiebeheer @@ -76,6 +81,7 @@ Comment[sr@ijekavianlatin]=Napredne postavke za upravljanje napajanjem Comment[sr@latin]=Napredne postavke za upravljanje napajanjem Comment[sv]=Avancerade inställningar av strömhantering +Comment[tr]=Gelişmiş Güç Yönetimi Ayarları Comment[uk]=Налаштування додаткових параметрів керування живленням Comment[x-test]=xxAdvanced Power Management Settingsxx Comment[zh_CN]=高级电源管理设置 @@ -86,6 +92,7 @@ X-KDE-Keywords[ca]=sistema,energia,gestió d'energia,corrent,portàtil,bateria,suspensió,AC,suspèn,hiberna,lluminositat,rendiment,tapa X-KDE-Keywords[da]=system,strøm,strømstyring,energi,laptop,bærbar,batteri,suspension,AC,strømforsyning,suspender,slumre,dvale,lysstyrke,ydelse,låg X-KDE-Keywords[de]=system,energie,energieverwaltung,laptop,notebook,akku,batterie,ruhezustand,tiefschlaf,helligkeit,leistung,deckel +X-KDE-Keywords[el]=σύστημα,ενέργεια,διαχείριση ενέργειας,ενέργεια,φορητός,μπαταρία,αναστολή,AC,κοίμηση,νάρκη,φωτεινότητα,επιδόσεις,καπάκι X-KDE-Keywords[en_GB]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid X-KDE-Keywords[es]=sistema,energía,gestión de energía,portátil,laptop,batería,suspensión,AC,suspender,hibernar,brillo,rendimiento,tapa X-KDE-Keywords[fi]=järjestelmä,virta,virranhallinta,energia,kannettava,tietokone,läppäri,akku,lepotila,valmiustila,AC,virtalähde,keskeytä,kirkkaus,suorituskyky,kansi @@ -93,6 +100,7 @@ X-KDE-Keywords[hu]=rendszer,energia,energiakezelés,energia,laptop,akkumulátor,AC,felfüggesztés,hibernálás,fényerő,teljesítmény,fedél X-KDE-Keywords[ia]=systema,potentia,gestion de potentia,energia,laptop,batteria,suspension,CA,suspende,hiberna,brillantia,prestation,coperculo X-KDE-Keywords[id]=sistem,daya,manajemen daya,energi,laptop,baterai,suspensi, AC,suspen,hibernasi,kecerahan,kinerja,penutup +X-KDE-Keywords[it]=sistema,energia,gestione energia,energia,laptop,batteria,sospensione,AC,corrente,sospensione,ibernazione,luminosità,prestazioni X-KDE-Keywords[ko]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,시스템,전원,전원 관리,에너지,노트북,배터리,어댑터,절전,대기 모드,대기,최대 절전,최대 절전 모드,밝기,성능,덮개,상판 X-KDE-Keywords[nb]=system,strøm,strømstyring,energi,bærbar,batteri,hvilemodus,AC,hvile,dvale,lysstyrke,ytelse,lokk X-KDE-Keywords[nds]=Systeem,Stroom,Stroompleeg,Energie,Klappreekner,Batterie,utsetten,AC,Wesselstroom,infreren,Helligkeit,Leisten
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/profiles/CMakeLists.txt ^
@@ -1,8 +1,9 @@ add_definitions(-DTRANSLATION_DOMAIN=\"powerdevilprofilesconfig\") set( kcm_powerdevil_profiles_SRCS + ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp EditPage.cpp - ../../daemon/powerdevilprofilegenerator.cpp + ${PowerDevil_SOURCE_DIR}/daemon/powerdevilprofilegenerator.cpp ) ki18n_wrap_ui(kcm_powerdevil_profiles_SRCS @@ -16,6 +17,8 @@ KF5::KIOWidgets KF5::Solid KF5::ConfigGui + KF5::ConfigWidgets + KF5::KDELibs4Support powerdevilui powerdevilconfigcommonprivate )
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/profiles/EditPage.cpp ^
@@ -25,6 +25,8 @@ #include <powerdevilactionconfig.h> #include <powerdevilprofilegenerator.h> +#include <powerdevil_debug.h> + #include <QCheckBox> #include <QFormLayout> #include <QLabel> @@ -93,7 +95,7 @@ m_profilesConfig->reparseConfiguration(); } - qDebug() << m_profilesConfig.data()->groupList() << m_profilesConfig.data()->entryMap().keys(); + qCDebug(POWERDEVIL) << m_profilesConfig.data()->groupList() << m_profilesConfig.data()->entryMap().keys(); // Create widgets for each profile ActionEditWidget editWidget = new ActionEditWidget("AC", tabWidget); @@ -167,7 +169,7 @@ void EditPage::load() { - qDebug() << "Loading routine called"; + qCDebug(POWERDEVIL) << "Loading routine called"; for (QHash< QString, ActionEditWidget >::const_iterator i = m_editWidgets.constBegin(); i != m_editWidgets.constEnd(); ++i) { i.value()->load(); @@ -207,7 +209,7 @@ if (reply.isValid()) { if (!editedProfiles.contains(reply.value())) { // Ask to reparse config - qDebug() << "Inactive profile edited, reparsing configuration"; + qCDebug(POWERDEVIL) << "Inactive profile edited, reparsing configuration"; call = QDBusMessage::createMethodCall("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement", "org.kde.Solid.PowerManagement", "reparseConfiguration"); @@ -234,7 +236,7 @@ "all existing modifications you made. " "Are you sure you want to continue?"), i18n("Restore Default Profiles")); if (ret == KMessageBox::Continue) { - qDebug() << "Restoring defaults."; + qCDebug(POWERDEVIL) << "Restoring defaults."; QSet <Solid::PowerManagement::SleepState > methods = Solid::PowerManagement::supportedSleepStates(); PowerDevil::ProfileGenerator::generateProfiles( methods.contains(Solid::PowerManagement::SuspendState),
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/kcmodule/profiles/powerdevilprofilesconfig.desktop ^
@@ -17,6 +17,7 @@ Name[cs]=Úsporný režim Name[da]=Strømbesparelse Name[de]=Energiesparen +Name[el]=Εξοικονόμηση ενέργειας Name[en_GB]=Energy Saving Name[es]=Ahorro de energía Name[fi]=Virransäästö @@ -24,7 +25,9 @@ Name[hu]=Energiatakarékosság Name[ia]=Sparnio de energia Name[id]=Hemat Energi +Name[it]=Risparmio energetico Name[ko]=에너지 절약 +Name[lt]=Energijos taupymas Name[nb]=Energisparing Name[nds]=Stroomsporen Name[nl]=Energiebesparing @@ -53,6 +56,7 @@ Comment[cs]=Úsporný režim Comment[da]=Strømbesparelse Comment[de]=Energiesparen +Comment[el]=Εξοικονόμηση ενέργειας Comment[en_GB]=Energy Saving Comment[es]=Ahorro de energía Comment[fi]=Virransäästö @@ -61,6 +65,7 @@ Comment[ia]=Sparnio de energia Comment[id]=Hemat Energi Comment[ko]=에너지 절약 +Comment[lt]=Energijos taupymas Comment[nb]=Energisparing Comment[nds]=Stroomsporen Comment[nl]=Energiebesparing @@ -76,6 +81,7 @@ Comment[sr@ijekavianlatin]=Štednja energije Comment[sr@latin]=Štednja energije Comment[sv]=Strömsparhantering +Comment[tr]=Güç Tasarrufu Comment[uk]=Заощадження енергії Comment[x-test]=xxEnergy Savingxx Comment[zh_CN]=节能 @@ -86,6 +92,7 @@ X-KDE-Keywords[ca]=sistema,energia,gestió d'energia,corrent,portàtil,bateria,suspensió,AC,suspèn,hiberna,lluminositat,rendiment,tapa X-KDE-Keywords[da]=system,strøm,strømstyring,energi,laptop,bærbar,batteri,suspension,AC,strømforsyning,suspender,slumre,dvale,lysstyrke,ydelse,låg X-KDE-Keywords[de]=system,energie,energieverwaltung,laptop,notebook,akku,batterie,ruhezustand,tiefschlaf,helligkeit,leistung,deckel +X-KDE-Keywords[el]=σύστημα,ενέργεια,διαχείριση ενέργειας,ενέργεια,φορητός,μπαταρία,αναστολή,AC,κοίμηση,νάρκη,φωτεινότητα,επιδόσεις,καπάκι X-KDE-Keywords[en_GB]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid X-KDE-Keywords[es]=sistema,energía,gestión de energía,portátil,laptop,batería,suspensión,AC,suspender,hibernar,brillo,rendimiento,tapa X-KDE-Keywords[fi]=järjestelmä,virta,virranhallinta,energia,kannettava,tietokone,läppäri,akku,lepotila,valmiustila,AC,virtalähde,keskeytä,kirkkaus,suorituskyky,kansi @@ -93,6 +100,7 @@ X-KDE-Keywords[hu]=rendszer,energia,energiakezelés,energia,laptop,akkumulátor,AC,felfüggesztés,hibernálás,fényerő,teljesítmény,fedél X-KDE-Keywords[ia]=systema,potentia,gestion de potentia,energia,laptop,batteria,suspension,CA,suspende,hiberna,brillantia,prestation,coperculo X-KDE-Keywords[id]=sistem,daya,manajemen daya,energi,laptop,baterai,suspensi, AC,suspen,hibernasi,kecerahan,kinerja,penutup +X-KDE-Keywords[it]=sistema,energia,gestione energia,energia,laptop,batteria,sospensione,AC,corrente,sospensione,ibernazione,luminosità,prestazioni X-KDE-Keywords[ko]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,시스템,전원,전원 관리,에너지,노트북,배터리,어댑터,절전,대기 모드,대기,최대 절전,최대 절전 모드,밝기,성능,덮개,상판 X-KDE-Keywords[nb]=system,strøm,strømstyring,energi,bærbar,batteri,hvilemodus,AC,hvile,dvale,lysstyrke,ytelse,lokk X-KDE-Keywords[nds]=Systeem,Stroom,Stroompleeg,Energie,Klappreekner,Batterie,utsetten,AC,Wesselstroom,infreren,Helligkeit,Leisten
[-] [+]	Changed	powerdevil-5.1.90.tar.xz/powerdevil.notifyrc ^
@@ -5,6 +5,7 @@ Name[cs]=Systém správy napájení KDE Name[da]=KDE's strømstyringssystem Name[de]=KDE-Energieverwaltungssystem +Name[el]=Σύστημα διαχείρισης ενέργειας του KDE Name[en_GB]=KDE Power Management System Name[es]=Sistema de gestión de energía de KDE Name[fi]=KDE:n virranhallintajärjestelmä @@ -12,8 +13,10 @@ Name[hu]=KDE energiakezelő rendszer Name[ia]=Systema de gestion de energia de KDE Name[id]=Sistem Manajemen Daya KDE +Name[it]=Sistema di gestione energetica di KDE Name[ja]=KDE 電源管理 Name[ko]=KDE 전원 관리 시스템 +Name[lt]=KDE energijos valdymo sistema Name[nb]=Et strømstyringsverktøy for KDE Name[nds]=Stroomkuntrullsysteem för KDE Name[nl]=KDE energiebeheersysteem @@ -42,6 +45,7 @@ Comment[cs]=Systém správy napájení Comment[da]=Strømstyringssystem Comment[de]=Energieverwaltungssystem +Comment[el]=Σύστημα διαχείρισης ενέργειας Comment[en_GB]=Power Management System Comment[es]=Sistema de gestión de energía Comment[fi]=Virranhallintajärjestelmä @@ -49,7 +53,9 @@ Comment[hu]=Energiakezelő rendszer Comment[ia]=Systema de gestion de energia Comment[id]=Sistem Manajemen Daya +Comment[it]=Sistema di gestione energetica Comment[ko]=전원 관리 시스템 +Comment[lt]=Energijos valdymo sistema Comment[nb]=Et strømstyringsverktøy Comment[nds]=Stroompleegsysteem Comment[nl]=Energiebeheersysteem @@ -80,6 +86,7 @@ Name[cs]=Varování Name[da]=Advarsel Name[de]=Warnung +Name[el]=Προειδοποίηση Name[en_GB]=Warning Name[es]=Advertencia Name[fi]=Varoitus @@ -87,7 +94,9 @@ Name[hu]=Figyelem Name[ia]=Aviso Name[id]=Peringatan +Name[it]=Avviso Name[ko]=경고 +Name[lt]=Perspėjimas Name[nb]=Advarsel Name[nds]=Wohrschoen Name[nl]=Waarschuwing @@ -115,6 +124,7 @@ Comment[cs]=Použito pro varování a upozornění Comment[da]=Bruges til advarselsbekendtgørelser Comment[de]=Verwendet für Warnmeldungen +Comment[el]=Χρησιμοποιείται για τις προειδοποιήσεις Comment[en_GB]=Used for warning notifications Comment[es]=Usado para notificaciones de advertencia Comment[fi]=Käytetään varoitusilmoituksiin @@ -122,7 +132,9 @@ Comment[hu]=Kezelőprogram figyelmeztető üzenetekhez Comment[ia]=Usate pro notificationes de avisos Comment[id]=Digunakan untuk pemberitahuan peringatan +Comment[it]=Usato per notifiche di avviso Comment[ko]=경고 알림에 사용됨 +Comment[lt]=Naudojama perspėjimams Comment[nb]=Brukt til varselsmeldinger Comment[nds]=Bi Wohrschoen bruukt Comment[nl]=Wordt gebruikt voor waarschuwingsmeldingen @@ -152,6 +164,7 @@ Name[cs]=Hlášení Name[da]=Bekendtgørelse Name[de]=Benachrichtigung +Name[el]=Ειδοποίηση Name[en_GB]=Notification Name[es]=Notificación Name[fi]=Ilmoitus @@ -159,8 +172,10 @@ Name[hu]=Értesítés Name[ia]=Notification Name[id]=Pemberitahuan +Name[it]=Notifica Name[ja]=通知 Name[ko]=알림 +Name[lt]=Pranešimas Name[nb]=Varsling Name[nds]=Bescheed Name[nl]=Melding @@ -190,6 +205,7 @@ Comment[cs]=Použito pro běžná oznámení Comment[da]=Bruges til almindelige bekendtgørelser Comment[de]=Verwendet für Standard-Benachrichtigungen +Comment[el]=Χρησιμοποιείται για τυπικές ειδοποιήσεις Comment[en_GB]=Used for standard notifications Comment[es]=Usado para notificaciones estándar Comment[fi]=Käytetään normaaleihin ilmoituksiin @@ -197,8 +213,10 @@ Comment[hu]=Kezelő értesítő üzenetekhez Comment[ia]=Usate pro notificationes standard Comment[id]=Digunakan untuk pemberitahuan standar +Comment[it]=Usato per notifiche standard Comment[ja]=通常の通知に使用 Comment[ko]=표준 알림에 사용됨 +Comment[lt]=Naudojamas standartiniams pranešimams Comment[nb]=Brukt til standardmeldinger Comment[nds]=Bi Standardbescheden bruukt Comment[nl]=Wordt gebruikt voor standaardmeldingen @@ -229,6 +247,7 @@ Name[cs]=Kritické hlášení Name[da]=Kritisk bekendtgørelse Name[de]=Kritische Benachrichtigung +Name[el]=Κρίσιμη ειδοποίηση Name[en_GB]=Critical notification Name[es]=Notificación crítica Name[fi]=Kriittinen ilmoitus @@ -236,8 +255,10 @@ Name[hu]=Kritikus értesítés Name[ia]=Notification critic Name[id]=Pemberitahuan kritis +Name[it]=Notifica critica Name[ja]=重大な通知 Name[ko]=치명적 알림 +Name[lt]=Kritinis pranešimas Name[nb]=Kritisk varsling Name[nds]=Kritisch Bescheed Name[nl]=Kritieke melding @@ -266,6 +287,7 @@ Comment[cs]=Upozorňuje na kritickou událost Comment[da]=Bekendtgør en kritisk begivenhed Comment[de]=Benachrichtigt über einen kritischen Zustand +Comment[el]=Ειδοποίηση για κρίσιμο γεγονός Comment[en_GB]=Notifies a critical event Comment[es]=Notifica de un evento crítico Comment[fi]=Ilmoittaa kriittisestä tapahtumasta @@ -273,8 +295,10 @@ Comment[hu]=Kritikus fontosságú üzenetet jelez Comment[ia]=Il notifica un evento critic Comment[id]=Pemberitahu kejadian kritis +Comment[it]=Notifica un evento critico Comment[ja]=重大なイベントを通知します Comment[ko]=치명적인 사건을 알림 +Comment[lt]=Perspėja apie kritinį įvykį Comment[nb]=Varsler om en kritisk hendelse Comment[nds]=Gifft över en kritisch Begeefnis bescheed Comment[nl]=Meldt een kritieke gebeurtenis @@ -305,6 +329,7 @@ Name[cs]=Baterie je téměř vybitá Name[da]=Lavt batteri Name[de]=Akku-Ladestand niedrig +Name[el]=Μπαταρία χαμηλή Name[en_GB]=Battery Low Name[es]=Batería baja Name[fi]=Akku vähissä @@ -312,7 +337,9 @@ Name[hu]=Az akkumulátor gyenge Name[ia]=Batteria basse Name[id]=Baterai Lemah +Name[it]=Batteria a livello basso Name[ko]=배터리 부족 +Name[lt]=Akumuliatorius ištuštėjęs Name[nb]=Lavt batteri Name[nds]=Batterie siet Name[nl]=Accu op laag niveau @@ -340,6 +367,7 @@ Comment[cs]=Baterie dosáhla nízké úrovně Comment[da]=Dit batteri har nået lavt niveau Comment[de]=Der Ladestand Ihres Akkus hat einen niedrigen Wert erreicht. +Comment[el]=Η μπαταρία σας έχει βρεθεί σε χαμηλή στάθμη ενέργειας Comment[en_GB]=Your battery has reached low level Comment[es]=La batería ha alcanzado un nivel bajo Comment[fi]=Akku on vähissä @@ -347,8 +375,10 @@ Comment[hu]=A telepek feltöltöttsége alacsony szintű Comment[ia]=Tu batteria ha attingite nivello basse Comment[id]=Baterai anda telah mencapai level rendah +Comment[it]=La batteria ha raggiunto un livello di carica basso Comment[ja]=バッテリ残量が低レベルに達しました Comment[ko]=배터리에 남은 용량이 적습니다 +Comment[lt]=Jūsų akumuliatorius pasiekė žemą lygmenį Comment[nb]=Batteriet har nådd lavt nivå Comment[nds]=Dien Batteriestoop is nu "Siet" Comment[nl]=Uw accu heeft het lage niveau bereikt @@ -383,6 +413,7 @@ Name[cs]=Baterie na kritické úrovni Name[da]=Kritisk batteri Name[de]=Akku-Ladestand kritisch +Name[el]=Μπαταρία κρίσιμη Name[en_GB]=Battery Critical Name[es]=Batería en nivel crítico Name[fi]=Akku kriittisellä tasolla @@ -390,7 +421,9 @@ Name[hu]=Kritikus lemerültség Name[ia]=Batteria critic Name[id]=Baterai Kritis +Name[it]=Batteria a livello critico Name[ko]=배터리 바닥남
[-] [+]	Changed	powerdevil.yaml ^
@@ -1,5 +1,5 @@ Name : powerdevil -Version : 5.1.0 +Version : 5.1.90 Release : 1 Group : System/Base License : GPLv2+

Comments for request 818 (0)

There's nothing to be done right now

Request History

sebas	created request	1421328112 over 9 years ago
Update to Plasma 5.1.90
sebas	Request got accepted	1421328331 over 9 years ago
OK

Request 818 (accepted)

Comments for request 818 (0)

Request History

0 Package Maintainers