Refasctoring brush 'events' to be under data and named as such, moved cbindings to libs

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

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__()
 

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

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__()
 

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__()
 

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__()
 

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__()
 

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__()
 

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):

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):

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: