Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 37 |
1 files changed, 14 insertions, 23 deletions
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 | { |
@@ -80,3 +81,3 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) | |||
80 | logwindow->log( "(i) Wellenreiter has been started." ); | 81 | logwindow->log( "(i) Wellenreiter has been started." ); |
81 | 82 | ||
82 | // | 83 | // |
@@ -84,3 +85,3 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) | |||
84 | // | 85 | // |
85 | 86 | ||
86 | #ifdef QWS | 87 | #ifdef QWS |
@@ -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 ); |
@@ -119,3 +117,3 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) | |||
119 | netview->setManufacturerDB( manufacturerdb ); | 117 | netview->setManufacturerDB( manufacturerdb ); |
120 | 118 | ||
121 | } | 119 | } |
@@ -125,3 +123,3 @@ Wellenreiter::~Wellenreiter() | |||
125 | // no need to delete child widgets, Qt does it all for us | 123 | // no need to delete child widgets, Qt does it all for us |
126 | 124 | ||
127 | delete manufacturerdb; | 125 | delete manufacturerdb; |
@@ -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 ..." ) ); |