From 58a78cbe1bc5ded219ba23432041f20e03404403 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Mon, 05 May 2003 22:27:02 +0000 Subject: major overhaul of the configuration window - showing what will come soon... --- (limited to 'noncore/net/wellenreiter') diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui index a8b55bb..d85956e 100644 --- a/noncore/net/wellenreiter/gui/configbase.ui +++ b/noncore/net/wellenreiter/gui/configbase.ui @@ -11,13 +11,13 @@ 0 0 - 232 - 342 + 209 + 287 caption - Form1 + Wellenreiter II COnfiguration Dialog layoutMargin @@ -28,526 +28,825 @@ margin - 6 + 2 spacing - 5 + 3 - - QLayoutWidget + + QTabWidget name - Layout5 + tab - layoutSpacing - - - - margin - 0 - - - spacing - 2 - - - QLabel - - name - TextLabel3_2 - - - sizePolicy - - 4 - 1 - - - - text - Sniffer - - - - Line - - name - Line9 - - - orientation - Horizontal - - - - - - QComboBox - - name - interfaceName - - - enabled - true - - - whatsThis - Choose the interface used for sniffing. - - - - QComboBox - - - text - <select> - - - - - text - cisco - - - - - text - wlan-ng - - - - - text - hostap - - - - - text - orinoco - - - - - text - <manual> - - - - - text - <file> - - - - name - deviceType - - - enabled - true + layoutMargin - whatsThis - Choose the type of driver used for sniffing. - - - - QSpinBox - - name - hopInterval - - - enabled - true - - - suffix - ms - - - maxValue - 2000 - - - minValue - 100 - - - lineStep - 100 - - - whatsThis - Choose the channel hop interval. - - - - QLabel - - name - TextLabel3_3 - - - enabled - true - - - text - Hop Interval - - - - QLabel - - name - TextLabel2_3 - - - enabled - true - - - text - Device Type - - - - QLabel - - name - TextLabel1_2 - - - enabled - true - - - text - Interface Name - - - - QLabel - - name - TextLabel1_5 - - - text - Fake MAC: - - - - QLineEdit - - name - MAC - - - enabled - false - - - text - 44:44:44:44:44:44 - - - - QCheckBox - - name - activeScanning - - - enabled - false - - - text - Active Scanning (caution!) - - - - QLayoutWidget - - name - Layout5 + layoutSpacing - - - margin - 0 - + + QWidget - spacing - 6 + name + tab - - QLabel + + title + Interface + + - name - TextLabel1 + margin + 5 - text - sound on new net + spacing + 3 - - - QComboBox - - + + QLabel + + name + TextLabel1_2 + + + enabled + true + + text - Ignore + Name: - - - + + + QLabel + + name + TextLabel2_3 + + + enabled + true + + text - Touch + Driver: - - - + + + QCheckBox + + name + hopChannels + + text - Key + Hop Channels - - - + + checked + true + + + + QCheckBox + + name + prismHeader + + text - Alarm + Use additional PRISM header + + + + QSpinBox + + name + hopInterval + + + enabled + true + + + suffix + ms + + + maxValue + 2000 + + + minValue + 100 + + + lineStep + 100 + + + value + 1000 - - - name - beaconSound - - - - QComboBox - - text - Ignore + whatsThis + Choose the channel hop interval. + + + + QGroupBox + + name + GroupBox1 + + + title + Scan on channel - - - text - Touch + layoutMargin - - - text - Key + layoutSpacing + + + + margin + 4 + + + spacing + 2 + + + QCheckBox + + name + channel6 + + + text + 6 + + + + QCheckBox + + name + channel8 + + + text + 8 + + + + QCheckBox + + name + channel2 + + + text + 2 + + + + QCheckBox + + name + channel9 + + + text + 9 + + + + QCheckBox + + name + channel1 + + + text + 1 + + + + QCheckBox + + name + channelAll + + + text + All + + + + QCheckBox + + name + channel11 + + + text + 11 + + + + QCheckBox + + name + channel10 + + + text + 10 + + + + QCheckBox + + name + channel7 + + + text + 7 + + + + QCheckBox + + name + channel3 + + + text + 3 + + + + QCheckBox + + name + channel5 + + + text + 5 + + + + QCheckBox + + name + channel4 + + + text + 4 + + + + QCheckBox + + name + channel12 + + + text + 12 + + + + QCheckBox + + name + channel13 + + + text + 13 + + + + QCheckBox + + name + channel14 + + + text + 14 + + + + + + QComboBox + + name + interfaceName + + + enabled + true - - + whatsThis + Choose the interface used for sniffing. + + + + QComboBox + + + text + <select> + + + + + text + cisco + + + + + text + wlan-ng + + + + + text + hostap + + + + + text + orinoco + + + + + text + <manual> + + + + + text + <file> + + + + name + deviceType + + + enabled + true + + + whatsThis + Choose the type of driver used for sniffing. + + + + QLabel + + name + TextLabel1 + + text - Alarm + every - - - name - netSound - - - - QLabel - - name - TextLabel1_3 - - - text - sound on beacon - - - - - - QLayoutWidget - - name - Layout7 - - - - margin - 0 - + + + + name + Spacer4 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + QWidget - spacing - 6 + name + tab - - QCheckBox - - name - writeCaptureFile - - - enabled - true - + + title + Capture + + - text - Write Capture File + margin + 5 - - - QToolButton - name - getCaptureFileName + spacing + 3 - - enabled - false - - - text - ... - - - - - - QLayoutWidget - - name - Layout6 - - - layoutSpacing - - - - margin - 0 - + + ProtocolListView + + name + capturePackets + + + sizePolicy + + 7 + 7 + + + + + QLineEdit + + name + captureFileName + + + enabled + false + + + + QToolButton + + name + getCaptureFileName + + + enabled + false + + + text + Browse + + + + + name + Spacer2 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QCheckBox + + name + writeCaptureFile + + + enabled + true + + + text + Write Capture Files To + + + + + + QWidget - spacing - 2 + name + tab - - QLabel - - name - TextLabel3_2_2 - - - sizePolicy - - 4 - 1 - - - - text - GUI - - - - Line + + title + Parse + + - name - Line9_2 + margin + 5 - orientation - Horizontal + spacing + 3 - - - - - - name - Spacer1 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QLayoutWidget - - name - Layout7 - - - - margin - 0 - + + ProtocolListView + + name + parsePackets + + + sizePolicy + + 7 + 7 + + + + + + + QWidget - spacing - 6 + name + tab - - QLabel - - name - TextLabel1_4 - - - text - CaptureFile: - - - - QLineEdit + + title + Intrusion + + - name - captureFileName + margin + 11 - enabled - false + spacing + 6 - - + + QGroupBox + + name + GroupBox3 + + + enabled + false + + + title + Link Level + + + + margin + 11 + + + spacing + 6 + + + QLabel + + name + TextLabel1_5 + + + text + Fake Mac: + + + + QCheckBox + + name + sendProbeRequests + + + text + Send proble requests + + + + QComboBox + + + text + <automatic> + + + + + text + 44:44:44:44:44:44 + + + + name + fakeMac + + + sizePolicy + + 7 + 0 + + + + editable + true + + + currentItem + 1 + + + autoCompletion + true + + + + QCheckBox + + name + tryToAuthenticate + + + text + Try to authenticate + + + + + + QCheckBox + + name + enableActiveScanning + + + enabled + false + + + text + Enable active scanning + + + + QGroupBox + + name + GroupBox4 + + + enabled + false + + + title + IP Level + + + + margin + 11 + + + spacing + 6 + + + QCheckBox + + name + CheckBox24 + + + text + Request DHCP Address + + + + QLabel + + name + TextLabel1_5_2 + + + text + Fake IP: + + + + QComboBox + + + text + 192.168.125.1 + + + + + text + <automatic> + + + + name + fakeIP + + + sizePolicy + + 7 + 0 + + + + editable + true + + + currentItem + 0 + + + + + + + + + ProtocolListView +
protolistview.h
+ + 100 + 100 + + 0 + + 3 + 3 + + image0 + + + + + image0 + 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 + + - writeCaptureFile + hopChannels + toggled(bool) + hopInterval + setEnabled(bool) + + + hopChannels toggled(bool) - getCaptureFileName + TextLabel1 setEnabled(bool) - activeScanning + enableActiveScanning toggled(bool) - MAC + GroupBox3 setEnabled(bool) - writeCaptureFile + enableActiveScanning toggled(bool) - captureFileName + GroupBox4 setEnabled(bool) diff --git a/noncore/net/wellenreiter/gui/configbasenew.ui b/noncore/net/wellenreiter/gui/configbasenew.ui deleted file mode 100644 index 1307f00..0000000 --- a/noncore/net/wellenreiter/gui/configbasenew.ui +++ b/dev/null @@ -1,814 +0,0 @@ - -Form1 - - QDialog - - name - Form1 - - - geometry - - 0 - 0 - 280 - 382 - - - - caption - Form1 - - - layoutMargin - - - layoutSpacing - - - - margin - 5 - - - spacing - 3 - - - QTabWidget - - name - interface - - - layoutMargin - - - layoutSpacing - - - QWidget - - name - tab - - - title - Interface - - - - margin - 11 - - - spacing - 6 - - - QLabel - - name - TextLabel1_2 - - - enabled - true - - - text - Name: - - - - QComboBox - - name - name - - - enabled - true - - - whatsThis - Choose the interface used for sniffing. - - - - QLabel - - name - TextLabel2_3 - - - enabled - true - - - text - Driver: - - - - QComboBox - - - text - <select> - - - - - text - cisco - - - - - text - wlan-ng - - - - - text - hostap - - - - - text - orinoco - - - - - text - <manual> - - - - - text - <file> - - - - name - driver - - - enabled - true - - - whatsThis - Choose the type of driver used for sniffing. - - - - QCheckBox - - name - CheckBox18 - - - text - Hop Channels - - - checked - true - - - - QLabel - - name - TextLabel1 - - - text - every - - - - QSpinBox - - name - hopInterval - - - enabled - true - - - suffix - ms - - - maxValue - 2000 - - - minValue - 100 - - - lineStep - 100 - - - value - 1000 - - - whatsThis - Choose the channel hop interval. - - - - QGroupBox - - name - GroupBox1 - - - title - Scan on channel - - - - margin - 11 - - - spacing - 6 - - - QCheckBox - - name - channel6 - - - text - 6 - - - - QCheckBox - - name - channel8 - - - text - 8 - - - - QCheckBox - - name - channel2 - - - text - 2 - - - - QCheckBox - - name - channel9 - - - text - 9 - - - - QCheckBox - - name - channel1 - - - text - 1 - - - - QCheckBox - - name - channelAll - - - text - All - - - - QCheckBox - - name - channel11 - - - text - 11 - - - - QCheckBox - - name - channel10 - - - text - 10 - - - - QCheckBox - - name - channel7 - - - text - 7 - - - - QCheckBox - - name - channel3 - - - text - 3 - - - - QCheckBox - - name - channel5 - - - text - 5 - - - - QCheckBox - - name - channel4 - - - text - 4 - - - - QCheckBox - - name - channel12 - - - text - 12 - - - - QCheckBox - - name - channel13 - - - text - 13 - - - - QCheckBox - - name - channel14 - - - text - 14 - - - - - - - name - Spacer4 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QCheckBox - - name - usePrismHeader - - - text - Use additional PRISM header - - - - - - QWidget - - name - tab - - - title - Capture - - - - margin - 5 - - - spacing - 3 - - - ProtocolListView - - name - MyCustomWidget1 - - - sizePolicy - - 7 - 7 - - - - - QCheckBox - - name - writeCaptureFile - - - enabled - true - - - text - Write Capture Files To - - - - QToolButton - - name - getCaptureFileName - - - enabled - false - - - text - ... - - - - QLineEdit - - name - captureFileName - - - enabled - false - - - - - - QWidget - - name - tab - - - title - Parse - - - - margin - 5 - - - spacing - 3 - - - ProtocolListView - - name - parsePackets - - - sizePolicy - - 7 - 7 - - - - - - - QWidget - - name - tab - - - title - Intrusion - - - - margin - 11 - - - spacing - 6 - - - QGroupBox - - name - GroupBox3 - - - enabled - false - - - title - Link Level - - - - margin - 11 - - - spacing - 6 - - - QLabel - - name - TextLabel1_5 - - - text - Fake Mac: - - - - QCheckBox - - name - sendProbeRequests - - - text - Send proble requests - - - - QComboBox - - - text - 44:44:44:44:44:44 - - - - - text - <automatic> - - - - name - fakeMac - - - sizePolicy - - 7 - 0 - - - - editable - true - - - autoCompletion - true - - - - QCheckBox - - name - tryToAuthenticate - - - text - Try to authenticate - - - - - - QCheckBox - - name - enableActiveScanning - - - enabled - false - - - text - Enable active scanning - - - - QGroupBox - - name - GroupBox4 - - - enabled - false - - - title - IP Level - - - - margin - 11 - - - spacing - 6 - - - QCheckBox - - name - CheckBox24 - - - text - Request DHCP Address - - - - QLabel - - name - TextLabel1_5_2 - - - text - Fake IP: - - - - QComboBox - - - text - 192.168.125.1 - - - - - text - <automatic> - - - - name - ComboBox10 - - - sizePolicy - - 7 - 0 - - - - - - - - - - - - - ProtocolListView -
protolistview.h
- - 100 - 100 - - 0 - - 3 - 3 - - image0 - - - - - image0 - 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 - - - - - CheckBox18 - toggled(bool) - hopInterval - setEnabled(bool) - - - CheckBox18 - toggled(bool) - TextLabel1 - setEnabled(bool) - - - enableActiveScanning - toggled(bool) - GroupBox3 - setEnabled(bool) - - - enableActiveScanning - toggled(bool) - GroupBox4 - setEnabled(bool) - - - diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp deleted file mode 100644 index 92715b4..0000000 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/dev/null @@ -1,146 +0,0 @@ -/********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. -** -** This file is part of Opie Environment. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -**********************************************************************/ - -/* LOCAL */ -#include "configwindow.h" -#include "mainwindow.h" - -/* QT */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* OPIE */ -#include - -WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; - -WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) - :WellenreiterConfigBase( parent, name, true, f ) -{ - _devicetype[ "cisco" ] = DEVTYPE_CISCO; - _devicetype[ "wlan-ng" ] = DEVTYPE_WLAN_NG; - _devicetype[ "hostap" ] = DEVTYPE_HOSTAP; - _devicetype[ "orinoco" ] = DEVTYPE_ORINOCO; - _devicetype[ "" ] = DEVTYPE_MANUAL; - _devicetype[ "" ] = DEVTYPE_FILE; - - // gather possible interface names from ONetwork - ONetwork* net = ONetwork::instance(); - ONetwork::InterfaceIterator it = net->iterator(); - while ( it.current() ) - { - if ( it.current()->isWireless() ) - interfaceName->insertItem( it.current()->name() ); - ++it; - } - - // try to guess device type - QFile m( "/proc/modules" ); - if ( m.open( IO_ReadOnly ) ) - { - int devicetype(0); - QString line; - QTextStream modules( &m ); - while( !modules.atEnd() && !devicetype ) - { - modules >> line; - if ( line.contains( "cisco" ) ) devicetype = DEVTYPE_CISCO; - else if ( line.contains( "hostap" ) ) devicetype = DEVTYPE_HOSTAP; - else if ( line.contains( "prism" ) ) devicetype = DEVTYPE_WLAN_NG; - else if ( line.contains( "orinoco" ) ) devicetype = DEVTYPE_ORINOCO; - } - if ( devicetype ) - { - deviceType->setCurrentItem( devicetype ); - _guess = devicetype; - qDebug( "Wellenreiter: guessed device type to be #%d", devicetype ); - } - } - - #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here - QPushButton* okButton = new QPushButton( "ok", this ); - okButton->show(); - Layout5_2->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui - connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); - #endif - - WellenreiterConfigWindow::_instance = this; - - connect( deviceType, SIGNAL( activated(int) ), this, SLOT( changedDeviceType(int) ) ); - connect( getCaptureFileName, SIGNAL( clicked() ), this, SLOT( getCaptureFileNameClicked() ) ); -}; - - -int WellenreiterConfigWindow::daemonDeviceType() -{ - QString name = deviceType->currentText(); - if ( _devicetype.contains( name ) ) - { - return _devicetype[name]; - } - else - { - return 0; - } -}; - - -int WellenreiterConfigWindow::daemonHopInterval() -{ - return hopInterval->cleanText().toInt(); -} - - -void WellenreiterConfigWindow::changedDeviceType(int t) -{ - if ( t != DEVTYPE_FILE ) return; - QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(false); - if ( !name.isEmpty() && QFile::exists( name ) ) - { - interfaceName->insertItem( name ); - interfaceName->setCurrentItem( interfaceName->count()-1 ); - } - else - { - deviceType->setCurrentItem( _guess ); - } - -} - - -void WellenreiterConfigWindow::getCaptureFileNameClicked() -{ - QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true); - qDebug( "name = %s", (const char*) name ); - if ( !name.isEmpty() ) - { - captureFileName->setText( name ); - } -} - - -bool WellenreiterConfigWindow::usePrismHeader() -{ - return true; - //return interface->usePrismHeader(); -} diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h deleted file mode 100644 index 11ae5b8..0000000 --- a/noncore/net/wellenreiter/gui/configwindow.h +++ b/dev/null @@ -1,59 +0,0 @@ -/********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. -** -** This file is part of Opie Environment. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -**********************************************************************/ - -#ifndef WELLENREITERCONFIGWINDOW_H -#define WELLENREITERCONFIGWINDOW_H - -#include "configbase.h" -#include -#include -#include - -const int DEVTYPE_SELECT = 0; -const int DEVTYPE_CISCO = 1; -const int DEVTYPE_WLAN_NG = 2; -const int DEVTYPE_HOSTAP = 3; -const int DEVTYPE_ORINOCO = 4; -const int DEVTYPE_MANUAL = 5; -const int DEVTYPE_FILE = 6; - -class WellenreiterConfigWindow; - -class WellenreiterConfigWindow : public WellenreiterConfigBase -{ - Q_OBJECT - - public: - WellenreiterConfigWindow( QWidget * parent = 0, const char * name = "WellenreiterConfigWindow", WFlags f = 0 ); - int daemonDeviceType(); - int daemonHopInterval(); - const QString soundOnNetwork() const { return netSound->currentText(); }; - const QString soundOnBeacon() const { return beaconSound->currentText(); }; - static WellenreiterConfigWindow* instance() { return _instance; }; - - bool usePrismHeader(); - - public slots: - void changedDeviceType(int); - void getCaptureFileNameClicked(); - - protected: - QMap _devicetype; - static WellenreiterConfigWindow* _instance; - int _guess; - -}; - -#endif diff --git a/noncore/net/wellenreiter/gui/graphwindow.cpp b/noncore/net/wellenreiter/gui/graphwindow.cpp index c620fe2..7e1f378 100644 --- a/noncore/net/wellenreiter/gui/graphwindow.cpp +++ b/noncore/net/wellenreiter/gui/graphwindow.cpp @@ -47,13 +47,13 @@ void MFrequencySpectrum::drawLine( QPainter* p, int x, int y, int width, const Q void MFrequencySpectrum::drawBar( QPainter* p, int x, int y, int width, int height, int maxheight ) { -/* int h1 = 133; int h2 = 0; + int h1 = 133; int h2 = 0; int s1 = 200; int s2 = 255; - int v1 = 140; int v2 = 255; */ + int v1 = 140; int v2 = 255; - int h1 = 196; int h2 = 194; + /*int h1 = 196; int h2 = 194; int s1 = 85; int s2 = 15; - int v1 = 95; int v2 = 237; + int v1 = 95; int v2 = 237;*/ QColor c( 120, 60, 200 ); for ( int i = 0; i < height; ++i ) @@ -125,7 +125,7 @@ MGraphWindow::MGraphWindow( QWidget* parent, const char* name, WFlags f ) { spectrum = new MFrequencySpectrum( 14, this ); legende = new Legende( 14, this ); - startTimer( 50 ); + startTimer( 50 ); //FIXME: tweak //testGraph(); @@ -146,7 +146,7 @@ void MGraphWindow::timerEvent( QTimerEvent* e ) { for ( int i = 0; i < 14; i++ ) { - spectrum->decrease( i, 4 ); + spectrum->decrease( i, 1 ); //TODO: make this customizable? } spectrum->repaint(); } diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index a11698f..2c4c6c3 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro @@ -13,7 +13,8 @@ HEADERS = wellenreiterbase.h \ statwindow.h \ configwindow.h \ manufacturers.h \ - graphwindow.h + graphwindow.h \ + protolistview.h SOURCES = main.cpp \ mainwindow.cpp \ @@ -25,11 +26,12 @@ SOURCES = main.cpp \ statwindow.cpp \ configwindow.cpp \ manufacturers.cpp \ - graphwindow.cpp + graphwindow.cpp \ + protolistview.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -INTERFACES = configbase.ui #configbasenew.ui +INTERFACES = configbase.ui TARGET = wellenreiter !contains( platform, x11 ) { diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 773d825..39f5978 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp @@ -181,8 +181,7 @@ void WellenreiterMainWindow::showConfigure() void WellenreiterMainWindow::updateToolButtonState() { const QString& interface = cw->interfaceName->currentText(); - const int cardtype = cw->daemonDeviceType(); - const int interval = cw->daemonHopInterval(); + const int cardtype = cw->driverType(); if ( ( interface != "