Diffstat (limited to 'noncore/graphics/drawpad/drawpad.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp index f67bef8..e94187f 100644 --- a/noncore/graphics/drawpad/drawpad.cpp +++ b/noncore/graphics/drawpad/drawpad.cpp | |||
@@ -37,7 +37,5 @@ | |||
37 | 37 | ||
38 | DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | 38 | DrawPad::DrawPad(QWidget* parent, const char* name) |
39 | : QMainWindow(parent, name, f) | 39 | : QMainWindow(parent, name) |
40 | { | 40 | { |
41 | setCaption(tr("DrawPad")); | ||
42 | |||
43 | // init members | 41 | // init members |
@@ -45,12 +43,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | |||
45 | m_pDrawPadCanvas = new DrawPadCanvas(this, this); | 43 | m_pDrawPadCanvas = new DrawPadCanvas(this, this); |
44 | |||
46 | connect(m_pDrawPadCanvas, SIGNAL(pagesChanged()), this, SLOT(updateNavigationToolButtons())); | 45 | connect(m_pDrawPadCanvas, SIGNAL(pagesChanged()), this, SLOT(updateNavigationToolButtons())); |
46 | connect(m_pDrawPadCanvas, SIGNAL(pagesChanged()), this, SLOT(updateCaption())); | ||
47 | connect(m_pDrawPadCanvas, SIGNAL(pageBackupsChanged()), this, SLOT(updateUndoRedoToolButtons())); | 47 | connect(m_pDrawPadCanvas, SIGNAL(pageBackupsChanged()), this, SLOT(updateUndoRedoToolButtons())); |
48 | 48 | ||
49 | QFile file(Global::applicationFileName("drawpad", "drawpad.xml")); | ||
50 | |||
51 | if (file.open(IO_ReadOnly)) { | ||
52 | m_pDrawPadCanvas->load(&file); | ||
53 | file.close(); | ||
54 | } | ||
55 | |||
56 | setCentralWidget(m_pDrawPadCanvas); | 49 | setCentralWidget(m_pDrawPadCanvas); |
@@ -108,4 +101,2 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | |||
108 | 101 | ||
109 | updateUndoRedoToolButtons(); | ||
110 | |||
111 | m_pFirstPageAction = new QAction(tr("First Page"), Resource::loadIconSet("fastback"), QString::null, 0, this); | 102 | m_pFirstPageAction = new QAction(tr("First Page"), Resource::loadIconSet("fastback"), QString::null, 0, this); |
@@ -126,4 +117,2 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | |||
126 | 117 | ||
127 | updateNavigationToolButtons(); | ||
128 | |||
129 | // init draw mode toolbar | 118 | // init draw mode toolbar |
@@ -219,2 +208,13 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags f) | |||
219 | brushColorPopupMenu->activateItemAt(1); | 208 | brushColorPopupMenu->activateItemAt(1); |
209 | |||
210 | // init pages | ||
211 | |||
212 | QFile file(Global::applicationFileName("drawpad", "drawpad.xml")); | ||
213 | |||
214 | if (file.open(IO_ReadOnly)) { | ||
215 | m_pDrawPadCanvas->load(&file); | ||
216 | file.close(); | ||
217 | } else { | ||
218 | m_pDrawPadCanvas->initialPage(); | ||
219 | } | ||
220 | } | 220 | } |
@@ -381 +381,10 @@ void DrawPad::updateNavigationToolButtons() | |||
381 | } | 381 | } |
382 | |||
383 | void DrawPad::updateCaption() | ||
384 | { | ||
385 | uint pagePosition = m_pDrawPadCanvas->pagePosition(); | ||
386 | uint pageCount = m_pDrawPadCanvas->pageCount(); | ||
387 | |||
388 | setCaption(tr("DrawPad") + " - " + tr("Page") + " " | ||
389 | + QString::number(pagePosition) + "/" + QString::number(pageCount)); | ||
390 | } | ||