1 files changed, 25 insertions, 7 deletions

diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 95a8294..6f57a7f 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
+** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
-** This file is part of Opie Environment.
+** This file is part of Wellenreiter II.
 **
 ** This file may be distributed and/or modified under the terms of the
@@ -38,4 +38,5 @@
 #include <qtextstream.h>
 #include <qtoolbutton.h>
+#include <qwhatsthis.h>
 
 #ifdef QWS
@@ -61,6 +62,6 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     // setup application icon
 
-    #ifndef QWS
     setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) );
+    #ifndef QWS
     setIconText( "Wellenreiter/X11" );
     #endif
@@ -69,4 +70,5 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     startButton = new QToolButton( 0 );
+    QWhatsThis::add( startButton, tr( "Click here to start scanning." ) );
     #ifdef QWS
     startButton->setAutoRaise( true );
@@ -77,4 +79,5 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     stopButton = new QToolButton( 0 );
+    QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) );
     #ifdef QWS
     stopButton->setAutoRaise( true );
@@ -85,4 +88,5 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     QToolButton* d = new QToolButton( 0 );
+    QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ),
     #ifdef QWS
     d->setAutoRaise( true );
@@ -92,4 +96,5 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     uploadButton = new QToolButton( 0 );
+    QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) );
     #ifdef QWS
     uploadButton->setAutoRaise( true );
@@ -124,7 +129,4 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
 
-    QPopupMenu* view = new QPopupMenu( mb );
-    view->insertItem( tr( "&Configure..." ) );
-
     QPopupMenu* sniffer = new QPopupMenu( mb );
     sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
@@ -135,4 +137,8 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     sniffer->setItemEnabled( stopID, false );
 
+    QPopupMenu* view = new QPopupMenu( mb );
+    view->insertItem( tr( "&Expand All" ), this, SLOT( viewExpandAll() ) );
+    view->insertItem( tr( "&Collapse All" ), this, SLOT( viewCollapseAll() ) );
+
     QPopupMenu* demo = new QPopupMenu( mb );
     demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
@@ -140,6 +146,8 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     id = mb->insertItem( tr( "&File" ), file );
-    //id = mb->insertItem( tr( "&View" ), view );
+
+    id = mb->insertItem( tr( "&View" ), view );
     //mb->setItemEnabled( id, false );
+
     id = mb->insertItem( tr( "&Sniffer" ), sniffer );
 
@@ -554,2 +562,12 @@ void WellenreiterMainWindow::uploadSession()
 }
 
+
+void WellenreiterMainWindow::viewExpandAll()
+{
+    mw->netView()->expand();
+}
+
+void WellenreiterMainWindow::viewCollapseAll()
+{
+    mw->netView()->collapse();
+}