Initial v2.0.0 Update

Complete app redesign as it's too big again. Modularizing code more and making it more readable.

Author: simon-milata

.gitignore

@@ -1,4 +1,3 @@
 
-__pycache__/styles.cpython-312.pyc
 test.py
 *.pyc

Package/data_management.py

@@ -326,6 +326,10 @@ def load_notes(self) -> None:
             frame.pack(pady=frame_padding)
             frame.grid_propagate(False)
 
+            def _delete_note(frame):
+                frame.destroy()
+                #DELETE NOTE FROM EXCEL
+
             title = ctk.CTkLabel(frame, text=str(self.worksheet["O" + str(i)].value), font=(font_family, font_size*1.25),
                                  text_color=(light_font_color, font_color), anchor="center", height=button_height + frame_padding * 2)
             title.grid(row=0, column=0, padx=widget_padding_x)
@@ -340,7 +344,7 @@ def load_notes(self) -> None:
                                    command=lambda: self.app._open_notes_text(str(self.worksheet["N" + str(i)].value), str(self.worksheet["O" + str(i)].value), str(self.worksheet["P" + str(i)].value), i))
             open_button.grid(row=0, column=0, padx=widget_padding_x)
             delete_button = ctk.CTkButton(button_frame, text="Delete", height=button_height, fg_color=self.color, hover_color=self.highlight_color, font=(font_family, font_size), text_color=button_font_color,
-                                          command=lambda: self.app._delete_note(frame))
+                                          command=lambda: _delete_note(frame))
             delete_button.grid(row=0, column=1)
 
 

Package/note_management.py

@@ -0,0 +1,2 @@
+class NotesManager:
+    pass

main.py

@@ -8,8 +8,8 @@
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdates
 from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg
-import customtkinter as ctk
 from matplotlib.ticker import MaxNLocator, FuncFormatter
+import customtkinter as ctk
 from winotify import Notification
 
 from Package import *
@@ -142,41 +142,41 @@ def _tab_frames_gui_setup(self) -> None:
         self.timer_tab.pack(pady=tab_padding_y)
         self.timer_tab_button = ctk.CTkButton(self.timer_tab, text="Timer", font=(tab_font_family, 22*tab_height/50, tab_font_weight), text_color=(light_font_color, font_color),
                                               fg_color=(light_tab_selected_color, tab_selected_color), width=int(tab_frame_width*0.95), height=int(tab_height*0.8), hover_color=(light_tab_highlight_color, tab_highlight_color), 
-                                              anchor="w", command=lambda: self.switch_tab("main"))
+                                              anchor="w", command=lambda: self.switch_tab("Timer"))
         self.timer_tab_button.place(relx=0.5, rely=0.5, anchor="center")
 
         self.statistics_tab = ctk.CTkFrame(self.tab_frame, width=tab_frame_width, height=tab_height*0.8, fg_color=(light_tab_color, tab_color))
         self.statistics_tab.pack(pady=tab_padding_y)
         self.statistics_tab_button = ctk.CTkButton(self.statistics_tab, text="Statistics", font=(tab_font_family, 22*tab_height/50, tab_font_weight), text_color=(light_font_color, font_color),
                                                    fg_color=(light_tab_color, tab_color), width=int(tab_frame_width*0.95), height=int(tab_height*0.8), hover_color=(light_tab_highlight_color, tab_highlight_color), 
-                                                   anchor="w", command=lambda: self.switch_tab("statistics"))
+                                                   anchor="w", command=lambda: self.switch_tab("Statistics"))
         self.statistics_tab_button.place(relx=0.5, rely=0.5, anchor="center")
 
         self.achievements_tab = ctk.CTkFrame(self.tab_frame, width=tab_frame_width, height=tab_height*0.8, fg_color=(light_tab_color, tab_color))
         self.achievements_tab.pack(pady=tab_padding_y)
         self.achievements_tab_button = ctk.CTkButton(self.achievements_tab, text="Achievements", font=(tab_font_family, 22*tab_height/50, tab_font_weight), text_color=(light_font_color, font_color),
                                                      fg_color=(light_tab_color, tab_color), width=int(tab_frame_width*0.95), height=int(tab_height*0.8), hover_color=(light_tab_highlight_color, tab_highlight_color), 
-                                                     anchor="w", command=lambda: self.switch_tab("achievements"))
+                                                     anchor="w", command=lambda: self.switch_tab("Achievements"))
         self.achievements_tab_button.place(relx=0.5, rely=0.5, anchor="center")
 
         self.history_tab = ctk.CTkFrame(self.tab_frame, width=tab_frame_width, height=tab_height*0.8, fg_color=(light_tab_color, tab_color))
         self.history_tab.pack(pady=tab_padding_y)
         self.history_tab_button = ctk.CTkButton(self.history_tab, text="History", font=(tab_font_family, 22*tab_height/50, tab_font_weight), text_color=(light_font_color, font_color),
                                                 fg_color=(light_tab_color, tab_color), width=int(tab_frame_width*0.95), height=int(tab_height*0.8), hover_color=(light_tab_highlight_color, tab_highlight_color), 
-                                                anchor="w", command=lambda: self.switch_tab("history"))
+                                                anchor="w", command=lambda: self.switch_tab("History"))
         self.history_tab_button.place(relx=0.5, rely=0.5, anchor="center")
 
         self.notes_tab = ctk.CTkFrame(self.tab_frame, width=tab_frame_width, height=tab_height*0.8, fg_color=(light_tab_color, tab_color))
         self.notes_tab.pack(pady=tab_padding_y)
         self.notes_tab_button = ctk.CTkButton(self.notes_tab, text="Notes", font=(tab_font_family, 22*tab_height/50, tab_font_weight), text_color=(light_font_color, font_color),
                                                 fg_color=(light_tab_color, tab_color), width=int(tab_frame_width*0.95), height=int(tab_height*0.8), hover_color=(light_tab_highlight_color, tab_highlight_color), 
-                                                anchor="w", command=lambda: self.switch_tab("notes"))
+                                                anchor="w", command=lambda: self.switch_tab("Notes"))
         self.notes_tab_button.place(relx=0.5, rely=0.5, anchor="center")
 
         self.settings_tab = ctk.CTkFrame(self.tab_frame, width=tab_frame_width, height=tab_height*0.8, fg_color=(light_tab_color, tab_color))
         self.settings_tab.place(relx=0.5, rely=1, anchor="s")
         self.settings_tab_button = ctk.CTkButton(self.settings_tab, text="Settings", font=(tab_font_family, 22*tab_height/50, tab_font_weight), text_color=(light_font_color, font_color),
-                                 fg_color=(light_tab_color, tab_color), width=int(tab_frame_width*0.95), height=int(tab_height*0.8), hover_color=(light_tab_highlight_color, tab_highlight_color), anchor="w", command=lambda: self.switch_tab("settings"))
+                                 fg_color=(light_tab_color, tab_color), width=int(tab_frame_width*0.95), height=int(tab_height*0.8), hover_color=(light_tab_highlight_color, tab_highlight_color), anchor="w", command=lambda: self.switch_tab("Settings"))
         self.settings_tab_button.place(relx=0.5, rely=0.5, anchor="center")
 
 
@@ -545,12 +545,12 @@ def forget_and_propagate(self, list: list) -> None:
 
     def switch_tab(self, tab = str) -> None:
         tabs = {
-            "main": [self.main_frame, self.timer_tab_button],
-            "statistics": [self.statistics_frame, self.statistics_tab_button],
-            "settings": [self.settings_frame, self.settings_tab_button],
-            "achievements": [self.achievements_frame, self.achievements_tab_button],
-            "history": [self.history_frame, self.history_tab_button],
-            "notes": [self.notes_frame, self.notes_tab_button]
+            "Timer": [self.main_frame, self.timer_tab_button],
+            "Statistics": [self.statistics_frame, self.statistics_tab_button],
+            "Settings": [self.settings_frame, self.settings_tab_button],
+            "Achievements": [self.achievements_frame, self.achievements_tab_button],
+            "History": [self.history_frame, self.history_tab_button],
+            "Notes": [self.notes_frame, self.notes_tab_button]
         }
 
         tab_list = [self.main_frame, self.statistics_frame, self.settings_frame, self.achievements_frame, self.history_frame, self.notes_frame]
@@ -789,10 +789,6 @@ def _exit_note(self, frame):
         self.notes_frame_frame.grid(row=0, column=0, padx=frame_padding, pady=(frame_padding, 0))
 
 
-    def _delete_note(self, frame):
-        frame.configure(fg_color="red")
-        #DELTE NOTE FROM EXCEL
-
     def clear_notes(self):
         for note in self.notes_data_frame.winfo_children():
             note.destroy()

v2.0.0/Package/__init__.py

@@ -0,0 +1,6 @@
+from .main_manager import MainManager
+from .timer_management import TimerManager
+from .statistics_management import StatisticsManager
+from .data_management import DataManager
+#from .note_management import NoteManager
+from .styles import *