Apply string id for multilanguage and fix some nabi issue

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

diff --git a/src/StAccessibilityForm.cpp b/src/StAccessibilityForm.cpp
index b0a3c6e..c16d6c9 100644 (file)
--- a/src/StAccessibilityForm.cpp
+++ b/src/StAccessibilityForm.cpp
@@ -76,7 +76,7 @@ AccessibilityForm::CreateFooter(void)
 result
 AccessibilityForm::OnInitializing(void)
 {
-       CreateHeader(L"Accessibility");
+       CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_ACCESSIBILITY"));
        CreateFooter();
        CreateTableView();
 
@@ -199,7 +199,7 @@ AccessibilityForm::CreateGroupItem(int groupIndex, int itemWidth)
        {
        case ID_GROUP_SPEED_AT_WHICH_THE_TEXT_IS_SPOKEN:
                {
-                       groupText = L"Speed at which the text is spoken";
+                       groupText = ResourceManager::GetString(L"IDS_ST_BODY_SPEED_AT_WHICH_THE_TEXT_IS_SPOKEN");
                        yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
                        itemHeight = GetHeightForStringArea(groupText, itemWidth, fontSize);
                }
@@ -267,7 +267,7 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_SCREEN_READER:
                                {
                                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-                                       itemText = L"Screen reader (TTS)";
+                                       itemText = ResourceManager::GetString(L"IDS_ST_MBODY_SCREEN_READER_HTTS");
                                }
                                break;
 
@@ -275,7 +275,7 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                {
                                        result r = E_FAILURE;
                                        ItemTypeTwoLine(itemRectangle, itemSecondLineTextRect, fontSize);
-                                       itemText = L"Speech rate";
+                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SPEECH_RATE");
 
                                        int ttsRate = 0;
 
@@ -285,13 +285,13 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                {
                                                case ID_ITEM_RATE_SPEECH_RATE_VERY_SLOW:
                                                        {
-                                                               secondLineText = L"Very slow";
+                                                               secondLineText = ResourceManager::GetString(L"IDS_ST_POP_VERY_SLOW");
                                                        }
                                                        break;
 
                                                case ID_ITEM_RATE_SPEECH_RATE_SLOW:
                                                        {
-                                                               secondLineText = L"Slow";
+                                                               secondLineText = ResourceManager::GetString(L"IDS_ST_POP_SLOW");
                                                        }
                                                        break;
 
@@ -303,13 +303,13 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                                                case ID_ITEM_RATE_SPEECH_RATE_FAST:
                                                        {
-                                                               secondLineText = L"Fast";
+                                                               secondLineText = ResourceManager::GetString(L"IDS_ST_POP_FAST");
                                                        }
                                                        break;
 
                                                case ID_ITEM_RATE_SPEECH_RATE_VERY_FAST:
                                                        {
-                                                               secondLineText = L"Very fast";
+                                                               secondLineText = ResourceManager::GetString(L"IDS_ST_POP_VERY_FAST");
                                                        }
                                                        break;
 
@@ -339,13 +339,13 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_RATE_SPEECH_RATE_VERY_SLOW:
                                {
-                                       itemText = L"Very slow";
+                                       itemText = ResourceManager::GetString(L"IDS_ST_POP_VERY_SLOW");
                                }
                                break;
 
                        case ID_ITEM_RATE_SPEECH_RATE_SLOW:
                                {
-                                       itemText = L"Slow";
+                                       itemText = ResourceManager::GetString(L"IDS_ST_POP_SLOW");
                                }
                                break;
 
@@ -357,13 +357,13 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        case ID_ITEM_RATE_SPEECH_RATE_FAST:
                                {
-                                       itemText = L"Fast";
+                                       itemText = ResourceManager::GetString(L"IDS_ST_POP_FAST");
                                }
                                break;
 
                        case ID_ITEM_RATE_SPEECH_RATE_VERY_FAST:
                                {
-                                       itemText = L"Very fast";
+                                       itemText = ResourceManager::GetString(L"IDS_ST_POP_VERY_FAST");
                                }
                                break;
 
@@ -503,7 +503,7 @@ AccessibilityForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::Group
                                {
                                        r = SettingInfo::SetValue(SETTING_INFO_KEY_TTS_RATE, count);
                                        AppLogDebug("SetValue. TTS Rate Result[%s] ", GetErrorMessage(r));
-                                       tableView.RefreshItem(ID_GROUP_SCREEN_READER, ID_ITEM_RATE_SPEECH_RATE,TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+                                       tableView.RefreshItem(ID_GROUP_SCREEN_READER, ID_ITEM_RATE_SPEECH_RATE, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
                                }
                        }
                        RefreshGroupItemAt(ID_GROUP_SPEECH_RATE_LIST);
@@ -553,14 +553,14 @@ AccessibilityForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls
                                        {
                                        case ID_ITEM_RATE_SPEECH_RATE_VERY_SLOW:
                                                {
-                                                       secondLineText = L"Very slow";
+                                                       secondLineText = ResourceManager::GetString(L"IDS_ST_POP_VERY_SLOW");
                                                        secondLine->SetText(secondLineText);
                                                }
                                                break;
 
                                        case ID_ITEM_RATE_SPEECH_RATE_SLOW:
                                                {
-                                                       secondLineText = L"Slow";
+                                                       secondLineText = ResourceManager::GetString(L"IDS_ST_POP_SLOW");
                                                        secondLine->SetText(secondLineText);
                                                }
                                                break;
@@ -574,14 +574,14 @@ AccessibilityForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls
 
                                        case ID_ITEM_RATE_SPEECH_RATE_FAST:
                                                {
-                                                       secondLineText = L"Fast";
+                                                       secondLineText = ResourceManager::GetString(L"IDS_ST_POP_FAST");
                                                        secondLine->SetText(secondLineText);
                                                }
                                                break;
 
                                        case ID_ITEM_RATE_SPEECH_RATE_VERY_FAST:
                                                {
-                                                       secondLineText = L"Very fast";
+                                                       secondLineText = ResourceManager::GetString(L"IDS_ST_POP_VERY_FAST");
                                                        secondLine->SetText(secondLineText);
                                                }
                                                break;

diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp
index 799eeb7..6203710 100644 (file)
--- a/src/StDateTimeForm.cpp
+++ b/src/StDateTimeForm.cpp
@@ -71,6 +71,7 @@ static const int TIME_FIELD_GAP = 20;
 
 static const int DEVIDE_TWO = 2;
 static const int SECOND_CONTROL_ITEM = 1;
+static const int SECOND_TEXT_ITEM = 2;
 static const int MIN_YEAR = 1970;
 static const int MAX_YEAR = 2037;
 
@@ -896,7 +897,9 @@ DateTimeForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Tab
        }
        if (groupIndex == ID_GROUP_DATE_AND_TIME_FORMAT)
        {
-               Label* pLabel = static_cast<Label*>(pItem->GetControl(SECOND_CONTROL_ITEM));
+               String timeFormat;
+               Label* pLabelSecondLine = static_cast<Label*>(pItem->GetControl(SECOND_TEXT_ITEM));
+               Label* pLabelBitmap = static_cast<Label*>(pItem->GetControl(SECOND_CONTROL_ITEM));
                Bitmap* pBitmap = null;
 
                if (__pTableView->IsGroupExpanded(ID_GROUP_DATE_AND_TIME_FORMAT_LIST))
@@ -907,8 +910,28 @@ DateTimeForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Tab
                {
                        pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_CLOSED);
                }
-               pLabel->SetBackgroundBitmap(*pBitmap);
-               pLabel->Invalidate(false);
+
+               bool hourFormat = false;
+
+               if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_TIME_FORMAT_24HOUR, hourFormat) != E_SUCCESS)
+               {
+                       AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
+               }
+
+               if (hourFormat == 0)
+               {
+                       timeFormat = ResourceManager::GetString(L"IDS_COM_BODY_12_HOURS");
+               }
+               else
+               {
+                       timeFormat = ResourceManager::GetString(L"IDS_ST_BODY_24_HOURS");
+               }
+
+               pLabelSecondLine->SetText(timeFormat);
+               pLabelSecondLine->Invalidate(false);
+
+               pLabelBitmap->SetBackgroundBitmap(*pBitmap);
+               pLabelBitmap->Invalidate(false);
                delete pBitmap;
        }
        pItem->Invalidate(false);

diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp
index e38d4ab..ff1350b 100644 (file)
--- a/src/StLanguageAndRegionForm.cpp
+++ b/src/StLanguageAndRegionForm.cpp
@@ -1277,4 +1277,4 @@ LocaleForm::RefreshTableViewItem(void)
        {
                RefreshTableViewGroupItem(index);
        }
-}
+}
\ No newline at end of file

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index ec504be..7676c45 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -389,7 +389,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                        itemHeight = (itemRectLabel.height + itemRectSecondLabel.height);
 
                                        pBitmap = ResourceManager::GetBitmapN(IDB_NFC);
-                                       itemText = L"NFC";
+                                       itemText = ResourceManager::GetString(L"IDS_NFC_BODY_NFC");
                                }
                                break;
 
@@ -474,7 +474,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_DEVICE_ACCESSIBILITY:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_ACCESSIBILITY);
-                                       itemText = L"Accessibility";
+                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_ACCESSIBILITY");
                                }
                                break;
 

diff --git a/src/StManageApplicationInfoForm.cpp b/src/StManageApplicationInfoForm.cpp
index e6d8c5e..255522f 100644 (file)
--- a/src/StManageApplicationInfoForm.cpp
+++ b/src/StManageApplicationInfoForm.cpp
@@ -76,6 +76,8 @@ static const int W_ALERT_POPUP_CLIENT_RECT_DEFAULT = 700;
 static const int H_ALERT_POPUP_CLIENT_RECT_DEFAULT = 550;
 
 static const int COMMAND_BUTTON_GAP = 20;
+static const int APPLICATION_NAME_MARGIN_GAP = 100;
+static const int APPLICATION_NAME_SECOND_CONTROL = 1;
 
 static const int DIVIDE_BY_TWO = 2;
 static const int KILOBYTE_TO_MEGABYTE = 1024;
@@ -552,7 +554,7 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
 
                        pItem->AddControl(*pLabel);
 
-                       relativeLayout.SetMargin(*pLabel, firstLineRectangle.x, 0, 0, 0);
+                       relativeLayout.SetMargin(*pLabel, secondLineRectangle.x, 0, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
                }
@@ -612,7 +614,17 @@ ManageApplicationInfoForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::
        {
        case ID_GROUP_APPLICATION_NAME:
                {
-                       if (itemIndex == ID_ITEM_APPLICATION_COMMAND_BUTTON)
+                       if (itemIndex == ID_ITEM_APPLICATION_NAME)
+                       {
+                               Label* pLabel = static_cast<Label*>(pItem->GetControl(APPLICATION_NAME_SECOND_CONTROL));
+                               Rectangle rect = pLabel->GetBounds();
+                               Rectangle clientRect = GetClientAreaBounds();
+                               rect.width = clientRect.width - APPLICATION_NAME_MARGIN_GAP;
+                               pLabel->SetBounds(rect);
+
+                               pItem->Invalidate(false);
+                       }
+                       else if (itemIndex == ID_ITEM_APPLICATION_COMMAND_BUTTON)
                        {
                                Rectangle pItemRect = pItem->GetBounds();
                                Rectangle clientRect = GetClientAreaBounds();
@@ -664,6 +676,7 @@ ManageApplicationInfoForm::OnOrientationChanged(const Tizen::Ui::Control& source
                AppLogDebug("__pTableView is null");
                return;
        }
+       __pTableView->RefreshItem(ID_GROUP_APPLICATION_NAME, ID_ITEM_APPLICATION_NAME, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
        __pTableView->RefreshItem(ID_GROUP_APPLICATION_NAME, ID_ITEM_APPLICATION_COMMAND_BUTTON, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
        Invalidate(true);
 }

diff --git a/src/StNfcForm.cpp b/src/StNfcForm.cpp
index aeef4a6..deec483 100644 (file)
--- a/src/StNfcForm.cpp
+++ b/src/StNfcForm.cpp
@@ -213,7 +213,7 @@ NfcForm::CreateGroupItem(int groupIndex, int itemWidth)
        case ID_GROUP_NFC_PREDEFINED_ITEM_HELP:
                {
                        yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP / DIVIDE_BY_TWO ;
-                       groupText = L"You can beam predefined items to another NFC device. Just bring the devices close together (typically back to back) while in the home screen";
+                       groupText = ResourceManager::GetString(L"IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG");
                        itemHeight = GetHeightForStringArea(groupText, itemWidth - W_TEXT_GAP, fontSize);
                }
                break;
@@ -278,7 +278,7 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
        case ID_GROUP_NFC:
                {
-                       itemText = L"NFC";
+                       itemText = ResourceManager::GetString(L"IDS_NFC_BODY_NFC");
                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
                }
                break;
@@ -291,7 +291,7 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                itemSecondLineText = *static_cast<String*>(__pResevedPushCandidatesAppidList->GetAt(selectItemIndex));
                        }
                        ItemTypeTwoLine(itemRectangle, itemSecondLineRectangle, fontSize);
-                       itemText = L"Predefined item";
+                       itemText = ResourceManager::GetString(L"IDS_NFC_BODY_PREDEFINED_ITEM_ABB");
                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
                }
                break;

diff --git a/src/StWallpaperAlbumListDetailForm.cpp b/src/StWallpaperAlbumListDetailForm.cpp
index d25ee32..f8db7a7 100644 (file)
--- a/src/StWallpaperAlbumListDetailForm.cpp
+++ b/src/StWallpaperAlbumListDetailForm.cpp
@@ -38,8 +38,8 @@ static const int FOLDER_BITMAP_MAX = 6;
 WallpaperAlbumListDetailForm::WallpaperAlbumListDetailForm(void)
        : __itemCount(0)
        , __pPresentationModel(null)
-       , __pIconListView(null)
        , __pAlbumInfo(null)
+       , __pIconListView(null)
        , __pArgs(null)
 {
 }
@@ -213,7 +213,7 @@ WallpaperAlbumListDetailForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId
        {
                CreateIconListView();
        }
-       CreateHeader(L"Add Image");
+       CreateHeader(ResourceManager::GetString(L"IDS_MP_BODY_ADD_IMAGE"));
        CreateFooter();
 }
 

diff --git a/src/StWallpaperAlbumListForm.cpp b/src/StWallpaperAlbumListForm.cpp
index e6fe96e..4f99493 100644 (file)
--- a/src/StWallpaperAlbumListForm.cpp
+++ b/src/StWallpaperAlbumListForm.cpp
@@ -195,7 +195,7 @@ WallpaperAlbumListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& prev
        {
                CreateIconListView();
        }
-       CreateHeader(L"Add Image");
+       CreateHeader(ResourceManager::GetString(L"IDS_MP_BODY_ADD_IMAGE"));
        CreateFooter();
 }
 

diff --git a/src/StWallpaperImageSelectForm.cpp b/src/StWallpaperImageSelectForm.cpp
index 37dc055..1bbfd12 100644 (file)
--- a/src/StWallpaperImageSelectForm.cpp
+++ b/src/StWallpaperImageSelectForm.cpp
@@ -75,7 +75,7 @@ WallpaperImageSelectForm::CreateFooter(void)
 
        FooterItem footerSave;
        footerSave.Construct(IDA_FOOTER_SAVE);
-       footerSave.SetText(L"Save");
+       footerSave.SetText(ResourceManager::GetString(L"IDS_ST_BODY_SAVE"));
 
        pFooter->AddItem(footerSave);
        pFooter->SetBackButton();