Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2015-02-16 15:06:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2015-01-29 12:52:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2015-02-16 17:47:44.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Feb 8 18:15:30 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.7.0 + * Added energyFull and energyFullDesign to Battery + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.7.0.php + +------------------------------------------------------------------- Old: ---- solid-5.6.0.tar.xz New: ---- solid-5.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.no8xDE/_old 2015-02-16 17:47:45.000000000 +0100 +++ /var/tmp/diff_new_pack.no8xDE/_new 2015-02-16 17:47:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package solid # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,13 @@ %define lname libKF5Solid5 +%define _tar_path 5.7 Name: solid -Version: 5.6.0 +Version: %{_tar_path}.0 Release: 0 BuildRequires: bison BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.6.0 +BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes BuildRequires: flex BuildRequires: kf5-filesystem @@ -38,7 +39,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/5.6/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ solid-5.6.0.tar.xz -> solid-5.7.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/CMakeLists.txt new/solid-5.7.0/CMakeLists.txt --- old/solid-5.6.0/CMakeLists.txt 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/CMakeLists.txt 2015-02-08 16:28:12.000000000 +0100 @@ -3,7 +3,7 @@ project(Solid) -find_package(ECM 1.6.0 REQUIRED NO_MODULE) +find_package(ECM 1.7.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -38,7 +38,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.6.0") # handled by release scripts +set(KF5_VERSION "5.7.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX SOLID VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/solid_version.h" @@ -66,7 +66,7 @@ add_subdirectory(autotests) # create a Config.cmake and a ConfigVersion.cmake file and install them -set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Solid") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Solid") ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5SolidConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5SolidConfig.cmake" @@ -80,6 +80,6 @@ install(EXPORT KF5SolidTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5SolidTargets.cmake NAMESPACE KF5:: ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/solid_version.h DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/solid_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/po/fi/solid5_qt.po new/solid-5.7.0/po/fi/solid5_qt.po --- old/solid-5.6.0/po/fi/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/po/fi/solid5_qt.po 2015-02-08 16:28:12.000000000 +0100 @@ -5,7 +5,7 @@ # Kim Enkovaara <e...@iki.fi>, 2010. # Tommi Nieminen <transla...@legisign.org>, 2010. # Lasse Liehu <lli...@kolumbus.fi>, 2011. -# Lasse Liehu <lasse.li...@gmail.com>, 2011, 2012, 2013, 2014. +# Lasse Liehu <lasse.li...@gmail.com>, 2011, 2012, 2013, 2014, 2015. # # KDE Finnish translation sprint participants: # Author: Lliehu @@ -14,9 +14,9 @@ "Project-Id-Version: solid_qt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-24 18:50+0000\n" -"PO-Revision-Date: 2014-10-10 17:26+0300\n" -"Last-Translator: Larso\n" -"Language-Team: Finnish <kde-i18n-...@kde.org>\n" +"PO-Revision-Date: 2015-01-04 23:36+0200\n" +"Last-Translator: Lasse Liehu <lasse.li...@gmail.com>\n" +"Language-Team: Finnish <lokalisoi...@lists.coss.fi>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -860,7 +860,7 @@ #: solid/devices/backends/udisks2/udisksdevice.cpp:722 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The kernel driver for this filesystem type is not available" -msgstr "Tämän tiedostojärjestelmän kerneliajuri ei ole käytettävissä" +msgstr "Tämän tiedostojärjestelmän ajuri ei ole käytettävissä" #: solid/devices/backends/udisks2/udisksdevice.cpp:724 msgctxt "Solid::Backends::UDisks2::Device|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/po/ko/solid5_qt.po new/solid-5.7.0/po/ko/solid5_qt.po --- old/solid-5.6.0/po/ko/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/po/ko/solid5_qt.po 2015-02-08 16:28:12.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2014-10-16 21:01+0900\n" +"PO-Revision-Date: 2015-01-18 17:09+0900\n" "Last-Translator: Park Shinjo <k...@peremen.name>\n" "Language-Team: Korean <k...@peremen.name>\n" "Language: ko\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/po/nb/solid5_qt.po new/solid-5.7.0/po/nb/solid5_qt.po --- old/solid-5.6.0/po/nb/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/po/nb/solid5_qt.po 2015-02-08 16:28:12.000000000 +0100 @@ -1,4 +1,4 @@ -# Translation of solid_qt to Norwegian Bokmål +# Translation of solid5_qt to Norwegian Bokmål # # Bjørn Steensrud <bjor...@skogkatt.homelinux.org>, 2009, 2010, 2011, 2012, 2013, 2014. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/po/nn/solid5_qt.po new/solid-5.7.0/po/nn/solid5_qt.po --- old/solid-5.6.0/po/nn/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/po/nn/solid5_qt.po 2015-02-08 16:28:12.000000000 +0100 @@ -1,4 +1,4 @@ -# Translation of solid_qt to Norwegian Nynorsk +# Translation of solid5_qt to Norwegian Nynorsk # # Karl Ove Hufthammer <k...@huftis.org>, 2010. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/po/se/solid5_qt.po new/solid-5.7.0/po/se/solid5_qt.po --- old/solid-5.6.0/po/se/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/po/se/solid5_qt.po 2015-02-08 16:28:12.000000000 +0100 @@ -1,4 +1,4 @@ -# Translation of solid_qt to Northern Sami +# Translation of solid5_qt to Northern Sami # # Børre Gaup <boe...@skolelinux.no>, 2010, 2011, 2012. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/po/zh_CN/solid5_qt.po new/solid-5.7.0/po/zh_CN/solid5_qt.po --- old/solid-5.6.0/po/zh_CN/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/po/zh_CN/solid5_qt.po 2015-02-08 16:28:12.000000000 +0100 @@ -3,7 +3,7 @@ # # Ni Hui <shuizhuyuan...@126.com>, 2009, 2010, 2011. # Lie Ex <lilith...@gmail.com>, 2010. -# Weng Xuetian <wen...@gmail.com>, 2012, 2013, 2014. +# Weng Xuetian <wen...@gmail.com>, 2012, 2013, 2014, 2015. # FengChao <rainofch...@gmail.com>, 2012. # Feng Chao <chaofeng...@gmail.com>, 2014. msgid "" @@ -11,9 +11,9 @@ "Project-Id-Version: solid_qt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2014-12-18 17:13-0800\n" +"PO-Revision-Date: 2015-01-30 09:37-0800\n" "Last-Translator: Weng Xuetian <wen...@gmail.com>\n" -"Language-Team: Chinese Simplified <kde-i18n-...@kde.org>\n" +"Language-Team: Chinese Simplified <kde-ch...@kde.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1193,7 +1193,7 @@ #: tools/solid-power/main.cpp:36 msgctxt "solid-power|" msgid "Tool to know and set the power management state of your device" -msgstr "" +msgstr "查看和设置设备电源管理状态的工具" #: tools/solid-power/main.cpp:38 msgctxt "solid-power|" @@ -1212,3 +1212,5 @@ " # - acPlugged: whether the device is connected to the AC or " "not\n" msgstr "" +" # 显示系统所有电源管理信息。\n" +" # - 已连接电源: 设备是否连接到电源\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/imports/CMakeLists.txt new/solid-5.7.0/src/imports/CMakeLists.txt --- old/solid-5.6.0/src/imports/CMakeLists.txt 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/imports/CMakeLists.txt 2015-02-08 16:28:12.000000000 +0100 @@ -27,6 +27,6 @@ Qt5::Qml ) -install(TARGETS solidextensionplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/solid) -install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/solid) +install(TARGETS solidextensionplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/solid) +install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/solid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/CMakeLists.txt new/solid-5.7.0/src/solid/CMakeLists.txt --- old/solid-5.6.0/src/solid/CMakeLists.txt 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/CMakeLists.txt 2015-02-08 16:28:12.000000000 +0100 @@ -9,12 +9,12 @@ set(solid_LIB_SRCS ${solid_LIB_SRCS} ${solid_QM_LOADER}) add_library(KF5Solid ${solid_LIB_SRCS}) -target_include_directories(KF5Solid PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>") +target_include_directories(KF5Solid PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>") generate_export_header(KF5Solid BASE_NAME Solid) add_library(KF5::Solid ALIAS KF5Solid) # Apps must include <Solid/File> or <solid/file.h> -target_include_directories(KF5Solid INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/Solid>") +target_include_directories(KF5Solid INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/Solid>") target_link_libraries(KF5Solid PUBLIC Qt5::Core PRIVATE Qt5::DBus @@ -80,7 +80,7 @@ ) endif() -install(FILES ${Solid_CamelCase_HEADERS} DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/Solid/Solid COMPONENT Devel) +install(FILES ${Solid_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Solid/Solid COMPONENT Devel) install(TARGETS KF5Solid EXPORT KF5SolidTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) @@ -91,14 +91,14 @@ target_link_libraries(KF5Solid_static PUBLIC Qt5::Core) target_link_libraries(KF5Solid_static PRIVATE Qt5::DBus Qt5::Xml Qt5::Widgets ${solid_OPTIONAL_LIBS}) -target_include_directories(KF5Solid_static PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>") +target_include_directories(KF5Solid_static PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>") ########### install files ############### install(FILES ${CMAKE_CURRENT_BINARY_DIR}/solid_export.h ${Solid_HEADERS} - DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/Solid/solid COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Solid/solid COMPONENT Devel ) ########### parser build ############### @@ -137,5 +137,5 @@ endif () include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME Solid LIB_NAME KF5Solid DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/Solid) -install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) \ No newline at end of file +ecm_generate_pri_file(BASE_NAME Solid LIB_NAME KF5Solid DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/Solid) +install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/backends/fakehw/fakebattery.cpp new/solid-5.7.0/src/solid/devices/backends/fakehw/fakebattery.cpp --- old/solid-5.6.0/src/solid/devices/backends/fakehw/fakebattery.cpp 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/backends/fakehw/fakebattery.cpp 2015-02-08 16:28:12.000000000 +0100 @@ -150,6 +150,16 @@ return fakeDevice()->property("energy").toDouble(); } +double FakeBattery::energyFull() const +{ + return fakeDevice()->property("energyFull").toDouble(); +} + +double FakeBattery::energyFullDesign() const +{ + return fakeDevice()->property("energyFullDesign").toDouble(); +} + double FakeBattery::energyRate() const { return fakeDevice()->property("energyRate").toDouble(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/backends/fakehw/fakebattery.h new/solid-5.7.0/src/solid/devices/backends/fakehw/fakebattery.h --- old/solid-5.6.0/src/solid/devices/backends/fakehw/fakebattery.h 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/backends/fakehw/fakebattery.h 2015-02-08 16:28:12.000000000 +0100 @@ -61,7 +61,8 @@ virtual Solid::Battery::Technology technology() const; virtual double energy() const; - + virtual double energyFull() const; + virtual double energyFullDesign() const; virtual double energyRate() const; virtual double voltage() const; @@ -82,6 +83,8 @@ void timeToEmptyChanged(qlonglong time, const QString &udi); void timeToFullChanged(qlonglong time, const QString &udi); void energyChanged(double energy, const QString &udi); + void energyFullChanged(double energyFull, const QString &udi); + void energyFullDesignChanged(double energyFullDesign, const QString &udi); void energyRateChanged(double energyRate, const QString &udi); void voltageChanged(double voltage, const QString &udi); void temperatureChanged(double temperature, const QString &udi); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/backends/hal/halbattery.cpp new/solid-5.7.0/src/solid/devices/backends/hal/halbattery.cpp --- old/solid-5.6.0/src/solid/devices/backends/hal/halbattery.cpp 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/backends/hal/halbattery.cpp 2015-02-08 16:28:12.000000000 +0100 @@ -142,6 +142,16 @@ return static_cast<HalDevice *>(m_device)->prop("battery.charge_level.current").toInt() / 1000; } +double Battery::energyFull() const +{ + return static_cast<HalDevice *>(m_device)->prop("battery.charge_level.last_full").toInt() / 1000; +} + +double Battery::energyFullDesign() const +{ + return static_cast<HalDevice *>(m_device)->prop("battery.charge_level.design").toInt() / 1000; +} + double Battery::energyRate() const { return static_cast<HalDevice *>(m_device)->prop("battery.charge_level.rate").toInt() / 1000; @@ -206,6 +216,14 @@ emit energyChanged(energy(), m_device->udi()); } + if (changes.contains("battery.charge_level.last_full")) { + emit energyFullChanged(energyFull(), m_device->udi()); + } + + if (changes.contains("battery.charge_level.design")) { + emit energyFullDesignChanged(energyFullDesign(), m_device->udi()); + } + if (changes.contains("battery.charge_level.rate")) { emit energyRateChanged(energyRate(), m_device->udi()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/backends/hal/halbattery.h new/solid-5.7.0/src/solid/devices/backends/hal/halbattery.h --- old/solid-5.6.0/src/solid/devices/backends/hal/halbattery.h 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/backends/hal/halbattery.h 2015-02-08 16:28:12.000000000 +0100 @@ -55,7 +55,8 @@ virtual Solid::Battery::Technology technology() const; virtual double energy() const; - + virtual double energyFull() const; + virtual double energyFullDesign() const; virtual double energyRate() const; virtual double voltage() const; @@ -76,6 +77,8 @@ void timeToEmptyChanged(qlonglong time, const QString &udi); void timeToFullChanged(qlonglong time, const QString &udi); void energyChanged(double energy, const QString &udi); + void energyFullChanged(double energyFull, const QString &udi); + void energyFullDesignChanged(double energyFullDesign, const QString &udi); void energyRateChanged(double energyRate, const QString &udi); void voltageChanged(double voltage, const QString &udi); void temperatureChanged(double temperature, const QString &udi); // dummy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/backends/iokit/iokitbattery.h new/solid-5.7.0/src/solid/devices/backends/iokit/iokitbattery.h --- old/solid-5.6.0/src/solid/devices/backends/iokit/iokitbattery.h 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/backends/iokit/iokitbattery.h 2015-02-08 16:28:12.000000000 +0100 @@ -57,6 +57,8 @@ qlonglong timeToFull() const { return 0; } Solid::Battery::Technology technology() const { return Solid::Battery::UnknownTechnology; } double energy() const { return 0.0; } + double energyFull() const { return 0.0; } + double energyFullDesign() const { return 0.0; } double energyRate() const { return 0.0; } double voltage() const { return 0.0; } double temperature() const { return 0.0; } @@ -68,6 +70,8 @@ Q_SIGNALS: void energyChanged(double energy, const QString &udi); + void energyFullChanged(double energyFull, const QString &udi); + void energyFullDesignChanged(double energyFullDesign, const QString &udi); void energyRateChanged(double energyRate, const QString &udi); void chargePercentChanged(int value, const QString &udi); void capacityChanged(int value, const QString &udi); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/backends/upower/upowerbattery.cpp new/solid-5.7.0/src/solid/devices/backends/upower/upowerbattery.cpp --- old/solid-5.6.0/src/solid/devices/backends/upower/upowerbattery.cpp 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/backends/upower/upowerbattery.cpp 2015-02-08 16:28:12.000000000 +0100 @@ -156,6 +156,16 @@ return m_device.data()->prop("Energy").toDouble(); } +double Battery::energyFull() const +{ + return m_device.data()->prop("EnergyFull").toDouble(); +} + +double Battery::energyFullDesign() const +{ + return m_device.data()->prop("EnergyFullDesign").toDouble(); +} + double Battery::energyRate() const { return m_device.data()->prop("EnergyRate").toDouble(); @@ -202,6 +212,8 @@ const qlonglong old_timeToEmpty = m_timeToEmpty; const qlonglong old_timeToFull = m_timeToFull; const double old_energy = m_energy; + const double old_energyFull = m_energyFull; + const double old_energyFullDesign = m_energyFullDesign; const double old_energyRate = m_energyRate; const double old_voltage = m_voltage; const double old_temperature = m_temperature; @@ -239,6 +251,14 @@ emit energyChanged(m_energy, m_device.data()->udi()); } + if (old_energyFull != m_energyFull) { + emit energyFullChanged(m_energyFull, m_device.data()->udi()); + } + + if (old_energyFullDesign != m_energyFullDesign) { + emit energyFullChanged(m_energyFullDesign, m_device.data()->udi()); + } + if (old_energyRate != m_energyRate) { emit energyRateChanged(m_energyRate, m_device.data()->udi()); } @@ -263,6 +283,8 @@ m_timeToEmpty = timeToEmpty(); m_timeToFull = timeToFull(); m_energy = energy(); + m_energyFull = energyFull(); + m_energyFullDesign = energyFullDesign(); m_energyRate = energyRate(); m_voltage = voltage(); m_temperature = temperature(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/backends/upower/upowerbattery.h new/solid-5.7.0/src/solid/devices/backends/upower/upowerbattery.h --- old/solid-5.6.0/src/solid/devices/backends/upower/upowerbattery.h 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/backends/upower/upowerbattery.h 2015-02-08 16:28:12.000000000 +0100 @@ -63,6 +63,10 @@ virtual double energy() const; + virtual double energyFull() const; + + virtual double energyFullDesign() const; + virtual double energyRate() const; virtual double voltage() const; @@ -86,6 +90,8 @@ void timeToEmptyChanged(qlonglong time, const QString &udi); void timeToFullChanged(qlonglong time, const QString &udi); void energyChanged(double energy, const QString &udi); + void energyFullChanged(double energyFull, const QString &udi); + void energyFullDesignChanged(double energyFullDesign, const QString &udi); void energyRateChanged(double energyRate, const QString &udi); void voltageChanged(double voltage, const QString &udi); void temperatureChanged(double temperature, const QString &udi); @@ -104,6 +110,8 @@ qlonglong m_timeToEmpty; qlonglong m_timeToFull; double m_energy; + double m_energyFull; + double m_energyFullDesign; double m_energyRate; double m_voltage; double m_temperature; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/backends/win/winbattery.cpp new/solid-5.7.0/src/solid/devices/backends/win/winbattery.cpp --- old/solid-5.6.0/src/solid/devices/backends/win/winbattery.cpp 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/backends/win/winbattery.cpp 2015-02-08 16:28:12.000000000 +0100 @@ -136,6 +136,8 @@ const Solid::Battery::ChargeState old_state = m_state; const bool old_isPowerSupply = m_isPowerSupply; const double old_energy = m_energy; + const double old_energyFull = m_energyFull; + const double old_energyFullDesign = m_energyFullDesign; const double old_energyRate = m_energyRate; const double old_voltage = m_voltage; @@ -172,6 +174,8 @@ } m_energy = status.Capacity / 1000.0;//provided in mWh + m_energyFull = info.FullChargedCapacity / 1000.0; // provided in mWh + m_energyFullDesign = info.DesignedCapacity / 1000.0; // provided in mWh m_energyRate = status.Rate / 1000.0;//provided in mW m_voltage = status.Voltage / 1000.0;//provided in mV @@ -223,6 +227,14 @@ emit energyChanged(m_energy, m_device->udi()); } + if (old_energyFull != m_energyFull) { + emit energyFullChanged(m_energyFull, m_device->udi()); + } + + if (old_energyFullDesign != m_energyFullDesign) { + emit energyFullDesignChanged(m_energyFullDesign, m_device->udi()); + } + if (old_energyRate != m_energyRate) { emit energyRateChanged(m_energyRate, m_device->udi()); } @@ -292,6 +304,16 @@ return m_energy; } +double WinBattery::energyFull() const +{ + return m_energyFull; +} + +double WinBattery::energyFullDesign() const +{ + return m_energyFullDesign; +} + double WinBattery::energyRate() const { return m_energyRate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/backends/win/winbattery.h new/solid-5.7.0/src/solid/devices/backends/win/winbattery.h --- old/solid-5.6.0/src/solid/devices/backends/win/winbattery.h 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/backends/win/winbattery.h 2015-02-08 16:28:12.000000000 +0100 @@ -56,7 +56,8 @@ Solid::Battery::Technology technology() const; double energy() const; - + double energyFull() const; + double energyFullDesign() const; double energyRate() const; double voltage() const; @@ -92,6 +93,8 @@ void chargeStateChanged(int newState, const QString &udi); void powerSupplyStateChanged(bool newState, const QString &udi); void energyChanged(double energy, const QString &udi); + void energyFullChanged(double energyFull, const QString &udi); + void energyFullDesignChanged(double energyFullDesign, const QString &udi); void energyRateChanged(double energyRate, const QString &udi); void timeToEmptyChanged(qlonglong time, const QString &udi); void temperatureChanged(double temperature, const QString &udi); @@ -120,6 +123,8 @@ Solid::Battery::ChargeState m_state; Solid::Battery::Technology m_technology; double m_energy; + double m_energyFull; + double m_energyFullDesign; double m_energyRate; double m_voltage; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/frontend/battery.cpp new/solid-5.7.0/src/solid/devices/frontend/battery.cpp --- old/solid-5.6.0/src/solid/devices/frontend/battery.cpp 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/frontend/battery.cpp 2015-02-08 16:28:12.000000000 +0100 @@ -53,6 +53,12 @@ connect(backendObject, SIGNAL(energyChanged(double,QString)), this, SIGNAL(energyChanged(double,QString))); + connect(backendObject, SIGNAL(energyFullChanged(double,QString)), + this, SIGNAL(energyFullChanged(double,QString))); + + connect(backendObject, SIGNAL(energyFullDesignChanged(double,QString)), + this, SIGNAL(energyFullDesignChanged(double,QString))); + connect(backendObject, SIGNAL(energyRateChanged(double,QString)), this, SIGNAL(energyRateChanged(double,QString))); @@ -135,6 +141,18 @@ return_SOLID_CALL(Ifaces::Battery *, d->backendObject(), 0.0, energy()); } +double Solid::Battery::energyFull() const +{ + Q_D(const Battery); + return_SOLID_CALL(Ifaces::Battery *, d->backendObject(), 0.0, energyFull()); +} + +double Solid::Battery::energyFullDesign() const +{ + Q_D(const Battery); + return_SOLID_CALL(Ifaces::Battery *, d->backendObject(), 0.0, energyFullDesign()); +} + double Solid::Battery::energyRate() const { Q_D(const Battery); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/frontend/battery.h new/solid-5.7.0/src/solid/devices/frontend/battery.h --- old/solid-5.6.0/src/solid/devices/frontend/battery.h 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/frontend/battery.h 2015-02-08 16:28:12.000000000 +0100 @@ -49,6 +49,8 @@ Q_PROPERTY(qlonglong timeToEmpty READ timeToEmpty NOTIFY timeToEmptyChanged) Q_PROPERTY(qlonglong timeToFull READ timeToFull NOTIFY timeToFullChanged) Q_PROPERTY(double energy READ energy NOTIFY energyChanged) + Q_PROPERTY(double energyFull READ energyFull NOTIFY energyFullChanged) + Q_PROPERTY(double energyFullDesign READ energyFullDesign NOTIFY energyFullDesignChanged) Q_PROPERTY(double energyRate READ energyRate NOTIFY energyRateChanged) Q_PROPERTY(double voltage READ voltage NOTIFY voltageChanged) Q_PROPERTY(double temperature READ temperature NOTIFY temperatureChanged) @@ -231,6 +233,22 @@ double energy() const; /** + * Amount of energy (measured in Wh) the battery has when it is full. + * + * @return amount of battery energy when full in Wh + * @since 5.7 + */ + double energyFull() const; + + /** + * Amount of energy (measured in Wh) the battery should have by design hen it is full. + * + * @return amount of battery energy when full by design in Wh + * @since 5.7 + */ + double energyFullDesign() const; + + /** * Amount of energy being drained from the source, measured in W. * If positive, the source is being discharged, if negative it's being charged. * @@ -360,11 +378,29 @@ * battery has changed. * * @param energy the new energy value of the battery - * @param udi the UDI of the battery with the new charge percent + * @param udi the UDI of the battery with the new energy value */ void energyChanged(double energy, const QString &udi); /** + * This signal is emitted when the energy full value of this + * battery has changed. + * + * @param energy the new energy full value of the battery + * @param udi the UDI of the battery with the new energy full value + */ + void energyFullChanged(double energy, const QString &udi); + + /** + * This signal is emitted when the energy full design value of this + * battery has changed. + * + * @param energy the new energy full design value of the battery + * @param udi the UDI of the battery with the new energy full design value + */ + void energyFullDesignChanged(double energy, const QString &udi); + + /** * This signal is emitted when the energy rate value of this * battery has changed. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/devices/ifaces/battery.h new/solid-5.7.0/src/solid/devices/ifaces/battery.h --- old/solid-5.6.0/src/solid/devices/ifaces/battery.h 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/devices/ifaces/battery.h 2015-02-08 16:28:12.000000000 +0100 @@ -130,6 +130,22 @@ virtual double energy() const = 0; /** + * Amount of energy (measured in Wh) the battery has when it is full. + * + * @return amount of battery energy when full in Wh + * @since 5.7 + */ + virtual double energyFull() const = 0; + + /** + * Amount of energy (measured in Wh) the battery should have by design hen it is full. + * + * @return amount of battery energy when full by design in Wh + * @since 5.7 + */ + virtual double energyFullDesign() const = 0; + + /** * Amount of energy being drained from the source, measured in W. * If positive, the source is being discharged, if negative it's being charged. * @@ -260,11 +276,29 @@ * battery has changed. * * @param energy the new energy value of the battery - * @param udi the UDI of the battery with the new charge percent + * @param udi the UDI of the battery with the new energy value */ virtual void energyChanged(double energy, const QString &udi) = 0; /** + * This signal is emitted when the energy full value of this + * battery has changed. + * + * @param energy the new energy full value of the battery + * @param udi the UDI of the battery with the new energy full value + */ + virtual void energyFullChanged(double energy, const QString &udi) = 0; + + /** + * This signal is emitted when the energy full design value of this + * battery has changed. + * + * @param energy the new energy full design value of the battery + * @param udi the UDI of the battery with the new energy full design value + */ + virtual void energyFullDesignChanged(double energy, const QString &udi) = 0; + + /** * This signal is emitted when the energy rate value of this * battery has changed. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/power/backends/dummy/dummystatesjob.cpp new/solid-5.7.0/src/solid/power/backends/dummy/dummystatesjob.cpp --- old/solid-5.6.0/src/solid/power/backends/dummy/dummystatesjob.cpp 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/power/backends/dummy/dummystatesjob.cpp 2015-02-08 16:28:12.000000000 +0100 @@ -33,4 +33,3 @@ return Power::Shutdown | Power::Sleep; } -#include "dummystatesjob.moc" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/solid/power/inhibition.cpp new/solid-5.7.0/src/solid/power/inhibition.cpp --- old/solid-5.6.0/src/solid/power/inhibition.cpp 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/solid/power/inhibition.cpp 2015-02-08 16:28:12.000000000 +0100 @@ -58,4 +58,3 @@ return d_ptr->backendObject->state(); } -#include "inhibition.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.6.0/src/tools/solid-hardware/solid-hardware.cpp new/solid-5.7.0/src/tools/solid-hardware/solid-hardware.cpp --- old/solid-5.6.0/src/tools/solid-hardware/solid-hardware.cpp 2015-01-03 13:17:31.000000000 +0100 +++ new/solid-5.7.0/src/tools/solid-hardware/solid-hardware.cpp 2015-02-08 16:28:12.000000000 +0100 @@ -448,4 +448,3 @@ m_loop.exit(); } -#include "solid-hardware.moc" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
