changed logic_controller to logic

Author: Adam-Color

src/core/gui.py

@@ -3,7 +3,8 @@
 import webbrowser
 import requests
 from PyQt6.QtWidgets import (
-    QApplication, QWidget, QLabel, QVBoxLayout, QMessageBox
+    QApplication, QWidget, QLabel, QVBoxLayout, QMessageBox,
+    QListWidget, QGridLayout
 )
 from PyQt6.QtGui import QIcon
 from PyQt6.QtCore import Qt
@@ -90,23 +91,29 @@ def splash_screen():
     QApplication.processEvents()
     splash.close()
 
-class GUIRoot(QWidget):
+class SessionsList(QListWidget):
+    def onItemClicked(self, item):
+        QMessageBox.information(self, "QListWidget Interaction", "You selected: " + item.text())
+
+class MainWindow(QWidget):
     def __init__(self):
         super().__init__()
         self.init_ui()
 
         # Initialize LogicRoot
-        self.logic_controller = LogicRoot(self)
+        self.logic = LogicRoot(self)
 
         # calls to create the app directories
         sessions_exist()
         user_dir_exists()
 
     def init_ui(self):
         splash_screen()
-        layout = QVBoxLayout()
-        label = QLabel("Welcome to AppUsageGUI")
-        layout.addWidget(label)
+
+        # define the layout type --
+        layout = QGridLayout()
+
+        # app setup --
         self.setLayout(layout)
         # self.setWindowFlags()
         self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
@@ -118,14 +125,20 @@ def init_ui(self):
         if is_dark_mode():
             self.setStyleSheet("background-color: #2E2E2E; color: white;")
 
+        # create widgets --
+        label = QLabel("Welcome to AppUsageGUI")
+
+        # add widgets to the layout --
+        layout.addWidget(label)
+
     def on_close(self):
         # Stop trackers
-        if self.logic_controller.app_tracker:
-            self.logic_controller.app_tracker.reset()
-        if self.logic_controller.time_tracker:
-            self.logic_controller.time_tracker.reset()
-        if self.logic_controller.mouse_tracker:
-            self.logic_controller.mouse_tracker.stop()
+        if self.logic.app_tracker:
+            self.logic.app_tracker.reset()
+        if self.logic.time_tracker:
+            self.logic.time_tracker.reset()
+        if self.logic.mouse_tracker:
+            self.logic.mouse_tracker.stop()
 
         self.close()
         sessions_exist()
@@ -134,6 +147,6 @@ def on_close(self):
     def closeEvent(self, event):
         print("Closing the application...")
         self.on_close()
-        self.logic_controller.close()
+        self.logic.close()
         QApplication.instance().quit()
         event.accept()

src/core/gui_root.py

@@ -18,7 +18,7 @@ def __init__(self, parent):
         self.parent = parent
 
         # Initialize LogicRoot
-        self.logic_controller = LogicRoot(self)
+        self.logic = LogicRoot(self)
 
         self.container = tk.Frame(self)
         self.container.pack(side="top", fill="both", expand=True)
@@ -36,7 +36,7 @@ def init_screens(self):
         # Pass the logic_controller when initializing screens
         for F in (MainWindow, SessionsWindow, SelectAppWindow, TrackerWindow, SaveWindow, CreateSessionWindow, SessionTotalWindow, TrackerSettingsWindow):
             page_name = F.__name__
-            frame = F(parent=self.container, controller=self, logic_controller=self.logic_controller)
+            frame = F(parent=self.container, controller=self, logic_controller=self.logic)
             self.frames[page_name] = frame
 
             frame.grid(row=0, column=0, sticky="nsew")
@@ -49,12 +49,12 @@ def show_frame(self, page_name):
 
     def reset_frames(self):
         # Stop trackers
-        if self.logic_controller.app_tracker:
-            self.logic_controller.app_tracker.reset()
-        if self.logic_controller.time_tracker:
-            self.logic_controller.time_tracker.reset()
-        if self.logic_controller.mouse_tracker:
-            self.logic_controller.mouse_tracker.stop()
+        if self.logic.app_tracker:
+            self.logic.app_tracker.reset()
+        if self.logic.time_tracker:
+            self.logic.time_tracker.reset()
+        if self.logic.mouse_tracker:
+            self.logic.mouse_tracker.stop()
 
         # Stop GUI threads
         for frame_name, frame in self.frames.items():
@@ -75,16 +75,16 @@ def reset_frames(self):
     def on_close(self):
         """Handle cleanup and close the application."""
         # Stop the AppTracker thread
-        if self.logic_controller.app_tracker:
-            self.logic_controller.app_tracker.stop()
+        if self.logic.app_tracker:
+            self.logic.app_tracker.stop()
 
         # stop the TimeTracker thread
-        if self.logic_controller.time_tracker:
-            self.logic_controller.time_tracker.stop()
+        if self.logic.time_tracker:
+            self.logic.time_tracker.stop()
 
         # stop the MouseTracker thread
-        if self.logic_controller.mouse_tracker:
-            self.logic_controller.mouse_tracker.stop()
+        if self.logic.mouse_tracker:
+            self.logic.mouse_tracker.stop()
 
         # Destroy the root window
         self.parent.destroy()

src/core/logic/user_trackers.py

@@ -19,7 +19,7 @@ def __init__(self, parent, logic_controller):
             self.idle_time_limit = 300  # Default value
         x = 0
         y = 0
-        self.logic_controller = logic_controller
+        self.logic = logic_controller
         self.mouse_position = x, y
         self.last_mouse_position = x , y
         self.stop_event = threading.Event()  # Used to stop the thread gracefully
@@ -37,7 +37,7 @@ def _update_mouse_position(self):
             self.last_mouse_position = self.mouse_position
 
             # time limit handling
-            if not self.logic_controller.time_tracker.get_is_paused():
+            if not self.logic.time_tracker.get_is_paused():
                 time.sleep(self.idle_time_limit)
             else:
                 time.sleep(1)
@@ -47,10 +47,10 @@ def _update_mouse_position(self):
 
             # pause the timer
             if self.last_mouse_position == self.mouse_position:
-                self.logic_controller.time_tracker.pause()
+                self.logic.time_tracker.pause()
                 self.pausing = True
-            elif self.logic_controller.time_tracker.get_is_paused():
-                self.logic_controller.time_tracker.resume()
+            elif self.logic.time_tracker.get_is_paused():
+                self.logic.time_tracker.resume()
                 self.pausing = False
 
     def start(self):

src/core/screens/analyze_data_window.py

@@ -6,7 +6,7 @@ class AnalyzeDataWindow(tk.Toplevel):
     def __init__(self, parent, controller, logic_controller):
         super().__init__(parent)  # Toplevel window with `parent` as master
         self.controller = controller
-        self.logic_controller = logic_controller
+        self.logic = logic_controller
 
         self.title("Popout Window")
         self.geometry("1600x1200")

src/core/screens/create_session_window.py

@@ -19,7 +19,7 @@ class CreateSessionWindow(tk.Frame):
     def __init__(self, parent, controller, logic_controller):
         tk.Frame.__init__(self, parent)
         self.controller = controller
-        self.logic_controller = logic_controller
+        self.logic = logic_controller
 
         vcmd = (self.register(validate_name), '%P')
         self.session_name = tk.StringVar()
@@ -43,15 +43,15 @@ def __init__(self, parent, controller, logic_controller):
     def on_confirm(self):
         """Saves session and resets trackers upon confirmation"""
         self.session_save(self.session_name.get())
-        self.logic_controller.time_tracker.reset()
-        self.logic_controller.app_tracker.reset()
+        self.logic.time_tracker.reset()
+        self.logic.app_tracker.reset()
         self.controller.show_frame("SessionTotalWindow")
 
     def session_save(self, session_name):
-        self.logic_controller.file_handler.set_file_name(session_name)
-        session_time = self.logic_controller.time_tracker.get_time(saved=True)
-        session_app_name = self.logic_controller.app_tracker.get_selected_app()
-        captures = self.logic_controller.time_tracker.get_time_captures()
+        self.logic.file_handler.set_file_name(session_name)
+        session_time = self.logic.time_tracker.get_time(saved=True)
+        session_app_name = self.logic.app_tracker.get_selected_app()
+        captures = self.logic.time_tracker.get_time_captures()
         try:
             self.config = read_file(config_file())
         except FileNotFoundError:
@@ -64,4 +64,4 @@ def session_save(self, session_name):
                 'time_captures': captures # {'starts': [], 'stops': [], 'pauses': [{start: 0, how_long: 0}]}
                 }
 
-        self.logic_controller.file_handler.save_session_data(data)
+        self.logic.file_handler.save_session_data(data)

src/core/screens/main_window.py

@@ -7,7 +7,7 @@ class MainWindow(tk.Frame):
     def __init__(self, parent, controller, logic_controller):
         tk.Frame.__init__(self, parent)
         self.controller = controller # GUI controller
-        self.logic_controller = logic_controller
+        self.logic = logic_controller
 
         label_text = "To begin app tracking, start a new session:"
 

src/core/screens/save_window.py

@@ -6,7 +6,7 @@ class SaveWindow(tk.Frame):
     def __init__(self, parent, controller, logic_controller):
         tk.Frame.__init__(self, parent)
         self.controller = controller
-        self.logic_controller = logic_controller
+        self.logic = logic_controller
 
         # display the page label
         self.page_label = tk.Label(self, text="Would you like to save the recorded data?")
@@ -22,10 +22,10 @@ def __init__(self, parent, controller, logic_controller):
         back_button.pack(pady=5, side='bottom')
 
     def save(self):
-        if self.logic_controller.file_handler.get_continuing_session():
-            session_time = self.logic_controller.time_tracker.get_total_time()
-            session_app_name = self.logic_controller.app_tracker.get_selected_app()
-            captures = self.logic_controller.time_tracker.get_time_captures()
+        if self.logic.file_handler.get_continuing_session():
+            session_time = self.logic.time_tracker.get_total_time()
+            session_app_name = self.logic.app_tracker.get_selected_app()
+            captures = self.logic.time_tracker.get_time_captures()
             try:
                 self.config = read_file(config_file())
             except FileNotFoundError:
@@ -38,7 +38,7 @@ def save(self):
                     'time_captures': captures # {'starts': [], 'stops': [], 'pauses': [{start: 0, how_long: 0}]}
                     }
 
-            self.logic_controller.file_handler.save_session_data(data)
+            self.logic.file_handler.save_session_data(data)
 
             # show to session total window
             self.controller.show_frame("SessionTotalWindow")
@@ -49,7 +49,7 @@ def dont_save(self):
         """confirm data deletion"""
         ans = tk.messagebox.askyesno("AppUsageGUI", "Are you sure you don't want to save?")
         if ans:
-            self.logic_controller.time_tracker.reset()
-            self.logic_controller.app_tracker.reset()
+            self.logic.time_tracker.reset()
+            self.logic.app_tracker.reset()
             self.controller.reset_frames()
             self.controller.show_frame("MainWindow")

src/core/screens/select_app_window.py

@@ -17,7 +17,7 @@ class SelectAppWindow(tk.Frame):
     def __init__(self, parent, controller, logic_controller):
         tk.Frame.__init__(self, parent)
         self.controller = controller
-        self.logic_controller = logic_controller
+        self.logic = logic_controller
 
         label = tk.Label(self, text="Ensure the desired application is running.\nYou may need to hit \'Refresh List\' if it was not.\n\nSelect which application you would like to track:")
         label.pack(side="top", fill="x", pady=5)
@@ -52,7 +52,7 @@ def __init__(self, parent, controller, logic_controller):
         self.app_listbox.config(yscrollcommand=scrollbar.set)
 
         # Track the apps and filtered apps
-        self.app_tracker = self.logic_controller.app_tracker
+        self.app_tracker = self.logic.app_tracker
         self.all_apps = []  # Store all apps to filter through
         self.refresh_apps()  # Populate list initially
 

src/core/screens/session_total_window.py

@@ -9,7 +9,7 @@ class SessionTotalWindow(tk.Frame):
     def __init__(self, parent, controller, logic_controller):
         tk.Frame.__init__(self, parent)
         self.controller = controller
-        self.logic_controller = logic_controller
+        self.logic = logic_controller
 
         self.update_queue = queue.Queue()
 
@@ -50,9 +50,9 @@ def update_total_time(self):
     def total_time_thread(self):
         while not self.stop_event.is_set():
             try:
-                if self.logic_controller.time_tracker.get_time() > 0 and self.logic_controller.time_tracker.is_running():
+                if self.logic.time_tracker.get_time() > 0 and self.logic.time_tracker.is_running():
                     # Get the total session time from the logic controller
-                    total_time = self.logic_controller.time_tracker.get_total_time()
+                    total_time = self.logic.time_tracker.get_total_time()
 
                     # Put the total time into the queue to update the UI
                     self.update_queue.put(total_time)

src/core/screens/sessions_window.py

@@ -8,7 +8,7 @@ class SessionsWindow(tk.Frame):
     def __init__(self, parent, controller, logic_controller):
         tk.Frame.__init__(self, parent)
         self.controller = controller
-        self.logic_controller = logic_controller
+        self.logic = logic_controller
 
         # label for SessionsWindow
         label = tk.Label(self, text="Select a Session to continue from:")
@@ -46,16 +46,16 @@ def load_sessions(self):
         for session in sessions:
             session_name = session.split(".")[0]
             # Load data for the current session
-            self.logic_controller.file_handler.load_session_data(session_name)
-            session_data = self.logic_controller.file_handler.get_data()
+            self.logic.file_handler.load_session_data(session_name)
+            session_data = self.logic.file_handler.get_data()
             if session_data is not None:
                 app_name = session_data['app_name']
                 time_spent = session_data['time_spent']
                 # Format the time spent
                 formatted_time = format_time(round(time_spent))
                 # Insert into the Listbox
                 self.session_listbox.insert(tk.END, f"{session_name}: {app_name}, {formatted_time} on record")
-        corrupt_sessions = self.logic_controller.file_handler.get_corrupt_sessions()
+        corrupt_sessions = self.logic.file_handler.get_corrupt_sessions()
         if len(corrupt_sessions) > 0:
             error_string = "The following session(s) failed to load:\n\n"
             for session in corrupt_sessions:
@@ -77,21 +77,21 @@ def select_session(self):
         selected_session_name = self.get_session_text().split(": ")[0]
 
         # update the logic session name var
-        self.logic_controller.file_handler.set_file_name(selected_session_name)
+        self.logic.file_handler.set_file_name(selected_session_name)
 
         # tell the controller we are continuing from a session
-        self.logic_controller.file_handler.set_continuing_session(True)
+        self.logic.file_handler.set_continuing_session(True)
 
         # load selected session data into the file handler,
         # so it's ready to be pulled
-        self.logic_controller.file_handler.load_session_data(selected_session_name)
+        self.logic.file_handler.load_session_data(selected_session_name)
 
         # start/reset tracking threads
-        self.logic_controller.app_tracker.reset()
-        self.logic_controller.app_tracker.set_selected_app(selected_app_name)
-        self.logic_controller.time_tracker.reset(add_time=self.logic_controller.file_handler.get_data()['time_spent'])
-        self.logic_controller.time_tracker.start()
-        self.logic_controller.time_tracker.clock()
+        self.logic.app_tracker.reset()
+        self.logic.app_tracker.set_selected_app(selected_app_name)
+        self.logic.time_tracker.reset(add_time=self.logic.file_handler.get_data()['time_spent'])
+        self.logic.time_tracker.start()
+        self.logic.time_tracker.clock()
 
         # show the TrackerWindow
         self.controller.show_frame('TrackerWindow')