2 files changed, 56 insertions, 9 deletions

diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 0ef89d4..9065351 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -18,28 +18,31 @@
 #include "mainwindow.h"
 #include "wellenreiter.h"
 
 #include "scanlist.h"
 
 #include <qcombobox.h>
 #include <qdatastream.h>
 #include <qfile.h>
+#include <qfileinfo.h>
 #include <qiconset.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qstatusbar.h>
 #include <qtextstream.h>
 #include <qtoolbutton.h>
 
 #ifdef QWS
 #include <qpe/resource.h>
+#include <opie/ofiledialog.h>
 #else
 #include "resource.h"
+#include <qfiledialog.h>
 #endif
 
 WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f )
 {
     cw = new WellenreiterConfigWindow( this );
     mw = new Wellenreiter( this );
     mw->setConfigWindow( cw );
@@ -97,21 +100,21 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     // setup menu bar
 
     int id;
 
     QMenuBar* mb = menuBar();
 
     QPopupMenu* fileSave = new QPopupMenu( mb );
-    fileSave->insertItem( "&Session", this, SLOT( fileSaveSession() ) );
-    fileSave->insertItem( "&Log", this, SLOT( fileSaveLog() ) );
+    fileSave->insertItem( "&Session...", this, SLOT( fileSaveSession() ) );
+    fileSave->insertItem( "&Log...", this, SLOT( fileSaveLog() ) );
 
     QPopupMenu* fileLoad = new QPopupMenu( mb );
-    fileLoad->insertItem( "&Session", this, SLOT( fileLoadSession() ) );
+    fileLoad->insertItem( "&Session...", this, SLOT( fileLoadSession() ) );
     //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
 
     QPopupMenu* file = new QPopupMenu( mb );
     id = file->insertItem( "&Load", fileLoad );
     file->insertItem( "&Save", fileSave );
 
     QPopupMenu* view = new QPopupMenu( mb );
     view->insertItem( "&Configure..." );
@@ -193,68 +196,109 @@ void WellenreiterMainWindow::demoAddStations()
 {
     mw->netView()->addNewItem( "managed", "Vanille", "00:00:20:EF:A6:43", true, 6, 80 );
     mw->netView()->addNewItem( "managed", "Vanille", "00:30:6D:EF:A6:23", true, 11, 10 );
     mw->netView()->addNewItem( "adhoc", "ELAN", "00:A0:F8:E7:16:22", false, 3, 10 );
     mw->netView()->addNewItem( "adhoc", "ELAN", "00:AA:01:E7:56:62", false, 3, 15 );
     mw->netView()->addNewItem( "adhoc", "ELAN", "00:B0:8E:E7:56:E2", false, 3, 20 );
 }
 
+QString WellenreiterMainWindow::getFileName( bool save )
+{
+    QMap<QString, QStringList> map;
+    map.insert( tr("All"), QStringList() );
+    QStringList text;
+    text << "text/*";
+    map.insert(tr("Text"), text );
+    text << "*";
+    map.insert(tr("All"), text );
+
+    QString str;
+    if ( save )
+    {
+        #ifdef QWS
+        str = OFileDialog::getSaveFileName( 2, "/", QString::null, map );
+        #else
+        str = QFileDialog::getSaveFileName();
+        #endif
+        if ( str.isEmpty() || QFileInfo(str).isDir() )
+            return "";
+    }
+    else
+    {
+        #ifdef QWS
+        str = OFileDialog::getOpenFileName( 2, "/", QString::null, map );
+        #else
+        str = QFileDialog::getOpenFileName();
+        #endif
+        if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() )
+            return "";
+    }
+    return str;
+}
+
 void WellenreiterMainWindow::fileSaveLog()
 {
-    const QString fname( "/tmp/log.txt" );
+    QString fname = getFileName( true );
+    if ( !fname.isEmpty() )
+    {
     QFile f( fname );
     if ( f.open(IO_WriteOnly) )
     {
         QTextStream t( &f );
         t << mw->logWindow()->getLog();
         f.close();
         qDebug( "Saved log to file '%s'", (const char*) fname );
     }
     else
     {
         qDebug( "Problem saving log to file '%s'", (const char*) fname );
     }
-
+    }
 }
 
 void WellenreiterMainWindow::fileSaveSession()
 {
-    const QString fname( "/tmp/session.xml" );
+    QString fname = getFileName( true );
+    if ( !fname.isEmpty() )
+    {
+
     QFile f( fname );
     if ( f.open(IO_WriteOnly) )
     {
         QDataStream t( &f );
         t << *mw->netView();
         f.close();
         qDebug( "Saved session to file '%s'", (const char*) fname );
     }
     else
     {
         qDebug( "Problem saving session to file '%s'", (const char*) fname );
     }
 }
+}
 
 void WellenreiterMainWindow::fileLoadSession()
 {
-    const QString fname( "/tmp/session.xml" );
+    QString fname = getFileName( false );
+    if ( !fname.isEmpty() )
+    {
     QFile f( fname );
-
     if ( f.open(IO_ReadOnly) )
     {
         QDataStream t( &f );
         t >> *mw->netView();
         f.close();
         qDebug( "Loaded session from file '%s'", (const char*) fname );
     }
     else
     {
         qDebug( "Problem loading session from file '%s'", (const char*) fname );
     }
-
+    }
 }
 
 void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
 {
     if ( mw->isDaemonRunning() )
     {
         QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." );
         e->ignore();
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
index 59f259d..850a343 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.h
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -41,16 +41,19 @@ class WellenreiterMainWindow: public QMainWindow
     const QIconSet* settingsIconSet;
     const QIconSet* cancelIconSet;
 
     QToolButton* startStopButton;
 
   protected:
     virtual void closeEvent( QCloseEvent* );
 
+  private:
+    QString getFileName( bool save );
+
   public slots:
     void showConfigure();
     void demoAddStations();
     void fileSaveLog();
     void fileSaveSession();
     void fileLoadSession();
 };