| -rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 16 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.h | 3 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 3 |
3 files changed, 16 insertions, 6 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 7f39230..9358866 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp @@ -87,19 +87,25 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char connect( autodetect, SIGNAL( clicked() ), this, SLOT( performAutodetection() ) ); // hide tab4 (parse) until Wellenreiter 1.2 tab->removePage( tab_4 ); }; -WellenreiterConfigWindow::~WellenreiterConfigWindow() +void WellenreiterConfigWindow::accept() { save(); + QDialog::accept(); +} + + +WellenreiterConfigWindow::~WellenreiterConfigWindow() +{ } void WellenreiterConfigWindow::performAutodetection() { //TODO: insert modal splash screen here // and sleep a second, so that it looks // like we're actually doing something fancy... ;-) @@ -303,17 +309,17 @@ void WellenreiterConfigWindow::performAction( const QString& type, script = newStationScript->text(); } else { qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type ); return; } - qDebug( "going to perform action %d (script='%s')", action, (const char*) script ); + qDebug( "for event '%s' I'm going to perform action %d (script='%s')", (const char*) type, action, (const char*) script ); switch( action ) { case 0: /* Ignore */ return; case 1: /* Play Alarm */ ODevice::inst()->alarmSound(); return; case 2: /* Play Click */ ODevice::inst()->touchSound(); return; case 3: /* Blink LED */ break; //FIXME: Implement this case 4: /* Run Script */ @@ -393,21 +399,21 @@ void WellenreiterConfigWindow::load() c->setGroup( "Capture" ); captureFileName->setText( c->readEntry( "filename", "/tmp/capture" ) ); c->setGroup( "UI" ); lookupVendor->setChecked( c->readBoolEntry( "lookupVendor", true ) ); openTree->setChecked( c->readBoolEntry( "openTree", true ) ); disablePM->setChecked( c->readBoolEntry( "disablePM", true ) ); - newNetworkAction->setCurrentItem( c->readNumEntry( "newNetworkAction", 0 ) ); + newNetworkAction->setCurrentItem( c->readNumEntry( "newNetworkAction", 1 ) ); // Default: Play Alarm newNetworkScript->setText( c->readEntry( "newNetworkScript", "" ) ); - newClientAction->setCurrentItem( c->readNumEntry( "newClientAction", 0 ) ); + newClientAction->setCurrentItem( c->readNumEntry( "newClientAction", 2 ) ); // Default: Play Click newClientScript->setText( c->readEntry( "newClientScript", "" ) ); - newStationAction->setCurrentItem( c->readNumEntry( "newStationAction", 0 ) ); + newStationAction->setCurrentItem( c->readNumEntry( "newStationAction", 2 ) ); // Default: Play Click newStationScript->setText( c->readEntry( "newStationScript", "" ) ); synchronizeActionsAndScripts(); // needed for showing/hiding the script QLineEdit on demand c->setGroup( "GPS" ); enableGPS->setChecked( c->readBoolEntry( "use", false ) ); #if QT_VERSION < 300 gpsdHost->insertItem( c->readEntry( "host", "localhost" ), 0 ); gpsdHost->setCurrentItem( 0 ); diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h index 5c998cb..d31d1e8 100644 --- a/noncore/net/wellenreiter/gui/configwindow.h +++ b/noncore/net/wellenreiter/gui/configwindow.h @@ -63,18 +63,19 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase void changedNetworkAction(int t); void changedClientAction(int t); void changedStationAction(int t); void getCaptureFileNameClicked(); void performAutodetection(); void channelAllClicked(int); void performAction( const QString&, const QString&, const QString&, bool, int, int /* , const GpsLocation& */ ); - protected: + protected slots: void synchronizeActionsAndScripts(); + virtual void accept(); protected: QMap<QString, int> _devicetype; static WellenreiterConfigWindow* _instance; int _guess; }; diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index fd88b63..10ead53 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp @@ -427,16 +427,19 @@ MScanListItem::MScanListItem( QListView* parent, const QString& type, const QStr MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const QString& essid, const QString& macaddr, bool wep, int channel, int signal ) :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) { #ifdef DEBUG qDebug( "creating scanlist item" ); #endif + if ( WellenreiterConfigWindow::instance() ) + WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here + decorateItem( type, essid, macaddr, wep, channel, signal, false ); } const QString& MScanListItem::essid() const { if ( type == "network" ) return _essid; else |