Diffstat (limited to 'noncore/net/wellenreiter/gui/configwindow.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 16 |
1 files changed, 11 insertions, 5 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 @@ -89,15 +89,21 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char // 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 @@ -305,13 +311,13 @@ void WellenreiterConfigWindow::performAction( const QString& type, 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; @@ -395,17 +401,17 @@ void WellenreiterConfigWindow::load() 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 |