Changeset 0384305 in flowtimer

Timestamp:

08/29/24 22:08:00 (10 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

guix

Children:

813e855

Parents:

794b5c2

Message:

better color scheme support

Location:

flowtimer

Files:

• Schedule.py (modified) (2 diffs)
• configs/HIA_friday.csv (deleted)
• configs/HIA_monday-thursday.csv (deleted)
• configs/new_config.csv (deleted)
• main.py (modified) (3 diffs)

flowtimer/Schedule.py

@@ -155 +155 @@
                 sum([block.ticks_left for block in self.upcoming_blocks()]))
 
+    def upcoming_block_titles(self):
+        return [each.title for each in self.upcoming_blocks()]
+
     def upcoming_blocks(self):
         index = self.blocks.index(self.current_block)
@@ -160 +163 @@
             return self.blocks[index+1:]
         return []
+
+    def current_phase(self):
+        if self.current_block.is_sequence():
+            return self.current_block.current_phase
+        else:
+            return self.current_block
 
     def tick(self, ticks):

flowtimer/main.py

@@ -40 +40 @@
         self.button_frame.pack(side='bottom', fill='both', expand=False)
 
-        self.label_headline = tk.Label(self.headline_frame,
-                                       text=(self.schedule.current_block.title),
-                                       bg='white', fg='grey', font="serif 20")
-        self.label_headline.pack(side='left', fill='both', expand=True)
+        # self.label_headline = tk.Label(self.headline_frame,
+        #                                text=(self.schedule.current_block.title),
+        #                                bg='white', fg='grey', font="serif 20")
+        # self.label_headline.pack(side='left', fill='both', expand=True)
 
         self.label_config = tk.LabelFrame(self.headline_frame,
@@ -93 +93 @@
             return self.schedule.current_block.ticks_left
 
+    def default_colors(self):
+        return next((d for d in self.color_scheme if d.get('title') == 'Default'))
+
     def colors_for_phase(self, a_title):
-        return next((d for d in self.color_scheme if d.get('title') == a_title), None)
+        return next((d for d in self.color_scheme if d.get('title') == a_title), self.default_colors())
 
     def current_title(self):
@@ -139 +142 @@
                                          self.schedule.current_block.ticks_left) % 60
             self.progressbar.update()
-            self.label_duration.config(text=self.current_time_status(), font='times 22')
+            colors = self.colors_for_phase(self.schedule.current_phase().title)
+            self.label_sequence.config(text=str(self.schedule.upcoming_block_titles()),
+                                       font='times 22', bg=colors.get('sequence_label'),
+                                       fg="white")
+            self.label_duration.config(text=self.current_time_status(), font='times 22',
+                                       bg=colors.get('duration_label'),
+                                       fg="white")
+            self.center_frame.configure(bg=colors.get('center_frame'))
+
             self.label_config_text.config(text=self.current_config())