X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=21220e88a99c4479e28a525ef481638204b480fe;hb=dbfab6256efe6b03e9750e33081d9dcdcdfc1c34;hp=98b34b5681fab05569975ca3754ffd86777cb421;hpb=7b7c8ec7d7f5379e09a8b7392f465f41639b0c79;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 98b34b5..21220e8 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -14,19 +14,24 @@ 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 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 keyPressEvent(QKeyEvent * event);
+		void keyReleaseEvent(QKeyEvent * event);
 
 	private:
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
@@ -36,39 +41,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;
-		Action * toolAction;
-/*		QSize minimumSizeHint() const;
-		QSize sizeHint() const;
-
-	private:
-		void CreateCursors(void);
-		QPoint GetAdjustedMousePosition(QMouseEvent * event);
-		QPoint GetAdjustedClientPosition(int x, int y);
+//		bool addLineTool;
+//		bool addCircleTool;
+//		bool addDimensionTool;
 
-		QImage image;
-		QPoint pt, ptOffset, ptPrevious;
-		ToolType tool;							// Current tool
-		GlyphPoints pts;						// Glyph point structure
-		int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
-		bool polyFirstPoint;
+	public:
+		Action * toolAction;
 
-		ToolWindow * toolPalette;
-		QCursor cur[8];
-*/
+//	public:
+//		static Container document;
 };
 
 #endif	// __DRAWINGVIEW_H__
+