Diffstat (limited to 'core/settings/security/security.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/settings/security/security.cpp | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 34f7e50..4eddb55 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -50,10 +50,3 @@ - cfg.setGroup("Sync"); - QString sa = cfg.readEntry("syncapp","Qtopia"); - for (int i=0; i<syncapp->count(); i++) { - if ( syncapp->text(i) == sa ) { - syncapp->setCurrentItem(i); - } - } @@ -86,7 +79,15 @@ int mode = cfg.readNumEntry("Mode",2); // Default to Sharp - syncModeCombo->setCurrentItem( mode - 1 ); + switch( mode ) { + case 0x01: + syncModeCombo->setCurrentItem( 0 ); + break; + case 0x02: + default: + syncModeCombo->setCurrentItem( 1 ); + break; + case 0x04: + syncModeCombo->setCurrentItem( 2 ); + break; + } - //since nobody knows what this is and it doesn't do anything, i'll hide it # CoreDump - // is this work-in-progress or can it be removed? - syncModeCombo->hide(); @@ -96,3 +97,2 @@ connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode())); - connect(syncapp,SIGNAL(activated(int)), this, SLOT(changeSyncApp())); connect(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults())); @@ -132,2 +132,3 @@ void Security::restoreDefaults() } + syncModeCombo->setCurrentItem( 2 ); } @@ -348,3 +349,20 @@ void Security::applySecurity() - cfg.writeEntry("syncapp",syncapp->currentText()); +#ifdef ODP + #error "Use 0,1,2 and use Launcher" +#endif + /* keep the old code so we don't use currentItem directly */ + int value = 0x02; + switch( syncModeCombo->currentItem() ) { + case 0: + value = 0x01; + break; + case 1: + value = 0x02; + break; + case 2: + value = 0x04; + break; + } + cfg.setGroup("SyncMode"); + cfg.writeEntry( "Mode", value ); @@ -371,19 +389,3 @@ void Security::applySecurity() } -void Security::changeSyncApp() -{ - // Don't say i didn't tell ya - if (syncapp->currentText() == "IntelliSync") { - QMessageBox attn( - tr("WARNING"), - tr("<p>Selecting IntelliSync here will disable the FTP password." - "<p>Every machine in your netrange will be able to sync with " - "your Zaurus!"), - QMessageBox::Warning, - QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, - 0, QString::null, TRUE, WStyle_StaysOnTop); - attn.setButtonText(QMessageBox::Cancel, tr("Ok")); - attn.exec(); - } - updateGUI(); -} + |