4 files changed, 24 insertions, 16 deletions

diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index aae9ab0..1375792 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -154,4 +154,5 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
 
     m_pRectangleToolButton->setPopup(rectanglePopupMenu);
+    m_pRectangleToolButton->setPopupDelay(0);
 
     m_pEllipseToolButton = new QToolButton(drawModeToolBar);
@@ -169,4 +170,5 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
 
     m_pEllipseToolButton->setPopup(ellipsePopupMenu);
+    m_pEllipseToolButton->setPopupDelay(0);
 
     m_pFillToolAction = new QAction(tr("Fill Region"), Resource::loadIconSet("drawpad/fill.png"), QString::null, 0, this);
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp
index 8818c03..b8a1c2e 100644
--- a/noncore/graphics/drawpad/drawpadcanvas.cpp
+++ b/noncore/graphics/drawpad/drawpadcanvas.cpp
@@ -55,4 +55,5 @@ private:
     State m_state;
     ulong m_dataLenght;
+    QString m_dataFormat;
     QList<QPixmap> m_pixmaps;
 };
@@ -81,4 +82,9 @@ bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QS
         m_state = InData;
         m_dataLenght = atts.value("length").toULong();
+        m_dataFormat = atts.value("format");
+
+        if (m_dataFormat.isEmpty()) {
+            m_dataFormat = "XPM";
+        }
     }
 
@@ -134,5 +140,5 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch)
 
         QImage image;
-        image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, "XPM");
+        image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat);
 
         QPixmap* pixmap = new QPixmap(image.width(), image.height());
@@ -216,5 +222,5 @@ void DrawPadCanvas::save(QIODevice* ioDevice)
         QByteArray byteArray;
         QBuffer buffer(byteArray);
-        QImageIO imageIO(&buffer, "XPM");
+        QImageIO imageIO(&buffer, "PNG");
 
         buffer.open(IO_WriteOnly);
@@ -227,5 +233,5 @@ void DrawPadCanvas::save(QIODevice* ioDevice)
         ::compress((uchar*)byteArrayZipped.data(), &size, (uchar*)byteArray.data(), byteArray.size());
 
-        textStream << "            <data length=\"" << byteArray.size() << "\">";
+        textStream << "            <data length=\"" << byteArray.size() << "\" format=\"PNG\">";
 
         static const char hexchars[] = "0123456789abcdef";
diff --git a/noncore/graphics/drawpad/newpagedialog.cpp b/noncore/graphics/drawpad/newpagedialog.cpp
index b1b26ef..5c31978 100644
--- a/noncore/graphics/drawpad/newpagedialog.cpp
+++ b/noncore/graphics/drawpad/newpagedialog.cpp
@@ -21,12 +21,12 @@
 #include <qspinbox.h>
 
-NewPageDialog::NewPageDialog(uint width, uint height, const QColor& foregroundColor,
-                             const QColor& backgroundColor, QWidget* parent, const char* name)
+NewPageDialog::NewPageDialog(uint width, uint height, const QColor& penColor,
+                             const QColor& brushColor, QWidget* parent, const char* name)
     : QDialog(parent, name, true)
 {
     setCaption(tr("New Page"));
 
-    m_foregroundColor = foregroundColor;
-    m_backgroundColor = backgroundColor;
+    m_penColor = penColor;
+    m_brushColor = brushColor;
 
     QGroupBox* sizeGroupBox = new QGroupBox(0, Qt::Vertical, tr("Page Size"), this);
@@ -41,9 +41,9 @@ NewPageDialog::NewPageDialog(uint width, uint height, const QColor& foregroundCo
     m_pHeightSpinBox->setValue(height);
 
-    m_pContentButtonGroup = new QButtonGroup(0, Qt::Vertical, tr("Contents"), this);
+    m_pContentButtonGroup = new QButtonGroup(0, Qt::Vertical, tr("Background"), this);
 
     QRadioButton* whiteColorRadioButton = new QRadioButton(tr("White"), m_pContentButtonGroup);
-    QRadioButton* foregroundColorRadioButton = new QRadioButton(tr("Foreground Color"), m_pContentButtonGroup);
-    QRadioButton* backgroundColorRadioButton = new QRadioButton(tr("Background Color"), m_pContentButtonGroup);
+    QRadioButton* penColorRadioButton = new QRadioButton(tr("Pen Color"), m_pContentButtonGroup);
+    QRadioButton* brushColorRadioButton = new QRadioButton(tr("Brush Color"), m_pContentButtonGroup);
 
     m_pContentButtonGroup->setButton(0);
@@ -63,6 +63,6 @@ NewPageDialog::NewPageDialog(uint width, uint height, const QColor& foregroundCo
 
     contentLayout->addWidget(whiteColorRadioButton);
-    contentLayout->addWidget(foregroundColorRadioButton);
-    contentLayout->addWidget(backgroundColorRadioButton);
+    contentLayout->addWidget(penColorRadioButton);
+    contentLayout->addWidget(brushColorRadioButton);
 
     mainLayout->addWidget(sizeGroupBox);
@@ -91,8 +91,8 @@ const QColor& NewPageDialog::selectedColor()
             break;
         case 1:
-            return (m_foregroundColor);
+            return (m_penColor);
             break;
         case 2:
-            return (m_backgroundColor);
+            return (m_brushColor);
             break;
         default:
diff --git a/noncore/graphics/drawpad/newpagedialog.h b/noncore/graphics/drawpad/newpagedialog.h
index f418340..d680394 100644
--- a/noncore/graphics/drawpad/newpagedialog.h
+++ b/noncore/graphics/drawpad/newpagedialog.h
@@ -37,6 +37,6 @@ private:
     QSpinBox* m_pHeightSpinBox;
 
-    QColor m_foregroundColor;
-    QColor m_backgroundColor;
+    QColor m_penColor;
+    QColor m_brushColor;
 
     QButtonGroup* m_pContentButtonGroup;