From 7331b18fa90888c519f37ed1a4125862d922dc9b Mon Sep 17 00:00:00 2001 From: SungWan Kim Date: Tue, 2 Apr 2013 16:52:11 +0900 Subject: [PATCH] Adjust layout of popups and EventDetailsForm. Change-Id: Idac8dfe478591432a291a56561b499d9ca32f33d Signed-off-by: SungWan Kim --- .../IDL_CALENDAR_SELECTOR_POPUP.xml | 10 ++--- res/screen-size-normal/IDL_GO_TO_DATE_POPUP.xml | 12 +++--- res/screen-size-normal/IDL_SHARE_POPUP.xml | 12 +++--- res/screen-size-normal/IDL_THREE_BUTTON_POPUP.xml | 32 +++++++-------- res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml | 18 ++++----- src/ClEventDetailsForm.cpp | 45 ++++++++++++++++++---- 6 files changed, 79 insertions(+), 50 deletions(-) diff --git a/res/screen-size-normal/IDL_CALENDAR_SELECTOR_POPUP.xml b/res/screen-size-normal/IDL_CALENDAR_SELECTOR_POPUP.xml index c808891..3208037 100644 --- a/res/screen-size-normal/IDL_CALENDAR_SELECTOR_POPUP.xml +++ b/res/screen-size-normal/IDL_CALENDAR_SELECTOR_POPUP.xml @@ -8,16 +8,16 @@ - + - - + + diff --git a/res/screen-size-normal/IDL_GO_TO_DATE_POPUP.xml b/res/screen-size-normal/IDL_GO_TO_DATE_POPUP.xml index b98fc6b..c31e70d 100644 --- a/res/screen-size-normal/IDL_GO_TO_DATE_POPUP.xml +++ b/res/screen-size-normal/IDL_GO_TO_DATE_POPUP.xml @@ -7,8 +7,8 @@ - - + + @@ -17,12 +17,12 @@ diff --git a/res/screen-size-normal/IDL_SHARE_POPUP.xml b/res/screen-size-normal/IDL_SHARE_POPUP.xml index b86df3f..5384ddc 100644 --- a/res/screen-size-normal/IDL_SHARE_POPUP.xml +++ b/res/screen-size-normal/IDL_SHARE_POPUP.xml @@ -6,17 +6,17 @@ - - + + - - + + diff --git a/res/screen-size-normal/IDL_THREE_BUTTON_POPUP.xml b/res/screen-size-normal/IDL_THREE_BUTTON_POPUP.xml index b4aff5d..cf23b1b 100755 --- a/res/screen-size-normal/IDL_THREE_BUTTON_POPUP.xml +++ b/res/screen-size-normal/IDL_THREE_BUTTON_POPUP.xml @@ -6,27 +6,27 @@ - - + + - - + diff --git a/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml b/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml index 990b5be..7fc1e68 100644 --- a/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml +++ b/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml @@ -6,22 +6,22 @@ - - + + diff --git a/src/ClEventDetailsForm.cpp b/src/ClEventDetailsForm.cpp index e2e7c64..f87aa6a 100644 --- a/src/ClEventDetailsForm.cpp +++ b/src/ClEventDetailsForm.cpp @@ -55,6 +55,10 @@ enum INFORMATION_CONTENT_ITEM_DESCRIPTION = 0, INFORMATION_CONTENT_ITEM_LOCATION, INFORMATION_CONTENT_ITEM_COUNT, + INFORMATION_CONTENT_ITEM_COUNT_WITHOUT_LOCATION = INFORMATION_CONTENT_ITEM_LOCATION, + + INFORMATION_CONTENT_ITEM_LOCATION_WITHOUT_DESCRIPTION = 0, + INFORMATION_CONTENT_ITEM_COUNT_WITHOUT_DESCRIPTION, ADDITIONAL_CONTENT_ITEM_REMINDER = 0, ADDITIONAL_CONTENT_ITEM_REPEAT, @@ -292,7 +296,22 @@ EventDetailsForm::GetItemCount(int sectionIndex) case GROUP_MAIN_CONTENT: return MAIN_CONTENT_ITEM_COUNT; case GROUP_INFORMATION_CONTENT: - return INFORMATION_CONTENT_ITEM_COUNT; + if (__pPm->GetDescription().IsEmpty() == false) + { + if (__pPm->GetLocation().IsEmpty() == false) + { + return INFORMATION_CONTENT_ITEM_COUNT; + } + else + { + return INFORMATION_CONTENT_ITEM_COUNT_WITHOUT_LOCATION; + } + } + else if (__pPm->GetLocation().IsEmpty() == false) + { + return INFORMATION_CONTENT_ITEM_COUNT_WITHOUT_DESCRIPTION; + } + break; case GROUP_ADDITIONAL_CONTENT: return ADDITIONAL_CONTENT_ITEM_COUNT; case GROUP_SAVE_TO: @@ -315,14 +334,24 @@ EventDetailsForm::CreateItem(int sectionIndex, int itemIndex, int itemWidth) } break; case GROUP_INFORMATION_CONTENT: - switch (itemIndex) + if (__pPm->GetDescription().IsEmpty() == false) { - case INFORMATION_CONTENT_ITEM_DESCRIPTION: - pItem = CreateDescriptionItemN(itemWidth, __pPm->GetDescription()); - break; - case INFORMATION_CONTENT_ITEM_LOCATION: - pItem = CreateLocationItemN(itemWidth, __pPm->GetLocation()); - break; + switch (itemIndex) + { + case INFORMATION_CONTENT_ITEM_DESCRIPTION: + pItem = CreateDescriptionItemN(itemWidth, __pPm->GetDescription()); + break; + case INFORMATION_CONTENT_ITEM_LOCATION: + pItem = CreateLocationItemN(itemWidth, __pPm->GetLocation()); + break; + } + } + else + { + if (itemIndex == INFORMATION_CONTENT_ITEM_LOCATION_WITHOUT_DESCRIPTION) + { + pItem = CreateLocationItemN(itemWidth, __pPm->GetLocation()); + } } break; case GROUP_ADDITIONAL_CONTENT: -- 2.7.4