1 files changed, 25 insertions, 16 deletions

diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h
index c49a559..fbe67b8 100644
--- a/noncore/graphics/drawpad/drawpad.h
+++ b/noncore/graphics/drawpad/drawpad.h
@@ -15,13 +15,13 @@
 #define DRAWPAD_H
 
 #include <qmainwindow.h>
 
 #include <qpen.h>
 
-class DrawMode;
+class Tool;
 class DrawPadCanvas;
 
 class QAction;
 class QColor;
 class QToolButton;
 class QWidgetStack;
@@ -31,55 +31,64 @@ class DrawPad : public QMainWindow
     Q_OBJECT
 
 public:
     DrawPad(QWidget* parent = 0, const char* name = 0);
     ~DrawPad();
 
-    DrawMode* drawMode() { return m_pDrawMode; }
+    Tool* tool() { return m_pTool; }
     QPen pen() { return m_pen; }
     QBrush brush() { return m_brush; }
 
 private slots:
-    void setPointDrawMode();
-    void setLineDrawMode();
-    void setRectangleDrawMode();
-    void setEllipseDrawMode();
-    void setFillDrawMode();
-    void setEraseDrawMode();
+    void setPointTool();
+    void setLineTool();
+    void setRectangleTool();
+    void setFilledRectangleTool();
+    void setEllipseTool();
+    void setFilledEllipseTool();
+    void setFillTool();
+    void setEraseTool();
 
     void changePenWidth(int value);
     void changePenColor(const QColor& color);
     void changeBrushColor(const QColor& color);
     void choosePenColor();
     void chooseBrushColor();
 
     void updateUndoRedoToolButtons();
     void updateNavigationToolButtons();
     void updateCaption();
 
+    void importPage();
+    void exportPage();
+
 private:
     DrawPadCanvas* m_pDrawPadCanvas;
 
-    DrawMode* m_pDrawMode;
+    Tool* m_pTool;
     QPen m_pen;
     QBrush m_brush;
 
     QAction* m_pUndoAction;
     QAction* m_pRedoAction;
 
     QAction* m_pFirstPageAction;
     QAction* m_pPreviousPageAction;
     QAction* m_pNextPageAction;
     QAction* m_pLastPageAction;
 
-    QAction* m_pPointDrawModeAction;
-    QAction* m_pLineDrawModeAction;
-    QAction* m_pRectangleDrawModeAction;
-    QAction* m_pEllipseDrawModeAction;
-    QAction* m_pFillDrawModeAction;
-    QAction* m_pEraseDrawModeAction;
-
+    QAction* m_pPointToolAction;
+    QAction* m_pLineToolAction;
+    QAction* m_pRectangleToolAction;
+    QAction* m_pFilledRectangleToolAction;
+    QAction* m_pEllipseToolAction;
+    QAction* m_pFilledEllipseToolAction;
+    QAction* m_pFillToolAction;
+    QAction* m_pEraseToolAction;
+
+    QToolButton* m_pRectangleToolButton;
+    QToolButton* m_pEllipseToolButton;
     QToolButton* m_pPenColorToolButton;
     QToolButton* m_pBrushColorToolButton;
 };
 
 #endif // DRAWPAD_H