summaryrefslogtreecommitdiff
path: root/noncore/net/wellenreiter/gui/mainwindow.cpp
Side-by-side diff
Diffstat (limited to 'noncore/net/wellenreiter/gui/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp36
1 files changed, 31 insertions, 5 deletions
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index e388fc5..0ef89d4 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -23,2 +23,3 @@
#include <qcombobox.h>
+#include <qdatastream.h>
#include <qfile.h>
@@ -46,2 +47,9 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
+ // setup application icon
+
+ #ifndef QWS
+ setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) );
+ setIconText( "Wellenreiter/X11" );
+ #endif
+
// setup icon sets
@@ -101,3 +109,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
fileLoad->insertItem( "&Session", this, SLOT( fileLoadSession() ) );
- fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
+ //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
@@ -105,3 +113,2 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
id = file->insertItem( "&Load", fileLoad );
- file->setItemEnabled( id, false );
file->insertItem( "&Save", fileSave );
@@ -187,3 +194,3 @@ void WellenreiterMainWindow::demoAddStations()
mw->netView()->addNewItem( "managed", "Vanille", "00:00:20:EF:A6:43", true, 6, 80 );
- mw->netView()->addNewItem( "managed", "Vanille", "00:00:1c:EF:A6:23", true, 11, 10 );
+ 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 );
@@ -217,4 +224,4 @@ void WellenreiterMainWindow::fileSaveSession()
{
- QTextStream t( &f );
- mw->netView()->dump( t );
+ QDataStream t( &f );
+ t << *mw->netView();
f.close();
@@ -228,2 +235,21 @@ void WellenreiterMainWindow::fileSaveSession()
+void WellenreiterMainWindow::fileLoadSession()
+{
+ const QString fname( "/tmp/session.xml" );
+ 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 )