tool groups

Author: LunaTheFoxgirl

source/wsedit/tools/camera/package.d

@@ -0,0 +1,12 @@
+module wsedit.tools.camera;
+import wsedit.tools;
+
+public import wsedit.tools.camera.zonetool;
+
+class CameraGroup : ToolGroup {
+public:
+    this(Workspace workspace) {
+        super("Camera", "camera-video-symbolic", workspace);
+        tools = [new ZoneTool(workspace, this)];
+    }
+}

source/wsedit/tools/camera/zonetool.d

@@ -0,0 +1,22 @@
+module wsedit.tools.camera.zonetool;
+import wsedit.tools;
+
+/**
+    Select tool
+*/
+class ZoneTool : Tool {
+private:
+
+public:
+    this(Workspace workspace, ToolGroup group) {
+        super("Zone Tool", "edit-select-all-symbolic", group, workspace);
+    }
+    
+    override void draw(Renderer renderer) {
+    
+    }
+
+    override void update(Mouse mouse) {
+
+    }
+}

source/wsedit/tools/package.d

@@ -3,9 +3,8 @@ public import wsedit.workspace;
 public import wsedit.subsystem.wsrenderer;
 public import wsedit.subsystem.mouse;
 
-public import wsedit.tools.tiletool;
-public import wsedit.tools.selecttool;
-public import wsedit.tools.erasetool;
+public import wsedit.tools.tiles;
+public import wsedit.tools.camera;
 
 /**
     A tool provides functionality on the canvas
@@ -14,10 +13,11 @@ class Tool {
 protected:
     Workspace workspace;
 
-    this(string name, string iconName, Workspace workspace) {
+    this(string name, string iconName, ToolGroup parent, Workspace workspace) {
         this.name = name;
         this.iconName = iconName;
         this.workspace = workspace;
+        this.parent = parent;
     }
 
 public:
@@ -31,6 +31,11 @@ public:
     */
     immutable(string) iconName;
 
+    /**
+        The group this tool belongs to
+    */
+    ToolGroup parent;
+
     /**
         Draw tool related UI on to the canvas
         Selections, etc.
@@ -43,3 +48,31 @@ public:
     abstract void update(Mouse mouse);
 }
 
+/**
+    A group of tools
+*/
+class ToolGroup {
+protected:
+    Workspace workspace;
+
+    this(string name, string iconName, Workspace workspace) {
+        this.name = name;
+        this.iconName = iconName;
+        this.workspace = workspace;
+    }
+public:
+    /**
+        Name of the tool
+    */
+    immutable(string) name;
+
+    /**
+        Name of the tool's icon
+    */
+    immutable(string) iconName;
+
+    /**
+        Tools in the tool group
+    */
+    Tool[] tools;
+}

source/wsedit/tools/selecttool.d

@@ -1,4 +1,4 @@
-module wsedit.tools.erasetool;
+module wsedit.tools.tiles.erasetool;
 import wsedit.tools;
 import wsedit;
 import wsedit.fmt;
@@ -16,8 +16,8 @@ private:
 
 
 public:
-    this(Workspace workspace) {
-        super("Erase Tile", "edit-delete-symbolic", workspace);
+    this(Workspace workspace, ToolGroup group) {
+        super("Erase Tool", "edit-delete-symbolic", group, workspace);
     }
 
     override void draw(Renderer renderer) {

source/wsedit/tools/erasetool.d renamed to source/wsedit/tools/tiles/erasetool.d

@@ -0,0 +1,13 @@
+module wsedit.tools.tiles;
+import wsedit.tools;
+public import wsedit.tools.tiles.erasetool;
+public import wsedit.tools.tiles.tiletool;
+public import wsedit.tools.tiles.selecttool;
+
+class TileGroup : ToolGroup {
+public:
+    this(Workspace workspace) {
+        super("Tiles", "view-grid-symbolic", workspace);
+        tools = [new TileTool(workspace, this), new SelectTool(workspace, this), new EraseTool(workspace, this)];
+    }
+}

source/wsedit/tools/tiles/package.d

@@ -0,0 +1,22 @@
+module wsedit.tools.tiles.selecttool;
+import wsedit.tools;
+
+/**
+    Select tool
+*/
+class SelectTool : Tool {
+private:
+
+public:
+    this(Workspace workspace, ToolGroup group) {
+        super("Select Tool", "edit-select-all-symbolic", group, workspace);
+    }
+    
+    override void draw(Renderer renderer) {
+    
+    }
+
+    override void update(Mouse mouse) {
+
+    }
+}

source/wsedit/tools/tiles/selecttool.d

@@ -1,4 +1,4 @@
-module wsedit.tools.tiletool;
+module wsedit.tools.tiles.tiletool;
 import wsedit.tools;
 import wsedit;
 import wsedit.fmt;
@@ -16,8 +16,8 @@ private:
 
 
 public:
-    this(Workspace workspace) {
-        super("Tile", "view-grid-symbolic", workspace);
+    this(Workspace workspace, ToolGroup group) {
+        super("Tile Tool", "insert-object-symbolic", group, workspace);
     }
 
     override void draw(Renderer renderer) {