X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbar.h;h=2810f619b228d21a478976c5fdfaf0d5c6674680;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=52065fd95eb468452cbe60f98b3d801c5666453f;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/forms/cadtoolbar.h b/src/forms/cadtoolbar.h
index 52065fd..2810f61 100644
--- a/src/forms/cadtoolbar.h
+++ b/src/forms/cadtoolbar.h
@@ -1,10 +1,10 @@
 #ifndef __CADTOOLBAR_H__
 #define __CADTOOLBAR_H__
 
-#include "ui_cadtoolbar.h"
+#include <QtGui>
 
-class RS_ActionInterface;
-class QG_ActionHandler;
+class ActionInterface;
+class ActionHandler;
 class CadToolBarSplines;
 class CadToolBarInfo;
 class CadToolBarMain;
@@ -27,14 +27,14 @@ class CadToolBar: public QWidget
 		CadToolBar(QWidget * parent = 0, Qt::WindowFlags flags = 0);
 		~CadToolBar();
 
-		QG_ActionHandler * getActionHandler();
+		ActionHandler * getActionHandler();
 
 	public slots:
 		void back();
 		void forceNext();
 		void mouseReleaseEvent(QMouseEvent * e);
 		void contextMenuEvent(QContextMenuEvent * e);
-		void createSubToolBars(QG_ActionHandler * ah);
+		void createSubToolBars(ActionHandler * ah);
 		void showToolBar(int id);
 		void showToolBarMain();
 		void showToolBarPoints();
@@ -49,14 +49,16 @@ class CadToolBar: public QWidget
 		void showToolBarSnap();
 		void showToolBarDim();
 		void showToolBarSelect();
-		void showToolBarSelect(RS_ActionInterface * selectAction, int nextAction);
+		void showToolBarSelect(ActionInterface * selectAction, int nextAction);
+		QToolButton * CreateBackButton(QWidget *);
+		QToolButton * CreateToolButton(QAction * action);
 
 	signals:
 		void signalBack();
 		void signalNext();
 
 	protected:
-		QG_ActionHandler * actionHandler;
+		ActionHandler * actionHandler;
 		QWidget * currentTb;
 		CadToolBarSplines * tbSplines;
 		CadToolBarInfo * tbInfo;
@@ -71,9 +73,6 @@ class CadToolBar: public QWidget
 		CadToolBarSnap * tbSnap;
 		CadToolBarSelect * tbSelect;
 		CadToolBarPolylines * tbPolylines;
-
-	private:
-		Ui::CadToolBar ui;
 };
 
 #endif	// __CADTOOLBAR_H__