Major update: Notes Finished

Major update:
- Notes finished
- App redesign canceled
- Added icons
- Minor UI changes

Author: simon-milata

Package/data_management.py

@@ -1,9 +1,11 @@
 import datetime
 from openpyxl.styles import Font
-from .styles import *
 
 import customtkinter as ctk
 
+from .styles import *
+from .note_management import NotesManager
+
 class DataManager:
     def __init__(self, App, timer_manager, workbook, worksheet):
         self.app = App
@@ -12,13 +14,19 @@ def __init__(self, App, timer_manager, workbook, worksheet):
         self.worksheet = worksheet
         self.initialize_variables()
 
+        self.notes_manager = NotesManager(self.app, self)
+
 
     def initialize_variables(self) -> None:
         self.day_name_list = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
         self.date_list = []
         self.duration_list = []
         self.total_duration = 0
         self.graph_color = "#f38064"
+        self.graph_bg_color = graph_bg_color
+        self.graph_fg_color = graph_fg_color
+        self.font_color = font_color
+        self.spine_color = border_frame_color
 
 
     def initialize_new_file_variables(self) -> None:
@@ -103,6 +111,7 @@ def customize_excel(self) -> None:
         self.worksheet["N8"].value = "Notes amount:"
         self.worksheet["N9"].value = self.notes_amount
         self.worksheet["N11"].value = "Notes:"
+        self.worksheet["M12"].value = "Deleted:"
         self.worksheet["N12"].value = "Date:"
         self.worksheet["O12"].value = "Title:"
         self.worksheet["P12"].value = "Text:"
@@ -258,6 +267,7 @@ def change_color(self) -> None:
         self.app.eye_care_checkbox.configure(fg_color=self.color)
         self.app.create_graphs()
 
+        self.load_notes()
         print("Color changed.")
 
 
@@ -266,28 +276,39 @@ def set_theme(self, theme_dropdown) -> None:
         print("Theme set.")
         self.save_theme()
 
+
     def save_theme(self) -> None:
         self.worksheet["U2"].value = self.theme_name
         self.load_theme()
 
-
-    def save_subject(self, subject: str) -> None:
-        self.worksheet["S2"].value = subject
-        print("Subject saved.")
-
 
     def load_theme(self) -> None:
         self.theme_name = self.worksheet["U2"].value
         self.app.theme_dropdown.configure(variable=ctk.StringVar(value=self.theme_name))
 
         if self.theme_name == "Dark":
             ctk.set_appearance_mode("dark")
+            self.graph_bg_color = graph_bg_color
+            self.graph_fg_color = graph_fg_color
+            self.spine_color = border_frame_color
+            self.font_color = "white"
         else:
             ctk.set_appearance_mode("light")
+            self.graph_bg_color = light_graph_bg_color
+            self.graph_fg_color = light_graph_fg_color
+            self.spine_color = light_border_frame_color
+            self.font_color = "black"
+
+        self.app.create_graphs()
 
         print("Theme loaded.")
 
 
+    def save_subject(self, subject: str) -> None:
+        self.worksheet["S2"].value = subject
+        print("Subject saved.")
+
+
     def load_subject(self) -> None:
         if self.worksheet["S2"].value != None:
             subject = self.worksheet["S2"].value
@@ -316,36 +337,14 @@ def create_new_note(self, title, text):
 
 
     def load_notes(self) -> None:
-        self.app.clear_notes()
+        self.notes_manager.clear_notes()
 
         if self.notes_amount == 0:
             return None
 
-        for i in range(self.notes_amount+13, 13, -1):
-            frame = ctk.CTkFrame(self.app.notes_data_frame, width=WIDTH + frame_padding, fg_color=(light_frame_color, frame_color), height=button_height + frame_padding * 2)
-            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)
-            date = ctk.CTkLabel(frame, text=str(self.worksheet["N" + 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)
-            date.grid(row=0, column=1, padx=widget_padding_x)
-
-            button_frame = ctk.CTkFrame(frame, fg_color="transparent")
-            button_frame.place(anchor="center", rely=0.5, relx=0.8)
-
-            open_button = ctk.CTkButton(button_frame, text="Open", 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._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: _delete_note(frame))
-            delete_button.grid(row=0, column=1)
+        for i in range(self.notes_amount+12, 12, -1):
+            if self.worksheet["M" + str(i)].value != "Yes":
+                self.notes_manager.create_task(i)
 
 
     def save_eye_care(self, eye_care: str, checkbox: str) -> None:

Package/eye_care.py

@@ -1,2 +1,100 @@
+import customtkinter as ctk
+
+from .styles import *
+
 class NotesManager:
-    pass
+    def __init__(self, app, data_manager):
+        self.app = app
+        self.data_manager = data_manager
+
+    def create_task(self, index):
+        self.frame = ctk.CTkFrame(self.app.notes_data_frame, width=WIDTH + frame_padding, fg_color=(light_frame_color, frame_color), height=button_height + frame_padding * 2)
+        self.frame.pack(pady=frame_padding/2)
+        self.frame.grid_propagate(False)
+
+        def title_text(title: str) -> str:
+            max_letters = 20
+
+            display_title = title
+
+            if len(title) > max_letters:
+                display_title = title[:max_letters] + "..."
+                
+            return display_title
+
+        title = ctk.CTkLabel(self.frame, text=title_text(str(self.data_manager.worksheet["O" + str(index)].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)
+        date = ctk.CTkLabel(self.frame, text=str(self.data_manager.worksheet["N" + str(index)].value), font=(font_family, font_size*1.25),
+                            text_color=(light_font_color, font_color), anchor="center", height=button_height + frame_padding * 2)
+        date.grid(row=0, column=1, padx=widget_padding_x)
+
+        button_frame = ctk.CTkFrame(self.frame, fg_color="transparent")
+        button_frame.place(anchor="center", rely=0.5, relx=0.825)
+
+        open_button = ctk.CTkButton(button_frame, text="Open", height=button_height, fg_color=self.data_manager.color, hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color,
+                                   command=lambda: self._open_notes_text(str(self.data_manager.worksheet["N" + str(index)].value), str(self.data_manager.worksheet["O" + str(index)].value), str(self.data_manager.worksheet["P" + str(index)].value), index))
+        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.data_manager.color, hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color,
+                                          command=lambda: self.delete_task(index))
+        delete_button.grid(row=0, column=1)
+
+
+    def delete_task(self, index):
+        self.data_manager.worksheet["M" + str(index)].value = "Yes"
+        self.frame.destroy()
+        self.data_manager.load_notes()
+
+
+    def _open_notes_text(self, date, title, text, index):
+        self.app.notes_frame_frame.grid_forget()
+
+        frame = ctk.CTkFrame(self.app.notes_frame, fg_color="transparent", corner_radius=10, height=HEIGHT + frame_padding * 2, width=WIDTH - frame_padding * 2)
+        frame.grid(padx=frame_padding, pady=frame_padding)
+        frame.grid_propagate(False)
+
+        header_frame = ctk.CTkFrame(frame, fg_color=(light_frame_color, frame_color), corner_radius=10, width=WIDTH - frame_padding * 2, height=60)
+        header_frame.grid(row=0, column=0, pady=(0, frame_padding))
+        header_frame.grid_propagate(False)
+
+        title_label = ctk.CTkLabel(header_frame, text=title, font=(font_family, font_size*1.5), text_color=(light_font_color, font_color),
+                                   height=40, width=WIDTH - 280 - frame_padding * 6, fg_color=(light_frame_color, frame_color), anchor="w")
+        title_label.grid(row=0, column=0, padx=widget_padding_x, pady=widget_padding_y)
+        #date_label = ctk.CTkLabel(header_frame, text=date, font=(font_family, font_size), text_color=(light_font_color, font_color),
+                                  #height=40, width=WIDTH - 280 - frame_padding * 6, fg_color=(light_frame_color, frame_color))
+        #date_label.grid(row=0, column=0, padx=widget_padding_x, pady=widget_padding_y)
+
+        button_frame = ctk.CTkFrame(header_frame, fg_color="transparent")
+        button_frame.place(anchor="center", rely=0.5, relx=0.85)
+
+        textbox = ctk.CTkTextbox(frame, font=(font_family, font_size), text_color=(light_font_color, font_color), fg_color="transparent", width=WIDTH - frame_padding * 2, height=HEIGHT + frame_padding * 2 - 60)
+        textbox.grid(row=1, column=0)
+        textbox.insert("0.0", text)
+        textbox.configure(state="disabled")
+        
+        edit_button = ctk.CTkButton(button_frame, height=button_height, text="Edit", fg_color=self.data_manager.color, 
+                                                hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color, command=lambda: self.edit_note(index, textbox, edit_button, frame))
+        edit_button.grid(row=0, column=1)
+        exit_button = ctk.CTkButton(button_frame, height=button_height, text="Exit", fg_color=self.data_manager.color, command=lambda: self._exit_note(frame), 
+                                                hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color)
+        exit_button.grid(row=0, column=2, padx=widget_padding_x, pady=widget_padding_y)
+
+
+    def _exit_note(self, frame):
+        frame.destroy()
+        self.app.notes_frame_frame.grid(row=0, column=0, padx=frame_padding, pady=(frame_padding, 0))
+
+
+    def edit_note(self, index, textbox, edit_button, frame):
+        def save_note(index, frame):
+            self.data_manager.worksheet["P" + str(index)].value = textbox.get("0.0", "end")
+            self._exit_note(frame)
+            self.data_manager.workbook.save(self.app.data_file)
+
+        textbox.configure(state="normal", fg_color=(light_frame_color, frame_color))
+        edit_button.configure(text="Save", command=lambda: save_note(index, frame))
+
+
+    def clear_notes(self):
+        for note in self.app.notes_data_frame.winfo_children():
+            note.destroy()

Package/note_management.py

@@ -55,7 +55,7 @@
 tab_width = tab_frame_width - (tab_frame_width * 0.2)
 tab_height = HEIGHT * 0.07
 
-border_frame_color = "#5b5b5b"
+border_frame_color = frame_border_color
 light_border_frame_color = "#b3b3b3"
 
 main_frame_pad_x = 0
@@ -64,17 +64,17 @@
 main_frame_color = "#2b2b2b"
 light_main_frame_color = "#d4d4d4"
 
-graph_height = HEIGHT/2
-graph_width = (WIDTH/2)-25
+graph_height = HEIGHT / 2
+graph_width = (WIDTH / 2) - frame_padding * 4
 
-graph_bg_color = "#323232"
-light_graph_bg_color = "#cccccc"
+graph_bg_color = frame_color
+light_graph_bg_color = light_frame_color
 
-graph_fg_color = "#323232"
-light_graph_fg_color = "#cccccc"
+graph_fg_color = frame_color
+light_graph_fg_color = light_frame_color
 
 graph_color = "#f38064"
-spine_color = "#5b5b5b"
+spine_color = frame_border_color
 
 pie_font_family = font_family
 pie_font_size = 10