-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp index 5d0c6e4..5b1aa7e 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.cpp +++ b/noncore/graphics/drawpad/drawpadcanvas.cpp | |||
@@ -176,9 +176,25 @@ void DrawPadCanvas::load(QIODevice* ioDevice) | |||
176 | 176 | ||
177 | xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler); | 177 | xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler); |
178 | xmlSimpleReader.parse(xmlInputSource); | 178 | xmlSimpleReader.parse(xmlInputSource); |
179 | 179 | ||
180 | m_pages = drawPadCanvasXmlHandler.pages(); | 180 | /* |
181 | * we could have loaded something from setDocument already | ||
182 | * due the delayed loading we need to make sure we do | ||
183 | * not lose pages | ||
184 | */ | ||
185 | if ( !m_pages.isEmpty() ) { | ||
186 | QList<Page> pages = drawPadCanvasXmlHandler.pages(); | ||
187 | QListIterator<Page> it( pages ); | ||
188 | Page *p; | ||
189 | while ( ( p = it.current() ) ) { | ||
190 | ++it; | ||
191 | m_pages.append( p ); | ||
192 | } | ||
193 | }else | ||
194 | m_pages = drawPadCanvasXmlHandler.pages(); | ||
195 | |||
196 | |||
181 | 197 | ||
182 | if (m_pages.isEmpty()) { | 198 | if (m_pages.isEmpty()) { |
183 | m_pages.append(new Page("", | 199 | m_pages.append(new Page("", |
184 | clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0), | 200 | clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0), |
@@ -193,8 +209,15 @@ void DrawPadCanvas::load(QIODevice* ioDevice) | |||
193 | } | 209 | } |
194 | 210 | ||
195 | void DrawPadCanvas::initialPage() | 211 | void DrawPadCanvas::initialPage() |
196 | { | 212 | { |
213 | /* | ||
214 | * by setDocument we've set a page already so | ||
215 | * don't add an empty one. This comes due the delayed initialisation | ||
216 | */ | ||
217 | if (!m_pages.isEmpty() ) | ||
218 | return; | ||
219 | |||
197 | m_pages.append(new Page("", | 220 | m_pages.append(new Page("", |
198 | clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0), | 221 | clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0), |
199 | clipper()->height()+(horizontalScrollBar()->isVisible()?horizontalScrollBar()->height():0))); | 222 | clipper()->height()+(horizontalScrollBar()->isVisible()?horizontalScrollBar()->height():0))); |
200 | //236, 232)); no more fixed sizes | 223 | //236, 232)); no more fixed sizes |