X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=704b79d357f60b1b610a0afbf4d802ea8f271fd1;hb=742d2aa9bb46bce4f690474fa22f5980e175e55e;hp=441b7a8eb61cecfd2b080bc636b11b00000faee8;hpb=9bf789d643e1885fee526a1d4d1e2648f02bbd86;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 441b7a8..704b79d 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -19,10 +19,6 @@ class DrawingView: public QWidget
 
 	public:
 		void DrawBackground(Painter *);
-		void SetGridSize(uint32_t);
-		void SetGridSize(double);
-		void UpdateGridBackground(void);
-		void UpdateGridBackgroundF(void);
 		Point SnapPointToGrid(Point);
 		Point SnapPointToAngle(Point);
 		void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
@@ -52,10 +48,12 @@ class DrawingView: public QWidget
 		void DeleteCurrentLayer(int);
 		void HandleLayerToggle(void);
 		void HandleLayerSwap(int, int);
+		void HandleLayerSwap(int, int, VPVector &);
 		void HandlePenWidth(float);
 		void HandlePenStyle(int);
 		void HandlePenColor(uint32_t);
-		void HandlePenStamp(void);
+		void HandlePenStamp(QAction *);
+		void HandlePenDropper(QAction *);
 
 	signals:
 		void ObjectHovered(Object *);
@@ -64,6 +62,7 @@ class DrawingView: public QWidget
 
 	protected:
 		void focusOutEvent(QFocusEvent * event);
+		void focusInEvent(QFocusEvent * event);
 		void paintEvent(QPaintEvent * event);
 		void resizeEvent(QResizeEvent * event);
 		void mousePressEvent(QMouseEvent * event);
@@ -89,6 +88,9 @@ class DrawingView: public QWidget
 		QPixmap gridBackground;
 		double scale;							// Window scaling factor
 		int32_t offsetX, offsetY;				// Window offsets
+		bool supressSelected;
+		QCursor curMarker;
+		QCursor curDropper;
 	public:
 		Container document;
 		uint32_t gridPixels;					// Grid size in pixels