Merge from BRANCH_1_0

9 files changed, 44 insertions, 17 deletions

diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index 4db6208..aac6bc1 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -278,6 +278,11 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
 
     changeBrushColor(Qt::white);
 
+}
+
+
+void DrawPad::finishStartup() 
+{
     // init pages
 
     QFile file(Global::applicationFileName("drawpad", "drawpad.xml"));
@@ -290,6 +295,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
     }
 
     loadConfig();
+
 }
 
 DrawPad::~DrawPad()
diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h
index 7306228..2cae700 100644
--- a/noncore/graphics/drawpad/drawpad.h
+++ b/noncore/graphics/drawpad/drawpad.h
@@ -40,6 +40,7 @@ public:
     QBrush brush() { return m_brush; }
 
     bool antiAliasing();
+    void finishStartup();
 
 private slots:
     void newPage();
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp
index 025bebb..dec498b 100644
--- a/noncore/graphics/drawpad/drawpadcanvas.cpp
+++ b/noncore/graphics/drawpad/drawpadcanvas.cpp
@@ -182,7 +182,9 @@ void DrawPadCanvas::load(QIODevice* ioDevice)
     m_pages = drawPadCanvasXmlHandler.pages();
 
     if (m_pages.isEmpty()) {
-        m_pages.append(new Page("", contentsRect().size()));
+        m_pages.append(new Page("",         
+                clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0),
+                clipper()->height()+(horizontalScrollBar()->isVisible()?horizontalScrollBar()->height():0)));
         m_pages.current()->pixmap()->fill(Qt::white);
     }
 
@@ -194,7 +196,11 @@ void DrawPadCanvas::load(QIODevice* ioDevice)
 
 void DrawPadCanvas::initialPage()
 {
-    m_pages.append(new Page("", 236, 232));
+    m_pages.append(new Page("", 
+        clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0),
+        clipper()->height()+(horizontalScrollBar()->isVisible()?horizontalScrollBar()->height():0)));
+        //236, 232)); no more fixed sizes
+
     m_pages.current()->pixmap()->fill(Qt::white);
 
     resizeContents(m_pages.current()->pixmap()->width(), m_pages.current()->pixmap()->height());
@@ -349,7 +355,10 @@ void DrawPadCanvas::deleteAll()
 {
     m_pages.clear();
 
-    m_pages.append(new Page("", contentsRect().size()));
+    m_pages.append(new Page("",         
+        clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0),
+        clipper()->height()+(horizontalScrollBar()->isVisible()?horizontalScrollBar()->height():0)));
+
     m_pages.current()->pixmap()->fill(Qt::white);
 
     resizeContents(m_pages.current()->pixmap()->width(), m_pages.current()->pixmap()->height());
@@ -382,7 +391,10 @@ void DrawPadCanvas::deletePage()
     m_pages.remove(m_pages.current());
 
     if (m_pages.isEmpty()) {
-        m_pages.append(new Page("", contentsRect().size()));
+        m_pages.append(new Page("",         
+                clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0),
+                clipper()->height()+(horizontalScrollBar()->isVisible()?horizontalScrollBar()->height():0)));
+
         m_pages.current()->pixmap()->fill(Qt::white);
     }
 
diff --git a/noncore/graphics/drawpad/exportdialog.cpp b/noncore/graphics/drawpad/exportdialog.cpp
index 5b11c0e..adbd612 100644
--- a/noncore/graphics/drawpad/exportdialog.cpp
+++ b/noncore/graphics/drawpad/exportdialog.cpp
@@ -13,7 +13,7 @@
 
 #include "exportdialog.h"
 
-#include <qpe/fileselector.h>
+#include <opie/ofileselector.h>
 
 #include <qbuttongroup.h>
 #include <qcombobox.h>
@@ -66,9 +66,12 @@ ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const c
     m_pFormatComboBox = new QComboBox(exportGroupBox);
     m_pFormatComboBox->insertStrList(QImageIO::outputFormats());
 
-    FileSelector* fileSelector = new FileSelector("image/*", this, "fileselector");
-    fileSelector->setNewVisible(false);
-    fileSelector->setCloseVisible(false);
+    MimeTypes types; types.insert( tr("All Images"), "image/*" );
+    OFileSelector* fileSelector = new OFileSelector(this, OFileSelector::FileSelector,
+                                                   OFileSelector::Normal,
+                                                   QString::null, QString::null,
+                                                   types );
+    fileSelector->setNameVisible( false );
 
     QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4);
     selectionButtonGroup->layout()->setSpacing(4);
diff --git a/noncore/graphics/drawpad/importdialog.cpp b/noncore/graphics/drawpad/importdialog.cpp
index 1c447cb..9a59a20 100644
--- a/noncore/graphics/drawpad/importdialog.cpp
+++ b/noncore/graphics/drawpad/importdialog.cpp
@@ -14,7 +14,7 @@
 #include "importdialog.h"
 
 #include <qpe/applnk.h>
-#include <qpe/fileselector.h>
+#include <opie/ofileselector.h>
 
 #include <qcheckbox.h>
 #include <qimage.h>
@@ -27,10 +27,14 @@ ImportDialog::ImportDialog(QWidget* parent, const char* name)
 {
     setCaption(tr("DrawPad - Import"));
 
-    m_pFileSelector = new FileSelector("image/*", this, "fileselector");
+    MimeTypes types; types.insert( tr("All images"),"image/*" );
+    m_pFileSelector = new OFileSelector(this,
+                                        OFileSelector::FileSelector,
+                                        OFileSelector::Normal,
+                                        QString::null,
+                                        QString::null, types );
+    m_pFileSelector->setNameVisible( false );
     connect(m_pFileSelector, SIGNAL(fileSelected(const DocLnk&)), this, SLOT(fileChanged()));
-    m_pFileSelector->setNewVisible(false);
-    m_pFileSelector->setCloseVisible(false);
 
     m_pPreviewLabel = new QLabel(this);
     m_pPreviewLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken);
@@ -68,7 +72,7 @@ ImportDialog::~ImportDialog()
 const DocLnk* ImportDialog::selected()
 {
     // FIXME change from pointer to reference -zecke
-    DocLnk *lnk = new DocLnk( m_pFileSelector->selectedDocument() );    
+    DocLnk *lnk = new DocLnk( m_pFileSelector->selectedDocument() );
     return lnk;
 }
 
diff --git a/noncore/graphics/drawpad/importdialog.h b/noncore/graphics/drawpad/importdialog.h
index ef51d7c..ed655a5 100644
--- a/noncore/graphics/drawpad/importdialog.h
+++ b/noncore/graphics/drawpad/importdialog.h
@@ -17,7 +17,7 @@
 #include <qdialog.h>
 
 class DocLnk;
-class FileSelector;
+class OFileSelector;
 
 class QCheckBox;
 class QLabel;
@@ -37,7 +37,7 @@ private slots:
     void preview();
 
 private:
-    FileSelector* m_pFileSelector;
+    OFileSelector* m_pFileSelector;
     QLabel* m_pPreviewLabel;
     QCheckBox* m_pAutomaticPreviewCheckBox;
 };
diff --git a/noncore/graphics/drawpad/main.cpp b/noncore/graphics/drawpad/main.cpp
index ec628cc..12f8084 100644
--- a/noncore/graphics/drawpad/main.cpp
+++ b/noncore/graphics/drawpad/main.cpp
@@ -21,7 +21,7 @@ int main(int argc, char **argv)
 
     DrawPad mw; // = new DrawPad();;
     a.showMainWidget(&mw );
-    
+    mw.finishStartup();
     
     return a.exec();
 }
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control
index 1c22186..5095b52 100644
--- a/noncore/graphics/drawpad/opie-drawpad.control
+++ b/noncore/graphics/drawpad/opie-drawpad.control
@@ -4,9 +4,9 @@ Priority: optional
 Section: opie/applications
 Maintainer: Sébastien Prud'homme <prudhomme@laposte.net>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
 Description: A note taking program with basic draw tools
  DrawPad is an easy note taking program for Zaurus.  It can also
  be used to draw simple images. DrawPad was developed for the Opie
  project, an alternative to the standard Zaurus environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/graphics/drawpad/texttool.h b/noncore/graphics/drawpad/texttool.h
index 3187675..17556a1 100644
--- a/noncore/graphics/drawpad/texttool.h
+++ b/noncore/graphics/drawpad/texttool.h
@@ -22,6 +22,7 @@ class QLineEdit;
 
 class TextToolDialog : public QDialog
 {
+    Q_OBJECT
 public:
     TextToolDialog(QWidget* parent = 0, const char* name = 0);
     ~TextToolDialog();