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
@@ -31,3 +31,2 @@
 #include "hexwindow.h"
-#include "configwindow.h"
 #include "scanlist.h"
@@ -57,5 +56,9 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
         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 );
@@ -68,3 +71,3 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     ap = new QWidget( TabWidget, "ap" );
-    apLayout = new QVBoxLayout( ap ); 
+    apLayout = new QVBoxLayout( ap );
     apLayout->setSpacing( 2 );
@@ -72,25 +75,21 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
 
-    //--------- 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 );
@@ -115,3 +114,3 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     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"
@@ -126,8 +125,4 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     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" ) );
@@ -135,3 +130,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) );
-    TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) );
     TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) );
@@ -141,9 +135,7 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     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" ) );