usage of OFileDialog

3 files changed, 85 insertions, 4 deletions

diff --git a/noncore/apps/zsafe/config.in b/noncore/apps/zsafe/config.in
index 53956ad..4b1e968 100644
--- a/noncore/apps/zsafe/config.in
+++ b/noncore/apps/zsafe/config.in
@@ -3,3 +3,3 @@ config ZSAFE
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 )
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
 
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index bd03031..abf6511 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -11,3 +11,4 @@
 ** Compile Flags:
-**    Zaurus arm     : none
+**    Zaurus arm     : -DNO_OPIE
+**    Zaurus Opie arm: none
 **    Linux Desktop  : -DDESKTOP
@@ -26,4 +27,8 @@
 #ifndef DESKTOP
+#ifndef NO_OPIE
+#include <opie/ofiledialog.h>
+#else
 #include "scqtfileedit.h"
 #endif
+#endif
 
@@ -1197,2 +1202,5 @@ bool ZSafe::isCategory(QListViewItem *_item)
 {
+   if (_item == NULL)
+      return FALSE;
+
    QString categoryName = _item->text (0);
@@ -1209,2 +1217,13 @@ void ZSafe::removeAsciiFile()
 #ifndef DESKTOP
+#ifndef NO_OPIE
+   QMap<QString, QStringList> mimeTypes;
+   mimeTypes.insert(tr("All"), QStringList() );
+   mimeTypes.insert(tr("Text"), "text/*" );
+   QString fn = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
+                       QDir::homeDirPath() + "/Documents/application/zsafe",
+                       QString::null,
+                       mimeTypes,
+                       this,
+                       tr ("Remove text file"));
+#else
   QString fn = ScQtFileEdit::getOpenFileName(this, 
@@ -1213,2 +1232,3 @@ void ZSafe::removeAsciiFile()
                        "*.txt");
+#endif
 #else
@@ -1247,2 +1267,13 @@ void ZSafe::writeAllEntries()
 #ifndef DESKTOP
+#ifndef NO_OPIE
+   QMap<QString, QStringList> mimeTypes;
+   mimeTypes.insert(tr("All"), QStringList() );
+   mimeTypes.insert(tr("Text"), "text/*" );
+   QString fn = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
+                       QDir::homeDirPath() + "/Documents/application/zsafe",
+                       QString::null,
+                       mimeTypes,
+                       this,
+                       tr ("Export text file"));
+#else
    QString fn = ScQtFileEdit::getSaveAsFileName(this, 
@@ -1251,2 +1282,3 @@ void ZSafe::writeAllEntries()
                        "*.txt");
+#endif
 #else
@@ -1330,2 +1362,13 @@ void ZSafe::readAllEntries()
 #ifndef DESKTOP
+#ifndef NO_OPIE
+   QMap<QString, QStringList> mimeTypes;
+   mimeTypes.insert(tr("All"), QStringList() );
+   mimeTypes.insert(tr("Text"), "text/*" );
+   QString fn = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
+                       QDir::homeDirPath() + "/Documents/application/zsafe",
+                       QString::null,
+                       mimeTypes,
+                       this,
+                       tr ("Import text file"));
+#else
   QString fn = ScQtFileEdit::getOpenFileName(this, 
@@ -1334,2 +1377,3 @@ void ZSafe::readAllEntries()
                        "*.txt");
+#endif
 #else
@@ -3143,2 +3187,13 @@ void ZSafe::newDocument()
 #ifndef DESKTOP
+#ifndef NO_OPIE
+   QMap<QString, QStringList> mimeTypes;
+   mimeTypes.insert(tr("All"), QStringList() );
+   mimeTypes.insert(tr("ZSafe"), "zsafe/*" );
+   QString newFile = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
+                       QDir::homeDirPath() + "/Documents/application/zsafe",
+                       QString::null,
+                       mimeTypes,
+                       this,
+                       tr ("Create new ZSafe document"));
+#else
    QString newFile = ScQtFileEdit::getSaveAsFileName(this, 
@@ -3147,2 +3202,3 @@ void ZSafe::newDocument()
                        "*.zsf");
+#endif
 #else
@@ -3191,3 +3247,3 @@ void ZSafe::newDocument()
        // m_password = "";
-       // selectedItem = NULL;
+       selectedItem = NULL;
 
@@ -3219,2 +3275,13 @@ void ZSafe::loadDocument()
 #ifndef DESKTOP
+#ifndef NO_OPIE
+   QMap<QString, QStringList> mimeTypes;
+   mimeTypes.insert(tr("All"), QStringList() );
+   mimeTypes.insert(tr("ZSafe"), "zsafe/*" );
+   QString newFile = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
+                       QDir::homeDirPath() + "/Documents/application/zsafe",
+                       QString::null,
+                       mimeTypes,
+                       this,
+                       tr ("Open ZSafe document"));
+#else
    QString newFile = ScQtFileEdit::getOpenFileName(this, 
@@ -3223,2 +3290,3 @@ void ZSafe::loadDocument()
                        "*.zsf");
+#endif
 #else
@@ -3285,2 +3353,13 @@ void ZSafe::saveDocumentAs()
 #ifndef DESKTOP
+#ifndef NO_OPIE
+   QMap<QString, QStringList> mimeTypes;
+   mimeTypes.insert(tr("All"), QStringList() );
+   mimeTypes.insert(tr("ZSafe"), "zsafe/*" );
+   QString newFile = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
+                       QDir::homeDirPath() + "/Documents/application/zsafe",
+                       QString::null,
+                       mimeTypes,
+                       this,
+                       tr ("Save ZSafe document as.."));
+#else
    QString newFile = ScQtFileEdit::getSaveAsFileName(this, 
@@ -3289,2 +3368,3 @@ void ZSafe::saveDocumentAs()
                        "*.zsf");
+#endif
 #else
@@ -3306,2 +3386,3 @@ void ZSafe::saveDocumentAs()
 
+       selectedItem = NULL;
        filename = newFile;
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro
index ae4c793..5cb74dd 100644
--- a/noncore/apps/zsafe/zsafe.pro
+++ b/noncore/apps/zsafe/zsafe.pro
@@ -16,3 +16,3 @@ INCLUDEPATH	+= $(OPIEDIR)/noncore/apps/zsafe
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS        += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe
+LIBS        += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopie
 TARGET		 = zsafe