Fix N_SE-36161 issue and code clean up
authorTaeHo Choi <thanks.choi@samsung.com>
Wed, 24 Apr 2013 10:34:00 +0000 (19:34 +0900)
committerTaeHo Choi <thanks.choi@samsung.com>
Thu, 25 Apr 2013 06:39:07 +0000 (15:39 +0900)
Change-Id: I2ad217eb1f745913c7da68366af1a4f4397d4631
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>
44 files changed:
inc/StLanguageAndRegionForm.h
src/StAboutPhoneForm.cpp
src/StAccessibilityForm.cpp
src/StAppSettingForm.cpp
src/StBluetoothDetailForm.cpp
src/StBrightnessForm.cpp
src/StCertificateDetailForm.cpp
src/StCertificateForm.cpp
src/StCertificateTrustedRootForm.cpp
src/StCertificateUserForm.cpp
src/StCertificateUserInstallForm.cpp
src/StCertificateUserInstallPasswordForm.cpp
src/StCertificateUserUnInstallForm.cpp
src/StDateTimeForm.cpp
src/StDeveloperOptionForm.cpp
src/StDisplayForm.cpp
src/StDownloadedApplicationForm.cpp
src/StEventsNotificationForm.cpp
src/StFontForm.cpp
src/StFontSizeForm.cpp
src/StHomeAndLockScreenForm.cpp
src/StKeyboardForm.cpp
src/StKeyboardInfoForm.cpp
src/StKeyboardSelectionForm.cpp
src/StLanguageAndRegionForm.cpp
src/StLanguageForm.cpp
src/StLocationForm.cpp
src/StMainMenuForm.cpp
src/StManageApplicationForm.cpp
src/StManageApplicationInfoForm.cpp
src/StMemoryForm.cpp
src/StMemoryStatusForm.cpp
src/StNetworkForm.cpp
src/StNfcForm.cpp
src/StNfcPredefinedItemForm.cpp
src/StPrivacyDetailForm.cpp
src/StPrivacyForm.cpp
src/StRegionForm.cpp
src/StResetForm.cpp
src/StResetSettingForm.cpp
src/StScreenTypeForm.cpp
src/StSecurityForm.cpp
src/StSoundsForm.cpp
src/StTimeZoneForm.cpp

index d7e735c..a88b554 100644 (file)
@@ -27,6 +27,7 @@
 
 class LocaleForm
        : public BaseForm
+       , public Tizen::Ui::IFocusEventListener
 {
 public:
        LocaleForm(void);
@@ -59,6 +60,9 @@ public:
 
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
 
+       virtual void OnFocusGained(const Tizen::Ui::Control& source);
+       virtual void OnFocusLost(const Tizen::Ui::Control& source);
+
 private:
        void RefreshTableViewItem(void);
        void RefreshTableViewGroupItem(int groupIndex);
@@ -66,6 +70,7 @@ private:
 
 private:
        Tizen::Base::Collection::ArrayList* __languageDataList;
+       bool __isRunningAppControl;
 };
 
 #endif // _ST_LANGUAGE_AND_REGION_FORM_H_
\ No newline at end of file
index c54d078..e182111 100644 (file)
@@ -265,7 +265,7 @@ PhoneInfoForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       Rectangle itemRectangle(X_GROUP_INDEX_DEFAULT_LABEL, yItemOffset, itemWidth, itemHeight);
+       Rectangle itemMainRectangle(X_GROUP_INDEX_DEFAULT_LABEL, yItemOffset, itemWidth, itemHeight);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -275,7 +275,7 @@ PhoneInfoForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
@@ -283,7 +283,7 @@ PhoneInfoForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        pItem->AddControl(*pLabel);
        pItem->SetEnabled(false);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
 
@@ -296,41 +296,41 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
        String batteryText;
-       bool isTwoLineItemText = false;
+       bool isItemSubText = false;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       Rectangle itemRectangle;
-       Rectangle itemRectSecondLabel;
-       String itemText;
-       String itemTextTwoLine;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
+       String itemMainText;
+       String itemSubText;
        Label* pLabel = null;
        int itemHeight = H_GROUP_ITEM_DEFAULT;
        int fontSize = GetFontSize();
 
        if (groupIndex == ID_GROUP_ABOUT_PHONE_MAIN)
        {
-               isTwoLineItemText = true;
-               ItemTypeTwoLine(itemRectangle, itemRectSecondLabel, fontSize);
-               itemHeight = (itemRectangle.height + itemRectSecondLabel.height);
+               isItemSubText = true;
+               ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+               itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
 
                switch (itemIndex)
                {
                case ID_ITEM_ABOUT_PHONE_MAIN_NAME:
                        {
-                               itemRectangle.x = 0;
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_NAME");
+                               itemMainRectangle.x = 0;
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_NAME");
 
                                String phoneName;
                                if (SettingInfo::GetValue(SETTING_INFO_KEY_DEVICE_NAME, phoneName) != E_SUCCESS)
                                {
-                                       itemTextTwoLine = L"Tizen";
+                                       itemSubText = L"Tizen";
                                }
                                else
                                {
-                                       itemTextTwoLine.Append(phoneName);
+                                       itemSubText.Append(phoneName);
                                }
-                               ItemTypeOneLine(itemRectangle);
-                               itemRectangle.height = itemHeight;
-                               isTwoLineItemText = false;
+                               ItemTypeOneLine(itemMainRectangle);
+                               itemMainRectangle.height = itemHeight;
+                               isItemSubText = false;
                        }
                        break;
 
@@ -339,32 +339,32 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                SimInfo* pSimInfo = new (std::nothrow) SimInfo();
                                if (pSimInfo->Construct() == E_SUCCESS)
                                {
-                                       itemTextTwoLine = pSimInfo->GetPhoneNumber();
+                                       itemSubText = pSimInfo->GetPhoneNumber();
 
-                                       if (itemTextTwoLine.IsEmpty() == true)
+                                       if (itemSubText.IsEmpty() == true)
                                        {
-                                               itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
+                                               itemSubText = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
                                        }
                                }
                                else
                                {
-                                       itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
+                                       itemSubText = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
                                }
 
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_MY_NUMBER");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MY_NUMBER");
                                delete pSimInfo;
                        }
                        break;
 
                case ID_ITEM_ABOUT_PHONE_MAIN_MODEL:
                        {
-                               if (SystemInfo::GetValue(SYSTEM_INFO_KEY_MODELNAME, itemTextTwoLine) != E_SUCCESS)
+                               if (SystemInfo::GetValue(SYSTEM_INFO_KEY_MODELNAME, itemSubText) != E_SUCCESS)
                                {
-                                       itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
+                                       itemSubText = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
                                        AppLogDebug("GetValue Fail.. - %s", GetErrorMessage(GetLastResult()));
                                }
 
-                               itemText = ResourceManager::GetString(L"IDS_COM_BODY_MODEL");
+                               itemMainText = ResourceManager::GetString(L"IDS_COM_BODY_MODEL");
                        }
                        break;
 
@@ -373,34 +373,34 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                String getVersion;
                                if (SystemInfo::GetPlatformVersion(getVersion) == E_SUCCESS)
                                {
-                                       itemTextTwoLine.Remove(0, itemTextTwoLine.GetLength());
-                                       itemTextTwoLine.Insert(getVersion, itemTextTwoLine.GetLength());
+                                       itemSubText.Remove(0, itemSubText.GetLength());
+                                       itemSubText.Insert(getVersion, itemSubText.GetLength());
                                }
                                else
                                {
-                                       itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
+                                       itemSubText = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
                                }
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_VERSION");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_VERSION");
                        }
                        break;
 
                case ID_ITEM_ABOUT_PHONE_MAIN_BLUETOOTH:
                        {
                                bool EnableStatus = false;
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_BLUETOOTH");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_BLUETOOTH");
 
                                if (SystemInfo::GetValue(SYSTEM_INFO_KEY_BLUETOOTH, EnableStatus) == E_SUCCESS)
                                {
                                        BluetoothPresentationModel* pInstance = BluetoothPresentationModel::GetInstance();
                                        if (EnableStatus == true && pInstance != null)
                                        {
-                                               itemTextTwoLine = pInstance->GetBluetoothLocalMacAddress();
+                                               itemSubText = pInstance->GetBluetoothLocalMacAddress();
                                        }
                                }
 
-                               if (itemTextTwoLine.IsEmpty() == true)
+                               if (itemSubText.IsEmpty() == true)
                                {
-                                       itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
+                                       itemSubText = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
                                }
                        }
                        break;
@@ -408,20 +408,20 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                case ID_ITEM_ABOUT_PHONE_MAIN_WIFI:
                        {
                                bool EnableStatus = false;
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_WI_FI");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_WI_FI");
 
                                if (SystemInfo::GetValue(SYSTEM_INFO_KEY_WIFI, EnableStatus) == E_SUCCESS)
                                {
                                        WifiPresentationModel* pInstance = WifiPresentationModel::GetInstance();
                                        if (EnableStatus == true && pInstance != null)
                                        {
-                                               itemTextTwoLine = pInstance->GetWifiMacAddress();
+                                               itemSubText = pInstance->GetWifiMacAddress();
                                        }
                                }
 
-                               if (itemTextTwoLine.IsEmpty() == true)
+                               if (itemSubText.IsEmpty() == true)
                                {
-                                       itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
+                                       itemSubText = ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE");
                                }
                        }
                        break;
@@ -432,7 +432,7 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                                Battery::GetCurrentLevelInPercentage(batteryLevel);
                                batteryText.Format(DEFAULT_TEXT_SIZE, L"%d%%", batteryLevel);
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_BATTERY");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_BATTERY");
                        }
                        break;
 
@@ -443,16 +443,16 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                                if (RuntimeInfo::GetValueAsync(RUNTIME_INFO_KEY_CPU_USAGE, __CpuUsageGetInfoResultListener))
                                {
-                                       itemTextTwoLine = Integer::ToString(cpuUsage);
-                                       itemTextTwoLine.Append(L"%");
+                                       itemSubText = Integer::ToString(cpuUsage);
+                                       itemSubText.Append(L"%");
                                }
                                else
                                {
                                        AppLogDebug("Get Value Result [%s]", GetErrorMessage(GetLastResult()));
-                                       itemTextTwoLine = L"0%";
+                                       itemSubText = L"0%";
                                }
 
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_CPU_USAGE");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_CPU_USAGE");
                        }
                        break;
 
@@ -462,8 +462,8 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        else
        {
-               itemText = ResourceManager::GetString(L"IDS_ST_BODY_CERTIFICATES");
-               ItemTypeOneLine(itemRectangle);
+               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_CERTIFICATES");
+               ItemTypeOneLine(itemMainRectangle);
        }
 
        RelativeLayout relativeLayout;
@@ -476,10 +476,10 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        if ((groupIndex == ID_GROUP_ABOUT_PHONE_MAIN) && (itemIndex == ID_ITEM_ABOUT_PHONE_MAIN_NAME))
        {
                __pEditField = new (std::nothrow) EditField();
-               __pEditField->Construct(itemRectangle, EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY, EDIT_FIELD_TITLE_STYLE_TOP, true, LIMIT_EDITFIELD, GROUP_STYLE_NONE);
+               __pEditField->Construct(itemMainRectangle, EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY, EDIT_FIELD_TITLE_STYLE_TOP, true, LIMIT_EDITFIELD, GROUP_STYLE_NONE);
                __pEditField->SetGuideText(ResourceManager::GetString(L"IDS_ST_HEADER_DEVICE_NAME_ABB"));
-               __pEditField->SetTitleText(itemText);
-               __pEditField->SetText(itemTextTwoLine);
+               __pEditField->SetTitleText(itemMainText);
+               __pEditField->SetText(itemSubText);
                __pEditField->SetTextSize(fontSize);
                __pEditField->SetTitleTextColor(EDIT_STATUS_NORMAL, COLOR_HELP_TEXT_TYPE_01);
                __pEditField->SetColor(EDIT_STATUS_NORMAL, COLOR_BG_GROUP_INDEX_DEFAULT);
@@ -499,7 +499,7 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        else
        {
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, itemText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -515,14 +515,14 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                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);
-               if (isTwoLineItemText == true)
+               if (isItemSubText == true)
                {
                        if ((groupIndex == ID_GROUP_ABOUT_PHONE_MAIN) && (itemIndex == ID_ITEM_ABOUT_PHONE_MAIN_BATTERY))
                        {
-                               itemTextTwoLine = batteryText;
+                               itemSubText = batteryText;
                        }
                        pLabel = new (std::nothrow) Label();
-                       pLabel->Construct(itemRectSecondLabel, itemTextTwoLine);
+                       pLabel->Construct(itemSubRectangle, itemSubText);
                        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                        pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                        pLabel->SetTextColor(COLOR_SUB_TEXT);
index 32b3187..3526667 100644 (file)
@@ -188,7 +188,7 @@ AccessibilityForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        int fontSize = GetFontSize();
        String groupText;
        Label* pLabel = null;
@@ -213,10 +213,10 @@ AccessibilityForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -225,7 +225,7 @@ AccessibilityForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(fontSize, style);
@@ -233,7 +233,7 @@ AccessibilityForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        pItem->AddControl(*pLabel);
        pItem->SetEnabled(false);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
@@ -245,18 +245,18 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String secondLineText;
+       String itemMainText;
+       String itemSubText;
        String fontReturnValue;
        Label* pLabel = null;
        int fontSize = GetFontSize();
        int startGap = 0;
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        switch (groupIndex)
        {
@@ -267,15 +267,15 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_SCREEN_READER:
                                {
                                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-                                       itemText = ResourceManager::GetString(L"IDS_ST_MBODY_SCREEN_READER_HTTS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_MBODY_SCREEN_READER_HTTS");
                                }
                                break;
 
                        case ID_ITEM_RATE_SPEECH_RATE:
                                {
                                        result r = E_FAILURE;
-                                       ItemTypeTwoLine(itemRectangle, itemSecondLineTextRect, fontSize);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SPEECH_RATE");
+                                       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SPEECH_RATE");
 
                                        int ttsRate = 0;
 
@@ -285,31 +285,31 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                {
                                                case ID_ITEM_RATE_SPEECH_RATE_VERY_SLOW:
                                                        {
-                                                               secondLineText = ResourceManager::GetString(L"IDS_ST_POP_VERY_SLOW");
+                                                               itemSubText = ResourceManager::GetString(L"IDS_ST_POP_VERY_SLOW");
                                                        }
                                                        break;
 
                                                case ID_ITEM_RATE_SPEECH_RATE_SLOW:
                                                        {
-                                                               secondLineText = ResourceManager::GetString(L"IDS_ST_POP_SLOW");
+                                                               itemSubText = ResourceManager::GetString(L"IDS_ST_POP_SLOW");
                                                        }
                                                        break;
 
                                                case ID_ITEM_RATE_SPEECH_RATE_NORMAL:
                                                        {
-                                                               secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
+                                                               itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
                                                        }
                                                        break;
 
                                                case ID_ITEM_RATE_SPEECH_RATE_FAST:
                                                        {
-                                                               secondLineText = ResourceManager::GetString(L"IDS_ST_POP_FAST");
+                                                               itemSubText = ResourceManager::GetString(L"IDS_ST_POP_FAST");
                                                        }
                                                        break;
 
                                                case ID_ITEM_RATE_SPEECH_RATE_VERY_FAST:
                                                        {
-                                                               secondLineText = ResourceManager::GetString(L"IDS_ST_POP_VERY_FAST");
+                                                               itemSubText = ResourceManager::GetString(L"IDS_ST_POP_VERY_FAST");
                                                        }
                                                        break;
 
@@ -339,31 +339,31 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_RATE_SPEECH_RATE_VERY_SLOW:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_POP_VERY_SLOW");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_POP_VERY_SLOW");
                                }
                                break;
 
                        case ID_ITEM_RATE_SPEECH_RATE_SLOW:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_POP_SLOW");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_POP_SLOW");
                                }
                                break;
 
                        case ID_ITEM_RATE_SPEECH_RATE_NORMAL:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
                                }
                                break;
 
                        case ID_ITEM_RATE_SPEECH_RATE_FAST:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_POP_FAST");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_POP_FAST");
                                }
                                break;
 
                        case ID_ITEM_RATE_SPEECH_RATE_VERY_FAST:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_POP_VERY_FAST");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_POP_VERY_FAST");
                                }
                                break;
 
@@ -384,7 +384,7 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
 
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
@@ -403,10 +403,10 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
-       if (secondLineText.IsEmpty() == false)
+       if (itemSubText.IsEmpty() == false)
        {
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemSecondLineTextRect, secondLineText);
+               pLabel->Construct(itemSubRectangle, itemSubText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
@@ -543,7 +543,7 @@ AccessibilityForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls
                        {
                                result r = E_FAILURE;
                                Label* secondLine = static_cast<Label*>(pItem->GetControl(ID_ITEM_RATE_SPEECH_RATE));
-                               String secondLineText;
+                               String itemSubText;
 
                                int ttsRate = 0;
 
@@ -553,36 +553,36 @@ AccessibilityForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls
                                        {
                                        case ID_ITEM_RATE_SPEECH_RATE_VERY_SLOW:
                                                {
-                                                       secondLineText = ResourceManager::GetString(L"IDS_ST_POP_VERY_SLOW");
-                                                       secondLine->SetText(secondLineText);
+                                                       itemSubText = ResourceManager::GetString(L"IDS_ST_POP_VERY_SLOW");
+                                                       secondLine->SetText(itemSubText);
                                                }
                                                break;
 
                                        case ID_ITEM_RATE_SPEECH_RATE_SLOW:
                                                {
-                                                       secondLineText = ResourceManager::GetString(L"IDS_ST_POP_SLOW");
-                                                       secondLine->SetText(secondLineText);
+                                                       itemSubText = ResourceManager::GetString(L"IDS_ST_POP_SLOW");
+                                                       secondLine->SetText(itemSubText);
                                                }
                                                break;
 
                                        case ID_ITEM_RATE_SPEECH_RATE_NORMAL:
                                                {
-                                                       secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
-                                                       secondLine->SetText(secondLineText);
+                                                       itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
+                                                       secondLine->SetText(itemSubText);
                                                }
                                                break;
 
                                        case ID_ITEM_RATE_SPEECH_RATE_FAST:
                                                {
-                                                       secondLineText = ResourceManager::GetString(L"IDS_ST_POP_FAST");
-                                                       secondLine->SetText(secondLineText);
+                                                       itemSubText = ResourceManager::GetString(L"IDS_ST_POP_FAST");
+                                                       secondLine->SetText(itemSubText);
                                                }
                                                break;
 
                                        case ID_ITEM_RATE_SPEECH_RATE_VERY_FAST:
                                                {
-                                                       secondLineText = ResourceManager::GetString(L"IDS_ST_POP_VERY_FAST");
-                                                       secondLine->SetText(secondLineText);
+                                                       itemSubText = ResourceManager::GetString(L"IDS_ST_POP_VERY_FAST");
+                                                       secondLine->SetText(itemSubText);
                                                }
                                                break;
 
index f92d5cf..a20799e 100644 (file)
@@ -1146,7 +1146,7 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_DEFAULT;
        int yItemOffset = Y_GROUP_INDEX_DEFAULT;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String* groupText = null;
        Node* pNode = null;
        Label* pLabel = null;
@@ -1154,14 +1154,14 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        __pGroupItemNodeList->GetAt(groupIndex, pNode);
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        itemHeight = H_GROUP_INDEX_DEFAULT;
-       itemRectangle.y = H_GROUP_INDEX_TITLE_TEXT;
-       itemRectangle.height = H_GROUP_INDEX_DEFAULT - H_GROUP_INDEX_TITLE_TEXT;
+       itemMainRectangle.y = H_GROUP_INDEX_TITLE_TEXT;
+       itemMainRectangle.height = H_GROUP_INDEX_DEFAULT - H_GROUP_INDEX_TITLE_TEXT;
        groupText = pNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_TITLE);
        if (groupText == null)
        {
@@ -1189,8 +1189,8 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        if (pNode->GetType().Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_LIST, false))
        {
-               ItemTypeOneLine(itemRectangle);
-               itemHeight = itemRectangle.height;
+               ItemTypeOneLine(itemMainRectangle);
+               itemHeight = itemMainRectangle.height;
        }
 
        if ((pNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_LIST, false))
@@ -1202,7 +1202,7 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
 
                pNode->RegisterObserverlistener(__pIOAppSetting);
 
-               pItem->Construct(Dimension(itemRectangle.width, itemRectangle.height));
+               pItem->Construct(Dimension(itemMainRectangle.width, itemMainRectangle.height));
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                expendList.Append(groupText->GetPointer());
@@ -1212,7 +1212,7 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
                delete value;
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, expendList);
+               pLabel->Construct(itemMainRectangle, expendList);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                pLabel->SetName(pNode->GetId());
@@ -1230,7 +1230,7 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
 
                Label* pLabel = new (std::nothrow) Label();
 
-               pLabel->Construct(itemRectangle, (*groupText).GetPointer());
+               pLabel->Construct(itemMainRectangle, (*groupText).GetPointer());
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
 
@@ -1249,7 +1249,7 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
 TableViewItem*
 AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        Label* pLabel = null;
        String itemType;
        String* itemText = null;
@@ -1280,7 +1280,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        itemText = pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_TITLE);
        itemType = pItemNode->GetType();
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_BOOL, false))
        {
@@ -1294,11 +1294,11 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
 
-               pItem->Construct(relativeLayout, Dimension(itemWidth, itemRectangle.height), style);
+               pItem->Construct(relativeLayout, Dimension(itemWidth, itemMainRectangle.height), style);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, (itemText)->GetPointer());
+               pLabel->Construct(itemMainRectangle, (itemText)->GetPointer());
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
 
@@ -1326,12 +1326,12 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                pItemNode->RegisterObserverlistener(__pIOAppSetting);
 
-               itemRectangle.width = (itemWidth - ITEM_WIDTH_GAP);
-               itemRectangle.height = H_GROUP_ITEM_DEFAULT_SLIDER;
+               itemMainRectangle.width = (itemWidth - ITEM_WIDTH_GAP);
+               itemMainRectangle.height = H_GROUP_ITEM_DEFAULT_SLIDER;
 
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
-               pItem->Construct(relativeLayout, Dimension(itemWidth, itemRectangle.height), style);
+               pItem->Construct(relativeLayout, Dimension(itemWidth, itemMainRectangle.height), style);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                String* minValueString = pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_MIN);
@@ -1343,7 +1343,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                Integer::Parse((*setValueString).GetPointer(), setValue);
 
                pSlider = new (std::nothrow) Slider();
-               result r = pSlider->Construct(itemRectangle, BACKGROUND_STYLE_NONE, true, minValue, maxValue);
+               result r = pSlider->Construct(itemMainRectangle, BACKGROUND_STYLE_NONE, true, minValue, maxValue);
                if (IsFailed(r))
                {
                        delete minValueString;
@@ -1372,7 +1372,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_STRING, false))
        {
-               itemRectangle.x = 0;
+               itemMainRectangle.x = 0;
                int stringLengthMin = 0;
                int stringLengthMax = 0;
 
@@ -1394,7 +1394,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
-               pItem->Construct(relativeLayout, Dimension(itemWidth, itemRectangle.height), style);
+               pItem->Construct(relativeLayout, Dimension(itemWidth, itemMainRectangle.height), style);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                pItemNode->RegisterObserverlistener(__pIOAppSetting);
@@ -1409,8 +1409,8 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                EditField* pEditField = new (std::nothrow) EditField();
                String* secondLine = pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_VALUE);
 
-               itemRectangle.x = X_GROUP_DEFAULT;
-               pEditField->Construct(itemRectangle, EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY, EDIT_FIELD_TITLE_STYLE_TOP, true, stringLengthMax, GROUP_STYLE_NONE);
+               itemMainRectangle.x = X_GROUP_DEFAULT;
+               pEditField->Construct(itemMainRectangle, EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY, EDIT_FIELD_TITLE_STYLE_TOP, true, stringLengthMax, GROUP_STYLE_NONE);
                pEditField->SetGuideText((*itemText).GetPointer());
                pEditField->SetTitleText((*itemText).GetPointer());
                pEditField->SetText((*secondLine).GetPointer());
@@ -1437,11 +1437,11 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_LABEL, false))
        {
-               pItem->Construct(Dimension(itemWidth, itemRectangle.height), style);
+               pItem->Construct(Dimension(itemWidth, itemMainRectangle.height), style);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, (itemText)->GetPointer());
+               pLabel->Construct(itemMainRectangle, (itemText)->GetPointer());
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
 
@@ -1465,7 +1465,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                pItemNode->RegisterObserverlistener(__pIOAppSetting);
 
-               pItem->Construct(Dimension(itemWidth, itemRectangle.height), style);
+               pItem->Construct(Dimension(itemWidth, itemMainRectangle.height), style);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                expendList.Append(itemText->GetPointer());
@@ -1475,7 +1475,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                delete value;
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, expendList);
+               pLabel->Construct(itemMainRectangle, expendList);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                pLabel->SetName(pItemNode->GetId());
@@ -1489,7 +1489,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
-               pItem->Construct(relativeLayout, Dimension(itemWidth, itemRectangle.height), style);
+               pItem->Construct(relativeLayout, Dimension(itemWidth, itemMainRectangle.height), style);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_LISTITEM);
 
                Node* parent = pItemNode->GetParent();
@@ -1503,7 +1503,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, (itemText)->GetPointer());
+               pLabel->Construct(itemMainRectangle, (itemText)->GetPointer());
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
 
@@ -1517,7 +1517,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_SEPARATOR, false))
        {
                Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_SEPARATOR);
-               itemRectangle.height = H_GROUP_INDEX_NO_TITLE_DEFAULT;
+               itemMainRectangle.height = H_GROUP_INDEX_NO_TITLE_DEFAULT;
 
                if (pBitmap == null)
                {
@@ -1527,10 +1527,10 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
-               pItem->Construct(relativeLayout, Dimension(itemWidth, itemRectangle.height), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+               pItem->Construct(relativeLayout, Dimension(itemWidth, itemMainRectangle.height), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, L" ");
+               pLabel->Construct(itemMainRectangle, L" ");
                pLabel->SetBackgroundBitmap(*pBitmap);
                pItem->AddControl(*pLabel);
 
index 8aaa595..62b3b44 100644 (file)
@@ -221,12 +221,12 @@ BluetoothDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
 TableViewItem*
 BluetoothDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       bool isTwoLineItemText = false;
+       bool isItemSubText = false;
        int itemHeight = H_GROUP_ITEM_DEFAULT;
-       Rectangle itemRectangle;
-       Rectangle itemRectSecondLabel;
-       String itemText;
-       String itemTextTwoLine;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
+       String itemMainText;
+       String itemSubText;
        int fontSize = GetFontSize();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
@@ -256,18 +256,18 @@ BluetoothDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
        case BLUETOOTH_DETAIL_STATUS_GROUP_ITEM_DEVICE_NAME:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_DEVICE_NAME_ABB");
-                       itemTextTwoLine =__pBluetoothPresentationModelInstance->GetPairedDeviceNameAt(__pairedDeviceIndex);
-                       isTwoLineItemText = true;
-                       ItemTypeTwoLine(itemRectangle, itemRectSecondLabel, fontSize);
-                       itemHeight = (itemRectangle.height + itemRectSecondLabel.height);
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_HEADER_DEVICE_NAME_ABB");
+                       itemSubText =__pBluetoothPresentationModelInstance->GetPairedDeviceNameAt(__pairedDeviceIndex);
+                       isItemSubText = true;
+                       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+                       itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
                }
                break;
 
        case BLUETOOTH_DETAIL_STATUS_GROUP_ITEM_UNPAIR:
                {
-                       itemText = ResourceManager::GetString(L"IDS_BT_BUTTON_UNPAIR");
-                       ItemTypeOneLine(itemRectangle);
+                       itemMainText = ResourceManager::GetString(L"IDS_BT_BUTTON_UNPAIR");
+                       ItemTypeOneLine(itemMainRectangle);
                }
                break;
 
@@ -298,7 +298,7 @@ BluetoothDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                return pItem;
        }
 
-       r = pLabel->Construct(itemRectangle, itemText);
+       r = pLabel->Construct(itemMainRectangle, itemMainText);
        if (IsFailed(r))
        {
                AppLogDebug("Construct fail [%s]", GetErrorMessage(r));
@@ -315,7 +315,7 @@ BluetoothDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        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);
-       if (isTwoLineItemText)
+       if (isItemSubText)
        {
                Label* pSecondLabel = new (std::nothrow) Label();
                if (pSecondLabel == null)
@@ -324,7 +324,7 @@ BluetoothDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        return pItem;
                }
 
-               r = pSecondLabel->Construct(itemRectSecondLabel, itemTextTwoLine);
+               r = pSecondLabel->Construct(itemSubRectangle, itemSubText);
                if (IsFailed(r))
                {
                        AppLogDebug("Construct fail [%s]", GetErrorMessage(r));
index 8fab3b9..2b47dfc 100644 (file)
@@ -167,21 +167,21 @@ BrightnessForm::CreateItem(int groupIndex, int itemIndex,int itemWidth)
        AppLogDebug("CreateItem group[%d] index[%d]", groupIndex, itemIndex);
 
        int brightness = 0;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        Slider* pSlider = null;
-       String itemText;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        switch (itemIndex)
        {
        case ID_ITEM_BRIGHTNESS_AUTOMATIC:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_AUTOMATIC");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_AUTOMATIC");
                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
                        RelativeLayout relativeLayout;
                        relativeLayout.Construct();
@@ -190,7 +190,7 @@ BrightnessForm::CreateItem(int groupIndex, int itemIndex,int itemWidth)
                        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                        pLabel = new (std::nothrow) Label();
-                       pLabel->Construct(itemRectangle, itemText);
+                       pLabel->Construct(itemMainRectangle, itemMainText);
                        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                        pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -204,8 +204,8 @@ BrightnessForm::CreateItem(int groupIndex, int itemIndex,int itemWidth)
 
        case ID_ITEM_BRIGHTNESS_SLIDE_BAR:
                {
-                       itemRectangle.width = W_GROUP_ITEM_DEFAULT_SLIDER;
-                       itemRectangle.height = H_GROUP_ITEM_DEFAULT_SLIDER;
+                       itemMainRectangle.width = W_GROUP_ITEM_DEFAULT_SLIDER;
+                       itemMainRectangle.height = H_GROUP_ITEM_DEFAULT_SLIDER;
 
                        RelativeLayout relativeLayout;
                        relativeLayout.Construct();
@@ -219,9 +219,9 @@ BrightnessForm::CreateItem(int groupIndex, int itemIndex,int itemWidth)
                        }
 
                        pSlider = new (std::nothrow) Slider();
-                       pSlider->Construct(itemRectangle, BACKGROUND_STYLE_NONE, true, GROUP_ITEM_SLIDER_MIN_VALUE, GROUP_ITEM_SLIDER_MAX_VALUE);
+                       pSlider->Construct(itemMainRectangle, BACKGROUND_STYLE_NONE, true, GROUP_ITEM_SLIDER_MIN_VALUE, GROUP_ITEM_SLIDER_MAX_VALUE);
                        pSlider->SetValue(brightness);
-                       pSlider->SetPosition(itemRectangle.x, itemRectangle.y + Y_GROUP_ITEM_SLIDER);
+                       pSlider->SetPosition(itemMainRectangle.x, itemMainRectangle.y + Y_GROUP_ITEM_SLIDER);
                        pSlider->AddAdjustmentEventListener(*this);
                        pSlider->AddSliderEventListener(*this);
 
index bd13104..0d14856 100644 (file)
@@ -166,7 +166,7 @@ CertificateDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -175,10 +175,10 @@ CertificateDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
        yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -187,7 +187,7 @@ CertificateDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
@@ -195,7 +195,7 @@ CertificateDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        pItem->AddControl(*pLabel);
        pItem->SetEnabled(false);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
 
@@ -205,33 +205,33 @@ CertificateDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
 Tizen::Ui::Controls::TableViewItem*
 CertificateDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       Rectangle itemRectangle;
-       Rectangle itemRectSecondLabel;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String itemSecondText;
+       String itemMainText;
+       String itemSubText;
 
        int fontSize = GetFontSize();
-       ItemTypeTwoLine(itemRectangle, itemRectSecondLabel, fontSize);
-       int itemHeight = (itemRectangle.height + itemRectSecondLabel.height);
+       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+       int itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
 
        switch (itemIndex)
        {
        case CERTIFICATE_DETAIL_ITEM_OWNER_COMMON_NAME:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_OWNER_C");
-                       itemText.Remove(itemText.GetLength() - OWNER_TEXT_RESIZE, OWNER_TEXT_RESIZE);
-                       itemText.Append(L"/");
-                       itemText.Append(ResourceManager::GetString(L"IDS_ST_BODY_COMMON_NAME_C"));
-                       itemSecondText = CertificatePresentationModelUtility::GetCommonName(__pX509Certificate->GetSubject());
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_OWNER_C");
+                       itemMainText.Remove(itemMainText.GetLength() - OWNER_TEXT_RESIZE, OWNER_TEXT_RESIZE);
+                       itemMainText.Append(L"/");
+                       itemMainText.Append(ResourceManager::GetString(L"IDS_ST_BODY_COMMON_NAME_C"));
+                       itemSubText = CertificatePresentationModelUtility::GetCommonName(__pX509Certificate->GetSubject());
                        if (IsFailed(GetLastResult()))
                        {
                                AppLogDebug("GetCommonName failed(%s)", GetErrorMessage(GetLastResult()));
-                               itemSecondText = CertificatePresentationModelUtility::GetOrganisation(__pX509Certificate->GetSubject());
+                               itemSubText = CertificatePresentationModelUtility::GetOrganisation(__pX509Certificate->GetSubject());
                                if (IsFailed(GetLastResult()))
                                {
                                        AppLogDebug("GetOrganisation failed(%s)", GetErrorMessage(GetLastResult()));
-                                       itemSecondText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
+                                       itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
                                }
                        }
                }
@@ -239,30 +239,30 @@ CertificateDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case CERTIFICATE_DETAIL_ITEM_OWNER_ORGANISATION:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_ORGANISATION_C");
-                       itemSecondText = CertificatePresentationModelUtility::GetOrganisation(__pX509Certificate->GetSubject());
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_ORGANISATION_C");
+                       itemSubText = CertificatePresentationModelUtility::GetOrganisation(__pX509Certificate->GetSubject());
                        if (IsFailed(GetLastResult()))
                        {
                                AppLogDebug("GetOrganisation failed(%s)", GetErrorMessage(GetLastResult()));
-                               itemSecondText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
+                               itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
                        }
                }
                break;
 
        case CERTIFICATE_DETAIL_ITEM_ISSUER_COMMON_NAME:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_ISSUER");
-                       itemText.Append(L"/");
-                       itemText.Append(ResourceManager::GetString(L"IDS_ST_BODY_COMMON_NAME_C"));
-                       itemSecondText = CertificatePresentationModelUtility::GetCommonName(__pX509Certificate->GetIssuer());
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_ISSUER");
+                       itemMainText.Append(L"/");
+                       itemMainText.Append(ResourceManager::GetString(L"IDS_ST_BODY_COMMON_NAME_C"));
+                       itemSubText = CertificatePresentationModelUtility::GetCommonName(__pX509Certificate->GetIssuer());
                        if (IsFailed(GetLastResult()))
                        {
                                AppLogDebug("GetCommonName failed(%s)", GetErrorMessage(GetLastResult()));
-                               itemSecondText = CertificatePresentationModelUtility::GetOrganisation(__pX509Certificate->GetIssuer());
+                               itemSubText = CertificatePresentationModelUtility::GetOrganisation(__pX509Certificate->GetIssuer());
                                if (IsFailed(GetLastResult()))
                                {
                                        AppLogDebug("GetOrganisation failed(%s)", GetErrorMessage(GetLastResult()));
-                                       itemSecondText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
+                                       itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
                                }
                        }
                }
@@ -270,93 +270,93 @@ CertificateDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case CERTIFICATE_DETAIL_ITEM_ISSUER_ORGANISATION:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_ORGANISATION_C");
-                       itemSecondText = CertificatePresentationModelUtility::GetOrganisation(__pX509Certificate->GetIssuer());
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_ORGANISATION_C");
+                       itemSubText = CertificatePresentationModelUtility::GetOrganisation(__pX509Certificate->GetIssuer());
                        if (IsFailed(GetLastResult()))
                        {
                                AppLogDebug("GetOrganisation failed(%s)", GetErrorMessage(GetLastResult()));
-                               itemSecondText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
+                               itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
                        }
                }
                break;
 
        case CERTIFICATE_DETAIL_ITEM_CERTIFICATE_INFORMATION_VERSION:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_CERTIFICATE_INFORMATION");
-                       itemText.Append(L"/");
-                       itemText.Append(ResourceManager::GetString(L"IDS_ST_BODY_VERSION"));
-                       itemText.Append(L":");
-                       itemSecondText = Integer::ToString(__pX509Certificate->GetSpecVersion());
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_CERTIFICATE_INFORMATION");
+                       itemMainText.Append(L"/");
+                       itemMainText.Append(ResourceManager::GetString(L"IDS_ST_BODY_VERSION"));
+                       itemMainText.Append(L":");
+                       itemSubText = Integer::ToString(__pX509Certificate->GetSpecVersion());
                }
                break;
 
        case CERTIFICATE_DETAIL_ITEM_VALID_FROM:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_VALID_FROM");
-                       itemText.Append(L":");
-                       itemSecondText = __pX509Certificate->GetNotBefore();
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_VALID_FROM");
+                       itemMainText.Append(L":");
+                       itemSubText = __pX509Certificate->GetNotBefore();
                        if (IsFailed(GetLastResult()))
                        {
                                AppLogDebug("GetNotBefore failed(%s)", GetErrorMessage(GetLastResult()));
-                               itemSecondText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
+                               itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
                        }
                }
                break;
 
        case CERTIFICATE_DETAIL_ITEM_VALID_TO:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_VALID_TO_C");
-                       itemSecondText = __pX509Certificate->GetNotAfter();
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_VALID_TO_C");
+                       itemSubText = __pX509Certificate->GetNotAfter();
                        if (IsFailed(GetLastResult()))
                        {
                                AppLogDebug("GetNotAfter failed(%s)", GetErrorMessage(GetLastResult()));
-                               itemSecondText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
+                               itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
                        }
                }
                break;
 
        case CERTIFICATE_DETAIL_ITEM_SERIAL_NUMBER:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SERIAL_NUMBER");
-                       itemText.Append(L":");
-                       itemSecondText = __pX509Certificate->GetSerialNumber();
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SERIAL_NUMBER");
+                       itemMainText.Append(L":");
+                       itemSubText = __pX509Certificate->GetSerialNumber();
                        if (IsFailed(GetLastResult()))
                        {
                                AppLogDebug("GetSerialNumber failed(%s)", GetErrorMessage(GetLastResult()));
-                               itemSecondText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
+                               itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
                        }
                }
                break;
 
        case CERTIFICATE_DETAIL_ITEM_SIGNATURE_ALGORITHM:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SIGNATURE_ALGORITHM");
-                       itemText.Append(L":");
-                       itemSecondText = __pX509Certificate->GetSignatureAlgorithm();
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SIGNATURE_ALGORITHM");
+                       itemMainText.Append(L":");
+                       itemSubText = __pX509Certificate->GetSignatureAlgorithm();
                        if (IsFailed(GetLastResult()))
                        {
                                AppLogDebug("GetSignatureAlgorithm failed(%s)", GetErrorMessage(GetLastResult()));
-                               itemSecondText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
+                               itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
                        }
                }
                break;
 
        case CERTIFICATE_DETAIL_ITEM_PUBLIC_KEY:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_PUBLIC_KEY_C");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_PUBLIC_KEY_C");
                        IPublicKey* publicKey = __pX509Certificate->GetPublicKeyN();
 
-                       itemSecondText = CertificatePresentationModelUtility::GetHexPublicKeyString(*publicKey);
+                       itemSubText = CertificatePresentationModelUtility::GetHexPublicKeyString(*publicKey);
                        if (IsFailed(GetLastResult()))
                        {
                                AppLogDebug("GetHexPublicKeyString failed(%s)", GetErrorMessage(GetLastResult()));
-                               itemSecondText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
+                               itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_NO_DATA");
                        }
                        delete publicKey;
 
-                       itemRectSecondLabel.width = itemWidth;
-                       itemRectSecondLabel.height = GetHeightForStringArea(itemSecondText, itemRectSecondLabel.width, H_GROUP_INDEX_TEXT_GAP);
-                       itemHeight = (itemRectangle.height + itemRectSecondLabel.height);
+                       itemSubRectangle.width = itemWidth;
+                       itemSubRectangle.height = GetHeightForStringArea(itemSubText, itemSubRectangle.width, H_GROUP_INDEX_TEXT_GAP);
+                       itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
                }
                break;
 
@@ -373,7 +373,7 @@ CertificateDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        Label* pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -384,7 +384,7 @@ CertificateDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
        Label* pSecondLabel = new (std::nothrow) Label();
-       result r = pSecondLabel->Construct(itemRectSecondLabel, itemSecondText);
+       result r = pSecondLabel->Construct(itemSubRectangle, itemSubText);
        if (IsFailed(r))
        {
                AppLogDebug("Construct fail [%s]", GetErrorMessage(r));
@@ -475,18 +475,18 @@ CertificateDetailForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Cont
 
        Rectangle clientRect = GetClientAreaBounds();
        Rectangle itemRect = pItem->GetBounds();
-       Rectangle itemRectangle;
-       Rectangle itemRectSecondLabel;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        int fontSize = GetFontSize();
        String groupText = pSecondLabel->GetText();
 
-       ItemTypeTwoLine(itemRectangle, itemRectSecondLabel, fontSize);
+       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
 
        int itemHeight = GetHeightForStringArea(groupText, clientRect.width, H_GROUP_INDEX_TEXT_GAP);
 
-       itemRect.height = (itemRectangle.height + itemHeight);
+       itemRect.height = (itemMainRectangle.height + itemHeight);
 
-       pSecondLabel->SetBounds(clientRect.x, itemRectangle.height, clientRect.width, itemHeight);
+       pSecondLabel->SetBounds(clientRect.x, itemMainRectangle.height, clientRect.width, itemHeight);
        pItem->SetBounds(itemRect);
 }
 
index 2d65b36..c656592 100644 (file)
@@ -145,7 +145,7 @@ CertificateForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -154,10 +154,10 @@ CertificateForm::CreateGroupItem(int groupIndex, int itemWidth)
        yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -166,14 +166,14 @@ CertificateForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -186,9 +186,9 @@ CertificateForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
@@ -196,13 +196,13 @@ CertificateForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
        case ID_ITEM_TRUSTED_ROOT_CERTIFICATES:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_TRUSTED_ROOT_CERTIFICATES");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_TRUSTED_ROOT_CERTIFICATES");
                }
                break;
 
        case ID_ITEM_USER_CERTIFICATES:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_USER_CERTIFICATES");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_USER_CERTIFICATES");
                }
                break;
 
@@ -211,7 +211,7 @@ CertificateForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -220,7 +220,7 @@ CertificateForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index 3dc728d..ac8da0d 100644 (file)
@@ -160,7 +160,7 @@ CertificateTrustedRootForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -169,16 +169,16 @@ CertificateTrustedRootForm::CreateGroupItem(int groupIndex, int itemWidth)
        yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        pItem->Construct(Dimension(itemWidth, itemHeight));
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
@@ -194,19 +194,19 @@ TableViewItem*
 CertificateTrustedRootForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("GroupIndex %d, ItemIndex %d, ItemWidth %d", groupIndex, itemIndex, itemWidth);
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        int fontSize = GetFontSize();
 
-       String itemText = L"";
+       String itemMainText = L"";
        if (__pCertificatePresentationModelInstance != null)
        {
-               itemText = CertificatePresentationModelUtility::GetCommonName(
+               itemMainText = CertificatePresentationModelUtility::GetCommonName(
                                __pCertificatePresentationModelInstance->GetSubjectNameFromCertifcateStore(itemIndex));
                if (IsFailed(GetLastResult()))
                {
                        AppLogDebug("GetCommonName failed(%s)", GetErrorMessage(GetLastResult()));
-                       itemText = CertificatePresentationModelUtility::GetOrganisation(
+                       itemMainText = CertificatePresentationModelUtility::GetOrganisation(
                                        __pCertificatePresentationModelInstance->GetSubjectNameFromCertifcateStore(itemIndex));
 
                        if (IsFailed(GetLastResult()))
@@ -218,7 +218,7 @@ CertificateTrustedRootForm::CreateItem(int groupIndex, int itemIndex, int itemWi
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -227,7 +227,7 @@ CertificateTrustedRootForm::CreateItem(int groupIndex, int itemIndex, int itemWi
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        Label* pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index 113d3d3..c73fb6e 100644 (file)
@@ -221,8 +221,8 @@ CertificateUserForm::CreateGroupItem(int groupIndex, int itemWidth)
 TableViewItem*
 CertificateUserForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       Rectangle itemRectangle;
-       Rectangle itemRectSecondLabel;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
 
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        String itemText = CertificatePresentationModelUtility::GetCommonName(
@@ -243,8 +243,8 @@ CertificateUserForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
        int fontSize = GetFontSize();
-       ItemTypeTwoLine(itemRectangle, itemRectSecondLabel, fontSize);
-       int itemHeight = (itemRectangle.height + itemRectSecondLabel.height);
+       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+       int itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -253,7 +253,7 @@ CertificateUserForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        Label* pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -264,7 +264,7 @@ CertificateUserForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
        Label* pSecondLabel = new (std::nothrow) Label();
-       result r = pSecondLabel->Construct(itemRectSecondLabel, itemSecondText);
+       result r = pSecondLabel->Construct(itemSubRectangle, itemSecondText);
        if (IsFailed(r))
        {
                AppLogDebug("Construct fail [%s]", GetErrorMessage(r));
index 131cb5f..2df8414 100644 (file)
@@ -188,11 +188,11 @@ CertificateUserInstallForm::CreateGroupItem(int groupIndex, int itemWidth)
 TableViewItem*
 CertificateUserInstallForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        int fontSize = GetFontSize();
 
-       String itemText = __pCertificatePresentationModelInstance->GetFileNameInFoundUserCertificateToInstallListAt(itemIndex);
+       String itemMainText = __pCertificatePresentationModelInstance->GetFileNameInFoundUserCertificateToInstallListAt(itemIndex);
        if (IsFailed(GetLastResult()))
        {
                AppLogDebug("GetFileNameInFoundUserCertificateToInstallListAt failed(%s)", GetErrorMessage(GetLastResult()));
@@ -212,9 +212,9 @@ CertificateUserInstallForm::CreateItem(int groupIndex, int itemIndex, int itemWi
        }
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
        Label* pLabel = new (std::nothrow) Label();
-       r = pLabel->Construct(itemRectangle, itemText);
+       r = pLabel->Construct(itemMainRectangle, itemMainText);
        if (IsFailed(r))
        {
                AppLogDebug("Construct failed(%s)", GetErrorMessage(r));
index 16962ac..0f30e5e 100644 (file)
@@ -185,7 +185,7 @@ CertificateUserInstallPasswordForm::CreateGroupItem(int groupIndex, int itemWidt
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText = ResourceManager::GetString(L"IDS_WIFI_BODY_ENTER_PASSWORD");
        Label* pLabel = null;
 
@@ -194,10 +194,10 @@ CertificateUserInstallPasswordForm::CreateGroupItem(int groupIndex, int itemWidt
        yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        itemHeight = H_GROUP_INDEX_DEFAULT;
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -206,14 +206,14 @@ CertificateUserInstallPasswordForm::CreateGroupItem(int groupIndex, int itemWidt
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -224,18 +224,15 @@ CertificateUserInstallPasswordForm::CreateGroupItem(int groupIndex, int itemWidt
 TableViewItem*
 CertificateUserInstallPasswordForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        Button* pButton = null;
 
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String itemSecondText;
-
        int fontSize = GetFontSize();
-       ItemTypeOneLine(itemRectangle);
-       int itemHeight = (itemRectangle.height);
+       ItemTypeOneLine(itemMainRectangle);
+       int itemHeight = (itemMainRectangle.height);
 
-       itemRectangle.width = (itemWidth - W_ITEM_RESIZE_GAP);
+       itemMainRectangle.width = (itemWidth - W_ITEM_RESIZE_GAP);
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
@@ -250,7 +247,7 @@ CertificateUserInstallPasswordForm::CreateItem(int groupIndex, int itemIndex, in
        case ID_ITEM_INSTALL_PASSWORD_INPUT:
                {
                        __pEditField = new (std::nothrow) EditField();
-                       __pEditField->Construct(itemRectangle, EDIT_FIELD_STYLE_PASSWORD, INPUT_STYLE_OVERLAY, EDIT_FIELD_TITLE_STYLE_NONE, false, LIMIT_EDITFIELD, GROUP_STYLE_SINGLE);
+                       __pEditField->Construct(itemMainRectangle, EDIT_FIELD_STYLE_PASSWORD, INPUT_STYLE_OVERLAY, EDIT_FIELD_TITLE_STYLE_NONE, false, LIMIT_EDITFIELD, GROUP_STYLE_SINGLE);
                        __pEditField->SetTextSize(fontSize);
                        __pEditField->SetTitleTextColor(EDIT_STATUS_NORMAL, COLOR_HELP_TEXT_TYPE_01);
                        __pEditField->SetColor(EDIT_STATUS_NORMAL, COLOR_BG_GROUP_INDEX_DEFAULT);
@@ -273,7 +270,7 @@ CertificateUserInstallPasswordForm::CreateItem(int groupIndex, int itemIndex, in
        case ID_ITEM_INSTALL_PASSWORD_OK:
                {
                        pButton = new (std::nothrow) Button();
-                       pButton->Construct(itemRectangle, ResourceManager::GetString(L"IDS_ST_BUTTON_OK"));
+                       pButton->Construct(itemMainRectangle, ResourceManager::GetString(L"IDS_ST_BUTTON_OK"));
                        pButton->SetActionId(IDA_PASSWORD_BUTTON_OK);
                        pButton->AddActionEventListener(*this);
 
@@ -288,7 +285,7 @@ CertificateUserInstallPasswordForm::CreateItem(int groupIndex, int itemIndex, in
        case ID_ITEM_INSTALL_PASSWORD_CANCEL:
                {
                        pButton = new (std::nothrow) Button();
-                       pButton->Construct(itemRectangle, ResourceManager::GetString(L"IDS_ST_BODY_CANCEL"));
+                       pButton->Construct(itemMainRectangle, ResourceManager::GetString(L"IDS_ST_BODY_CANCEL"));
                        pButton->SetActionId(IDA_PASSWORD_BUTTON_CANCEL);
                        pButton->AddActionEventListener(*this);
 
index 34ee964..b630fb7 100644 (file)
@@ -148,10 +148,10 @@ CertificateUserUnInstallForm::CreateGroupItem(int groupIndex, int itemWidth)
 TableViewItem*
 CertificateUserUnInstallForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_MARK;
        int fontSize = GetFontSize();
-       String itemText = CertificatePresentationModelUtility::GetCommonName(
+       String itemMainText = CertificatePresentationModelUtility::GetCommonName(
                                                        __pCertificatePresentationModelInstance->GetSubjectNameFromCertifcateStore(itemIndex));
        if (IsFailed(GetLastResult()))
        {
@@ -160,7 +160,7 @@ CertificateUserUnInstallForm::CreateItem(int groupIndex, int itemIndex, int item
        }
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -169,7 +169,7 @@ CertificateUserUnInstallForm::CreateItem(int groupIndex, int itemIndex, int item
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        Label* pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index 59f5e01..0813afe 100644 (file)
@@ -227,7 +227,7 @@ DateTimeForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -275,10 +275,10 @@ DateTimeForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectangle.x = X_GROUP_INDEX_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_INDEX_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -286,14 +286,14 @@ DateTimeForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->Construct(relativeLayout, Dimension(itemWidth, itemHeight));
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
@@ -308,18 +308,18 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
        bool isSecondLine = false;
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String secondLineText;
+       String itemMainText;
+       String itemSubText;
        String key;
        String Value;
        Label* pLabel = null;
        int itemHeight = H_GROUP_ITEM_DEFAULT;
        int fontSize = GetFontSize();
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
        switch (groupIndex)
@@ -328,8 +328,8 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                {
                        bool automaticUpdate = false;
                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_AUTOMATIC_UPDATE");
-                       itemRectangle.width -= W_RESIZE_LABEL_GAP;
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_AUTOMATIC_UPDATE");
+                       itemMainRectangle.width -= W_RESIZE_LABEL_GAP;
 
                        if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_UPDATE_AUTO, automaticUpdate) == E_SUCCESS)
                        {
@@ -351,18 +351,18 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_DATE_AND_TIME_TIME_ZONE:
                                {
-                                       secondLineText = timeZone.GetId();
-                                       secondLineText.IndexOf(L"/", 0, slashIndex);
-                                       secondLineText.Remove(0, slashIndex + NEXT_INDEX);
+                                       itemSubText = timeZone.GetId();
+                                       itemSubText.IndexOf(L"/", 0, slashIndex);
+                                       itemSubText.Remove(0, slashIndex + NEXT_INDEX);
                                        if (rawOffset > 0)
                                        {
-                                               secondLineText.Insert(L", GMT +", secondLineText.GetLength());
+                                               itemSubText.Insert(L", GMT +", itemSubText.GetLength());
                                        }
                                        else
                                        {
-                                               secondLineText.Insert(L", GMT ", secondLineText.GetLength());
+                                               itemSubText.Insert(L", GMT ", itemSubText.GetLength());
                                        }
-                                       secondLineText.Insert((rawOffset / SIXTY_MINUTES_TO_HOUR), (secondLineText.GetLength()));
+                                       itemSubText.Insert((rawOffset / SIXTY_MINUTES_TO_HOUR), (itemSubText.GetLength()));
                                        int minutes = rawOffset % SIXTY_MINUTES_TO_HOUR;
                                        if (minutes != 0)
                                        {
@@ -370,24 +370,24 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                if (minutes < 0)
                                                {
                                                        minusMinutes -= (minusMinutes + minutes);
-                                                       secondLineText.Insert(L":", secondLineText.GetLength());
-                                                       secondLineText.Insert((minusMinutes), (secondLineText.GetLength()));
+                                                       itemSubText.Insert(L":", itemSubText.GetLength());
+                                                       itemSubText.Insert((minusMinutes), (itemSubText.GetLength()));
                                                }
                                                else
                                                {
-                                                       secondLineText.Insert(L":", secondLineText.GetLength());
-                                                       secondLineText.Insert((minutes), (secondLineText.GetLength()));
+                                                       itemSubText.Insert(L":", itemSubText.GetLength());
+                                                       itemSubText.Insert((minutes), (itemSubText.GetLength()));
                                                }
                                        }
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_TIME_ZONE");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_TIME_ZONE");
                                }
                                break;
 
                        case ID_ITEM_DATE_AND_TIME_DATE_AND_TIME:
                                {
-                                       ItemTypeOneLine(itemRectangle);
+                                       ItemTypeOneLine(itemMainRectangle);
                                        itemHeight = H_GROUP_ITEM_EDITFIELD_DEFAULT;
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DATE_AND_TIME");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DATE_AND_TIME");
                                }
                                break;
 
@@ -409,14 +409,14 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        if (hourFormat == 0)
                        {
-                               secondLineText = ResourceManager::GetString(L"IDS_COM_BODY_12_HOURS");
+                               itemSubText = ResourceManager::GetString(L"IDS_COM_BODY_12_HOURS");
                        }
                        else
                        {
-                               secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_24_HOURS");
+                               itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_24_HOURS");
                        }
 
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_TIME_FORMAT");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_TIME_FORMAT");
                }
                break;
        
@@ -435,7 +435,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_DATE_AND_TIME_FORMAT_12_HOURS:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_COM_BODY_12_HOURS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_COM_BODY_12_HOURS");
 
                                        if (hourFormat == false)
                                        {
@@ -446,7 +446,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        case ID_ITEM_DATE_AND_TIME_FORMAT_24_HOURS:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_24_HOURS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_24_HOURS");
 
                                        if (hourFormat == true)
                                        {
@@ -470,7 +470,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                                AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
                        }
-                       secondLineText = firstDayOfWeek;
+                       itemSubText = firstDayOfWeek;
                }
                break;
 
@@ -489,7 +489,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_DATE_AND_TIME_FORMAT_FIRST_DAY_MONDAY:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MONDAY");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MONDAY");
 
                                        if (firstDayOfWeek.Equals(L"Sunday", false) == false)
                                        {
@@ -500,7 +500,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        case ID_ITEM_DATE_AND_TIME_FORMAT_FIRST_DAY_SUNDAY:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SUNDAY");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SUNDAY");
                                        if (firstDayOfWeek.Equals(L"Sunday", false))
                                        {
                                                __pTableView->SetItemChecked(groupIndex, itemIndex, true);
@@ -525,7 +525,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                bool hourFormat = false;
                EditDate* pEditDate = new (std::nothrow) EditDate();
-               pEditDate->Construct(Point(0, 0), itemText);
+               pEditDate->Construct(Point(0, 0), itemMainText);
                pEditDate->SetCurrentDate();
                pEditDate->SetYearRange(MIN_YEAR, MAX_YEAR);
                pEditDate->AddDateChangeEventListener(*this);
@@ -551,8 +551,8 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        else if (isSecondLine == true)
        {
-               ItemTypeTwoLine(itemRectangle, itemSecondLineTextRect, fontSize);
-               itemHeight = (itemRectangle.height + itemSecondLineTextRect.height);
+               ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+               itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
 
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
@@ -561,7 +561,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, itemText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -569,11 +569,11 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->AddControl(*pLabel);
                if (groupIndex == ID_GROUP_DATE_AND_TIME_FORMAT)
                {
-                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
+                       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
                }
                else
                {
-                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+                       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
@@ -591,8 +591,8 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_CLOSED);
                        }
 
-                       detailArrow = itemRectangle;
-                       detailArrow.y = itemRectangle.y + ((itemHeight - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
+                       detailArrow = itemMainRectangle;
+                       detailArrow.y = itemMainRectangle.y + ((itemHeight - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
                        detailArrow.height = W_DETAIL_ARROW_BUTTON;
                        detailArrow.width = W_DETAIL_ARROW_BUTTON;
 
@@ -602,19 +602,19 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pLabel->SetBackgroundBitmap(*pBitmap);
 
                        pItem->AddControl(*pLabel);
-                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
+                       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
                }
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemSecondLineTextRect, secondLineText);
+               pLabel->Construct(itemSubRectangle, itemSubText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemSecondLineTextRect.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetMargin(*pLabel, itemSubRectangle.x, 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);
        }
@@ -627,7 +627,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, itemText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -644,13 +644,13 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                case TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING:
                        {
-                               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
+                               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
                        }
                        break;
 
                default:
                        {
-                               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+                               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        }
                        break;
                }
index 035c12d..1eff35e 100644 (file)
@@ -226,7 +226,7 @@ DeveloperOptionForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
@@ -284,10 +284,10 @@ DeveloperOptionForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectangle.x = X_GROUP_INDEX_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_INDEX_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -296,7 +296,7 @@ DeveloperOptionForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(fontSize, style);
@@ -317,28 +317,28 @@ DeveloperOptionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-       Rectangle itemRectangle;
-       String itemText;
+       Rectangle itemMainRectangle;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        switch (groupIndex)
        {
        case ID_GROUP_DEVELOPER_USB_DEBUGGING:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_USB_DEBUGGING");
-                       itemRectangle.width -= W_RESIZE_LABEL_GAP;
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_USB_DEBUGGING");
+                       itemMainRectangle.width -= W_RESIZE_LABEL_GAP;
                }
                break;
 
        case ID_GROUP_DEVELOPER_GPU_RENDERING:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FORCE_GPU_RENDERING_ABB");
-                       itemRectangle.width -= W_RESIZE_LABEL_GAP;
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_FORCE_GPU_RENDERING_ABB");
+                       itemMainRectangle.width -= W_RESIZE_LABEL_GAP;
                }
                break;
 
@@ -353,13 +353,13 @@ DeveloperOptionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.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);
 
index cc4c36b..3ffd24f 100644 (file)
@@ -170,7 +170,7 @@ DisplayForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -185,10 +185,10 @@ DisplayForm::CreateGroupItem(int groupIndex, int itemWidth)
                itemHeight = 0;
        }
 
-       itemRectangle.x = X_GROUP_INDEX_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_INDEX_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -197,14 +197,14 @@ DisplayForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -217,10 +217,10 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
-       Rectangle subItemRectangle;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
+       String itemMainText;
        String subText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
@@ -231,23 +231,23 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        int itemHeight = 0;
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       ItemTypeOneLine(itemRectangle);
-       itemHeight = itemRectangle.height;
+       ItemTypeOneLine(itemMainRectangle);
+       itemHeight = itemMainRectangle.height;
 
        switch (groupIndex)
        {
        case ID_GROUP_AUTO_ROTATE_SCREEN:
                {
                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-                       itemRectangle.width -= W_RESIZE_LABEL_GAP;
-                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB");
+                       itemMainRectangle.width -= W_RESIZE_LABEL_GAP;
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB");
                }
                break;
 
        case ID_GROUP_BACKLIGHT_TIME:
                {
-                       ItemTypeTwoLine(itemRectangle, subItemRectangle,fontSize);
-                       itemHeight = (itemRectangle.height + subItemRectangle.height);
+                       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle,fontSize);
+                       itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
 
                        if (__pTableView->IsGroupExpanded(ID_GROUP_BACKLIGHT_TIME_LIST) == false)
                        {
@@ -258,7 +258,7 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_CLOSED);
                        }
 
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_BACKLIGHT_TIME");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_BACKLIGHT_TIME");
                        int index = GetBackLightTimeIndex();
                        subText = GetBackLightTimeIndexString(index);
                }
@@ -267,13 +267,13 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        case ID_GROUP_BACKLIGHT_TIME_LIST:
                {
                        style = TABLE_VIEW_ANNEX_STYLE_RADIO;
-                       itemText = GetBackLightTimeIndexString(itemIndex);
+                       itemMainText = GetBackLightTimeIndexString(itemIndex);
                }
                break;
 
        case ID_GROUP_FONT:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FONT");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_FONT");
                }
                break;
 
@@ -288,7 +288,7 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -322,8 +322,8 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        if (pBitmap)
        {
-               detailArrow = itemRectangle;
-               detailArrow.y = itemRectangle.y + ((itemHeight - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
+               detailArrow = itemMainRectangle;
+               detailArrow.y = itemMainRectangle.y + ((itemHeight - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
                detailArrow.height = W_DETAIL_ARROW_BUTTON;
                detailArrow.width = W_DETAIL_ARROW_BUTTON;
 
@@ -333,18 +333,18 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetBackgroundBitmap(*pBitmap);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
+               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(subItemRectangle, subText);
+               pLabel->Construct(itemSubRectangle, subText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        }
@@ -470,8 +470,8 @@ void
 DisplayForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        int index = 0;
-       String itemText;
-       String subItemText;
+       String itemMainText;
+       String itemSubText;
        Label* pSubLabel = null;
 
        switch (groupIndex)
@@ -529,9 +529,9 @@ DisplayForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Tabl
                        pLabelBitmap->SetBounds(detailArrow);
 
                        index = GetBackLightTimeIndex();
-                       subItemText = GetBackLightTimeIndexString(index);
+                       itemSubText = GetBackLightTimeIndexString(index);
                        pSubLabel->SetBounds(subRectangle);
-                       pSubLabel->SetText(subItemText);
+                       pSubLabel->SetText(itemSubText);
                        pSubLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
 
                        pLabel->Invalidate(false);
index 7ce7268..c7de8a7 100644 (file)
@@ -190,23 +190,22 @@ DownloadedApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWid
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectIcon;
-       Rectangle itemRectLabel;
+       Rectangle itemIconRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String secondLineText;
+       String itemMainText;
        String fontReturnValue;
        Label* pLabel = null;
        Bitmap* pBitmap;
 
        int fontSize = GetFontSize();
        int itemHeight = H_GROUP_ITEM_DEFAULT_LABEL;
-       ItemTypeIconAndOneLine(itemRectIcon, itemRectLabel);
+       ItemTypeIconAndOneLine(itemIconRectangle, itemMainRectangle);
 
        String appIdKey = GetDownLoadAppIdKeyAt(itemIndex);
        String iconPath = GetAppSettingIconPathFromAppIdListAt(appIdKey);
 
-       itemText = GetDownLoadAppNameAt(itemIndex);
+       itemMainText = GetDownLoadAppNameAt(itemIndex);
 
        if (iconPath.IsEmpty() == true)
        {
@@ -225,7 +224,7 @@ DownloadedApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWid
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectIcon, L"");
+       pLabel->Construct(itemIconRectangle, L"");
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
        pLabel->SetBackgroundBitmap(*pBitmap);
@@ -233,13 +232,13 @@ DownloadedApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWid
        pItem->AddControl(*pLabel);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectLabel, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, MAIN_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);
 
index 32f28fc..24d28a7 100644 (file)
@@ -129,16 +129,16 @@ NotificationForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
        TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
 
-       itemRectangle.x = X_GROUP_INDEX_DEFAULT_LABEL;
-       itemRectangle.y = Y_GROUP_INDEX_DEFAULT_LABEL;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_INDEX_DEFAULT_LABEL;
+       itemMainRectangle.y = Y_GROUP_INDEX_DEFAULT_LABEL;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -147,13 +147,13 @@ NotificationForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -166,9 +166,9 @@ NotificationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
@@ -176,19 +176,19 @@ NotificationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
        case ID_ITEM_NOTIFICATION_EMAIL:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_EMAIL");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_EMAIL");
                }
                break;
 
        case ID_ITEM_NOTOFICATION_MESSAGE:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SIDEBAR_MESSAGES");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SIDEBAR_MESSAGES");
                }
                break;
 
        case ID_ITEM_NOTOFICATION_INSTANT_MESSENGER:
                {
-                       itemText = ResourceManager::GetString(L"IDS_COM_BODY_INSTANT_MESSENGER");
+                       itemMainText = ResourceManager::GetString(L"IDS_COM_BODY_INSTANT_MESSENGER");
                }
                break;
 
@@ -196,7 +196,7 @@ NotificationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
        }
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
        RelativeLayout relativeLayout;
@@ -206,7 +206,7 @@ NotificationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index 82fed6c..aad5090 100644 (file)
@@ -147,9 +147,9 @@ FontForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, c
        {
                for (int i = 0; i < __fontList->GetCount(); i++)
                {
-                       String itemText = static_cast<String*>(__fontList->GetAt(i))->GetPointer();
+                       String itemMainText = static_cast<String*>(__fontList->GetAt(i))->GetPointer();
 
-                       if (itemText.Equals(currentFontType, false))
+                       if (itemMainText.Equals(currentFontType, false))
                        {
                                __pTableView->SetItemChecked(ID_GROUP_FONT_LIST, i, true);
                                break;
@@ -232,7 +232,7 @@ FontForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
@@ -270,10 +270,10 @@ FontForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -282,14 +282,14 @@ FontForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -302,17 +302,17 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String secondLineText;
+       String itemMainText;
+       String itemSubText;
        String fontReturnValue;
        Label* pLabel = null;
        Label* pLabelArrow = null;
 
        int fontSize = GetFontSize();
-       bool isTwoLineText = true;
+       bool isItemSubText = true;
        int itemHeight = H_GROUP_ITEM_DEFAULT;
        Rectangle detailArrow;
        Bitmap* pBitmap = null;
@@ -321,18 +321,18 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        if (groupIndex == ID_GROUP_FONT_LIST)
        {
                String currentFontType;
-               isTwoLineText = false;
+               isItemSubText = false;
                style = TABLE_VIEW_ANNEX_STYLE_RADIO;
        }
 
-       GetTableViewItemString(groupIndex, itemIndex, itemText, secondLineText);
+       GetTableViewItemString(groupIndex, itemIndex, itemMainText, itemSubText);
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       if (isTwoLineText == true )
+       if (isItemSubText == true)
        {
-               ItemTypeTwoLine(itemRectangle, itemSecondLineTextRect, fontSize);
-               itemHeight = (itemRectangle.height + itemSecondLineTextRect.height);
+               ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+               itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
 
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
@@ -341,13 +341,13 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, itemText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
 
                if (groupIndex == ID_GROUP_FONT)
@@ -361,8 +361,8 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_CLOSED);
                        }
 
-                       detailArrow = itemRectangle;
-                       detailArrow.y = itemRectangle.y + ((itemHeight - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
+                       detailArrow = itemMainRectangle;
+                       detailArrow.y = itemMainRectangle.y + ((itemHeight - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
                        detailArrow.height = W_DETAIL_ARROW_BUTTON;
                        detailArrow.width = W_DETAIL_ARROW_BUTTON;
 
@@ -372,7 +372,7 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pLabelArrow->SetBackgroundBitmap(*pBitmap);
 
                        pItem->AddControl(*pLabelArrow);
-                       relativeLayout.SetMargin(*pLabelArrow, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
+                       relativeLayout.SetMargin(*pLabelArrow, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
                        relativeLayout.SetRelation(*pLabelArrow, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
                        relativeLayout.SetRelation(*pLabel, *pLabelArrow, RECT_EDGE_RELATION_RIGHT_TO_LEFT);
                }
@@ -382,14 +382,14 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemSecondLineTextRect, secondLineText);
+               pLabel->Construct(itemSubRectangle, itemSubText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemSecondLineTextRect.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetMargin(*pLabel, itemSubRectangle.x, 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);
        }
@@ -401,9 +401,9 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->Construct(relativeLayout, Dimension(itemWidth, H_GROUP_ITEM_DEFAULT), style);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
-               ItemTypeOneLine(itemRectangle);
+               ItemTypeOneLine(itemMainRectangle);
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, itemText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -549,8 +549,8 @@ FontForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupIte
 void
 FontForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
-       Rectangle firstLine;
-       Rectangle secondLine;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        Rectangle pItemBounds = pItem->GetBounds();
        int fontSize = GetFontSize();
 
@@ -558,20 +558,20 @@ FontForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableVi
        {
        case ID_GROUP_FONT:
                {
-                       ItemTypeTwoLine(firstLine, secondLine, fontSize);
+                       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
 
-                       pItemBounds.height = firstLine.height + secondLine.height;
+                       pItemBounds.height = itemMainRectangle.height + itemSubRectangle.height;
                        pItem->SetBounds(pItemBounds);
                        Label* pFirstLabel = static_cast<Label*>(pItem->GetControl(FONT_FORM_FIRST_CONTROL));
                        Label* pSecondLabel = static_cast<Label*>(pItem->GetControl(FONT_FORM_SECOND_CONTROL));
                        Label* pThirdLabel = static_cast<Label*>(pItem->GetControl(FONT_FORM_THIRD_CONTROL));
                        Rectangle detailArrow = pSecondLabel->GetBounds();
-                       detailArrow.y = firstLine.y + ((pItemBounds.height - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
+                       detailArrow.y = itemMainRectangle.y + ((pItemBounds.height - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
 
-                       pFirstLabel->SetBounds(firstLine);
+                       pFirstLabel->SetBounds(itemMainRectangle);
                        pFirstLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                        pSecondLabel->SetBounds(detailArrow);
-                       pThirdLabel->SetBounds(secondLine);
+                       pThirdLabel->SetBounds(itemSubRectangle);
                        pThirdLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
 
                        Bitmap* pBitmap = null;
@@ -594,24 +594,24 @@ FontForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableVi
 
        case ID_GROUP_FONT_SIZE:
                {
-                       ItemTypeTwoLine(firstLine, secondLine, fontSize);
+                       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
 
-                       pItemBounds.height = firstLine.height + secondLine.height;
+                       pItemBounds.height = itemMainRectangle.height + itemSubRectangle.height;
                        pItem->SetBounds(pItemBounds);
                        Label* pFirstLabel = static_cast<Label*>(pItem->GetControl(FONT_FORM_FIRST_CONTROL));
                        Label* pSecondLabel = static_cast<Label*>(pItem->GetControl(FONT_FORM_SECOND_CONTROL));
 
-                       pFirstLabel->SetBounds(firstLine);
+                       pFirstLabel->SetBounds(itemMainRectangle);
                        pFirstLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
-                       pSecondLabel->SetBounds(secondLine);
+                       pSecondLabel->SetBounds(itemSubRectangle);
                        pSecondLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
 
-                       String firstLineText = L"";
-                       String secondLineText = L"";
+                       String itemMainText = L"";
+                       String itemSubText = L"";
 
-                       GetTableViewItemString(groupIndex, itemIndex, firstLineText, secondLineText);
-                       pFirstLabel->SetText(firstLineText);
-                       pSecondLabel->SetText(secondLineText);
+                       GetTableViewItemString(groupIndex, itemIndex, itemMainText, itemSubText);
+                       pFirstLabel->SetText(itemMainText);
+                       pSecondLabel->SetText(itemSubText);
 
                        pFirstLabel->Invalidate(false);
                        pSecondLabel->Invalidate(false);
@@ -621,9 +621,9 @@ FontForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableVi
 
        case ID_GROUP_FONT_LIST:
                {
-                       ItemTypeOneLine(firstLine);
+                       ItemTypeOneLine(itemMainRectangle);
                        Label* pFirstLabel = static_cast<Label*>(pItem->GetControl(0));
-                       pFirstLabel->SetBounds(firstLine);
+                       pFirstLabel->SetBounds(itemMainRectangle);
                        pFirstLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                        pFirstLabel->Invalidate(false);
                }
@@ -745,7 +745,7 @@ FontForm::GetFontList(Tizen::Base::Collection::IList& list)
 }
 
 void
-FontForm::GetTableViewItemString(int groupIndex, int itemIndex, Tizen::Base::String& firstLineText, Tizen::Base::String& secondLineText)
+FontForm::GetTableViewItemString(int groupIndex, int itemIndex, Tizen::Base::String& itemMainText, Tizen::Base::String& itemSubText)
 {
        switch (groupIndex)
        {
@@ -754,16 +754,16 @@ FontForm::GetTableViewItemString(int groupIndex, int itemIndex, Tizen::Base::Str
                        String fontReturnValue;
                        if ((SettingInfo::GetValue(SETTING_INFO_KEY_FONT_TYPE, fontReturnValue)) == E_SUCCESS)
                        {
-                               secondLineText = fontReturnValue;
+                               itemSubText = fontReturnValue;
                        }
-                       firstLineText = ResourceManager::GetString(L"IDS_ST_BODY_FONT_TYPE");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_FONT_TYPE");
                }
                break;
 
        case ID_GROUP_FONT_LIST:
                {
-                       firstLineText = static_cast<String*>(__fontList->GetAt(itemIndex))->GetPointer();
-                       secondLineText = L"";
+                       itemMainText = static_cast<String*>(__fontList->GetAt(itemIndex))->GetPointer();
+                       itemSubText = L"";
                }
                break;
 
@@ -774,26 +774,26 @@ FontForm::GetTableViewItemString(int groupIndex, int itemIndex, Tizen::Base::Str
                        {
                                if (fontReturnValue.Equals(L"giant", false))
                                {
-                                       secondLineText = ResourceManager::GetString(L"IDS_EMAIL_POP_GIANT_M_TEXTSIZE");
+                                       itemSubText = ResourceManager::GetString(L"IDS_EMAIL_POP_GIANT_M_TEXTSIZE");
                                }
                                else if (fontReturnValue.Equals(L"huge", false))
                                {
-                                       secondLineText = ResourceManager::GetString(L"IDS_EMAIL_OPT_HUGE_M_TEXTSIZE");
+                                       itemSubText = ResourceManager::GetString(L"IDS_EMAIL_OPT_HUGE_M_TEXTSIZE");
                                }
                                else if (fontReturnValue.Equals(L"large", false))
                                {
-                                       secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_TEXTSTYLE_LARGE");
+                                       itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_TEXTSTYLE_LARGE");
                                }
                                else if (fontReturnValue.Equals(L"medium", false))
                                {
-                                       secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
+                                       itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
                                }
                                else
                                {
-                                       secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_SMALL_M_TEXTSIZE");
+                                       itemSubText = ResourceManager::GetString(L"IDS_ST_BODY_SMALL_M_TEXTSIZE");
                                }
                        }
-                       firstLineText = ResourceManager::GetString(L"IDS_ST_BODY_FONT_SIZE");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_FONT_SIZE");
                }
                break;
 
index 82375ad..b110c11 100644 (file)
@@ -194,7 +194,7 @@ FontSizeForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        int fontSize = GetFontSize();
        String groupText;
        Label* pLabel = null;
@@ -226,10 +226,10 @@ FontSizeForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -238,7 +238,7 @@ FontSizeForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(fontSize, style);
@@ -246,7 +246,7 @@ FontSizeForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        pItem->AddControl(*pLabel);
        pItem->SetEnabled(false);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
@@ -258,14 +258,12 @@ FontSizeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_RADIO;
-       String itemText;
-       String secondLineText;
+       String itemMainText;
        String fontReturnValue;
        Label* pLabel = null;
-       int FontSize = FONT_MAIN_TEXT_SIZE_NORMAL;
+       int fontSize = FONT_MAIN_TEXT_SIZE_NORMAL;
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
        if (SettingInfo::GetValue(SETTING_INFO_KEY_FONT_SIZE, fontReturnValue) == E_SUCCESS)
@@ -277,8 +275,8 @@ FontSizeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
        case ID_ITEM_FONT_SIZE_GIANT:
                {
-                       FontSize = FONT_MAIN_TEXT_SIZE_GIANT;
-                       itemText = ResourceManager::GetString(L"IDS_EMAIL_POP_GIANT_M_TEXTSIZE");
+                       fontSize = FONT_MAIN_TEXT_SIZE_GIANT;
+                       itemMainText = ResourceManager::GetString(L"IDS_EMAIL_POP_GIANT_M_TEXTSIZE");
 
                        if (fontReturnValue.Equals(L"giant", false))
                        {
@@ -289,8 +287,8 @@ FontSizeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_ITEM_FONT_SIZE_HUGE:
                {
-                       FontSize = FONT_MAIN_TEXT_SIZE_HUGE;
-                       itemText = ResourceManager::GetString(L"IDS_EMAIL_OPT_HUGE_M_TEXTSIZE");
+                       fontSize = FONT_MAIN_TEXT_SIZE_HUGE;
+                       itemMainText = ResourceManager::GetString(L"IDS_EMAIL_OPT_HUGE_M_TEXTSIZE");
 
                        if (fontReturnValue.Equals(L"huge", false))
                        {
@@ -301,8 +299,8 @@ FontSizeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_ITEM_FONT_SIZE_LARGE:
                {
-                       FontSize = FONT_MAIN_TEXT_SIZE_LARGE;
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_TEXTSTYLE_LARGE");
+                       fontSize = FONT_MAIN_TEXT_SIZE_LARGE;
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_TEXTSTYLE_LARGE");
 
                        if (fontReturnValue.Equals(L"large", false))
                        {
@@ -313,8 +311,8 @@ FontSizeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_ITEM_FONT_SIZE_NORMAL:
                {
-                       FontSize = FONT_MAIN_TEXT_SIZE_NORMAL;
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
+                       fontSize = FONT_MAIN_TEXT_SIZE_NORMAL;
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
 
                        if (fontReturnValue.Equals(L"medium", false))
                        {
@@ -325,8 +323,8 @@ FontSizeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_ITEM_FONT_SIZE_SMALL:
                {
-                       FontSize = FONT_MAIN_TEXT_SIZE_SMALL;
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SMALL_M_TEXTSIZE");
+                       fontSize = FONT_MAIN_TEXT_SIZE_SMALL;
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SMALL_M_TEXTSIZE");
 
                        if (fontReturnValue.Equals(L"small", false))
                        {
@@ -339,20 +337,20 @@ FontSizeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
        }
 
-       ItemTypeOneLine(itemRectangle);
-       itemRectangle.height = itemRectangle.height + H_GROUP_INDEX_HELP_TEXT_GAP;
+       ItemTypeOneLine(itemMainRectangle);
+       itemMainRectangle.height = itemMainRectangle.height + H_GROUP_INDEX_HELP_TEXT_GAP;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
 
-       pItem->Construct(relativeLayout, Dimension(itemWidth, itemRectangle.height), style);
+       pItem->Construct(relativeLayout, Dimension(itemWidth, itemMainRectangle.height), style);
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
 
-       pLabel->SetTextConfig(FontSize, LABEL_TEXT_STYLE_NORMAL);
+       pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
index 2302f20..c33447b 100644 (file)
@@ -149,16 +149,16 @@ HomeAndLockScreenForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        int itemHeight = H_GROUP_INDEX_DEFAULT;;
        int yItemOffset = 0;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
        groupText = GetGroupText(groupIndex);
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
 
@@ -169,14 +169,14 @@ HomeAndLockScreenForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_BOTTOM);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -189,26 +189,26 @@ HomeAndLockScreenForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
-       Rectangle subItemRectangle;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String secondLineText;
+       String itemMainText;
+       String itemSubText;
        String fontReturnValue;
        Label* pLabel = null;
        int itemHeight = 0;
        int fontSize = GetFontSize();
 
-       itemText = GetGroupItemText(groupIndex);
+       itemMainText = GetGroupItemText(groupIndex);
 
-       ItemTypeOneLine(itemRectangle);
-       itemHeight = itemRectangle.height;
+       ItemTypeOneLine(itemMainRectangle);
+       itemHeight = itemMainRectangle.height;
 
        if (groupIndex == ID_GROUP_SCREEN_TYPE)
        {
-               secondLineText = GetGroupItemSelectedText();
-               ItemTypeTwoLine(itemRectangle, subItemRectangle, fontSize);
-               itemHeight = itemRectangle.height + subItemRectangle.height;
+               itemSubText = GetGroupItemSelectedText();
+               ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+               itemHeight = itemMainRectangle.height + itemSubRectangle.height;
        }
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
@@ -220,7 +220,7 @@ HomeAndLockScreenForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -233,7 +233,7 @@ HomeAndLockScreenForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        if (groupIndex == ID_GROUP_SCREEN_TYPE)
        {
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(subItemRectangle, secondLineText);
+               pLabel->Construct(itemSubRectangle, itemSubText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
@@ -329,10 +329,10 @@ HomeAndLockScreenForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Cont
        {
        case ID_GROUP_SCREEN_TYPE:
                {
-                       String secondLineText;
+                       String itemSubText;
                        Label* pSecondLabel = static_cast<Label*>(pItem->GetControl(1));
-                       secondLineText = GetGroupItemSelectedText();
-                       pSecondLabel->SetText(secondLineText);
+                       itemSubText = GetGroupItemSelectedText();
+                       pSecondLabel->SetText(itemSubText);
                        pSecondLabel->Invalidate(false);
                }
                break;
@@ -421,7 +421,7 @@ HomeAndLockScreenForm::GetGroupText(int groupIndex)
 Tizen::Base::String
 HomeAndLockScreenForm::GetGroupItemText(int groupIndex)
 {
-       String itemText;
+       String itemMainText;
 
        switch (groupIndex)
        {
@@ -429,11 +429,11 @@ HomeAndLockScreenForm::GetGroupItemText(int groupIndex)
                {
                        if (GetWallpaperIndex())
                        {
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_SCREEN_LOCK_TYPE");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SCREEN_LOCK_TYPE");
                        }
                        else
                        {
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_HOME_SCREEN_TYPE");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_HOME_SCREEN_TYPE");
                        }
                }
                break;
@@ -442,23 +442,23 @@ HomeAndLockScreenForm::GetGroupItemText(int groupIndex)
                {
                        if (GetWallpaperIndex())
                        {
-                               itemText = ResourceManager::GetString(L"IDS_ST_MBODY_LOCK_SCREEN_WALLPAPER_M_NOUN");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_MBODY_LOCK_SCREEN_WALLPAPER_M_NOUN");
                        }
                        else
                        {
-                               itemText = ResourceManager::GetString(L"IDS_ST_MBODY_HOME_SCREEN_WALLPAPER");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_MBODY_HOME_SCREEN_WALLPAPER");
                        }
                }
                break;
        }
 
-       return itemText;
+       return itemMainText;
 }
 
 Tizen::Base::String
 HomeAndLockScreenForm::GetGroupItemSelectedText(void)
 {
-       String itemText;
+       String itemMainText;
        String screenType;
        String applicationId;
 
@@ -481,21 +481,21 @@ HomeAndLockScreenForm::GetGroupItemSelectedText(void)
                if (applicationId.Equals(L"org.tizen.menu-screen", false))
                {
                        // Preloaded home
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DEFAULT_HOME_SCREEN");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DEFAULT_HOME_SCREEN");
                }
                else if (applicationId.Equals(L"org.tizen.lockscreen", false))
                {
                        // Preloaded lock
-                       itemText = ResourceManager::GetString(L"IDS_ST_MBODY_SWIPE");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_MBODY_SWIPE");
                }
                else
                {
                        // Downloaded home/lock
                        PackageManager* pMgr = PackageManager::GetInstance();
                        PackageAppInfo* pPackageAppInfo = pMgr->GetPackageAppInfoN(applicationId);
-                       itemText = pPackageAppInfo->GetAppDisplayName();
+                       itemMainText = pPackageAppInfo->GetAppDisplayName();
                }
        }
 
-       return itemText;
+       return itemMainText;
 }
\ No newline at end of file
index 74f11a8..a237ef4 100644 (file)
@@ -146,7 +146,7 @@ KeyboardForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -174,10 +174,10 @@ KeyboardForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -186,14 +186,14 @@ KeyboardForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -206,9 +206,9 @@ KeyboardForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
@@ -227,13 +227,13 @@ KeyboardForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_KEYBOARD_SOFTWARE_SELECT_KEYBOARD:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_IME_BODY_KEYBOARD_SELECTION");
+                                       itemMainText = ResourceManager::GetString(L"IDS_IME_BODY_KEYBOARD_SELECTION");
                                }
                                break;
 
                        case ID_ITEM_KEYBOARD_SOFTWARE_KEYBOARD_SETTING:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_IME_BODY_WRITING_LANGUAGES");
+                                       itemMainText = ResourceManager::GetString(L"IDS_IME_BODY_WRITING_LANGUAGES");
                                }
                                break;
 
@@ -249,13 +249,13 @@ KeyboardForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_KEYBOARD_HARDWARE_SELECT_KEYBOARD:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_IME_BODY_KEYBOARD_SELECTION");
+                                       itemMainText = ResourceManager::GetString(L"IDS_IME_BODY_KEYBOARD_SELECTION");
                                }
                                break;
 
                        case ID_ITEM_KEYBOARD_HARDWARE_KEYBOARD_SETTING:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_IME_BODY_KEYBOARD_SETTINGS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_IME_BODY_KEYBOARD_SETTINGS");
                                }
                                break;
 
@@ -269,7 +269,7 @@ KeyboardForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
        }
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -278,7 +278,7 @@ KeyboardForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index cad077f..7037980 100644 (file)
@@ -221,9 +221,9 @@ KeyboardInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
@@ -241,10 +241,10 @@ KeyboardInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        const Tizen::Locales::Locale* pLocale = static_cast<const Tizen::Locales::Locale*>(pLangList->GetAt(itemIndex));
        if (pLocale != null)
        {
-               itemText = pLocale->GetLocaleCodeString();
+               itemMainText = pLocale->GetLocaleCodeString();
        }
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -253,7 +253,7 @@ KeyboardInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index 0658f43..42711ea 100644 (file)
@@ -158,7 +158,7 @@ KeyboardSelectionForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -186,16 +186,16 @@ KeyboardSelectionForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        pItem->Construct(Dimension(itemWidth, itemHeight));
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
@@ -210,9 +210,9 @@ KeyboardSelectionForm::CreateGroupItem(int groupIndex, int itemWidth)
 TableViewItem*
 KeyboardSelectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_DETAILED;
-       String itemText;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
@@ -229,7 +229,7 @@ KeyboardSelectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        }
 
                        InputMethodInfo* pInputMethodInfo = static_cast<InputMethodInfo*>(__pInputMethodInfoList->GetAt(itemIndex));
-                       itemText = pInputMethodInfo->GetName();
+                       itemMainText = pInputMethodInfo->GetName();
                }
                break;
 
@@ -239,13 +239,13 @@ KeyboardSelectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_KEYBOARD_HARDWARE_SELECT_KEYBOARD:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_IME_BODY_KEYBOARD_SELECTION");
+                                       itemMainText = ResourceManager::GetString(L"IDS_IME_BODY_KEYBOARD_SELECTION");
                                }
                                break;
 
                        case ID_ITEM_KEYBOARD_HARDWARE_KEYBOARD_SETTING:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_IME_BODY_KEYBOARD_SETTINGS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_IME_BODY_KEYBOARD_SETTINGS");
                                }
                                break;
 
@@ -259,13 +259,13 @@ KeyboardSelectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
        }
 
-       ItemTypeOneLine(itemRectangle);
-       itemRectangle.width -= ITEM_WIDE_GAP;
+       ItemTypeOneLine(itemMainRectangle);
+       itemMainRectangle.width -= ITEM_WIDE_GAP;
        pItem->Construct(Dimension(itemWidth, H_GROUP_ITEM_DEFAULT), style);
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index 4f997a3..3e679de 100644 (file)
@@ -120,6 +120,7 @@ static const wchar_t* languageCode[ID_GROUP_LANGUAGE_ITEM_COUNT] =
 
 LocaleForm::LocaleForm(void)
        : __languageDataList(null)
+       , __isRunningAppControl(false)
 {
 }
 
@@ -557,6 +558,8 @@ LocaleForm::OnInitializing(void)
        CreateFooter();
        CreateTableView();
 
+       AddFocusEventListener(*this);
+
        AppLogDebug("ENTER");
 
        return E_SUCCESS;
@@ -641,7 +644,7 @@ LocaleForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
@@ -737,10 +740,10 @@ LocaleForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -749,14 +752,14 @@ LocaleForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
        pItem->SetEnabled(false);
@@ -768,12 +771,12 @@ TableViewItem*
 LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
-       bool isSecondLine = false;
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       bool isItemSubText = false;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String secondLineText;
+       String itemMainText;
+       String itemSubText;
        String systemLocaleString;
        Label* pLabel = null;
        int fontSize = GetFontSize();
@@ -786,14 +789,14 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
        case ID_GROUP_LANGUAGE_AND_REGION_MAIN:
                {
-                       isSecondLine = true;
+                       isItemSubText = true;
 
                        switch (itemIndex)
                        {
                        case ID_ITEM_LANGUAGE_AND_REGION_MAIN_DISPLAY_LANGUAGE:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_DISPLAY_LANGUAGE");
-                                       if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_LANGUAGE, secondLineText) != E_SUCCESS)
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_HEADER_DISPLAY_LANGUAGE");
+                                       if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_LANGUAGE, itemSubText) != E_SUCCESS)
                                        {
                                                AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
                                        }
@@ -801,12 +804,12 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                        {
                                                for (int i = 0; i< ID_GROUP_LANGUAGE_ITEM_COUNT; i++)
                                                {
-                                                       if (secondLineText.Equals(languageCode[i], false))
+                                                       if (itemSubText.Equals(languageCode[i], false))
                                                        {
                                                                String* pKey = static_cast<String*>(__languageDataList->GetAt(i));
 
                                                                StringTokenizer stringTokenizer(*pKey, L"/");
-                                                               stringTokenizer.GetNextToken(secondLineText);
+                                                               stringTokenizer.GetNextToken(itemSubText);
                                                                break;
                                                        }
                                                }
@@ -816,7 +819,7 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        case ID_ITEM_LANGUAGE_AND_REGION_MAIN_REGION:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_REGION");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_REGION");
                                        String localeLanguage;
                                        if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_LANGUAGE, localeLanguage) != E_SUCCESS)
                                        {
@@ -844,11 +847,11 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                        Locale currentLocale(langCode, countryCode);
 
                                        locale.GetLanguageName(currentLocale, systemLocaleString);
-                                       secondLineText.Append(systemLocaleString + L"(");
+                                       itemSubText.Append(systemLocaleString + L"(");
                                        systemLocaleString.Remove(0, systemLocaleString.GetLength());
 
                                        locale.GetCountryName(currentLocale, systemLocaleString);
-                                       secondLineText.Append(systemLocaleString + L")");
+                                       itemSubText.Append(systemLocaleString + L")");
                                        systemLocaleString.Remove(0, systemLocaleString.GetLength());
                                }
                                break;
@@ -861,7 +864,7 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_GROUP_KEYBOARD:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_KEYBOARD");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_KEYBOARD");
                }
                break;
 
@@ -869,14 +872,14 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
        }
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       if (isSecondLine == true)
+       if (isItemSubText == true)
        {
-               ItemTypeTwoLine(itemRectangle, itemSecondLineTextRect, fontSize);
-               itemHeight = (itemRectangle.height + itemSecondLineTextRect.height);
+               ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+               itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
 
@@ -884,7 +887,7 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, itemText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -895,7 +898,7 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemSecondLineTextRect, secondLineText);
+               pLabel->Construct(itemSubRectangle, itemSubText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
@@ -915,7 +918,7 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, itemText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -981,7 +984,16 @@ LocaleForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTable
                        #if 0
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_KEYBOARD, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), null);
                        #else
-                       AppControl::FindAndStart(L"http://tizen.org/appcontrol/operation/setting/ime", null, null, null, null, null);
+
+                       if (__isRunningAppControl == true)
+                       {
+                               return;
+                       }
+
+                       if (AppControl::FindAndStart(L"http://tizen.org/appcontrol/operation/setting/ime", null, null, null, null, null) == E_SUCCESS)
+                       {
+                               __isRunningAppControl = true;
+                       }
                        #endif
                }
                break;
@@ -1142,7 +1154,7 @@ void
 LocaleForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        String firstLineText;
-       String secondLineText;
+       String itemSubText;
 
        Rectangle pItemBounds = pItem->GetBounds();
        Rectangle firstLineRect;
@@ -1169,7 +1181,7 @@ LocaleForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Table
                                {
                                        firstLineText = ResourceManager::GetString(L"IDS_ST_HEADER_DISPLAY_LANGUAGE");
 
-                                       if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_LANGUAGE, secondLineText) != E_SUCCESS)
+                                       if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_LANGUAGE, itemSubText) != E_SUCCESS)
                                        {
                                                AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
                                        }
@@ -1177,12 +1189,12 @@ LocaleForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Table
                                        {
                                                for (int i = 0; i< ID_GROUP_LANGUAGE_ITEM_COUNT; i++)
                                                {
-                                                       if (secondLineText.Equals(languageCode[i], false))
+                                                       if (itemSubText.Equals(languageCode[i], false))
                                                        {
                                                                String* pKey = static_cast<String*>(__languageDataList->GetAt(i));
 
                                                                StringTokenizer stringTokenizer(*pKey, L"/");
-                                                               stringTokenizer.GetNextToken(secondLineText);
+                                                               stringTokenizer.GetNextToken(itemSubText);
                                                                break;
                                                        }
                                                }
@@ -1191,7 +1203,7 @@ LocaleForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Table
                                        pFirstLabel->SetText(firstLineText);
                                        pFirstLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
 
-                                       pSecondLabel->SetText(secondLineText);
+                                       pSecondLabel->SetText(itemSubText);
                                        pSecondLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
 
                                        pFirstLabel->Invalidate(false);
@@ -1236,18 +1248,18 @@ LocaleForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Table
                                        Locale currentLocale(langCode, countryCode);
 
                                        locale.GetLanguageName(currentLocale, systemLocaleString);
-                                       secondLineText.Append(systemLocaleString + L"(");
+                                       itemSubText.Append(systemLocaleString + L"(");
                                        systemLocaleString.Remove(0, systemLocaleString.GetLength());
 
                                        locale.GetCountryName(currentLocale, systemLocaleString);
-                                       secondLineText.Append(systemLocaleString + L")");
+                                       itemSubText.Append(systemLocaleString + L")");
                                        systemLocaleString.Remove(0, systemLocaleString.GetLength());
 
                                        pItem->SetBounds(pItemBounds);
                                        pFirstLabel->SetText(firstLineText);
                                        pFirstLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
 
-                                       pSecondLabel->SetText(secondLineText);
+                                       pSecondLabel->SetText(itemSubText);
                                        pSecondLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
 
                                        pFirstLabel->Invalidate(false);
@@ -1325,4 +1337,15 @@ LocaleForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::Or
 {
        RefreshTableViewItem();
        Invalidate(true);
+}
+
+void
+LocaleForm::OnFocusGained(const Tizen::Ui::Control& source)
+{
+       __isRunningAppControl = false;
+}
+
+void
+LocaleForm::OnFocusLost(const Tizen::Ui::Control& source)
+{
 }
\ No newline at end of file
index 3016933..29ffc4e 100644 (file)
@@ -148,7 +148,7 @@ LocaleLanguageForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -157,7 +157,7 @@ LocaleLanguageForm::CreateGroupItem(int groupIndex, int itemWidth)
        yItemOffset = H_GROUP_INDEX_NO_HELP_TEXT_GAP;
        itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -166,14 +166,14 @@ LocaleLanguageForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -186,35 +186,33 @@ LocaleLanguageForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String secondLineText;
+       String itemMainText;
        String fontReturnValue;
        Label* pLabel = null;
        int fontSize = GetFontSize();
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        String* pKey = static_cast<String*>(__pLanguageDataList->GetAt(itemIndex));
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
        if (fontSize > FONT_MAIN_TEXT_SIZE_LARGE)
        {
-               itemRectangle.height = itemRectangle.height + H_FONT_HEIGHT_GAP;
+               itemMainRectangle.height = itemMainRectangle.height + H_FONT_HEIGHT_GAP;
        }
-       itemWidth = itemRectangle.width;
+       itemWidth = itemMainRectangle.width;
 
        StringTokenizer stringTokenizer(*pKey, L"/");
-       stringTokenizer.GetNextToken(itemText);
+       stringTokenizer.GetNextToken(itemMainText);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
 
-       pItem->Construct(relativeLayout, Dimension(itemWidth, itemRectangle.height), style);
+       pItem->Construct(relativeLayout, Dimension(itemWidth, itemMainRectangle.height), style);
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
 
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
index a0fcb9a..c39f5b8 100644 (file)
@@ -215,7 +215,7 @@ LocationForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -238,10 +238,10 @@ LocationForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -250,14 +250,14 @@ LocationForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -268,21 +268,21 @@ LocationForm::CreateGroupItem(int groupIndex, int itemWidth)
 TableViewItem*
 LocationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        switch (groupIndex)
        {
        case ID_GROUP_GPS_1:
                {
                        bool gpsStatus;
-                       itemText = ResourceManager::GetString(L"IDS_CAM_OPT_GPS");
+                       itemMainText = ResourceManager::GetString(L"IDS_CAM_OPT_GPS");
                        SettingInfo::GetValue(SETTING_INFO_KEY_LOCATION_GPS, gpsStatus);
                        if (!IsFailed(GetLastResult())
                                && (gpsStatus == true))
@@ -299,8 +299,8 @@ LocationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_GPS_NETWORK_POSITION:
                                {
                                        bool wpsStatus;
-                                       itemText = ResourceManager::GetString(L"IDS_LBS_BODY_NETWORK_POSITION");
-                                       itemRectangle.width -= W_RESIZE_LABEL_GAP;
+                                       itemMainText = ResourceManager::GetString(L"IDS_LBS_BODY_NETWORK_POSITION");
+                                       itemMainRectangle.width -= W_RESIZE_LABEL_GAP;
 
                                        SettingInfo::GetValue(SETTING_INFO_KEY_LOCATION_WPS, wpsStatus);
                                        if (!IsFailed(GetLastResult())
@@ -330,13 +330,13 @@ LocationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.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);
 
index ca1aa3d..c7ee25c 100644 (file)
@@ -364,17 +364,16 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        unsigned int itemHeight = 0;
        bool isDrawBitmapIcon = true;
-       Rectangle itemRectIcon;
-       Rectangle itemRectLabel;
-       Rectangle itemRectSecondLabel;
-       String itemText;
-       String itemTextTwoLine;
+       Rectangle itemIconRectangle;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
+       String itemMainText;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        Bitmap* pBitmap = null;
        Label* pLabel = null;
 
-       ItemTypeIconAndOneLine(itemRectIcon, itemRectLabel);
-       itemHeight = itemRectLabel.height;
+       ItemTypeIconAndOneLine(itemIconRectangle, itemMainRectangle);
+       itemHeight = itemMainRectangle.height;
 
        switch (groupIndex)
        {
@@ -391,7 +390,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                        else
                                        {
                                                pBitmap = ResourceManager::GetBitmapN(IDB_WIFI);
-                                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_WI_FI");
+                                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_WI_FI");
                                        }
                                }
                                break;
@@ -404,11 +403,11 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                        }
                                        else
                                        {
-                                               ItemTypeIconAndOneLine(itemRectIcon, itemRectLabel);
-                                               itemHeight = itemRectLabel.height;
+                                               ItemTypeIconAndOneLine(itemIconRectangle, itemMainRectangle);
+                                               itemHeight = itemMainRectangle.height;
 
                                                pBitmap = ResourceManager::GetBitmapN(IDB_BLUETOOTH);
-                                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_BLUETOOTH");
+                                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_BLUETOOTH");
                                        }
                                }
                                break;
@@ -416,17 +415,17 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_CONNECTIVITY_NETWORK:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_NETWORK);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_NETWORK");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_NETWORK");
                                }
                                break;
 
                        case ID_ITEM_CONNECTIVITY_NFC:
                                {
-                                       ItemTypeIconAndOneLine(itemRectIcon, itemRectLabel);
-                                       itemHeight = (itemRectLabel.height + itemRectSecondLabel.height);
+                                       ItemTypeIconAndOneLine(itemIconRectangle, itemMainRectangle);
+                                       itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
 
                                        pBitmap = ResourceManager::GetBitmapN(IDB_NFC);
-                                       itemText = ResourceManager::GetString(L"IDS_NFC_BODY_NFC");
+                                       itemMainText = ResourceManager::GetString(L"IDS_NFC_BODY_NFC");
                                }
                                break;
 
@@ -439,9 +438,9 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        case ID_GROUP_MODE:
                {
                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-                       itemRectLabel.width -= W_RESIZE_LABEL_GAP;
+                       itemMainRectangle.width -= W_RESIZE_LABEL_GAP;
                        pBitmap = ResourceManager::GetBitmapN(IDB_FLIGHT_MODE);
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FLIGHT_MODE");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_FLIGHT_MODE");
                }
                break;
 
@@ -452,28 +451,28 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_PERSONAL_HOME_SCREEN:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_HOME_SCREEN);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_HOME_SCREEN");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_HEADER_HOME_SCREEN");
                                }
                                break;
 
                        case ID_ITEM_PERSONAL_LOCK_SCREEN:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_LOCK_SCREEN);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_LOCK_SCREEN");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_LOCK_SCREEN");
                                }
                                break;
 
                        case ID_ITEM_PERSONAL_ACCOUNTS:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_ACCOUNTS);
-                                       itemText = ResourceManager::GetString(L"IDS_COM_BODY_ACCOUNTS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_COM_BODY_ACCOUNTS");
                                }
                                break;
 
                        case ID_ITEM_PERSONAL_PRIVACY:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_PRIVACY);
-                                       itemText = ResourceManager::GetString(L"IDS_COM_BODY_PRIVACY");
+                                       itemMainText = ResourceManager::GetString(L"IDS_COM_BODY_PRIVACY");
                                }
                                break;
 
@@ -490,49 +489,49 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_DEVICE_DISPLAY:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_DISPLAY);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DISPLAY");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DISPLAY");
                                }
                                break;
 
                        case ID_ITEM_DEVICE_SOUND:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_SOUND);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SOUNDS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SOUNDS");
                                }
                                break;
 
                        case ID_ITEM_DEVICE_LOCATION:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_LOCATION);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_LOCATIONS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_LOCATIONS");
                                }
                                break;
 
                        case ID_ITEM_DEVICE_CALL_SETTING:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_PHONE);
-                                       itemText = ResourceManager::GetString(L"IDS_CST_BODY_CALL_SETTINGS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_CST_BODY_CALL_SETTINGS");
                                }
                                break;
 
                        case ID_ITEM_DEVICE_ACCESSIBILITY:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_ACCESSIBILITY);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_ACCESSIBILITY");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_ACCESSIBILITY");
                                }
                                break;
 
                        case ID_ITEM_DEVICE_DATE_TIME:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_DATE_AND_TIME);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DATE_AND_TIME");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DATE_AND_TIME");
                                }
                                break;
 
                        case ID_ITEM_DEVICE_LANGUAGE_KEYBOARD:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_LANGUAGE_KEYBOARD);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_KEYBOARD");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_KEYBOARD");
                                }
                                break;
 
@@ -549,14 +548,14 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_SYSTEM_MANAGE_APPLICATION:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_MANAGE_APPLICATION);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS");
                                }
                                break;
 
                        case ID_ITEM_SYSTEM_DOWNLOADED_APPLICATION:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_DEFAULT_ICON);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DOWNLOADED_APPLICATIONS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DOWNLOADED_APPLICATIONS");
                                }
                                break;
 
@@ -569,7 +568,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                        else
                                        {
                                                pBitmap = ResourceManager::GetBitmapN(IDB_DEVELOPER_OPTION);
-                                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_DEVELOPER_OPTIONS");
+                                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DEVELOPER_OPTIONS");
                                        }
                                }
                                break;
@@ -577,7 +576,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_SYSTEM_ABOUT_PHONE:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_ABOUT_PHONE);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_ABOUT_PHONE");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_ABOUT_PHONE");
                                }
                                break;
 
@@ -604,7 +603,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                if (isDrawBitmapIcon)
                {
                        pLabel = new (std::nothrow) Label();
-                       pLabel->Construct(itemRectIcon, L"");
+                       pLabel->Construct(itemIconRectangle, L"");
                        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                        pLabel->SetBackgroundBitmap(*pBitmap);
@@ -613,7 +612,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectLabel, itemText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -621,11 +620,11 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->AddControl(*pLabel);
                if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
                {
-                       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
+                       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
                }
                else
                {
-                       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+                       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, MAIN_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);
index 7b33129..79939ac 100644 (file)
@@ -308,17 +308,17 @@ ManageApplicationForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        int fontSize = GetFontSize();
        String groupText;
        Label* pLabel = null;
 
        TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -327,7 +327,7 @@ ManageApplicationForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(fontSize, style);
@@ -335,7 +335,7 @@ ManageApplicationForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        pItem->AddControl(*pLabel);
        pItem->SetEnabled(false);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
@@ -347,12 +347,12 @@ ManageApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle iconRectangle;
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemIconRectangle;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String secondLineText;
+       String itemMainText;
+       String itemSubText;
        String fontReturnValue;
        Label* pLabel = null;
        Bitmap* pBitmap = null;
@@ -360,8 +360,8 @@ ManageApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        int fontSize = GetFontSize();
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       itemText = GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_NAME);
-       ItemTypeIconAndOneLine(iconRectangle, itemRectangle);
+       itemMainText = GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_NAME);
+       ItemTypeIconAndOneLine(itemIconRectangle, itemMainRectangle);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -376,12 +376,12 @@ ManageApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pBitmap = ResourceManager::GetBitmapN(IDB_DEFAULT_ICON);
        }
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(iconRectangle, L"");
+       pLabel->Construct(itemIconRectangle, L"");
        pLabel->SetBackgroundBitmap(*pBitmap);
        pItem->AddControl(*pLabel);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
 
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
@@ -389,7 +389,7 @@ ManageApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        pItem->AddControl(*pLabel);
 
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        delete pBitmap;
index 25f49fb..fd81078 100644 (file)
@@ -308,12 +308,12 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
 
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
 
-       bool isTwoLineText = false;
+       bool isItemSubText = false;
        bool isBitmapSet = false;
        bool isCommandButton = false;
-       Rectangle iconRectangle;
-       Rectangle firstLineRectangle;
-       Rectangle secondLineRectangle;
+       Rectangle itemIconRectangle;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
 
        int itemHeight = H_ITEM_TYPE_1_LABEL;
 
@@ -323,14 +323,14 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
        Label* pLabel = null;
        Label* pBitmapLabel = null;
 
-       String itemText;
-       String secondLineText;
+       String itemMainText;
+       String itemSubText;
 
        int fontSize = GetFontSize();
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       ItemTypeOneLine(firstLineRectangle);
-       itemHeight = firstLineRectangle.height;
+       ItemTypeOneLine(itemMainRectangle);
+       itemHeight = itemMainRectangle.height;
 
        switch (groupIndex)
        {
@@ -340,7 +340,7 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
                        {
                        case ID_ITEM_APPLICATION_NAME:
                                {
-                                       isTwoLineText = true;
+                                       isItemSubText = true;
                                        isBitmapSet = true;
                                        double appSize = 0;
                                        double dataSize = 0;
@@ -354,9 +354,9 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
                                        }
 
                                        String sizeData;
-                                       ItemTypeIconAndTwoLine(iconRectangle, firstLineRectangle, secondLineRectangle, fontSize);
-                                       itemHeight = (firstLineRectangle.height + secondLineRectangle.height);
-                                       itemText = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_NAME)));
+                                       ItemTypeIconAndTwoLine(itemIconRectangle, itemMainRectangle, itemSubRectangle, fontSize);
+                                       itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
+                                       itemMainText = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_NAME)));
                                        sizeData = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_SIZE)));
                                        Double::Parse(sizeData, appSize);
                                        sizeData = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_DATA_SIZE)));
@@ -364,13 +364,13 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
 
                                        if (((appSize+dataSize) / KILOBYTE_TO_MEGABYTE) >= 1)
                                        {
-                                               secondLineText = Double::ToString(((appSize+dataSize) / KILOBYTE_TO_MEGABYTE));
-                                               secondLineText.Append(L" MB");
+                                               itemSubText = Double::ToString(((appSize+dataSize) / KILOBYTE_TO_MEGABYTE));
+                                               itemSubText.Append(L" MB");
                                        }
                                        else
                                        {
-                                               secondLineText = Double::ToString(((appSize+dataSize)));
-                                               secondLineText.Append(L" KB");
+                                               itemSubText = Double::ToString(((appSize+dataSize)));
+                                               itemSubText.Append(L" KB");
                                        }
                                }
                                break;
@@ -391,16 +391,16 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
                        double totalSize = 0;
                        String tmpDataSize;
 
-                       isTwoLineText = true;
+                       isItemSubText = true;
 
-                       ItemTypeTwoLine(firstLineRectangle, secondLineRectangle, fontSize);
-                       itemHeight = (firstLineRectangle.height + secondLineRectangle.height);
+                       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+                       itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
 
                        switch (itemIndex)
                        {
                        case ID_ITEM_APPLICATION_SIZE:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_APPLICATION");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_APPLICATION");
                                        tmpDataSize = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_SIZE)));
 
                                        Double::Parse(tmpDataSize, appSize);
@@ -410,7 +410,7 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
 
                        case ID_ITEM_APPLICATION_DATA_SIZE:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DATA");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DATA");
                                        tmpDataSize = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_DATA_SIZE)));
 
                                        Double::Parse(tmpDataSize, dataSize);
@@ -420,7 +420,7 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
 
                        default:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_TOTAL");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_TOTAL");
                                        tmpDataSize = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_SIZE)));
                                        Double::Parse(tmpDataSize, appSize);
                                        tmpDataSize = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_DATA_SIZE)));
@@ -433,32 +433,32 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
 
                        if ((totalSize / KILOBYTE_TO_MEGABYTE) >= 1)
                        {
-                               secondLineText = Double::ToString((totalSize / KILOBYTE_TO_MEGABYTE));
-                               secondLineText.Append(L" MB");
+                               itemSubText = Double::ToString((totalSize / KILOBYTE_TO_MEGABYTE));
+                               itemSubText.Append(L" MB");
                        }
                        else
                        {
-                               secondLineText = Double::ToString((totalSize));
-                               secondLineText.Append(L" KB");
+                               itemSubText = Double::ToString((totalSize));
+                               itemSubText.Append(L" KB");
                        }
                }
                break;
 
        case ID_GROUP_APPLICATION_CLEAR_DEFAULT:
                {
-                       ItemTypeOneLine(firstLineRectangle);
-                       itemHeight = firstLineRectangle.height;
+                       ItemTypeOneLine(itemMainRectangle);
+                       itemHeight = itemMainRectangle.height;
 
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_CLEAR_DEFAULTS");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_CLEAR_DEFAULTS");
                }
                break;
 
        case ID_GROUP_APPLICATION_DETAIL:
                {
-                       ItemTypeOneLine(firstLineRectangle);
-                       itemHeight = firstLineRectangle.height;
+                       ItemTypeOneLine(itemMainRectangle);
+                       itemHeight = itemMainRectangle.height;
 
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MORE_DETAILS");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MORE_DETAILS");
                }
                break;
 
@@ -474,18 +474,18 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
                String homeAppId;
                String lockAppId;
                String appId;
-               firstLineRectangle.height -= (H_ITEM_TYPE_1_LABEL / DIVIDE_BY_TWO);
+               itemMainRectangle.height -= (H_ITEM_TYPE_1_LABEL / DIVIDE_BY_TWO);
 
-               pItem->Construct(Dimension(itemWidth, firstLineRectangle.height), style);
+               pItem->Construct(Dimension(itemWidth, itemMainRectangle.height), style);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                Rectangle stopButtonRect;
                Rectangle uninstallButtonRect;
 
-               stopButtonRect = firstLineRectangle;
+               stopButtonRect = itemMainRectangle;
                stopButtonRect.width = (itemWidth / DIVIDE_BY_TWO) - COMMAND_BUTTON_GAP;
 
-               uninstallButtonRect = firstLineRectangle;
+               uninstallButtonRect = itemMainRectangle;
                uninstallButtonRect.x = (itemWidth / DIVIDE_BY_TWO);
                uninstallButtonRect.width = (itemWidth / DIVIDE_BY_TWO) - COMMAND_BUTTON_GAP;
 
@@ -530,34 +530,34 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
                if (isBitmapSet == true)
                {
                        pBitmapLabel = new (std::nothrow) Label();
-                       pBitmapLabel->Construct(iconRectangle, L"");
+                       pBitmapLabel->Construct(itemIconRectangle, L"");
                        pBitmapLabel->SetBackgroundBitmap(*pBitmap);
                        pItem->AddControl(*pBitmapLabel);
                }
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(firstLineRectangle, itemText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, firstLineRectangle.x, 0, 0, 0);
+               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
 
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
-               if (isTwoLineText == true)
+               if (isItemSubText == true)
                {
                        pLabel = new (std::nothrow) Label();
-                       pLabel->Construct(secondLineRectangle, secondLineText);
+                       pLabel->Construct(itemSubRectangle, itemSubText);
                        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                        pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                        pLabel->SetTextColor(COLOR_SUB_TEXT);
 
                        pItem->AddControl(*pLabel);
 
-                       relativeLayout.SetMargin(*pLabel, secondLineRectangle.x, 0, 0, 0);
+                       relativeLayout.SetMargin(*pLabel, itemSubRectangle.x, 0, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
                }
index ff57613..2d5f0f6 100644 (file)
@@ -126,16 +126,16 @@ MemoryForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
        TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
 
-       itemRectangle.x = X_GROUP_INDEX_DEFAULT_LABEL;
-       itemRectangle.y = Y_GROUP_INDEX_DEFAULT_LABEL;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_INDEX_DEFAULT_LABEL;
+       itemMainRectangle.y = Y_GROUP_INDEX_DEFAULT_LABEL;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -144,13 +144,13 @@ MemoryForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -163,17 +163,17 @@ MemoryForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        if (itemIndex == ID_ITEM_MEMORY_MAIN_MEMORY_STATUS)
        {
-               itemText = ResourceManager::GetString(L"IDS_ST_BODY_MEMORY_STATUS");
+               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MEMORY_STATUS");
        }
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
@@ -185,13 +185,13 @@ MemoryForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
 
index be003a4..3cf3c2b 100644 (file)
@@ -165,7 +165,7 @@ MemoryStatusForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -179,10 +179,10 @@ MemoryStatusForm::CreateGroupItem(int groupIndex, int itemWidth)
        yItemOffset = H_GROUP_INDEX_NO_HELP_TEXT_GAP;
        itemHeight = H_GROUP_INDEX_DEFAULT;
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -191,14 +191,14 @@ MemoryStatusForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -211,12 +211,12 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       bool isTwoLineItemText = false;
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       bool isItemSubText = false;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
-       String itemTextTwoLine;
+       String itemMainText;
+       String itemSubText;
        String fontReturnValue;
        int fontSize = GetFontSize();
        int itemHeight = 0;
@@ -229,19 +229,19 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case SD_CARD_GROUP_ITEM_MOUNT:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MOUNT_SD_CARD");
-                                       itemTextTwoLine = L"Insert SD card";
-                                       ItemTypeTwoLine(itemRectangle, itemSecondLineTextRect, fontSize);
-                                       itemHeight = itemRectangle.height + itemSecondLineTextRect.height;
-                                       isTwoLineItemText = true;
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MOUNT_SD_CARD");
+                                       itemSubText = L"Insert SD card";
+                                       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+                                       itemHeight = itemMainRectangle.height + itemSubRectangle.height;
+                                       isItemSubText = true;
                                }
                                break;
 
                        case SD_CARD_GROUP_ITEM_UNMOUNT:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_UNMOUNT_SD_CARD");;
-                                       ItemTypeOneLine(itemRectangle);
-                                       itemHeight = itemRectangle.height;
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_UNMOUNT_SD_CARD");;
+                                       ItemTypeOneLine(itemMainRectangle);
+                                       itemHeight = itemMainRectangle.height;
                                }
                                break;
 
@@ -253,22 +253,22 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                        {
                                                break;
                                        }
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_AVAILABLE_SPACE");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_AVAILABLE_SPACE");
                                        float megabyteAvailableSpace = static_cast<float>(availableSpace) / (AVILABLE_SPACE_BYTE_CHANGED * AVILABLE_SPACE_BYTE_CHANGED);
                                        if (megabyteAvailableSpace > AVILABLE_SPACE_BYTE_CHANGED)
                                        {
                                                float gigabyteAvailableSpace = megabyteAvailableSpace / AVILABLE_SPACE_BYTE_CHANGED;
-                                               itemTextTwoLine.Format(AVILABLE_SPACE_STRING_LIMIT, L"%.1f", gigabyteAvailableSpace);
-                                               itemTextTwoLine.Append(L" GB");
+                                               itemSubText.Format(AVILABLE_SPACE_STRING_LIMIT, L"%.1f", gigabyteAvailableSpace);
+                                               itemSubText.Append(L" GB");
                                        }
                                        else
                                        {
-                                               itemTextTwoLine.Format(AVILABLE_SPACE_STRING_LIMIT, L"%.0f", megabyteAvailableSpace);
-                                               itemTextTwoLine.Append(L" MB");
+                                               itemSubText.Format(AVILABLE_SPACE_STRING_LIMIT, L"%.0f", megabyteAvailableSpace);
+                                               itemSubText.Append(L" MB");
                                        }
-                                       ItemTypeTwoLine(itemRectangle, itemSecondLineTextRect, fontSize);
-                                       itemHeight = itemRectangle.height + itemSecondLineTextRect.height;
-                                       isTwoLineItemText = true;
+                                       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+                                       itemHeight = itemMainRectangle.height + itemSubRectangle.height;
+                                       isItemSubText = true;
                                }
                                break;
 
@@ -301,7 +301,7 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                AppLogDebug("pLabel is null");
                return pItem;
        }
-       r = pLabel->Construct(itemRectangle, itemText);
+       r = pLabel->Construct(itemMainRectangle, itemMainText);
        if (IsFailed(r))
        {
                AppLogDebug("Construct fail [%s]", GetErrorMessage(r));
@@ -313,11 +313,11 @@ MemoryStatusForm::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, itemMainRectangle.x, 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);
 
-       if (isTwoLineItemText == true)
+       if (isItemSubText == true)
        {
                Label* pSecondLabel = new (std::nothrow) Label();
                if (pSecondLabel == null)
@@ -325,7 +325,7 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        AppLogDebug("pLabel is null");
                        return pItem;
                }
-               r = pSecondLabel->Construct(itemSecondLineTextRect, itemTextTwoLine);
+               r = pSecondLabel->Construct(itemSubRectangle, itemSubText);
                if (IsFailed(r))
                {
                        AppLogDebug("Construct fail [%s]", GetErrorMessage(r));
@@ -339,7 +339,7 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSecondLabel->SetTextColor(COLOR_SUB_TEXT);
 
                pItem->AddControl(*pSecondLabel);
-               relativeLayout.SetMargin(*pSecondLabel, itemSecondLineTextRect.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetMargin(*pSecondLabel, itemSubRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
        }
index da2dda9..0b7a3d6 100644 (file)
@@ -187,7 +187,7 @@ NetworkForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectLabel;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -234,10 +234,10 @@ NetworkForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectLabel.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectLabel.y = yItemOffset;
-       itemRectLabel.width = itemWidth;
-       itemRectLabel.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -246,14 +246,14 @@ NetworkForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectLabel, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -265,9 +265,9 @@ TableViewItem*
 NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
-       Rectangle itemRectLabel;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-       String itemText;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
@@ -283,7 +283,7 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        case ID_GROUP_USE_PACKET_DATA:
                {
                        bool packetStatus = false;
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_USE_PACKET_DATA");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_USE_PACKET_DATA");
                        if (SettingInfo::GetValue(SETTING_INFO_KEY_NETWORK_PACKETSERVICE, packetStatus) == E_SUCCESS)
                        {
                                __pTableView->SetItemChecked(groupIndex, itemIndex, packetStatus);
@@ -298,7 +298,7 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        case ID_GROUP_DATA_ROAMING:
                {
                        bool roamingStatus = false;
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DATA_ROAMING");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DATA_ROAMING");
 
                        if (SettingInfo::GetValue(SETTING_INFO_KEY_NETWORK_ROAMING, roamingStatus) == E_SUCCESS)
                        {
@@ -315,7 +315,7 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                {
                        if (itemIndex == ID_ITEM_NETWORK_NETWORK_MODE)
                        {
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_NETWORK_MODE");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_NETWORK_MODE");
                        }
                }
                break;
@@ -336,20 +336,20 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                __pTableView->SetItemChecked(groupIndex, itemIndex, true);
                                        }
 
-                                       itemText = L"GSM/WCDMA";
-                                       itemText.Append(ResourceManager::GetString(L"IDS_KW_MBODY_AUTO_CONNECT"));
+                                       itemMainText = L"GSM/WCDMA";
+                                       itemMainText.Append(ResourceManager::GetString(L"IDS_KW_MBODY_AUTO_CONNECT"));
                                }
                                break;
 
                        case ID_ITEM_NETWORK_NETWORK_MODE_GSM_ONLY:
                                {
-                                       itemText = L"GSM only";
+                                       itemMainText = L"GSM only";
                                }
                                break;
 
                        case ID_ITEM_NETWORK_NETWORK_MODE_WCDMA_ONLY:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_SETTING_NETWORK_MODE_WCDMA_ONLY");
+                                       itemMainText = ResourceManager::GetString(L"IDS_SETTING_NETWORK_MODE_WCDMA_ONLY");
                                }
                                break;
 
@@ -361,7 +361,7 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_GROUP_NETWORK_CONNECTIONS:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_CONNECTIONS");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_CONNECTIONS");
                }
                break;
 
@@ -369,8 +369,8 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
        }
 
-       ItemTypeOneLine(itemRectLabel);
-       itemRectLabel.width -= W_RESIZE_LABEL_GAP;
+       ItemTypeOneLine(itemMainRectangle);
+       itemMainRectangle.width -= W_RESIZE_LABEL_GAP;
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
 
@@ -378,7 +378,7 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectLabel, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -386,11 +386,11 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->AddControl(*pLabel);
        if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
        {
-               relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
+               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
        }
        else
        {
-               relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
index 55c4f32..aa4aa37 100644 (file)
@@ -187,7 +187,7 @@ NfcForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        int fontSize = GetFontSize();
        String groupText;
        Label* pLabel = null;
@@ -234,10 +234,10 @@ NfcForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight + H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight + H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -246,7 +246,7 @@ NfcForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(fontSize, style);
@@ -254,7 +254,7 @@ NfcForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        pItem->AddControl(*pLabel);
        pItem->SetEnabled(false);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
@@ -267,13 +267,13 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        AppLogDebug("group[%d] item[%d] width[%d]", groupIndex, itemIndex, itemWidth);
        int itemHeight = H_GROUP_ITEM_DEFAULT;
        int fontSize = GetFontSize();
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineRectangle;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
 
-       String itemText;
-       String itemSecondLineText;
+       String itemMainText;
+       String itemSubText;
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
@@ -286,7 +286,7 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
        case ID_GROUP_NFC:
                {
-                       itemText = ResourceManager::GetString(L"IDS_NFC_BODY_NFC");
+                       itemMainText = ResourceManager::GetString(L"IDS_NFC_BODY_NFC");
                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
                }
                break;
@@ -296,10 +296,10 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        if (__pResevedPushCandidatesAppidList->GetCount() != 0)
                        {
                                int selectItemIndex = __pNfcPredefinedItemPresentationModelInstance->GetSelectNfcReservedPushCandidatesAppIdIndex();
-                               itemSecondLineText = *static_cast<String*>(__pResevedPushCandidatesAppidList->GetAt(selectItemIndex));
+                               itemSubText = *static_cast<String*>(__pResevedPushCandidatesAppidList->GetAt(selectItemIndex));
                        }
-                       ItemTypeTwoLine(itemRectangle, itemSecondLineRectangle, fontSize);
-                       itemText = ResourceManager::GetString(L"IDS_NFC_BODY_PREDEFINED_ITEM_ABB");
+                       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+                       itemMainText = ResourceManager::GetString(L"IDS_NFC_BODY_PREDEFINED_ITEM_ABB");
                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
                }
                break;
@@ -332,7 +332,7 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                return pItem;
        }
 
-       r = pLabel->Construct(itemRectangle, itemText);
+       r = pLabel->Construct(itemMainRectangle, itemMainText);
        if (IsFailed(r))
        {
                AppLogDebug("Construct fail [%s]", GetErrorMessage(r));
@@ -345,7 +345,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_ONOFF_SLIDING, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.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);
 
@@ -358,7 +358,7 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        return pItem;
                }
 
-               r = pSecondLineLabel->Construct(itemSecondLineRectangle, itemSecondLineText);
+               r = pSecondLineLabel->Construct(itemSubRectangle, itemSubText);
                if (IsFailed(r))
                {
                        AppLogDebug("Construct fail [%s]", GetErrorMessage(r));
@@ -371,7 +371,7 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSecondLineLabel->SetTextColor(COLOR_SUB_TEXT);
 
                pItem->AddControl(*pSecondLineLabel);
-               relativeLayout.SetMargin(*pSecondLineLabel, itemSecondLineRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetMargin(*pSecondLineLabel, itemSubRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pSecondLineLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pSecondLineLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
        }
index 89569bd..dcbd4eb 100644 (file)
@@ -146,7 +146,7 @@ NfcPredefinedItemForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;\r
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;\r
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;\r
-       Rectangle itemRectangle;\r
+       Rectangle itemMainText;\r
        int fontSize = GetFontSize();\r
        String groupText;\r
        Label* pLabel = null;\r
@@ -156,10 +156,10 @@ NfcPredefinedItemForm::CreateGroupItem(int groupIndex, int itemWidth)
        yItemOffset = H_GROUP_INDEX_NO_HELP_TEXT_GAP;\r
        itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;\r
 \r
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;\r
-       itemRectangle.y = yItemOffset;\r
-       itemRectangle.width = itemWidth;\r
-       itemRectangle.height = itemHeight + H_GROUP_INDEX_HELP_TEXT_TOP_GAP;\r
+       itemMainText.x = X_GROUP_ITEM_DEFAULT_LABEL;\r
+       itemMainText.y = yItemOffset;\r
+       itemMainText.width = itemWidth;\r
+       itemMainText.height = itemHeight + H_GROUP_INDEX_HELP_TEXT_TOP_GAP;\r
 \r
        RelativeLayout relativeLayout;\r
        relativeLayout.Construct();\r
@@ -168,7 +168,7 @@ NfcPredefinedItemForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);\r
 \r
        pLabel = new (std::nothrow) Label();\r
-       pLabel->Construct(itemRectangle, groupText);\r
+       pLabel->Construct(itemMainText, groupText);\r
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);\r
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);\r
        pLabel->SetTextConfig(fontSize, style);\r
@@ -176,7 +176,7 @@ NfcPredefinedItemForm::CreateGroupItem(int groupIndex, int itemWidth)
 \r
        pItem->AddControl(*pLabel);\r
        pItem->SetEnabled(false);\r
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0);\r
+       relativeLayout.SetMargin(*pLabel, itemMainText.x, 0, 0, 0);\r
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);\r
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);\r
 \r
@@ -189,13 +189,13 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        AppLogDebug("group[%d] item[%d] width[%d]", groupIndex, itemIndex, itemWidth);\r
        int itemHeight = H_GROUP_ITEM_DEFAULT;\r
        int fontSize = GetFontSize();\r
-       Rectangle itemRectangle;\r
-       Rectangle itemSecondLineRectangle;\r
+       Rectangle itemMainRectangle;\r
+       Rectangle itemSubRectangle;\r
 \r
-       String itemText;\r
-       String itemSecondLineText;\r
+       String itemMainText;\r
+       String itemSubText;\r
 \r
-       ItemTypeOneLine(itemRectangle);\r
+       ItemTypeOneLine(itemMainRectangle);\r
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;\r
 \r
        TableViewItem* pItem = new (std::nothrow) TableViewItem();\r
@@ -204,9 +204,9 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {\r
        case ID_GROUP_NFC_PREDEFINED_ITEM:\r
                {\r
-                       ItemTypeTwoLine(itemRectangle, itemSecondLineRectangle, fontSize);\r
-                       itemText = ResourceManager::GetString(L"IDS_NFC_BODY_PREDEFINED_ITEM_ABB");\r
-                       itemSecondLineText = *static_cast<String*>(__pReservedPushCandidatesAppIdList->GetAt(itemIndex));\r
+                       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);\r
+                       itemMainText = ResourceManager::GetString(L"IDS_NFC_BODY_PREDEFINED_ITEM_ABB");\r
+                       itemSubText = *static_cast<String*>(__pReservedPushCandidatesAppIdList->GetAt(itemIndex));\r
                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;\r
                }\r
                break;\r
@@ -214,7 +214,7 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        case ID_GROUP_NFC_PREDEFINED_ITEM_LIST:\r
                {\r
                        style = TABLE_VIEW_ANNEX_STYLE_RADIO;\r
-                       itemText = *static_cast<String*>(__pReservedPushCandidatesAppIdList->GetAt(itemIndex));\r
+                       itemMainText = *static_cast<String*>(__pReservedPushCandidatesAppIdList->GetAt(itemIndex));\r
                }\r
                break;\r
 \r
@@ -236,7 +236,7 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);\r
 \r
        Label* pLabel = new (std::nothrow) Label();\r
-       r = pLabel->Construct(itemRectangle, itemText);\r
+       r = pLabel->Construct(itemMainRectangle, itemMainText);\r
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);\r
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);\r
        pLabel->SetTextColor(COLOR_MAIN_TEXT);\r
@@ -244,11 +244,11 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->AddControl(*pLabel);\r
        if (groupIndex == ID_GROUP_NFC_PREDEFINED_ITEM)\r
        {\r
-               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);\r
+               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);\r
        }\r
        else\r
        {\r
-               relativeLayout.SetMargin(*pLabel, itemRectangle.x + RELATIVE_LAYOUT_LEFT_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);\r
+               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x + RELATIVE_LAYOUT_LEFT_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);\r
        }\r
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);\r
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);\r
@@ -262,7 +262,7 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        return pItem;\r
                }\r
 \r
-               r = pSecondLineLabel->Construct(itemSecondLineRectangle, itemSecondLineText);\r
+               r = pSecondLineLabel->Construct(itemSubRectangle, itemSubText);\r
                if (IsFailed(r))\r
                {\r
                        AppLogDebug("Construct fail [%s]", GetErrorMessage(r));\r
@@ -275,7 +275,7 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSecondLineLabel->SetTextColor(COLOR_SUB_TEXT);\r
 \r
                pItem->AddControl(*pSecondLineLabel);\r
-               relativeLayout.SetMargin(*pSecondLineLabel, itemSecondLineRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);\r
+               relativeLayout.SetMargin(*pSecondLineLabel, itemSubRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);\r
                relativeLayout.SetRelation(*pSecondLineLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);\r
                relativeLayout.SetRelation(*pSecondLineLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);\r
        }\r
@@ -373,8 +373,8 @@ NfcPredefinedItemForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Cont
                {\r
                        Label* secondLabel = static_cast<Label*>(pItem->GetControl(1));\r
                        int selectItemIndex = __pNfcPredefinedItemPresentationModelInstance->GetSelectNfcReservedPushCandidatesAppIdIndex();\r
-                       String secondLineText = *static_cast<String*>(__pReservedPushCandidatesAppIdList->GetAt(selectItemIndex));\r
-                       secondLabel->SetText(secondLineText);\r
+                       String itemSubText = *static_cast<String*>(__pReservedPushCandidatesAppIdList->GetAt(selectItemIndex));\r
+                       secondLabel->SetText(itemSubText);\r
                }\r
                break;\r
 \r
index aaaa85a..ac6fef4 100644 (file)
@@ -170,7 +170,7 @@ PrivacyDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
@@ -180,10 +180,10 @@ PrivacyDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
        yItemOffset = H_GROUP_INDEX_NO_HELP_TEXT_GAP;
        itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -192,14 +192,14 @@ PrivacyDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -212,18 +212,16 @@ PrivacyDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_MARK;
-       String itemText;
-       String secondLineText;
+       String itemMainText;
        String fontReturnValue;
        Label* pLabel = null;
 
        int fontSize = GetFontSize();
-       itemText = *static_cast<String*>(__pPrivateDataList->GetAt(itemIndex));
+       itemMainText = *static_cast<String*>(__pPrivateDataList->GetAt(itemIndex));
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
@@ -235,7 +233,7 @@ PrivacyDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index ac86cf9..4cc1455 100644 (file)
@@ -259,7 +259,7 @@ PrivacyForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
@@ -269,10 +269,10 @@ PrivacyForm::CreateGroupItem(int groupIndex, int itemWidth)
        yItemOffset = H_GROUP_INDEX_NO_HELP_TEXT_GAP;
        itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -281,14 +281,14 @@ PrivacyForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -301,11 +301,11 @@ PrivacyForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemMainRectangle;
+       Rectangle itemSubRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String firstLineText;
-       String secondLineText;
+       String itemMainText;
+       String itemSubText;
        String fontReturnValue;
        Label* pLabel = null;
 
@@ -313,11 +313,11 @@ PrivacyForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        int itemHeight = H_GROUP_ITEM_DEFAULT;
        Rectangle detailArrow;
 
-       firstLineText = GetDisplayPackageName(itemIndex);
-       secondLineText = GetUsedPrivacyService(itemIndex);
+       itemMainText = GetDisplayPackageName(itemIndex);
+       itemSubText = GetUsedPrivacyService(itemIndex);
 
-       ItemTypeTwoLine(itemRectangle, itemSecondLineTextRect, fontSize);
-       itemHeight = (itemRectangle.height + itemSecondLineTextRect.height);
+       ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+       itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -328,24 +328,24 @@ PrivacyForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, firstLineText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemSecondLineTextRect, secondLineText);
+       pLabel->Construct(itemSubRectangle, itemSubText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_SUB_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemSecondLineTextRect.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemSubRectangle.x, 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);
 
index 4a891f1..a32a19d 100644 (file)
@@ -275,15 +275,15 @@ LocaleRegionForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
        TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
 
-       itemRectangle.y = H_GROUP_INDEX_NO_HELP_TEXT_GAP;
-       itemRectangle.height = itemHeight;
-       itemRectangle.width = itemWidth;
+       itemMainRectangle.y = H_GROUP_INDEX_NO_HELP_TEXT_GAP;
+       itemMainRectangle.height = itemHeight;
+       itemMainRectangle.width = itemWidth;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -292,14 +292,14 @@ LocaleRegionForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -312,11 +312,10 @@ LocaleRegionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        String* pKey = null;
-       String itemText;
+       String itemMainText;
        String currentRegion;
        String listRegion;
        Label* pLabel = null;
@@ -330,17 +329,17 @@ LocaleRegionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pKey = static_cast<String*>(__pSearchedText->GetAt(itemIndex));
 
        StringTokenizer stringTokenizer(*pKey, L":");
-       stringTokenizer.GetNextToken(itemText);
+       stringTokenizer.GetNextToken(itemMainText);
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       if (itemText.Contains(currentRegion) == true)
+       if (itemMainText.Contains(currentRegion) == true)
        {
                __pTableView->SetItemChecked(groupIndex, itemIndex, true);
        }
 
-       ItemTypeOneLine(itemRectangle);
-       itemRectangle.width = itemWidth;
+       ItemTypeOneLine(itemMainRectangle);
+       itemMainRectangle.width = itemWidth;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -349,7 +348,7 @@ LocaleRegionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(FontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index e35934a..6c680c3 100644 (file)
@@ -137,7 +137,7 @@ ResetterForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectLabel;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -168,10 +168,10 @@ ResetterForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectLabel.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectLabel.y = yItemOffset;
-       itemRectLabel.width = itemWidth;
-       itemRectLabel.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -180,14 +180,14 @@ ResetterForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectLabel, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -198,9 +198,9 @@ ResetterForm::CreateGroupItem(int groupIndex, int itemWidth)
 TableViewItem*
 ResetterForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       Rectangle itemRectLabel;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       String itemText;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
@@ -212,13 +212,13 @@ ResetterForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_RESET_MAIN_RESET_SETTING:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_RESET_SETTINGS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_HEADER_RESET_SETTINGS");
                                }
                                break;
 
                        case ID_ITEM_RESET_MAIN_FACTORY_RESET:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_MBODY_FACTORY_RESET");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_MBODY_FACTORY_RESET");
                                }
                                break;
 
@@ -232,7 +232,7 @@ ResetterForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
        }
 
-       ItemTypeOneLine(itemRectLabel);
+       ItemTypeOneLine(itemMainRectangle);
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
@@ -243,13 +243,13 @@ ResetterForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectLabel, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
 
index d871299..0eec759 100644 (file)
@@ -105,24 +105,24 @@ void
 ResetterSettingForm::CreateTableView(void)
 {
        Rectangle bounds = GetClientAreaBounds();
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        Rectangle itemSelectCount;
 
-       String itemText = ResourceManager::GetString(L"IDS_ST_BODY_SELECT_ALL");
+       String itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SELECT_ALL");
        String itemSelectedText = ResourceManager::GetString(L"IDS_ST_OPT_SELECTED");
 
        bounds.x = X_GROUP_DEFAULT;
        bounds.y = H_GROUP_ITEM_DEFAULT;
        bounds.width -= (bounds.x * WIDTH_GAP);
 
-       itemRectangle = itemSelectCount = bounds;
-       itemRectangle.y = Y_GROUP_DEFAULT;
-       itemRectangle.height = H_GROUP_ITEM_DEFAULT;
+       itemMainRectangle = itemSelectCount = bounds;
+       itemMainRectangle.y = Y_GROUP_DEFAULT;
+       itemMainRectangle.height = H_GROUP_ITEM_DEFAULT;
 
        __pCheckButton = new (std::nothrow) CheckButton();
-       __pCheckButton->Construct(itemRectangle, CHECK_BUTTON_STYLE_MARK, BACKGROUND_STYLE_NONE, false);
+       __pCheckButton->Construct(itemMainRectangle, CHECK_BUTTON_STYLE_MARK, BACKGROUND_STYLE_NONE, false);
        __pCheckButton->SetActionId(IDA_BUTTON_CHECKED, IDA_BUTTON_UNCHECKED, IDA_BUTTON_SELECTED);
-       __pCheckButton->SetText(itemText);
+       __pCheckButton->SetText(itemMainText);
 
        AddControl(*__pCheckButton);
 
@@ -223,8 +223,8 @@ ResetterSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_MARK;
-       Rectangle itemRectangle;
-       String itemText;
+       Rectangle itemMainRectangle;
+       String itemMainText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
@@ -232,97 +232,97 @@ ResetterSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
        case ID_ITEM_LOCATION:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_LOCATIONS");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_LOCATIONS");
                }
                break;
 
        case ID_ITEM_NETWORK:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_NETWORK");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_NETWORK");
                }
                break;
 
        case ID_ITEM_WIFI_DIRECT:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_WI_FI_DIRECT");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_HEADER_WI_FI_DIRECT");
                }
                break;
 
        case ID_ITEM_WALLPAPER:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MAINDISPLAY_WALLPAPER");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MAINDISPLAY_WALLPAPER");
                }
                break;
 
        case ID_ITEM_SOUNDS:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SOUNDS");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SOUNDS");
                }
                break;
 
        case ID_ITEM_BRIGHTNESS:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_BRIGHTNESS");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_BRIGHTNESS");
                }
                break;
 
        case ID_ITEM_FONT:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FONT");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_FONT");
                }
                break;
 
        case ID_ITEM_DISPLAY:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DISPLAY");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DISPLAY");
                }
                break;
 
        case ID_ITEM_AUTO_ROTATE_SCREEN:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB");
                }
                break;
 
        case ID_ITEM_DATE_TIME:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DATE_AND_TIME");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DATE_AND_TIME");
                }
                break;
 
        case ID_ITEM_LANGUAGE_REGION:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_REGION_ABB");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_REGION_ABB");
                }
                break;
 
        case ID_ITEM_KEYBOARD:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_KEYBOARD");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_KEYBOARD");
                }
                break;
 
        case ID_ITEM_MANAGE_APPLICATION:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS");
                }
                break;
 
        case ID_ITEM_MEMORY:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MEMORY");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MEMORY");
                }
                break;
 
        case ID_ITEM_DEVELOPER_OPTION:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DEVELOPER_OPTIONS");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DEVELOPER_OPTIONS");
                }
                break;
 
        case ID_ITEM_ABOUT_PHONE:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_ABOUT_PHONE");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_ABOUT_PHONE");
                }
                break;
 
@@ -330,7 +330,7 @@ ResetterSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
        }
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
@@ -341,14 +341,14 @@ ResetterSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
 
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
 
index c4073ec..79d4c91 100644 (file)
@@ -173,7 +173,7 @@ ScreenTypeForm::CreateGroupItem(int groupIndex, int itemWidth)
        int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectangle;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
        int fontSize = GetFontSize();
@@ -183,10 +183,10 @@ ScreenTypeForm::CreateGroupItem(int groupIndex, int itemWidth)
        yItemOffset = H_GROUP_INDEX_NO_HELP_TEXT_GAP;
        itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
 
-       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectangle.y = yItemOffset;
-       itemRectangle.width = itemWidth;
-       itemRectangle.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -195,14 +195,14 @@ ScreenTypeForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -215,19 +215,17 @@ ScreenTypeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       Rectangle itemRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_RADIO;
-       String itemText = L"";
+       String itemMainText = L"";
        String valueKeyString = L"";
-       String secondLineText;
        String fontReturnValue;
        Label* pLabel = null;
 
        int fontSize = GetFontSize();
        int itemHeight = H_GROUP_ITEM_DEFAULT;
 
-       itemText = GetItemString(itemIndex);
+       itemMainText = GetItemString(itemIndex);
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
        RelativeLayout relativeLayout;
@@ -236,9 +234,9 @@ ScreenTypeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->Construct(relativeLayout, Dimension(itemWidth, itemHeight), style);
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
-       ItemTypeOneLine(itemRectangle);
+       ItemTypeOneLine(itemMainRectangle);
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectangle, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index fe63db2..a4d58ba 100644 (file)
@@ -179,7 +179,7 @@ SecurityForm::CreateGroupItem(int groupIndex, int itemWidth)
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
        Color colorText = COLOR_HELP_TEXT_TYPE_01;
-       Rectangle itemRectLabel;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -250,10 +250,10 @@ SecurityForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectLabel.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectLabel.y = yItemOffset;
-       itemRectLabel.width = itemWidth;
-       itemRectLabel.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -262,14 +262,14 @@ SecurityForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectLabel, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(colorText);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -280,10 +280,10 @@ SecurityForm::CreateGroupItem(int groupIndex, int itemWidth)
 TableViewItem*
 SecurityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       Rectangle itemRectLabel;
+       Rectangle itemMainRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        Label* pLabel = null;
-       String itemText;
+       String itemMainText;
        int fontSize = GetFontSize();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
@@ -296,13 +296,13 @@ SecurityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_SECURITY_SCREEN_LOCK_TYPE:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SCREEN_LOCK_TYPE");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SCREEN_LOCK_TYPE");
                                }
                                break;
 
                        case ID_ITEM_SECURITY_SCREEN_LOCK_SCREEN_OPTION:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_LOCK_SCREEN_OPTIONS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_LOCK_SCREEN_OPTIONS");
                                }
                                break;
 
@@ -314,13 +314,13 @@ SecurityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_GROUP_SECURITY_PHONE_SECURITY:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_MBODY_FIND_MY_MOBILE");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_MBODY_FIND_MY_MOBILE");
                }
                break;
 
        case ID_GROUP_SECURITY_SIM:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SIM_LOCK");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SIM_LOCK");
                        if (itemIndex == ID_ITEM_SECURITY_PIN_LOCK)
                        {
                                style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
@@ -335,19 +335,19 @@ SecurityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_SECURITY_PIN_LOCK:
                                {
                                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_PIN_LOCK");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_PIN_LOCK");
                                }
                                break;
 
                        case ID_ITEM_SECURITY_CHANGE_PIN_1:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_CHANGE_PIN1");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_CHANGE_PIN1");
                                }
                                break;
 
                        case ID_ITEM_SECURITY_CHANGE_PIN_2:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_CHANGE_PIN2");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_CHANGE_PIN2");
                                }
                                break;
 
@@ -359,7 +359,7 @@ SecurityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_GROUP_SECURITY_DEVICE:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DEVICE_ENCRYPTED");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_DEVICE_ENCRYPTED");
                }
                break;
 
@@ -367,7 +367,7 @@ SecurityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
        }
 
-       ItemTypeOneLine(itemRectLabel);
+       ItemTypeOneLine(itemMainRectangle);
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -376,14 +376,14 @@ SecurityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectLabel, itemText);
+       pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
 
-       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
 
index 6b8ad9c..2d0358d 100644 (file)
@@ -244,7 +244,7 @@ SoundsForm::CreateGroupItem(int groupIndex, int itemWidth)
        int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
        Color colorText = COLOR_HELP_TEXT_TYPE_01;
        LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
-       Rectangle itemRectLabel;
+       Rectangle itemMainRectangle;
        String groupText;
        Label* pLabel = null;
 
@@ -328,10 +328,10 @@ SoundsForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       itemRectLabel.x = X_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectLabel.y = yItemOffset;
-       itemRectLabel.width = itemWidth;
-       itemRectLabel.height = itemHeight;
+       itemMainRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemMainRectangle.y = yItemOffset;
+       itemMainRectangle.width = itemWidth;
+       itemMainRectangle.height = itemHeight;
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
@@ -340,14 +340,14 @@ SoundsForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
 
        pLabel = new (std::nothrow) Label();
-       pLabel->Construct(itemRectLabel, groupText);
+       pLabel->Construct(itemMainRectangle, groupText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(colorText);
 
        pItem->AddControl(*pLabel);
-       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        pItem->SetEnabled(false);
@@ -359,25 +359,25 @@ TableViewItem*
 SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        bool slientMode = false;
-       Rectangle itemRectLabel;
-       Rectangle itemRectSlider;
+       Rectangle itemMainRectangle;
+       Rectangle itemSliderRectangle;
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        Bitmap* pBitmapSoundMin = null;
        Bitmap* pBitmapSoundMax = null;
        Label* pLabel = null;
 
        Slider* pSlider = null;
-       String itemText;
+       String itemMainText;
        int fontSize = GetFontSize();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       ItemTypeOneLine(itemRectLabel);
+       ItemTypeOneLine(itemMainRectangle);
 
-       itemRectSlider.x = 0;
-       itemRectSlider.y = Y_GROUP_ITEM_DEFAULT_LABEL;
-       itemRectSlider.width = itemWidth;
-       itemRectSlider.height = H_GROUP_ITEM_DEFAULT_SLIDER;
+       itemSliderRectangle.x = 0;
+       itemSliderRectangle.y = Y_GROUP_ITEM_DEFAULT_LABEL;
+       itemSliderRectangle.width = itemWidth;
+       itemSliderRectangle.height = H_GROUP_ITEM_DEFAULT_SLIDER;
 
        if (groupIndex == ID_GROUP1)
        {
@@ -398,7 +398,7 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_MAIN_VOLUME:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SOUNDS");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SOUNDS");
 
                                        if (SettingInfo::GetValue(SETTING_INFO_KEY_SOUND_SILENTMODE, slientMode) == E_SUCCESS)
                                        {
@@ -418,7 +418,7 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_MAIN_VIBRATION:
                                {
                                        bool vibratorStatus = false;
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_CALLALERTTYPE_VIBRATION");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_CALLALERTTYPE_VIBRATION");
 
                                        if (SettingInfo::GetValue(SETTING_INFO_KEY_VIBRATOR, vibratorStatus) == E_SUCCESS)
                                        {
@@ -436,13 +436,13 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        }
 
                        pLabel = new (std::nothrow) Label();
-                       pLabel->Construct(itemRectLabel, itemText);
+                       pLabel->Construct(itemMainRectangle, itemMainText);
                        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
                        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                        pItem->AddControl(*pLabel);
-                       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+                       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
                }
@@ -452,13 +452,13 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_INCOMMING_CALL_RINGTONE:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_INCOMING_CALL_RINGTONE");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_INCOMING_CALL_RINGTONE");
                                }
                                break;
 
                        case ID_ITEM_INCOMMING_CALL_VIBRATION:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_INCOMING_CALL_VIBRATION");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_INCOMING_CALL_VIBRATION");
                                }
                                break;
 
@@ -467,13 +467,13 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        }
 
                        pLabel = new (std::nothrow) Label();
-                       pLabel->Construct(itemRectLabel, itemText);
+                       pLabel->Construct(itemMainRectangle, itemMainText);
                        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
                        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                        pItem->AddControl(*pLabel);
-                       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+                       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
                }
@@ -503,23 +503,23 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        if (itemIndex == ID_ITEM_VOLUME_SYSTEM)
                        {
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_SYSTEM");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SYSTEM");
                        }
                        else if (itemIndex == ID_ITEM_VOLUME_MEDIA)
                        {
-                               itemText = ResourceManager::GetString(L"IDS_COM_BODY_MEDIA");
+                               itemMainText = ResourceManager::GetString(L"IDS_COM_BODY_MEDIA");
                                settingInfoVolumeKey = SETTING_INFO_KEY_SOUND_MEDIA_VOLUME;
                        }
                        else if (itemIndex == ID_ITEM_VOLUME_NOTIFICATION)
                        {
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_NOTIFICATION");
+                               itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_NOTIFICATION");
                                settingInfoVolumeKey = SETTING_INFO_KEY_SOUND_NOTIFICATION_VOLUME;
                        }
 
                        pSlider = new (std::nothrow) Slider();
 
-                       pSlider->Construct(itemRectSlider, BACKGROUND_STYLE_NONE, true, GROUP_ITEM_SLIDER_MIN_VALUE, GROUP_ITEM_SLIDER_MAX_VALUE);
-                       pSlider->SetTitleText(itemText);
+                       pSlider->Construct(itemSliderRectangle, BACKGROUND_STYLE_NONE, true, GROUP_ITEM_SLIDER_MIN_VALUE, GROUP_ITEM_SLIDER_MAX_VALUE);
+                       pSlider->SetTitleText(itemMainText);
 
                        int systemVolume = 0;
                        if (SettingInfo::GetValue(settingInfoVolumeKey, systemVolume) != E_SUCCESS)
@@ -555,25 +555,25 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_NOTIFICATION_MESSAGE_ALERT:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MESSAGE_ALERT");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MESSAGE_ALERT");
                                }
                                break;
 
                        case ID_ITEM_NOTIFICATION_MESSAGE_ALERT_REPETITION:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MSG_ALERT_REPETITION");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MSG_ALERT_REPETITION");
                                }
                                break;
 
                        case ID_ITEM_NOTIFICATION_EMAIL_ALERT:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_EMAIL_ALERT");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_EMAIL_ALERT");
                                }
                                break;
 
                        case ID_ITEM_NOTIFICATION_EMAIL_ALERT_REPETITION:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_EMAIL_ALERT_REPETITION");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_EMAIL_ALERT_REPETITION");
                                }
                                break;
 
@@ -582,7 +582,7 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        }
 
                        pLabel = new (std::nothrow) Label();
-                       pLabel->Construct(itemRectLabel, itemText);
+                       pLabel->Construct(itemMainRectangle, itemMainText);
                        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
                        pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -614,13 +614,13 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                        case ID_ITEM_VIBRATION_NOTIFICATION:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_NOTIFICATION");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_NOTIFICATION");
                                }
                                break;
 
                        case ID_ITEM_VIBRATION_HAPTIC_FEEDBACK:
                                {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SOUNDFEEDBACK_HAPTIC_FEEDBACK");
+                                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SOUNDFEEDBACK_HAPTIC_FEEDBACK");
                                }
                                break;
 
@@ -633,8 +633,8 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        pSlider = new (std::nothrow) Slider();
 
-                       pSlider->Construct(itemRectSlider, BACKGROUND_STYLE_NONE, true, GROUP_ITEM_SLIDER_MIN_VALUE, GROUP_ITEM_SLIDER_MAX_VALUE);
-                       pSlider->SetTitleText(itemText);
+                       pSlider->Construct(itemSliderRectangle, BACKGROUND_STYLE_NONE, true, GROUP_ITEM_SLIDER_MIN_VALUE, GROUP_ITEM_SLIDER_MAX_VALUE);
+                       pSlider->SetTitleText(itemMainText);
                        pSlider->SetValue(GROUP_ITEM_SLIDER_DEFAULT_VALUE);
 
                        pBitmapSoundMin = ResourceManager::GetBitmapN(IDB_VIBRATION_MIN);
@@ -659,9 +659,9 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
                else
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SCREEN_LOCK_SOUND");
+                       itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_SCREEN_LOCK_SOUND");
                        pLabel = new (std::nothrow) Label();
-                       pLabel->Construct(itemRectLabel, itemText);
+                       pLabel->Construct(itemMainRectangle, itemMainText);
                        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
                        pLabel->SetTextColor(COLOR_MAIN_TEXT);
index f0e0916..50b2b2e 100644 (file)
@@ -318,11 +318,11 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        String key;
        String stringGMT;
        String tmpStr;
-       String firstLineText;
-       String secondLineText;
-       Rectangle itemRectangle;
+       String itemMainText;
+       String itemSubText;
+       Rectangle itemMainRectangle;
        Rectangle itemGMTRectangle;
-       Rectangle itemSecondLineTextRect;
+       Rectangle itemSubRectangle;
        int itemHeight = H_GROUP_ITEM_DEFAULT;
 
        String noSearchResult = ResourceManager::GetString(L"IDS_COM_BODY_NO_SEARCH_RESULTS");
@@ -335,14 +335,14 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       firstLineText = pData->GetCountryData();
-       secondLineText = pData->GetRegionData();
+       itemMainText = pData->GetCountryData();
+       itemSubText = pData->GetRegionData();
        gmtMin = pData->GetGMTData();
 
-       if (firstLineText.Equals(noSearchResult, false))
+       if (itemMainText.Equals(noSearchResult, false))
        {
-               ItemTypeOneLine(itemRectangle);
-               itemHeight = (itemRectangle.height);
+               ItemTypeOneLine(itemMainRectangle);
+               itemHeight = (itemMainRectangle.height);
 
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
@@ -351,14 +351,14 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, firstLineText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                pItem->AddControl(*pLabel);
 
-               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 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);
        }
@@ -389,9 +389,9 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        }
                }
 
-               ItemTypeTwoLine(itemRectangle, itemSecondLineTextRect, fontSize);
-               itemHeight = (itemRectangle.height + itemSecondLineTextRect.height);
-               itemGMTRectangle = itemRectangle;
+               ItemTypeTwoLine(itemMainRectangle, itemSubRectangle, fontSize);
+               itemHeight = (itemMainRectangle.height + itemSubRectangle.height);
+               itemGMTRectangle = itemMainRectangle;
 
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
@@ -399,13 +399,13 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->Construct(relativeLayout, Dimension(itemWidth, itemHeight), style);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
-               itemRectangle.width = itemWidth;
+               itemMainRectangle.width = itemWidth;
                itemGMTRectangle.width = W_GMT_FIXED_SIZE;
-               itemGMTRectangle.x = itemRectangle.width - itemGMTRectangle.width;
-               itemRectangle.width = itemRectangle.width - itemGMTRectangle.width;
+               itemGMTRectangle.x = itemMainRectangle.width - itemGMTRectangle.width;
+               itemMainRectangle.width = itemMainRectangle.width - itemGMTRectangle.width;
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemRectangle, firstLineText);
+               pLabel->Construct(itemMainRectangle, itemMainText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
@@ -425,14 +425,14 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                relativeLayout.SetRelation(*pLabel, *pSecLabel, RECT_EDGE_RELATION_RIGHT_TO_LEFT);
 
                pLabel = new (std::nothrow) Label();
-               pLabel->Construct(itemSecondLineTextRect, secondLineText);
+               pLabel->Construct(itemSubRectangle, itemSubText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemSecondLineTextRect.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetMargin(*pLabel, itemSubRectangle.x, 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);
        }