From 6657040ae54afb2f2378f4db7bfc9e616e6d7b83 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Sun, 02 Mar 2003 18:59:21 +0000 Subject: use filedialogs before loading and saving sessions and logs --- 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 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -33,8 +34,10 @@ #ifdef QWS #include +#include #else #include "resource.h" +#include #endif WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) @@ -102,11 +105,11 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n 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 ); @@ -198,58 +201,99 @@ void WellenreiterMainWindow::demoAddStations() mw->netView()->addNewItem( "adhoc", "ELAN", "00:B0:8E:E7:56:E2", false, 3, 20 ); } -void WellenreiterMainWindow::fileSaveLog() +QString WellenreiterMainWindow::getFileName( bool save ) { - const QString fname( "/tmp/log.txt" ); - QFile f( fname ); - if ( f.open(IO_WriteOnly) ) + QMap 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 ""; } else { - 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 ); + } } } 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 ); + } } - } void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) 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 @@ -46,6 +46,9 @@ class WellenreiterMainWindow: public QMainWindow protected: virtual void closeEvent( QCloseEvent* ); + private: + QString getFileName( bool save ); + public slots: void showConfigure(); void demoAddStations(); -- cgit v0.9.0.2