--- a/securitysettings/cpeapuiplugins/cpeaptlsmethodsui/inc/cpeaptlsmethodsui.h	Fri Sep 17 08:30:11 2010 +0300
+++ b/securitysettings/cpeapuiplugins/cpeaptlsmethodsui/inc/cpeaptlsmethodsui.h	Mon Oct 04 00:19:54 2010 +0300
@@ -17,7 +17,7 @@
  */
 
 /*
- * %version: 17 %
+ * %version: 26 %
  */
 
 #ifndef CPEAPTLSMETHODSUI_H
@@ -28,6 +28,7 @@
 #include <eapqtconfiginterface.h>
 #include <eapqtplugininfo.h>
 #include <eapqtpluginhandle.h>
+#include <cpeappacstoreui.h>
 
 // User includes
 
@@ -36,10 +37,12 @@
 class HbDataFormModel;
 class HbDataFormModelItem;
 class HbMessageBox;
+class HbInputDialog;
 class CpSettingFormItemData;
 class EapQtValidator;
 class EapQtCertificateInfo;
 class CpEapCiphersuiteUi;
+class EapInnerMethodEntryItemData;
 
 // External data types
 
@@ -49,7 +52,7 @@
  * @addtogroup group_eap_ui_plugin_eap_tlsmethods
  * @{
  */
-
+// Class declaration
 class CpEapTlsMethodsUi : public CpBaseSettingView
 {
 Q_OBJECT
@@ -63,10 +66,17 @@
     ~CpEapTlsMethodsUi();
 
     CpBaseSettingView *innerUiInstance();
+    CpBaseSettingView *secondInnerUiInstance();
+
+signals:
+
+public slots:
 
 protected:
     void close();
 
+protected slots:
+
 private:
     // Supported PEAP versions
     enum PeapVersions {
@@ -78,6 +88,11 @@
         PeapVersionBoth
     };
     
+    enum TlsPrivacyIndexes {
+        TlsPrivacyOff,
+        TlsPrivacyOn
+    };
+
 private:
     void createUi();
     void createTlsUi();
@@ -90,11 +105,16 @@
     void createUserCerts();
     void createAuthorityCerts();
     void createPeapVersion();
+    void createProvisioning();
+    void createTlsPrivacy();
     void createInnerMethod();
     void createEapSelector();
+    void createSecondInnerMethod();
+    void createSecondEapSelector();
+    void createPacStoreGroup();
     
     void defaultInnerPlugin();
-
+    
     bool checkStateToBool(const int state);
     int boolToCheckState(const bool state);
     
@@ -105,6 +125,7 @@
     bool validateUserCertificate();
     bool validateCiphersuites();
     void setPeapVersion(EapQtConfig &eapConfig);
+    void setFastSettings(EapQtConfig &eapConfig);
     bool storeSettings();
     
 private slots:  
@@ -115,7 +136,11 @@
     void authorityCertAutomaticChanged(int state);
     void authorityCertChanged(int value);
     void peapVersionChanged(int value);
+    void provisioningModeChanged(int state);
     void innerEapTypeChanged(int value);
+    void secondInnerEapTypeChanged(int value);
+    void incompletedSettingsConfirmed(int action);
+    void unableToSaveSettingsClosed(int action);
     
 private:
     //! Pointer to EapQtConfigInterface
@@ -128,6 +153,8 @@
     EapQtPluginHandle mOuterHandle;
     //! Current EAP configuration
     EapQtConfig mEapConfig;
+    //! Pointer to PAC store UI class
+    CpEapPacStoreUi *mPacStoreUi;
     
     //! Dataform
     HbDataForm *mForm;
@@ -145,14 +172,28 @@
     CpSettingFormItemData *mRealmAutomatic;
     //! Realm lineEdit
     CpSettingFormItemData *mRealm;
+    //! User certificate comboBox
+    CpSettingFormItemData *mUserCertificate;
     //! Authority certificate select automatically checkBox
     CpSettingFormItemData *mCaCertAutomatic;
     //! Authority certificate comboBox
     CpSettingFormItemData *mCaCert;
     //! Peap version comboBox
     CpSettingFormItemData *mPeapVersion;
+    //! Authenticated provisioning checkBox
+    CpSettingFormItemData *mAuthProvisioning;
+    //! Unauthenticated provisioning checkBox
+    CpSettingFormItemData *mUnauthProvisioning;
+    //! TLS Privacy comboBox
+    CpSettingFormItemData *mTlsPrivacy;
     //! Inner EAP type comboBox
     CpSettingFormItemData *mInnerEapType;
+    //! Second inner EAP type comboBox
+    CpSettingFormItemData *mSecondInnerEapType;
+    //! Second inner EAP type configure button
+    EapInnerMethodEntryItemData *mSecondEapEntry;
+    //! Pac store group
+    HbDataFormModelItem *mGroupItemPacStore;
     //! Cipher suites group
     CpEapCiphersuiteUi *mGroupItemCs;
     
@@ -174,12 +215,23 @@
     int mCurrentPeapVersion;
     //! Index of selected Inner EAP type
     int mCurrentInnerPlugin;
+    //! Index of selected second Inner EAP type
+    int mCurrentSecondInnerPlugin;
     //! Index of inner type EAP-MSCHAPv2, default value for PEAP and EAP-FAST 
     int mInnerEapMschapv2;
     //! Index of inner type EAP-GTC, default value for PEAPv1
     int mInnerEapGtc;
+    //! Index of second inner type EAP-GTC
+    int mSecondInnerEapGtc;
     //! Tells if no inner EAP type is stored and default value is used instead
     bool mDefaultPluginInUse;
+    //! Tells if EAP-MSCHAPv2 is the only possible inner EAP type
+    bool mInnerEapMschapv2Only;
+    //! List of supported inner EAP types localisation strings
+    QStringList mInnerEapItems;
+    //! EAP-MSCHAPv2 localisation string. 
+    //  Used in Inner EAP tyupe combobox when only EAP-MSCHAPv2 is supported
+    QStringList mMschapv2Items;
 };
 
 /*! @} */