added forward and back buttons

Author: Adam-Color

src/core/gui_root.py

@@ -24,11 +24,23 @@ def __init__(self, parent):
         # Initialize LogicRoot
         self.logic = LogicRoot(self)
 
+        # Navigation history
+        self.history = []  # Stack to store visited pages
+        self.history_index = -1  # Pointer to the current page in history
+
+        # Create container for screens
         self.container = tk.Frame(self)
         self.container.pack(side="top", fill="both", expand=True)
 
-        self.container.grid_rowconfigure(0, weight=1)
-        self.container.grid_columnconfigure(0, weight=1)
+        # Create navigation buttons
+        self.nav_frame = tk.Frame(self)
+        self.nav_frame.pack(side="top", fill="x")
+
+        self.back_button = tk.Button(self.nav_frame, text="←", command=self.go_back, state="disabled")
+        self.back_button.pack(side="left")
+
+        self.forward_button = tk.Button(self.nav_frame, text="→", command=self.go_forward, state="disabled")
+        self.forward_button.pack(side="left")
 
         self.frames = {}
         self.selected_project = None  # Store the selected project for navigation
@@ -52,21 +64,50 @@ def init_screens(self):
     def show_frame(self, page_name):
         frame = self.frames[page_name]
         frame.tkraise()
-        
+
+        # Check if the page is already the current page
+        if self.history and self.history[self.history_index] == page_name:
+            return  # Do nothing if the page is already the current page
+
+        # If navigating to a new screen, clear forward history
+        if self.history_index < len(self.history) - 1:
+            self.history = self.history[:self.history_index + 1]
+
+        # Add the new screen to history
+        self.history.append(page_name)
+        self.history_index += 1
+
+        # Update navigation buttons
+        self.update_nav_buttons()
+
         # Special handling for ProjectSessionsWindow - load sessions when shown
         if page_name == "ProjectSessionsWindow":
             frame.load_sessions()
         # Special handling for CreateSessionWindow - check for pre-selected project
         elif page_name == "CreateSessionWindow":
             frame.check_pre_selected_project()
+
+        # Ensure navigation buttons are updated after any special handling
+        self.update_nav_buttons()
 
-    def set_selected_project(self, project_name):
-        """Set the selected project for navigation between windows"""
-        self.selected_project = project_name
-    
-    def get_selected_project(self):
-        """Get the currently selected project"""
-        return self.selected_project
+    def go_back(self):
+        """Navigate to the previous screen."""
+        if self.history_index > 0:
+            self.history_index -= 1
+            self.show_frame(self.history[self.history_index])
+            self.update_nav_buttons()
+
+    def go_forward(self):
+        """Navigate to the next screen."""
+        if self.history_index < len(self.history) - 1:
+            self.history_index += 1
+            self.show_frame(self.history[self.history_index])
+            self.update_nav_buttons()
+
+    def update_nav_buttons(self):
+        """Enable or disable navigation buttons based on history."""
+        self.back_button.config(state="normal" if self.history_index > 0 else "disabled")
+        self.forward_button.config(state="normal" if self.history_index < len(self.history) - 1 else "disabled")
 
     def reset_frames(self):
         try:

src/core/logic/project_handler.py

@@ -12,6 +12,7 @@ class ProjectHandler:
     def __init__(self, parent, logic_controller):
         self.parent = parent
         self.controller = logic_controller
+        self.selected_project = None  # For navigation between windows
         self.current_project = None
         self.projects_directory = get_projects_directory()
         self.projects_metadata_file = os.path.join(self.projects_directory, "projects_metadata.json")
@@ -145,6 +146,14 @@ def update_project_metadata(self, project_name, session_count=None):
                 metadata["projects"][project_name]["session_count"] = session_count
             self._save_metadata(metadata)
 
+    def set_selected_project(self, project_name):
+        """Set the selected project for navigation between windows"""
+        self.selected_project = project_name
+    
+    def get_selected_project(self):
+        """Get the currently selected project"""
+        return self.selected_project
+    
     def get_project_info(self, project_name):
         """Get detailed information about a project"""
         metadata = self._load_metadata()

src/core/screens/create_session_window.py

@@ -99,7 +99,7 @@ def load_projects(self):
 
     def check_pre_selected_project(self):
         """Check if there's a pre-selected project from the controller and set it"""
-        selected_project = self.controller.get_selected_project()
+        selected_project = self.logic.project_handler.get_selected_project()
         if selected_project:
             self.project_var.set(selected_project)
         else:

src/core/screens/main_window.py

@@ -1,44 +1,61 @@
 import tkinter as tk
-
 from core.utils.file_utils import sessions_exist, get_projects
 
 class MainWindow(tk.Frame):
     def __init__(self, parent, controller, logic_controller):
-        tk.Frame.__init__(self, parent)
-        self.controller = controller # GUI controller
-        self.logic = logic_controller
+        super().__init__(parent)
+        self.controller = controller
         self.logic = logic_controller
 
         # Check if we have projects or sessions
         _ = get_projects()
         _ = sessions_exist()
-        
 
+        # Title Label
         label_text = "Track app usage in a project or standalone session."
-
-        label = tk.Label(self, text=label_text)
-        label.pack(side="top", fill="x", pady=10)
-
-        # Start new session button
-        button1 = tk.Button(self, text="Start new session",
-                            command=lambda: self.controller.show_frame("CreateSessionWindow"), width=25)
-        button1.pack(pady=3)
-
-        # Project management button
-        button_projects = tk.Button(self, text="Projects",
-                                   command=lambda: self.controller.show_frame("ProjectsWindow"), width=25)
-        button_projects.pack(pady=3)
-
-        # Sessions button (always show)
-        button2 = tk.Button(self, text="Sessions",
-                            command=lambda: [self.controller.show_frame("SessionsWindow"), self.logic.app_tracker.start_filter_reset(refresh=True)], width=25)
-        button2.pack(pady=3)
-
-        # Configure custom rules button
-        button3 = tk.Button(self, text="Configure custom rules",
-                            command=lambda: self.controller.show_frame("TrackerSettingsWindow"),
-                            width=25)
-        button3.pack(pady=3)
-
-        exit_button = tk.Button(self, text=" Exit ", command=lambda: self.controller.on_close())
-        exit_button.pack(pady=10, side='bottom')
+        label = tk.Label(self, text=label_text, font=("Arial", 14, "bold"))
+        label.pack(side="top", pady=(15, 20))
+
+        # Button Container
+        button_frame = tk.Frame(self)
+        button_frame.pack(pady=10)
+
+        # Row 1: Sessions + Projects
+        btn_session = tk.Button(
+            button_frame, text="Start New Session",
+            command=lambda: self.controller.show_frame("CreateSessionWindow"),
+            width=20, height=2
+        )
+        btn_session.grid(row=0, column=0, padx=10, pady=10)
+
+        btn_projects = tk.Button(
+            button_frame, text="Projects",
+            command=lambda: self.controller.show_frame("ProjectsWindow"),
+            width=20, height=2
+        )
+        btn_projects.grid(row=0, column=1, padx=10, pady=10)
+
+        # Row 2: Sessions list + Rules
+        btn_sessions = tk.Button(
+            button_frame, text="View Sessions",
+            command=lambda: [
+                self.controller.show_frame("SessionsWindow"),
+                self.logic.app_tracker.start_filter_reset(refresh=True)
+            ],
+            width=20, height=2
+        )
+        btn_sessions.grid(row=1, column=0, padx=10, pady=10)
+
+        btn_rules = tk.Button(
+            button_frame, text="Custom Rules",
+            command=lambda: self.controller.show_frame("TrackerSettingsWindow"),
+            width=20, height=2
+        )
+        btn_rules.grid(row=1, column=1, padx=10, pady=10)
+
+        # Exit Button at Bottom
+        exit_button = tk.Button(
+            self, text="Exit", command=self.controller.on_close,
+            width=10, height=1, bg="#d9534f", fg="white"
+        )
+        exit_button.pack(side="bottom", pady=15)

src/core/screens/project_sessions_window.py

@@ -72,7 +72,7 @@ def load_sessions(self):
         self.session_listbox.delete(0, tk.END)
 
         # Get selected project from controller
-        selected_project = self.controller.get_selected_project()
+        selected_project = self.logic.project_handler.get_selected_project()
 
         if selected_project:
             self.title_label.config(text=f'"{selected_project}" sessions')
@@ -138,14 +138,14 @@ def get_session_text(self):
 
     def create_new_session(self):
         """Create a new session for the current project"""
-        selected_project = self.controller.get_selected_project()
+        selected_project = self.logic.project_handler.get_selected_project()
 
         if not selected_project:
             messagebox.showerror("Error", "No project selected")
             return
 
         # Set the project context for the CreateSessionWindow
-        self.controller.set_selected_project(selected_project)
+        self.logic.project_handler.set_selected_project(selected_project)
 
         # Navigate to CreateSessionWindow with project pre-selected
         self.controller.show_frame("CreateSessionWindow")
@@ -168,7 +168,7 @@ def continue_session(self):
         self.logic.file_handler.set_continuing_session(True)
 
         # Load selected session data into the file handler
-        selected_project = self.controller.get_selected_project()
+        selected_project = self.logic.project_handler.get_selected_project()
         self.logic.file_handler.load_session_data(selected_session_name, selected_project)
 
         # Start/reset tracking threads
@@ -195,7 +195,7 @@ def analyze_session(self):
         selected_session_name = session_text.split(": ")[0]
 
         # Load the session data
-        selected_project = self.controller.get_selected_project()
+        selected_project = self.logic.project_handler.get_selected_project()
         self.logic.file_handler.load_session_data(selected_session_name, selected_project)
 
         # Start session total window
@@ -220,7 +220,7 @@ def delete_session(self):
                                      f"Are you sure you want to delete the session '{selected_session_name}'?\n"
                                      f"This action cannot be undone.")
         if confirm:
-            selected_project = self.controller.get_selected_project()
+            selected_project = self.logic.project_handler.get_selected_project()
             self.logic.file_handler.delete_session(selected_session_name, selected_project)
 
             # Remove from listbox

src/core/screens/projects_window.py

@@ -134,7 +134,7 @@ def view_sessions(self):
         project_name = self.extract_project_name(selected_text)
 
         # Set the selected project in the controller and navigate to sessions
-        self.controller.set_selected_project(project_name)
+        self.logic.project_handler.set_selected_project(project_name)
         self.controller.show_frame("ProjectSessionsWindow")
 
     def delete_project(self):