summaryrefslogtreecommitdiff
authorleseb <leseb>2002-04-07 10:50:41 (UTC)
committer leseb <leseb>2002-04-07 10:50:41 (UTC)
commitf87f79ef356475764d8b9011c3f3b467d3015426 (patch) (side-by-side diff)
tree635aa20f8584a12ede938132c2113a7f8ed1bb1b
parent8f55b5aec83bb24ea80003f41f52794090d302fc (diff)
downloadopie-f87f79ef356475764d8b9011c3f3b467d3015426.zip
opie-f87f79ef356475764d8b9011c3f3b467d3015426.tar.gz
opie-f87f79ef356475764d8b9011c3f3b467d3015426.tar.bz2
Fix initial page size
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--apps/Applications/drawpad.desktop2
-rw-r--r--noncore/graphics/drawpad/drawpadcanvas.cpp2
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 @@
[Desktop Entry]
-Comment=A Drawing Program
+Comment=A Note Taking Program
Exec=drawpad
Icon=drawpad/DrawPad
Type=Application
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)
if (m_dataFormat == "XPM") {
if (m_dataLenght < ch.length() * 5) {
m_dataLenght = ch.length() * 5;
}
QByteArray byteArrayUnzipped(m_dataLenght);
::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size());
image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat);
} else {
image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat);
}
QPixmap* pixmap = new QPixmap(image.width(), image.height());
pixmap->convertFromImage(image);
m_pixmaps.append(pixmap);
}
return true;
}
DrawPadCanvas::DrawPadCanvas(DrawPad* drawPad, QWidget* parent, const char* name)
: QScrollView(parent, name)
{
m_pDrawPad = drawPad;
m_pages.setAutoDelete(true);
m_pageBackups.setAutoDelete(true);
}
DrawPadCanvas::~DrawPadCanvas()
{
}
void DrawPadCanvas::load(QIODevice* ioDevice)
{
QTextStream textStream(ioDevice);
textStream.setCodec(QTextCodec::codecForName("UTF-8"));
QXmlInputSource xmlInputSource(textStream);
QXmlSimpleReader xmlSimpleReader;
DrawPadCanvasXmlHandler drawPadCanvasXmlHandler;
xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler);
xmlSimpleReader.parse(xmlInputSource);
m_pages = drawPadCanvasXmlHandler.pixmaps();
if (m_pages.isEmpty()) {
m_pages.append(new QPixmap(contentsRect().size()));
m_pages.current()->fill(Qt::white);
}
m_pageBackups.clear();
m_pageBackups.append(new QPixmap(*(m_pages.current())));
resizeContents(m_pages.current()->width(), m_pages.current()->height());
viewport()->update();
emit pagesChanged();
emit pageBackupsChanged();
}
void DrawPadCanvas::initialPage()
{
- m_pages.append(new QPixmap(234, 233));
+ m_pages.append(new QPixmap(236, 232));
m_pages.current()->fill(Qt::white);
m_pageBackups.clear();
m_pageBackups.append(new QPixmap(*(m_pages.current())));
resizeContents(m_pages.current()->width(), m_pages.current()->height());
viewport()->update();
emit pagesChanged();
emit pageBackupsChanged();
}
void DrawPadCanvas::save(QIODevice* ioDevice)
{
QTextStream textStream(ioDevice);
textStream.setCodec(QTextCodec::codecForName("UTF-8"));
textStream << "<drawpad>" << endl;
textStream << " <images>" << endl;
QListIterator<QPixmap> bufferIterator(m_pages);
for (bufferIterator.toFirst(); bufferIterator.current() != 0; ++bufferIterator) {
textStream << " <image>" << endl;
QImage image = bufferIterator.current()->convertToImage();
QByteArray byteArray;
QBuffer buffer(byteArray);
QImageIO imageIO(&buffer, "PNG");
buffer.open(IO_WriteOnly);
imageIO.setImage(image);
imageIO.write();
buffer.close();
textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">";
static const char hexchars[] = "0123456789abcdef";
for (int i = 0; i < (int)byteArray.size(); i++ ) {
uchar s = (uchar)byteArray[i];
textStream << hexchars[s >> 4];
textStream << hexchars[s & 0x0f];
}
textStream << "</data>" << endl;
textStream << " </image>" << endl;
}
textStream << " </images>" << endl;
textStream << "</drawpad>";
}
void DrawPadCanvas::importPage(const QString& fileName)
{
QPixmap* importedPixmap = new QPixmap();
importedPixmap->load(fileName);
m_pages.insert(m_pages.at() + 1, importedPixmap);
m_pageBackups.clear();
m_pageBackups.append(new QPixmap(*(m_pages.current())));
resizeContents(m_pages.current()->width(), m_pages.current()->height());