Skip to content

panel : standalone power widget #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AKArien wants to merge 1 commit into
base: master
Choose a base branch
from
Open

panel : standalone power widget #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions metadata/panel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,18 @@ If full_span is off, both sides of the panel will take the same amount of space,
</option>
</group>
<group>
<_short>Power profiles</_short>
<option name="power_profiles_icon_size" type="int">
<_short>Battery Icon Size</_short>
<default>0</default>
<min>0</min>
</option>
<option name="power_profiles_font" type="string">
<_short>Battery Font</_short>
<default>default</default>
</option>
</group>
<group>
<_short>Network</_short>
<option name="network_status_font" type="string">
<_short>Clock Font</_short>
Expand Down
3 changes: 2 additions & 1 deletion src/panel/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
widget_sources = [
'widgets/battery.cpp',
'widgets/power-profiles.cpp',
'widgets/menu/menu.cpp',
'widgets/menu/layout.cpp',
'widgets/menu/logout.cpp',
Expand Down Expand Up @@ -92,4 +93,4 @@ executable(
['panel.cpp'] + widget_sources,
dependencies: deps,
install: true,
)
)
8 changes: 8 additions & 0 deletions src/panel/panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include "network/manager.hpp"
#include "widgets/battery.hpp"
#include "widgets/power-profiles.hpp"
#include "widgets/command-output.hpp"
#include "widgets/language.hpp"
#include "widgets/menu/menu.hpp"
Expand Down Expand Up @@ -232,6 +233,11 @@ class WayfirePanel::impl
return Widget(new WayfireBatteryInfo());
}

if (name == "power-profiles")
{
return Widget(new WayfirePowerProfiles());
}

if (name == "volume")
{
#ifdef HAVE_PULSE
Expand Down Expand Up @@ -606,6 +612,7 @@ void WayfirePanelApp::on_activate()
{"panel/menu_category_icon_size", ".app-category .default-icon"},
{"panel/launchers_size", ".launcher.widget-icon"},
{"panel/battery_icon_size", ".battery image.widget-icon"},
{"panel/power_profiles_icon_size", ".power-profiles image.widget-icon"},
{"panel/network_icon_size", ".network .widget-icon"},
{"panel/volume_icon_size", ".volume .widget-icon"},
{"panel/mixer_icon_size", ".mixer .widget-icon"},
Expand All @@ -628,6 +635,7 @@ void WayfirePanelApp::on_activate()
new CssFromConfigBool("panel/network_icon_invert_color", ".network-icon{filter:invert(100%);}", "");

new CssFromConfigFont("panel/battery_font", ".battery {", "}");
new CssFromConfigFont("panel/power_profiles_font", ".power_profiles {", "}");
new CssFromConfigFont("panel/clock_font", ".clock {", "}");
new CssFromConfigFont("panel/weather_font", ".weather {", "}");
}
Expand Down
184 changes: 12 additions & 172 deletions src/panel/widgets/battery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
#include <iostream>

#include "battery.hpp"
#define POWER_PROFILE_PATH "/org/freedesktop/UPower/PowerProfiles"
#define POWER_PROFILE_NAME "org.freedesktop.UPower.PowerProfiles"
#define UPOWER_NAME "org.freedesktop.UPower"
#define DISPLAY_DEVICE "/org/freedesktop/UPower/devices/DisplayDevice"

Expand All @@ -15,10 +13,6 @@
#define TIMETOEMPTY "TimeToEmpty"
#define SHOULD_DISPLAY "IsPresent"

#define DEGRADED "PerformanceDegraded"
#define PROFILES "Profiles"
#define ACTIVE_PROFILE "ActiveProfile"

static std::string get_device_type_description(uint32_t type)
{
if (type == 2)
Expand Down Expand Up @@ -77,12 +71,6 @@ void WayfireBatteryInfo::on_properties_changed(

void WayfireBatteryInfo::update_icon()
{
if (!feat_bat && feat_modes)
{
icon.set_from_icon_name("power-profile-" + power_mode);
return;
}

Glib::Variant<Glib::ustring> icon_name;
display_device->get_cached_property(icon_name, ICON);
icon.set_from_icon_name(icon_name.get());
Expand Down Expand Up @@ -150,14 +138,14 @@ void WayfireBatteryInfo::update_details()
description += ", " + uint_to_time(time_to_empty.get()) + " remaining";
}

box->set_tooltip_text(
box.set_tooltip_text(
get_device_type_description(type.get()) + description);

if (status_opt.value() == BATTERY_STATUS_PERCENT)
{
label.set_text(percentage_string);
overlay.remove_overlay(label);
box->set_child(label);
box.append(label);
} else if (status_opt.value() == BATTERY_STATUS_FULL)
{
label.set_text(description);
Expand All @@ -167,14 +155,14 @@ void WayfireBatteryInfo::update_details()
overlay.remove_overlay(label);
}

box->set_child(label);
box.append(label);
} else if (status_opt.value() == BATTERY_STATUS_OVERLAY)
{
label.set_text(percentage_string);
auto children = box->get_children();
auto children = box.get_children();
if (std::count(children.begin(), children.end(), &label))
{
box->remove(label);
box.remove(label);
}

overlay.add_overlay(label);
Expand All @@ -195,46 +183,6 @@ void WayfireBatteryInfo::update_state()
"\n\tWayfireBatteryInfo::update_state()" << std::endl;
}

bool WayfireBatteryInfo::setup_dbus_power_modes()
{
auto cancellable = Gio::Cancellable::create();
connection = Gio::DBus::Connection::get_sync(Gio::DBus::BusType::SYSTEM, cancellable);
if (!connection)
{
std::cerr << "Failed to connect to dbus" << std::endl;
return false;
}

powerprofile_proxy = Gio::DBus::Proxy::create_sync(connection, POWER_PROFILE_NAME,
POWER_PROFILE_PATH,
POWER_PROFILE_NAME);
if (!powerprofile_proxy)
{
std::cout << "Unable to conect to Power Profiles. Continuing" << std::endl;
} else
{
powerprofile_proxy->signal_properties_changed().connect(
sigc::mem_fun(*this, &WayfireBatteryInfo::on_upower_properties_changed));
Glib::Variant<Glib::ustring> current_profile;
Glib::Variant<std::vector<std::map<Glib::ustring, Glib::VariantBase>>> profiles;
powerprofile_proxy->get_cached_property(current_profile, ACTIVE_PROFILE);
powerprofile_proxy->get_cached_property(profiles, PROFILES);

if (profiles && current_profile)
{
setup_profiles(profiles.get());
set_current_profile(current_profile.get());
return true;
} else
{
std::cout << "Unable to conect to Power Profiles. Continuing" << std::endl;
return false;
}
}

return false;
}

bool WayfireBatteryInfo::setup_dbus_battery()
{
auto cancellable = Gio::Cancellable::create();
Expand Down Expand Up @@ -282,10 +230,10 @@ void WayfireBatteryInfo::update_layout()

if (panel_position.value() == PANEL_POSITION_LEFT or panel_position.value() == PANEL_POSITION_RIGHT)
{
box->set_orientation(Gtk::Orientation::VERTICAL);
box.set_orientation(Gtk::Orientation::VERTICAL);
} else
{
box->set_orientation(Gtk::Orientation::HORIZONTAL);
box.set_orientation(Gtk::Orientation::HORIZONTAL);
}
}

Expand All @@ -294,139 +242,31 @@ void WayfireBatteryInfo::handle_config_reload()
update_layout();
}

// TODO: simplify config loading

void WayfireBatteryInfo::init(Gtk::Box *container)
{
profiles_menu = Gio::Menu::create();
state_action = Gio::SimpleAction::create_radio_string("set_profile", "");

// the two features are battery displaying and power modes
feat_bat = setup_dbus_battery();
feat_modes = setup_dbus_power_modes();

// ignore if we can’t do either
if (!feat_bat && !feat_modes)
if (!setup_dbus_battery())
{
return;
}

box = std::make_unique<WayfireMenuWidget>("panel", "battery");

box->set_child(overlay);
box.append(overlay);
overlay.set_child(icon);
icon.add_css_class("widget-icon");

if (feat_bat)
{
status_opt.set_callback([=] () { update_details(); });
update_details();
}
status_opt.set_callback([=] () { update_details(); });
update_details();

update_icon();

if (feat_modes)
{
auto actions = Gio::SimpleActionGroup::create();

state_action->signal_activate().connect([=] (Glib::VariantBase vb)
{
// User has requested a change of state. Don't change the UI choice,
// let the dbus roundtrip happen to be sure.
if (vb.is_of_type(Glib::VariantType("s")))
{
// Couldn't seem to make proxy send property back, so this will have to do
Glib::VariantContainerBase params = Glib::Variant<std::tuple<Glib::ustring, Glib::ustring,
Glib::VariantBase>>::create({POWER_PROFILE_NAME, ACTIVE_PROFILE, vb});

connection->call_sync(
POWER_PROFILE_PATH,
"org.freedesktop.DBus.Properties",
"Set",
params,
NULL,
POWER_PROFILE_NAME,
-1,
Gio::DBus::CallFlags::NONE,
{});
}
});

actions->add_action(state_action);

box->open_on(1);
box->insert_action_group("actions", actions);
box->set_spacing(5);
box->set_menu_model(profiles_menu);
}

container->append(*box);
container->append(box);

icon.property_scale_factor().signal_changed()
.connect(sigc::mem_fun(*this, &WayfireBatteryInfo::update_icon));

update_layout();
}

void WayfireBatteryInfo::on_upower_properties_changed(
const Gio::DBus::Proxy::MapChangedProperties& properties,
const std::vector<Glib::ustring>& invalidated)
{
for (auto& prop : properties)
{
if (prop.first == ACTIVE_PROFILE)
{
if (prop.second.is_of_type(Glib::VariantType("s")))
{
auto value_string =
Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(prop.second).get();
set_current_profile(value_string);
}
} else if (prop.first == PROFILES)
{
// I've been unable to find a way to change possible profiles on the fly, so cannot confirm this
// works at all.
auto value = Glib::VariantBase::cast_dynamic<Glib::Variant<std::vector<std::map<Glib::ustring,
Glib::VariantBase>>>>(prop.second);
setup_profiles(value.get());
}

// TODO Consider watching for "Performance Degraded" events too, but we currently have no way to
// output this additional information
}
}

void WayfireBatteryInfo::set_current_profile(Glib::ustring profile)
{
power_mode = profile;
state_action->set_state(Glib::Variant<Glib::ustring>::create(profile));
update_icon();
}

void WayfireBatteryInfo::setup_profiles(std::vector<std::map<Glib::ustring, Glib::VariantBase>> profiles)
{
profiles_menu->remove_all();
for (auto profile : profiles)
{
if (profile.count("Profile") == 1)
{
Glib::VariantBase value = profile.at("Profile");
if (value.is_of_type(Glib::VariantType("s")))
{
auto value_string =
Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(value).get();
auto item = Gio::MenuItem::create(value_string, "noactionyet");

item->set_action_and_target("actions.set_profile",
Glib::Variant<Glib::ustring>::create(value_string));
profiles_menu->append_item(item);
}
}
}
}

WayfireBatteryInfo::~WayfireBatteryInfo()
{
btn_sig.disconnect();
disp_dev_sig.disconnect();
}
22 changes: 4 additions & 18 deletions src/panel/widgets/battery.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@

#include <giomm/dbusproxy.h>
#include <giomm/dbusconnection.h>
#include <giomm/simpleactiongroup.h>

#include <sigc++/connection.h>

#include "widget.hpp"
#include "wf-popover.hpp"

using DBusConnection = Glib::RefPtr<Gio::DBus::Connection>;
using DBusProxy = Glib::RefPtr<Gio::DBus::Proxy>;
Expand All @@ -28,21 +26,18 @@ class WayfireBatteryInfo : public WayfireWidget
{
WfOption<std::string> status_opt{"panel/battery_status"};

sigc::connection btn_sig, disp_dev_sig;
sigc::connection disp_dev_sig;

Gtk::Label label;
std::unique_ptr<WayfireMenuWidget> box;
Gtk::Box box;
Gtk::Overlay overlay;
std::shared_ptr<Gio::Menu> profiles_menu;
Gtk::Image icon;

DBusConnection connection;
DBusProxy upower_proxy, powerprofile_proxy, display_device;
std::string power_mode = "";
DBusProxy upower_proxy, display_device;

bool feat_bat, feat_modes; // the available features when running
bool feat_bat;
bool setup_dbus_battery();
bool setup_dbus_power_modes();

void update_icon();
void update_details();
Expand All @@ -55,15 +50,6 @@ class WayfireBatteryInfo : public WayfireWidget
const Gio::DBus::Proxy::MapChangedProperties& properties,
const std::vector<Glib::ustring>& invalidated);

void on_upower_properties_changed(
const Gio::DBus::Proxy::MapChangedProperties& properties,
const std::vector<Glib::ustring>& invalidated);

void set_current_profile(Glib::ustring profile);
void setup_profiles(std::vector<std::map<Glib::ustring, Glib::VariantBase>> profiles);

std::shared_ptr<Gio::SimpleAction> state_action;

public:
virtual void init(Gtk::Box *container);
virtual ~WayfireBatteryInfo();
Expand Down
Loading