X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=bd3e07e43307fe4d1256fa4898d70a683a243390;hb=921bf050ffe5fc81a9ab377e634180e659ee5d5d;hp=cd76d1e9aba034be6e7e93ce335280bc42e48530;hpb=59e5af9d8606aa091fa979e19f78e9325a1c0825;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index cd76d1e..bd3e07e 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -14,20 +14,23 @@ 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 SetCurrentLayer(int);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
+		void resizeEvent(QResizeEvent * event);
 		void mousePressEvent(QMouseEvent * event);
 		void mouseMoveEvent(QMouseEvent * event);
 		void mouseReleaseEvent(QMouseEvent * event);
+		void keyPressEvent(QKeyEvent * event);
+		void keyReleaseEvent(QKeyEvent * event);
 
 	private:
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
@@ -37,25 +40,23 @@ 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;