Hello community, here is the log from the commit of package solaar for openSUSE:Factory checked in at 2019-09-18 13:14:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solaar (Old) and /work/SRC/openSUSE:Factory/.solaar.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solaar" Wed Sep 18 13:14:06 2019 rev:4 rq:731587 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/solaar/solaar.changes 2019-08-23 11:08:52.438464836 +0200 +++ /work/SRC/openSUSE:Factory/.solaar.new.7948/solaar.changes 2019-09-18 13:15:11.852642472 +0200 @@ -1,0 +2,8 @@ +Tue Sep 17 19:32:16 UTC 2019 - Andreas Schneider <[email protected]> + +- Fix icon theme for battery level + + Added 0001-data-fix-icon-theme-for-battery-level.patch +- Fix battery status notifaction parsing + + Added 0005-notifications-fix-battery-status-notification-parsin.patch + +------------------------------------------------------------------- New: ---- 0001-data-fix-icon-theme-for-battery-level.patch 0005-notifications-fix-battery-status-notification-parsin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solaar.spec ++++++ --- /var/tmp/diff_new_pack.VxJAU9/_old 2019-09-18 13:15:12.332642371 +0200 +++ /var/tmp/diff_new_pack.VxJAU9/_new 2019-09-18 13:15:12.332642371 +0200 @@ -28,6 +28,10 @@ Patch0: solaar-fix-desktop-categories.patch # https://github.com/pwr-Solaar/Solaar/pull/546 Patch1: 0001-Fix-reading-and-storing-DPI-in-config-settings.patch +# https://github.com/pwr-Solaar/Solaar/commit/a06ea6de11259ca1511e7fe759306e7db47fb1da +Patch2: 0001-data-fix-icon-theme-for-battery-level.patch +# https://github.com/pwr-Solaar/Solaar/commit/69815558041b84da9add36d4bd1503415a3ac0c0 +Patch3: 0005-notifications-fix-battery-status-notification-parsin.patch # BuildRequires: fdupes BuildRequires: hicolor-icon-theme ++++++ 0001-data-fix-icon-theme-for-battery-level.patch ++++++ >From a06ea6de11259ca1511e7fe759306e7db47fb1da Mon Sep 17 00:00:00 2001 From: Zachary Cook <[email protected]> Date: Tue, 20 Aug 2019 03:35:31 -0400 Subject: [PATCH 1/5] data: fix icon theme for battery level It was previously assigning levels 1-89 to caution and 90+ to full, which was unintended due to the floor division by 100 --- lib/solaar/ui/icons.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/solaar/ui/icons.py b/lib/solaar/ui/icons.py index 3c1616f..3426b0c 100644 --- a/lib/solaar/ui/icons.py +++ b/lib/solaar/ui/icons.py @@ -133,9 +133,9 @@ def _battery_icon_name(level, charging): level_approx = 20 * ((level + 10) // 20) if _has_mint_icons: - if level == 0: - return 'battery-empty%s-symbolic' % ('-charging' if charging else '') - level_name = ('caution', 'low', 'good', 'full')[3*(level_approx // 100)] + if level == 100 and charging: + return 'battery-full-charged-symbolic' + level_name = ('empty', 'caution', 'low', 'good', 'good', 'full')[level_approx // 20] return 'battery-%s%s-symbolic' % (level_name, '-charging' if charging else '') if _has_gpm_icons: -- 2.23.0 ++++++ 0005-notifications-fix-battery-status-notification-parsin.patch ++++++ >From 69815558041b84da9add36d4bd1503415a3ac0c0 Mon Sep 17 00:00:00 2001 From: Alex Cherkayev <[email protected]> Date: Tue, 20 Aug 2019 10:40:39 +0300 Subject: [PATCH 5/5] notifications: fix battery status notification parsing Fix indicator tooltip (duplicate Solaar line, python list instead of battery status). --- lib/logitech_receiver/notifications.py | 7 ++++--- lib/solaar/ui/tray.py | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/logitech_receiver/notifications.py b/lib/logitech_receiver/notifications.py index cd9928f..22d8cb7 100644 --- a/lib/logitech_receiver/notifications.py +++ b/lib/logitech_receiver/notifications.py @@ -204,9 +204,10 @@ def _process_hidpp10_notification(device, status, n): def _process_feature_notification(device, status, n, feature): if feature == _F.BATTERY_STATUS: if n.address == 0x00: - discharge = ord(n.data[:1]) - battery_status = ord(n.data[1:2]) - status.set_battery_info(discharge, _hidpp20.BATTERY_STATUS[battery_status]) + discharge_level = ord(n.data[:1]) + discharge_next_level = ord(n.data[1:2]) + battery_status = ord(n.data[2:3]) + status.set_battery_info(discharge_level, _hidpp20.BATTERY_STATUS[battery_status]) else: _log.warn("%s: unknown BATTERY %s", device, n) return True diff --git a/lib/solaar/ui/tray.py b/lib/solaar/ui/tray.py index 29bcd91..161775a 100644 --- a/lib/solaar/ui/tray.py +++ b/lib/solaar/ui/tray.py @@ -185,7 +185,7 @@ try: battery_charging = device_status.get(_K.BATTERY_CHARGING) tray_icon_name = _icons.battery(battery_level, battery_charging) - description = '%s: %s' % (name, device_status) + description = '%s: %s' % (name, device_status.to_string()) else: # there may be a receiver, but no peripherals tray_icon_name = _icons.TRAY_OKAY if _devices_info else _icons.TRAY_INIT @@ -279,9 +279,6 @@ def _generate_tooltip_lines(): yield '<b>%s</b>: ' % NAME + _("no receiver") return - yield '<b>%s</b>' % NAME - yield '' - for _ignore, number, name, status in _devices_info: if number is None: # receiver continue -- 2.23.0
