Refactor 'elements' into layouts and widgets (#32)

Author: Conengmo

battle_map_tv/layouts/__init__.py

@@ -0,0 +1 @@
+

battle_map_tv/elements/widgets.py battle_map_tv/layouts/area_of_effect.pybattle_map_tv/elements/widgets.py renamed to battle_map_tv/layouts/area_of_effect.py

@@ -1,16 +1,12 @@
 from typing import Callable
 
-from PySide6.QtWidgets import QWidget
+from battle_map_tv.layouts.base import FixedRowGridLayout
+from battle_map_tv.widgets.buttons import ColorSelectionButton
 
-from battle_map_tv.elements.buttons import ColorSelectionButton
-from battle_map_tv.elements.layouts import FixedRowGridLayout
 
-
-class ColorSelectionWindow(QWidget):
+class ColorSelectionWindow(FixedRowGridLayout):
     def __init__(self, callback: Callable):
-        super().__init__()
-        grid = FixedRowGridLayout(rows=2)
-        self.setLayout(grid)
+        super().__init__(rows=2)
         self.colors = [
             "#ff3d00",
             "#48ABB4",
@@ -25,7 +21,7 @@ def __init__(self, callback: Callable):
         for color in self.colors:
             button = ColorSelectionButton(color=color)
             button.clicked.connect(self.create_color_selected_handler(color, callback))
-            grid.add_widget(button)
+            self.add_widget(button)
             self.buttons.append(button)
         self.selected_color: str
         self.buttons[-1].click()

battle_map_tv/elements/layouts.py battle_map_tv/layouts/base.pybattle_map_tv/elements/layouts.py renamed to battle_map_tv/layouts/base.py

@@ -1,7 +1,7 @@
 from PySide6.QtWidgets import QWidget, QVBoxLayout, QLabel, QHBoxLayout, QGridLayout, QSlider
 from PySide6.QtCore import Signal, Qt
 
-from battle_map_tv.elements.text_based import StyledLineEdit
+from battle_map_tv.widgets.text_based import StyledLineEdit
 
 
 class DualScaleSlider(QWidget):

battle_map_tv/elements/__init__.py battle_map_tv/widgets/__init__.pybattle_map_tv/elements/__init__.py renamed to battle_map_tv/widgets/__init__.py

@@ -12,12 +12,12 @@
 
 from battle_map_tv.area_of_effect import area_of_effect_shapes_to_class
 from battle_map_tv.events import global_event_dispatcher, EventKeys
-from battle_map_tv.elements import get_window_icon
-from battle_map_tv.elements.widgets import ColorSelectionWindow
-from battle_map_tv.elements.layouts import FixedRowGridLayout
-from battle_map_tv.elements.sliders import StyledSlider, DualScaleSlider
-from battle_map_tv.elements.buttons import StyledButton
-from battle_map_tv.elements.text_based import StyledTextEdit
+from battle_map_tv.widgets import get_window_icon
+from battle_map_tv.layouts.area_of_effect import ColorSelectionWindow
+from battle_map_tv.layouts.base import FixedRowGridLayout
+from battle_map_tv.widgets.sliders import StyledSlider, DualScaleSlider
+from battle_map_tv.widgets.buttons import StyledButton
+from battle_map_tv.widgets.text_based import StyledTextEdit
 from battle_map_tv.window_image import ImageWindow
 from battle_map_tv.grid import GridOverlayColor
 
@@ -197,7 +197,7 @@ def add_row_area_of_effect(self):
         container = self._create_container()
 
         color_selector = ColorSelectionWindow(callback=self.image_window.area_of_effect_set_color)
-        container.addWidget(color_selector)
+        container.addLayout(color_selector)
 
         def get_area_of_effect_callback(_shape: str, _button: StyledButton):
             def callback():

battle_map_tv/elements/buttons.py battle_map_tv/widgets/buttons.pybattle_map_tv/elements/buttons.py renamed to battle_map_tv/widgets/buttons.py

@@ -9,7 +9,7 @@
 from battle_map_tv.image import Image
 from battle_map_tv.initiative import InitiativeOverlayManager
 from battle_map_tv.storage import get_from_storage, StorageKeys, ImageKeys, get_image_from_storage
-from battle_map_tv.elements import get_window_icon
+from battle_map_tv.widgets import get_window_icon
 
 
 class ImageWindow(QGraphicsView):