X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=c8e46ff627fe6fb70be0d860bbca4efa2c910ce8;hb=3c2db966e79e6437db75eebcff0bfc427f37c71b;hp=1e050e8f1d72917c14f487d8e306dffc0d5d7fbc;hpb=deb5512a6b35e73dc2c19ac4d2800cff87dd2e71;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 1e050e8..c8e46ff 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -5,6 +5,8 @@
 #include <stdint.h>
 #include "structs.h"
 
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
 class Painter;
 
 class DrawingView: public QWidget
@@ -19,22 +21,19 @@ class DrawingView: public QWidget
 		void UpdateGridBackground(void);
 		Point SnapPointToGrid(Point);
 		void RenderObjects(Painter *, std::vector<void *> &);
-		void DeleteSelectedItems(void);
-		void ClearSelection(void);
 		void AddHoveredToSelection(void);
 		void GetSelection(std::vector<void *> &);
 		void GetHovered(std::vector<void *> &);
-		void ToolMouse(int, Point);
+		void ToolHandler(int, Point);
 		void ToolDraw(Painter *);
 		void LineHandler(int, Point);
+		void CircleHandler(int, Point);
 		void RotateHandler(int, Point);
 		void CheckObjectBounds(void);
 		bool HitTestObjects(Point);
 		void HandleObjectMovement(Point);
 
 	public slots:
-		void AddNewObjectToDocument(Object *);
-		void HandleActionUpdate(void);
 		void SetCurrentLayer(int);
 
 	protected:
@@ -57,7 +56,6 @@ class DrawingView: public QWidget
 		uint32_t numHovered;
 		bool shiftDown;
 		bool ctrlDown;
-		bool overrideColor;
 
 	private:
 		QPixmap gridBackground;
@@ -70,11 +68,13 @@ class DrawingView: public QWidget
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
+		QString informativeText;
 
 	public:
 		std::vector<void *> select;
 		std::vector<void *> hover;
 		std::vector<void *> toolObjects;
+		std::vector<Object> toolScratch;
 		Point toolPoint[32];
 
 //	public: