[MusicPlayer] Modify xml error and apply createitem exception handling and fixed...
authorMyunkyu <mk70.kang@partner.samsung.com>
Thu, 4 Apr 2013 11:37:37 +0000 (20:37 +0900)
committerMyunkyu <mk70.kang@partner.samsung.com>
Fri, 5 Apr 2013 00:48:09 +0000 (09:48 +0900)
Change-Id: I2a6b3ba1e0fd68675c7ccd10be24984970f8f849

12 files changed:
res/screen-size-normal/IDL_CONTENT_LIST_ALBUM_INFO_PANEL.xml
res/screen-size-normal/IDL_CONTENT_LIST_FORM.xml
src/MpAlbumContentListForm.cpp
src/MpAlbumListEditorPanel.cpp
src/MpAlbumListPanel.cpp
src/MpAllListEditorPanel.cpp
src/MpAllListPanel.cpp
src/MpFormFactory.cpp
src/MpMainFrame.cpp [changed mode: 0755->0644]
src/MpMusicPlayerApp.cpp
src/MpPanelFactory.cpp
src/MpSceneRegister.cpp

index 11be1b3..2d0b5d2 100644 (file)
@@ -3,40 +3,40 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.\r
 -->\r
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
-<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
+<ScenePanel Bversion="2.0.0.201304011927" Dversion="20120315">\r
     <Panel id="IDL_CONTENT_LIST_ALBUM_INFO_PANEL">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout height="158" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
-        <layout height="158" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+        <layout height="158.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="0.0"/>\r
+        <layout height="158.0" mode="Landscape" type="LAYOUT_RELATIVE" width="1280.0" x="0.0" y="0.0"/>\r
     </Panel>\r
     <Label id="IDC_PLAY_CONTENT_COUNT" parent="IDL_CONTENT_LIST_ALBUM_INFO_PANEL">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="22" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="206" x="488" y="22"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="22" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="206" x="1048" y="22"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" leftMargin="16" text="" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="22.0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="206.0" x="488.0" y="22.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="22.0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="206.0" x="1048.0" y="22.0"/>\r
     </Label>\r
     <Label id="IDC_THUMBNAIL_INNER_STROKE" parent="IDL_CONTENT_LIST_ALBUM_INFO_PANEL">\r
-        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="20" y="25"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="20" y="25"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108.0" x="20.0" y="25.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108.0" x="20.0" y="25.0"/>\r
     </Label>\r
     <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_CONTENT_LIST_ALBUM_INFO_PANEL">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="#000000" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="22" mode="Portrait" rightRelation="IDC_PLAY_CONTENT_COUNT" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="334" x="154" y="22"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="22" mode="Landscape" rightRelation="IDC_PLAY_CONTENT_COUNT" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="894" x="154" y="22"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="44.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="22.0" mode="Portrait" rightRelation="IDC_PLAY_CONTENT_COUNT" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="334.0" x="154.0" y="22.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="22.0" mode="Landscape" rightRelation="IDC_PLAY_CONTENT_COUNT" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="894.0" x="154.0" y="22.0"/>\r
     </Label>\r
     <Label id="IDC_CONTENTS_ARTIST_NAME" parent="IDL_CONTENT_LIST_ALBUM_INFO_PANEL">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="540" x="154" y="76"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1100" x="154" y="76"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="26.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="540.0" x="154.0" y="76.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="26.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ALBUM_INFO_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1100.0" x="154.0" y="76.0"/>\r
     </Label>\r
     <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDL_CONTENT_LIST_ALBUM_INFO_PANEL">\r
-        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="2" marginRight="0" marginTop="2" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="22" y="27"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="2" marginRight="0" marginTop="2" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="22" y="27"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="2.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="104.0" x="22.0" y="27.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="2.0" marginRight="0.0" marginTop="2.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="104.0" x="22.0" y="27.0"/>\r
     </Label>\r
     <Label id="IDC_LABEL_ALBUM_BACKGROUND" parent="IDL_CONTENT_LIST_ALBUM_INFO_PANEL">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="158" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="720" x="0" y="0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="158" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="1280" x="0" y="0"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="158.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="158.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="1280.0" x="0" y="0"/>\r
     </Label>\r
 </ScenePanel>\r
index e7a7fb5..21f6e53 100644 (file)
@@ -3,10 +3,10 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.\r
 -->\r
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
-<Scene Bversion="2.0.0.201303041025" Dversion="20120315">\r
+<Scene Bversion="2.0.0.201304011927" Dversion="20120315">\r
     <LogicalCoordinate>720</LogicalCoordinate>\r
     <Form id="IDL_CONTENT_LIST_FORM">\r
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>\r
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>\r
     </Form>\r
         <itemSet/>\r
     </Footer>\r
     <Header>\r
-        <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="Title Text" titleTextColor="#3B73B6"/>\r
+        <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="Title Text" titleTextColor="#3B73B6"/>\r
         <itemSet/>\r
     </Header>\r
     <Label id="IDC_LABEL_BALLOON_TOOLTIP" parent="IDL_CONTENT_LIST_FORM">\r
-        <property backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="%d items are selected." textColor="#FFFFFF" textSize="32" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDL_CONTENT_LIST_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="1011"/>\r
-        <layout bottomRelation="IDL_CONTENT_LIST_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="484"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="%d items are selected." textColor="#FFFFFF" textSize="32.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="1011.0"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="484.0"/>\r
     </Label>\r
     <Panel id="IDC_LABEL_CONTENT_ADDITIONAL_INFO" parent="IDL_CONTENT_LIST_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="0.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="0.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>\r
     </Panel>\r
     <TableView id="IDC_TABLEVIEW_CONTENT_LIST" parent="IDL_CONTENT_LIST_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
-        <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="1011" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL_CONTENT_ADDITIONAL_INFO" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>\r
-        <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="484" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL_CONTENT_ADDITIONAL_INFO" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>\r
+        <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="1011.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL_CONTENT_ADDITIONAL_INFO" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>\r
+        <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="484.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL_CONTENT_ADDITIONAL_INFO" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>\r
     </TableView>\r
     <Label id="IDC_LABEL_NO_CONTENT" parent="IDL_CONTENT_LIST_FORM">\r
-        <property backgroundBitmapPath="T02_nocomposers.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="No Songs" textColor="" textSize="32" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_BOTTOM"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="220" y="365"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="500" y="102"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="T02_nocomposers.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="No Songs" textColor="" textSize="32.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="365.5"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="500.0" y="102.0"/>\r
     </Label>\r
 </Scene>\r
index 3ed13ca..8094ba9 100644 (file)
@@ -312,7 +312,6 @@ AlbumContentListForm::CreateItem(const int itemIndex, int itemWidth)
        AppLogDebug("ENTER");
        RelativeLayout layout;
        layout.Construct();
-       TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
        TableViewAnnexStyle tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        if (GetScreenState() != SCREEN_STATE_NORMAL)
@@ -320,21 +319,24 @@ AlbumContentListForm::CreateItem(const int itemIndex, int itemWidth)
                tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_MARK;
        }
 
-       if (IsFailed(pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), tableViewAnnexStyle)))
-       {
-               AppLogDebug("Construct(Dimension(itemWidth, ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
-               return null;
-       }
-
+       TableViewItem* pItem = new (std::nothrow) TableViewItem();
        ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
-       if (pContentInfo != null)
-       {
-               CreateTableViewItem(*pItem, *pContentInfo);
-               delete pContentInfo;
-       }
+
+       result r = pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), tableViewAnnexStyle);
+       TryCatch(r == E_SUCCESS, delete pItem, "pItem->Construct(%s)", GetErrorMessage(r));
+       TryCatch(pContentInfo != null, delete pItem, "pContentInfo is null", GetErrorMessage(GetLastResult()));
+
+       r = CreateTableViewItem(*pItem, *pContentInfo);
+       TryCatch(r == E_SUCCESS, delete pItem, "CreateTableViewItem failed(%s)", GetErrorMessage(r));
+       delete pContentInfo;
 
        AppLogDebug("EXIT");
        return pItem;
+
+CATCH:
+       AppLogDebug("EXIT(%ls)", GetErrorMessage(GetLastResult()));
+       delete pContentInfo;
+       return null;
 }
 
 void
index e1f612f..f3b6072 100644 (file)
@@ -251,23 +251,29 @@ Tizen::Ui::Controls::TableViewItem*
 AlbumListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-       ContentInformation* pContentInfoStruct = __pPresentationModel->GetAlbumInfoN(itemIndex);
-       if (pContentInfoStruct == null)
-       {
-               return null;
-       }
        RelativeLayout layout;
        layout.Construct();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
+       ContentInformation* pContentInfo = __pPresentationModel->GetAlbumInfoN(itemIndex);
+
+       result r = pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
+       TryCatch(r == E_SUCCESS, delete pItem, "pItem->Construct(%s)", GetErrorMessage(r));
+       TryCatch(pContentInfo != null, delete pItem, "pContentInfo is null", GetErrorMessage(GetLastResult()));
 
-       CreateTableViewItem(*pItem, *pContentInfoStruct);
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) Integer(itemIndex)));
-       delete pContentInfoStruct;
+       r = CreateTableViewItem(*pItem, *pContentInfo);
+       TryCatch(r == E_SUCCESS, delete pItem, "CreateTableViewItem failed(%s)", GetErrorMessage(r));
+
+       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
+       delete pContentInfo;
 
        AppLogDebug("EXIT");
        return pItem;
+
+CATCH:
+       AppLogDebug("EXIT(%ls)", GetErrorMessage(GetLastResult()));
+       delete pContentInfo;
+       return null;
 }
 
 void
index 3e7f874..0329f9c 100644 (file)
@@ -236,27 +236,30 @@ Tizen::Ui::Controls::TableViewItem*
 AlbumListPanel::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-       ContentInformation* pContentInfoStruct = __pPresentationModel->GetAlbumInfoN(itemIndex);
-       if (pContentInfoStruct == null)
-       {
-               return null;
-       }
-
        RelativeLayout layout;
        layout.Construct();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+       ContentInformation* pContentInfo = __pPresentationModel->GetAlbumInfoN(itemIndex);
 
-       CreateTableViewItem(*pItem, *pContentInfoStruct, __pPresentationModel->GetContentCount(itemIndex));
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) Integer(itemIndex)));
-       pItem->SetContextItem(__pContextItem);
+       result r = pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+       TryCatch(r == E_SUCCESS, delete pItem, "pItem->Construct(%s)", GetErrorMessage(r));
+       TryCatch(pContentInfo != null, delete pItem, "pContentInfo is null", GetErrorMessage(GetLastResult()));
 
-       delete pContentInfoStruct;
-       pContentInfoStruct = null;
+       r = CreateTableViewItem(*pItem, *pContentInfo, __pPresentationModel->GetContentCount(itemIndex));
+       TryCatch(r == E_SUCCESS, delete pItem, "CreateTableViewItem failed(%s)", GetErrorMessage(r));
+
+       pItem->SetContextItem(__pContextItem);
+       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
+       delete pContentInfo;
 
        AppLogDebug("EXIT");
        return pItem;
+
+CATCH:
+       AppLogDebug("EXIT(%ls)", GetErrorMessage(GetLastResult()));
+       delete pContentInfo;
+       return null;
 }
 
 void
index c33816b..6b7d8b5 100644 (file)
@@ -326,24 +326,29 @@ Tizen::Ui::Controls::TableViewItem*
 AllListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-       ContentInformation* pContentInfoStruct = __pPresentationModel->GetContentInfoN(itemIndex);
-       if (pContentInfoStruct == null)
-       {
-               return null;
-       }
        RelativeLayout layout;
        layout.Construct();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
+       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
 
-       CreateTableViewItem(*pItem, *pContentInfoStruct);
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) Integer(itemIndex)));
+       result r = pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
+       TryCatch(r == E_SUCCESS, delete pItem, "pItem->Construct(%s)", GetErrorMessage(r));
+       TryCatch(pContentInfo != null, delete pItem, "pContentInfo is null", GetErrorMessage(GetLastResult()));
 
-       delete pContentInfoStruct;
+       r = CreateTableViewItem(*pItem, *pContentInfo);
+       TryCatch(r == E_SUCCESS, delete pItem, "CreateTableViewItem failed(%s)", GetErrorMessage(r));
+
+       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
+       delete pContentInfo;
 
        AppLogDebug("EXIT");
        return pItem;
+
+CATCH:
+       AppLogDebug("EXIT(%ls)", GetErrorMessage(GetLastResult()));
+       delete pContentInfo;
+       return null;
 }
 
 void
index b0fe0ae..d5ee8ec 100644 (file)
@@ -434,26 +434,30 @@ TableViewItem*
 AllListPanel::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
-       if (pContentInfo == null)
-       {
-               return null;
-       }
-
        RelativeLayout layout;
        layout.Construct();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
 
-       CreateTableViewItem(*pItem, *pContentInfo);
-       pItem->SetContextItem(__pContextItem);
+       result r = pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+       TryCatch(r == E_SUCCESS, delete pItem, "pItem->Construct(%s)", GetErrorMessage(r));
+       TryCatch(pContentInfo != null, delete pItem, "pContentInfo is null", GetErrorMessage(GetLastResult()));
+
+       r = CreateTableViewItem(*pItem, *pContentInfo);
+       TryCatch(r == E_SUCCESS, delete pItem, "CreateTableViewItem failed(%s)", GetErrorMessage(r));
 
+       pItem->SetContextItem(__pContextItem);
        RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
        delete pContentInfo;
 
        AppLogDebug("EXIT");
        return pItem;
+
+CATCH:
+       AppLogDebug("EXIT(%ls)", GetErrorMessage(GetLastResult()));
+       delete pContentInfo;
+       return null;
 }
 
 void
index 8686385..5e01eda 100644 (file)
@@ -255,30 +255,30 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
 //             pSceneManager->AddSceneEventListener(sceneId, *pForm);
 //             pNewForm = pForm;
 //     }
-       else if (formId == IDC_ARTIST_ALBUM_LIST_EDIT_FORM)
-       {
-               ArtistAlbumListEditorForm* pForm = new (std::nothrow) ArtistAlbumListEditorForm();
-               if (pForm == null)
-               {
-                       AppLogDebug("EXIT");
-                       return null;
-               }
-               pForm->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pForm);
-               pNewForm = pForm;
-       }
-       else if (formId == IDC_ARTIST_ALL_SONG_LIST_FORM)
-       {
-               ArtistAllSongListForm* pForm = new (std::nothrow) ArtistAllSongListForm();
-               if (pForm == null)
-               {
-                       AppLogDebug("EXIT");
-                       return null;
-               }
-               pForm->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pForm);
-               pNewForm = pForm;
-       }
+//     else if (formId == IDC_ARTIST_ALBUM_LIST_EDIT_FORM)
+//     {
+//             ArtistAlbumListEditorForm* pForm = new (std::nothrow) ArtistAlbumListEditorForm();
+//             if (pForm == null)
+//             {
+//                     AppLogDebug("EXIT");
+//                     return null;
+//             }
+//             pForm->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pForm);
+//             pNewForm = pForm;
+//     }
+//     else if (formId == IDC_ARTIST_ALL_SONG_LIST_FORM)
+//     {
+//             ArtistAllSongListForm* pForm = new (std::nothrow) ArtistAllSongListForm();
+//             if (pForm == null)
+//             {
+//                     AppLogDebug("EXIT");
+//                     return null;
+//             }
+//             pForm->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pForm);
+//             pNewForm = pForm;
+//     }
        else if (formId == IDC_USER_PLAYLIST_CONTENT_LIST_FORM)
        {
                UserPlaylistContentListForm* pForm = new (std::nothrow) UserPlaylistContentListForm();
old mode 100755 (executable)
new mode 100644 (file)
index e6826fd..4faca15
@@ -43,8 +43,7 @@ result
 MainFrame::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       r = SceneRegister::RegisterAllScenes();
+       result r = SceneRegister::RegisterAllScenes();
        TryReturn(r == E_SUCCESS, r, "[%s] Scene registering Failed.", GetErrorMessage(r));
        AppLogDebug("EXIT");
        return r;
@@ -54,27 +53,25 @@ result
 MainFrame::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       result r = E_SUCCESS;
        AppLogDebug("EXIT");
-       return r;
+       return E_SUCCESS;
 }
 
 result
 MainFrame::GoToInitialScene(const Tizen::Ui::Scenes::SceneId& sceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       result r = E_SUCCESS;
-
+       AppLogDebug("ENTER");
        if (pArgs == null)
        {
-               AppLogDebug("GoToInitialScene pArgs is null");
+               AppLogDebug("GoToInitialScene pArgs is null(%ls)", sceneId.GetPointer());
        }
        else
        {
-               AppLogDebug("GoToInitialScene pArgs is not null");
+               AppLogDebug("GoToInitialScene pArgs is not null(%ls)", sceneId.GetPointer());
        }
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
-       r = pSceneManager->GoForward(ForwardSceneTransition(sceneId), pArgs);
+       result r = pSceneManager->GoForward(ForwardSceneTransition(sceneId), pArgs);
        TryReturn(r == E_SUCCESS, r, "[%s] Scene transition Failed.", GetErrorMessage(r));
 
        AppLogDebug("EXIT");
index 8f5d4fe..e872c55 100644 (file)
@@ -48,7 +48,7 @@ static const wchar_t* PARAM_COUNTRY = L"http://tizen.org/setting/locale.country"
 MusicPlayerApp::MusicPlayerApp(void)
        : __requestId(null)
        , __operationId(null)
-       , __sceneId(null)
+       , __sceneId(IDSCN_ALL_LIST)
        , __pDataList(null)
        , __pMainFrame(null)
 {
@@ -285,7 +285,7 @@ MusicPlayerApp::OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::
        }
        else
        {
-               // Empty statement
+               __sceneId = IDSCN_ALL_LIST;
        }
        __pMainFrame->GoToInitialScene(__sceneId, __pDataList);
        AppLogDebug("EXIT");
index f4027b5..d74caff 100644 (file)
@@ -143,33 +143,33 @@ PanelFactory::CreatePanelN(const Tizen::Base::String& panelId, const Tizen::Ui::
                pSceneManager->AddSceneEventListener(sceneId, *pPanel);
                pNewPanel = pPanel;
        }
-       else if (panelId == IDC_GENRES_LIST_PANEL)
-       {
-               GenreListPanel* pPanel = new (std::nothrow) GenreListPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_COMPOSER_LIST_PANEL)
-       {
-               ComposerListPanel* pPanel = new (std::nothrow) ComposerListPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_YEAR_LIST_PANEL)
-       {
-               YearsListPanel* pPanel = new (std::nothrow) YearsListPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
+//     else if (panelId == IDC_GENRES_LIST_PANEL)
+//     {
+//             GenreListPanel* pPanel = new (std::nothrow) GenreListPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_COMPOSER_LIST_PANEL)
+//     {
+//             ComposerListPanel* pPanel = new (std::nothrow) ComposerListPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_YEAR_LIST_PANEL)
+//     {
+//             YearsListPanel* pPanel = new (std::nothrow) YearsListPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
        else if (panelId == IDC_FOLDER_LIST_PANEL)
        {
                FolderListPanel* pPanel = new (std::nothrow) FolderListPanel();
@@ -215,33 +215,33 @@ PanelFactory::CreatePanelN(const Tizen::Base::String& panelId, const Tizen::Ui::
                pSceneManager->AddSceneEventListener(sceneId, *pPanel);
                pNewPanel = pPanel;
        }
-       else if (panelId == IDC_GENRES_LIST_EDITOR_PANEL)
-       {
-               GenresListEditorPanel* pPanel = new (std::nothrow) GenresListEditorPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_COMPOSER_LIST_EDITOR_PANEL)
-       {
-               ComposerListEditorPanel* pPanel = new (std::nothrow) ComposerListEditorPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_YEAR_LIST_EDITOR_PANEL)
-       {
-               YearsListEditorPanel* pPanel = new (std::nothrow) YearsListEditorPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
+//     else if (panelId == IDC_GENRES_LIST_EDITOR_PANEL)
+//     {
+//             GenresListEditorPanel* pPanel = new (std::nothrow) GenresListEditorPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_COMPOSER_LIST_EDITOR_PANEL)
+//     {
+//             ComposerListEditorPanel* pPanel = new (std::nothrow) ComposerListEditorPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_YEAR_LIST_EDITOR_PANEL)
+//     {
+//             YearsListEditorPanel* pPanel = new (std::nothrow) YearsListEditorPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
        else if (panelId == IDC_FOLDER_LIST_EDITOR_PANEL)
        {
                FolderListEditorPanel* pPanel = new (std::nothrow) FolderListEditorPanel();
@@ -251,63 +251,63 @@ PanelFactory::CreatePanelN(const Tizen::Base::String& panelId, const Tizen::Ui::
                pSceneManager->AddSceneEventListener(sceneId, *pPanel);
                pNewPanel = pPanel;
        }
-       else if (panelId == IDC_ALBUM_PICKER_PANEL)
-       {
-               AlbumPickerPanel* pPanel = new (std::nothrow) AlbumPickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_ARTIST_PICKER_PANEL)
-       {
-               ArtistPickerPanel* pPanel = new (std::nothrow) ArtistPickerPanel();
-               if (pPanel == null)
-               {
-                       AppLogDebug("EXIT");
-                       return null;
-               }
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_GENRE_PICKER_PANEL)
-       {
-               GenrePickerPanel* pPanel = new (std::nothrow) GenrePickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_COMPOSER_PICKER_PANEL)
-       {
-               ComposerPickerPanel* pPanel = new (std::nothrow) ComposerPickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_YEAR_PICKER_PANEL)
-       {
-               YearPickerPanel* pPanel = new (std::nothrow) YearPickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_FOLDER_PICKER_PANEL)
-       {
-               FolderPickerPanel* pPanel = new (std::nothrow) FolderPickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
+//     else if (panelId == IDC_ALBUM_PICKER_PANEL)
+//     {
+//             AlbumPickerPanel* pPanel = new (std::nothrow) AlbumPickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_ARTIST_PICKER_PANEL)
+//     {
+//             ArtistPickerPanel* pPanel = new (std::nothrow) ArtistPickerPanel();
+//             if (pPanel == null)
+//             {
+//                     AppLogDebug("EXIT");
+//                     return null;
+//             }
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_GENRE_PICKER_PANEL)
+//     {
+//             GenrePickerPanel* pPanel = new (std::nothrow) GenrePickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_COMPOSER_PICKER_PANEL)
+//     {
+//             ComposerPickerPanel* pPanel = new (std::nothrow) ComposerPickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_YEAR_PICKER_PANEL)
+//     {
+//             YearPickerPanel* pPanel = new (std::nothrow) YearPickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_FOLDER_PICKER_PANEL)
+//     {
+//             FolderPickerPanel* pPanel = new (std::nothrow) FolderPickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
        else if (panelId == IDC_ALL_CONTENT_PICKER_PANEL)
        {
                AllContentPickerPanel* pPanel = new (std::nothrow) AllContentPickerPanel();
@@ -317,60 +317,60 @@ PanelFactory::CreatePanelN(const Tizen::Base::String& panelId, const Tizen::Ui::
                pSceneManager->AddSceneEventListener(sceneId, *pPanel);
                pNewPanel = pPanel;
        }
-       else if (panelId == IDC_ALBUM_CONTENT_PICKER_PANEL)
-       {
-               AlbumContentPickerPanel* pPanel = new (std::nothrow) AlbumContentPickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_ARTIST_CONTENT_PICKER_PANEL)
-       {
-               ArtistContentPickerPanel* pPanel = new (std::nothrow) ArtistContentPickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_GENRE_CONTENT_PICKER_PANEL)
-       {
-               GenreContentPickerPanel* pPanel = new (std::nothrow) GenreContentPickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_COMPOSER_CONTENT_PICKER_PANEL)
-       {
-               ComposerContentPickerPanel* pPanel = new (std::nothrow) ComposerContentPickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_YEAR_CONTENT_PICKER_PANEL)
-       {
-               YearContentPickerPanel* pPanel = new (std::nothrow) YearContentPickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
-       else if (panelId == IDC_FOLDER_CONTENT_PICKER_PANEL)
-       {
-               FolderContentPickerPanel* pPanel = new (std::nothrow) FolderContentPickerPanel();
-               TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
-
-               pPanel->Initialize();
-               pSceneManager->AddSceneEventListener(sceneId, *pPanel);
-               pNewPanel = pPanel;
-       }
+//     else if (panelId == IDC_ALBUM_CONTENT_PICKER_PANEL)
+//     {
+//             AlbumContentPickerPanel* pPanel = new (std::nothrow) AlbumContentPickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_ARTIST_CONTENT_PICKER_PANEL)
+//     {
+//             ArtistContentPickerPanel* pPanel = new (std::nothrow) ArtistContentPickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_GENRE_CONTENT_PICKER_PANEL)
+//     {
+//             GenreContentPickerPanel* pPanel = new (std::nothrow) GenreContentPickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_COMPOSER_CONTENT_PICKER_PANEL)
+//     {
+//             ComposerContentPickerPanel* pPanel = new (std::nothrow) ComposerContentPickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_YEAR_CONTENT_PICKER_PANEL)
+//     {
+//             YearContentPickerPanel* pPanel = new (std::nothrow) YearContentPickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
+//     else if (panelId == IDC_FOLDER_CONTENT_PICKER_PANEL)
+//     {
+//             FolderContentPickerPanel* pPanel = new (std::nothrow) FolderContentPickerPanel();
+//             TryCatch(pPanel != null, , "[E_OUT_OF_MEMORY] Unable to create albumlistpanel.");
+//
+//             pPanel->Initialize();
+//             pSceneManager->AddSceneEventListener(sceneId, *pPanel);
+//             pNewPanel = pPanel;
+//     }
        AppLogDebug("EXIT");
        return pNewPanel;
 
index 79185df..f99803e 100644 (file)
@@ -122,47 +122,47 @@ SceneRegister::RegisterAllScenes(void)
        r = pSceneManager->RegisterScene(IDSCN_PLAYLIST_LIST, IDC_CONTENT_FORM, IDC_PLAYLIST_LIST_PANEL);
        r = pSceneManager->RegisterScene(IDSCN_ALBUM_LIST, IDC_CONTENT_FORM, IDC_ALBUM_LIST_PANEL);
        r = pSceneManager->RegisterScene(IDSCN_ARTIST_LIST, IDC_CONTENT_FORM, IDC_ARTIST_LIST_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_GENRE_LIST, IDC_CONTENT_FORM, IDC_GENRES_LIST_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_COMPOSER_LIST, IDC_CONTENT_FORM, IDC_COMPOSER_LIST_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_YEAR_LIST, IDC_CONTENT_FORM, IDC_YEAR_LIST_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_GENRE_LIST, IDC_CONTENT_FORM, IDC_GENRES_LIST_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_COMPOSER_LIST, IDC_CONTENT_FORM, IDC_COMPOSER_LIST_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_YEAR_LIST, IDC_CONTENT_FORM, IDC_YEAR_LIST_PANEL);
        r = pSceneManager->RegisterScene(IDSCN_FOLDER_LIST, IDC_CONTENT_FORM, IDC_FOLDER_LIST_PANEL);
 
        r = pSceneManager->RegisterScene(IDSCN_ALL_LIST_EDITOR, IDC_CONTENT_FORM, IDC_ALL_LIST_EDITOR_PANEL);
        r = pSceneManager->RegisterScene(IDSCN_PLAYLIST_LIST_EDITOR, IDC_CONTENT_FORM, IDC_PLAYLIST_LIST_EDITOR_PANEL);
        r = pSceneManager->RegisterScene(IDSCN_ALBUM_LIST_EDITOR, IDC_CONTENT_FORM, IDC_ALBUM_LIST_EDITOR_PANEL);
        r = pSceneManager->RegisterScene(IDSCN_ARTIST_LIST_EDITOR, IDC_CONTENT_FORM, IDC_ARTIST_LIST_EDITOR_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_GENRE_LIST_EDITOR, IDC_CONTENT_FORM, IDC_GENRES_LIST_EDITOR_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_COMPOSER_LIST_EDITOR, IDC_CONTENT_FORM, IDC_COMPOSER_LIST_EDITOR_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_YEAR_LIST_EDITOR, IDC_CONTENT_FORM, IDC_YEAR_LIST_EDITOR_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_GENRE_LIST_EDITOR, IDC_CONTENT_FORM, IDC_GENRES_LIST_EDITOR_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_COMPOSER_LIST_EDITOR, IDC_CONTENT_FORM, IDC_COMPOSER_LIST_EDITOR_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_YEAR_LIST_EDITOR, IDC_CONTENT_FORM, IDC_YEAR_LIST_EDITOR_PANEL);
        r = pSceneManager->RegisterScene(IDSCN_FOLDER_LIST_EDITOR, IDC_CONTENT_FORM, IDC_FOLDER_LIST_EDITOR_PANEL);
 
-       r = pSceneManager->RegisterScene(IDSCN_ALBUM_PICKER, IDC_CONTENT_FORM, IDC_ALBUM_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_ARTIST_PICKER, IDC_CONTENT_FORM, IDC_ARTIST_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_GENRE_PICKER, IDC_CONTENT_FORM, IDC_GENRE_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_COMPOSER_PICKER,IDC_CONTENT_FORM, IDC_COMPOSER_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_YEAR_PICKER, IDC_CONTENT_FORM, IDC_YEAR_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_FOLDER_PICKER, IDC_CONTENT_FORM, IDC_FOLDER_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_ALBUM_PICKER, IDC_CONTENT_FORM, IDC_ALBUM_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_ARTIST_PICKER, IDC_CONTENT_FORM, IDC_ARTIST_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_GENRE_PICKER, IDC_CONTENT_FORM, IDC_GENRE_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_COMPOSER_PICKER,IDC_CONTENT_FORM, IDC_COMPOSER_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_YEAR_PICKER, IDC_CONTENT_FORM, IDC_YEAR_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_FOLDER_PICKER, IDC_CONTENT_FORM, IDC_FOLDER_PICKER_PANEL);
 
        r = pSceneManager->RegisterScene(IDSCN_ALL_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_ALL_CONTENT_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_ALBUM_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_ALBUM_CONTENT_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_ARTIST_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_ARTIST_CONTENT_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_GENRE_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_GENRE_CONTENT_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_COMPOSER_CONTENT_PICKER,IDC_CONTENT_FORM, IDC_COMPOSER_CONTENT_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_YEAR_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_YEAR_CONTENT_PICKER_PANEL);
-       r = pSceneManager->RegisterScene(IDSCN_FOLDER_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_FOLDER_CONTENT_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_ALBUM_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_ALBUM_CONTENT_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_ARTIST_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_ARTIST_CONTENT_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_GENRE_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_GENRE_CONTENT_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_COMPOSER_CONTENT_PICKER,IDC_CONTENT_FORM, IDC_COMPOSER_CONTENT_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_YEAR_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_YEAR_CONTENT_PICKER_PANEL);
+//     r = pSceneManager->RegisterScene(IDSCN_FOLDER_CONTENT_PICKER, IDC_CONTENT_FORM, IDC_FOLDER_CONTENT_PICKER_PANEL);
 
        r = pSceneManager->RegisterScene(IDSCN_ALBUM_CONTENT_LIST, IDC_ALBUM_CONTENT_LIST_FORM, PANEL_BLANK);
        r = pSceneManager->RegisterScene(IDSCN_ARTIST_CONTENT_LIST, IDC_ARTIST_CONTENT_LIST_FORM, PANEL_BLANK);
-       r = pSceneManager->RegisterScene(IDSCN_GENRE_CONTENT_LIST, IDC_GENRE_CONTENT_LIST_FORM, PANEL_BLANK);
-       r = pSceneManager->RegisterScene(IDSCN_COMPOSER_CONTENT_LIST,  IDC_COMPOSER_CONTENT_LIST_FORM,PANEL_BLANK);
-       r = pSceneManager->RegisterScene(IDSCN_YEAR_CONTENT_LIST, IDC_YEAR_CONTENT_LIST_FORM, PANEL_BLANK);
+//     r = pSceneManager->RegisterScene(IDSCN_GENRE_CONTENT_LIST, IDC_GENRE_CONTENT_LIST_FORM, PANEL_BLANK);
+//     r = pSceneManager->RegisterScene(IDSCN_COMPOSER_CONTENT_LIST,  IDC_COMPOSER_CONTENT_LIST_FORM,PANEL_BLANK);
+//     r = pSceneManager->RegisterScene(IDSCN_YEAR_CONTENT_LIST, IDC_YEAR_CONTENT_LIST_FORM, PANEL_BLANK);
        r = pSceneManager->RegisterScene(IDSCN_FOLDER_CONTENT_LIST, IDC_FOLDER_CONTENT_LIST_FORM, PANEL_BLANK);
        r = pSceneManager->RegisterScene(IDSCN_PLAYLIST_CONTENT_LIST, IDC_PLAYLIST_CONTENT_LIST_FORM, PANEL_BLANK);
 
-       r = pSceneManager->RegisterScene(IDSCN_ARTIST_ALBUM_LIST, IDC_ARTIST_ALBUM_LIST_FORM, PANEL_BLANK);
-       r = pSceneManager->RegisterScene(IDSCN_ARTIST_ALBUM_SEARCH_LIST, IDC_ARTIST_ALBUM_LIST_SEARCH_FORM,PANEL_BLANK);
-       r = pSceneManager->RegisterScene(IDSCN_ARTIST_ALBUM_LIST_EDITOR, IDC_ARTIST_ALBUM_LIST_EDIT_FORM, PANEL_BLANK);
-       r = pSceneManager->RegisterScene(IDSCN_ARTIST_ALL_SONG_LIST, IDC_ARTIST_ALL_SONG_LIST_FORM, PANEL_BLANK);
+//     r = pSceneManager->RegisterScene(IDSCN_ARTIST_ALBUM_LIST, IDC_ARTIST_ALBUM_LIST_FORM, PANEL_BLANK);
+//     r = pSceneManager->RegisterScene(IDSCN_ARTIST_ALBUM_SEARCH_LIST, IDC_ARTIST_ALBUM_LIST_SEARCH_FORM,PANEL_BLANK);
+//     r = pSceneManager->RegisterScene(IDSCN_ARTIST_ALBUM_LIST_EDITOR, IDC_ARTIST_ALBUM_LIST_EDIT_FORM, PANEL_BLANK);
+//     r = pSceneManager->RegisterScene(IDSCN_ARTIST_ALL_SONG_LIST, IDC_ARTIST_ALL_SONG_LIST_FORM, PANEL_BLANK);
 
        r = pSceneManager->RegisterScene(IDSCN_PLAYLIST_CREATOR, IDC_PLAYLIST_CREATOR_FORM, PANEL_BLANK);
        r = pSceneManager->RegisterScene(IDSCN_PLAYLIST_RENAME, IDC_PLAYLIST_RENAME_FORM, PANEL_BLANK);