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 | |||
@@ -48,14 +48,7 @@ | |||
48 | connect(syncnet, SIGNAL(textChanged(const QString&)), | 48 | connect(syncnet, SIGNAL(textChanged(const QString&)), |
49 | this, SLOT(setSyncNet(const QString&))); | 49 | this, SLOT(setSyncNet(const QString&))); |
50 | 50 | ||
51 | cfg.setGroup("Sync"); | ||
52 | QString sa = cfg.readEntry("syncapp","Qtopia"); | ||
53 | 51 | ||
54 | for (int i=0; i<syncapp->count(); i++) { | ||
55 | if ( syncapp->text(i) == sa ) { | ||
56 | syncapp->setCurrentItem(i); | ||
57 | } | ||
58 | } | ||
59 | 52 | ||
60 | /* | 53 | /* |
61 | cfg.setGroup("Remote"); | 54 | cfg.setGroup("Remote"); |
@@ -84,17 +77,24 @@ | |||
84 | 77 | ||
85 | cfg.setGroup("SyncMode"); | 78 | cfg.setGroup("SyncMode"); |
86 | int mode = cfg.readNumEntry("Mode",2); // Default to Sharp | 79 | int mode = cfg.readNumEntry("Mode",2); // Default to Sharp |
87 | syncModeCombo->setCurrentItem( mode - 1 ); | 80 | switch( mode ) { |
81 | case 0x01: | ||
82 | syncModeCombo->setCurrentItem( 0 ); | ||
83 | break; | ||
84 | case 0x02: | ||
85 | default: | ||
86 | syncModeCombo->setCurrentItem( 1 ); | ||
87 | break; | ||
88 | case 0x04: | ||
89 | syncModeCombo->setCurrentItem( 2 ); | ||
90 | break; | ||
91 | } | ||
88 | 92 | ||
89 | //since nobody knows what this is and it doesn't do anything, i'll hide it # CoreDump | ||
90 | // is this work-in-progress or can it be removed? | ||
91 | syncModeCombo->hide(); | ||
92 | 93 | ||
93 | connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool))); | 94 | connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool))); |
94 | connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int))); | 95 | connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int))); |
95 | connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode())); | 96 | connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode())); |
96 | connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode())); | 97 | connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode())); |
97 | connect(syncapp,SIGNAL(activated(int)), this, SLOT(changeSyncApp())); | ||
98 | connect(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults())); | 98 | connect(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults())); |
99 | connect(deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry())); | 99 | connect(deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry())); |
100 | 100 | ||
@@ -130,6 +130,7 @@ void Security::restoreDefaults() | |||
130 | syncnet->clear(); | 130 | syncnet->clear(); |
131 | insertDefaultRanges(); | 131 | insertDefaultRanges(); |
132 | } | 132 | } |
133 | syncModeCombo->setCurrentItem( 2 ); | ||
133 | } | 134 | } |
134 | 135 | ||
135 | void Security::insertDefaultRanges() | 136 | void Security::insertDefaultRanges() |
@@ -346,7 +347,24 @@ void Security::applySecurity() | |||
346 | cfg.writeEntry(target,syncnet->text(i)); | 347 | cfg.writeEntry(target,syncnet->text(i)); |
347 | } | 348 | } |
348 | 349 | ||
349 | cfg.writeEntry("syncapp",syncapp->currentText()); | 350 | #ifdef ODP |
351 | #error "Use 0,1,2 and use Launcher" | ||
352 | #endif | ||
353 | /* keep the old code so we don't use currentItem directly */ | ||
354 | int value = 0x02; | ||
355 | switch( syncModeCombo->currentItem() ) { | ||
356 | case 0: | ||
357 | value = 0x01; | ||
358 | break; | ||
359 | case 1: | ||
360 | value = 0x02; | ||
361 | break; | ||
362 | case 2: | ||
363 | value = 0x04; | ||
364 | break; | ||
365 | } | ||
366 | cfg.setGroup("SyncMode"); | ||
367 | cfg.writeEntry( "Mode", value ); | ||
350 | 368 | ||
351 | /* | 369 | /* |
352 | cfg.setGroup("Remote"); | 370 | cfg.setGroup("Remote"); |
@@ -369,23 +387,7 @@ void Security::applySecurity() | |||
369 | 387 | ||
370 | } | 388 | } |
371 | } | 389 | } |
372 | void Security::changeSyncApp() | 390 | |
373 | { | ||
374 | // Don't say i didn't tell ya | ||
375 | if (syncapp->currentText() == "IntelliSync") { | ||
376 | QMessageBox attn( | ||
377 | tr("WARNING"), | ||
378 | tr("<p>Selecting IntelliSync here will disable the FTP password." | ||
379 | "<p>Every machine in your netrange will be able to sync with " | ||
380 | "your Zaurus!"), | ||
381 | QMessageBox::Warning, | ||
382 | QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, | ||
383 | 0, QString::null, TRUE, WStyle_StaysOnTop); | ||
384 | attn.setButtonText(QMessageBox::Cancel, tr("Ok")); | ||
385 | attn.exec(); | ||
386 | } | ||
387 | updateGUI(); | ||
388 | } | ||
389 | 391 | ||
390 | 392 | ||
391 | 393 | ||