X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fqg_dialogfactory.h;h=c2d08c64d20092be9594ead5c50192201e81bdfe;hb=d774c2655ba2c3657a565f325411144452392277;hp=5fff2cf87fc3b307ca418cde77d05fa5645622a7;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/widgets/qg_dialogfactory.h b/src/widgets/qg_dialogfactory.h
index 5fff2cf..c2d08c6 100644
--- a/src/widgets/qg_dialogfactory.h
+++ b/src/widgets/qg_dialogfactory.h
@@ -6,15 +6,17 @@
 #include "vector.h"
 #include "rs_debug.h"
 
+class ActionInterface;
 class CadToolBar;
-class CoordinateWidget;
-class SelectionWidget;
-class MouseWidget;
 class CommandWidget;
-class QG_MainWindowInterface;
+class CoordinateWidget;
 class RS_Document;
+class GraphicView;
+class QG_MainWindowInterface;
+class MouseWidget;
+class SelectionWidget;
 
-#define QG_DIALOGFACTORY (RS_DialogFactory::instance()->getFactoryObject()->isAdapter()==false ? ((QG_DialogFactory*)RS_DialogFactory::instance()->getFactoryObject()) : NULL)
+#define QG_DIALOGFACTORY (RS_DialogFactory::instance()->getFactoryObject()->isAdapter() == false ? ((QG_DialogFactory *)RS_DialogFactory::instance()->getFactoryObject()) : NULL)
 
 // !A_WIDGET
 /**
@@ -24,11 +26,11 @@ class RS_Document;
 class QG_DialogFactory: public RS_DialogFactoryInterface
 {
 	public:
-		QG_DialogFactory(QWidget * parent, QWidget * ow);
+		QG_DialogFactory(QWidget * parent, QToolBar * ow);
 		virtual ~QG_DialogFactory();
 
 	protected:
-		virtual void setOptionWidget(QWidget * ow);
+		virtual void setOptionWidget(QToolBar * ow);
 
 	public:
 		virtual void setCoordinateWidget(CoordinateWidget * cw);
@@ -41,7 +43,7 @@ class QG_DialogFactory: public RS_DialogFactoryInterface
 		virtual void setMainWindow(QG_MainWindowInterface * mw);
 		virtual void requestWarningDialog(const QString& warning);
 
-		virtual RS_GraphicView * requestNewDocument(const QString& fileName = QString::null,
+		virtual GraphicView * requestNewDocument(const QString & fileName = QString::null,
 			RS_Document * doc = NULL);
 		virtual void requestSimulationControls();
 
@@ -58,40 +60,40 @@ class QG_DialogFactory: public RS_DialogFactoryInterface
 		//virtual QString requestFileOpenDialog();
 
 		virtual QString requestImageOpenDialog();
-		virtual void requestOptions(RS_ActionInterface * action, bool on, bool update = false);
+		virtual void requestOptions(ActionInterface * action, bool on, bool update = false);
 
 	protected:
-		virtual void requestPrintPreviewOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestLineOptions(RS_ActionInterface * action, bool on);
-		virtual void requestPolylineOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestLineAngleOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestLineRelAngleOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestLineParallelOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestLineParallelThroughOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestLineBisectorOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestLinePolygonOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestLinePolygon2Options(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestArcOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestArcTangentialOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestCircleOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestSplineOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestTextOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestDimensionOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestDimLinearOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestInsertOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestImageOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestTrimAmountOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestMoveRotateOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestBevelOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestRoundOptions(RS_ActionInterface * action, bool on, bool update);
-		virtual void requestLibraryInsertOptions(RS_ActionInterface * action, bool on, bool update);
+		virtual void requestPrintPreviewOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestLineOptions(ActionInterface * action, bool on);
+		virtual void requestPolylineOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestLineAngleOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestLineRelAngleOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestLineParallelOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestLineParallelThroughOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestLineBisectorOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestLinePolygonOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestLinePolygon2Options(ActionInterface * action, bool on, bool update);
+		virtual void requestArcOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestArcTangentialOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestCircleOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestSplineOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestTextOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestDimensionOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestDimLinearOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestInsertOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestImageOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestTrimAmountOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestMoveRotateOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestBevelOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestRoundOptions(ActionInterface * action, bool on, bool update);
+		virtual void requestLibraryInsertOptions(ActionInterface * action, bool on, bool update);
 
 	public:
 		virtual void requestSnapDistOptions(double& dist, bool on);
 
 	public:
 		virtual void requestToolBar(RS2::ToolBarId id);
-		virtual void requestToolBarSelect(RS_ActionInterface * selectAction, RS2::ActionType nextAction);
+		virtual void requestToolBarSelect(ActionInterface * selectAction, RS2::ActionType nextAction);
 
 		virtual bool requestAttributesDialog(RS_AttributesData & data, RS_LayerList & layerList);
 		virtual bool requestMoveDialog(RS_MoveData & data);
@@ -106,11 +108,11 @@ class QG_DialogFactory: public RS_DialogFactoryInterface
 		virtual bool requestHatchDialog(RS_Hatch * hatch);
 
 #ifdef RS_CAM
-		virtual bool requestCamOptionsDialog(RS_Graphic & graphic);
+		virtual bool requestCamOptionsDialog(Drawing & graphic);
 #endif
 
 		virtual void requestOptionsGeneralDialog();
-		virtual void requestOptionsDrawingDialog(RS_Graphic & graphic);
+		virtual void requestOptionsDrawingDialog(Drawing & graphic);
 
 		virtual void requestPreviousMenu();
 
@@ -127,7 +129,7 @@ class QG_DialogFactory: public RS_DialogFactoryInterface
 		//! Pointer to the widget which can host dialogs
 		QWidget * parent;
 		//! Pointer to the widget which can host individual tool options
-		QWidget * optionWidget;
+		QToolBar * optionWidget;
 		//! Pointer to the coordinate widget.
 		CoordinateWidget * coordinateWidget;
 		//! Pointer to the mouse widget.