Yeah baby yeah remove IntelliSync support

and add it to the SyncMode... as it should have been done
Keep compatible with the old ored meaning...
Now we can have
IntelliSync plain text transfer, ask for pw less on connect
Opie 1.0    plain text transfer, need pw and allow for syncing
Qtopia 1.7  base64 transter    , need pw and allow for syncing

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
@@ -45,17 +45,10 @@
     int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24);
     selectNet(auth_peer,auth_peer_bits,TRUE);
-  
+
     connect(syncnet, SIGNAL(textChanged(const QString&)),
             this, SLOT(setSyncNet(const QString&)));
 
-    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);       	    
-        }
-    }  
-    
+
     /*
        cfg.setGroup("Remote");
@@ -73,5 +66,5 @@
     QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
     Config loginCfg(configFile,Config::File);
-        
+
     loginCfg.setGroup("General");
     autoLoginName=loginCfg.readEntry("AutoLogin","");
@@ -85,9 +78,17 @@
     cfg.setGroup("SyncMode");
     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;
+    }
+
 
     connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool)));
@@ -95,8 +96,7 @@
     connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode()));
     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();
     updateGUI();
@@ -110,5 +110,5 @@ Security::~Security()
 }
 
-void Security::deleteListEntry() 
+void Security::deleteListEntry()
 {
     syncnet->removeItem(syncnet->currentItem());
@@ -116,5 +116,5 @@ void Security::deleteListEntry()
 
 void Security::restoreDefaults()
-{		
+{
     QMessageBox unrecbox(
     tr("Attention"),
@@ -126,13 +126,14 @@ void Security::restoreDefaults()
     unrecbox.setButtonText(QMessageBox::Yes, tr("Ok"));
 
-    if ( unrecbox.exec() == QMessageBox::Yes)	
+    if ( unrecbox.exec() == QMessageBox::Yes)
     {
         syncnet->clear();
         insertDefaultRanges();
-    }	
+    }
+    syncModeCombo->setCurrentItem( 2 );
 }
 
 void Security::insertDefaultRanges()
-{    
+{
     syncnet->insertItem( tr( "192.168.129.0/24" ) );
     syncnet->insertItem( tr( "192.168.1.0/24" ) );
@@ -155,5 +156,5 @@ void Security::updateGUI()
 
     autologinToggle->setChecked(autoLogin);
-    userlist->setEnabled(autoLogin);    
+    userlist->setEnabled(autoLogin);
 }
 
@@ -238,5 +239,5 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update)
                     for (int i=0; i<syncnet->count(); i++) {
                         if ( syncnet->text(i) == netrange ) {
-                            already_there=TRUE;      	    
+                            already_there=TRUE;
                         }
                     }
@@ -245,10 +246,10 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update)
                     } else {
                         already_there=FALSE;
-                    }		
-                }	
+                    }
+                }
             }
-        }	
-    } 
-     
+        }
+    }
+
     for (int i=0; i<syncnet->count(); i++) {
         if ( syncnet->text(i).left(sn.length()) == sn ) {
@@ -335,9 +336,9 @@ void Security::applySecurity()
         QString sn = syncnet->currentText();
         parseNet(sn,auth_peer,auth_peer_bits);
-       
+
         //this is the *selected* (active) net range
         cfg.writeEntry("auth_peer",auth_peer);
         cfg.writeEntry("auth_peer_bits",auth_peer_bits);
-	
+
 	//write back all other net ranges in *cleartext*
 	for (int i=0; i<10; i++) {
@@ -346,7 +347,24 @@ void Security::applySecurity()
         	cfg.writeEntry(target,syncnet->text(i));
 	}
-		
-        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 );
+
         /*
            cfg.setGroup("Remote");
@@ -370,21 +388,5 @@ 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
@@ -26,5 +26,5 @@ class QPEDialogListener;
 
 class Security : public SecurityBase
-{ 
+{
     Q_OBJECT
 
@@ -47,5 +47,4 @@ private slots:
     void changeLoginName(int);
     void toggleAutoLogin(bool);
-    void changeSyncApp();
     void restoreDefaults();
     void insertDefaultRanges();
@@ -61,5 +60,5 @@ private:
     void selectNet(int auth_peer,int auth_peer_bits,bool update);
 
-    
+
     QString enterPassCode(const QString&);
     QString passcode;
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 @@
             <x>0</x>
             <y>0</y>
-            <width>309</width>
+            <width>327</width>
             <height>483</height>
         </rect>
@@ -467,31 +467,4 @@ Beware that all manually entered net ranges will be lost!</string>
                                     <property>
                                         <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>
                                     </property>
@@ -506,5 +479,5 @@ The default is Qtopia. It will let you log in with username "root" and password
                                     <property>
                                         <name>text</name>
-                                        <string>Both</string>
+                                        <string>IntelliSync</string>
                                     </property>
                                 </item>
@@ -513,4 +486,12 @@ The default is Qtopia. It will let you log in with username "root" and password
                                     <cstring>syncModeCombo</cstring>
                                 </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>
                         </vbox>