Changeset 58e7315 in flowtimer

Timestamp:

08/29/24 16:33:22 (9 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

guix

Children:

ab10343

Parents:

80996d0

Message:

support for color scheme added

Files:

• flowtimer/configs/colors.json (added)
• flowtimer/configs/small.json (added)
• flowtimer/main.py (modified) (11 diffs)
• pyproject.toml (modified) (1 diff)

flowtimer/main.py

@@ -4 +4 @@
 from PIL import Image, ImageTk
 from pathlib import Path
-import datetime
 import argparse
-
+import json
 from Schedule import Schedule
 
@@ -12 +11 @@
 class TimerApp(tk.Frame):
 
-    def __init__(self, parent, tick_speed, config_file, autostart):
+    def __init__(self, parent, tick_speed, config_file, color_file, autostart):
 
         super().__init__(parent)
@@ -22 +21 @@
         print("Config:", config_file)
         self.schedule = self.load_config(config_file)
-
+        self.color_scheme = self.load_color_file(color_file)
         self.build_gui()
         if autostart:
@@ -74 +73 @@
         self.label_duration.pack(side='top', fill='both', expand=True)
 
-        self.start_timer_button = tk.Button(self.button_frame, text="START",
-                                            font="courier 14", width=20, command=self.start)
-        self.start_timer_button.pack(side='left', fill='both', ipady=20, expand=True)
-
         self.freeze_button = tk.Button(self.button_frame, text="PLAY/PAUSE",
                                        font="courier 14", width=20, command=self.toggle_play_pause)
@@ -95 +90 @@
         else:
             return self.schedule.current_block.ticks_left
+
+    def color_for_phase(self, a_title):
+        return next((d for d in self.colors if d.get('title') == a_title), None)
 
     def current_title(self):
@@ -109 +107 @@
                     f"{len(self.schedule.current_block.phases)} "
                     f"({self.schedule.current_block.passes_left})")
+        return (f"{self.schedule.current_block.title}")
 
     def current_time_status(self):
@@ -145 +144 @@
                 self.freeze_button.config(fg="ivory3")
 
-    def start(self):
-        self.schedule.start()
-        self.tick()
-        self.start_timer_button['state'] = 'disabled'
-        self.start_timer_button.config(fg="ivory3")
-        self.config_button.pack_forget()
-
     def skip(self):
         self.schedule.skip()
 
     def toggle_play_pause(self):
-        if self.schedule.paused():
+        if not self.schedule.running():
             self.freeze_button.config(relief="raised", fg='black')
             self.label_sequence.config(fg="white")
@@ -172 +164 @@
         self.parent.destroy()
 
+    def load_color_file(self, file_name=Path(__file__).parent / 'configs' / 'colors.json'):
+        try:
+            with open(file_name) as color_file:
+                colors = json.loads(color_file.read())
+        except Exception as e:
+            with open(Path(__file__).parent / 'configs' / 'colors.json') as color_file:
+                colors = json.loads(color_file.read())
+            print(e)
+        return colors.get('color_list', [])
+
     def change_config(self, json_string):
         self.schedule = Schedule.from_json(json_string)
@@ -181 +183 @@
                 schedule = self.change_config(config_file.read())
         except Exception as e:
-            messagebox.showerror('Config error', f'Can not load {file_name}\n\nDefault loaded instead')
+            messagebox.showerror('Config error',
+                                 f'Can not load {file_name}\n\nDefault loaded instead')
+            print(e)
             return Schedule.default()
         return schedule
@@ -195 +199 @@
 
 
-now = datetime.datetime.now()
-date = now.strftime("%m/%d/%Y")
-time = now.strftime("%H:%M:%S")
-
 parser = argparse.ArgumentParser(description="Load specified config file and autostart if needed")
 parser.add_argument('--start', dest='autostart', action='store_true', default=False,
                     required=False, help='use --start to autostart the timer with the given config')
-parser.add_argument('--config', dest='config_file', required=False, default=Path(__file__).parent / 'configs' / 'default.json',
+parser.add_argument('--config', dest='config_file', required=False,
+                    default=Path(__file__).parent / 'configs' / 'default.json',
                     help='use --config /path/to/config_file.json to specify the configuration of the timer')
-
+parser.add_argument('--color', dest='color_file', required=False,
+                    default=Path(__file__).parent / 'configs' / 'colors.json')
 args = parser.parse_args()
 
 root = tk.Tk()
-root.title("--=> flowtimer <=-- " + "  date: " + date + "  time: " + time)
+root.title(args.config_file)
 root.geometry("1280x860")
 root.config(bg='black')
@@ -218 +220 @@
                tick_speed=1,
                config_file=args.config_file,
+               color_file=args.color_file,
                autostart=args.autostart)
 

pyproject.toml

@@ -9 +9 @@
 authors = ["See Contributors"]
 homepage = "https://kokyou.org:8080/playground/browser/flowtimer"
-repository = "kokyou.org:/srv/git/flowtimer.git"
+repository = "https://kokyou.org:/srv/git/flowtimer.git"
 license = "MIT"
 readme = "README.md"