Diffstat (limited to 'noncore/graphics/drawpad/drawpad.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 81 |
1 files changed, 30 insertions, 51 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp index 3c593b6..5cc2197 100644 --- a/noncore/graphics/drawpad/drawpad.cpp +++ b/noncore/graphics/drawpad/drawpad.cpp | |||
@@ -41,6 +41,8 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | |||
41 | // init members | 41 | // init members |
42 | 42 | ||
43 | m_pDrawPadCanvas = new DrawPadCanvas(this, this); | 43 | m_pDrawPadCanvas = new DrawPadCanvas(this, this); |
44 | connect(m_pDrawPadCanvas, SIGNAL(pagesChanged()), this, SLOT(updateNavigationToolButtons())); | ||
45 | connect(m_pDrawPadCanvas, SIGNAL(pageBackupsChanged()), this, SLOT(updateUndoRedoToolButtons())); | ||
44 | 46 | ||
45 | QFile file(Global::applicationFileName("drawpad", "drawpad.xml")); | 47 | QFile file(Global::applicationFileName("drawpad", "drawpad.xml")); |
46 | 48 | ||
@@ -71,7 +73,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | |||
71 | QPopupMenu *toolsPopupMenu = new QPopupMenu(menuBar); | 73 | QPopupMenu *toolsPopupMenu = new QPopupMenu(menuBar); |
72 | 74 | ||
73 | QAction* clearAllAction = new QAction(tr("Clear All"), QString::null, 0, this); | 75 | QAction* clearAllAction = new QAction(tr("Clear All"), QString::null, 0, this); |
74 | connect(clearAllAction, SIGNAL(activated()), this, SLOT(clearAll())); | 76 | connect(clearAllAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(clearAll())); |
75 | clearAllAction->addTo(toolsPopupMenu); | 77 | clearAllAction->addTo(toolsPopupMenu); |
76 | 78 | ||
77 | toolsPopupMenu->insertSeparator(); | 79 | toolsPopupMenu->insertSeparator(); |
@@ -86,7 +88,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | |||
86 | QPEToolBar* pageToolBar = new QPEToolBar(this); | 88 | QPEToolBar* pageToolBar = new QPEToolBar(this); |
87 | 89 | ||
88 | QAction* newPageAction = new QAction(tr("New Page"), Resource::loadIconSet("new"), QString::null, 0, this); | 90 | QAction* newPageAction = new QAction(tr("New Page"), Resource::loadIconSet("new"), QString::null, 0, this); |
89 | connect(newPageAction, SIGNAL(activated()), this, SLOT(newPage())); | 91 | connect(newPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(newPage())); |
90 | newPageAction->addTo(pageToolBar); | 92 | newPageAction->addTo(pageToolBar); |
91 | 93 | ||
92 | QAction* clearPageAction = new QAction(tr("Clear Page"), Resource::loadIconSet("drawpad/clear"), QString::null, 0, this); | 94 | QAction* clearPageAction = new QAction(tr("Clear Page"), Resource::loadIconSet("drawpad/clear"), QString::null, 0, this); |
@@ -94,7 +96,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | |||
94 | clearPageAction->addTo(pageToolBar); | 96 | clearPageAction->addTo(pageToolBar); |
95 | 97 | ||
96 | QAction* deletePageAction = new QAction(tr("Delete Page"), Resource::loadIconSet("trash"), QString::null, 0, this); | 98 | QAction* deletePageAction = new QAction(tr("Delete Page"), Resource::loadIconSet("trash"), QString::null, 0, this); |
97 | connect(deletePageAction, SIGNAL(activated()), this, SLOT(deletePage())); | 99 | connect(deletePageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(deletePage())); |
98 | deletePageAction->addTo(pageToolBar); | 100 | deletePageAction->addTo(pageToolBar); |
99 | 101 | ||
100 | QPEToolBar* emptyToolBar = new QPEToolBar(this); | 102 | QPEToolBar* emptyToolBar = new QPEToolBar(this); |
@@ -104,23 +106,33 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | |||
104 | 106 | ||
105 | QPEToolBar* navigationToolBar = new QPEToolBar(this); | 107 | QPEToolBar* navigationToolBar = new QPEToolBar(this); |
106 | 108 | ||
109 | m_pUndoAction = new QAction(tr("Undo"), Resource::loadIconSet("drawpad/undo"), QString::null, 0, this); | ||
110 | connect(m_pUndoAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(undo())); | ||
111 | m_pUndoAction->addTo(navigationToolBar); | ||
112 | |||
113 | m_pRedoAction = new QAction(tr("Redo"), Resource::loadIconSet("drawpad/redo"), QString::null, 0, this); | ||
114 | connect(m_pRedoAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(redo())); | ||
115 | m_pRedoAction->addTo(navigationToolBar); | ||
116 | |||
117 | updateUndoRedoToolButtons(); | ||
118 | |||
107 | m_pFirstPageAction = new QAction(tr("First Page"), Resource::loadIconSet("fastback"), QString::null, 0, this); | 119 | m_pFirstPageAction = new QAction(tr("First Page"), Resource::loadIconSet("fastback"), QString::null, 0, this); |
108 | connect(m_pFirstPageAction, SIGNAL(activated()), this, SLOT(goFirstPage())); | 120 | connect(m_pFirstPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goFirstPage())); |
109 | m_pFirstPageAction->addTo(navigationToolBar); | 121 | m_pFirstPageAction->addTo(navigationToolBar); |
110 | 122 | ||
111 | m_pPreviousPageAction = new QAction(tr("Previous Page"), Resource::loadIconSet("back"), QString::null, 0, this); | 123 | m_pPreviousPageAction = new QAction(tr("Previous Page"), Resource::loadIconSet("back"), QString::null, 0, this); |
112 | connect(m_pPreviousPageAction, SIGNAL(activated()), this, SLOT(goPreviousPage())); | 124 | connect(m_pPreviousPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goPreviousPage())); |
113 | m_pPreviousPageAction->addTo(navigationToolBar); | 125 | m_pPreviousPageAction->addTo(navigationToolBar); |
114 | 126 | ||
115 | m_pNextPageAction = new QAction(tr("Next Page"), Resource::loadIconSet("forward"), QString::null, 0, this); | 127 | m_pNextPageAction = new QAction(tr("Next Page"), Resource::loadIconSet("forward"), QString::null, 0, this); |
116 | connect(m_pNextPageAction, SIGNAL(activated()), this, SLOT(goNextPage())); | 128 | connect(m_pNextPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goNextPage())); |
117 | m_pNextPageAction->addTo(navigationToolBar); | 129 | m_pNextPageAction->addTo(navigationToolBar); |
118 | 130 | ||
119 | m_pLastPageAction = new QAction(tr("Last Page"), Resource::loadIconSet("fastforward"), QString::null, 0, this); | 131 | m_pLastPageAction = new QAction(tr("Last Page"), Resource::loadIconSet("fastforward"), QString::null, 0, this); |
120 | connect(m_pLastPageAction, SIGNAL(activated()), this, SLOT(goLastPage())); | 132 | connect(m_pLastPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goLastPage())); |
121 | m_pLastPageAction->addTo(navigationToolBar); | 133 | m_pLastPageAction->addTo(navigationToolBar); |
122 | 134 | ||
123 | updateNavigationToolBar(); | 135 | updateNavigationToolButtons(); |
124 | 136 | ||
125 | // init draw mode toolbar | 137 | // init draw mode toolbar |
126 | 138 | ||
@@ -161,6 +173,9 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | |||
161 | 173 | ||
162 | emptyToolBar = new QPEToolBar(this); | 174 | emptyToolBar = new QPEToolBar(this); |
163 | emptyToolBar->setHorizontalStretchable(true); | 175 | emptyToolBar->setHorizontalStretchable(true); |
176 | emptyToolBar->addSeparator(); | ||
177 | |||
178 | // init draw parameters toolbar | ||
164 | 179 | ||
165 | QPEToolBar* drawParametersToolBar = new QPEToolBar(this); | 180 | QPEToolBar* drawParametersToolBar = new QPEToolBar(this); |
166 | 181 | ||
@@ -218,48 +233,6 @@ DrawPad::~DrawPad() | |||
218 | } | 233 | } |
219 | } | 234 | } |
220 | 235 | ||
221 | void DrawPad::clearAll() | ||
222 | { | ||
223 | m_pDrawPadCanvas->clearAll(); | ||
224 | updateNavigationToolBar(); | ||
225 | } | ||
226 | |||
227 | void DrawPad::newPage() | ||
228 | { | ||
229 | m_pDrawPadCanvas->newPage(); | ||
230 | updateNavigationToolBar(); | ||
231 | } | ||
232 | |||
233 | void DrawPad::deletePage() | ||
234 | { | ||
235 | m_pDrawPadCanvas->deletePage(); | ||
236 | updateNavigationToolBar(); | ||
237 | } | ||
238 | |||
239 | void DrawPad::goFirstPage() | ||
240 | { | ||
241 | m_pDrawPadCanvas->goFirstPage(); | ||
242 | updateNavigationToolBar(); | ||
243 | } | ||
244 | |||
245 | void DrawPad::goPreviousPage() | ||
246 | { | ||
247 | m_pDrawPadCanvas->goPreviousPage(); | ||
248 | updateNavigationToolBar(); | ||
249 | } | ||
250 | |||
251 | void DrawPad::goNextPage() | ||
252 | { | ||
253 | m_pDrawPadCanvas->goNextPage(); | ||
254 | updateNavigationToolBar(); | ||
255 | } | ||
256 | |||
257 | void DrawPad::goLastPage() | ||
258 | { | ||
259 | m_pDrawPadCanvas->goLastPage(); | ||
260 | updateNavigationToolBar(); | ||
261 | } | ||
262 | |||
263 | void DrawPad::setPointDrawMode() | 236 | void DrawPad::setPointDrawMode() |
264 | { | 237 | { |
265 | if (m_pDrawMode) { | 238 | if (m_pDrawMode) { |
@@ -381,7 +354,13 @@ void DrawPad::changeBrushColor(int index) | |||
381 | painter.end(); | 354 | painter.end(); |
382 | } | 355 | } |
383 | 356 | ||
384 | void DrawPad::updateNavigationToolBar() | 357 | void DrawPad::updateUndoRedoToolButtons() |
358 | { | ||
359 | m_pUndoAction->setEnabled(m_pDrawPadCanvas->undoEnabled()); | ||
360 | m_pRedoAction->setEnabled(m_pDrawPadCanvas->redoEnabled()); | ||
361 | } | ||
362 | |||
363 | void DrawPad::updateNavigationToolButtons() | ||
385 | { | 364 | { |
386 | m_pFirstPageAction->setEnabled(m_pDrawPadCanvas->goPreviousPageEnabled()); | 365 | m_pFirstPageAction->setEnabled(m_pDrawPadCanvas->goPreviousPageEnabled()); |
387 | m_pPreviousPageAction->setEnabled(m_pDrawPadCanvas->goPreviousPageEnabled()); | 366 | m_pPreviousPageAction->setEnabled(m_pDrawPadCanvas->goPreviousPageEnabled()); |