author | leseb <leseb> | 2002-04-06 22:20:19 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-04-06 22:20:19 (UTC) |
commit | 75bc9d885aa131334a0b906a1a58134740c40783 (patch) (unidiff) | |
tree | 08a05fe92e1e2f1dc67604f9040bf669e5b4c84a /noncore/graphics | |
parent | 8e092bf08c2873dcdec4694573cf715b7a590e41 (diff) | |
download | opie-75bc9d885aa131334a0b906a1a58134740c40783.zip opie-75bc9d885aa131334a0b906a1a58134740c40783.tar.gz opie-75bc9d885aa131334a0b906a1a58134740c40783.tar.bz2 |
- Save album in PNG format instead of XPM
- Small fixes
-rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 2 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 12 | ||||
-rw-r--r-- | noncore/graphics/drawpad/newpagedialog.cpp | 22 | ||||
-rw-r--r-- | noncore/graphics/drawpad/newpagedialog.h | 4 |
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 | |||
@@ -155,2 +155,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name) | |||
155 | m_pRectangleToolButton->setPopup(rectanglePopupMenu); | 155 | m_pRectangleToolButton->setPopup(rectanglePopupMenu); |
156 | m_pRectangleToolButton->setPopupDelay(0); | ||
156 | 157 | ||
@@ -170,2 +171,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name) | |||
170 | m_pEllipseToolButton->setPopup(ellipsePopupMenu); | 171 | m_pEllipseToolButton->setPopup(ellipsePopupMenu); |
172 | m_pEllipseToolButton->setPopupDelay(0); | ||
171 | 173 | ||
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 | |||
@@ -56,2 +56,3 @@ private: | |||
56 | ulong m_dataLenght; | 56 | ulong m_dataLenght; |
57 | QString m_dataFormat; | ||
57 | QList<QPixmap> m_pixmaps; | 58 | QList<QPixmap> m_pixmaps; |
@@ -82,2 +83,7 @@ bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QS | |||
82 | m_dataLenght = atts.value("length").toULong(); | 83 | m_dataLenght = atts.value("length").toULong(); |
84 | m_dataFormat = atts.value("format"); | ||
85 | |||
86 | if (m_dataFormat.isEmpty()) { | ||
87 | m_dataFormat = "XPM"; | ||
88 | } | ||
83 | } | 89 | } |
@@ -135,3 +141,3 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch) | |||
135 | QImage image; | 141 | QImage image; |
136 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, "XPM"); | 142 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat); |
137 | 143 | ||
@@ -217,3 +223,3 @@ void DrawPadCanvas::save(QIODevice* ioDevice) | |||
217 | QBuffer buffer(byteArray); | 223 | QBuffer buffer(byteArray); |
218 | QImageIO imageIO(&buffer, "XPM"); | 224 | QImageIO imageIO(&buffer, "PNG"); |
219 | 225 | ||
@@ -228,3 +234,3 @@ void DrawPadCanvas::save(QIODevice* ioDevice) | |||
228 | 234 | ||
229 | textStream << " <data length=\"" << byteArray.size() << "\">"; | 235 | textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">"; |
230 | 236 | ||
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 | |||
@@ -22,4 +22,4 @@ | |||
22 | 22 | ||
23 | NewPageDialog::NewPageDialog(uint width, uint height, const QColor& foregroundColor, | 23 | NewPageDialog::NewPageDialog(uint width, uint height, const QColor& penColor, |
24 | const QColor& backgroundColor, QWidget* parent, const char* name) | 24 | const QColor& brushColor, QWidget* parent, const char* name) |
25 | : QDialog(parent, name, true) | 25 | : QDialog(parent, name, true) |
@@ -28,4 +28,4 @@ NewPageDialog::NewPageDialog(uint width, uint height, const QColor& foregroundCo | |||
28 | 28 | ||
29 | m_foregroundColor = foregroundColor; | 29 | m_penColor = penColor; |
30 | m_backgroundColor = backgroundColor; | 30 | m_brushColor = brushColor; |
31 | 31 | ||
@@ -42,7 +42,7 @@ NewPageDialog::NewPageDialog(uint width, uint height, const QColor& foregroundCo | |||
42 | 42 | ||
43 | m_pContentButtonGroup = new QButtonGroup(0, Qt::Vertical, tr("Contents"), this); | 43 | m_pContentButtonGroup = new QButtonGroup(0, Qt::Vertical, tr("Background"), this); |
44 | 44 | ||
45 | QRadioButton* whiteColorRadioButton = new QRadioButton(tr("White"), m_pContentButtonGroup); | 45 | QRadioButton* whiteColorRadioButton = new QRadioButton(tr("White"), m_pContentButtonGroup); |
46 | QRadioButton* foregroundColorRadioButton = new QRadioButton(tr("Foreground Color"), m_pContentButtonGroup); | 46 | QRadioButton* penColorRadioButton = new QRadioButton(tr("Pen Color"), m_pContentButtonGroup); |
47 | QRadioButton* backgroundColorRadioButton = new QRadioButton(tr("Background Color"), m_pContentButtonGroup); | 47 | QRadioButton* brushColorRadioButton = new QRadioButton(tr("Brush Color"), m_pContentButtonGroup); |
48 | 48 | ||
@@ -64,4 +64,4 @@ NewPageDialog::NewPageDialog(uint width, uint height, const QColor& foregroundCo | |||
64 | contentLayout->addWidget(whiteColorRadioButton); | 64 | contentLayout->addWidget(whiteColorRadioButton); |
65 | contentLayout->addWidget(foregroundColorRadioButton); | 65 | contentLayout->addWidget(penColorRadioButton); |
66 | contentLayout->addWidget(backgroundColorRadioButton); | 66 | contentLayout->addWidget(brushColorRadioButton); |
67 | 67 | ||
@@ -92,6 +92,6 @@ const QColor& NewPageDialog::selectedColor() | |||
92 | case 1: | 92 | case 1: |
93 | return (m_foregroundColor); | 93 | return (m_penColor); |
94 | break; | 94 | break; |
95 | case 2: | 95 | case 2: |
96 | return (m_backgroundColor); | 96 | return (m_brushColor); |
97 | break; | 97 | break; |
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 | |||
@@ -38,4 +38,4 @@ private: | |||
38 | 38 | ||
39 | QColor m_foregroundColor; | 39 | QColor m_penColor; |
40 | QColor m_backgroundColor; | 40 | QColor m_brushColor; |
41 | 41 | ||