new camera handling concept

controllers/main_controller.py

@@ -7,8 +7,6 @@ from ui.widgets.thumbnail_list_widget import ThumbnailListWidget
 from ui.widgets.split_view_widget import SplitView
 from .camera_controller import CameraController
 
-from core.camera.gphoto_camera import GPhotoCamera
-from core.camera.camera_manager import CameraManager
 
 class MainController:
     def __init__(self, view):
@@ -17,11 +15,7 @@ class MainController:
         self.media_repo = MediaRepository(self.db)
         self.media_repo.sync_media()
 
-        camera = GPhotoCamera()
-        self.manager = CameraManager(camera)
-
-
-        # self.camera_controller = CameraController()
+        self.camera_controller = CameraController()
 
         self.view = view
         self.color_list: ColorListWidget = view.color_list_widget
@@ -31,20 +25,13 @@ class MainController:
         self.photo_button: QPushButton = view.photo_button
         self.photo_button.clicked.connect(self.take_photo)
 
-        self.record_button: QPushButton = view.record_button
-        # self.record_button.clicked.connect(self.fun_test)
-
         self.color_list.colorSelected.connect(self.on_color_selected)
         self.color_list.editColor.connect(self.on_edit_color)
         self.thumbnail_list.selectedThumbnail.connect(self.on_thumbnail_selected)
 
-        # self.camera_controller.errorOccurred.connect(self.split_view.widget_start.set_info_text)
-        self.manager.error_occurred.connect(self.split_view.widget_start.set_info_text)
-        # self.camera_controller.frameReady.connect(self.split_view.set_live_image)
-        self.manager.frame_ready.connect(self.split_view.set_live_image)
-        # self.split_view.widget_start.camera_start_btn.clicked.connect(self.camera_controller.start)
-        self.split_view.widget_start.camera_start_btn.clicked.connect(self.start_liveview)
-
+        self.camera_controller.errorOccurred.connect(self.split_view.widget_start.set_info_text)
+        self.camera_controller.frameReady.connect(self.split_view.set_live_image)
+        self.split_view.widget_start.camera_start_btn.clicked.connect(self.camera_controller.start)
 
     def start_camera(self):
         pass
@@ -84,10 +71,3 @@ class MainController:
     def take_photo(self):
         print("Robienie zdjęcia...")
         self.split_view.toglle_live_view()
-
-    def start_liveview(self):
-        self.manager.start_camera()
-        # self.manager.start_stream()
-
-    def shutdown(self):
-        self.manager.stop()

core/base.py

@@ -0,0 +1,18 @@
+from 
+
+
+class BaseImageSource(QObject):
+    frameReady = Signal(QPixmap)
+    errorOccurred = Signal(str)
+
+    def start(self): ...
+    def stop(self): ...
+
+
+class BaseControlSource(QObject):
+    errorOccurred = Signal(str)
+    parameterChanged = Signal(str, object)
+
+    def set_parameter(self, name: str, value): ...
+    def get_parameter(self, name: str): ...
+    def list_parameters(self) -> dict: ...

core/camera/base_camera.py

@@ -1,37 +1,49 @@
 from abc import ABC, abstractmethod
 
-
 class BaseCamera(ABC):
-    def __init__(self) -> None:
-        self.error_msg = None
+    """Interfejs wspólny dla wszystkich backendów kamer."""
 
     @abstractmethod
     def connect(self) -> bool:
+        """Nawiązuje połączenie z urządzeniem."""
         raise NotImplementedError
-
+    
     @abstractmethod
-    def disconnect(self) -> None:
+    def disconnect(self):
+        """Zamyka połączenie z urządzeniem."""
         raise NotImplementedError
-
+    
+    @abstractmethod
+    def start_stream(self):
+        """Rozpocznij strumień wideo."""
+        raise NotImplementedError
+ 
+    @abstractmethod
+    def stop_stream(self):
+        """Zatrzymaj strumień wideo."""
+        raise NotImplementedError
+ 
     @abstractmethod
     def get_frame(self):
+        """Pobierz jedną klatkę liveview."""
         raise NotImplementedError
 
     @abstractmethod
-    def get_config_by_id(self, id: int) -> dict:
+    def capture_photo(self):
+        """Zrób zdjęcie."""
         raise NotImplementedError
 
     @abstractmethod
-    def get_config_by_name(self, name: str) -> dict:
+    def record_video(self):
+        """Nagraj film."""
+        raise NotImplementedError
+    
+    @abstractmethod
+    def get_available_settings(self) -> dict:
+        """Zwraca słownik dostępnych ustawień i ich możliwych wartości."""
         raise NotImplementedError
 
     @abstractmethod
-    def set_config_by_id(self, id: int, value) -> None:
-        raise NotImplementedError
-
-    @abstractmethod
-    def set_config_by_name(self, name: str, value) -> None:
-        raise NotImplementedError
-
-    def get_error_msg(self):
-        return str(self.error_msg)
+    def set_setting(self, name: str, value) -> bool:
+        """Ustawia wybraną wartość dla danego ustawienia."""
+        raise NotImplementedError

core/camera/camera_manager.py

@@ -1,88 +0,0 @@
-from PySide6.QtCore import QObject, QThread, QTimer, Signal, Slot
-from PySide6.QtGui import QImage, QPixmap
-import cv2
-
-from .base_camera import BaseCamera
-
-
-class CameraManager(QThread):
-    frame_ready = Signal(QPixmap)
-    photo_ready = Signal(QPixmap)
-    error_occurred = Signal(str)
-
-    def __init__(self, camera: BaseCamera, fps: int = 15, parent: QObject | None = None) -> None:
-        super().__init__(parent)
-        self.camera = camera
-        self.fps = fps
-        self.timer = None
-        self.is_streaming = False
-
-        self.is_connected = False
-
-        self.timer = QTimer()
-        self.timer.setInterval(int(1000 / self.fps))
-        self.timer.timeout.connect(self._update_frame)
-        self.start()
-
-    def run(self) -> None:
-        # self.timer = QTimer()
-        # self.timer.setInterval(int(1000 / self.fps))
-        # self.timer.timeout.connect(self._update_frame)
-        self.exec()
-
-    def start_camera(self) -> None:
-        if self.is_connected:
-            return
-        
-        if self.camera.connect():
-            self.is_connected = True
-        else:
-            self.is_connected = False
-            self.error_occurred.emit(self.camera.get_error_msg())
-
-    def stop_camera(self) -> None:
-        self.is_streaming = False
-        self.is_connected = False
-        if self.timer:
-            self.timer.stop()
-        self.camera.disconnect()
-
-    def start_stream(self):
-        if not self.is_connected:
-            return
-        
-        if self.is_streaming:
-            return
-        
-        if self.timer:
-            self.is_streaming = True
-            self.timer.start()
-
-    def stop_stream(self) -> None:
-        if self.is_streaming:
-            self.is_streaming = False
-            if self.timer:
-                self.timer.stop()
-
-    def _update_frame(self) -> None:
-        if not self.is_streaming or not self.is_connected:
-            return
-
-        ret, frame = self.camera.get_frame()
-
-        if not ret:
-            self.error_occurred.emit(self.camera.get_error_msg())
-            return
-
-        if frame is not None:
-            rgb_image = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
-            h, w, ch = rgb_image.shape
-            qimg = QImage(rgb_image.data, w, h, ch * w, QImage.Format.Format_RGB888)
-            pixmap = QPixmap.fromImage(qimg)
-
-            self.frame_ready.emit(pixmap)
-
-    def stop(self):
-        self.stop_camera()
-        self.quit()
-        self.wait()

core/camera/gphoto_camera.py

@@ -1,122 +1,35 @@
-from typing import Optional, List
-from dataclasses import dataclass, field
-import gphoto2 as gp
-import cv2
-import numpy as np
 
 from .base_camera import BaseCamera
 
-camera_widget_types = {
-    gp.GP_WIDGET_WINDOW: "GP_WIDGET_WINDOW",    # type: ignore
-    gp.GP_WIDGET_SECTION: "GP_WIDGET_SECTION",  # type: ignore
-    gp.GP_WIDGET_TEXT: "GP_WIDGET_TEXT",        # type: ignore
-    gp.GP_WIDGET_RANGE: "GP_WIDGET_RANGE",      # type: ignore
-    gp.GP_WIDGET_TOGGLE: "GP_WIDGET_TOGGLE",    # type: ignore
-    gp.GP_WIDGET_RADIO: "GP_WIDGET_RADIO",      # type: ignore
-    gp.GP_WIDGET_MENU: "GP_WIDGET_MENU",        # type: ignore
-    gp.GP_WIDGET_BUTTON: "GP_WIDGET_BUTTON",    # type: ignore
-    gp.GP_WIDGET_DATE: "GP_WIDGET_DATE",        # type: ignore
-}
-
-
-class GPhotoCamera(BaseCamera):
+class GPhotoBackend(BaseCamera):
     def __init__(self) -> None:
-        super().__init__()
         self.camera = None
-        self.configs: List[dict] = []
+        self.context = None
+        self._is_streaming = False
 
     def connect(self) -> bool:
-        self.error_msg = None
-        try:
-            self.camera = gp.Camera()   # type: ignore
-            self.camera.init()
-            config = self.camera.get_config()
-            self.read_config(config)
-            return True
-        except Exception as e:
-            self.error_msg = f"[GPHOTO2] {e}"
-            self.camera = None
-            return False
-
-    def disconnect(self) -> None:
-        if self.camera:
-            self.camera.exit()
-            self.camera = None
-            self.configs.clear()
-
+        pass
+    
+    def disconnect(self):
+        pass
+    
+    def start_stream(self):
+        pass
+ 
+    def stop_stream(self):
+        pass
+ 
     def get_frame(self):
-        self.error_msg = None
+        pass
 
-        if self.camera is None:
-            self.error_msg = "[GPHOTO2] Camera is not initialized."
-            return (False, None)
+    def capture_photo(self):
+        pass
 
-        try:
-            file = self.camera.capture_preview()    # type: ignore
-            data = file.get_data_and_size()
-            frame = np.frombuffer(data, dtype=np.uint8)
-            frame = cv2.imdecode(frame, cv2.IMREAD_COLOR)
+    def record_video(self):
+        pass
+    
+    def get_available_settings(self) -> dict:
+        pass
 
-            return (True, frame)
-        except Exception as e:
-            self.error_msg = f"[GPHOTO2] {e}"
-            return (False, None)
-
-    def get_config_by_id(self, id: int):
-        return next(w for w in self.configs if w['id'] == id)
-
-    def get_config_by_name(self, name: str):
-        return next(w for w in self.configs if w['name'] == name)
-
-    def set_config(self, config, value):
-        if value not in config['choices']:
-            return
-
-        config['config'].set_value(value)  # type: ignore
-        if self._save_config(config):
-            config['value'] = value
-
-    def set_config_by_id(self, id: int, value: str):
-        config = self.get_config_by_id(id)
-
-        self.set_config(config, value)
-
-    def set_config_by_name(self, name: str, value: str):
-        config = self.get_config_by_name(name)
-
-        self.set_config(config, value)
-
-    def _save_config(self, config):
-        if not self.camera:
-            return False
-
-        self.camera.set_single.config(config['name'], config['widget'])
-        return True
-
-    def parse_config(self, config):
-        new_config = {
-            "id": config.get_id(),
-            "name": config.get_name(),
-            "label": config.get_label(),
-            "type": camera_widget_types[config.get_type()],
-            "widget": config
-        }
-
-        try:
-            new_config["value"] = config.get_value()
-        except gp.GPhoto2Error:
-            pass
-
-        try:
-            new_config["choices"] = list(config.get_choices())
-        except gp.GPhoto2Error:
-            pass
-
-        return new_config
-
-    def read_config(self, config):
-        self.configs.append(self.parse_config(config))
-
-        for i in range(config.count_children()):
-            child = config.get_child(i)
-            self.read_config(child)
+    def set_setting(self, name: str, value) -> bool:
+        pass

core/camera/opencv_camera.py

@@ -1,98 +1,104 @@
-import cv2
-from typing import List
+# camera/opencv_camera.py
 
+import cv2
+import time
+from PySide6.QtGui import QImage, QPixmap
 from .base_camera import BaseCamera
 
+class OpenCVCamera(BaseCamera):
+    """Implementacja kamery przy użyciu OpenCV."""
 
-
-
-class CvCamera(BaseCamera):
-    """Kamera oparta na cv2.VideoCapture"""
-
-    config_map = {
-        0: {"name": "frame_width", "cv_prop": cv2.CAP_PROP_FRAME_WIDTH, "default": 640},
-        1: {"name": "frame_height", "cv_prop": cv2.CAP_PROP_FRAME_HEIGHT, "default": 480},
-        2: {"name": "fps", "cv_prop": cv2.CAP_PROP_FPS, "default": 30},
-        3: {"name": "brightness", "cv_prop": cv2.CAP_PROP_BRIGHTNESS, "default": 0.5},
-        4: {"name": "contrast", "cv_prop": cv2.CAP_PROP_CONTRAST, "default": 0.5},
-        5: {"name": "saturation", "cv_prop": cv2.CAP_PROP_SATURATION, "default": 0.5},
-    }
-
-    def __init__(self, device_index: int = 0) -> None:
-        super().__init__()
-        self.device_index = device_index
-        self.cap = None
-        self.configs: List[dict] = []
+    def __init__(self, camera_index=0):
+        self.camera_index = camera_index
+        self.video_capture = None
+        self._is_streaming = False
+        # self._live_view_thread = None # Wewnętrzny wątek do pętli live view
 
     def connect(self) -> bool:
-        self.error_msg = None
-        try:
-            self.cap = cv2.VideoCapture(self.device_index)
-            if not self.cap.isOpened():
-                self.error_msg = f"[CV2] Could not open camera {self.device_index}"
-                return False
-
-            self.configs.clear()
-            for id, conf in self.config_map.items():
-                value = self.cap.get(conf["cv_prop"])
-                self.configs.append(
-                    {
-                        "id": id,
-                        "name": conf["name"],
-                        "label": conf["name"].capitalize(),
-                        "value": value,
-                        "choices": None,  # brak predefiniowanych wyborów
-                        "cv_prop": conf["cv_prop"],
-                    }
-                )
-            return True
-
-        except Exception as e:
-            self.error_msg = f"[CV2] {e}"
-            self.cap = None
+        self.video_capture = cv2.VideoCapture(self.camera_index)
+        if not self.video_capture.isOpened():
+            # self.error_occurred.emit(f"Nie można otworzyć kamery OpenCV o indeksie {self.camera_index}")
+            self.video_capture = None
             return False
+        # print("Kamera OpenCV połączona.")
+        return True
+
+    def disconnect(self):
+        self.stop_stream()
+        if self.video_capture:
+            self.video_capture.release()
+            self.video_capture = None
+            # print("Kamera OpenCV rozłączona.")
+        # self.camera_disconnected.emit()
+
+    def start_stream(self):
+        if not self.video_capture or not self.video_capture.isOpened():
+            # self.error_occurred.emit("Próba uruchomienia podglądu na niepodłączonej kamerze.")
+            return
+
+        if self._is_streaming:
+            return # Już działa
+
+        self._is_streaming = True
+        # Uruchamiamy pętlę w metodzie, ponieważ cała klasa działa już w dedykowanym wątku
+        # self._live_view_loop()
+
+    def stop_stream(self):
+        self._is_streaming = False
 
-    def disconnect(self) -> None:
-        if self.cap:
-            self.cap.release()
-            self.cap = None
-            self.configs.clear()
 
     def get_frame(self):
-        self.error_msg = None
-        if self.cap is None or not self.cap.isOpened():
-            self.error_msg = "[CV2] Camera is not initialized."
-            return (False, None)
+        if not self.video_capture:
+            return None
+        
+        ret, frame = self.video_capture.read()
+        if not ret:
+            self.stop_stream()
+            return None
+        
+        rgb_image = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
+        h, w, ch = rgb_image.shape
+        bytes_per_line = ch * w
+        qt_image = QImage(rgb_image.data, w, h, bytes_per_line, QImage.Format.Format_RGB888)
 
-        try:
-            ret, frame = self.cap.read()
-            if not ret:
-                self.error_msg = "[CV2] Failed to read frame."
-                return (False, None)
-            return (True, frame)
-        except Exception as e:
-            self.error_msg = f"[CV2] {e}"
-            return (False, None)
+        return qt_image
 
-    def get_config_by_id(self, id: int):
-        return next(w for w in self.configs if w["id"] == id)
-
-    def get_config_by_name(self, name: str):
-        return next(w for w in self.configs if w["name"] == name)
-
-    def set_config(self, config, value: float):
-        if not self.cap:
+    def capture_photo(self, save_path: str):
+        if not self.video_capture or not self.video_capture.isOpened():
+            # self.error_occurred.emit("Nie można zrobić zdjęcia, kamera nie jest podłączona.")
             return
-        try:
-            self.cap.set(config["cv_prop"], value)
-            config["value"] = self.cap.get(config["cv_prop"])  # sprawdz co ustawiło
-        except Exception as e:
-            self.error_msg = f"[CV2] {e}"
 
-    def set_config_by_id(self, id: int, value: float):
-        config = self.get_config_by_id(id)
-        self.set_config(config, value)
+        ret, frame = self.video_capture.read()
+        if ret:
+            try:
+                cv2.imwrite(save_path, frame)
+                print(f"Zdjęcie zapisane w: {save_path}")
+                # self.photo_captured.emit(save_path)
+            except Exception as e:
+                # self.error_occurred.emit(f"Błąd zapisu zdjęcia: {e}")
+        else:
+            # self.error_occurred.emit("Nie udało się przechwycić klatki do zdjęcia.")
+            
+    def get_available_settings(self) -> dict:
+        # To jest uproszczona implementacja
+        if not self.video_capture:
+            return {}
+        return {
+            "brightness": self.video_capture.get(cv2.CAP_PROP_BRIGHTNESS),
+            "contrast": self.video_capture.get(cv2.CAP_PROP_CONTRAST),
+            "saturation": self.video_capture.get(cv2.CAP_PROP_SATURATION),
+        }
 
-    def set_config_by_name(self, name: str, value: float):
-        config = self.get_config_by_name(name)
-        self.set_config(config, value)
+    def set_setting(self, name: str, value) -> bool:
+        if not self.video_capture:
+            return False
+            
+        prop_map = {
+            "brightness": cv2.CAP_PROP_BRIGHTNESS,
+            "contrast": cv2.CAP_PROP_CONTRAST,
+            "saturation": cv2.CAP_PROP_SATURATION,
+        }
+        
+        if name in prop_map:
+            return self.video_capture.set(prop_map[name], value)
+        return False

core/gphoto_adapter.py

@@ -0,0 +1,80 @@
+from PySide6.QtCore import QObject, QThread, Signal, QTimer
+from PySide6.QtGui import QImage, QPixmap
+import cv2
+import numpy as np
+
+from .base import BaseControlSource, BaseImageSource
+
+# try:
+    # import gphoto2 as gp
+# except:
+from . import mock_gphoto as gp
+
+class GPhotoImageSource(BaseImageSource):
+    def __init__(self, camera: gp.Camera, fps=10, parent=None):
+        super().__init__(parent)
+        self.camera = camera
+        self.fps = fps
+        self.timer = None
+
+    def start(self):
+        self.timer = QTimer()
+        self.timer.timeout.connect(self._grab_frame)
+        self.timer.start(int(1000 / self.fps))
+
+    def _grab_frame(self):
+        try:
+            file = self.camera.capture_preview()
+            data = file.get_data_and_size()
+            frame = np.frombuffer(data, dtype=np.uint8)
+            frame = cv2.imdecode(frame, cv2.IMREAD_COLOR)
+            if frame is None:
+                return
+
+            rgb_image = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
+            h, w, ch = rgb_image.shape
+            qimg = QImage(rgb_image.data, w, h, ch * w, QImage.Format.Format_RGB888)
+            pixmap = QPixmap.fromImage(qimg)
+            self.frameReady.emit(pixmap)
+        except gp.GPhoto2Error as e:
+            self.errorOccurred.emit(f"GPhoto2 error: {e}")
+
+    def stop(self):
+        if self.timer:
+            self.timer.stop()
+
+
+
+class GPhotoControlSource(BaseControlSource):
+    def __init__(self, camera: gp.Camera, parent=None):
+        super().__init__(parent)
+        self.camera = camera
+
+    def set_parameter(self, name, value):
+        try:
+            config = self.camera.get_config()
+            child = config.get_child_by_name(name)
+            child.set_value(value)
+            self.camera.set_config(config)
+            self.parameterChanged.emit(name, value)
+        except gp.GPhoto2Error as e:
+            self.errorOccurred.emit(str(e))
+
+    def get_parameter(self, name):
+        try:
+            config = self.camera.get_config()
+            child = config.get_child_by_name(name)
+            return child.get_value()
+        except gp.GPhoto2Error as e:
+            self.errorOccurred.emit(str(e))
+            return None
+
+    def list_parameters(self):
+        params = {}
+        try:
+            config = self.camera.get_config()
+            for child in config.get_children():
+                params[child.get_name()] = child.get_value()
+        except gp.GPhoto2Error as e:
+            self.errorOccurred.emit(str(e))
+        return params

core/mock_gphoto.py

@@ -0,0 +1,64 @@
+import cv2
+import numpy as np
+
+class GPhoto2Error(Exception):
+    pass
+
+
+class CameraFileMock:
+    """Mock obiektu zwracanego przez gphoto2.Camera.capture_preview()"""
+
+    def __init__(self, frame: np.ndarray):
+        # Kodowanie do JPEG, żeby symulować prawdziwe dane z kamery
+        success, buf = cv2.imencode(".jpg", frame)
+        if not success:
+            raise GPhoto2Error("Nie udało się zakodować ramki testowej.")
+        self._data = buf.tobytes()
+
+    def get_data_and_size(self):
+        return self._data
+        return self._data, len(self._data)
+
+
+class Camera:
+    def __init__(self):
+        self._frame_counter = 0
+        self._running = False
+
+    def init(self):
+        self._running = True
+        print("[my_gphoto] Kamera MOCK zainicjalizowana")
+
+    def exit(self):
+        self._running = False
+        print("[my_gphoto] Kamera MOCK wyłączona")
+
+    def capture_preview(self):
+        if not self._running:
+            raise GPhoto2Error("Kamera MOCK nie jest uruchomiona")
+
+        # przykład 1: wczytaj stały obrazek z pliku
+        # frame = cv2.imread("test_frame.jpg")
+        # if frame is None:
+        #     raise GPhoto2Error("Nie znaleziono test_frame.jpg")
+
+        # przykład 2: wygeneruj kolorową planszę
+        h, w = 480, 640
+        color = (self._frame_counter % 255, 100, 200)
+        frame = np.full((h, w, 3), color, dtype=np.uint8)
+
+        # dodanie napisu
+        text = "OBRAZ TESTOWY"
+        font = cv2.FONT_HERSHEY_SIMPLEX
+        scale = 1.5
+        thickness = 3
+        color_text = (255, 255, 255)
+
+        (text_w, text_h), _ = cv2.getTextSize(text, font, scale, thickness)
+        x = (w - text_w) // 2
+        y = (h + text_h) // 2
+        cv2.putText(frame, text, (x, y), font, scale, color_text, thickness, cv2.LINE_AA)
+
+
+        self._frame_counter += 1
+        return CameraFileMock(frame)

core/opencv_adapter.py

@@ -0,0 +1,34 @@
+
+
+
+
+
+
+class OpenCVControlSource(BaseControlSource):
+    def __init__(self, cap: cv2.VideoCapture, parent=None):
+        super().__init__(parent)
+        self.cap = cap
+
+    def set_parameter(self, name, value):
+        prop_id = getattr(cv2, name, None)
+        if prop_id is None:
+            self.errorOccurred.emit(f"Nieznany parametr {name}")
+            return
+        self.cap.set(prop_id, value)
+        self.parameterChanged.emit(name, value)
+
+    def get_parameter(self, name):
+        prop_id = getattr(cv2, name, None)
+        if prop_id is None:
+            self.errorOccurred.emit(f"Nieznany parametr {name}")
+            return None
+        return self.cap.get(prop_id)
+
+    def list_parameters(self):
+        return {
+            "CAP_PROP_BRIGHTNESS": self.cap.get(cv2.CAP_PROP_BRIGHTNESS),
+            "CAP_PROP_CONTRAST": self.cap.get(cv2.CAP_PROP_CONTRAST),
+            "CAP_PROP_SATURATION": self.cap.get(cv2.CAP_PROP_SATURATION),
+            "CAP_PROP_GAIN": self.cap.get(cv2.CAP_PROP_GAIN),
+            "CAP_PROP_EXPOSURE": self.cap.get(cv2.CAP_PROP_EXPOSURE),
+        }

main.py

@@ -1,7 +1,6 @@
 import sys
 from PySide6.QtWidgets import QApplication
 
-from ui.main_palette import set_dark_theme
 from ui.main_window import MainWindow
 from controllers.main_controller import MainController
 
@@ -9,13 +8,10 @@ from controllers.main_controller import MainController
 
 def main():
     app = QApplication(sys.argv)
-    set_dark_theme(app)
-    # app.setStyle("Fusion")
+    app.setStyle("Fusion")
     window = MainWindow()
     controller = MainController(window)
     controller.load_colors()
-
-    app.aboutToQuit.connect(controller.shutdown)
     window.show()
     sys.exit(app.exec())
 

ui/main_palette.py

@@ -1,48 +0,0 @@
-import sys
-from PySide6.QtWidgets import QApplication
-from PySide6.QtGui import QPalette, QColor
-from PySide6.QtCore import Qt
-
-def set_dark_theme(app: QApplication):
-    """Definiuje i stosuje ciemną paletę kolorów do aplikacji."""
-    
-    # 1. Upewnij się, że styl jest ustawiony na "Fusion"
-    app.setStyle('Fusion')
-    
-    # 2. Definicja kolorów dla ciemnego motywu
-    palette = QPalette()
-    
-    # Kolory tła
-    DARK_GRAY = QColor(45, 45, 45)    # Ogólne tło okien i widżetów (Base, Window)
-    LIGHT_GRAY = QColor(53, 53, 53)   # Tło elementów, np. toolbara, menu (Window)
-    VERY_DARK_GRAY = QColor(32, 32, 32) # Kolor tła dla kontrolek (Button)
-    
-    # Kolory tekstu i obramowań
-    WHITE = QColor(200, 200, 200)    # Główny kolor tekstu (Text, WindowText)
-    HIGHLIGHT = QColor(66, 135, 245) # Kolor podświetlenia (Highlight)
-
-    # Ustawienie głównej palety
-    # palette.setColor(QPalette.ColorRole.Window, LIGHT_GRAY)
-    palette.setColor(QPalette.ColorRole.Window, VERY_DARK_GRAY)
-    palette.setColor(QPalette.ColorRole.WindowText, WHITE)
-    palette.setColor(QPalette.ColorRole.Base, DARK_GRAY)
-    palette.setColor(QPalette.ColorRole.AlternateBase, LIGHT_GRAY)
-    palette.setColor(QPalette.ColorRole.ToolTipBase, WHITE)
-    palette.setColor(QPalette.ColorRole.ToolTipText, WHITE)
-    palette.setColor(QPalette.ColorRole.Text, WHITE)
-    palette.setColor(QPalette.ColorRole.Button, VERY_DARK_GRAY)
-    palette.setColor(QPalette.ColorRole.ButtonText, WHITE)
-    palette.setColor(QPalette.ColorRole.BrightText, Qt.GlobalColor.red)
-    palette.setColor(QPalette.ColorRole.Link, QColor(42, 130, 218))
-    palette.setColor(QPalette.ColorRole.PlaceholderText, QColor(150, 150, 150))
-    
-    # Kolory zaznaczenia/interakcji
-    palette.setColor(QPalette.ColorRole.Highlight, HIGHLIGHT)
-    palette.setColor(QPalette.ColorRole.HighlightedText, Qt.GlobalColor.black)
-    
-    # Kontrolki wyłączone (Disabled)
-    # palette.setColor(QPalette.ColorRole.Disabled, QPalette.ColorGroup.Active, QPalette.ColorRole.Text, QColor(127, 127, 127))
-    # palette.setColor(QPalette.ColorRole.Disabled, QPalette.ColorGroup.Active, QPalette.ColorRole.ButtonText, QColor(127, 127, 127))
-
-    # 3. Zastosowanie palety do aplikacji
-    app.setPalette(palette)