48 |
48 |
49 const wchar_t ON_SCREEN_KEYPAD_VALUE_NO[] = L"0"; |
49 const wchar_t ON_SCREEN_KEYPAD_VALUE_NO[] = L"0"; |
50 const wchar_t ON_SCREEN_KEYPAD_VALUE_GAMEACTIONS[] = L"1"; |
50 const wchar_t ON_SCREEN_KEYPAD_VALUE_GAMEACTIONS[] = L"1"; |
51 const wchar_t ON_SCREEN_KEYPAD_VALUE_NAVIGATION[] = L"2"; |
51 const wchar_t ON_SCREEN_KEYPAD_VALUE_NAVIGATION[] = L"2"; |
52 |
52 |
53 JavaApplicationSettingsViewPrivate::JavaApplicationSettingsViewPrivate(const QString& aJavaAppUid): |
53 JavaApplicationSettingsViewPrivate::JavaApplicationSettingsViewPrivate(const QString& aJavaAppUid, const QString& aJavaAppName): |
54 mMainForm(0), mModel(0), mGeneralSettingsGroup(0), mSecuritySettingsGroup(0), mNetConnSettingsUi(0), mAsyncToSyncCallEventLoop(0), mSecWarningAccepted(false), mDefaultConnId(0) |
54 mMainForm(0), mModel(0), mGeneralSettingsGroup(0), mSecuritySettingsGroup(0), mNetConnSettingsUi(0), mAsyncToSyncCallEventLoop(0), mSecWarningAccepted(false), mDefaultConnId(0) |
55 { |
55 { |
56 // init common values |
56 // init common values |
57 init(); |
57 init(); |
58 |
58 |
62 { |
62 { |
63 ELOG1(EJavaSettings, "No suite found with uid %S", aJavaAppUid.toStdWString().c_str()); |
63 ELOG1(EJavaSettings, "No suite found with uid %S", aJavaAppUid.toStdWString().c_str()); |
64 return; |
64 return; |
65 } |
65 } |
66 ELOG1(EJavaSettings, "Initializing settings for suite %S", mSuiteUid.c_str()); |
66 ELOG1(EJavaSettings, "Initializing settings for suite %S", mSuiteUid.c_str()); |
67 |
67 |
68 // init access point settings ui |
68 // init access point settings ui |
69 mNetConnSettingsUi = new CmApplSettingsUi(this); |
69 mNetConnSettingsUi = new CmApplSettingsUi(this); |
70 mAsyncToSyncCallEventLoop = new QEventLoop(); |
70 mAsyncToSyncCallEventLoop = new QEventLoop(); |
71 |
71 |
72 // read all settings |
72 // read all settings |
73 readAllSettings(); |
73 readAllSettings(); |
74 |
74 |
75 // init form |
75 // init form |
76 mMainForm = new HbDataForm(); |
76 mMainForm = new HbDataForm(); |
77 mMainForm->setHeading(QString::fromStdWString(readFromStorage(PACKAGE_NAME, L"", L"", APPLICATION_PACKAGE_TABLE))); |
77 if (aJavaAppName.isEmpty()) |
|
78 { |
|
79 mMainForm->setHeading(QString::fromStdWString(readFromStorage(PACKAGE_NAME, L"", L"", APPLICATION_PACKAGE_TABLE))); |
|
80 } |
|
81 else |
|
82 { |
|
83 mMainForm->setHeading(aJavaAppName); |
|
84 } |
78 mModel = new HbDataFormModel(); |
85 mModel = new HbDataFormModel(); |
79 |
86 |
80 // init settings |
87 // init settings |
81 mGeneralSettingsGroup = mModel->appendDataFormGroup( |
88 mGeneralSettingsGroup = mModel->appendDataFormGroup( |
82 QString(hbTrId(ID_GENERAL_GROUP_TITLE)), mModel->invisibleRootItem()); |
89 QString(hbTrId(ID_GENERAL_GROUP_TITLE)), mModel->invisibleRootItem()); |