X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fqg_graphicview.h;h=7784ea977acfcd0289a60a4be526ef88bdd67f26;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=af3528c14be074f90dbbcd916cc46a4985d81c08;hpb=27d4a138d23453e93a833e9347444b828a971cb4;p=architektonas

diff --git a/src/widgets/qg_graphicview.h b/src/widgets/qg_graphicview.h
index af3528c..7784ea9 100644
--- a/src/widgets/qg_graphicview.h
+++ b/src/widgets/qg_graphicview.h
@@ -3,12 +3,10 @@
 
 #include <QtGui>
 #include "graphicview.h"
-#include "rs_layerlistlistener.h"
-#include "rs_blocklistlistener.h"
-#include "qg_scrollbar.h"
 
-class RS_Preview;
+class Document;
 class PaintInterface;
+class Preview;
 
 /**
  * This is the Qt implementation of a widget which can view a
@@ -17,14 +15,13 @@ class PaintInterface;
  * Instances of this class can be linked to layer lists using
  * addLayerListListener().
  */
-//class QG_GraphicView: public QWidget, public RS_GraphicView, //public Q3FilePreview,
-class QG_GraphicView: public QWidget, public GraphicView, //public Q3FilePreview,
-	public RS_LayerListListener, public RS_BlockListListener
+class QG_GraphicView: public QWidget, public GraphicView//, public Q3FilePreview
 {
 	Q_OBJECT
 
 	public:
 		QG_GraphicView(QWidget * parent = 0, const char * name = 0, Qt::WindowFlags f = 0);
+		QG_GraphicView(Document * doc, QWidget * parent = 0);
 		virtual ~QG_GraphicView();
 
 		virtual int getWidth();
@@ -32,14 +29,16 @@ class QG_GraphicView: public QWidget, public GraphicView, //public Q3FilePreview
 		virtual void redraw();
 		virtual void adjustOffsetControls();
 		virtual void adjustZoomControls();
-		virtual void setBackground(const RS_Color & bg);
+		virtual void setBackground(const Color & bg);
 		virtual void setMouseCursor(RS2::CursorType c);
 		virtual void updateGridStatusWidget(const QString & text);
 
-		// Methods from RS_LayerListListener Interface:
-		virtual void layerEdited(RS_Layer *);
-		virtual void layerRemoved(RS_Layer *);
-		virtual void layerToggled(RS_Layer *);
+// This is just crap. Why have a klunky listener interface when we have slots/signals???
+// That's what I thought!!!
+		// Methods from LayerListListener Interface:
+//		virtual void layerEdited(Layer *);
+//		virtual void layerRemoved(Layer *);
+//		virtual void layerToggled(Layer *);
 
 	protected:
 		virtual void emulateMouseMoveEvent();
@@ -61,23 +60,27 @@ class QG_GraphicView: public QWidget, public GraphicView, //public Q3FilePreview
 #warning "!!! File preview needs porting to Qt4 !!!"
 //		void previewUrl(const Q3Url &u);
 
+	private:
+		void CommonInitialization(void);
+
 	private slots:
 		void slotHScrolled(int value);
 		void slotVScrolled(int value);
 
-	private:
-#warning "!!! Double buffering is not necessary anymore !!!"
-		//! Buffer for double-buffering
-		QPixmap * buffer;
+//	private:
+//#warning "!!! Double buffering is not necessary anymore !!!"
+//		//! Buffer for double-buffering
+//		QPixmap * buffer;
 //		int refCount;
 
+#if 0
 	protected:
 		int lastWidth;
 		int lastHeight;
 		//! Horizontal scrollbar.
-		QG_ScrollBar * hScrollBar;
+		QScrollBar * hScrollBar;
 		//! Vertical scrollbar.
-		QG_ScrollBar * vScrollBar;
+		QScrollBar * vScrollBar;
 		//! Layout used to fit in the view and the scrollbars.
 		QGridLayout * layout;
 		//! Label for grid spacing.
@@ -92,6 +95,7 @@ class QG_GraphicView: public QWidget, public GraphicView, //public Q3FilePreview
 		QCursor * curMagnifier;
 		//! Hand mouse cursor
 		QCursor * curHand;
+#endif
 };
 
 #endif