- revamped part of the gui

- configuration is now a seperate dialog
- orinoco_hopper is no longer needed

1 files changed, 21 insertions, 29 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index da12f2b..3a703bc 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -29,7 +29,6 @@
 
 #include "logwindow.h"
 #include "hexwindow.h"
-#include "configwindow.h"
 #include "scanlist.h"
 
 #ifdef QWS
@@ -55,9 +54,13 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     
     if ( !name )
         setName( "WellenreiterBase" );
-    resize( 191, 294 ); 
-    setCaption( tr( "Wellenreiter" ) );
-    WellenreiterBaseLayout = new QVBoxLayout( this ); 
+    resize( 191, 294 );
+#ifdef QWS
+    setCaption( tr( "Wellenreiter/Opie" ) );
+#else
+    setCaption( tr( "Wellenreiter/X11" ) );
+#endif
+    WellenreiterBaseLayout = new QVBoxLayout( this );
     WellenreiterBaseLayout->setSpacing( 2 );
     WellenreiterBaseLayout->setMargin( 0 );
 #ifdef QWS
@@ -66,33 +69,29 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     TabWidget = new QTabWidget( this, "TabWidget" );
 #endif
     ap = new QWidget( TabWidget, "ap" );
-    apLayout = new QVBoxLayout( ap ); 
+    apLayout = new QVBoxLayout( ap );
     apLayout->setSpacing( 2 );
     apLayout->setMargin( 2 );
 
-    //--------- NETVIEW TAB --------------    
-    
-    netview = new MScanListView( ap );    
+    //--------- NETVIEW TAB --------------
+
+    netview = new MScanListView( ap );
     apLayout->addWidget( netview );
-    
+
 
     //--------- LOG TAB --------------
-    
+
     logwindow = new MLogWindow( TabWidget, "Log" );
-    
+
 
     //--------- HEX TAB --------------
-    
+
     hexwindow = new MHexWindow( TabWidget, "Hex" );
 
-    //--------- CONFIG TAB --------------
-    
-    configwindow = new WellenreiterConfigWindow( TabWidget, "Config" );
-    
     //--------- ABOUT TAB --------------
-    
+
     about = new QWidget( TabWidget, "about" );
-    aboutLayout = new QGridLayout( about ); 
+    aboutLayout = new QGridLayout( about );
     aboutLayout->setSpacing( 6 );
     aboutLayout->setMargin( 11 );
 
@@ -113,7 +112,7 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     QFont TextLabel1_4_2_font(  TextLabel1_4_2->font() );
     TextLabel1_4_2_font.setFamily( "adobe-helvetica" );
     TextLabel1_4_2_font.setPointSize( 10 );
-    TextLabel1_4_2->setFont( TextLabel1_4_2_font ); 
+    TextLabel1_4_2->setFont( TextLabel1_4_2_font );
     TextLabel1_4_2->setText( tr( "<p align=center>\n"
 "<hr>\n"
 "Max Moser<br>\n"
@@ -124,28 +123,21 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) );
 
     aboutLayout->addWidget( TextLabel1_4_2, 1, 0 );
-   
-    button = new QPushButton( this, "button" );
-    button->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, button->sizePolicy().hasHeightForWidth() ) );
-    button->setText( tr( "Start Scanning" ) );
 
-#ifdef QWS    
+#ifdef QWS
     TabWidget->addTab( ap, "wellenreiter/networks", tr( "Networks" ) );
     TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) );
     TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) );
-    TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) );
     TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) );
 #else
     TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) );
     TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) );
     TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) );
-    TabWidget->addTab( configwindow, /* "wellenreiter/config", */ tr( "Config" ) );
     TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) );
-#endif   
+#endif
     WellenreiterBaseLayout->addWidget( TabWidget );
-    WellenreiterBaseLayout->addWidget( button );
    
-#ifdef QWS   
+#ifdef QWS
     TabWidget->setCurrentTab( tr( "Networks" ) );
 #endif