From 5c728478640c7d1ddeea826b16935daecbf53b0e Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Wed, 17 Sep 2025 16:22:04 -0500
Subject: [PATCH] Refasctoring brush 'events' to be under data and named as
 such, moved cbindings to libs

---
 src/data/{cbindings => events}/__init__.py                  | 0
 src/{widgets => data/events}/brushes/__init__.py            | 2 +-
 src/{widgets => data/events}/brushes/arrow.py               | 5 ++---
 .../brush_base.py => data/events/brushes/brush_event.py}    | 6 +++---
 src/{widgets => data/events}/brushes/circle.py              | 4 ++--
 src/{widgets => data/events}/brushes/erase.py               | 4 ++--
 src/{widgets => data/events}/brushes/grid.py                | 4 ++--
 src/{widgets => data/events}/brushes/line.py                | 5 ++---
 src/{widgets => data/events}/brushes/square.py              | 4 ++--
 src/data/{ => events}/event.py                              | 0
 src/libs/cbindings/__init__.py                              | 0
 .../cbindings/ctypes_cdll_example_not_working/compile.sh    | 0
 .../cbindings/ctypes_cdll_example_not_working/example.py    | 0
 .../pixels_to_cairo_surface.c                               | 0
 src/{data => libs}/cbindings/pixbuf2cairo.py                | 0
 .../cbindings/python_package_works/compile.sh               | 0
 .../cbindings/python_package_works/pixbuf2cairo.c           | 0
 src/{data => libs}/cbindings/python_package_works/setup.py  | 0
 src/widgets/draw_area.py                                    | 2 +-
 src/widgets/image_type_dialog.py                            | 2 +-
 src/widgets/surface.py                                      | 3 +--
 21 files changed, 19 insertions(+), 22 deletions(-)
 rename src/data/{cbindings => events}/__init__.py (100%)
 rename src/{widgets => data/events}/brushes/__init__.py (67%)
 rename src/{widgets => data/events}/brushes/arrow.py (93%)
 rename src/{widgets/brushes/brush_base.py => data/events/brushes/brush_event.py} (81%)
 rename src/{widgets => data/events}/brushes/circle.py (90%)
 rename src/{widgets => data/events}/brushes/erase.py (95%)
 rename src/{widgets => data/events}/brushes/grid.py (95%)
 rename src/{widgets => data/events}/brushes/line.py (93%)
 rename src/{widgets => data/events}/brushes/square.py (92%)
 rename src/data/{ => events}/event.py (100%)
 create mode 100644 src/libs/cbindings/__init__.py
 rename src/{data => libs}/cbindings/ctypes_cdll_example_not_working/compile.sh (100%)
 rename src/{data => libs}/cbindings/ctypes_cdll_example_not_working/example.py (100%)
 rename src/{data => libs}/cbindings/ctypes_cdll_example_not_working/pixels_to_cairo_surface.c (100%)
 rename src/{data => libs}/cbindings/pixbuf2cairo.py (100%)
 rename src/{data => libs}/cbindings/python_package_works/compile.sh (100%)
 rename src/{data => libs}/cbindings/python_package_works/pixbuf2cairo.c (100%)
 rename src/{data => libs}/cbindings/python_package_works/setup.py (100%)

diff --git a/src/data/cbindings/__init__.py b/src/data/events/__init__.py
similarity index 100%
rename from src/data/cbindings/__init__.py
rename to src/data/events/__init__.py
diff --git a/src/widgets/brushes/__init__.py b/src/data/events/brushes/__init__.py
similarity index 67%
rename from src/widgets/brushes/__init__.py
rename to src/data/events/brushes/__init__.py
index 4134dfc..8f4906d 100644
--- a/src/widgets/brushes/__init__.py
+++ b/src/data/events/brushes/__init__.py
@@ -1,4 +1,4 @@
-from .brush_base import BrushBase
+from .brush_event import BrushEvent
 from .grid import Grid
 from .arrow import Arrow
 from .line import Line
diff --git a/src/widgets/brushes/arrow.py b/src/data/events/brushes/arrow.py
similarity index 93%
rename from src/widgets/brushes/arrow.py
rename to src/data/events/brushes/arrow.py
index 0ace15d..17818ad 100644
--- a/src/widgets/brushes/arrow.py
+++ b/src/data/events/brushes/arrow.py
@@ -2,16 +2,15 @@
 
 # Lib imports
 import cairo
-import traceback
 
 # Application imports
 from data.point import Point
 from data.points import Points
 
-from . import BrushBase
+from . import BrushEvent
 
 
-class Arrow(BrushBase):
+class Arrow(BrushEvent):
     def __init__(self):
         super(Arrow, self).__init__()
 
diff --git a/src/widgets/brushes/brush_base.py b/src/data/events/brushes/brush_event.py
similarity index 81%
rename from src/widgets/brushes/brush_base.py
rename to src/data/events/brushes/brush_event.py
index 9fd8773..0d2c970 100644
--- a/src/widgets/brushes/brush_base.py
+++ b/src/data/events/brushes/brush_event.py
@@ -4,16 +4,16 @@
 import cairo
 
 # Application imports
-from data.event import Event
+from data.events.event import Event
 
 
 class UnboundException(Exception):
     ...
 
 
-class BrushBase(Event):
+class BrushEvent(Event):
     def __init__(self):
-        super(BrushBase, self).__init__()
+        super(BrushEvent, self).__init__()
 
         self.is_valid: bool = False
         self.size: int      = 12
diff --git a/src/widgets/brushes/circle.py b/src/data/events/brushes/circle.py
similarity index 90%
rename from src/widgets/brushes/circle.py
rename to src/data/events/brushes/circle.py
index 03b93ca..61a3a75 100644
--- a/src/widgets/brushes/circle.py
+++ b/src/data/events/brushes/circle.py
@@ -7,10 +7,10 @@ import cairo
 from data.point import Point
 from data.points import Points
 
-from . import BrushBase
+from . import BrushEvent
 
 
-class Circle(BrushBase):
+class Circle(BrushEvent):
     def __init__(self):
         super(Circle, self).__init__()
 
diff --git a/src/widgets/brushes/erase.py b/src/data/events/brushes/erase.py
similarity index 95%
rename from src/widgets/brushes/erase.py
rename to src/data/events/brushes/erase.py
index 706bfb7..08054df 100644
--- a/src/widgets/brushes/erase.py
+++ b/src/data/events/brushes/erase.py
@@ -7,10 +7,10 @@ import cairo
 from data.point import Point
 from data.points import Points
 
-from . import BrushBase
+from . import BrushEvent
 
 
-class Erase(BrushBase):
+class Erase(BrushEvent):
     def __init__(self):
         super(Erase, self).__init__()
 
diff --git a/src/widgets/brushes/grid.py b/src/data/events/brushes/grid.py
similarity index 95%
rename from src/widgets/brushes/grid.py
rename to src/data/events/brushes/grid.py
index a6cb9cb..a5812f7 100644
--- a/src/widgets/brushes/grid.py
+++ b/src/data/events/brushes/grid.py
@@ -4,10 +4,10 @@
 import cairo
 
 # Application imports
-from . import BrushBase
+from . import BrushEvent
 
 
-class Grid(BrushBase):
+class Grid(BrushEvent):
     def __init__(self):
         super(Grid, self).__init__()
 
diff --git a/src/widgets/brushes/line.py b/src/data/events/brushes/line.py
similarity index 93%
rename from src/widgets/brushes/line.py
rename to src/data/events/brushes/line.py
index a0be9f8..0d76360 100644
--- a/src/widgets/brushes/line.py
+++ b/src/data/events/brushes/line.py
@@ -2,16 +2,15 @@
 
 # Lib imports
 import cairo
-import traceback
 
 # Application imports
 from data.point import Point
 from data.points import Points
 
-from . import BrushBase
+from . import BrushEvent
 
 
-class Line(BrushBase):
+class Line(BrushEvent):
     def __init__(self):
         super(Line, self).__init__()
 
diff --git a/src/widgets/brushes/square.py b/src/data/events/brushes/square.py
similarity index 92%
rename from src/widgets/brushes/square.py
rename to src/data/events/brushes/square.py
index 713422a..12b3ab0 100644
--- a/src/widgets/brushes/square.py
+++ b/src/data/events/brushes/square.py
@@ -7,10 +7,10 @@ import cairo
 from data.point import Point
 from data.points import Points
 
-from . import BrushBase
+from . import BrushEvent
 
 
-class Square(BrushBase):
+class Square(BrushEvent):
     def __init__(self):
         super(Square, self).__init__()
 
diff --git a/src/data/event.py b/src/data/events/event.py
similarity index 100%
rename from src/data/event.py
rename to src/data/events/event.py
diff --git a/src/libs/cbindings/__init__.py b/src/libs/cbindings/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/data/cbindings/ctypes_cdll_example_not_working/compile.sh b/src/libs/cbindings/ctypes_cdll_example_not_working/compile.sh
similarity index 100%
rename from src/data/cbindings/ctypes_cdll_example_not_working/compile.sh
rename to src/libs/cbindings/ctypes_cdll_example_not_working/compile.sh
diff --git a/src/data/cbindings/ctypes_cdll_example_not_working/example.py b/src/libs/cbindings/ctypes_cdll_example_not_working/example.py
similarity index 100%
rename from src/data/cbindings/ctypes_cdll_example_not_working/example.py
rename to src/libs/cbindings/ctypes_cdll_example_not_working/example.py
diff --git a/src/data/cbindings/ctypes_cdll_example_not_working/pixels_to_cairo_surface.c b/src/libs/cbindings/ctypes_cdll_example_not_working/pixels_to_cairo_surface.c
similarity index 100%
rename from src/data/cbindings/ctypes_cdll_example_not_working/pixels_to_cairo_surface.c
rename to src/libs/cbindings/ctypes_cdll_example_not_working/pixels_to_cairo_surface.c
diff --git a/src/data/cbindings/pixbuf2cairo.py b/src/libs/cbindings/pixbuf2cairo.py
similarity index 100%
rename from src/data/cbindings/pixbuf2cairo.py
rename to src/libs/cbindings/pixbuf2cairo.py
diff --git a/src/data/cbindings/python_package_works/compile.sh b/src/libs/cbindings/python_package_works/compile.sh
similarity index 100%
rename from src/data/cbindings/python_package_works/compile.sh
rename to src/libs/cbindings/python_package_works/compile.sh
diff --git a/src/data/cbindings/python_package_works/pixbuf2cairo.c b/src/libs/cbindings/python_package_works/pixbuf2cairo.c
similarity index 100%
rename from src/data/cbindings/python_package_works/pixbuf2cairo.c
rename to src/libs/cbindings/python_package_works/pixbuf2cairo.c
diff --git a/src/data/cbindings/python_package_works/setup.py b/src/libs/cbindings/python_package_works/setup.py
similarity index 100%
rename from src/data/cbindings/python_package_works/setup.py
rename to src/libs/cbindings/python_package_works/setup.py
diff --git a/src/widgets/draw_area.py b/src/widgets/draw_area.py
index c7c8c1a..7a06b5b 100644
--- a/src/widgets/draw_area.py
+++ b/src/widgets/draw_area.py
@@ -14,10 +14,10 @@ from libs.surface_manager import SurfaceManager
 from libs.event_collection import EventCollection
 
 from data.mouse_buttons import MouseButton
+from data.events import brushes
 
 from .surface import Surface
 
-from . import brushes
 
 
 class DrawArea(Gtk.DrawingArea):
diff --git a/src/widgets/image_type_dialog.py b/src/widgets/image_type_dialog.py
index e4f7954..6e85131 100644
--- a/src/widgets/image_type_dialog.py
+++ b/src/widgets/image_type_dialog.py
@@ -14,7 +14,7 @@ from gi.repository import GdkPixbuf
 # Application imports
 from .controls.open_file_button import OpenFileButton
 from .file_label import FileLabel
-from data.cbindings import pixbuf2cairo
+from libs.cbindings import pixbuf2cairo
 
 
 class ImageTypeDialog(Gtk.Dialog):
diff --git a/src/widgets/surface.py b/src/widgets/surface.py
index 777d22a..88df917 100644
--- a/src/widgets/surface.py
+++ b/src/widgets/surface.py
@@ -3,11 +3,10 @@
 # Lib imports
 import cairo
 
-
 # Application imports
 from libs.history_manager import HistoryManager
 
-from data.event import Event
+from data.events.event import Event
 
 
 class Surface: