From 35f9c766b97779aa97229676b717415768c0433d Mon Sep 17 00:00:00 2001 From: Stephen Horvath Date: Sun, 13 Apr 2025 11:55:06 +1000 Subject: [PATCH] Show battery limiter percentage & fix icons for pip --- yafi/battery.py | 4 ++++ yafi/ui/battery.ui | 6 ++++++ yafi/ui/yafi.cmb | 6 ++++-- yafi/yafi.gresource | Bin 15319 -> 20100 bytes yafi/yafi.gresource.xml | 4 ++++ 5 files changed, 18 insertions(+), 2 deletions(-) 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 39ee0eb9f659f0c229f4307ee0ad8065a068a5bc..9ea1cb55b58b119af87eafb7aa92262b5a176a74 100644 GIT binary patch literal 20100 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
  • 6u2hEoaWnN+SsL4@xAV3#lhvaC{`gq`8Opu_{+;vPG$e|=Ei#X zaB5X$V*ccNpEn_-qm`*X)3p=m??Kj1V4Ayw5tYGbrVetdu|?aE*s9o*m7br^n^>=k zo$B-Mrl#Ez@hMEX7cRhOrf&;-%gGz^@w6;vBq!JOXF5%0L`nCI$RF!1yri#t?VLid zG?ef0gSKx5HeRr>?qSbgZ)#pT&mfLvE;vg9R=sZFWUc#%{*I z(j#&$7PaThCeVx`gEn5^?Y9xCDlj~3Hx?Bfc|-0)N7u7rb!)V*o>;$@uzsX<`>f&7 zYXN7;@G_QoABEt>%lGDxin;i6u$cy>Uh%%}&?(^^+W0+PD&anjgWl`S)O+JH?|Gf~ zyv}=G=S4Z>yv{4@VCQvSRJy22E$VgWb>8zj?|Gf~QPp{oW8zB>0msI~pFQe*iEl_+ z4z2ZC{@?&FJ@x1vu!r-h3xf*7Np6^Yha#cxyyRP&TM(3GibPcOl3p~Nnzv-K_j&Wk z$?i$9Wv(~c#bhuH9oli3;Gcf02QwzRkJ<<-7;E@yz>x}io0Bg+OmJl1hrbWH2Z6J< zYneIQ{U#-%+b9rip`U3Tu=w@P^lW?%zj&b{Fj@R8cka)s z$|1E+rOG>lg-cRbP{!c_jCwjE&G_N`t#7%ucY5xOSN-W7%f+v=-`{5w;5M-g@gbwE z-^h<8#8#hvLoK2Ng@DGwSZxpy;-iSD5Fz*hVzZi+EQo<*H!&bYgC8KKRzE-k z!bWT@tOQX(Orc2`}LPM*vK) zhj_Yl$uEktiezODoCdP@FDowmr}j%(GT?y+tFNn0j~v= zuHJ`uxmIF|H_FO2%p2fzzTRXIbqGNZ;PxyI0?!X@>A8|>8TOm{-4nG8*g?2_F9mP| zK06+J4o31?F;~%wI+|gkP8t)jJ$rd+G8pE9s$22SHyl=_W%etv=00jq 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 +