X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbarselect.h;h=4ba9aa155495b9feeaea9b1a9326157f764db512;hb=d774c2655ba2c3657a565f325411144452392277;hp=6ab02980992c6171b53aea4ff53ab80a6c457c46;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/forms/cadtoolbarselect.h b/src/forms/cadtoolbarselect.h
index 6ab0298..4ba9aa1 100644
--- a/src/forms/cadtoolbarselect.h
+++ b/src/forms/cadtoolbarselect.h
@@ -1,49 +1,31 @@
 #ifndef __CADTOOLBARSELECT_H__
 #define __CADTOOLBARSELECT_H__
 
-#include "ui_cadtoolbarselect.h"
+#include <QtGui>
 
 class CadToolBar;
 class QG_ActionHandler;
-class RS_ActionInterface;
+class ActionInterface;
 
 class CadToolBarSelect: public QWidget
 {
 	Q_OBJECT
 
 	public:
-		CadToolBarSelect(QWidget * parent = 0, Qt::WindowFlags flags = 0);
+		CadToolBarSelect(CadToolBar * parent, Qt::WindowFlags flags = 0);
 		~CadToolBarSelect();
 
+		void setSelectAction(ActionInterface * selectAction);
+		void setNextAction(int nextAction);
+
 	public slots:
-		virtual void mousePressEvent(QMouseEvent * e);
-		virtual void contextMenuEvent(QContextMenuEvent * e);
-		virtual void setCadToolBar(CadToolBar * tb);
-		virtual void selectSingle();
-		virtual void selectContour();
-		virtual void deselectAll();
-		virtual void selectAll();
-		virtual void selectWindow();
-		virtual void deselectWindow();
-		virtual void selectIntersected();
-		virtual void deselectIntersected();
-		virtual void selectInvert();
-		virtual void selectLayer();
-		virtual void setSelectAction(RS_ActionInterface * selectAction);
-		virtual void setNextAction(int nextAction);
-		virtual void runNextAction();
-		virtual void back();
-
-	protected:
-		QG_ActionHandler * actionHandler;
-		CadToolBar * cadToolBar;
+		void runNextAction();
 
 	private:
-		RS_ActionInterface * selectAction;
+		QToolButton * doit;
+		QG_ActionHandler * actionHandler;
+		ActionInterface * selectAction;
 		int nextAction;
-
-	private:
-		Ui::CadToolBarSelect ui;
 };
 
 #endif	// __CADTOOLBARSELECT_H__