Modify GUI issues.

Change-Id: Id82c45e98350cefb7f185eeb21a2fe8024a6c596
Signed-off-by: SungWan Kim <sw0726.kim@samsung.com>

diff --git a/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml b/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml
index 5658423..990b5be 100644 (file)
--- a/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml
+++ b/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml
@@ -15,7 +15,7 @@
         <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="" centerVertical="false" height="135" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_TWO_BUTTON_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="114" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_TWO_BUTTON_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_TWO_BUTTON_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="576" x="0" y="0"/>
     </Label>
     <Button id="IDC_BUTTON_DELETE" parent="IDL_TWO_BUTTON_POPUP">
-        <property disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_CLD_SK3_DELETE" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
+        <property disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="#C24747" highlightedColorOpacity="100" highlightedTextColor="#FFFFFF" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#D05252" normalColorOpacity="100" normalTextColor="#FFFFFF" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="#C24747" pressedColorOpacity="100" pressedTextColor="#FFFFFF" text="::IDS_CLD_SK3_DELETE" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_TWO_BUTTON_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="278" x="0" y="178"/>
         <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_TWO_BUTTON_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="278" x="0" y="178"/>
     </Button>

diff --git a/src/ClEventDetailsForm.cpp b/src/ClEventDetailsForm.cpp
index d31601f..911cb28 100644 (file)
--- a/src/ClEventDetailsForm.cpp
+++ b/src/ClEventDetailsForm.cpp
@@ -69,7 +69,6 @@ static const int IDA_EVENT_DETAILS_FORM_SHARE = 60003;
 static const int IDA_EVENT_DETAILS_FORM_ADD_TO_CALENDAR = 60004;
 static const int IDA_DETAIL_FORM_FOOTER_SUB_MENU = 60010;
 
-static const unsigned int COLOR_ITEM_BACKGROUND = Color32<232, 232, 232>::Value;
 static const int H_ITEM = 140;
 static const int H_MAIN_ITEM = 313;
 static const int Y_MAIN_ITEM_SUBJECT = 18;
@@ -609,7 +608,6 @@ EventDetailsForm::CreateMainItemN(int itemWidth, const String& title, const Date
 {
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, H_MAIN_ITEM));
-       pItem->SetBackgroundColor(Color(COLOR_ITEM_BACKGROUND));
        pItem->SetEnabled(false);
 
        int y = Y_MAIN_ITEM_SUBJECT;
@@ -766,7 +764,6 @@ EventDetailsForm::CreateDescriptionItemN(int itemWidth, const String& descriptio
                }
 
                pItem->Construct(Dimension(itemWidth, itemHeight));
-               pItem->SetBackgroundColor(Color(COLOR_ITEM_BACKGROUND));
                pItem->SetEnabled(false);
 
                Label* pLabelDescription = new (std::nothrow) Label();
@@ -799,7 +796,6 @@ EventDetailsForm::CreateLocationItemN(int itemWidth, const String& location)
        if (location.IsEmpty() != true)
        {
                pItem->Construct(Dimension(itemWidth, H_ITEM));
-               pItem->SetBackgroundColor(Color(COLOR_ITEM_BACKGROUND));
                pItem->SetEnabled(false);
 
                Label* pLabelLocation = new (std::nothrow) Label();
@@ -832,7 +828,6 @@ EventDetailsForm::CreateReminderItemN(int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, height));
-       pItem->SetBackgroundColor(Color(COLOR_ITEM_BACKGROUND));
        pItem->SetEnabled(false);
 
        Label* pLabelReminder = new (std::nothrow) Label();
@@ -866,7 +861,6 @@ EventDetailsForm::CreateRepeatItemN(int itemWidth, const String& repeat)
 {
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, H_REPEAT_ITEM));
-       pItem->SetBackgroundColor(Color(COLOR_ITEM_BACKGROUND));
        pItem->SetEnabled(false);
 
        Label* pLabelRepeat = new (std::nothrow) Label();
@@ -893,7 +887,6 @@ EventDetailsForm::CreateSaveToItemN(int itemWidth, const String& accountName, co
 {
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, H_SAVE_TO_ITEM));
-       pItem->SetBackgroundColor(Color(COLOR_ITEM_BACKGROUND));
        pItem->SetEnabled(false);
 
        int x = 0;

diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp
index 3fd7a24..1b5c5e5 100644 (file)
--- a/src/ClEventEditorForm.cpp
+++ b/src/ClEventEditorForm.cpp
@@ -84,7 +84,7 @@ static const int IDA_EVENT_EDITOR_FORM_REMOVE_REMINDER5 = 20105;
 
 static const int H_ITEM = 112;
 static const int H_ITEM_2LINE = 136;
-static const unsigned int COLOR_ITEM_BACKGROUND = Color32<232, 232, 232>::Value;
+static const unsigned int COLOR_ITEM_BACKGROUND = Color32<239, 237, 229>::Value;
 static const unsigned int COLOR_BLANK_BACKGROUND = Color32<0, 0, 0, 0>::Value;
 static const int Y_ITEM_CONTENT01 = 22;
 static const int H_ITEM_CONTENT01 = 38;

diff --git a/src/ClEventSearcherForm.cpp b/src/ClEventSearcherForm.cpp
index 7e72f6c..a0cf765 100644 (file)
--- a/src/ClEventSearcherForm.cpp
+++ b/src/ClEventSearcherForm.cpp
@@ -52,6 +52,9 @@ static const unsigned int COLOR_GROUP_ITEM_TODAY_BACKGROUND = Color32<239, 236,
 static const unsigned int COLOR_GROUP_ITEM_TEXT = Color32<128, 128, 128>::Value;
 static const unsigned int COLOR_GROUP_ITEM_TODAY_TEXT = Color32<59, 115, 182>::Value;
 static const unsigned int COLOR_ITEM_TODAY_BACKGROUND = Color32<239, 236, 224>::Value;
+static const unsigned int COLOR_ITEM_DELETE_TEXT = Color32<255, 255, 255>::Value;
+static const unsigned int COLOR_ITEM_DELETE_BACKGROUND = Color32<208, 82, 82>::Value;
+static const unsigned int COLOR_ITEM_DELETE_PRESSED_BACKGROUND = Color32<194, 71, 71>::Value;
 
 
 EventSearcherForm::EventSearcherForm(void)
@@ -277,6 +280,10 @@ EventSearcherForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                                 ResourceManager::GetString(IDS_COM_SK4_SHARE), true);
                pContextItem->AddElement(IDA_EVENT_SEARCHER_CONTEXT_MENU_DELETE,
                                                                 ResourceManager::GetString(IDS_CLD_SK3_DELETE), true);
+               pContextItem->SetElementBackgroundColor(IDA_EVENT_SEARCHER_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_NORMAL, Color(COLOR_ITEM_DELETE_BACKGROUND));
+               pContextItem->SetElementBackgroundColor(IDA_EVENT_SEARCHER_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_PRESSED, Color(COLOR_ITEM_DELETE_PRESSED_BACKGROUND));
+               pContextItem->SetElementBackgroundColor(IDA_EVENT_SEARCHER_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_HIGHLIGHTED, Color(COLOR_ITEM_DELETE_PRESSED_BACKGROUND));
+               pContextItem->SetElementTextColor(IDA_EVENT_SEARCHER_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_NORMAL, Color(COLOR_ITEM_DELETE_TEXT));
 
                __pContextItem = pContextItem;
        }

diff --git a/src/ClListPanel.cpp b/src/ClListPanel.cpp
index d4c75ec..bbd743b 100644 (file)
--- a/src/ClListPanel.cpp
+++ b/src/ClListPanel.cpp
@@ -70,6 +70,8 @@ static const unsigned int COLOR_TOP_BOTTOM_ITEM_TEXT = Color32<42, 137, 194>::Va
 static const unsigned int COLOR_ITEM_BACKGROUND = Color32<248, 246, 239>::Value;
 static const unsigned int COLOR_ITEM_TODAY_BACKGROUND = Color32<239, 236, 224>::Value;
 static const unsigned int COLOR_ITEM_TEXT_PRESSED = Color32<255, 255, 255>::Value;
+static const unsigned int COLOR_ITEM_DELETE_BACKGROUND = Color32<208, 82, 82>::Value;
+static const unsigned int COLOR_ITEM_DELETE_PRESSED_BACKGROUND = Color32<194, 71, 71>::Value;
 
 ListPanel::ListPanel(void)
        : __pPm(null)
@@ -390,6 +392,10 @@ ListPanel::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                                 ResourceManager::GetString(IDS_COM_SK4_SHARE), true);
                pContextItem->AddElement(IDA_LIST_PANEL_CONTEXT_MENU_DELETE,
                                                                 ResourceManager::GetString(IDS_CLD_SK3_DELETE), true);
+               pContextItem->SetElementBackgroundColor(IDA_LIST_PANEL_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_NORMAL, Color(COLOR_ITEM_DELETE_BACKGROUND));
+               pContextItem->SetElementBackgroundColor(IDA_LIST_PANEL_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_PRESSED, Color(COLOR_ITEM_DELETE_PRESSED_BACKGROUND));
+               pContextItem->SetElementBackgroundColor(IDA_LIST_PANEL_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_HIGHLIGHTED, Color(COLOR_ITEM_DELETE_PRESSED_BACKGROUND));
+               pContextItem->SetElementTextColor(IDA_LIST_PANEL_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_NORMAL, Color(COLOR_ITEM_TEXT_PRESSED));
 
                __pContextItem = pContextItem;
        }

diff --git a/src/ClMonthPanel.cpp b/src/ClMonthPanel.cpp
index bc3e5fd..859145e 100644 (file)
--- a/src/ClMonthPanel.cpp
+++ b/src/ClMonthPanel.cpp
@@ -82,6 +82,9 @@ static const unsigned int COLOR_DAY_SUN_DIM = Color32<224, 185, 180>::Value;
 static const unsigned int COLOR_DAY_FOCUS = Color32<255, 255, 255>::Value;
 static const unsigned int COLOR_EVENT_LIST_BACKGROUND = Color32<248, 246, 239>::Value;
 static const unsigned int COLOR_EVENT_LIST_DIVIDER = Color32<169, 169, 169>::Value;
+static const unsigned int COLOR_ITEM_DELETE_TEXT = Color32<255, 255, 255>::Value;
+static const unsigned int COLOR_ITEM_DELETE_BACKGROUND = Color32<208, 82, 82>::Value;
+static const unsigned int COLOR_ITEM_DELETE_PRESSED_BACKGROUND = Color32<194, 71, 71>::Value;
 
 static const int WEEKDAY_COUNT = 7;
 static const int HALF_ALPHA = 128;
@@ -716,6 +719,10 @@ MonthPanel::OnInitializing(void)
                                                         ResourceManager::GetString(IDS_COM_SK4_SHARE), true);
        __pContextItem->AddElement(IDA_MONTH_PANEL_CONTEXT_MENU_DELETE,
                                                         ResourceManager::GetString(IDS_CLD_SK3_DELETE), true);
+       __pContextItem->SetElementBackgroundColor(IDA_MONTH_PANEL_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_NORMAL, Color(COLOR_ITEM_DELETE_BACKGROUND));
+       __pContextItem->SetElementBackgroundColor(IDA_MONTH_PANEL_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_PRESSED, Color(COLOR_ITEM_DELETE_PRESSED_BACKGROUND));
+       __pContextItem->SetElementBackgroundColor(IDA_MONTH_PANEL_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_HIGHLIGHTED, Color(COLOR_ITEM_DELETE_PRESSED_BACKGROUND));
+       __pContextItem->SetElementTextColor(IDA_MONTH_PANEL_CONTEXT_MENU_DELETE, LIST_CONTEXT_ITEM_ELEMENT_STATUS_NORMAL, Color(COLOR_ITEM_DELETE_TEXT));
 
        __pContextItemNoEdit = new (std::nothrow) ListContextItem();
        __pContextItemNoEdit->Construct();
@@ -864,7 +871,6 @@ MonthPanel::OnListViewItemStateChanged(ListView& listView, int index, int elemen
 void
 MonthPanel::OnListViewItemSwept(ListView& listView, int index, SweepDirection direction)
 {
-
 }
 
 void

diff --git a/src/ClReminderForm.cpp b/src/ClReminderForm.cpp
index a8bafb0..716d6b9 100644 (file)
--- a/src/ClReminderForm.cpp
+++ b/src/ClReminderForm.cpp
@@ -46,8 +46,6 @@ static const int H_REMINDER_TYPE_CUSTOM_EDIT_FILED = 74;
 static const int Y_REMINDER_TYPE_BUTTON_TIME_UNIT = 19;
 static const int W_REMINDER_TYPE_BUTTON_TIME_UNIT = 130;
 static const int H_REMINDER_TYPE_BUTTON_TIME_UNIT = 74;
-static const unsigned int COLOR_ITEM_BACKGROUND = Color32<220, 218, 211>::Value;
-static const unsigned int COLOR_ITEM_TEXT = Color32<0, 0, 0>::Value;
 static const int X_TIME_UNIT_SELECTOR = 400;
 static const int Y_TIME_UNIT_SELECTOR = 1050;
 
@@ -121,18 +119,22 @@ ReminderForm::OnFormBackRequested(Form& source)
                return;
        }
 
-       if(__pReminder != null)
+       if (__reminderType == REMINDER_TYPE_CUSTOM)
        {
-               if (__reminderType == REMINDER_TYPE_CUSTOM)
+               int timeOffset = 0;
+               if (__pEditFieldReminderTime != null)
                {
-                       int timeOffset = 0;
                        if (__pEditFieldReminderTime->GetText().IsEmpty() == false)
                        {
                                Integer::Parse(__pEditFieldReminderTime->GetText(), timeOffset);
                        }
-
-                       __pReminder->SetTimeOffset(__reminderTimeUnit, timeOffset);
                }
+               else
+               {
+                       timeOffset = __customReminderTimeOffset;
+               }
+
+               __pReminder->SetTimeOffset(__reminderTimeUnit, timeOffset);
        }
 
        LinkedList* pList = new (std::nothrow) LinkedList();
@@ -159,7 +161,6 @@ ReminderForm::CreateItem(int sectionIndex, int itemIndex, int itemWidth)
 {
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, H_REMINDER_ITEM), TABLE_VIEW_ANNEX_STYLE_RADIO);
-       pItem->SetBackgroundColor(COLOR_ITEM_BACKGROUND, TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL);
 
        Label* pText = new (std::nothrow) Label();
        switch (itemIndex)
@@ -242,7 +243,6 @@ ReminderForm::CreateItem(int sectionIndex, int itemIndex, int itemWidth)
 
        pText->SetTextConfig(FONT_SIZE_REMINDER_TYPE_CUSTOM, LABEL_TEXT_STYLE_NORMAL);
        pText->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pText->SetTextColor(COLOR_ITEM_TEXT);
        pItem->AddControl(*pText);
 
        return pItem;
@@ -516,10 +516,10 @@ ReminderForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId& n
 void
 ReminderForm::OnActionPerformed(const Control& source, int actionId)
 {
+       SetFocus();
        switch (actionId)
        {
        case IDA_REMINDER_FORM_TIME_UNIT:
-               __pEditFieldReminderTime->HideKeypad();
                __pContextMenuTimeUnitSelector->SetAnchorPosition(Point(X_TIME_UNIT_SELECTOR, Y_TIME_UNIT_SELECTOR));
                __pContextMenuTimeUnitSelector->SetShowState(true);
                __pContextMenuTimeUnitSelector->Show();
@@ -557,18 +557,22 @@ ReminderForm::OnActionPerformed(const Control& source, int actionId)
                                SceneManager::GetInstance()->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), pList);
                        }
 
-                       if(__pReminder != null)
+                       if (__reminderType == REMINDER_TYPE_CUSTOM)
                        {
-                               if (__reminderType == REMINDER_TYPE_CUSTOM)
+                               int timeOffset = 0;
+                               if (__pEditFieldReminderTime != null)
                                {
-                                       int timeOffset = 0;
                                        if (__pEditFieldReminderTime->GetText().IsEmpty() == false)
                                        {
                                                Integer::Parse(__pEditFieldReminderTime->GetText(), timeOffset);
                                        }
-
-                                       __pReminder->SetTimeOffset(__reminderTimeUnit, timeOffset);
                                }
+                               else
+                               {
+                                       timeOffset = __customReminderTimeOffset;
+                               }
+
+                               __pReminder->SetTimeOffset(__reminderTimeUnit, timeOffset);
                        }
 
                        LinkedList* pList = new (std::nothrow) LinkedList();
@@ -590,6 +594,7 @@ void
 ReminderForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
        Invalidate(true);
+       __pTableView->ScrollToItem(0, REMINDER_TYPE_CUSTOM, TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_BOTTOM);
 }
 
 void

diff --git a/src/ClRepeatForm.cpp b/src/ClRepeatForm.cpp
index fe25598..54db962 100644 (file)
--- a/src/ClRepeatForm.cpp
+++ b/src/ClRepeatForm.cpp
@@ -46,15 +46,14 @@ enum
 };
 
 static const int H_REPEAT_ITEM = 112;
-static const unsigned int COLOR_ITEM_BACKGROUND = Color32<220, 218, 211>::Value;
 static const int FONT_SIZE_REPEAT_UNTIL_TYPE = 44;
 static const int X_REPEAT_UNTIL = 148;
 static const int Y_REPEAT_UNTIL_TYPE_EDIT_FIELD = 16;
 static const int W_REPEAT_UNTIL_TYPE_EDIT_FIELD = 132;
 static const int H_REPEAT_UNTIL_TYPE_EDIT_FIELD = 80;
-static const int X_REPEAT_UNTIL_TYPE_EDIT_DATE = 90;
+static const int X_REPEAT_UNTIL_TYPE_EDIT_DATE = 0;
 static const int Y_REPEAT_UNTIL_TYPE_EDIT_DATE = 0;
-static const unsigned int COLOR_TEXT_REPEAT = Color32<0, 0, 0>::Value;
+
 static const int IDA_REMINDER_FORM_BACK = 29101;
 
 RepeatForm::RepeatForm(void)
@@ -176,17 +175,27 @@ RepeatForm::OnFormBackRequested(Form& source)
 
        if (__repeatUntilType == REPEAT_UNTIL_TYPE_UNTIL_DATE)
        {
-               DateTime dateTime;
-               dateTime.SetValue(__pEditDateUntilDate->GetYear(), __pEditDateUntilDate->GetMonth()
-                                                  , __pEditDateUntilDate->GetDay(), 23, 59, 59);
+               DateTime dateTime = __untilDate;
+               if (__pEditDateUntilDate != null)
+               {
+                       dateTime.SetValue(__pEditDateUntilDate->GetYear(), __pEditDateUntilDate->GetMonth()
+                                                          , __pEditDateUntilDate->GetDay(), 23, 59, 59);
+               }
                __pRepeat->SetUntil(&dateTime);
        }
        else if (__repeatUntilType == REPEAT_UNTIL_TYPE_COUNT)
        {
                int count = 1;
-               if (__pEditFieldRepeatCount->GetText().IsEmpty() == false)
+               if (__pEditFieldRepeatCount != null)
+               {
+                       if (__pEditFieldRepeatCount->GetText().IsEmpty() == false)
+                       {
+                               Integer::Parse(__pEditFieldRepeatCount->GetText(), count);
+                       }
+               }
+               else
                {
-                       Integer::Parse(__pEditFieldRepeatCount->GetText(), count);
+                       count = __repeatCount;
                }
                __pRepeat->SetCounts((count > 1) ? count : 1);
        }
@@ -234,7 +243,6 @@ RepeatForm::CreateItem(int sectionIndex, int itemIndex, int itemWidth)
 {
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, H_REPEAT_ITEM), TABLE_VIEW_ANNEX_STYLE_RADIO);
-       pItem->SetBackgroundColor(COLOR_ITEM_BACKGROUND, TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL);
        if (sectionIndex == GROUP_REPEAT_UNTIL_TYPE && itemIndex == REPEAT_UNTIL_TYPE_UNTIL_DATE)
        {
                __pEditDateUntilDate = new (std::nothrow) EditDate();
@@ -315,7 +323,6 @@ RepeatForm::CreateItem(int sectionIndex, int itemIndex, int itemWidth)
        }
 
        pContent->SetTextConfig(FONT_SIZE_REPEAT_UNTIL_TYPE, LABEL_TEXT_STYLE_NORMAL);
-       pContent->SetTextColor(Color(COLOR_TEXT_REPEAT));
        pContent->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pItem->AddControl(*pContent);
 

diff --git a/src/ClSettingForm.cpp b/src/ClSettingForm.cpp
index 0c88b5d..779f6ed 100644 (file)
--- a/src/ClSettingForm.cpp
+++ b/src/ClSettingForm.cpp
@@ -62,7 +62,6 @@ enum
 };
 
 static const int H_ITEM = 112;
-static const unsigned int COLOR_ITEM_BACKGROUND = Color32<248, 246, 239>::Value;
 static const unsigned int COLOR_EXPANDED_ITEM_BACKGROUND = Color32<220, 218, 211>::Value;
 static const int H_LOCK_TIME_ZONE_SELECTION_ITEM = 140;
 static const int Y_LOCK_TIME_ZONE = 22;
@@ -290,7 +289,7 @@ SettingForm::GetSectionHeader(int sectionIndex)
 bool
 SettingForm::HasSectionHeader(int sectionIndex)
 {
-       return true;
+       return false;
 }
 
 String
@@ -495,8 +494,6 @@ SettingForm::CreateFirstDayOfWeekExpanderItemN(int itemWidth, bool isSundayFirst
 {
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, H_FIRST_DAY_OF_WEEK_ITEM), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       // TBD : Background color of item must be transparent.(will be in SDK 2.1)
-       pItem->SetBackgroundColor(Color(COLOR_ITEM_BACKGROUND));
 
        Label* pLabel = new (std::nothrow) Label();
        pLabel->Construct(Rectangle(0, Y_FIRST_DAY_OF_WEEK, itemWidth, H_FIRST_DAY_OF_WEEK), L"First day of week");