Appliy string id for multi language

Change-Id: I1a22716c8443a252fae3ecfb9981a863e0e89aa9
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/inc/StManageApplicationForm.h b/inc/StManageApplicationForm.h
index c6b42eb..f68a559 100644 (file)
--- a/inc/StManageApplicationForm.h
+++ b/inc/StManageApplicationForm.h
@@ -65,7 +65,7 @@ private:
        void DeletePackageInfoList(void);
        void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
        Tizen::Base::String GetPackageInfoItem(int index, int type);
-       result CreateAlertPopup(Tizen::Base::String* appName = null);
+       result CreateAlertPopup(Tizen::Base::String* appName = null, bool uninstallResult = true);
        void HideAlertPopup(void);
        void ShowAlertPopup(void);
        void DeleteAlertPopup(void);

diff --git a/inc/StTypes.h b/inc/StTypes.h
index 027ed34..1220c96 100644 (file)
--- a/inc/StTypes.h
+++ b/inc/StTypes.h
@@ -174,6 +174,8 @@ extern const int ICON_AND_ONE_LINE_ITEM_WIDTH_GAP;
 
 extern const int RELATIVE_LAYOUT_RIGHT_MARGIN;
 extern const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON;
+extern const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING;
+extern const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON;
 extern const int RELATIVE_LAYOUT_LEFT_MARGIN;
 extern const int W_DETAIL_ARROW_BUTTON;
 

diff --git a/manifest.xml b/manifest.xml
index 8d09a73..f012bd0 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -90,6 +90,7 @@
             <Privilege>http://tizen.org/privilege/certificate.write</Privilege>
             <Privilege>http://tizen.org/privilege/application.kill</Privilege>
             <Privilege>http://tizen.org/privilege/platforminfo</Privilege>
+            <Privilege>http://tizen.org/privilege/nfcmanager</Privilege>
         </Privileges>
         <UiApp Main="True" MenuIconVisible="True" Name="Settings" SubMode="True">
             <UiScalability BaseScreenSize="Normal" CoordinateSystem="Logical" LogicalCoordinate="720"/>

diff --git a/src/StAccessibilityForm.cpp b/src/StAccessibilityForm.cpp
index b44d36e..b0a3c6e 100644 (file)
--- a/src/StAccessibilityForm.cpp
+++ b/src/StAccessibilityForm.cpp
@@ -392,7 +392,14 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        pItem->AddControl(*pLabel);
 
-       relativeLayout.SetMargin(*pLabel, startGap, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
+       {
+               relativeLayout.SetMargin(*pLabel, startGap, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
+       }
+       else
+       {
+               relativeLayout.SetMargin(*pLabel, startGap, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       }
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 

diff --git a/src/StBluetoothForm.cpp b/src/StBluetoothForm.cpp
index b8da26f..3863f89 100644 (file)
--- a/src/StBluetoothForm.cpp
+++ b/src/StBluetoothForm.cpp
@@ -56,7 +56,6 @@ static const int ID_IN_PROGRESS__REPEAT_COUNT = 1000;
 
 static const int ID_BLUETOOTH_VISIBLE_GROUP_ITEM_CONUNT = 5;
 static const int SEARCH_ICON_FILE_PATH_NAME_LENGTH_MAX = 100;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
 
 enum BluetoothTurnOnOffStatusItem
 {

diff --git a/src/StCertificateUserInstallPasswordForm.cpp b/src/StCertificateUserInstallPasswordForm.cpp
index a3b4207..f83a869 100644 (file)
--- a/src/StCertificateUserInstallPasswordForm.cpp
+++ b/src/StCertificateUserInstallPasswordForm.cpp
@@ -119,7 +119,7 @@ CertificateUserInstallPasswordForm::CreateTableView(void)
 result
 CertificateUserInstallPasswordForm::OnInitializing(void)
 {
-       CreateHeader(L"Certificate Detail");
+       CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_PASSWORD"));
        CreateFooter();
        CreateTableView();
 
@@ -186,7 +186,7 @@ CertificateUserInstallPasswordForm::CreateGroupItem(int groupIndex, int itemWidt
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
        Rectangle itemRectangle;
-       String groupText = L"Enter password";
+       String groupText = ResourceManager::GetString(L"IDS_WIFI_BODY_ENTER_PASSWORD");
        Label* pLabel = null;
 
        TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();

diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp
index 012fa5b..799eeb7 100644 (file)
--- a/src/StDateTimeForm.cpp
+++ b/src/StDateTimeForm.cpp
@@ -69,7 +69,6 @@ static const int H_TIME_FIELD = 150;
 static const int DIVIDE_BY_TWO = 2;
 static const int TIME_FIELD_GAP = 20;
 
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 240;
 static const int DEVIDE_TWO = 2;
 static const int SECOND_CONTROL_ITEM = 1;
 static const int MIN_YEAR = 1970;
@@ -702,7 +701,6 @@ DateTimeForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                                tableView.SetItemChecked(groupIndex, itemIndex, automaticUpdateStatus);
                                tableView.SetItemEnabled(ID_GROUP_DATE_AND_TIME_LOCAL_TIME, ID_ITEM_DATE_AND_TIME_TIME_ZONE, !automaticUpdateStatus);
                                tableView.SetItemEnabled(ID_GROUP_DATE_AND_TIME_LOCAL_TIME, ID_ITEM_DATE_AND_TIME_DATE_AND_TIME, !automaticUpdateStatus);
-                               tableView.UpdateTableView();
                        }
                        else
                        {
@@ -771,7 +769,6 @@ DateTimeForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                        {
                                AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
                        }
-                       tableView.UpdateTableView();
                }
                break;
 
@@ -806,7 +803,7 @@ DateTimeForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                                AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
                        }
 
-                       tableView.UpdateTableView();
+                       tableView.RefreshAllItems();
                }
                break;
 
@@ -887,6 +884,11 @@ DateTimeForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Tab
                        AppLogDebug("pEditTime update Fail");
                        return;
                }
+               bool hourFormat = false;
+               if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_TIME_FORMAT_24HOUR, hourFormat) == E_SUCCESS)
+               {
+                       pEditTime->Set24HourNotationEnabled(hourFormat);
+               }
 
                int pos = GetClientAreaBounds().width / DIVIDE_BY_TWO + TIME_FIELD_GAP;
                pEditTime->SetPosition(pos, 0);
@@ -909,6 +911,7 @@ DateTimeForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Tab
                pLabel->Invalidate(false);
                delete pBitmap;
        }
+       pItem->Invalidate(false);
 }
 
 void

diff --git a/src/StDeveloperOptionForm.cpp b/src/StDeveloperOptionForm.cpp
index 81d5d6b..7cbf610 100644 (file)
--- a/src/StDeveloperOptionForm.cpp
+++ b/src/StDeveloperOptionForm.cpp
@@ -77,7 +77,6 @@ static const int ALERT_POPUP_LABEL_FONT_SIZE = 40;
 
 static const int W_ALERT_POPUP_CLIENT_RECT_DEFAULT = 700;
 static const int H_ALERT_POPUP_CLIENT_RECT_DEFAULT = 550;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 230;
 
 DeveloperOptionForm::DeveloperOptionForm(void)
        : __isAppControlRequest(false)

diff --git a/src/StDisplayForm.cpp b/src/StDisplayForm.cpp
index 6b83748..4e0999f 100644 (file)
--- a/src/StDisplayForm.cpp
+++ b/src/StDisplayForm.cpp
@@ -220,7 +220,14 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        pItem->AddControl(*pLabel);
 
-       relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_ITEM_RIGHT_MARGIN, 0, 0);
+       if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
+       {
+               relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
+       }
+       else
+       {
+               relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_ITEM_RIGHT_MARGIN, 0, 0);
+       }
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 

diff --git a/src/StKeyboardForm.cpp b/src/StKeyboardForm.cpp
index 5998886..74f11a8 100644 (file)
--- a/src/StKeyboardForm.cpp
+++ b/src/StKeyboardForm.cpp
@@ -284,7 +284,14 @@ KeyboardForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
+       {
+               relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
+       }
+       else
+       {
+               relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       }
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 

diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp
index 9b3256a..1bef724 100644 (file)
--- a/src/StLanguageAndRegionForm.cpp
+++ b/src/StLanguageAndRegionForm.cpp
@@ -467,7 +467,7 @@ result
 LocaleForm::OnInitializing(void)
 {
        InitLanguageList();
-       CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_REGION_ABB"));
+       CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_KEYBOARD"));
        CreateFooter();
        CreateTableView();
 
@@ -489,7 +489,7 @@ void
 LocaleForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
        Header* pHeader = GetHeader();
-       pHeader->SetTitleText(ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_REGION_ABB"));
+       pHeader->SetTitleText(ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_KEYBOARD"));
 
        __pTableView->Draw();
        RefreshTableViewItem();

diff --git a/src/StLocationForm.cpp b/src/StLocationForm.cpp
index ffb8fe4..a0fcb9a 100644 (file)
--- a/src/StLocationForm.cpp
+++ b/src/StLocationForm.cpp
@@ -52,7 +52,6 @@ static const int ID_FOOTER_ITEM_INDEX_1 = 0;
 static const int IDA_FOOTER_ITEM_HELP = 100;
 
 static const int W_RESIZE_LABEL_GAP = 170;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 120;
 
 LocationForm::LocationForm(void)
        : __isAppControlRequest(APPCONTROL_REQUEST_DEFAULT)

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index 57f9f61..ec504be 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -48,7 +48,6 @@ static const int H_GROUP_FONT_SIZE_HUGE = 128;
 static const int H_GROUP_FONT_SIZE_LARGE = 110;
 static const int H_GROUP_FONT_SIZE_DEFAULT = 80;
 static const int H_GROUP_TITLE_TEXT = (H_GROUP_INDEX_TITLE_TEXT / 4);
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 200;
 static const int MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN = 60;
 
 static const wchar_t* APPCONTROL_OPERATION_ID_CONFIGURE = L"http://tizen.org/appcontrol/operation/configure";
@@ -255,19 +254,19 @@ MainMenuForm::CreateGroupItem(int groupIndex, int itemWidth)
 
 //     case ID_GROUP_MODE:
 //             {
-//                     groupText = L"Mode";
+//                     groupText = ResourceManager::GetString(L"IDS_ST_BODY_MODE");
 //             }
 //             break;
 
        case ID_GROUP_PERSONAL:
                {
-                       groupText = L"Personal";
+                       groupText = ResourceManager::GetString(L"IDS_ST_BODY_PERSONAL");
                }
                break;
 
        case ID_GROUP_DEVICE:
                {
-                       groupText = L"Device";
+                       groupText = ResourceManager::GetString(L"IDS_ST_BODY_DEVICE");
                }
                break;
 
@@ -468,7 +467,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_DEVICE_CALL_SETTING:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_PHONE);
-                                       itemText = L"Call settings";
+                                       itemText = ResourceManager::GetString(L"IDS_CST_BODY_CALL_SETTINGS");
                                }
                                break;
 
@@ -489,7 +488,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_DEVICE_LANGUAGE_KEYBOARD:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_LANGUAGE);
-                                       itemText = L"Language and keyboard"; //ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_REGION_ABB");
+                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_KEYBOARD");
                                }
                                break;
 

diff --git a/src/StManageApplicationForm.cpp b/src/StManageApplicationForm.cpp
index 39e15bf..3e2057f 100644 (file)
--- a/src/StManageApplicationForm.cpp
+++ b/src/StManageApplicationForm.cpp
@@ -244,15 +244,12 @@ ManageApplicationForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        {
                if (pArgs != null)
                {
-//                     String* uninstalledApplicationName = (static_cast<String*>(pArgs->GetAt(0)));
+                       String* uninstalledApplicationName = (static_cast<String*>(pArgs->GetAt(0)));
                        String uninstallationResult = *(static_cast<String*>(pArgs->GetAt(1)));
 
-                       if (uninstallationResult.Equals(L"true", false))
-                       {
-                               ReLoadPackageInfoList();
-//                             CreateAlertPopup(uninstalledApplicationName);
-//                             ShowAlertPopup();
-                       }
+                       ReLoadPackageInfoList();
+                       CreateAlertPopup(uninstalledApplicationName, uninstallationResult.Equals(L"true", false));
+                       ShowAlertPopup();
                        delete pArgs;
                }
        }
@@ -524,7 +521,7 @@ ManageApplicationForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
 }
 
 result
-ManageApplicationForm::CreateAlertPopup(Tizen::Base::String* appName)
+ManageApplicationForm::CreateAlertPopup(Tizen::Base::String* appName, bool uninstallResult)
 {
        String buttonText;
        Label* pLabel = null;
@@ -557,8 +554,15 @@ ManageApplicationForm::CreateAlertPopup(Tizen::Base::String* appName)
        __uninstallResultPopup->SetTitleText(*appName);
        __uninstallResultPopup->SetTitleTextColor(COLOR_SUB_TEXT);
 
-       String descriptionText = ResourceManager::GetString(L"IDS_ST_BUTTON_UNINSTALL");
-       descriptionText.Append(L" Success");
+       String descriptionText = L"";
+       if (uninstallResult)
+       {
+               descriptionText = ResourceManager::GetString(L"IDS_ST_POP_UNINSTALLED");
+       }
+       else
+       {
+               descriptionText = ResourceManager::GetString(L"IDS_COM_POP_FAILED");
+       }
 
        pLabel = new (std::nothrow) Label();
        pLabel->Construct(itemRectLabel, descriptionText);

diff --git a/src/StManageApplicationInfoForm.cpp b/src/StManageApplicationInfoForm.cpp
index 5f1269f..e6d8c5e 100644 (file)
--- a/src/StManageApplicationInfoForm.cpp
+++ b/src/StManageApplicationInfoForm.cpp
@@ -788,8 +788,7 @@ ManageApplicationInfoForm::CreateUninstallPopup(void)
        __uninstallConfirmPopup->SetTitleText(applicationName);
        __uninstallConfirmPopup->SetTitleTextColor(COLOR_SUB_TEXT);
 
-       String descriptionText = ResourceManager::GetString(L"IDS_ST_BUTTON_UNINSTALL");
-       descriptionText.Append(L"?");
+       String descriptionText = ResourceManager::GetString(L"IDS_SAPPS_POP_ARE_YOU_SURE_Q");
 
        pLabel = new (std::nothrow) Label();
        pLabel->Construct(itemRectLabel, descriptionText);
@@ -799,7 +798,7 @@ ManageApplicationInfoForm::CreateUninstallPopup(void)
 
        __uninstallConfirmPopup->AddControl(*pLabel);
 
-       buttonText = ResourceManager::GetString(L"IDS_ST_BUTTON_YES");
+       buttonText = ResourceManager::GetString(L"IDS_ST_BODY_DELETE");
        pOkButton = new (std::nothrow) Button();
        pOkButton->Construct(itemRectLhsButton, buttonText);
        pOkButton->SetActionId(IDA_UNINSTALL_CONFIRM_OK);
@@ -822,7 +821,7 @@ ManageApplicationInfoForm::CreateUninstallPopup(void)
        __pProgressPopup->SetTitleText(applicationName);
        __pProgressPopup->SetBounds(clientRect);
 
-       descriptionText = ResourceManager::GetString(L"IDS_ST_BUTTON_UNINSTALL");
+       descriptionText = ResourceManager::GetString(L"IDS_ST_BODY_DELETE");
        descriptionText.Append(L"....");
        __pProgressPopup->SetText(descriptionText);
 

diff --git a/src/StMoreSystemForm.cpp b/src/StMoreSystemForm.cpp
index b06d8f0..5f40089 100644 (file)
--- a/src/StMoreSystemForm.cpp
+++ b/src/StMoreSystemForm.cpp
@@ -47,7 +47,6 @@ static const int ID_GROUP_COUNT = 1;
 static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_SYSTEM_ITEM_COUNT;
 
 static const int W_RESIZE_LABEL_GAP = 150;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 140;
 
 MoreSystemForm::MoreSystemForm(void)
 {

diff --git a/src/StNetworkForm.cpp b/src/StNetworkForm.cpp
index fcd7a48..da2dda9 100644 (file)
--- a/src/StNetworkForm.cpp
+++ b/src/StNetworkForm.cpp
@@ -53,7 +53,6 @@ static const int ID_GROUP_NETWORK_CONNECTIONS = 4;
 static const int ID_GROUP_COUNT = 2;
 
 static const int W_RESIZE_LABEL_GAP = 170;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 140;
 
 NetworkForm::NetworkForm(void)
 {

diff --git a/src/StNfcForm.cpp b/src/StNfcForm.cpp
index 16cd2aa..aeef4a6 100644 (file)
--- a/src/StNfcForm.cpp
+++ b/src/StNfcForm.cpp
@@ -198,7 +198,7 @@ NfcForm::CreateGroupItem(int groupIndex, int itemWidth)
        case ID_GROUP_NFC_HELP:
                {
                        yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP / DIVIDE_BY_TWO ;
-                       groupText = L"When NFC is on, you can send or receive data when your device touches other NFC-capable devices or NFC tags";
+                       groupText = ResourceManager::GetString(L"IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS");
                        itemHeight = GetHeightForStringArea(groupText, itemWidth - W_TEXT_GAP, fontSize);
                }
                break;
@@ -337,7 +337,7 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
@@ -417,7 +417,12 @@ NfcForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableVie
                        {
                                if (__pNfcPresentationModelInstance->IsNfcActivated() == false)
                                {
-                                       __pNfcPresentationModelInstance->ActivateNfc();
+                                       r = __pNfcPresentationModelInstance->ActivateNfc();
+                                       if (r != E_SUCCESS)
+                                       {
+                                               AppLogDebug("NFC Activate is filed [%s]", GetErrorMessage(r));
+                                               return;
+                                       }
                                }
                                if (__isPredefinedItem)
                                {
@@ -429,7 +434,12 @@ NfcForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableVie
                        {
                                if (__pNfcPresentationModelInstance->IsNfcActivated() == true)
                                {
-                                       __pNfcPresentationModelInstance->DeactivateNfc();
+                                       r = __pNfcPresentationModelInstance->DeactivateNfc();
+                                       if (r != E_SUCCESS)
+                                       {
+                                               AppLogDebug("NFC Activate is filed [%s]", GetErrorMessage(r));
+                                               return;
+                                       }
                                }
                                if (__isPredefinedItem)
                                {

diff --git a/src/StNfcPredefinedItemForm.cpp b/src/StNfcPredefinedItemForm.cpp
index d0711bf..c5c1471 100644 (file)
--- a/src/StNfcPredefinedItemForm.cpp
+++ b/src/StNfcPredefinedItemForm.cpp
@@ -41,7 +41,6 @@ static const int ID_GROUP_ITEM_NFC_PREDEFINED_ITEM = 0;
 static const int ID_GROUP_NFC_PREDEFINED_ITEM_LIST = 1;\r
 static const int ID_GROUP_NFC_PREDEFINED_ITEM_LIST_DEFAULT_COUNT = 0;\r
 \r
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 140;\r
 static const int NFC_PREDEFINED_ITEM_DEFAULT_GROUP_COUNT = 2;\r
 static const int DIVIDE_BY_TWO = 2;\r
 static const int W_TEXT_GAP = 30;\r

diff --git a/src/StTypes.cpp b/src/StTypes.cpp
index 2d9edde..e6bf42d 100644 (file)
--- a/src/StTypes.cpp
+++ b/src/StTypes.cpp
@@ -170,6 +170,8 @@ const int ICON_AND_ONE_LINE_ITEM_WIDTH_GAP = 170;
 
 const int RELATIVE_LAYOUT_RIGHT_MARGIN = 20;
 const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON = 30;
+const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 240;
+const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
 const int RELATIVE_LAYOUT_LEFT_MARGIN = 116;
 const int W_DETAIL_ARROW_BUTTON = 72;
 

diff --git a/src/StWallpaperAlbumListDetailForm.cpp b/src/StWallpaperAlbumListDetailForm.cpp
index 3511a44..d25ee32 100644 (file)
--- a/src/StWallpaperAlbumListDetailForm.cpp
+++ b/src/StWallpaperAlbumListDetailForm.cpp
@@ -38,6 +38,7 @@ static const int FOLDER_BITMAP_MAX = 6;
 WallpaperAlbumListDetailForm::WallpaperAlbumListDetailForm(void)
        : __itemCount(0)
        , __pPresentationModel(null)
+       , __pIconListView(null)
        , __pAlbumInfo(null)
        , __pArgs(null)
 {
@@ -208,7 +209,10 @@ WallpaperAlbumListDetailForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId
        __pPresentationModel->InitializeFileList(__pAlbumInfo);
        __itemCount = __pPresentationModel->GetFileCount();
 
-       CreateIconListView();
+       if (__pIconListView == null)
+       {
+               CreateIconListView();
+       }
        CreateHeader(L"Add Image");
        CreateFooter();
 }

diff --git a/src/StWallpaperAlbumListForm.cpp b/src/StWallpaperAlbumListForm.cpp
index 7a9b36d..e6fe96e 100644 (file)
--- a/src/StWallpaperAlbumListForm.cpp
+++ b/src/StWallpaperAlbumListForm.cpp
@@ -86,11 +86,6 @@ WallpaperAlbumListForm::CreateFooter(void)
 result
 WallpaperAlbumListForm::OnInitializing(void)
 {
-       __pPresentationModel = WallpaperAlbumListPresentationModel::GetInstance();
-       __pPresentationModel->InitializeAlbumInfoList();
-       __itemCount = __pPresentationModel->GetFolderCount();
-       CreateIconListView();
-
        return E_SUCCESS;
 }
 
@@ -196,7 +191,10 @@ WallpaperAlbumListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& prev
        }
        __pPresentationModel->InitializeAlbumInfoList();
        __itemCount = __pPresentationModel->GetFolderCount();
-       __pIconListView->UpdateList();
+       if (__pIconListView == null)
+       {
+               CreateIconListView();
+       }
        CreateHeader(L"Add Image");
        CreateFooter();
 }

diff --git a/src/StWallpaperForm.cpp b/src/StWallpaperForm.cpp
index 2ccc18b..b9ae863 100644 (file)
--- a/src/StWallpaperForm.cpp
+++ b/src/StWallpaperForm.cpp
@@ -66,7 +66,7 @@ WallpaperForm::CreateFooter(void)
 result
 WallpaperForm::OnInitializing(void)
 {
-       CreateHeader(L"Wallpaper");
+       CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_MAINDISPLAY_WALLPAPER"));
        CreateFooter();
 
        CreateTableView();
@@ -173,13 +173,13 @@ WallpaperForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
        case ID_HOME_SCREEN_WALLPAPER:
                {
-                       itemText = L"Home screen wallpaper";
+                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_HOME_SCREEN");
                }
                break;
 
        case ID_LOCK_SCREEN_WALLPAPER:
                {
-                       itemText = L"Lock screen wallpaper";
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_LOCK_SCREEN");
                }
                break;
 

diff --git a/src/StWifiConnectionForm.cpp b/src/StWifiConnectionForm.cpp
index 223d0ac..90f7814 100644 (file)
--- a/src/StWifiConnectionForm.cpp
+++ b/src/StWifiConnectionForm.cpp
@@ -54,8 +54,6 @@ static const int ID_ITEM_WIFI_EAP_CONNECT_PROXY_PORT = 2;
 
 static const int ID_GROUP_COUNT = 3;
 static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_WIFI_EAP_CONNECT_MAIN_ITEM_COUNT;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 240;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
 
 WifiConnectionForm::WifiConnectionForm(void)
 {

diff --git a/src/StWifiForm.cpp b/src/StWifiForm.cpp
index 828e4ed..e6a1602 100644 (file)
--- a/src/StWifiForm.cpp
+++ b/src/StWifiForm.cpp
@@ -53,8 +53,6 @@ static const int WIFI_DEFAULT_COUNT = 1;
 static const int WIFI_RSSI_DETAIL_MAX = -70;
 static const int WIFI_RSSI_DETAIL_MID = -80;
 static const int WIFI_RSSI_DETAIL_MIN = -90;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 140;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
 
 enum GroupIndex
 {