From 767365b49f2aa679afd388c1fd9384cc6a6df4ef Mon Sep 17 00:00:00 2001 From: mickeyl Date: Thu, 12 Dec 2002 10:53:13 +0000 Subject: Config Tab is shaping up. --- diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui index 8f38252..57ffd2a 100644 --- a/noncore/net/wellenreiter/gui/configbase.ui +++ b/noncore/net/wellenreiter/gui/configbase.ui @@ -1,18 +1,18 @@ -Form1 +WellenreiterConfigBase QWidget name - Form1 + WellenreiterConfigBase geometry 0 0 - 226 - 300 + 240 + 276 @@ -29,250 +29,320 @@ 6 - QGroupBox + QLayoutWidget name - GroupBox1 + Layout5 + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + TextLabel3_2 + + + sizePolicy + + 4 + 1 + + + + text + Sniffer + + + + Line + + name + Line9 + + + orientation + Horizontal + + + + + + QLayoutWidget - title - Sniffer Options + name + Layout7 margin - 11 + 0 spacing 6 - QLayoutWidget + QComboBox + + + text + <select> + + + + + text + eth0 + + + + + text + eth1 + + + + + text + wlan0 + + + + + text + wlan1 + + + + + text + wifi0 + + + + + text + wifi1 + + name - Layout1 + interfaceName + + + enabled + false - - - margin - 0 + + + QCheckBox + + name + activeScanning + + + enabled + false + + + text + Active Scanning (caution!) + + + + QComboBox + + + text + <select> + + + + + text + cisco + + + + + text + orinoco + + + + + text + prism - - spacing - 6 + + + + text + <manual> - - QSpinBox - - name - hopInterval - - - suffix - ms - - - maxValue - 2000 - - - minValue - 100 - - - lineStep - 100 - - - - QLabel - - name - TextLabel3 - - - text - Hop Interval - - - - QComboBox - - - text - <select> - - - - - text - eth0 - - - - - text - eth1 - - - - - text - wlan0 - - - - - text - wlan1 - - - - - text - wifi0 - - - - - text - wifi1 - - - - name - interfaceName - - - - QLabel - - name - TextLabel1 - - - text - Interface Name - - - - QComboBox - - - text - <select> - - - - - text - cisco - - - - - text - orinoco - - - - - text - prism - - - - - text - <manual> - - - - name - deviceType - - - - QLabel - - name - TextLabel2 - - - text - Device Type - - - + + + name + deviceType + + + enabled + false + + + + QCheckBox + + name + additionalInfo + + + enabled + false + + + text + Gather Additional Info + + + + QSpinBox + + name + hopInterval + + + enabled + false + + + suffix + ms + + + maxValue + 2000 + + + minValue + 100 + + + lineStep + 100 + + + + QLabel + + name + TextLabel3_3 + + + enabled + false + + + text + Hop Interval + + + + QLabel + + name + TextLabel2_3 + + + enabled + false + + + text + Device Type + + + + QLabel + + name + TextLabel1_2 + + + enabled + false + + + text + Interface Name + - QGroupBox + QLayoutWidget name - GroupBox8 + Layout6 - - title - Advanced Options - - - QCheckBox - - name - additionalInfo - - - geometry - - 11 - 19 - 147 - 19 - - - - text - Gather Additional Info - - - - QCheckBox - - name - activeScanning - + - geometry - - 11 - 44 - 175 - 19 - + margin + 0 - text - Active Scanning (caution!) + spacing + 6 - + + QLabel + + name + TextLabel3_2_2 + + + sizePolicy + + 4 + 1 + + + + text + GUI + + + + Line + + name + Line9_2 + + + orientation + Horizontal + + + - QGroupBox + QLayoutWidget name - GroupBox3 - - - title - GUI Options + Layout8 margin - 11 + 0 spacing @@ -285,6 +355,10 @@ groupNetworks + enabled + false + + text Group Detected Networks @@ -296,6 +370,10 @@ enableActivity + enabled + false + + text Enable Activity Display diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index a047433..b271ee3 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro @@ -2,8 +2,8 @@ DESTDIR = $(OPIEDIR)/bin TEMPLATE = app CONFIG = qt warn_on debug #CONFIG = qt warn_on release -HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h -SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp +HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h +SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp INCLUDEPATH += $(OPIEDIR)/include ../daemon DEPENDPATH += $(OPIEDIR)/include ../daemon LIBS += -lqpe -lopie -lwellenreiter diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index b1845b9..aa94c81 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp @@ -30,6 +30,7 @@ #include "logwindow.h" #include "hexwindow.h" +#include "configwindow.h" #include @@ -90,8 +91,8 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f //--------- CONFIG TAB -------------- - QPushButton* dummy = new QPushButton( "under construction", TabWidget ); - TabWidget->addTab( dummy, "wellenreiter/config", tr( "Config" ) ); + configwindow = new WellenreiterConfigWindow( TabWidget, "Config" ); + TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) ); //--------- ABOUT TAB -------------- diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h index b7bd820..4e5ca94 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.h +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h @@ -28,6 +28,7 @@ class QPushButton; class OTabWidget; class MLogWindow; class MHexWindow; +class WellenreiterConfigWindow; class WellenreiterBase : public QWidget { @@ -41,7 +42,8 @@ public: QWidget* ap; QListView* netview; MLogWindow* logwindow; - MHexWindow* hexwindow; + MHexWindow* hexwindow; + WellenreiterConfigWindow* configwindow; QWidget* about; QLabel* PixmapLabel1_3_2; QLabel* TextLabel1_4_2; -- cgit v0.9.0.2