diff --git a/yafi/battery.py b/yafi/battery.py index ac7fbd4..ec5c9d1 100644 --- a/yafi/battery.py +++ b/yafi/battery.py @@ -31,8 +31,10 @@ class BatteryPage(Gtk.Box): chg_limit_enable = Gtk.Template.Child() chg_limit = Gtk.Template.Child() + chg_limit_label = Gtk.Template.Child() chg_limit_scale = Gtk.Template.Child() bat_limit = Gtk.Template.Child() + bat_limit_label = Gtk.Template.Child() bat_limit_scale = Gtk.Template.Child() chg_limit_override = Gtk.Template.Child() chg_limit_override_btn = Gtk.Template.Child() @@ -56,7 +58,9 @@ class BatteryPage(Gtk.Box): self.chg_limit_enable.set_active(ec_limit_enabled) if ec_limit_enabled: self.chg_limit_scale.set_value(ec_limit[0]) + self.chg_limit_label.set_label(f"{ec_limit[0]}%") self.bat_limit_scale.set_value(ec_limit[1]) + self.bat_limit_label.set_label(f"{ec_limit[1]}%") self.chg_limit.set_sensitive(True) self.bat_limit.set_sensitive(True) self.chg_limit_override.set_sensitive(True) diff --git a/yafi/ui/battery.ui b/yafi/ui/battery.ui index 9680064..ae69694 100644 --- a/yafi/ui/battery.ui +++ b/yafi/ui/battery.ui @@ -29,6 +29,9 @@ Charge Limit + + + @@ -54,6 +57,9 @@ Discharge Limit + + + diff --git a/yafi/ui/yafi.cmb b/yafi/ui/yafi.cmb index 4293ac3..bd2350c 100644 --- a/yafi/ui/yafi.cmb +++ b/yafi/ui/yafi.cmb @@ -60,7 +60,7 @@ (4,3,"AdwActionRow",None,2,None,None,None,0,None,None), (4,4,"AdwActionRow","chg_limit",2,None,None,None,2,None,None), (4,5,"GtkBox",None,4,None,None,None,0,None,None), - (4,6,"GtkScale","chg_limit_scale",5,None,None,None,0,None,None), + (4,6,"GtkScale","chg_limit_scale",5,None,None,None,1,None,None), (4,7,"GtkAdjustment",None,6,None,None,None,0,None,None), (4,13,"AdwPreferencesGroup","bat_ext_group",2,None,None,None,5,None,None), (4,27,"AdwSpinRow","bat_ext_trigger",13,None,None,None,5,None,None), @@ -71,7 +71,7 @@ (4,32,"AdwSwitchRow","bat_ext_enable",13,None,None,None,1,None,None), (4,33,"AdwActionRow","bat_limit",2,None,None,None,3,None,None), (4,34,"GtkBox",None,33,None,None,None,0,None,None), - (4,35,"GtkScale","bat_limit_scale",34,None,None,None,0,None,None), + (4,35,"GtkScale","bat_limit_scale",34,None,None,None,1,None,None), (4,36,"GtkAdjustment",None,35,None,None,None,0,None,None), (4,37,"AdwActionRow","chg_limit_override",2,None,None,None,4,None,None), (4,38,"GtkBox",None,37,None,None,None,0,None,None), @@ -79,6 +79,8 @@ (4,40,"AdwSwitchRow","chg_limit_enable",2,None,None,None,1,None,None), (4,41,"AdwActionRow","bat_ext_trigger_time",13,None,None,None,3,None,None), (4,42,"AdwActionRow","bat_ext_reset_time",13,None,None,None,4,None,None), + (4,43,"GtkLabel","chg_limit_label",5,None,None,None,0,None,None), + (4,44,"GtkLabel","bat_limit_label",34,None,None,None,0,None,None), (5,1,"GtkBox","HardwarePage",None,None,None,None,0,None,None), (5,2,"GtkListBox",None,1,None,None,None,0,None,None), (5,3,"AdwActionRow",None,2,None,None,None,0,None,None), diff --git a/yafi/yafi.gresource b/yafi/yafi.gresource index 39ee0eb..9ea1cb5 100644 Binary files a/yafi/yafi.gresource and b/yafi/yafi.gresource differ diff --git a/yafi/yafi.gresource.xml b/yafi/yafi.gresource.xml index 90915f0..79af55d 100644 --- a/yafi/yafi.gresource.xml +++ b/yafi/yafi.gresource.xml @@ -7,4 +7,8 @@ ui/battery.ui ui/hardware.ui + + ../data/icons/hicolor/scalable/apps/au.stevetech.yafi.svg + ../data/icons/hicolor/symbolic/apps/au.stevetech.yafi-symbolic.svg +