3 files changed, 66 insertions, 84 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();
-}
+
 
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
@@ -27,3 +27,3 @@ class QPEDialogListener;
 class Security : public SecurityBase
-{ 
+{
     Q_OBJECT
@@ -48,3 +48,2 @@ private slots:
     void toggleAutoLogin(bool);
-    void changeSyncApp();
     void restoreDefaults();
@@ -62,3 +61,3 @@ private:
 
-    
+
     QString enterPassCode(const QString&);
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
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>309</width>
+            <width>327</width>
             <height>483</height>
@@ -468,29 +468,2 @@ Beware that all manually entered net ranges will be lost!</string>
                                         <name>text</name>
-                                        <string>QTopia</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>IntelliSync</string>
-                                    </property>
-                                </item>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>syncapp</cstring>
-                                </property>
-                                <property>
-                                    <name>whatsThis</name>
-                                    <string>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the "IntelliSync" setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username "root" and password "Qtopia".   The password is CaSeSeNsItIvE.</string>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QComboBox</class>
-                                <item>
-                                    <property>
-                                        <name>text</name>
                                         <string>Qtopia 1.7</string>
@@ -507,3 +480,3 @@ The default is Qtopia. It will let you log in with username "root" and password
                                         <name>text</name>
-                                        <string>Both</string>
+                                        <string>IntelliSync</string>
                                     </property>
@@ -514,2 +487,10 @@ The default is Qtopia. It will let you log in with username "root" and password
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Alter the Sync Protocol to tweak for the different devices.
+                                    IntelliSync will disable the password check but you'll be prompted to accept the connection.
+                                    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
+                                    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
+                                    </string>
+                                </property>
                             </widget>