[wesnoth-commits] [wesnoth/wesnoth] 0587b0: Add initial battery_info and apple_battery_info

Tue Aug 21 15:56:31 UTC 2018

  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 0587b0e8fb41b69a59796e1b9fd459fef92e7a31
      https://github.com/wesnoth/wesnoth/commit/0587b0e8fb41b69a59796e1b9fd459fef92e7a31
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    A src/desktop/apple_battery_info.hpp
    A src/desktop/apple_battery_info.mm
    A src/desktop/battery_info.cpp
    A src/desktop/battery_info.hpp

  Log Message:
  -----------
  Add initial battery_info and apple_battery_info

  Commit: 0e81d54de32ea836813db9421e0c478b3added07
      https://github.com/wesnoth/wesnoth/commit/0e81d54de32ea836813db9421e0c478b3added07
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M src/desktop/apple_battery_info.mm

  Log Message:
  -----------
  Include verification if target is iOS or macOS

  Commit: 5394ede8b5cba2a13a2ceb52a5e582aec247c598
      https://github.com/wesnoth/wesnoth/commit/5394ede8b5cba2a13a2ceb52a5e582aec247c598
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    A data/core/images/themes/battery-bw-lighting-bolt.png
    A data/core/images/themes/battery-bw.png
    A data/core/images/themes/battery-lighting-bolt.png
    A data/core/images/themes/battery.png
    M data/themes/_initial.cfg
    M data/themes/classic.cfg
    M data/themes/default.cfg
    M src/game_display.cpp
    M src/reports.cpp

  Log Message:
  -----------
  Include battery percentage into GUI and add 2 versions of battery icon

  Commit: c2d23b036e110df3587914870c73c885abd929b0
      https://github.com/wesnoth/wesnoth/commit/c2d23b036e110df3587914870c73c885abd929b0
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M src/reports.cpp

  Log Message:
  -----------
  Show battery percentage as integer

  Commit: d2cbf9ed56b86724e46700bfad34f21561713a3a
      https://github.com/wesnoth/wesnoth/commit/d2cbf9ed56b86724e46700bfad34f21561713a3a
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M data/themes/_initial.cfg
    M data/themes/classic.cfg
    M data/themes/default.cfg

  Log Message:
  -----------
  Move battery info to right from current time

  Commit: 9902a2a69828e2f3ff3a5048d746c3cba255881d
      https://github.com/wesnoth/wesnoth/commit/9902a2a69828e2f3ff3a5048d746c3cba255881d
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M src/reports.cpp

  Log Message:
  -----------
  Remove unused battery variable

  Commit: 8d8f9acc5ee8599e304a396fd5526767244f11f7
      https://github.com/wesnoth/wesnoth/commit/8d8f9acc5ee8599e304a396fd5526767244f11f7
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M SConstruct
    M source_lists/wesnoth
    M src/CMakeLists.txt
    M src/SConscript
    M src/desktop/apple_battery_info.mm

  Log Message:
  -----------
  Fix C-Make and Scons builds

  Commit: 9fefbc123d50a27e818df3b15cc03691860c6f6e
      https://github.com/wesnoth/wesnoth/commit/9fefbc123d50a27e818df3b15cc03691860c6f6e
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M projectfiles/VC12/wesnoth.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj.filters
    M src/CMakeLists.txt
    M src/SConscript
    M src/desktop/battery_info.cpp
    M src/desktop/battery_info.hpp
    A src/desktop/windows_battery_info.cpp
    A src/desktop/windows_battery_info.hpp

  Log Message:
  -----------
  Implement getting battery status on Windows

  Commit: 203551f80d674686e1e7e470e83d0b65ab4beb69
      https://github.com/wesnoth/wesnoth/commit/203551f80d674686e1e7e470e83d0b65ab4beb69
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M src/reports.cpp

  Log Message:
  -----------
  fix use of old-style cast error

  Commit: b1384e1577b00f7fbcf449c3787a9b4893316551
      https://github.com/wesnoth/wesnoth/commit/b1384e1577b00f7fbcf449c3787a9b4893316551
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M data/themes/_initial.cfg
    M data/themes/classic.cfg
    M data/themes/default.cfg

  Log Message:
  -----------
  Revert "Move battery info to right from current time"

This reverts commit b1c12acb8ee9b82c088114dfe00cf1a7ceff9c33.

  Commit: 900555c84512e519c0df70735d43e61ff39cad12
      https://github.com/wesnoth/wesnoth/commit/900555c84512e519c0df70735d43e61ff39cad12
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M src/CMakeLists.txt

  Log Message:
  -----------
  Fix CMake build on macOS

Thanks @Pentarctagon

  Commit: f551fdc378d83e657673ea86d830582e611249d6
      https://github.com/wesnoth/wesnoth/commit/f551fdc378d83e657673ea86d830582e611249d6
  Author: Martin Hrubý <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M src/desktop/apple_battery_info.hpp

  Log Message:
  -----------
  Correct comment

  Commit: b36295ca9bab2bb2e4898cd1149cd407517c4eb9
      https://github.com/wesnoth/wesnoth/commit/b36295ca9bab2bb2e4898cd1149cd407517c4eb9
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M src/desktop/apple_battery_info.hpp
    M src/desktop/apple_battery_info.mm
    M src/desktop/battery_info.cpp
    M src/desktop/battery_info.hpp

  Log Message:
  -----------
  Fix indentation and namespace names

  Commit: e58e57d1d01ebfe0b8fe91cdf08124f738ee992c
      https://github.com/wesnoth/wesnoth/commit/e58e57d1d01ebfe0b8fe91cdf08124f738ee992c
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M data/game_config.cfg
    M data/themes/_initial.cfg
    M data/themes/default.cfg
    M src/game_config.cpp
    M src/game_config.hpp
    M src/reports.cpp
    M src/theme.cpp
    M src/theme.hpp

  Log Message:
  -----------
  Hide battery status if the device doesn't have a battery

The strategy is two-fold. We move the rendering of the icon into the
battery status report where it can be disabled at runtime, and allow the
countdown/clock to move to the position of the battery status if the device
doesn't have a battery. I also moved rendering of the clock icon to the
time report to allow the icon to move together with the text.

I needed to change theme::status_ to store pointers to status items because
otherwise the countdown object loses its type when inserted to the map. And
to be able to use std::unique_ptr inside the theme class, I had to make the
class non-copyable and movable.

  Commit: 81d9d8aa8ab61039a7e84ea6058fa8af7d6b571d
      https://github.com/wesnoth/wesnoth/commit/81d9d8aa8ab61039a7e84ea6058fa8af7d6b571d
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/desktop/battery_info.cpp
    A src/desktop/dbus_features.cpp
    A src/desktop/dbus_features.hpp
    R src/desktop/dbus_notification.cpp
    R src/desktop/dbus_notification.hpp
    M src/desktop/notifications.cpp

  Log Message:
  -----------
  WIP: implement battery status querying on GNU/Linux

This code is supposed to work in theory, but in practice (at least on my
PC) it fails with this error message:

The name org.freedesktop.UPower was not provided by any .service files

I'll need to investigate later on why it's happening.

  Commit: 3cb6adeb69ed221275bcc50f1cacb7b32311812e
      https://github.com/wesnoth/wesnoth/commit/3cb6adeb69ed221275bcc50f1cacb7b32311812e
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M src/desktop/dbus_features.cpp

  Log Message:
  -----------
  Fix battery status querying on GNU/Linux

The code was looking at the wrong bus (why on Earth does D-Bus have two
distinct buses, anyway?), and failed to unpack the return value from a
variant.

It seems to now work correctly, although UPower seems to categorize my
desktop PC's power source as "unknown" rather than the more accurate
"line power". No harm done because our code only shows the battery
indicator if the device is detected to have a battery.

Compare: https://github.com/wesnoth/wesnoth/compare/82faa024c382...3cb6adeb69ed
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.