Diffstat (limited to 'noncore/graphics/drawpad/drawpad.h') (more/less context) (ignore 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 | |||
@@ -19,5 +19,5 @@ | |||
19 | #include <qpen.h> | 19 | #include <qpen.h> |
20 | 20 | ||
21 | class DrawMode; | 21 | class Tool; |
22 | class DrawPadCanvas; | 22 | class DrawPadCanvas; |
23 | 23 | ||
@@ -35,15 +35,17 @@ public: | |||
35 | ~DrawPad(); | 35 | ~DrawPad(); |
36 | 36 | ||
37 | DrawMode* drawMode() { return m_pDrawMode; } | 37 | Tool* tool() { return m_pTool; } |
38 | QPen pen() { return m_pen; } | 38 | QPen pen() { return m_pen; } |
39 | QBrush brush() { return m_brush; } | 39 | QBrush brush() { return m_brush; } |
40 | 40 | ||
41 | private slots: | 41 | private slots: |
42 | void setPointDrawMode(); | 42 | void setPointTool(); |
43 | void setLineDrawMode(); | 43 | void setLineTool(); |
44 | void setRectangleDrawMode(); | 44 | void setRectangleTool(); |
45 | void setEllipseDrawMode(); | 45 | void setFilledRectangleTool(); |
46 | void setFillDrawMode(); | 46 | void setEllipseTool(); |
47 | void setEraseDrawMode(); | 47 | void setFilledEllipseTool(); |
48 | void setFillTool(); | ||
49 | void setEraseTool(); | ||
48 | 50 | ||
49 | void changePenWidth(int value); | 51 | void changePenWidth(int value); |
@@ -57,8 +59,11 @@ private slots: | |||
57 | void updateCaption(); | 59 | void updateCaption(); |
58 | 60 | ||
61 | void importPage(); | ||
62 | void exportPage(); | ||
63 | |||
59 | private: | 64 | private: |
60 | DrawPadCanvas* m_pDrawPadCanvas; | 65 | DrawPadCanvas* m_pDrawPadCanvas; |
61 | 66 | ||
62 | DrawMode* m_pDrawMode; | 67 | Tool* m_pTool; |
63 | QPen m_pen; | 68 | QPen m_pen; |
64 | QBrush m_brush; | 69 | QBrush m_brush; |
@@ -72,11 +77,15 @@ private: | |||
72 | QAction* m_pLastPageAction; | 77 | QAction* m_pLastPageAction; |
73 | 78 | ||
74 | QAction* m_pPointDrawModeAction; | 79 | QAction* m_pPointToolAction; |
75 | QAction* m_pLineDrawModeAction; | 80 | QAction* m_pLineToolAction; |
76 | QAction* m_pRectangleDrawModeAction; | 81 | QAction* m_pRectangleToolAction; |
77 | QAction* m_pEllipseDrawModeAction; | 82 | QAction* m_pFilledRectangleToolAction; |
78 | QAction* m_pFillDrawModeAction; | 83 | QAction* m_pEllipseToolAction; |
79 | QAction* m_pEraseDrawModeAction; | 84 | QAction* m_pFilledEllipseToolAction; |
80 | 85 | QAction* m_pFillToolAction; | |
86 | QAction* m_pEraseToolAction; | ||
87 | |||
88 | QToolButton* m_pRectangleToolButton; | ||
89 | QToolButton* m_pEllipseToolButton; | ||
81 | QToolButton* m_pPenColorToolButton; | 90 | QToolButton* m_pPenColorToolButton; |
82 | QToolButton* m_pBrushColorToolButton; | 91 | QToolButton* m_pBrushColorToolButton; |