--- a/javamanager/javasettings/appsettingsview_qt/src/javaapplicationsettingsview_p.h	Fri May 14 15:47:24 2010 +0300
+++ b/javamanager/javasettings/appsettingsview_qt/src/javaapplicationsettingsview_p.h	Thu May 27 12:49:31 2010 +0300
@@ -18,19 +18,23 @@
 #define JAVAAPPLICATIONSETTINGSVIEW_P_H
 
 #include <QVector>
+#include <QModelIndex>
 #include <memory>
+#include <cmapplsettingsui.h>
+#include "javaapplicationsettings.h"
 #include "javastorage.h"
 
-class HbComboBox;
+class HbWidget;
+class HbPushButton;
 class HbDataForm;
 class HbDataFormModel;
 class HbDataFormModelItem;
 class JavaApplicationSettingsView;
-class JavaApplicationSettings;
 
-class JavaApplicationSettingsViewPrivate
+class JavaApplicationSettingsViewPrivate: public QObject
 {
-
+    Q_OBJECT
+    
 public:
     JavaApplicationSettingsViewPrivate(const QString& aApplication);
     virtual ~JavaApplicationSettingsViewPrivate();
@@ -38,22 +42,31 @@
 
     // slots
     void _q_settingsChanged(const QString &newValue);
+    void _q_settingsChanged(bool);
     void _q_dataItemDisplayed(const QModelIndex);
 
+private slots:
+    void netConnSelected(uint netConnSelectionStatus);
+
 private:
     void readAllSettings();
     void initSettings(QVector<JavaApplicationSettings>& settings, HbDataFormModelItem * parent);
     void writeSettings(JavaApplicationSettings& settings, const QString &newValue);
     void securityWarningsChanged(const QString &);
     bool blanketAllowed(const JavaApplicationSettings &settings);
-    HbComboBox * itemToComboBox(const HbDataFormModelItem *);
-    JavaApplicationSettings* findSettings(HbComboBox* id);
-    JavaApplicationSettings* findSettings(HbComboBox* id, QVector<JavaApplicationSettings>& settings);
+    HbWidget * itemToWidget(const HbDataFormModelItem *);
+    JavaApplicationSettings* findSettings(HbWidget* id);
+    JavaApplicationSettings* findSettings(HbWidget* id, QVector<JavaApplicationSettings>& settings);
     int readFromStorage(JavaApplicationSettings& settings);
     void writeToStorage(JavaApplicationSettings& settings);
     bool findFromStorage(const std::wstring&, const std::wstring&, const std::wstring&, const std::string&);
     std::wstring readFromStorage(const std::wstring&, const std::wstring&, const std::wstring&, const std::string&);
+    void filterSecuritySettings(JavaApplicationSettings& settings);
     void findEntry(const java::storage::JavaStorageApplicationList_t&, const std::wstring&, std::wstring& eValue);
+    void readSuiteUid(const QString& aAppUid);
+    bool securityWarningAccepted(const QString& text, const QString& acceptActionLabel, const QString& rejectActionLabel, const QString& headingText);
+    void handleNetworkSettings();
+    void readNetworkConnectionName();
 private:
     HbDataForm * mainForm;
     HbDataFormModel *model;
@@ -64,8 +77,12 @@
     QVector<JavaApplicationSettings> extraSettings;
     JavaApplicationSettingsView* iPublicView;
     std::auto_ptr<java::storage::JavaStorage> iStorage;
-    std::wstring iJavaAppUid;
-    QString BLANKET,SESSION,ONESHOT,DENIED,SECURITY_LEVEL,USER_DEFINED,SENSITIVE_SETTINGS,SENSITIVE_SETTINGS_NET_USAGE,MUTUALLY_EXCLUSIVE_SETTINGS,OK,CANCEL,SECURITY_WARNING_TITLE,NET_ACCESS,LOW_LEVEL_NET_ACCESS;
+    std::wstring iSuiteUid;
+    QString BLANKET,SESSION,ONESHOT,DENIED,SECURITY_LEVEL,USER_DEFINED,SENSITIVE_SETTINGS,SENSITIVE_SETTINGS_NET_USAGE,MUTUALLY_EXCLUSIVE_SETTINGS,OK,CANCEL,SECURITY_WARNING_TITLE,NET_ACCESS,LOW_LEVEL_NET_ACCESS,NETWORK_CONNECTION,NETWORK_CONNECTION_CHANGE;
+    CmApplSettingsUi* netConnSettingsUi;
+    CmApplSettingsUi::SettingSelection netConnSelection;
+    JavaApplicationSettings::NetworkConnection netConn;
+    int netSettIndex;
 };