Diffstat (limited to 'noncore/graphics/drawpad/drawpad.h') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/drawpad.h | 41 |
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 @@ -20,3 +20,3 @@ -class DrawMode; +class Tool; class DrawPadCanvas; @@ -36,3 +36,3 @@ public: - DrawMode* drawMode() { return m_pDrawMode; } + Tool* tool() { return m_pTool; } QPen pen() { return m_pen; } @@ -41,8 +41,10 @@ public: 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(); @@ -58,2 +60,5 @@ private slots: + void importPage(); + void exportPage(); + private: @@ -61,3 +66,3 @@ private: - DrawMode* m_pDrawMode; + Tool* m_pTool; QPen m_pen; @@ -73,9 +78,13 @@ private: - 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; |