From 75294ad7758978070dd13b0baa0e7c91ef51d1e6 Mon Sep 17 00:00:00 2001
From: Dregu <dregu@dreg.us>
Date: Tue, 10 Oct 2023 11:13:18 +0300
Subject: [PATCH] Clean unified look for all trackers

---
 src/modlunky2/static/images/pacifist.png | Bin 0 -> 1259 bytes
 src/modlunky2/static/images/timer.png    | Bin 0 -> 1500 bytes
 src/modlunky2/ui/trackers/category.py    |   5 +-
 src/modlunky2/ui/trackers/pacifist.py    |  68 +++++++++++----
 src/modlunky2/ui/trackers/timer.py       | 100 ++++++++++++++---------
 5 files changed, 115 insertions(+), 58 deletions(-)
 create mode 100644 src/modlunky2/static/images/pacifist.png
 create mode 100644 src/modlunky2/static/images/timer.png

diff --git a/src/modlunky2/static/images/pacifist.png b/src/modlunky2/static/images/pacifist.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4beb82e31c5ab536b5efa3f98c281a2f6c4ea06
GIT binary patch
literal 1259
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZk1_s7|0X`wFKn1@JnEgCp
z_UoYeuY+dacN)H5ruyfo<=3tHUpDH#S)lZDugUMj7N6H^1C<Q}^nIrh&_~D~`M$&O
z^9CJ=2++$vb{T=#`^~;=*88+Z3(ey{_nH3OZwgWTakVCp@p`Vpr!^o31bx}03t}83
zIjn%L0=fj~JfL2n74H@)zg?&VjEncn)!r{t`>;a&#~$Oi3zdNp^lh8L*UftG7Aphe
z=oip22hBgN)p|2u@$DjIpi6%2HvX~4<kLDWp!2@(GWxdN@bh||4=dGyUVFPh>EkL5
zpr?So0Q&C#|NoD|OGJSwps6ItFBnK80VV};wOOr#!MBg<Fi!d9H?3Fb{J+@pi=w)(
zzd74|{_Yj>=c(%H$xSEtI<HEyte@}r<!9iv0)gZ6EIv9_KQXAdBRi-6>-86#SpWWO
z+4Va}_}b;Ke(Eppx^nN>&s+T5=JOjpk@L@{p5<P?QD*UjHnD&;>t<$Y2UVD70G+^?
z<n8XVQk|cT1;}A9@$_|Nf6m3l!KJ=Auapfa9pmZZ7@~1L^up6%Cr1(1f^~NnB_))b
z-?$3`vCm&R9~E;w^3MM9^PU4mc5m<8e|P7mvJj_YQGv*0PEL09baBqk62+p@;_nKK
zOXhv}ly;E)!(V3mdKQ*V0xT@;0)ZJ4hm<2adYnpn7&aDm_!~5IsB|{?Fj!8Qa)xOs
z!^+Gl^B7aSdKI*#EqAJ%WBzoKgNv(CNlVYMLUZHklUsN+)~{e$wdy8&(DhljtQPEJ
z%*auCR@Z1hD|*LYX1<!$lFXA@%ryA=`=+Wde=GZp?M2R;S7CGJ#xvYW^<UpwXZiK(
z<5!b*hZUOt(X}_oXjqt7kk$IiZ}Fb%Ov;O`Hf)iq-cegq6}B%U-ZZMm`sIOJX-Pq=
z?JBF;KP-H-eA(CAx#?;4`}egP=G9r8k-W8a^ZeuW6$y@qYE;yuex2xSJgWM)CNd}F
z(W$I&_f7J0Yn?Tw<dzo(Z`-<e^KSK}|JnB^Hx#ApiF8#42EA&DYeY#(Vo9o1a#1Rf
zVlXl=GS)RT0HP2B3o8RlD+3d40|P4qgVvhopfU-eAvZrIGp!O$gQ0<yu>nNG=Bf@*
P$;063>gTe~DWM4fH??LC

literal 0
HcmV?d00001

diff --git a/src/modlunky2/static/images/timer.png b/src/modlunky2/static/images/timer.png
new file mode 100644
index 0000000000000000000000000000000000000000..17fc63a6e28429f085d1128c7b1877e7d3b29725
GIT binary patch
literal 1500
zcmaJ=c~H|w6y5}l0o0<7P}HIoK`Uw_PSqk>unAW*fS^ICDVl@BkU(yZK*&Kr0V&84
zM3f^jfD$0eI5;AmmRe;Pg^Gd&BUX_!QXoH0wVN{2Y5%A@Z}+|3_rC9YJF}Y}K=NK@
zwZ;knu*}y7e+2qZ%@b<@*Qb?j51?BV?s?b~fV%V6^QRWW{RXPfk;4GQI|Cq*127AZ
zBm)5OaR3a30pL~$fL%;+W1u?#=%WFLf(fudS*T7|Y0eg1m0u`LD^#bcG_nh&^1QOt
z{Bm(tQG_rhLL_DIlVejdc=Ge%0!f5W8ZJnQk(`SZNt4fCjEs|o3sWLRGKN6HPD*Db
zr3q4V*vaWpadL5HQDUYFl7GaY;zAbc!XWcfHI*Ib7j%Nk5=F(!y#hnr2}D8w8OHyR
zDDumg38}CXXmoxujVp%Iu)}nfnMzqu0ed#5c*%5L5?`LZ0OU%ulm+E5hKkI@RAz!g
zmU|hNK`b*-39n!_fdsO__1^(xgDQ|8iY{=%Y&3-YT?TpJAw-$m;3qGTETqmPD9qA@
zYIp@IClNLilboi^y_jEGnO{~J3*&+cwpgjw-RyqeH#T9a*40<(>bebm>?EZ~k@cXx
z6PcNvo|~VVox4`6zgAn{+TN+t-@IO@uc^NglcYpu=BjJ!HM*O~{5&!{_ssBea>6ur
zuWfQ**fcY1nx4ro)pm9N-pmm{-a|~KFqk|ciz{Gq_yuK^)w()lYPu)0u+!DMF-pMY
ziK4lDW-JduriU(S4DNx$s)~t86M{?`+yjPG<s+I}!#@8ZRfVRu;jRAmNJR}|nriLn
zZ0&d=O3msvyd0Y}Rn^pKbPXRqe28zC_QQw8=N%yhLI3fwl@`u$v1xigf7hn@#}&@O
zx$iI7ir<UvHpY3Q(ECezr%LwcjG{h~kB+?VvU}H`gGCoxAGnNmSnq*&9(zYV=<xiq
zh0*v8T9JzGnVc(e^rI3jWEgcOR7IU8dgFhYMaQ?njb)6_aV`MXtIQJxii*vjX$jBw
zFk#6XD=RGa3&smK8N?WU@t(n39#X@Ag_kqIiN1O@-RUU97DH>U(A1P#E?RTq*|mt3
zZfZ51u2wh3Ge@?q!&;IUVvBDb9jO*#hO@KtvBDiYSPm4-svtdwYmGTTbUCwDyY#L^
za{baB8I_<Ym*wh-mDM?GL!|y5&AmVA>#G_y4UIJ&t+$&V-z%`(^!b)o#^CNpU5|S@
zp7lKGq71%SZ-dRTv9%o6jtq<p83#v)2aSVowM&<;SnL~P-4)j$Bn^xX4x!4@b7wav
zD8{YOPIzhY*0onBNuz^kX-QL4No3xszSAC-e`1wY8lyw@^rXGV$=+SV>o&HetV9R4
zceZWlv)3~os`jxdWG<hV0Rp6ZcC(U*-}{rNq>6L4UmkDd9XE{M5>d22pKU6!cOhS=
z=motU>fx&gofe(;@M`O-js2~E`$WHIh99tRxik>)^vNCm9}T0S;XKc6{^-yhD2_4X
zvwgypmdyw<Qgev(1MnNe$~6r_WA|+~=2w|G7x5<%3tnOTe9~z&w2bB@e25RoUbi<y
zmDlFD%nHwnoqF{EiBvAv?d6F2+wbSyH==u93}mA)35+QENz?f2<}m+Oj-5@m0)M4g
zk{zuLBC#kG7AYyh=DXq)&yrBQtNKc<R(tD;oGcGTZNh*;@{L<x$rLT{F*xxEAw1eC
z9^H+~p+g5;ajv_z@5Dh1#_e^(?RMMwwF?gChQoDR^*;I!Aev2!WW@bHKue}GAprOi
LNcftAVbZ?<n8CO1

literal 0
HcmV?d00001

diff --git a/src/modlunky2/ui/trackers/category.py b/src/modlunky2/ui/trackers/category.py
index b7b421378..18329e3ca 100644
--- a/src/modlunky2/ui/trackers/category.py
+++ b/src/modlunky2/ui/trackers/category.py
@@ -99,8 +99,8 @@ class CategoryButtons(ttk.Frame):
     def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
         super().__init__(parent, *args, **kwargs)
         self.modlunky_config = modlunky_config
-        self.columnconfigure(0, weight=1)
-        self.columnconfigure(1, weight=1)
+        self.columnconfigure(0, weight=1, minsize=200)
+        self.columnconfigure(1, weight=10000)
         self.rowconfigure(0, minsize=60)
         self.window = None
 
@@ -116,6 +116,7 @@ def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
             text="Category",
             compound="left",
             command=self.launch,
+            width=1,
         )
         self.category_button.grid(row=0, column=0, pady=5, padx=5, sticky="nswe")
 
diff --git a/src/modlunky2/ui/trackers/pacifist.py b/src/modlunky2/ui/trackers/pacifist.py
index bce435de1..f6234615d 100644
--- a/src/modlunky2/ui/trackers/pacifist.py
+++ b/src/modlunky2/ui/trackers/pacifist.py
@@ -2,7 +2,10 @@
 import tkinter as tk
 from tkinter import ttk
 
+from PIL import Image, ImageTk
+
 from modlunky2.config import Config, PacifistTrackerConfig
+from modlunky2.constants import BASE_DIR
 from modlunky2.mem import Spel2Process
 from modlunky2.mem.state import RunRecapFlags
 
@@ -15,23 +18,20 @@
 logger = logging.getLogger(__name__)
 
 
-class PacifistButtons(ttk.Frame):
-    def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
+ICON_PATH = BASE_DIR / "static/images"
+
+
+class PacifistModifiers(ttk.LabelFrame):
+    def __init__(
+        self, parent, pacifist_tracker_config: PacifistTrackerConfig, *args, **kwargs
+    ):
         super().__init__(parent, *args, **kwargs)
-        self.modlunky_config = modlunky_config
-        self.columnconfigure(0, weight=1)
-        self.rowconfigure(0, minsize=60)
-        self.window = None
+        self.parent = parent
 
-        self.pacifist_button = ttk.Button(
-            self,
-            text="Pacifist",
-            command=self.launch,
-        )
-        self.pacifist_button.grid(row=0, column=0, pady=5, padx=5, sticky="nswe")
+        self.pacifist_tracker_config = pacifist_tracker_config
 
         self.show_kill_count = tk.BooleanVar()
-        self.show_kill_count.set(self.modlunky_config.trackers.pacifist.show_kill_count)
+        self.show_kill_count.set(self.pacifist_tracker_config.show_kill_count)
         self.show_kill_count_checkbox = ttk.Checkbutton(
             self,
             text="Show Kill Count",
@@ -43,12 +43,39 @@ def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
         self.show_kill_count_checkbox.grid(row=0, column=1, pady=5, padx=5, sticky="w")
 
     def toggle_show_kill_count(self):
-        self.modlunky_config.trackers.pacifist.show_kill_count = (
-            self.show_kill_count.get()
+        self.pacifist_tracker_config.show_kill_count = self.show_kill_count.get()
+        self.parent.config_update_callback()
+
+
+class PacifistButtons(ttk.Frame):
+    def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
+        super().__init__(parent, *args, **kwargs)
+        self.modlunky_config = modlunky_config
+        self.columnconfigure(0, weight=1, minsize=200)
+        self.columnconfigure(1, weight=10000)
+        self.rowconfigure(0, minsize=60)
+        self.window = None
+
+        self.pacifist_icon = ImageTk.PhotoImage(
+            Image.open(ICON_PATH / "pacifist.png").resize(
+                (24, 24), Image.Resampling.LANCZOS
+            )
         )
-        self.modlunky_config.save()
-        if self.window:
-            self.window.update_config(self.modlunky_config.trackers.pacifist)
+
+        self.pacifist_button = ttk.Button(
+            self,
+            text="Pacifist",
+            image=self.pacifist_icon,
+            compound="left",
+            command=self.launch,
+            width=1,
+        )
+        self.pacifist_button.grid(row=0, column=0, pady=5, padx=5, sticky="nswe")
+
+        self.modifiers = PacifistModifiers(
+            self, self.modlunky_config.trackers.pacifist, text="Modifiers"
+        )
+        self.modifiers.grid(row=0, column=1, pady=5, padx=5, sticky="nswe")
 
     def launch(self):
         color_key = self.modlunky_config.tracker_color_key
@@ -62,6 +89,11 @@ def launch(self):
             config=self.modlunky_config.trackers.pacifist,
         )
 
+    def config_update_callback(self):
+        self.modlunky_config.save()
+        if self.window:
+            self.window.update_config(self.modlunky_config.trackers.pacifist)
+
     def window_closed(self):
         self.window = None
         # If we're in the midst of destroy() the button might not exist
diff --git a/src/modlunky2/ui/trackers/timer.py b/src/modlunky2/ui/trackers/timer.py
index 7c7fa3e5e..580f53952 100644
--- a/src/modlunky2/ui/trackers/timer.py
+++ b/src/modlunky2/ui/trackers/timer.py
@@ -3,7 +3,10 @@
 from tkinter import ttk
 import datetime
 
+from PIL import Image, ImageTk
+
 from modlunky2.config import Config, TimerTrackerConfig
+from modlunky2.constants import BASE_DIR
 from modlunky2.mem import Spel2Process
 
 from modlunky2.ui.trackers.common import (
@@ -14,25 +17,20 @@
 
 logger = logging.getLogger(__name__)
 
+ICON_PATH = BASE_DIR / "static/images"
 
-class TimerButtons(ttk.Frame):
-    def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
+
+class TimerModifiers(ttk.LabelFrame):
+    def __init__(
+        self, parent, timer_tracker_config: TimerTrackerConfig, *args, **kwargs
+    ):
         super().__init__(parent, *args, **kwargs)
-        self.modlunky_config = modlunky_config
-        self.columnconfigure(0, weight=1)
-        self.rowconfigure(0, minsize=60)
-        self.window = None
-        self.modlunky_config.trackers.timer.anchor = "w"
+        self.parent = parent
 
-        self.timer_button = ttk.Button(
-            self,
-            text="Timer",
-            command=self.launch,
-        )
-        self.timer_button.grid(row=0, column=0, pady=5, padx=5, sticky="nswe")
+        self.timer_tracker_config = timer_tracker_config
 
         self.show_total = tk.BooleanVar()
-        self.show_total.set(self.modlunky_config.trackers.timer.show_total)
+        self.show_total.set(self.timer_tracker_config.show_total)
         self.show_total_checkbox = ttk.Checkbutton(
             self,
             text="Total",
@@ -44,7 +42,7 @@ def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
         self.show_total_checkbox.grid(row=0, column=1, pady=5, padx=5, sticky="w")
 
         self.show_level = tk.BooleanVar()
-        self.show_level.set(self.modlunky_config.trackers.timer.show_level)
+        self.show_level.set(self.timer_tracker_config.show_level)
         self.show_level_checkbox = ttk.Checkbutton(
             self,
             text="Level",
@@ -56,7 +54,7 @@ def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
         self.show_level_checkbox.grid(row=0, column=2, pady=5, padx=5, sticky="w")
 
         self.show_last_level = tk.BooleanVar()
-        self.show_last_level.set(self.modlunky_config.trackers.timer.show_last_level)
+        self.show_last_level.set(self.timer_tracker_config.show_last_level)
         self.show_last_level_checkbox = ttk.Checkbutton(
             self,
             text="Last Level",
@@ -68,7 +66,7 @@ def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
         self.show_last_level_checkbox.grid(row=0, column=3, pady=5, padx=5, sticky="w")
 
         self.show_tutorial = tk.BooleanVar()
-        self.show_tutorial.set(self.modlunky_config.trackers.timer.show_tutorial)
+        self.show_tutorial.set(self.timer_tracker_config.show_tutorial)
         self.show_tutorial_checkbox = ttk.Checkbutton(
             self,
             text="Tutorial",
@@ -80,7 +78,7 @@ def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
         self.show_tutorial_checkbox.grid(row=0, column=4, pady=5, padx=5, sticky="w")
 
         self.show_startup = tk.BooleanVar()
-        self.show_startup.set(self.modlunky_config.trackers.timer.show_startup)
+        self.show_startup.set(self.timer_tracker_config.show_startup)
         self.show_startup_checkbox = ttk.Checkbutton(
             self,
             text="Session",
@@ -92,34 +90,55 @@ def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
         self.show_startup_checkbox.grid(row=0, column=5, pady=5, padx=5, sticky="w")
 
     def toggle_show_total(self):
-        self.modlunky_config.trackers.timer.show_total = self.show_total.get()
-        self.modlunky_config.save()
-        if self.window:
-            self.window.update_config(self.modlunky_config.trackers.timer)
+        self.timer_tracker_config.show_total = self.show_total.get()
+        self.parent.config_update_callback()
 
     def toggle_show_level(self):
-        self.modlunky_config.trackers.timer.show_level = self.show_level.get()
-        self.modlunky_config.save()
-        if self.window:
-            self.window.update_config(self.modlunky_config.trackers.timer)
+        self.timer_tracker_config.show_level = self.show_level.get()
+        self.parent.config_update_callback()
 
     def toggle_show_last_level(self):
-        self.modlunky_config.trackers.timer.show_last_level = self.show_last_level.get()
-        self.modlunky_config.save()
-        if self.window:
-            self.window.update_config(self.modlunky_config.trackers.timer)
+        self.timer_tracker_config.show_last_level = self.show_last_level.get()
+        self.parent.config_update_callback()
 
     def toggle_show_tutorial(self):
-        self.modlunky_config.trackers.timer.show_tutorial = self.show_tutorial.get()
-        self.modlunky_config.save()
-        if self.window:
-            self.window.update_config(self.modlunky_config.trackers.timer)
+        self.timer_tracker_config.show_tutorial = self.show_tutorial.get()
+        self.parent.config_update_callback()
 
     def toggle_show_startup(self):
-        self.modlunky_config.trackers.timer.show_startup = self.show_startup.get()
-        self.modlunky_config.save()
-        if self.window:
-            self.window.update_config(self.modlunky_config.trackers.timer)
+        self.timer_tracker_config.show_startup = self.show_startup.get()
+        self.parent.config_update_callback()
+
+
+class TimerButtons(ttk.Frame):
+    def __init__(self, parent, modlunky_config: Config, *args, **kwargs):
+        super().__init__(parent, *args, **kwargs)
+        self.modlunky_config = modlunky_config
+        self.columnconfigure(0, weight=1, minsize=200)
+        self.columnconfigure(1, weight=10000)
+        self.rowconfigure(0, minsize=60)
+        self.window = None
+
+        self.timer_icon = ImageTk.PhotoImage(
+            Image.open(ICON_PATH / "timer.png").resize(
+                (24, 24), Image.Resampling.LANCZOS
+            )
+        )
+
+        self.timer_button = ttk.Button(
+            self,
+            image=self.timer_icon,
+            text="Timer",
+            compound="left",
+            command=self.launch,
+            width=1,
+        )
+        self.timer_button.grid(row=0, column=0, pady=5, padx=5, sticky="nswe")
+
+        self.modifiers = TimerModifiers(
+            self, self.modlunky_config.trackers.timer, text="Modifiers"
+        )
+        self.modifiers.grid(row=0, column=1, pady=5, padx=5, sticky="nswe")
 
     def launch(self):
         color_key = self.modlunky_config.tracker_color_key
@@ -133,6 +152,11 @@ def launch(self):
             config=self.modlunky_config.trackers.timer,
         )
 
+    def config_update_callback(self):
+        self.modlunky_config.save()
+        if self.window:
+            self.window.update_config(self.modlunky_config.trackers.timer)
+
     def window_closed(self):
         self.window = None
         # If we're in the midst of destroy() the button might not exist