[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/network/kvpnc/src
From:       Fathi Boudra <fboudra () free ! fr>
Date:       2009-05-27 18:33:37
Message-ID: 1243449217.757497.13724.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 973719 by fabo:

get current text from combobox directly
use currentIndex() instead of currentItem()


 M  +7 -18     newprofilewizard.cpp  


--- trunk/playground/network/kvpnc/src/newprofilewizard.cpp #973718:973719
@@ -2474,7 +2474,7 @@
     } else if (currentpage == newprofilewizardnetworkroutepage) {
         msg = i18n("These fields must be filled in:\n");
 
-        if (newprofilewizardnetworkroutecontent->DefaultRouteComboBox->currentItem() \
== 1) { +        if (newprofilewizardnetworkroutecontent->DefaultRouteComboBox->currentIndex() \
== 1) {  profileData->setReplaceDefaultRoute(true);
 
             if (GlobalConfig->KvpncDebugLevel > 1)
@@ -3225,9 +3225,9 @@
 
 void NewProfileWizard::idTypeToggled()
 {
-    //  if (newprofilewizardcertcontent->Pkcs11IdTypeComboBox->currentItem() == 0)
+    //  if (newprofilewizardcertcontent->Pkcs11IdTypeComboBox->currentIndex() == 0)
     //   newprofilewizardcertcontent->IdLabel->setText(i18n("ID"));
-    //  else if (newprofilewizardcertcontent->Pkcs11IdTypeComboBox->currentItem() == \
1) +    //  else if (newprofilewizardcertcontent->Pkcs11IdTypeComboBox->currentIndex() \
== 1)  //   newprofilewizardcertcontent->IdLabel->setText(i18n("Label"));
     //  else
     //   newprofilewizardcertcontent->IdLabel->setText(i18n("Description"));
@@ -3238,21 +3238,10 @@
     GlobalConfig->appPointer->setOverrideCursor(QCursor(Qt::WaitCursor));
     newprofilewizardcertcontent->Pkcs11IdComboBox->clear();
 
-    int Pkcs11IdType = \
                newprofilewizardcertcontent->Pkcs11IdTypeComboBox->currentItem();
-    QString Pkcs11IdTypeTmp;
-    if (Pkcs11IdType == 0) {
-        Pkcs11IdTypeTmp = "id";
-
-        if (GlobalConfig->KvpncDebugLevel > 1)
-            GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1" ,   \
                Pkcs11IdTypeTmp), KVpncEnum::debug);
-    } else if (Pkcs11IdType == 1) {
-        Pkcs11IdTypeTmp = "label";
-        if (GlobalConfig->KvpncDebugLevel > 1)
-            GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1" ,   \
                Pkcs11IdTypeTmp), KVpncEnum::debug);
-    } else {
-        Pkcs11IdTypeTmp = "subject";
-        if (GlobalConfig->KvpncDebugLevel > 1)
-            GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1" ,   \
Pkcs11IdTypeTmp), KVpncEnum::debug); +    QString Pkcs11IdTypeTmp = \
newprofilewizardcertcontent->Pkcs11IdTypeComboBox->currentText().toLower(); +    if \
(GlobalConfig->KvpncDebugLevel > 1) { +        \
GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1", Pkcs11IdTypeTmp), +             \
KVpncEnum::debug);  }
 
     QString ProviderLib = "";


[prev in list] [next in list] [prev in thread] [next in thread]