From eb3cd0e8b71ec93c7567939245998165274420a1 Mon Sep 17 00:00:00 2001 From: Hongryeol Gil Date: Wed, 15 May 2013 15:27:02 +0900 Subject: [PATCH] Fixed N_SE-38563, N_SE-38552 Change-Id: Ibdcb7aec1442d2de3810ab5ddd167c633aac999f Signed-off-by: Hongryeol Gil --- manifest.xml | 3 +-- src/StAboutPhoneForm.cpp | 18 +++++++------- src/StAccessibilityForm.cpp | 12 +++++----- src/StAppSettingForm.cpp | 22 ++++++++--------- src/StBaseForm.cpp | 6 ++--- src/StBluetoothDetailForm.cpp | 14 +++++------ src/StBluetoothForm.cpp | 20 ++++++++-------- src/StBrightnessForm.cpp | 14 +++++------ src/StCertificateDetailForm.cpp | 14 +++++------ src/StCertificateForm.cpp | 8 +++---- src/StCertificateTrustedRootForm.cpp | 4 ++-- src/StCertificateUserForm.cpp | 10 ++++---- src/StCertificateUserInstallForm.cpp | 4 ++-- src/StCertificateUserInstallPasswordForm.cpp | 18 +++++++------- src/StCertificateUserUnInstallForm.cpp | 4 ++-- src/StDateTimeForm.cpp | 18 +++++++------- src/StDeveloperOptionForm.cpp | 8 +++---- src/StDisplayForm.cpp | 14 +++++------ src/StDownloadedApplicationForm.cpp | 8 +++---- src/StEventsNotificationForm.cpp | 8 +++---- src/StFontForm.cpp | 22 ++++++++--------- src/StFontSizeForm.cpp | 8 +++---- src/StHomeAndLockScreenForm.cpp | 12 +++++----- src/StKeyboardForm.cpp | 8 +++---- src/StKeyboardInfoForm.cpp | 4 ++-- src/StLanguageAndRegionForm.cpp | 35 +++++++++++----------------- src/StLanguageForm.cpp | 8 +++---- src/StLocationForm.cpp | 8 +++---- src/StMainMenuForm.cpp | 28 +++++++++++++++------- src/StManageApplicationForm.cpp | 8 +++---- src/StManageApplicationInfoForm.cpp | 12 +++++----- src/StMemoryForm.cpp | 8 +++---- src/StMemoryStatusForm.cpp | 14 +++++------ src/StMoreConnectivityForm.cpp | 16 ++++++------- src/StMoreSystemForm.cpp | 12 +++++----- src/StNetworkForm.cpp | 8 +++---- src/StNfcForm.cpp | 12 +++++----- src/StNfcPredefinedItemForm.cpp | 14 +++++------ src/StPrivacyDetailForm.cpp | 8 +++---- src/StPrivacyForm.cpp | 10 ++++---- src/StRegionForm.cpp | 14 +++++------ src/StResetForm.cpp | 8 +++---- src/StResetSettingForm.cpp | 4 ++-- src/StScreenTypeForm.cpp | 8 +++---- src/StSecurityForm.cpp | 8 +++---- src/StSoundsForm.cpp | 24 +++++++++---------- src/StTimeZoneForm.cpp | 20 ++++++++-------- src/StWallpaperAlbumListDetailForm.cpp | 7 +++--- src/StWallpaperForm.cpp | 8 +++---- src/StWifiApDetailForm.cpp | 14 +++++------ src/StWifiConnectionForm.cpp | 8 +++---- src/StWifiDirectConnectionForm.cpp | 4 ++-- src/StWifiDirectForm.cpp | 12 +++++----- src/StWifiForm.cpp | 18 +++++++------- 54 files changed, 321 insertions(+), 318 deletions(-) diff --git a/manifest.xml b/manifest.xml index a52a00a..5e67aac 100644 --- a/manifest.xml +++ b/manifest.xml @@ -163,8 +163,7 @@ http://tizen.org/appcontrol/operation/configure http://tizen.org/appcontrol/operation/pick - - + diff --git a/src/StAboutPhoneForm.cpp b/src/StAboutPhoneForm.cpp index 26b3093..0ceafb5 100644 --- a/src/StAboutPhoneForm.cpp +++ b/src/StAboutPhoneForm.cpp @@ -284,8 +284,8 @@ PhoneInfoForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); pItem->SetEnabled(false); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -495,8 +495,8 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(__pEditField); relativeLayout.SetMargin(*__pEditField, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0); - relativeLayout.SetRelation(*__pEditField, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*__pEditField, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*__pEditField, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*__pEditField, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else { @@ -515,8 +515,8 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (isItemSubText == true) { if ((groupIndex == ID_GROUP_ABOUT_PHONE_MAIN) && (itemIndex == ID_ITEM_ABOUT_PHONE_MAIN_BATTERY)) @@ -533,8 +533,8 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_HIGHLIGHTED); pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } } @@ -974,4 +974,4 @@ PhoneInfoForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection } delete pArgs; } -} \ No newline at end of file +} diff --git a/src/StAccessibilityForm.cpp b/src/StAccessibilityForm.cpp index 13cf004..60aaec1 100644 --- a/src/StAccessibilityForm.cpp +++ b/src/StAccessibilityForm.cpp @@ -233,8 +233,8 @@ AccessibilityForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); pItem->SetEnabled(false); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -399,8 +399,8 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) { relativeLayout.SetMargin(*pLabel, startGap, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0); } - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (itemSubText.IsEmpty() == false) { @@ -413,8 +413,8 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; diff --git a/src/StAppSettingForm.cpp b/src/StAppSettingForm.cpp index fa2f6d2..4449de7 100644 --- a/src/StAppSettingForm.cpp +++ b/src/StAppSettingForm.cpp @@ -1304,8 +1304,8 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + 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, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED); @@ -1360,8 +1360,8 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSlider); relativeLayout.SetMargin(*pSlider, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0); - relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL); pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED); @@ -1432,8 +1432,8 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->SetIndividualSelectionEnabled(pEditField, true); relativeLayout.SetMargin(*pEditField, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0); - relativeLayout.SetRelation(*pEditField, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pEditField, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pEditField, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pEditField, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_LABEL, false)) { @@ -1513,8 +1513,8 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) delete pParentValue; delete pCurrentValue; relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_SEPARATOR, false)) { @@ -1540,8 +1540,8 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->SetEnabled(false); relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_RIGHT_MARGIN, 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else { @@ -1921,4 +1921,4 @@ ItemTag::GetItemTag(int& groupIndex, int& itemIndex) { groupIndex = __groupIndex; itemIndex = __itemIndex; -} \ No newline at end of file +} diff --git a/src/StBaseForm.cpp b/src/StBaseForm.cpp index f9b9cbd..af85918 100644 --- a/src/StBaseForm.cpp +++ b/src/StBaseForm.cpp @@ -99,8 +99,8 @@ BaseForm::CreateTableView(void) if (pRelativeLayout != null) { pRelativeLayout->SetHorizontalFitPolicy(*__pTableView, FIT_POLICY_PARENT); - pRelativeLayout->SetRelation(*__pTableView, *this, RECT_EDGE_RELATION_TOP_TO_TOP); - pRelativeLayout->SetRelation(*__pTableView, *this, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM); + pRelativeLayout->SetRelation(*__pTableView, this, RECT_EDGE_RELATION_TOP_TO_TOP); + pRelativeLayout->SetRelation(*__pTableView, this, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM); delete pRelativeLayout; } } @@ -319,4 +319,4 @@ BaseForm::GetHeightForStringArea(const Tizen::Base::String source, int width, in } return dim.height * lineCount; -} \ No newline at end of file +} diff --git a/src/StBluetoothDetailForm.cpp b/src/StBluetoothDetailForm.cpp index 2b7022a..2c9bb39 100644 --- a/src/StBluetoothDetailForm.cpp +++ b/src/StBluetoothDetailForm.cpp @@ -212,8 +212,8 @@ BluetoothDetailForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); pItem->SetEnabled(false); relativeLayout.SetMargin(*pLabel, itemRectangle.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -313,8 +313,8 @@ BluetoothDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (isItemSubText) { Label* pSecondLabel = new (std::nothrow) Label(); @@ -338,8 +338,8 @@ BluetoothDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSecondLabel); relativeLayout.SetMargin(*pSecondLabel, 0, 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); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; @@ -471,4 +471,4 @@ BluetoothDetailForm::OnBluetoothPresentationModelEventCompletedN(BluetoothPresen { AppLogDebug("BluetoothPresentationModelEvent is unknown"); } -} \ No newline at end of file +} diff --git a/src/StBluetoothForm.cpp b/src/StBluetoothForm.cpp index c4f88dc..a7f2885 100644 --- a/src/StBluetoothForm.cpp +++ b/src/StBluetoothForm.cpp @@ -374,8 +374,8 @@ BluetoothForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectangle.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); + 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); pItem->SetEnabled(false); @@ -624,8 +624,8 @@ BluetoothForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemIconRect.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); delete pBitmap; } @@ -662,8 +662,8 @@ BluetoothForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) { relativeLayout.SetMargin(*pLabel, itemRectangle.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (isTwoLineItemText == true) { @@ -689,8 +689,8 @@ BluetoothForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSecondLabel); relativeLayout.SetMargin(*pSecondLabel, itemRectSecondLabel.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); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } if ((__groupIndexTranslateTable[ID_GROUP_TOTAL_COUNT] == groupIndex + ID_BLUETOOTH_COUNT_DEFAULT) @@ -1544,7 +1544,7 @@ BluetoothForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Ta AppLogDebug("pAnimation is null"); return; } - pItem->RemoveControl(*pAnimation); + pItem->RemoveControl(pAnimation); } } break; @@ -1721,4 +1721,4 @@ BluetoothForm::OnBluetoothPresentationModelEventCompletedN(BluetoothPresentation default: break; } -} \ No newline at end of file +} diff --git a/src/StBrightnessForm.cpp b/src/StBrightnessForm.cpp index 8723f2c..f7c57d2 100644 --- a/src/StBrightnessForm.cpp +++ b/src/StBrightnessForm.cpp @@ -153,8 +153,8 @@ BrightnessForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + 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); pItem->SetEnabled(false); @@ -197,8 +197,8 @@ BrightnessForm::CreateItem(int groupIndex, int itemIndex,int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } break; @@ -227,8 +227,8 @@ BrightnessForm::CreateItem(int groupIndex, int itemIndex,int itemWidth) pItem->AddControl(pSlider); relativeLayout.SetMargin(*pSlider, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0); - relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } break; @@ -357,4 +357,4 @@ BrightnessForm::OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::C void BrightnessForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status) { -} \ No newline at end of file +} diff --git a/src/StCertificateDetailForm.cpp b/src/StCertificateDetailForm.cpp index d705b1a..08a399d 100644 --- a/src/StCertificateDetailForm.cpp +++ b/src/StCertificateDetailForm.cpp @@ -196,8 +196,8 @@ CertificateDetailForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); pItem->SetEnabled(false); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -380,8 +380,8 @@ CertificateDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); Label* pSecondLabel = new (std::nothrow) Label(); result r = pSecondLabel->Construct(itemSubRectangle, itemSubText); @@ -400,8 +400,8 @@ CertificateDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->SetEnabled(false); pItem->AddControl(pSecondLabel); relativeLayout.SetMargin(*pSecondLabel, 0, 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); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -530,4 +530,4 @@ CertificateDetailForm::OnOrientationChanged(const Tizen::Ui::Control& source, Ti { __pTableView->RefreshItem(0, CERTIFICATE_DETAIL_ITEM_PUBLIC_KEY, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY); Invalidate(true); -} \ No newline at end of file +} diff --git a/src/StCertificateForm.cpp b/src/StCertificateForm.cpp index 4bc9dd2..8bb21fe 100644 --- a/src/StCertificateForm.cpp +++ b/src/StCertificateForm.cpp @@ -174,8 +174,8 @@ CertificateForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -227,8 +227,8 @@ CertificateForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StCertificateTrustedRootForm.cpp b/src/StCertificateTrustedRootForm.cpp index 2d8682b..92d5e35 100644 --- a/src/StCertificateTrustedRootForm.cpp +++ b/src/StCertificateTrustedRootForm.cpp @@ -234,8 +234,8 @@ CertificateTrustedRootForm::CreateItem(int groupIndex, int itemIndex, int itemWi pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StCertificateUserForm.cpp b/src/StCertificateUserForm.cpp index 021a2d6..b02d792 100644 --- a/src/StCertificateUserForm.cpp +++ b/src/StCertificateUserForm.cpp @@ -260,8 +260,8 @@ CertificateUserForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); Label* pSecondLabel = new (std::nothrow) Label(); result r = pSecondLabel->Construct(itemSubRectangle, itemSecondText); @@ -279,8 +279,8 @@ CertificateUserForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSecondLabel); relativeLayout.SetMargin(*pSecondLabel, 0, 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); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -552,4 +552,4 @@ CertificateUserForm::HideAlertPopup(void) __isPopupVisible = false; __installFromSDCardPopup->SetShowState(false); __installFromSDCardPopup->Invalidate(true); -} \ No newline at end of file +} diff --git a/src/StCertificateUserInstallForm.cpp b/src/StCertificateUserInstallForm.cpp index f65b40b..8543f87 100644 --- a/src/StCertificateUserInstallForm.cpp +++ b/src/StCertificateUserInstallForm.cpp @@ -227,8 +227,8 @@ CertificateUserInstallForm::CreateItem(int groupIndex, int itemIndex, int itemWi pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StCertificateUserInstallPasswordForm.cpp b/src/StCertificateUserInstallPasswordForm.cpp index b9428c6..c56ed64 100644 --- a/src/StCertificateUserInstallPasswordForm.cpp +++ b/src/StCertificateUserInstallPasswordForm.cpp @@ -214,8 +214,8 @@ CertificateUserInstallPasswordForm::CreateGroupItem(int groupIndex, int itemWidt pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -262,8 +262,8 @@ CertificateUserInstallPasswordForm::CreateItem(int groupIndex, int itemIndex, in pItem->SetIndividualSelectionEnabled(__pEditField, true); pItem->AddControl(__pEditField); relativeLayout.SetMargin(*__pEditField, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0); - relativeLayout.SetRelation(*__pEditField, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*__pEditField, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*__pEditField, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*__pEditField, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } break; @@ -277,8 +277,8 @@ CertificateUserInstallPasswordForm::CreateItem(int groupIndex, int itemIndex, in pItem->SetIndividualSelectionEnabled(pButton, true); pItem->AddControl(pButton); relativeLayout.SetMargin(*pButton, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0); - relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pButton, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pButton, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } break; @@ -292,8 +292,8 @@ CertificateUserInstallPasswordForm::CreateItem(int groupIndex, int itemIndex, in pItem->SetIndividualSelectionEnabled(pButton, true); pItem->AddControl(pButton); relativeLayout.SetMargin(*pButton, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0); - relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pButton, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pButton, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } break; @@ -523,4 +523,4 @@ CertificateUserInstallPasswordForm::HideUserInstallResultPopup(void) { __pInstallResultPopup->SetShowState(false); Invalidate(true); -} \ No newline at end of file +} diff --git a/src/StCertificateUserUnInstallForm.cpp b/src/StCertificateUserUnInstallForm.cpp index d81e740..3e68a6b 100644 --- a/src/StCertificateUserUnInstallForm.cpp +++ b/src/StCertificateUserUnInstallForm.cpp @@ -176,8 +176,8 @@ CertificateUserUnInstallForm::CreateItem(int groupIndex, int itemIndex, int item pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_RADIO_BUTTON_MARGIN, 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp index 318e735..ce847ca 100644 --- a/src/StDateTimeForm.cpp +++ b/src/StDateTimeForm.cpp @@ -298,8 +298,8 @@ DateTimeForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + 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); pItem->SetEnabled(false); @@ -594,8 +594,8 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) { 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (groupIndex == ID_GROUP_DATE_AND_TIME_FORMAT) { @@ -622,7 +622,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } pLabel = new (std::nothrow) Label(); @@ -634,8 +634,8 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else { @@ -674,8 +674,8 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) break; } - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; diff --git a/src/StDeveloperOptionForm.cpp b/src/StDeveloperOptionForm.cpp index 3b1d7e8..e10d1ac 100644 --- a/src/StDeveloperOptionForm.cpp +++ b/src/StDeveloperOptionForm.cpp @@ -304,8 +304,8 @@ DeveloperOptionForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, 0, 0, 0, 0); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -360,8 +360,8 @@ DeveloperOptionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StDisplayForm.cpp b/src/StDisplayForm.cpp index f5265b9..45c4ad7 100644 --- a/src/StDisplayForm.cpp +++ b/src/StDisplayForm.cpp @@ -205,8 +205,8 @@ DisplayForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -317,8 +317,8 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) break; } relativeLayout.SetMargin(*pLabel, leftMargin, rightMargin, 0, 0); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (pBitmap) { @@ -334,7 +334,7 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pLabel = new (std::nothrow) Label(); pLabel->Construct(itemSubRectangle, subText); @@ -345,8 +345,8 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; diff --git a/src/StDownloadedApplicationForm.cpp b/src/StDownloadedApplicationForm.cpp index 4eaa2cf..8805918 100644 --- a/src/StDownloadedApplicationForm.cpp +++ b/src/StDownloadedApplicationForm.cpp @@ -178,8 +178,8 @@ DownloadedApplicationForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectangle.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -239,8 +239,8 @@ DownloadedApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWid pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StEventsNotificationForm.cpp b/src/StEventsNotificationForm.cpp index 45c1214..5d0506d 100644 --- a/src/StEventsNotificationForm.cpp +++ b/src/StEventsNotificationForm.cpp @@ -154,8 +154,8 @@ NotificationForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -213,8 +213,8 @@ NotificationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StFontForm.cpp b/src/StFontForm.cpp index 50b5094..e8a03d2 100644 --- a/src/StFontForm.cpp +++ b/src/StFontForm.cpp @@ -290,8 +290,8 @@ FontForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -348,7 +348,7 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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_LEFT_TO_LEFT); if (groupIndex == ID_GROUP_FONT) { @@ -373,12 +373,12 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabelArrow); 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); + relativeLayout.SetRelation(*pLabelArrow, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pLabelArrow, RECT_EDGE_RELATION_RIGHT_TO_LEFT); } else { - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } pLabel = new (std::nothrow) Label(); @@ -390,8 +390,8 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else { @@ -410,8 +410,8 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } if ((appControlRequest = GetAppControlRequest()) != APPCONTROL_DEFAULT) @@ -830,4 +830,4 @@ void FontForm::SetAppControlRequest(char requestStatus) { __isAppControlRequest = requestStatus; -} \ No newline at end of file +} diff --git a/src/StFontSizeForm.cpp b/src/StFontSizeForm.cpp index 0d4bf36..93bf5bd 100644 --- a/src/StFontSizeForm.cpp +++ b/src/StFontSizeForm.cpp @@ -247,8 +247,8 @@ FontSizeForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); pItem->SetEnabled(false); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -355,8 +355,8 @@ FontSizeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StHomeAndLockScreenForm.cpp b/src/StHomeAndLockScreenForm.cpp index a89e4a5..dadd70b 100644 --- a/src/StHomeAndLockScreenForm.cpp +++ b/src/StHomeAndLockScreenForm.cpp @@ -177,8 +177,8 @@ HomeAndLockScreenForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -227,8 +227,8 @@ HomeAndLockScreenForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (groupIndex == ID_GROUP_SCREEN_TYPE) { @@ -240,8 +240,8 @@ HomeAndLockScreenForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; } diff --git a/src/StKeyboardForm.cpp b/src/StKeyboardForm.cpp index c4a84f1..946aa10 100644 --- a/src/StKeyboardForm.cpp +++ b/src/StKeyboardForm.cpp @@ -194,8 +194,8 @@ KeyboardForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -292,8 +292,8 @@ KeyboardForm::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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StKeyboardInfoForm.cpp b/src/StKeyboardInfoForm.cpp index 6c79c87..9cba931 100644 --- a/src/StKeyboardInfoForm.cpp +++ b/src/StKeyboardInfoForm.cpp @@ -262,8 +262,8 @@ KeyboardInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->SetIndividualSelectionEnabled(pLabel, true); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp index e4c6e62..988924f 100644 --- a/src/StLanguageAndRegionForm.cpp +++ b/src/StLanguageAndRegionForm.cpp @@ -760,8 +760,8 @@ LocaleForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -894,8 +894,8 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pLabel = new (std::nothrow) Label(); pLabel->Construct(itemSubRectangle, itemSubText); @@ -906,8 +906,8 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else { @@ -925,8 +925,8 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; @@ -957,6 +957,11 @@ LocaleForm::DeleteItem(int groupIndex, int itemIndex, TableViewItem* pItem) void LocaleForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status) { + if (__isRunningAppControl == true) + { + return; + } + SceneManager* pSceneManager = SceneManager::GetInstance(); AppAssert(pSceneManager); @@ -966,18 +971,12 @@ LocaleForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTable { case ID_GROUP_LANGUAGE_AND_REGION_MAIN: { - if (__isRunningAppControl == true) - { - return; - } if (itemIndex == ID_ITEM_LANGUAGE_AND_REGION_MAIN_DISPLAY_LANGUAGE) { - // TODO: Set display language. does not yet support pSceneManager->GoForward(ForwardSceneTransition(IDSCN_LOCALE_LANGUAGE, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), __languageDataList); } if (itemIndex == ID_ITEM_LANGUAGE_AND_REGION_MAIN_REGION) { - // TODO: Set region. does not yet support pSceneManager->GoForward(ForwardSceneTransition(IDSCN_LOCALE_REGION, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), null); } } @@ -988,12 +987,6 @@ LocaleForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTable #if 0 pSceneManager->GoForward(ForwardSceneTransition(IDSCN_KEYBOARD, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), null); #else - - if (__isRunningAppControl == true) - { - return; - } - if (AppControl::FindAndStart(L"http://tizen.org/appcontrol/operation/setting/ime", null, null, null, null, null) == E_SUCCESS) { __isRunningAppControl = true; @@ -1352,4 +1345,4 @@ LocaleForm::OnFocusGained(const Tizen::Ui::Control& source) void LocaleForm::OnFocusLost(const Tizen::Ui::Control& source) { -} \ No newline at end of file +} diff --git a/src/StLanguageForm.cpp b/src/StLanguageForm.cpp index 4243ee6..b92cf92 100644 --- a/src/StLanguageForm.cpp +++ b/src/StLanguageForm.cpp @@ -174,8 +174,8 @@ LocaleLanguageForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -220,8 +220,8 @@ LocaleLanguageForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StLocationForm.cpp b/src/StLocationForm.cpp index dc15fc0..17487b0 100644 --- a/src/StLocationForm.cpp +++ b/src/StLocationForm.cpp @@ -258,8 +258,8 @@ LocationForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -337,8 +337,8 @@ LocationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp index 2e8f8bf..2772160 100644 --- a/src/StMainMenuForm.cpp +++ b/src/StMainMenuForm.cpp @@ -342,8 +342,8 @@ MainMenuForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -626,8 +626,8 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) { 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; @@ -658,6 +658,12 @@ MainMenuForm::DeleteItem(int groupIndex, int itemIndex, TableViewItem* pItem) void MainMenuForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status) { + if (__isRunningAppControl) + { + AppLogDebug("busy status"); + return; + } + SceneManager* pSceneManager = SceneManager::GetInstance(); AppAssert(pSceneManager); @@ -695,7 +701,10 @@ MainMenuForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab pExtraData->Add(new (std::nothrow) String(L"caller"), new (std::nothrow) String(L"osp-setting")); - pAppControl->Start(null, null, pExtraData, null); + if (pAppControl->Start(null, null, pExtraData, null) == E_SUCCESS) + { + __isRunningAppControl = true; + } delete pAppControl; delete pExtraData; @@ -1034,10 +1043,11 @@ MainMenuForm::FindAppControlScene(int itemIndex) if (pAppControl) { - pAppControl->Start(pDataList, null); + if (pAppControl->Start(pDataList, null) == E_SUCCESS) + { + __isRunningAppControl = true; + } delete pAppControl; - - __isRunningAppControl = true; } } @@ -1104,4 +1114,4 @@ MainMenuForm::OnFocusGained(const Tizen::Ui::Control& source) void MainMenuForm::OnFocusLost(const Tizen::Ui::Control& source) { -} \ No newline at end of file +} diff --git a/src/StManageApplicationForm.cpp b/src/StManageApplicationForm.cpp index b8eb3c2..e857348 100644 --- a/src/StManageApplicationForm.cpp +++ b/src/StManageApplicationForm.cpp @@ -336,8 +336,8 @@ ManageApplicationForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); pItem->SetEnabled(false); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -390,8 +390,8 @@ ManageApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); delete pBitmap; return pItem; } diff --git a/src/StManageApplicationInfoForm.cpp b/src/StManageApplicationInfoForm.cpp index ffc9428..4de12de 100644 --- a/src/StManageApplicationInfoForm.cpp +++ b/src/StManageApplicationInfoForm.cpp @@ -294,8 +294,8 @@ ManageApplicationInfoForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); pItem->SetEnabled(false); relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -543,8 +543,8 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (isItemSubText == true) { @@ -557,8 +557,8 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } } return pItem; diff --git a/src/StMemoryForm.cpp b/src/StMemoryForm.cpp index 16a195d..befcf41 100644 --- a/src/StMemoryForm.cpp +++ b/src/StMemoryForm.cpp @@ -151,8 +151,8 @@ MemoryForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -192,8 +192,8 @@ MemoryForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StMemoryStatusForm.cpp b/src/StMemoryStatusForm.cpp index 4447431..221be7d 100644 --- a/src/StMemoryStatusForm.cpp +++ b/src/StMemoryStatusForm.cpp @@ -199,8 +199,8 @@ MemoryStatusForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -314,8 +314,8 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (isItemSubText == true) { @@ -340,8 +340,8 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSecondLabel); 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); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; @@ -520,4 +520,4 @@ MemoryStatusForm::IsSdMounted(void) return true; } return false; -} \ No newline at end of file +} diff --git a/src/StMoreConnectivityForm.cpp b/src/StMoreConnectivityForm.cpp index 86ff3b5..f2883fd 100644 --- a/src/StMoreConnectivityForm.cpp +++ b/src/StMoreConnectivityForm.cpp @@ -179,8 +179,8 @@ MoreConnectivityForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectangle.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -289,8 +289,8 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemLabelRect.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else { @@ -310,8 +310,8 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemIconLabelRect.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (checkSecondText == true) { @@ -324,8 +324,8 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemSecondLineTextRect.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } } diff --git a/src/StMoreSystemForm.cpp b/src/StMoreSystemForm.cpp index ac3b4ea..f042a8f 100644 --- a/src/StMoreSystemForm.cpp +++ b/src/StMoreSystemForm.cpp @@ -168,8 +168,8 @@ MoreSystemForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectangle.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -275,8 +275,8 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) { relativeLayout.SetMargin(*pLabel, itemRectLabel.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else { @@ -303,8 +303,8 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) { relativeLayout.SetMargin(*pLabel, itemRectLabel.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; diff --git a/src/StNetworkForm.cpp b/src/StNetworkForm.cpp index f53e66a..968a6b5 100644 --- a/src/StNetworkForm.cpp +++ b/src/StNetworkForm.cpp @@ -254,8 +254,8 @@ NetworkForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -392,8 +392,8 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) { 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StNfcForm.cpp b/src/StNfcForm.cpp index 338fa78..6ef6872 100644 --- a/src/StNfcForm.cpp +++ b/src/StNfcForm.cpp @@ -263,8 +263,8 @@ NfcForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); pItem->SetEnabled(false); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -354,8 +354,8 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (groupIndex == ID_GROUP_NFC_PREDEFINED_ITEM) { @@ -380,8 +380,8 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSecondLineLabel); 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); + relativeLayout.SetRelation(*pSecondLineLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSecondLineLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; } diff --git a/src/StNfcPredefinedItemForm.cpp b/src/StNfcPredefinedItemForm.cpp index 612bdce..228cd39 100644 --- a/src/StNfcPredefinedItemForm.cpp +++ b/src/StNfcPredefinedItemForm.cpp @@ -176,8 +176,8 @@ NfcPredefinedItemForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); pItem->SetEnabled(false); relativeLayout.SetMargin(*pLabel, itemMainText.x, 0, 0, 0); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -249,8 +249,8 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) { relativeLayout.SetMargin(*pLabel, itemMainRectangle.x + RELATIVE_LAYOUT_LEFT_MARGIN, 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (groupIndex == ID_GROUP_NFC_PREDEFINED_ITEM) { @@ -275,8 +275,8 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSecondLineLabel); 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); + relativeLayout.SetRelation(*pSecondLineLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSecondLineLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; @@ -414,4 +414,4 @@ NfcPredefinedItemForm::SelectItemCheckIndex(int itemIndex) __pTableView->Invalidate(true); __pTableView->RefreshItem(ID_GROUP_NFC_PREDEFINED_ITEM, ID_GROUP_ITEM_NFC_PREDEFINED_ITEM, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY); -} \ No newline at end of file +} diff --git a/src/StPrivacyDetailForm.cpp b/src/StPrivacyDetailForm.cpp index 33ff172..4acbbf2 100644 --- a/src/StPrivacyDetailForm.cpp +++ b/src/StPrivacyDetailForm.cpp @@ -200,8 +200,8 @@ PrivacyDetailForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -240,8 +240,8 @@ PrivacyDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StPrivacyForm.cpp b/src/StPrivacyForm.cpp index 8e2b082..edec971 100644 --- a/src/StPrivacyForm.cpp +++ b/src/StPrivacyForm.cpp @@ -289,8 +289,8 @@ PrivacyForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -335,7 +335,7 @@ PrivacyForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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_LEFT_TO_LEFT); pLabel = new (std::nothrow) Label(); pLabel->Construct(itemSubRectangle, itemSubText); @@ -346,8 +346,8 @@ PrivacyForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StRegionForm.cpp b/src/StRegionForm.cpp index 3147535..4159e4c 100644 --- a/src/StRegionForm.cpp +++ b/src/StRegionForm.cpp @@ -93,8 +93,8 @@ LocaleRegionForm::CreateTableView(void) pRelativeLayout->SetHorizontalFitPolicy(*__pSearchBar, FIT_POLICY_PARENT); pRelativeLayout->SetVerticalFitPolicy(*__pSearchBar, FIT_POLICY_FIXED); pRelativeLayout->SetHorizontalFitPolicy(*__pTableView, FIT_POLICY_PARENT); - pRelativeLayout->SetRelation(*__pTableView, *__pSearchBar, RECT_EDGE_RELATION_TOP_TO_BOTTOM); - pRelativeLayout->SetRelation(*__pTableView, *this, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM); + pRelativeLayout->SetRelation(*__pTableView, __pSearchBar, RECT_EDGE_RELATION_TOP_TO_BOTTOM); + pRelativeLayout->SetRelation(*__pTableView, this, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM); delete pRelativeLayout; } } @@ -300,8 +300,8 @@ LocaleRegionForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -355,8 +355,8 @@ LocaleRegionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -548,4 +548,4 @@ LocaleRegionForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui: default: break; } -} \ No newline at end of file +} diff --git a/src/StResetForm.cpp b/src/StResetForm.cpp index c7aee1b..6b3489c 100644 --- a/src/StResetForm.cpp +++ b/src/StResetForm.cpp @@ -188,8 +188,8 @@ ResetterForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -250,8 +250,8 @@ ResetterForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StResetSettingForm.cpp b/src/StResetSettingForm.cpp index a7d945a..8a5213c 100644 --- a/src/StResetSettingForm.cpp +++ b/src/StResetSettingForm.cpp @@ -349,8 +349,8 @@ ResetterSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StScreenTypeForm.cpp b/src/StScreenTypeForm.cpp index 4ef9ec8..6809007 100644 --- a/src/StScreenTypeForm.cpp +++ b/src/StScreenTypeForm.cpp @@ -203,8 +203,8 @@ ScreenTypeForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -243,8 +243,8 @@ ScreenTypeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StSecurityForm.cpp b/src/StSecurityForm.cpp index 183526f..46d9fcf 100644 --- a/src/StSecurityForm.cpp +++ b/src/StSecurityForm.cpp @@ -270,8 +270,8 @@ SecurityForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -384,8 +384,8 @@ SecurityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StSoundsForm.cpp b/src/StSoundsForm.cpp index 4a6feba..36b96bb 100644 --- a/src/StSoundsForm.cpp +++ b/src/StSoundsForm.cpp @@ -141,7 +141,7 @@ SoundsForm::OnInitializing(void) SettingInfo::GetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, __systemVolume); SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_MEDIA_VOLUME, 15); - SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, 0); + SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, 15); __pSoundPlay = new (std::nothrow) Player(); r = __pSoundPlay->Construct(*this); @@ -381,8 +381,8 @@ SoundsForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -476,8 +476,8 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else { @@ -507,8 +507,8 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } } @@ -568,8 +568,8 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSlider); pItem->SetIndividualSelectionEnabled(pSlider, true); - relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else { @@ -674,8 +674,8 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSlider); pItem->SetIndividualSelectionEnabled(pSlider, true); - relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); __pTableView->SetItemEnabled(groupIndex, itemIndex, false); } @@ -1056,7 +1056,7 @@ SoundsForm::OnFocusGained(const Tizen::Ui::Control& source) SettingInfo::GetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, __systemVolume); SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_MEDIA_VOLUME, 15); - SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, 0); + SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, 15); } void diff --git a/src/StTimeZoneForm.cpp b/src/StTimeZoneForm.cpp index 90336b3..0daca3f 100644 --- a/src/StTimeZoneForm.cpp +++ b/src/StTimeZoneForm.cpp @@ -157,8 +157,8 @@ TimeZoneForm::CreateTableView(void) pRelativeLayout->SetHorizontalFitPolicy(*__pSearchBar, FIT_POLICY_PARENT); pRelativeLayout->SetVerticalFitPolicy(*__pSearchBar, FIT_POLICY_FIXED); pRelativeLayout->SetHorizontalFitPolicy(*__pTableView, FIT_POLICY_PARENT); - pRelativeLayout->SetRelation(*__pTableView, *__pSearchBar, RECT_EDGE_RELATION_TOP_TO_BOTTOM); - pRelativeLayout->SetRelation(*__pTableView, *this, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM); + pRelativeLayout->SetRelation(*__pTableView, __pSearchBar, RECT_EDGE_RELATION_TOP_TO_BOTTOM); + pRelativeLayout->SetRelation(*__pTableView, this, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM); delete pRelativeLayout; } } @@ -338,8 +338,8 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } else { @@ -399,9 +399,9 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSecLabel); relativeLayout.SetHorizontalFitPolicy(*pSecLabel, FIT_POLICY_FIXED); - relativeLayout.SetRelation(*pSecLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pSecLabel, RECT_EDGE_RELATION_RIGHT_TO_LEFT); + relativeLayout.SetRelation(*pSecLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pSecLabel, RECT_EDGE_RELATION_RIGHT_TO_LEFT); pLabel = new (std::nothrow) Label(); pLabel->Construct(itemSubRectangle, itemSubText); @@ -412,8 +412,8 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); 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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; @@ -750,4 +750,4 @@ Tizen::Base::Integer TimeZoneData::GetGMTData(void) const { return _timeZoneGMT; -} \ No newline at end of file +} diff --git a/src/StWallpaperAlbumListDetailForm.cpp b/src/StWallpaperAlbumListDetailForm.cpp index 69cea46..e32a1b8 100644 --- a/src/StWallpaperAlbumListDetailForm.cpp +++ b/src/StWallpaperAlbumListDetailForm.cpp @@ -314,10 +314,11 @@ WallpaperAlbumListDetailForm::OnIconListViewItemStateChanged(IconListView& view, AppControl* pAc = AppManager::FindAppControlN(IMAGE_VIEWER_APP_ID, IMAGE_VIEWER_CROP_OPERATION_ID); if (pAc) { - pAc->Start(&uri, null, &extraData, this); + if (pAc->Start(&uri, null, &extraData, this) == E_SUCCESS) + { + __isRunningAppControl = true; + } delete pAc; - - __isRunningAppControl = true; } } diff --git a/src/StWallpaperForm.cpp b/src/StWallpaperForm.cpp index c33abf8..9c63992 100644 --- a/src/StWallpaperForm.cpp +++ b/src/StWallpaperForm.cpp @@ -150,8 +150,8 @@ WallpaperForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectangle.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -209,8 +209,8 @@ WallpaperForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, 0, 0, 0, 0); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StWifiApDetailForm.cpp b/src/StWifiApDetailForm.cpp index 4e2c962..23277d8 100644 --- a/src/StWifiApDetailForm.cpp +++ b/src/StWifiApDetailForm.cpp @@ -298,8 +298,8 @@ WifiApDetailForm::CreateGroupItem(int groupIndex, int itemWidth) pLabel->SetTextColor(itemLableTextColor); relativeLayout.SetMargin(*pLabel, itemRectLable.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->AddControl(pLabel); } @@ -573,8 +573,8 @@ WifiApDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectangle.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (isTwoLineItemText == true) { @@ -610,8 +610,8 @@ WifiApDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSecondLabel); relativeLayout.SetMargin(*pSecondLabel, itemRectSecondLabel.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); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } if (__wifiApConnectCheck == true) @@ -974,4 +974,4 @@ WifiApDetailForm::OnWifiPresentationModelEventCompleted(WifiPresentationModelEve default: break; } -} \ No newline at end of file +} diff --git a/src/StWifiConnectionForm.cpp b/src/StWifiConnectionForm.cpp index ae9215d..079f8fa 100644 --- a/src/StWifiConnectionForm.cpp +++ b/src/StWifiConnectionForm.cpp @@ -187,8 +187,8 @@ WifiConnectionForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectLable.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; @@ -357,8 +357,8 @@ WifiConnectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) { relativeLayout.SetMargin(*pLabel, itemRectLable.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; diff --git a/src/StWifiDirectConnectionForm.cpp b/src/StWifiDirectConnectionForm.cpp index 40bb48e..f4d3315 100644 --- a/src/StWifiDirectConnectionForm.cpp +++ b/src/StWifiDirectConnectionForm.cpp @@ -457,8 +457,8 @@ WifiDirectConnectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidt pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemIconLabelRect.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } diff --git a/src/StWifiDirectForm.cpp b/src/StWifiDirectForm.cpp index b2ababd..43db469 100644 --- a/src/StWifiDirectForm.cpp +++ b/src/StWifiDirectForm.cpp @@ -558,8 +558,8 @@ WifiDirectForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectangle.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); pItem->SetEnabled(false); return pItem; @@ -814,8 +814,8 @@ WifiDirectForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectangle.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); if (isTwoLineItemText) { @@ -827,8 +827,8 @@ WifiDirectForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSecondLabel); relativeLayout.SetMargin(*pLabel, itemRectSecondLabel.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } if (isCreaetInProgressAnimation) diff --git a/src/StWifiForm.cpp b/src/StWifiForm.cpp index 18024a2..2dfae8f 100644 --- a/src/StWifiForm.cpp +++ b/src/StWifiForm.cpp @@ -374,8 +374,8 @@ WifiForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->AddControl(pLabel); relativeLayout.SetMargin(*pLabel, itemRectLabel.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); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); return pItem; } @@ -610,8 +610,8 @@ WifiForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) { relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0); } - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } if (isTwoLineItemText == true) @@ -637,8 +637,8 @@ WifiForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pSecondLabel); relativeLayout.SetMargin(*pSecondLabel, itemRectSecondLabel.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); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pSecondLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } if (isButton == true) @@ -655,8 +655,8 @@ WifiForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) pItem->AddControl(pButton); relativeLayout.SetMargin(*pButton, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0); - relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); - relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); + relativeLayout.SetRelation(*pButton, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT); + relativeLayout.SetRelation(*pButton, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT); } return pItem; @@ -1206,4 +1206,4 @@ WifiForm::OnWifiPresentationModelEventCompleted(WifiPresentationModelEvent reque default: break; } -} \ No newline at end of file +} -- 2.7.4