diff -r dc7c549001d5 -r 85266cc22c7f javamanager/javasettings/appsettingsview_qt/src/javaapplicationsettingsview_p.h --- a/javamanager/javasettings/appsettingsview_qt/src/javaapplicationsettingsview_p.h Thu May 27 12:49:31 2010 +0300 +++ b/javamanager/javasettings/appsettingsview_qt/src/javaapplicationsettingsview_p.h Fri Jun 11 13:33:44 2010 +0300 @@ -18,7 +18,10 @@ #define JAVAAPPLICATIONSETTINGSVIEW_P_H #include +#include +#include #include +#include #include #include #include "javaapplicationsettings.h" @@ -30,6 +33,21 @@ class HbDataFormModel; class HbDataFormModelItem; class JavaApplicationSettingsView; +class HbAction; + +struct IndexedSettingsName +{ + std::wstring name; + int index; +}; + +struct AscendingSort +{ + bool operator()(const IndexedSettingsName& i1, const IndexedSettingsName& i2) + { + return i1.index < i2.index; + } +}; class JavaApplicationSettingsViewPrivate: public QObject { @@ -47,6 +65,7 @@ private slots: void netConnSelected(uint netConnSelectionStatus); + void securityWarningDismissed(HbAction*); private: void readAllSettings(); @@ -57,16 +76,22 @@ HbWidget * itemToWidget(const HbDataFormModelItem *); JavaApplicationSettings* findSettings(HbWidget* id); JavaApplicationSettings* findSettings(HbWidget* id, QVector& settings); - int readFromStorage(JavaApplicationSettings& settings); + void 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&); + std::vector readFromStorage(const std::wstring& aColumnName, const std::string& aTableName); 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(); + void initNetworkConnection(); + void configureList(QList&, const QStringList&, const QHash&); + void attachList(const QString& settingsName, const QList&, const QHash&, bool isHighRiskList = true); + void installTranslator(const QString& translationFileName); + private: HbDataForm * mainForm; HbDataFormModel *model; @@ -78,11 +103,15 @@ JavaApplicationSettingsView* iPublicView; std::auto_ptr iStorage; 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; + 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,SETTINGS_TITLE,SETTINGS_NOT_AVAILABLE; CmApplSettingsUi* netConnSettingsUi; CmApplSettingsUi::SettingSelection netConnSelection; JavaApplicationSettings::NetworkConnection netConn; int netSettIndex; + QEventLoop* asyncToSyncCallEventLoop; + bool secWarningAccepted; + int defaultConnId; + QList translators; };