Diffstat (limited to 'core/settings/security/security.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/settings/security/security.cpp | 106 |
1 files changed, 54 insertions, 52 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 @@ -46,3 +46,3 @@ selectNet(auth_peer,auth_peer_bits,TRUE); - + connect(syncnet, SIGNAL(textChanged(const QString&)), @@ -50,11 +50,4 @@ - 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); - } - } - + /* @@ -74,3 +67,3 @@ Config loginCfg(configFile,Config::File); - + loginCfg.setGroup("General"); @@ -86,7 +79,15 @@ int mode = cfg.readNumEntry("Mode",2); // Default to Sharp - syncModeCombo->setCurrentItem( mode - 1 ); - - //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(); + switch( mode ) { + case 0x01: + syncModeCombo->setCurrentItem( 0 ); + break; + case 0x02: + default: + syncModeCombo->setCurrentItem( 1 ); + break; + case 0x04: + syncModeCombo->setCurrentItem( 2 ); + break; + } + @@ -96,6 +97,5 @@ connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode())); - connect(syncapp,SIGNAL(activated(int)), this, SLOT(changeSyncApp())); - connect(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults())); + connect(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults())); connect(deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry())); - + loadUsers(); @@ -111,3 +111,3 @@ Security::~Security() -void Security::deleteListEntry() +void Security::deleteListEntry() { @@ -117,3 +117,3 @@ void Security::deleteListEntry() void Security::restoreDefaults() -{ +{ QMessageBox unrecbox( @@ -127,3 +127,3 @@ void Security::restoreDefaults() - if ( unrecbox.exec() == QMessageBox::Yes) + if ( unrecbox.exec() == QMessageBox::Yes) { @@ -131,3 +131,4 @@ void Security::restoreDefaults() insertDefaultRanges(); - } + } + syncModeCombo->setCurrentItem( 2 ); } @@ -135,3 +136,3 @@ void Security::restoreDefaults() void Security::insertDefaultRanges() -{ +{ syncnet->insertItem( tr( "192.168.129.0/24" ) ); @@ -156,3 +157,3 @@ void Security::updateGUI() autologinToggle->setChecked(autoLogin); - userlist->setEnabled(autoLogin); + userlist->setEnabled(autoLogin); } @@ -239,3 +240,3 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) if ( syncnet->text(i) == netrange ) { - already_there=TRUE; + already_there=TRUE; } @@ -246,8 +247,8 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) already_there=FALSE; - } - } + } + } } - } - } - + } + } + for (int i=0; i<syncnet->count(); i++) { @@ -336,3 +337,3 @@ void Security::applySecurity() parseNet(sn,auth_peer,auth_peer_bits); - + //this is the *selected* (active) net range @@ -340,3 +341,3 @@ void Security::applySecurity() cfg.writeEntry("auth_peer_bits",auth_peer_bits); - + //write back all other net ranges in *cleartext* @@ -347,5 +348,22 @@ 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(); -} + |