summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp62
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.h3
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
@@ -24,4 +24,5 @@
#include <qdatastream.h>
#include <qfile.h>
+#include <qfileinfo.h>
#include <qiconset.h>
#include <qmenubar.h>
@@ -34,6 +35,8 @@
#ifdef QWS
#include <qpe/resource.h>
+#include <opie/ofiledialog.h>
#else
#include "resource.h"
+#include <qfiledialog.h>
#endif
@@ -103,9 +106,9 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
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() ) );
@@ -199,7 +202,43 @@ void WellenreiterMainWindow::demoAddStations()
}
+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) )
@@ -214,10 +253,13 @@ void WellenreiterMainWindow::fileSaveLog()
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) )
@@ -233,10 +275,12 @@ void WellenreiterMainWindow::fileSaveSession()
}
}
+}
void WellenreiterMainWindow::fileLoadSession()
{
- const QString fname( "/tmp/session.xml" );
+ QString fname = getFileName( false );
+ if ( !fname.isEmpty() )
+ {
QFile f( fname );
-
if ( f.open(IO_ReadOnly) )
{
@@ -250,5 +294,5 @@ void WellenreiterMainWindow::fileLoadSession()
qDebug( "Problem loading session from file '%s'", (const char*) fname );
}
-
+ }
}
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
@@ -47,4 +47,7 @@ class WellenreiterMainWindow: public QMainWindow
virtual void closeEvent( QCloseEvent* );
+ private:
+ QString getFileName( bool save );
+
public slots:
void showConfigure();