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
@@ -280,2 +280,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
 
+}
+
+
+void DrawPad::finishStartup() 
+{
     // init pages
@@ -292,2 +297,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
     loadConfig();
+
 }
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
@@ -42,2 +42,3 @@ public:
     bool antiAliasing();
+    void finishStartup();
 
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
@@ -184,3 +184,5 @@ void DrawPadCanvas::load(QIODevice* ioDevice)
     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);
@@ -196,3 +198,7 @@ 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);
@@ -351,3 +357,6 @@ void DrawPadCanvas::deleteAll()
 
-    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);
@@ -384,3 +393,6 @@ void DrawPadCanvas::deletePage()
     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
@@ -15,3 +15,3 @@
 
-#include <qpe/fileselector.h>
+#include <opie/ofileselector.h>
 
@@ -68,5 +68,8 @@ ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const c
 
-    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 );
 
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
@@ -16,3 +16,3 @@
 #include <qpe/applnk.h>
-#include <qpe/fileselector.h>
+#include <opie/ofileselector.h>
 
@@ -29,6 +29,10 @@ ImportDialog::ImportDialog(QWidget* parent, const char* name)
 
-    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);
 
@@ -70,3 +74,3 @@ 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
@@ -19,3 +19,3 @@
 class DocLnk;
-class FileSelector;
+class OFileSelector;
 
@@ -39,3 +39,3 @@ private slots:
 private:
-    FileSelector* m_pFileSelector;
+    OFileSelector* m_pFileSelector;
     QLabel* m_pPreviewLabel;
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
@@ -23,3 +23,3 @@ int main(int argc, char **argv)
     a.showMainWidget(&mw );
-    
+    mw.finishStartup();
     
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
@@ -6,3 +6,2 @@ Maintainer: Sébastien Prud'homme <prudhomme@laposte.net>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
@@ -12 +11,2 @@ Description: A note taking program with basic draw tools
  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
@@ -24,2 +24,3 @@ class TextToolDialog : public QDialog
 {
+    Q_OBJECT
 public: