author | mickeyl <mickeyl> | 2003-02-23 15:14:18 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-02-23 15:14:18 (UTC) |
commit | 9b7faae2ec12eeb9a056ca6093ac6e0840b11717 (patch) (unidiff) | |
tree | fc4d9de4ee2fd5c502513ccf0fa592bfaaa87185 /noncore/net/wellenreiter/gui | |
parent | 791c7512c530cb373726f9c01e26229cb8ca992a (diff) | |
download | opie-9b7faae2ec12eeb9a056ca6093ac6e0840b11717.zip opie-9b7faae2ec12eeb9a056ca6093ac6e0840b11717.tar.gz opie-9b7faae2ec12eeb9a056ca6093ac6e0840b11717.tar.bz2 |
- revamped part of the gui
- configuration is now a seperate dialog
- orinoco_hopper is no longer needed
-rw-r--r-- | noncore/net/wellenreiter/gui/configbase.ui | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 12 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 74 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.h | 8 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/manufacturers.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 29 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 11 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 18 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.h | 3 |
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 @@ | |||
3 | <widget> | 3 | <widget> |
4 | <class>QWidget</class> | 4 | <class>QDialog</class> |
5 | <property stdset="1"> | 5 | <property stdset="1"> |
@@ -13,3 +13,3 @@ | |||
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>224</width> | 14 | <width>220</width> |
15 | <height>267</height> | 15 | <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 @@ | |||
21 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) | 21 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) |
22 | :WellenreiterConfigBase( parent, name, f ) | 22 | :WellenreiterConfigBase( parent, name, true, f ) |
23 | { | 23 | { |
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 @@ | |||
1 | MOC_DIR = ./tmp | ||
2 | OBJECTS_DIR = ./tmp | ||
1 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
@@ -3,5 +5,5 @@ TEMPLATE = app | |||
3 | CONFIG = qt warn_on debug | 5 | CONFIG = qt warn_on debug |
4 | #CONFIG = qt warn_on release | 6 | |
5 | HEADERS = mainwindow.h \ | 7 | HEADERS = wellenreiterbase.h \ |
6 | wellenreiterbase.h \ | 8 | mainwindow.h \ |
7 | wellenreiter.h \ | 9 | wellenreiter.h \ |
@@ -15,2 +17,3 @@ HEADERS = mainwindow.h \ | |||
15 | manufacturers.h | 17 | manufacturers.h |
18 | |||
16 | SOURCES = main.cpp \ | 19 | SOURCES = main.cpp \ |
@@ -26,3 +29,4 @@ SOURCES = main.cpp \ | |||
26 | cardconfig.cpp \ | 29 | cardconfig.cpp \ |
27 | manufacturers.h | 30 | manufacturers.cpp |
31 | |||
28 | INCLUDEPATH += $(OPIEDIR)/include ../ | 32 | 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 @@ | |||
15 | 15 | ||
16 | #include "configwindow.h" | ||
16 | #include "mainwindow.h" | 17 | #include "mainwindow.h" |
@@ -18,2 +19,3 @@ | |||
18 | 19 | ||
20 | #include <qcombobox.h> | ||
19 | #include <qiconset.h> | 21 | #include <qiconset.h> |
@@ -33,3 +35,5 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
33 | { | 35 | { |
36 | cw = new WellenreiterConfigWindow( this ); | ||
34 | mw = new Wellenreiter( this ); | 37 | mw = new Wellenreiter( this ); |
38 | mw->setConfigWindow( cw ); | ||
35 | setCentralWidget( mw ); | 39 | setCentralWidget( mw ); |
@@ -45,7 +49,9 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
45 | 49 | ||
46 | QToolButton* b = new QToolButton( 0 ); | 50 | startStopButton = new QToolButton( 0 ); |
47 | b->setAutoRaise( true ); | 51 | startStopButton->setAutoRaise( true ); |
48 | b->setOnIconSet( *cancelIconSet ); | 52 | startStopButton->setOnIconSet( *cancelIconSet ); |
49 | b->setOffIconSet( *searchIconSet ); | 53 | startStopButton->setOffIconSet( *searchIconSet ); |
50 | b->setToggleButton( true ); | 54 | startStopButton->setToggleButton( true ); |
55 | connect( startStopButton, SIGNAL( clicked() ), mw, SLOT( startStopClicked() ) ); | ||
56 | startStopButton->setEnabled( false ); | ||
51 | 57 | ||
@@ -59,2 +65,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
59 | d->setIconSet( *settingsIconSet ); | 65 | d->setIconSet( *settingsIconSet ); |
66 | connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); | ||
60 | 67 | ||
@@ -64,14 +71,31 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
64 | 71 | ||
65 | QPopupMenu* p = new QPopupMenu( mb ); | 72 | QPopupMenu* file = new QPopupMenu( mb ); |
66 | p->insertItem( "&Load" ); | 73 | file->insertItem( "&Load" ); |
67 | p->insertItem( "&Save" ); | 74 | file->insertItem( "&Save" ); |
68 | 75 | ||
69 | mb->insertItem( "&File", p ); | 76 | QPopupMenu* view = new QPopupMenu( mb ); |
70 | mb->setItemEnabled( mb->insertItem( b ), false ); | 77 | view->insertItem( "&Configure" ); |
71 | mb->setItemEnabled( mb->insertItem( c ), false ); | 78 | |
79 | QPopupMenu* sniffer = new QPopupMenu( mb ); | ||
80 | sniffer->insertItem( "&Configure" ); | ||
81 | sniffer->insertSeparator(); | ||
82 | |||
83 | int id; | ||
84 | |||
85 | id = mb->insertItem( "&File", file ); | ||
86 | mb->setItemEnabled( id, false ); | ||
87 | id = mb->insertItem( "&View", view ); | ||
88 | mb->setItemEnabled( id, false ); | ||
89 | id = mb->insertItem( "&Sniffer", sniffer ); | ||
90 | mb->setItemEnabled( id, false ); | ||
91 | |||
92 | mb->insertItem( startStopButton ); | ||
93 | mb->insertItem( c ); | ||
72 | mb->insertItem( d ); | 94 | mb->insertItem( d ); |
73 | 95 | ||
74 | // setup status bar | 96 | // setup status bar (for now only on X11) |
75 | 97 | ||
76 | // statusBar()->message( "Ready." ); | 98 | #ifndef QWS |
99 | statusBar()->message( "Ready." ); | ||
100 | #endif | ||
77 | 101 | ||
@@ -79,2 +103,26 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
79 | 103 | ||
104 | void WellenreiterMainWindow::showConfigure() | ||
105 | { | ||
106 | qDebug( "show configure..." ); | ||
107 | cw->setCaption( tr( "Configure" ) ); | ||
108 | cw->showMaximized(); | ||
109 | int result = cw->exec(); | ||
110 | |||
111 | if ( result ) | ||
112 | { | ||
113 | // check configuration from config window | ||
114 | |||
115 | const QString& interface = cw->interfaceName->currentText(); | ||
116 | const int cardtype = cw->daemonDeviceType(); | ||
117 | const int interval = cw->daemonHopInterval(); | ||
118 | |||
119 | if ( ( interface != "<select>" ) && ( cardtype != 0 ) ) | ||
120 | startStopButton->setEnabled( true ); | ||
121 | //TODO ... | ||
122 | else | ||
123 | startStopButton->setEnabled( false ); | ||
124 | //TODO ... | ||
125 | } | ||
126 | } | ||
127 | |||
80 | WellenreiterMainWindow::~WellenreiterMainWindow() | 128 | 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 @@ | |||
21 | class Wellenreiter; | 21 | class Wellenreiter; |
22 | class WellenreiterConfigWindow; | ||
22 | class QIconSet; | 23 | class QIconSet; |
24 | class QToolButton; | ||
23 | 25 | ||
@@ -25,2 +27,3 @@ class WellenreiterMainWindow: public QMainWindow | |||
25 | { | 27 | { |
28 | Q_OBJECT | ||
26 | 29 | ||
@@ -32,2 +35,3 @@ class WellenreiterMainWindow: public QMainWindow | |||
32 | Wellenreiter* mw; | 35 | Wellenreiter* mw; |
36 | WellenreiterConfigWindow* cw; | ||
33 | 37 | ||
@@ -38,3 +42,6 @@ class WellenreiterMainWindow: public QMainWindow | |||
38 | 42 | ||
43 | QToolButton* startStopButton; | ||
39 | 44 | ||
45 | public slots: | ||
46 | void showConfigure(); | ||
40 | }; | 47 | }; |
@@ -42,2 +49 @@ class WellenreiterMainWindow: public QMainWindow | |||
42 | #endif | #endif | |
43 | |||
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 ) | |||
43 | #ifdef DEBUG | 43 | #ifdef DEBUG |
44 | qDebug( "ManufacturerDB: read pair %s, %s", (const char*) addr, (const char*) manu ); | 44 | //qDebug( "ManufacturerDB: read pair %s, %s", (const char*) addr, (const char*) manu ); |
45 | #endif | 45 | #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; | |||
63 | 63 | ||
64 | Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) | 64 | Wellenreiter::Wellenreiter( QWidget* parent ) |
65 | : WellenreiterBase( parent, name, fl ), daemonRunning( false ), manufacturerdb( 0 ) | 65 | : WellenreiterBase( parent, 0, 0 ), |
66 | daemonRunning( false ), manufacturerdb( 0 ), configwindow( 0 ) | ||
66 | { | 67 | { |
@@ -112,5 +113,2 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) | |||
112 | // setup GUI | 113 | // setup GUI |
113 | |||
114 | connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) ); | ||
115 | // button->setEnabled( false ); | ||
116 | netview->setColumnWidthMode( 1, QListView::Manual ); | 114 | netview->setColumnWidthMode( 1, QListView::Manual ); |
@@ -129,2 +127,7 @@ Wellenreiter::~Wellenreiter() | |||
129 | 127 | ||
128 | void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw ) | ||
129 | { | ||
130 | configwindow = cw; | ||
131 | } | ||
132 | |||
130 | void Wellenreiter::handleMessage() | 133 | void Wellenreiter::handleMessage() |
@@ -213,14 +216,4 @@ void Wellenreiter::dataReceived() | |||
213 | 216 | ||
214 | void Wellenreiter::buttonClicked() | 217 | void Wellenreiter::startStopClicked() |
215 | { | 218 | { |
216 | /* | ||
217 | // add some test stations, so that we can see if the GUI part works | ||
218 | addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 ); | ||
219 | addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 ); | ||
220 | addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 ); | ||
221 | addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 ); | ||
222 | addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 ); | ||
223 | */ | ||
224 | |||
225 | |||
226 | if ( daemonRunning ) | 219 | if ( daemonRunning ) |
@@ -230,3 +223,2 @@ void Wellenreiter::buttonClicked() | |||
230 | logwindow->log( "(i) Daemon has been stopped." ); | 223 | logwindow->log( "(i) Daemon has been stopped." ); |
231 | button->setText( tr( "Start Scanning" ) ); | ||
232 | setCaption( tr( "Wellenreiter/Opie" ) ); | 224 | setCaption( tr( "Wellenreiter/Opie" ) ); |
@@ -263,3 +255,3 @@ void Wellenreiter::buttonClicked() | |||
263 | { | 255 | { |
264 | QMessageBox::information( this, "Wellenreiter/Opie", "You must configure your\ndevice before scanning." ); | 256 | QMessageBox::information( this, "Wellenreiter/Opie", "Your device is not\nptoperly configured. Please reconfigure!" ); |
265 | return; | 257 | return; |
@@ -278,3 +270,2 @@ void Wellenreiter::buttonClicked() | |||
278 | daemonRunning = true; | 270 | daemonRunning = true; |
279 | button->setText( tr( "Stop Scanning" ) ); | ||
280 | setCaption( tr( "Scanning ..." ) ); | 271 | 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; | |||
40 | 40 | ||
41 | |||
42 | class QTimerEvent; | 41 | class QTimerEvent; |
@@ -44,2 +43,3 @@ class QPixmap; | |||
44 | class ManufacturerDB; | 43 | class ManufacturerDB; |
44 | class WellenreiterConfigWindow; | ||
45 | 45 | ||
@@ -49,8 +49,8 @@ class Wellenreiter : public WellenreiterBase { | |||
49 | public: | 49 | public: |
50 | 50 | Wellenreiter( QWidget* parent = 0 ); | |
51 | Wellenreiter( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | ||
52 | ~Wellenreiter(); | 51 | ~Wellenreiter(); |
53 | 52 | ||
54 | protected: | 53 | void setConfigWindow( WellenreiterConfigWindow* cw ); |
55 | 54 | ||
55 | protected: | ||
56 | bool daemonRunning; | 56 | bool daemonRunning; |
@@ -58,4 +58,4 @@ protected: | |||
58 | public slots: | 58 | public slots: |
59 | void buttonClicked(); | ||
60 | void dataReceived(); | 59 | void dataReceived(); |
60 | void startStopClicked(); | ||
61 | 61 | ||
@@ -69,2 +69,3 @@ private: | |||
69 | ManufacturerDB* manufacturerdb; | 69 | ManufacturerDB* manufacturerdb; |
70 | WellenreiterConfigWindow* configwindow; | ||
70 | struct sockaddr_in sockaddr; | 71 | 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 @@ | |||
31 | #include "hexwindow.h" | 31 | #include "hexwindow.h" |
32 | #include "configwindow.h" | ||
33 | #include "scanlist.h" | 32 | #include "scanlist.h" |
@@ -58,3 +57,7 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
58 | resize( 191, 294 ); | 57 | resize( 191, 294 ); |
59 | setCaption( tr( "Wellenreiter" ) ); | 58 | #ifdef QWS |
59 | setCaption( tr( "Wellenreiter/Opie" ) ); | ||
60 | #else | ||
61 | setCaption( tr( "Wellenreiter/X11" ) ); | ||
62 | #endif | ||
60 | WellenreiterBaseLayout = new QVBoxLayout( this ); | 63 | WellenreiterBaseLayout = new QVBoxLayout( this ); |
@@ -87,6 +90,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
87 | 90 | ||
88 | //--------- CONFIG TAB -------------- | ||
89 | |||
90 | configwindow = new WellenreiterConfigWindow( TabWidget, "Config" ); | ||
91 | |||
92 | //--------- ABOUT TAB -------------- | 91 | //--------- ABOUT TAB -------------- |
@@ -127,6 +126,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
127 | 126 | ||
128 | button = new QPushButton( this, "button" ); | ||
129 | button->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, button->sizePolicy().hasHeightForWidth() ) ); | ||
130 | button->setText( tr( "Start Scanning" ) ); | ||
131 | |||
132 | #ifdef QWS | 127 | #ifdef QWS |
@@ -135,3 +130,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
135 | TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); | 130 | TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); |
136 | TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) ); | ||
137 | TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); | 131 | TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); |
@@ -141,3 +135,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
141 | TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) ); | 135 | TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) ); |
142 | TabWidget->addTab( configwindow, /* "wellenreiter/config", */ tr( "Config" ) ); | ||
143 | TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) ); | 136 | TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) ); |
@@ -145,3 +138,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
145 | WellenreiterBaseLayout->addWidget( TabWidget ); | 138 | WellenreiterBaseLayout->addWidget( TabWidget ); |
146 | WellenreiterBaseLayout->addWidget( button ); | ||
147 | 139 | ||
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; | |||
29 | class MHexWindow; | 29 | class MHexWindow; |
30 | class WellenreiterConfigWindow; | ||
31 | 30 | ||
@@ -54,3 +53,2 @@ public: | |||
54 | MHexWindow* hexwindow; | 53 | MHexWindow* hexwindow; |
55 | WellenreiterConfigWindow* configwindow; | ||
56 | QWidget* about; | 54 | QWidget* about; |
@@ -58,3 +56,2 @@ public: | |||
58 | QLabel* TextLabel1_4_2; | 56 | QLabel* TextLabel1_4_2; |
59 | QPushButton* button; | ||
60 | 57 | ||