Refactored CAD tool bars to use predefined actions.

[architektonas] / src / forms / cadtoolbarselect.h

diff --git a/src/forms/cadtoolbarselect.h b/src/forms/cadtoolbarselect.h
index 6ab02980992c6171b53aea4ff53ab80a6c457c46..434ce946069661c68b8f575e14a7fa8400b61bb0 100644 (file)
--- a/src/forms/cadtoolbarselect.h
+++ b/src/forms/cadtoolbarselect.h
@@ -1,7 +1,7 @@
 #ifndef __CADTOOLBARSELECT_H__
 #define __CADTOOLBARSELECT_H__
 
-#include "ui_cadtoolbarselect.h"
+#include <QtGui>
 
 class CadToolBar;
 class QG_ActionHandler;
@@ -12,38 +12,29 @@ 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(RS_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();
+               void runNextAction();
+
+       protected slots:
+               void back();
+
+       private:
+               QToolButton * CreateToolButton(QAction * action);
 
        protected:
-               QG_ActionHandler * actionHandler;
                CadToolBar * cadToolBar;
 
        private:
+               QToolButton * doit;
+               QG_ActionHandler * actionHandler;
                RS_ActionInterface * selectAction;
                int nextAction;
-
-       private:
-               Ui::CadToolBarSelect ui;
 };
 
 #endif // __CADTOOLBARSELECT_H__