-rw-r--r-- | core/settings/security/security.cpp | 62 | ||||
-rw-r--r-- | core/settings/security/security.h | 1 | ||||
-rw-r--r-- | core/settings/security/securitybase.ui | 39 |
3 files changed, 42 insertions, 60 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 | |||
@@ -49,12 +49,5 @@ | |||
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 | /* |
@@ -85,9 +78,17 @@ | |||
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))); |
@@ -95,5 +96,4 @@ | |||
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())); |
@@ -131,4 +131,5 @@ void Security::restoreDefaults() | |||
131 | insertDefaultRanges(); | 131 | insertDefaultRanges(); |
132 | } | 132 | } |
133 | syncModeCombo->setCurrentItem( 2 ); | ||
133 | } | 134 | } |
134 | 135 | ||
@@ -347,5 +348,22 @@ void Security::applySecurity() | |||
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 | /* |
@@ -370,21 +388,5 @@ void Security::applySecurity() | |||
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 | ||
diff --git a/core/settings/security/security.h b/core/settings/security/security.h index 72aa352..ed25ce1 100644 --- a/core/settings/security/security.h +++ b/core/settings/security/security.h | |||
@@ -47,5 +47,4 @@ private slots: | |||
47 | void changeLoginName(int); | 47 | void changeLoginName(int); |
48 | void toggleAutoLogin(bool); | 48 | void toggleAutoLogin(bool); |
49 | void changeSyncApp(); | ||
50 | void restoreDefaults(); | 49 | void restoreDefaults(); |
51 | void insertDefaultRanges(); | 50 | void insertDefaultRanges(); |
diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui index 1769ae1..dcf1d6b 100644 --- a/core/settings/security/securitybase.ui +++ b/core/settings/security/securitybase.ui | |||
@@ -12,5 +12,5 @@ | |||
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>309</width> | 14 | <width>327</width> |
15 | <height>483</height> | 15 | <height>483</height> |
16 | </rect> | 16 | </rect> |
@@ -467,31 +467,4 @@ Beware that all manually entered net ranges will be lost!</string> | |||
467 | <property> | 467 | <property> |
468 | <name>text</name> | 468 | <name>text</name> |
469 | <string>QTopia</string> | ||
470 | </property> | ||
471 | </item> | ||
472 | <item> | ||
473 | <property> | ||
474 | <name>text</name> | ||
475 | <string>IntelliSync</string> | ||
476 | </property> | ||
477 | </item> | ||
478 | <property stdset="1"> | ||
479 | <name>name</name> | ||
480 | <cstring>syncapp</cstring> | ||
481 | </property> | ||
482 | <property> | ||
483 | <name>whatsThis</name> | ||
484 | <string>This option changes the login behaviour of the internal FTP server. | ||
485 | |||
486 | If you have problems syncing, try the "IntelliSync" setting, which will accept any password you throw at the sync (FTP) port. | ||
487 | |||
488 | The default is Qtopia. It will let you log in with username "root" and password "Qtopia". The password is CaSeSeNsItIvE.</string> | ||
489 | </property> | ||
490 | </widget> | ||
491 | <widget> | ||
492 | <class>QComboBox</class> | ||
493 | <item> | ||
494 | <property> | ||
495 | <name>text</name> | ||
496 | <string>Qtopia 1.7</string> | 469 | <string>Qtopia 1.7</string> |
497 | </property> | 470 | </property> |
@@ -506,5 +479,5 @@ The default is Qtopia. It will let you log in with username "root" and password | |||
506 | <property> | 479 | <property> |
507 | <name>text</name> | 480 | <name>text</name> |
508 | <string>Both</string> | 481 | <string>IntelliSync</string> |
509 | </property> | 482 | </property> |
510 | </item> | 483 | </item> |
@@ -513,4 +486,12 @@ The default is Qtopia. It will let you log in with username "root" and password | |||
513 | <cstring>syncModeCombo</cstring> | 486 | <cstring>syncModeCombo</cstring> |
514 | </property> | 487 | </property> |
488 | <property> | ||
489 | <name>whatsThis</name> | ||
490 | <string>Alter the Sync Protocol to tweak for the different devices. | ||
491 | IntelliSync will disable the password check but you'll be prompted to accept the connection. | ||
492 | Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync | ||
493 | Qtopia1.7 will alter the way data is send to the client and will not work with older clients. | ||
494 | </string> | ||
495 | </property> | ||
515 | </widget> | 496 | </widget> |
516 | </vbox> | 497 | </vbox> |