| -rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 116 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.h | 3 |
2 files changed, 83 insertions, 36 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 @@ -25,2 +25,3 @@ #include <qfile.h> +#include <qfileinfo.h> #include <qiconset.h> @@ -35,4 +36,6 @@ #include <qpe/resource.h> +#include <opie/ofiledialog.h> #else #include "resource.h" +#include <qfiledialog.h> #endif @@ -104,7 +107,7 @@ 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() ) ); @@ -200,12 +203,22 @@ void WellenreiterMainWindow::demoAddStations() -void WellenreiterMainWindow::fileSaveLog() +QString WellenreiterMainWindow::getFileName( bool save ) { - const QString fname( "/tmp/log.txt" ); - QFile f( fname ); - if ( f.open(IO_WriteOnly) ) + 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 ) { - QTextStream t( &f ); - t << mw->logWindow()->getLog(); - f.close(); - qDebug( "Saved log to file '%s'", (const char*) fname ); + #ifdef QWS + str = OFileDialog::getSaveFileName( 2, "/", QString::null, map ); + #else + str = QFileDialog::getSaveFileName(); + #endif + if ( str.isEmpty() || QFileInfo(str).isDir() ) + return ""; } @@ -213,21 +226,51 @@ void WellenreiterMainWindow::fileSaveLog() { - qDebug( "Problem saving log to file '%s'", (const char*) fname ); + #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::fileSaveSession() +void WellenreiterMainWindow::fileSaveLog() { - const QString fname( "/tmp/session.xml" ); - QFile f( fname ); - if ( f.open(IO_WriteOnly) ) + QString fname = getFileName( true ); + if ( !fname.isEmpty() ) { - QDataStream t( &f ); - t << *mw->netView(); - f.close(); - qDebug( "Saved session to file '%s'", (const char*) fname ); + 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 ); + } } - else +} + +void WellenreiterMainWindow::fileSaveSession() +{ + QString fname = getFileName( true ); + if ( !fname.isEmpty() ) { - qDebug( "Problem saving session to file '%s'", (const char*) fname ); + + 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 ); + } } @@ -237,17 +280,18 @@ void WellenreiterMainWindow::fileLoadSession() { - const QString fname( "/tmp/session.xml" ); - QFile f( fname ); - - if ( f.open(IO_ReadOnly) ) + QString fname = getFileName( false ); + if ( !fname.isEmpty() ) { - 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 ); + 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 ); + } } - } 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 @@ -48,2 +48,5 @@ class WellenreiterMainWindow: public QMainWindow + private: + QString getFileName( bool save ); + public slots: |