Change AlbumList look

Change-Id: I87eddb105ba503f55aa2b4b8c16d1eee61205fa6
Signed-off-by: HyukSoon Choi <hs619.choi@samsung.com>

diff --git a/inc/GlTypes.h b/inc/GlTypes.h
index c299f96..8a9e545 100644 (file)
--- a/inc/GlTypes.h
+++ b/inc/GlTypes.h
@@ -131,6 +131,8 @@ extern const wchar_t* IDL_FORM_SETTING_MAIN;
 extern const wchar_t* IDL_FORM_SETTING_INTERVAL;
 extern const wchar_t* IDL_FORM_SETTING_TRANSITION;
 
+extern const wchar_t* IDC_LABEL_ALBUM_LIST_EDITOR_SELECTED;
+
 extern const wchar_t* IDC_FORM_ALBUM_LIST;
 extern const wchar_t* IDC_FORM_ALBUM_LIST_EDITOR;
 extern const wchar_t* IDC_FORM_ALBUM_NAME_EDITOR;

diff --git a/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml b/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml
index 0f547fd..484d1fa 100644 (file)
--- a/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml
+++ b/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml
@@ -3,24 +3,25 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201303111438" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201303182057" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM_ALBUM_LIST">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
-        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
-        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <layout mode="Portrait" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
+        <layout mode="Landscape" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
     <Footer>
         <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/>
         <itemSet/>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
         <itemSet/>
     </Header>
     <IconListView id="IDC_ICONLISTVIEW_ALBUM_LIST" parent="IDL_FORM_ALBUM_LIST">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" checkBoxPosition="ICON_LIST_VIEW_CHECK_BOX_POSITION_TOP_RIGHT" colorOfEmptyListText="" highlightedItemTextColor="" itemBitmapHeight="334" itemBitmapWidth="334" itemBorderStyle="ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE" itemHorizontalAlignment="ALIGNMENT_CENTER" itemHorizontalSpacing="2" itemTextHorizontalAlignment="ALIGNMENT_CENTER" itemTextSize="30" itemTextVerticalAlignment="ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_INSIDE_BOTTOM" itemVerticalAlignment="ALIGNMENT_MIDDLE" itemVerticalSpacing="2" magneticScrollSize="0" normalItemTextColor="" pressedItemTextColor="" scrollDirection="ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL" textOfEmptyList="::IDS_COM_BODY_NO_ITEMS" touchAnimationEnabled="false"/>
-        <layout bottomRelation="IDL_FORM_ALBUM_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="1011" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_NORMAL" topRelation="IDL_FORM_ALBUM_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="124" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="730" x="456" y="22"/>
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="T01_Nocontents_picture.png" checkBoxPosition="ICON_LIST_VIEW_CHECK_BOX_POSITION_TOP_RIGHT" colorOfEmptyListText="" highlightedItemTextColor="" itemBitmapHeight="348.0" itemBitmapWidth="348.0" itemBorderStyle="ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE" itemHorizontalAlignment="ALIGNMENT_CENTER" itemHorizontalSpacing="6.0" itemTextHorizontalAlignment="ALIGNMENT_CENTER" itemTextSize="30.0" itemTextVerticalAlignment="ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_INSIDE_BOTTOM" itemVerticalAlignment="ALIGNMENT_MIDDLE" itemVerticalSpacing="8.0" magneticScrollSize="0.0" normalItemTextColor="" pressedItemTextColor="" scrollDirection="ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" textOfEmptyList="::IDS_COM_BODY_NO_ITEMS" touchAnimationEnabled="false"/>
+        <layout bottomRelation="IDL_FORM_ALBUM_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="1071.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_NORMAL" topRelation="IDL_FORM_ALBUM_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="124.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="730.0" x="456.0" y="82.0"/>
     </IconListView>
 </Scene>

diff --git a/res/screen-size-normal/IDL_FORM_ALBUM_LIST_EDITOR.xml b/res/screen-size-normal/IDL_FORM_ALBUM_LIST_EDITOR.xml
index ca405e0..a01eed7 100644 (file)
--- a/res/screen-size-normal/IDL_FORM_ALBUM_LIST_EDITOR.xml
+++ b/res/screen-size-normal/IDL_FORM_ALBUM_LIST_EDITOR.xml
@@ -8,8 +8,8 @@
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM_ALBUM_LIST_EDITOR">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
-        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
-        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
+        <layout mode="Portrait" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
+        <layout mode="Landscape" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
     <Footer>
         <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/>
@@ -25,8 +25,13 @@
         </itemSet>
     </Header>
     <IconListView id="IDC_ICONLISTVIEW_ALBUM_LIST_EDITOR" parent="IDL_FORM_ALBUM_LIST_EDITOR">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" checkBoxPosition="ICON_LIST_VIEW_CHECK_BOX_POSITION_TOP_RIGHT" colorOfEmptyListText="" highlightedItemTextColor="" itemBitmapHeight="100.0" itemBitmapWidth="100.0" itemBorderStyle="ICON_LIST_VIEW_ITEM_BORDER_STYLE_SHADOW" itemHorizontalAlignment="ALIGNMENT_CENTER" itemHorizontalSpacing="2.0" itemTextHorizontalAlignment="ALIGNMENT_CENTER" itemTextSize="30.0" itemTextVerticalAlignment="ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_INSIDE_BOTTOM" itemVerticalAlignment="ALIGNMENT_MIDDLE" itemVerticalSpacing="2.0" magneticScrollSize="0.0" normalItemTextColor="" pressedItemTextColor="" scrollDirection="ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" textOfEmptyList="" touchAnimationEnabled="true"/>
-        <layout height="1010.0" mode="Portrait" style="" width="720.0" x="0.0" y="0.0"/>
-        <layout height="124.0" mode="Landscape" style="" width="730.0" x="416.0" y="25.0"/>
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="T01_Nocontents_picture.png" checkBoxPosition="ICON_LIST_VIEW_CHECK_BOX_POSITION_TOP_LEFT" colorOfEmptyListText="" highlightedItemTextColor="" itemBitmapHeight="348.0" itemBitmapWidth="348.0" itemBorderStyle="ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE" itemHorizontalAlignment="ALIGNMENT_CENTER" itemHorizontalSpacing="6.0" itemTextHorizontalAlignment="ALIGNMENT_CENTER" itemTextSize="30.0" itemTextVerticalAlignment="ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_INSIDE_BOTTOM" itemVerticalAlignment="ALIGNMENT_MIDDLE" itemVerticalSpacing="6.0" magneticScrollSize="0.0" normalItemTextColor="" pressedItemTextColor="" scrollDirection="ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" textOfEmptyList="::IDS_COM_BODY_NO_ITEMS" touchAnimationEnabled="false"/>
+        <layout height="1023.0" mode="Portrait" style="ICON_LIST_VIEW_STYLE_MARK" width="720.0" x="0.0" y="0.0"/>
+        <layout height="124.0" mode="Landscape" style="ICON_LIST_VIEW_STYLE_MARK" width="730.0" x="416.0" y="85.0"/>
     </IconListView>
+    <Label id="IDC_LABEL_ALBUM_LIST_EDITOR_SELECTED" parent="IDL_FORM_ALBUM_LIST_EDITOR">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_ST_POP_NO_ITEMS_SELECTED" textColor="#FFFFFF" textSize="33.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout height="48.0" mode="Portrait" width="720.0" x="0.0" y="1023.0"/>
+        <layout height="15.0" mode="Landscape" width="533.0" x="119.0" y="529.0"/>
+    </Label>
 </Scene>

diff --git a/res/screen-size-normal/IDL_FORM_FILE_LIST.xml b/res/screen-size-normal/IDL_FORM_FILE_LIST.xml
index 831f52a..a380f7f 100644 (file)
--- a/res/screen-size-normal/IDL_FORM_FILE_LIST.xml
+++ b/res/screen-size-normal/IDL_FORM_FILE_LIST.xml
@@ -4,19 +4,19 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="3.0.0.201302121633" Dversion="20120315">
+<Scene Bversion="2.0.0.201303182057" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM_FILE_LIST">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
-        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
-        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <layout mode="Portrait" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
+        <layout mode="Landscape" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
     <Footer>
         <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/>
         <itemSet/>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="File View" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="File View" titleTextColor=""/>
         <itemSet/>
     </Header>
 </Scene>

diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp
index 757810a..d089956 100644 (file)
--- a/src/GlAlbumListEditorForm.cpp
+++ b/src/GlAlbumListEditorForm.cpp
@@ -38,15 +38,10 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const unsigned int COLOR_SELECT_COUNT_LABEL = Color32<68, 68, 68>::Value;
-static const unsigned int COLOR_SELECT_COUNT_FONT = Color32<255, 255, 255>::Value;
 static const unsigned int COLOR_DELETE_BUTTON_NORMAL = Color32<208, 82, 82>::Value;
 static const unsigned int COLOR_DELETE_BUTTON_PRESSED = Color32<194, 71, 71>::Value;
 static const unsigned int COLOR_DELETE_BUTTON_TEXT = Color32<248, 246, 239>::Value;
 
-static const int W_FOLDER_SIZE = 348;
-static const int H_FOLDER_SIZE = 348;
-
 static const int GAP_W_POPUP_ITEM = 5;
 static const int W_DELETE_POPUP = 600;
 static const int H_DELETE_POPUP = 300;
@@ -54,11 +49,6 @@ static const int H_DELETE_LABEL = 180;
 static const int Y_DELETE_BUTTON = 180;
 static const int H_DELETE_BUTTON = 80;
 
-static const int H_CHECKBOX = 80;
-static const int GAP_H_ICON_LIST_VIEW = 40;
-
-static const int H_SELECT_COUNT_LABEL = 48;
-
 static const int FORMAT_BUFFER_SIZE = 256;
 
 static const int X_POSITION_SHARE_CONTEXTMENU = 300;
@@ -152,18 +142,9 @@ AlbumListEditorForm::InitializeControl()
 
        CreateIconListView();
        __checkedCount = GetCheckedFolder();
-       tempString.Format(FORMAT_BUFFER_SIZE, L"%ls (%d)",
-                       ResourceManager::GetString(L"IDS_ST_POP_NO_ITEMS_SELECTED").GetPointer(), __checkedCount);
-
-       __pSelectCountLabel = new (std::nothrow) Label();
-       __pSelectCountLabel->Construct(Rectangle(0, GetClientAreaBounds().height - H_SELECT_COUNT_LABEL,
-                       GetClientAreaBounds().width, H_SELECT_COUNT_LABEL), tempString);
 
-       __pSelectCountLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
-       __pSelectCountLabel->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
-       __pSelectCountLabel->SetBackgroundColor(Color(COLOR_SELECT_COUNT_LABEL));
-       __pSelectCountLabel->SetTextColor(Color(COLOR_SELECT_COUNT_FONT));
-       AddControl(*__pSelectCountLabel);
+       __pSelectCountLabel = static_cast<Label*>(GetControl(L"IDC_LABEL_ALBUM_LIST_EDITOR_SELECTED"));
+       AppAssert(__pSelectCountLabel);
 
        __pShareContextMenu = new ContextMenu();
        __pShareContextMenu->Construct(Point(X_POSITION_SHARE_CONTEXTMENU, Y_POSITION_SHARE_CONTEXTMENU),
@@ -230,24 +211,11 @@ void
 AlbumListEditorForm::CreateIconListView(void)
 {
        AppLogDebug("ENTER");
-       Dimension itemSize(W_FOLDER_SIZE, H_FOLDER_SIZE);
-       __pEditorFolderIconList = new (std::nothrow) IconListView();
-       __pEditorFolderIconList->Construct(Rectangle(0, 0, GetClientAreaBounds().width,
-                       GetClientAreaBounds().height - H_CHECKBOX - GAP_H_ICON_LIST_VIEW), itemSize,
-                       ICON_LIST_VIEW_STYLE_MARK, ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL);
-       Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_LISTVIEW_EMPTY);
-       if (pBitmap != null)
-       {
-               __pEditorFolderIconList->SetBitmapOfEmptyList(pBitmap);
-               delete pBitmap;
-       }
-       __pEditorFolderIconList->SetTextOfEmptyList(ResourceManager::GetString(L"IDS_COM_BODY_NO_ITEMS"));
-       __pEditorFolderIconList->SetItemBorderStyle(ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE);
-       __pEditorFolderIconList->SetCheckBoxPosition(ICON_LIST_VIEW_CHECK_BOX_POSITION_TOP_LEFT);
+       __pEditorFolderIconList = static_cast< IconListView* >(GetControl(L"IDC_ICONLISTVIEW_ALBUM_LIST_EDITOR"));
+       AppAssert(__pEditorFolderIconList);
+
        __pEditorFolderIconList->SetItemProvider(*this);
-       __pEditorFolderIconList->SetTouchAnimationEnabled(false);
        __pEditorFolderIconList->AddIconListViewItemEventListener(*this);
-       AddControl(*__pEditorFolderIconList);
        __pEditorFolderIconList->SetShowState(true);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
@@ -315,12 +283,19 @@ void
 AlbumListEditorForm::OnIconListViewItemStateChanged(IconListView& view, int index, IconListViewItemStatus status)
 {
        AppLogDebug("ENTER");
-       String tempString;
 
        if (status == ICON_LIST_VIEW_ITEM_CHECKED || status == ICON_LIST_VIEW_ITEM_UNCHECKED)
        {
-               __checkedCount = GetCheckedFolder();
+               if (status == ICON_LIST_VIEW_ITEM_CHECKED)
+               {
+                       --__checkedCount;
+               }
+               else if (status == ICON_LIST_VIEW_ITEM_UNCHECKED)
+               {
+                       ++__checkedCount;
+               }
 
+               String tempString;
                if (__checkedCount == 0)
                {
                        tempString = ResourceManager::GetString(L"IDS_ST_POP_NO_ITEMS_SELECTED");

diff --git a/src/GlTypes.cpp b/src/GlTypes.cpp
index d38e3dd..79412a3 100644 (file)
--- a/src/GlTypes.cpp
+++ b/src/GlTypes.cpp
@@ -31,6 +31,8 @@ const wchar_t* IDL_FORM_SETTING_MAIN = L"IDL_FORM_SETTING_MAIN";
 const wchar_t* IDL_FORM_SETTING_INTERVAL = L"IDL_FORM_SETTING_INTERVAL";
 const wchar_t* IDL_FORM_SETTING_TRANSITION = L"IDL_FORM_SETTING_TRANSITION";
 
+const wchar_t* IDC_LABEL_ALBUM_LIST_EDITOR_SELECTED = L"IDC_LABEL_ALBUM_LIST_EDITOR_SELECTED";
+
 const wchar_t* IDC_FORM_ALBUM_LIST = L"AlbumListForm";
 const wchar_t* IDC_FORM_ALBUM_LIST_EDITOR = L"AlbumListEditorForm";
 const wchar_t* IDC_FORM_ALBUM_NAME_EDITOR = L"AlbumNameEditorForm";