10 files changed, 101 insertions, 62 deletions

diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index 7992e6b..398118f 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -3,3 +3,3 @@
 <widget>
-    <class>QWidget</class>
+    <class>QDialog</class>
     <property stdset="1">
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>224</width>
+            <width>220</width>
             <height>267</height>
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 515d9b2..6ea6f02 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -21,3 +21,3 @@
 WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
-           :WellenreiterConfigBase( parent, name, f )
+           :WellenreiterConfigBase( parent, name, true, f )
 {
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 4ee360d..95e9f22 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1 +1,3 @@
+MOC_DIR         = ./tmp
+OBJECTS_DIR     = ./tmp
 DESTDIR         = $(OPIEDIR)/bin
@@ -3,5 +5,5 @@ TEMPLATE        = app
 CONFIG          = qt warn_on debug
-#CONFIG         = qt warn_on release
-HEADERS         = mainwindow.h \
-                  wellenreiterbase.h \
+
+HEADERS         = wellenreiterbase.h \
+                  mainwindow.h \
                   wellenreiter.h \
@@ -15,2 +17,3 @@ HEADERS         = mainwindow.h \
                   manufacturers.h
+
 SOURCES         = main.cpp \
@@ -26,3 +29,4 @@ SOURCES         = main.cpp \
                   cardconfig.cpp \
-                  manufacturers.h
+                  manufacturers.cpp
+
 INCLUDEPATH     += $(OPIEDIR)/include ../
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index d7326c0..b67376c 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -15,2 +15,3 @@
 
+#include "configwindow.h"
 #include "mainwindow.h"
@@ -18,2 +19,3 @@
 
+#include <qcombobox.h>
 #include <qiconset.h>
@@ -33,3 +35,5 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 {
+    cw = new WellenreiterConfigWindow( this );
     mw = new Wellenreiter( this );
+    mw->setConfigWindow( cw );
     setCentralWidget( mw );
@@ -45,7 +49,9 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
-    QToolButton* b = new QToolButton( 0 );
-    b->setAutoRaise( true );
-    b->setOnIconSet( *cancelIconSet );
-    b->setOffIconSet( *searchIconSet );
-    b->setToggleButton( true );
+    startStopButton = new QToolButton( 0 );
+    startStopButton->setAutoRaise( true );
+    startStopButton->setOnIconSet( *cancelIconSet );
+    startStopButton->setOffIconSet( *searchIconSet );
+    startStopButton->setToggleButton( true );
+    connect( startStopButton, SIGNAL( clicked() ), mw, SLOT( startStopClicked() ) );
+    startStopButton->setEnabled( false );
 
@@ -59,2 +65,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     d->setIconSet( *settingsIconSet );
+    connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
 
@@ -64,14 +71,31 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
-    QPopupMenu* p = new QPopupMenu( mb );
-    p->insertItem( "&Load" );
-    p->insertItem( "&Save" );
+    QPopupMenu* file = new QPopupMenu( mb );
+    file->insertItem( "&Load" );
+    file->insertItem( "&Save" );
 
-    mb->insertItem( "&File", p );
-    mb->setItemEnabled( mb->insertItem( b ), false );
-    mb->setItemEnabled( mb->insertItem( c ), false );
+    QPopupMenu* view = new QPopupMenu( mb );
+    view->insertItem( "&Configure" );
+
+    QPopupMenu* sniffer = new QPopupMenu( mb );
+    sniffer->insertItem( "&Configure" );
+    sniffer->insertSeparator();
+
+    int id;
+
+    id = mb->insertItem( "&File", file );
+    mb->setItemEnabled( id, false );
+    id = mb->insertItem( "&View", view );
+    mb->setItemEnabled( id, false );
+    id = mb->insertItem( "&Sniffer", sniffer );
+    mb->setItemEnabled( id, false );
+
+    mb->insertItem( startStopButton );
+    mb->insertItem( c );
     mb->insertItem( d );
 
-    // setup status bar
+    // setup status bar (for now only on X11)
 
-    // statusBar()->message( "Ready." );
+    #ifndef QWS
+    statusBar()->message( "Ready." );
+    #endif
 
@@ -79,2 +103,26 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
+void WellenreiterMainWindow::showConfigure()
+{
+    qDebug( "show configure..." );
+    cw->setCaption( tr( "Configure" ) );
+    cw->showMaximized();
+    int result = cw->exec();
+
+    if ( result )
+    {
+        // check configuration from config window
+
+        const QString& interface = cw->interfaceName->currentText();
+        const int cardtype = cw->daemonDeviceType();
+        const int interval = cw->daemonHopInterval();
+
+        if ( ( interface != "<select>" ) && ( cardtype != 0 ) )
+            startStopButton->setEnabled( true );
+            //TODO ...
+        else
+            startStopButton->setEnabled( false );
+            //TODO ...
+    }
+}
+
 WellenreiterMainWindow::~WellenreiterMainWindow()
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
index dcc79e6..7d772a8 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.h
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -21,3 +21,5 @@
 class Wellenreiter;
+class WellenreiterConfigWindow;
 class QIconSet;
+class QToolButton;
 
@@ -25,2 +27,3 @@ class WellenreiterMainWindow: public QMainWindow
 {
+  Q_OBJECT
 
@@ -32,2 +35,3 @@ class WellenreiterMainWindow: public QMainWindow
     Wellenreiter* mw;
+    WellenreiterConfigWindow* cw;
 
@@ -38,3 +42,6 @@ class WellenreiterMainWindow: public QMainWindow
 
+    QToolButton* startStopButton;
 
+  public slots:
+    void showConfigure();
 };
@@ -42,2 +49 @@ class WellenreiterMainWindow: public QMainWindow
 #endif
-
diff --git a/noncore/net/wellenreiter/gui/manufacturers.cpp b/noncore/net/wellenreiter/gui/manufacturers.cpp
index dad2753..f9f8967 100644
--- a/noncore/net/wellenreiter/gui/manufacturers.cpp
+++ b/noncore/net/wellenreiter/gui/manufacturers.cpp
@@ -43,3 +43,3 @@ ManufacturerDB::ManufacturerDB( const QString& filename )
             #ifdef DEBUG
-            qDebug( "ManufacturerDB: read pair %s, %s", (const char*) addr, (const char*) manu );
+            //qDebug( "ManufacturerDB: read pair %s, %s", (const char*) addr, (const char*) manu );
             #endif
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 4c53028..db7063b 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -63,4 +63,5 @@ using namespace Opie;
 
-Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
-    : WellenreiterBase( parent, name, fl ), daemonRunning( false ), manufacturerdb( 0 )
+Wellenreiter::Wellenreiter( QWidget* parent )
+    : WellenreiterBase( parent, 0, 0 ),
+      daemonRunning( false ), manufacturerdb( 0 ), configwindow( 0 )
 {
@@ -112,5 +113,2 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
     // setup GUI
-        
-    connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) );
-    // button->setEnabled( false );
     netview->setColumnWidthMode( 1, QListView::Manual );
@@ -129,2 +127,7 @@ Wellenreiter::~Wellenreiter()
 
+void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
+{
+    configwindow = cw;
+}
+
 void Wellenreiter::handleMessage()
@@ -213,14 +216,4 @@ void Wellenreiter::dataReceived()
 
-void Wellenreiter::buttonClicked()
+void Wellenreiter::startStopClicked()
 {
-        /*
-        // add some test stations, so that we can see if the GUI part works
-        addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 );
-        addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 );
-        addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 );
-        addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 );
-        addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 );
-        */
-
-
     if ( daemonRunning )
@@ -230,3 +223,2 @@ void Wellenreiter::buttonClicked()
         logwindow->log( "(i) Daemon has been stopped." );
-        button->setText( tr( "Start Scanning" ) );
         setCaption( tr( "Wellenreiter/Opie" ) );
@@ -263,3 +255,3 @@ void Wellenreiter::buttonClicked()
         {
-            QMessageBox::information( this, "Wellenreiter/Opie", "You must configure your\ndevice before scanning." );
+            QMessageBox::information( this, "Wellenreiter/Opie", "Your device is not\nptoperly configured. Please reconfigure!" );
             return;
@@ -278,3 +270,2 @@ void Wellenreiter::buttonClicked()
         daemonRunning = true;
-        button->setText( tr( "Stop Scanning" ) );
         setCaption( tr( "Scanning ..." ) );
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index 0ddc72c..a55d6a1 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -40,3 +40,2 @@ using namespace Opie;
 
-
 class QTimerEvent;
@@ -44,2 +43,3 @@ class QPixmap;
 class ManufacturerDB;
+class WellenreiterConfigWindow;
 
@@ -49,8 +49,8 @@ class Wellenreiter : public WellenreiterBase {
 public:
-
-    Wellenreiter( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    Wellenreiter( QWidget* parent = 0 );
     ~Wellenreiter();
 
-protected:
+    void setConfigWindow( WellenreiterConfigWindow* cw );
     
+  protected:
     bool daemonRunning;
@@ -58,4 +58,4 @@ protected:
 public slots:
-    void buttonClicked();
     void dataReceived();
+    void startStopClicked();
 
@@ -69,2 +69,3 @@ private:
     ManufacturerDB* manufacturerdb;
+    WellenreiterConfigWindow* configwindow;
     struct sockaddr_in sockaddr;
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"
@@ -58,3 +57,7 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     resize( 191, 294 ); 
-    setCaption( tr( "Wellenreiter" ) );
+#ifdef QWS
+    setCaption( tr( "Wellenreiter/Opie" ) );
+#else
+    setCaption( tr( "Wellenreiter/X11" ) );
+#endif
     WellenreiterBaseLayout = new QVBoxLayout( this ); 
@@ -87,6 +90,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
 
-    //--------- CONFIG TAB --------------
-    
-    configwindow = new WellenreiterConfigWindow( TabWidget, "Config" );
-    
     //--------- ABOUT TAB --------------
@@ -127,6 +126,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
    
-    button = new QPushButton( this, "button" );
-    button->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, button->sizePolicy().hasHeightForWidth() ) );
-    button->setText( tr( "Start Scanning" ) );
-
 #ifdef QWS    
@@ -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,3 +135,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" ) );
@@ -145,3 +138,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     WellenreiterBaseLayout->addWidget( TabWidget );
-    WellenreiterBaseLayout->addWidget( button );
    
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h
index edb2930..1fa1ea3 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.h
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h
@@ -29,3 +29,2 @@ class MLogWindow;
 class MHexWindow;
-class WellenreiterConfigWindow;
 
@@ -54,3 +53,2 @@ public:
     MHexWindow* hexwindow;
-    WellenreiterConfigWindow* configwindow;
     QWidget* about;
@@ -58,3 +56,2 @@ public:
     QLabel* TextLabel1_4_2;
-    QPushButton* button;