author | leseb <leseb> | 2002-03-27 17:09:29 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-03-27 17:09:29 (UTC) |
commit | 4372bb8e59eb4b0d2fa5fba8f6525dc14873f239 (patch) (unidiff) | |
tree | 6947938ca5d22d3a373741ba3acfc20e8dd67729 /noncore/graphics/drawpad/drawpad.h | |
parent | fb056735d9a021787f83c6a791225a7ca70c1eb5 (diff) | |
download | opie-4372bb8e59eb4b0d2fa5fba8f6525dc14873f239.zip opie-4372bb8e59eb4b0d2fa5fba8f6525dc14873f239.tar.gz opie-4372bb8e59eb4b0d2fa5fba8f6525dc14873f239.tar.bz2 |
Import/export dialogs, improved new page dialog, new tools, ...
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 | |||
@@ -15,13 +15,13 @@ | |||
15 | #define DRAWPAD_H | 15 | #define DRAWPAD_H |
16 | 16 | ||
17 | #include <qmainwindow.h> | 17 | #include <qmainwindow.h> |
18 | 18 | ||
19 | #include <qpen.h> | 19 | #include <qpen.h> |
20 | 20 | ||
21 | class DrawMode; | 21 | class Tool; |
22 | class DrawPadCanvas; | 22 | class DrawPadCanvas; |
23 | 23 | ||
24 | class QAction; | 24 | class QAction; |
25 | class QColor; | 25 | class QColor; |
26 | class QToolButton; | 26 | class QToolButton; |
27 | class QWidgetStack; | 27 | class QWidgetStack; |
@@ -31,55 +31,64 @@ class DrawPad : public QMainWindow | |||
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | 32 | ||
33 | public: | 33 | public: |
34 | DrawPad(QWidget* parent = 0, const char* name = 0); | 34 | DrawPad(QWidget* parent = 0, const char* name = 0); |
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); |
50 | void changePenColor(const QColor& color); | 52 | void changePenColor(const QColor& color); |
51 | void changeBrushColor(const QColor& color); | 53 | void changeBrushColor(const QColor& color); |
52 | void choosePenColor(); | 54 | void choosePenColor(); |
53 | void chooseBrushColor(); | 55 | void chooseBrushColor(); |
54 | 56 | ||
55 | void updateUndoRedoToolButtons(); | 57 | void updateUndoRedoToolButtons(); |
56 | void updateNavigationToolButtons(); | 58 | void updateNavigationToolButtons(); |
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; |
65 | 70 | ||
66 | QAction* m_pUndoAction; | 71 | QAction* m_pUndoAction; |
67 | QAction* m_pRedoAction; | 72 | QAction* m_pRedoAction; |
68 | 73 | ||
69 | QAction* m_pFirstPageAction; | 74 | QAction* m_pFirstPageAction; |
70 | QAction* m_pPreviousPageAction; | 75 | QAction* m_pPreviousPageAction; |
71 | QAction* m_pNextPageAction; | 76 | QAction* m_pNextPageAction; |
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; |
83 | }; | 92 | }; |
84 | 93 | ||
85 | #endif // DRAWPAD_H | 94 | #endif // DRAWPAD_H |