-rw-r--r-- | apps/Applications/drawpad.desktop | 2 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/Applications/drawpad.desktop b/apps/Applications/drawpad.desktop index 831858b..d4ba9ad 100644 --- a/apps/Applications/drawpad.desktop +++ b/apps/Applications/drawpad.desktop | |||
@@ -1,6 +1,6 @@ | |||
1 | [Desktop Entry] | 1 | [Desktop Entry] |
2 | Comment=A Drawing Program | 2 | Comment=A Note Taking Program |
3 | Exec=drawpad | 3 | Exec=drawpad |
4 | Icon=drawpad/DrawPad | 4 | Icon=drawpad/DrawPad |
5 | Type=Application | 5 | Type=Application |
6 | Name=DrawPad | 6 | Name=DrawPad |
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp index 21ef15c..3ddd7b7 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.cpp +++ b/noncore/graphics/drawpad/drawpadcanvas.cpp | |||
@@ -137,129 +137,129 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch) | |||
137 | if (m_dataFormat == "XPM") { | 137 | if (m_dataFormat == "XPM") { |
138 | if (m_dataLenght < ch.length() * 5) { | 138 | if (m_dataLenght < ch.length() * 5) { |
139 | m_dataLenght = ch.length() * 5; | 139 | m_dataLenght = ch.length() * 5; |
140 | } | 140 | } |
141 | 141 | ||
142 | QByteArray byteArrayUnzipped(m_dataLenght); | 142 | QByteArray byteArrayUnzipped(m_dataLenght); |
143 | ::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size()); | 143 | ::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size()); |
144 | 144 | ||
145 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat); | 145 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat); |
146 | } else { | 146 | } else { |
147 | image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat); | 147 | image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat); |
148 | } | 148 | } |
149 | 149 | ||
150 | QPixmap* pixmap = new QPixmap(image.width(), image.height()); | 150 | QPixmap* pixmap = new QPixmap(image.width(), image.height()); |
151 | pixmap->convertFromImage(image); | 151 | pixmap->convertFromImage(image); |
152 | m_pixmaps.append(pixmap); | 152 | m_pixmaps.append(pixmap); |
153 | } | 153 | } |
154 | 154 | ||
155 | return true; | 155 | return true; |
156 | } | 156 | } |
157 | 157 | ||
158 | DrawPadCanvas::DrawPadCanvas(DrawPad* drawPad, QWidget* parent, const char* name) | 158 | DrawPadCanvas::DrawPadCanvas(DrawPad* drawPad, QWidget* parent, const char* name) |
159 | : QScrollView(parent, name) | 159 | : QScrollView(parent, name) |
160 | { | 160 | { |
161 | m_pDrawPad = drawPad; | 161 | m_pDrawPad = drawPad; |
162 | m_pages.setAutoDelete(true); | 162 | m_pages.setAutoDelete(true); |
163 | m_pageBackups.setAutoDelete(true); | 163 | m_pageBackups.setAutoDelete(true); |
164 | } | 164 | } |
165 | 165 | ||
166 | DrawPadCanvas::~DrawPadCanvas() | 166 | DrawPadCanvas::~DrawPadCanvas() |
167 | { | 167 | { |
168 | } | 168 | } |
169 | 169 | ||
170 | void DrawPadCanvas::load(QIODevice* ioDevice) | 170 | void DrawPadCanvas::load(QIODevice* ioDevice) |
171 | { | 171 | { |
172 | QTextStream textStream(ioDevice); | 172 | QTextStream textStream(ioDevice); |
173 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); | 173 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); |
174 | 174 | ||
175 | QXmlInputSource xmlInputSource(textStream); | 175 | QXmlInputSource xmlInputSource(textStream); |
176 | QXmlSimpleReader xmlSimpleReader; | 176 | QXmlSimpleReader xmlSimpleReader; |
177 | DrawPadCanvasXmlHandler drawPadCanvasXmlHandler; | 177 | DrawPadCanvasXmlHandler drawPadCanvasXmlHandler; |
178 | 178 | ||
179 | xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler); | 179 | xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler); |
180 | xmlSimpleReader.parse(xmlInputSource); | 180 | xmlSimpleReader.parse(xmlInputSource); |
181 | 181 | ||
182 | m_pages = drawPadCanvasXmlHandler.pixmaps(); | 182 | m_pages = drawPadCanvasXmlHandler.pixmaps(); |
183 | 183 | ||
184 | if (m_pages.isEmpty()) { | 184 | if (m_pages.isEmpty()) { |
185 | m_pages.append(new QPixmap(contentsRect().size())); | 185 | m_pages.append(new QPixmap(contentsRect().size())); |
186 | m_pages.current()->fill(Qt::white); | 186 | m_pages.current()->fill(Qt::white); |
187 | } | 187 | } |
188 | 188 | ||
189 | m_pageBackups.clear(); | 189 | m_pageBackups.clear(); |
190 | m_pageBackups.append(new QPixmap(*(m_pages.current()))); | 190 | m_pageBackups.append(new QPixmap(*(m_pages.current()))); |
191 | 191 | ||
192 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 192 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
193 | viewport()->update(); | 193 | viewport()->update(); |
194 | 194 | ||
195 | emit pagesChanged(); | 195 | emit pagesChanged(); |
196 | emit pageBackupsChanged(); | 196 | emit pageBackupsChanged(); |
197 | } | 197 | } |
198 | 198 | ||
199 | void DrawPadCanvas::initialPage() | 199 | void DrawPadCanvas::initialPage() |
200 | { | 200 | { |
201 | m_pages.append(new QPixmap(234, 233)); | 201 | m_pages.append(new QPixmap(236, 232)); |
202 | m_pages.current()->fill(Qt::white); | 202 | m_pages.current()->fill(Qt::white); |
203 | 203 | ||
204 | m_pageBackups.clear(); | 204 | m_pageBackups.clear(); |
205 | m_pageBackups.append(new QPixmap(*(m_pages.current()))); | 205 | m_pageBackups.append(new QPixmap(*(m_pages.current()))); |
206 | 206 | ||
207 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 207 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
208 | viewport()->update(); | 208 | viewport()->update(); |
209 | 209 | ||
210 | emit pagesChanged(); | 210 | emit pagesChanged(); |
211 | emit pageBackupsChanged(); | 211 | emit pageBackupsChanged(); |
212 | } | 212 | } |
213 | 213 | ||
214 | void DrawPadCanvas::save(QIODevice* ioDevice) | 214 | void DrawPadCanvas::save(QIODevice* ioDevice) |
215 | { | 215 | { |
216 | QTextStream textStream(ioDevice); | 216 | QTextStream textStream(ioDevice); |
217 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); | 217 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); |
218 | 218 | ||
219 | textStream << "<drawpad>" << endl; | 219 | textStream << "<drawpad>" << endl; |
220 | textStream << " <images>" << endl; | 220 | textStream << " <images>" << endl; |
221 | 221 | ||
222 | QListIterator<QPixmap> bufferIterator(m_pages); | 222 | QListIterator<QPixmap> bufferIterator(m_pages); |
223 | 223 | ||
224 | for (bufferIterator.toFirst(); bufferIterator.current() != 0; ++bufferIterator) { | 224 | for (bufferIterator.toFirst(); bufferIterator.current() != 0; ++bufferIterator) { |
225 | textStream << " <image>" << endl; | 225 | textStream << " <image>" << endl; |
226 | 226 | ||
227 | QImage image = bufferIterator.current()->convertToImage(); | 227 | QImage image = bufferIterator.current()->convertToImage(); |
228 | QByteArray byteArray; | 228 | QByteArray byteArray; |
229 | QBuffer buffer(byteArray); | 229 | QBuffer buffer(byteArray); |
230 | QImageIO imageIO(&buffer, "PNG"); | 230 | QImageIO imageIO(&buffer, "PNG"); |
231 | 231 | ||
232 | buffer.open(IO_WriteOnly); | 232 | buffer.open(IO_WriteOnly); |
233 | imageIO.setImage(image); | 233 | imageIO.setImage(image); |
234 | imageIO.write(); | 234 | imageIO.write(); |
235 | buffer.close(); | 235 | buffer.close(); |
236 | 236 | ||
237 | textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">"; | 237 | textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">"; |
238 | 238 | ||
239 | static const char hexchars[] = "0123456789abcdef"; | 239 | static const char hexchars[] = "0123456789abcdef"; |
240 | 240 | ||
241 | for (int i = 0; i < (int)byteArray.size(); i++ ) { | 241 | for (int i = 0; i < (int)byteArray.size(); i++ ) { |
242 | uchar s = (uchar)byteArray[i]; | 242 | uchar s = (uchar)byteArray[i]; |
243 | textStream << hexchars[s >> 4]; | 243 | textStream << hexchars[s >> 4]; |
244 | textStream << hexchars[s & 0x0f]; | 244 | textStream << hexchars[s & 0x0f]; |
245 | } | 245 | } |
246 | 246 | ||
247 | textStream << "</data>" << endl; | 247 | textStream << "</data>" << endl; |
248 | textStream << " </image>" << endl; | 248 | textStream << " </image>" << endl; |
249 | } | 249 | } |
250 | 250 | ||
251 | textStream << " </images>" << endl; | 251 | textStream << " </images>" << endl; |
252 | textStream << "</drawpad>"; | 252 | textStream << "</drawpad>"; |
253 | } | 253 | } |
254 | 254 | ||
255 | void DrawPadCanvas::importPage(const QString& fileName) | 255 | void DrawPadCanvas::importPage(const QString& fileName) |
256 | { | 256 | { |
257 | QPixmap* importedPixmap = new QPixmap(); | 257 | QPixmap* importedPixmap = new QPixmap(); |
258 | 258 | ||
259 | importedPixmap->load(fileName); | 259 | importedPixmap->load(fileName); |
260 | m_pages.insert(m_pages.at() + 1, importedPixmap); | 260 | m_pages.insert(m_pages.at() + 1, importedPixmap); |
261 | 261 | ||
262 | m_pageBackups.clear(); | 262 | m_pageBackups.clear(); |
263 | m_pageBackups.append(new QPixmap(*(m_pages.current()))); | 263 | m_pageBackups.append(new QPixmap(*(m_pages.current()))); |
264 | 264 | ||
265 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 265 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |