X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=2cc4bcdac8676e0118e2214eff3f5c4ddfbb9e5b;hb=c58b8a9f8b1ae5494857fc423ed8e33b2bbcf329;hp=eaf8826f564e4d6ab747ed78bd61bb6044de6c8a;hpb=ef811c836c00cc94ce1eaea5c2e77e5278298b18;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index eaf8826..2cc4bcd 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -14,20 +14,25 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-		void SetRotateToolActive(bool state = true);
-		void SetAddLineToolActive(bool state = true);
-		void SetAddCircleToolActive(bool state = true);
-		void SetAddDimensionToolActive(bool state = true);
+//		void SetRotateToolActive(bool state = true);
+		void SetToolActive(Action * action);
+		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 
 	public slots:
 		void AddNewObjectToDocument(Object *);
+		void HandleActionUpdate(void);
+		void SetCurrentLayer(int);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
+		void resizeEvent(QResizeEvent * event);
 		void mousePressEvent(QMouseEvent * event);
 		void mouseMoveEvent(QMouseEvent * event);
 		void mouseReleaseEvent(QMouseEvent * event);
+		void wheelEvent(QWheelEvent * event);
+		void keyPressEvent(QKeyEvent * event);
+		void keyReleaseEvent(QKeyEvent * event);
 
 	private:
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
@@ -37,28 +42,30 @@ class DrawingView: public QWidget
 		bool useAntialiasing;
 
 	private:
-//		QBrush * backgroundBrush;
 		QPixmap gridBackground;
 		double scale;							// Window scaling factor
 		int32_t offsetX, offsetY;				// Window offsets
 	public:
 		Container document;
-		double gridSpacing;
+		uint32_t gridPixels;					// Grid size in pixels
 	private:
 		bool collided;
 //Should this go into Object's class variables???
-		bool rotateTool;
-		double rx, ry;
+//maybe, maybe not... :-P
+//		bool rotateTool;
+//		double rx, ry;
 		bool scrollDrag;
 		Vector oldPoint;
-		bool addLineTool;
-		bool addCircleTool;
-		bool addDimensionTool;
-		bool selectionInProgress;
-		QRectF selection;
+//		bool addLineTool;
+//		bool addCircleTool;
+//		bool addDimensionTool;
 
 	public:
 		Action * toolAction;
+
+//	public:
+//		static Container document;
 };
 
 #endif	// __DRAWINGVIEW_H__
+