author | leseb <leseb> | 2002-03-27 17:09:29 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-03-27 17:09:29 (UTC) |
commit | 4372bb8e59eb4b0d2fa5fba8f6525dc14873f239 (patch) (side-by-side diff) | |
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 @@ #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 |