[MusicPlayer] Fixed jira issues and apply SearchForm UIBuilder and modify ThumbnailPr...
authorMyunkyu <mk70.kang@partner.samsung.com>
Wed, 3 Apr 2013 11:25:19 +0000 (20:25 +0900)
committerMyunkyu <mk70.kang@partner.samsung.com>
Wed, 3 Apr 2013 12:14:21 +0000 (21:14 +0900)
Change-Id: I340f2b138e8c436f3e5d60163ecc67bf5a936305

34 files changed:
inc/MpMusicPlayerPresentationModel.h
inc/MpThumbnailProvider.h
inc/MpTypes.h
res/screen-size-normal/IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL.xml [deleted file]
res/screen-size-normal/IDL_CONTENTS_DETAIL_FORM.xml
res/screen-size-normal/IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_SEARCH_FORM.xml [new file with mode: 0644]
src/MpAlbumContentListForm.cpp
src/MpAlbumListEditorPanel.cpp
src/MpAlbumListPanel.cpp
src/MpAllListEditorPanel.cpp
src/MpAllListPanel.cpp
src/MpArtistAlbumListEditorForm.cpp
src/MpArtistAlbumListForm.cpp
src/MpArtistAllSongListForm.cpp
src/MpArtistContentListForm.cpp
src/MpArtistListEditorPanel.cpp
src/MpArtistListPanel.cpp
src/MpArtistPickerPanel.cpp
src/MpContentDetailForm.cpp
src/MpFolderContentListForm.cpp
src/MpMusicPlayerApp.cpp
src/MpMusicPlayerForm.cpp
src/MpMusicPlayerPresentationModel.cpp
src/MpPlaylistContentListForm.cpp
src/MpPlaylistCreatorForm.cpp
src/MpPlaylistListEditorPanel.cpp
src/MpPlaylistListPanel.cpp
src/MpPlaylistReNameForm.cpp
src/MpSearchForm.cpp
src/MpSettingForm.cpp
src/MpThumbnailProvider.cpp
src/MpTypes.cpp
src/MpUserPlaylistContentListForm.cpp

index 1e1fbc3..41410c2 100644 (file)
@@ -23,7 +23,7 @@
 #define _MP_MUSIC_PLAYER_PRESENTATION_MODEL_H_
 
 #include <FMedia.h>
-/*#include <FTelephony.h>*/
+#include <FTelephony.h>
 #include "MpContentInformationStruct.h"
 
 class IMusicPlayerEventListener;
@@ -31,8 +31,8 @@ class IMusicPlayerEventListener;
 class PlayerPresentationModel
        : public Tizen::Base::Runtime::ITimerEventListener
        , public Tizen::Media::IPlayerEventListener
-       /*, public Tizen::Media::IAudioSessionEventListener
-       , public Tizen::Telephony::ITelephonyCallEventListener*/
+       /*, public Tizen::Media::IAudioSessionEventListener*/
+       , public Tizen::Telephony::ITelephonyCallEventListener
 {
 public:
        static PlayerPresentationModel* GetInstance(void);
@@ -59,6 +59,7 @@ public:
        void StopForwardRewind(void);
        result SetPlayPosition(int playPosition);
        int GetPlayPosition(void);
+       Tizen::Base::String GetCurrentDuration(void);
        ContentInformation* GetContentInfoN(int contentIndex);
        Tizen::Graphics::Bitmap* GetContentAlbumArtN(int contentIndex);
 
@@ -78,7 +79,7 @@ public:
        result StartAutoOffTimer(int autoOffValue);
        void RemoveContent(const Tizen::Base::String& filePath);
 
-       /*virtual void OnTelephonyCallStatusChangedN(Tizen::Telephony::CallStatus callStatus, Tizen::Telephony::CallInfo* pCallInfo);*/
+       virtual void OnTelephonyCallStatusChangedN(Tizen::Telephony::CallStatus callStatus, Tizen::Telephony::CallInfo* pCallInfo);
 
        virtual void OnPlayerOpened(result r);
        virtual void OnPlayerReleased(void);
@@ -151,8 +152,8 @@ private:
 
        Tizen::Media::PlayerState __previousPlayerState;
        int __xTimesValue;
-       /*Tizen::Telephony::CallManager* __pCallManager;
-       bool __audioFocusChanged;*/
+       Tizen::Telephony::CallManager* __pCallManager;
+       /*bool __audioFocusChanged;*/
        static PlayerPresentationModel* pPlayerPresentationModel;
 };
 
index 89333c5..896d6ca 100644 (file)
@@ -44,7 +44,7 @@ public:
        const Tizen::Graphics::Bitmap* GetDefaultThumbnail(void) const;
 
        static void Release(void);
-       static void DestroyInstance(void);
+       virtual result Quit(void);
 
 private:
        ThumbnailProvider(void);
@@ -61,6 +61,7 @@ private:
        Tizen::Base::String GetFileNameFromFullPath(const Tizen::Base::String& fullPath, bool withExt) const;
 
        static result CreateInstance(void);
+       static void DestroyInstance(void);
 
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList * pArgs);
        virtual bool OnStart(void);
@@ -71,6 +72,7 @@ private:
        Tizen::Base::Collection::ArrayList* __pCmdQueue;
        Tizen::Graphics::Bitmap* __pDefaultThumbnail;
        unsigned long __requestId;
+       bool __isForceClose;
 
        static ThumbnailProvider* __pThumbnailProviderInstance;
 };
index 9f7f828..d7aa69e 100644 (file)
@@ -436,7 +436,7 @@ extern const wchar_t* IDL_CONTENTS_LIBARY_ITEM_PANEL;
 extern const wchar_t* IDL_CONTENTS_LIBARY_EDITOR_PANEL;
 extern const wchar_t* IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL;
 extern const wchar_t* IDL_MUSIC_PLAYER_FORM;
-extern const wchar_t* IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL;
+extern const wchar_t* IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL;
 extern const wchar_t* IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL;
 extern const wchar_t* IDL_PLAYLIST_CREATOR_FORM;
 extern const wchar_t* IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL;
@@ -465,6 +465,7 @@ extern const wchar_t* IDL_CONTENT_LIST_ARTIST_FORM;
 extern const wchar_t* IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL;
 extern const wchar_t* IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL;
 extern const wchar_t* IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL;
+extern const wchar_t* IDL_SEARCH_FORM;
 //_XML IDL_
 
 //_XML IDC_
@@ -538,6 +539,9 @@ extern const wchar_t* IDC_CONTENT_GROUPED_TABLEVIEW;
 extern const wchar_t* IDC_LABEL_MAIN_TEXT;
 extern const wchar_t* IDC_LABEL_SUB_TEXT;
 extern const wchar_t* IDC_LABEL_EX;
+extern const wchar_t* IDC_SEARCHBAR_CONTENT_SEARCH;
+extern const wchar_t* IDC_TABLEVIEW_CONTENT_SEARCH;
+extern const wchar_t* IDC_MEDIA_INFO_LABEL;
 //_XML IDC_
 
 //<--__XML_IDC_ORDERING PREFIX : IDC_CONTROLTYPE_ EX) IDC_BUTTON_TOGGLE_PLAY
diff --git a/res/screen-size-normal/IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL.xml b/res/screen-size-normal/IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL.xml
deleted file mode 100644 (file)
index dcf61dd..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!--\r
-       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.201302250944" Dversion="20120315">\r
-    <Panel id="IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\r
-        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout height="669" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
-        <layout height="700" mode="Landscape" type="LAYOUT_RELATIVE" width="547" x="0" y="0"/>\r
-    </Panel>\r
-    <Label id="IDC_ALBUM_THUMBANIL_BACKGROUND" parent="IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\r
-        <property backgroundBitmapPath="T02_album_thumbnail_h_bg.PNG" 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="525" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="19" marginRight="0" marginTop="90" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="525" x="19" y="90"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="406" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MUSIC_PLAYER_ALBUM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="406" x="16" y="147"/>\r
-    </Label>\r
-    <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_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="492" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="8" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="492" x="35" y="98"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="374" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="8" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="374" x="32" y="155"/>\r
-    </Label>\r
-    <Label id="IDC_ALBUM_TURN_TABLE" parent="IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\r
-        <property backgroundBitmapPath="T02_album_turn_table_h.PNG" 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="484" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="198" marginRight="19" marginTop="14" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="497" x="204" y="104"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="368" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="14" marginTop="12" mode="Landscape" rightRelation="IDC_MUSIC_PLAYER_ALBUM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="369" x="164" y="159"/>\r
-    </Label>\r
-</ScenePanel>\r
index 9b4287b..fc02ec9 100644 (file)
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-       This XML file was automatically generated by UiBuilder - do not modify by hand.
--->
-<!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201303250953" Dversion="20120315">
-    <LogicalCoordinate>720</LogicalCoordinate>
-    <Form id="IDL_CONTENTS_DETAIL_FORM">
-        <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"/>
-        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
-        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
-    </Form>
-    <Footer>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON_TEXT" 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>
-    <Label id="IDC_TITLE_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="CONTENT NAME" textColor="#3B73B6" textSize="56.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="0.0" marginTop="32.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="678.0" x="16.0" y="32.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="28.0" marginTop="32.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1236.0" x="16.0" y="32.0"/>
-    </Label>
-    <Label id="IDC_ARTIST_NAME_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Artist name" textColor="#4A4947" textSize="37.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="678.0" x="16.0" y="100.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="28.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1236.0" x="16.0" y="100.0"/>
-    </Label>
-    <Label id="IDC_MEDIA_INFO_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Media Info" textColor="#3B73B6" textSize="52.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="62.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="26.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="668.0" x="26.0" y="160.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="62.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="28.0" marginRight="28.0" marginTop="20.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1224.0" x="28.0" y="160.0"/>
-    </Label>
-    <Label id="IDC_NAME_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Name" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="26.0" marginTop="28.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="134.0" x="26.0" y="250.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="28.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="135.0" x="26.0" y="250.0"/>
-    </Label>
-    <Label id="IDC_FORMAT_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Format" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="155.0" x="26.0" y="300.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="155.0" x="26.0" y="300.0"/>
-    </Label>
-    <Label id="IDC_SIZE_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Size" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="105.0" x="26.0" y="350.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="105.0" x="26.0" y="350.0"/>
-    </Label>
-    <Label id="IDC_FORWARDING_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Forwarding" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="225.0" x="26.0" y="400.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="225.0" x="26.0" y="400.0"/>
-    </Label>
-    <Label id="IDC_DATE_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Date created" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="250.0" x="26.0" y="450.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="250.0" x="26.0" y="450.0"/>
-    </Label>
-    <Label id="IDC_LOCATION_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Location" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="180.0" x="26.0" y="500.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="180.0" x="26.0" y="500.0"/>
-    </Label>
-    <Label id="IDC_NAME_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NAME_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="28.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_MEDIA_INFO_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="534.0" x="160.0" y="250.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NAME_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="28.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_MEDIA_INFO_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1093.0" x="161.0" y="250.0"/>
-    </Label>
-    <Label id="IDC_FORMAT_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FORMAT_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_NAME_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="513.0" x="181.0" y="300.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FORMAT_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_NAME_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1073.0" x="181.0" y="300.0"/>
-    </Label>
-    <Label id="IDC_SIZE_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SIZE_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="563.0" x="131.0" y="350.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SIZE_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_FORMAT_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1123.0" x="131.0" y="350.0"/>
-    </Label>
-    <Label id="IDC_FORWARDING_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FORWARDING_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SIZE_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="443.0" x="251.0" y="400.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FORWARDING_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SIZE_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1003.0" x="251.0" y="400.0"/>
-    </Label>
-    <Label id="IDC_LOCATION_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LOCATION_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="488.0" x="206.0" y="500.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_DATE_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_FORWARDING_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="978.0" x="276.0" y="450.0"/>
-    </Label>
-    <Label id="IDC_DATE_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_DATE_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_FORWARDING_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="418.0" x="276.0" y="450.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LOCATION_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LOCATION_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1048.0" x="206.0" y="500.0"/>
-    </Label>
-</Scene>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       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.201304011927" Dversion="20120315">\r
+    <LogicalCoordinate>720</LogicalCoordinate>\r
+    <Form id="IDL_CONTENTS_DETAIL_FORM">\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_FOOTER" type="LAYOUT_RELATIVE"/>\r
+        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>\r
+    </Form>\r
+    <Footer>\r
+        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON_TEXT" 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"/>\r
+        <itemSet/>\r
+    </Footer>\r
+    <Label id="IDC_TITLE_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="CONTENT NAME" textColor="#3B73B6" textSize="56.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="0.0" marginTop="32.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="678.0" x="16.0" y="32.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="28.0" marginTop="32.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1236.0" x="16.0" y="32.0"/>\r
+    </Label>\r
+    <Label id="IDC_ARTIST_NAME_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Artist name" textColor="#4A4947" textSize="37.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="678.0" x="16.0" y="100.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="28.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1236.0" x="16.0" y="100.0"/>\r
+    </Label>\r
+    <Label id="IDC_MEDIA_INFO_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Media Info" textColor="#3B73B6" textSize="52.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="62.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="26.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="668.0" x="26.0" y="160.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="62.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="28.0" marginRight="28.0" marginTop="20.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1224.0" x="28.0" y="160.0"/>\r
+    </Label>\r
+    <Label id="IDC_NAME_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Name" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="26.0" marginTop="28.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="134.0" x="26.0" y="250.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="28.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="135.0" x="26.0" y="250.0"/>\r
+    </Label>\r
+    <Label id="IDC_FORMAT_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Format" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="155.0" x="26.0" y="300.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="155.0" x="26.0" y="300.0"/>\r
+    </Label>\r
+    <Label id="IDC_SIZE_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Size" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="105.0" x="26.0" y="350.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="105.0" x="26.0" y="350.0"/>\r
+    </Label>\r
+    <Label id="IDC_FORWARDING_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Forwarding" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="225.0" x="26.0" y="400.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="225.0" x="26.0" y="400.0"/>\r
+    </Label>\r
+    <Label id="IDC_DATE_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Date created" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="250.0" x="26.0" y="450.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="250.0" x="26.0" y="450.0"/>\r
+    </Label>\r
+    <Label id="IDC_LOCATION_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Location" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="180.0" x="26.0" y="500.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="180.0" x="26.0" y="500.0"/>\r
+    </Label>\r
+    <Label id="IDC_NAME_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NAME_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="28.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_MEDIA_INFO_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="534.0" x="160.0" y="250.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NAME_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="28.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_MEDIA_INFO_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1093.0" x="161.0" y="250.0"/>\r
+    </Label>\r
+    <Label id="IDC_FORMAT_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FORMAT_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_NAME_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="513.0" x="181.0" y="300.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FORMAT_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_NAME_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1073.0" x="181.0" y="300.0"/>\r
+    </Label>\r
+    <Label id="IDC_SIZE_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SIZE_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="563.0" x="131.0" y="350.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SIZE_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_FORMAT_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1123.0" x="131.0" y="350.0"/>\r
+    </Label>\r
+    <Label id="IDC_FORWARDING_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FORWARDING_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SIZE_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="443.0" x="251.0" y="400.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FORWARDING_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SIZE_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1003.0" x="251.0" y="400.0"/>\r
+    </Label>\r
+    <Label id="IDC_LOCATION_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LOCATION_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="488.0" x="206.0" y="500.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_DATE_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_FORWARDING_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="978.0" x="276.0" y="450.0"/>\r
+    </Label>\r
+    <Label id="IDC_DATE_DATA_LABEL" parent="IDL_CONTENTS_DETAIL_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#000000" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_DATE_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_FORWARDING_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="418.0" x="276.0" y="450.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LOCATION_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LOCATION_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1048.0" x="206.0" y="500.0"/>\r
+    </Label>\r
+</Scene>\r
diff --git a/res/screen-size-normal/IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL.xml b/res/screen-size-normal/IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL.xml
new file mode 100644 (file)
index 0000000..02cddcb
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       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.201304011927" Dversion="20120315">\r
+    <Panel id="IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="669.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="0.0"/>\r
+        <layout height="700.0" mode="Landscape" type="LAYOUT_RELATIVE" width="547.0" x="0.0" y="0.0"/>\r
+    </Panel>\r
+    <Label id="IDC_ALBUM_THUMBANIL_BACKGROUND" parent="IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\r
+        <property accessibilityHint="" backgroundBitmapPath="T02_album_thumbnail_h_bg.PNG" 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="true" height="525.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="19.0" marginRight="0.0" marginTop="90.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="525.0" x="19.0" y="72.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="406.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MUSIC_PLAYER_ALBUM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="406.0" x="16.0" y="147.0"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\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="492.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="0.0" marginTop="8.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="492.0" x="35.0" y="80.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="374.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="0.0" marginTop="8.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="374.0" x="32.0" y="155.0"/>\r
+    </Label>\r
+    <Label id="IDC_ALBUM_TURN_TABLE" parent="IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\r
+        <property accessibilityHint="" backgroundBitmapPath="T02_album_turn_table_h.PNG" 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="484.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="198.0" marginRight="19.0" marginTop="14.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="497.0" x="204.0" y="86.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="368.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="14.0" marginTop="12.0" mode="Landscape" rightRelation="IDC_MUSIC_PLAYER_ALBUM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="369.0" x="164.0" y="159.0"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_SEARCH_FORM.xml b/res/screen-size-normal/IDL_SEARCH_FORM.xml
new file mode 100644 (file)
index 0000000..d82c7d3
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
+\r
+<Scene Bversion="2.0.0.201303280948" Dversion="20120315">\r
+    <LogicalCoordinate>720</LogicalCoordinate>\r
+    <Form id="IDL_SEARCH_FORM">\r
+        <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"/>\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
+    <Footer>\r
+        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON_TEXT" 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"/>\r
+        <itemSet/>\r
+    </Footer>\r
+    <Header>\r
+        <property accessibilityHint="" backgroundBitmapPath="" color="#FFFFFF" 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="Search" titleTextColor="#3B73B6"/>\r
+        <itemSet/>\r
+    </Header>\r
+    <SearchBar id="IDC_SEARCHBAR_CONTENT_SEARCH" parent="IDL_SEARCH_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" buttonActionId="0" buttonText="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonTextColor="" disabledSearchFieldColor="" disabledSearchFieldTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" guideText="" guideTextColor="" highlightedButtonColor="" highlightedButtonTextColor="" highlightedSearchFieldColor="" highlightedSearchFieldTextColor="" keypadAction="KEYPAD_ACTION_SEARCH" limitLength="500" lowerCaseMode="false" normalButtonColor="" normalButtonTextColor="" normalSearchFieldColor="" normalSearchFieldTextColor="" pressedButtonColor="" pressedButtonTextColor="" searchFieldTextSize="33.0" showSearchBarButton="true" text="" textPredictionEnabled="true"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="86.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SEARCH_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_SEARCH_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_SEARCH_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="86.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SEARCH_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_SEARCH_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_SEARCH_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>\r
+    </SearchBar>\r
+    <TableView id="IDC_TABLEVIEW_CONTENT_SEARCH" parent="IDL_SEARCH_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="IDL_SEARCH_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="925.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SEARCH_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_SEARCH_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SEARCHBAR_CONTENT_SEARCH" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="86.0"/>\r
+        <layout bottomRelation="IDL_SEARCH_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="398.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SEARCH_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_SEARCH_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SEARCHBAR_CONTENT_SEARCH" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="86.0"/>\r
+    </TableView>\r
+</Scene>\r
index 2221fab..e143ca8 100644 (file)
@@ -100,6 +100,7 @@ result
 AlbumContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        AppLogDebug("EXIT");
        return ContentListForm::OnTerminating();
 }
index f94a5a2..ae17352 100644 (file)
@@ -62,6 +62,7 @@ result
 AlbumListEditorPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        if (__pPlayListPickerPopup != null)
        {
                delete __pPlayListPickerPopup;
index a683720..8050e7c 100644 (file)
@@ -67,6 +67,7 @@ result
 AlbumListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        RemoveContextMenu();
 
        if (__pPlayListPickerPopup != null)
index 426fe61..367b615 100644 (file)
@@ -68,6 +68,7 @@ result
 AllListEditorPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        if (__pPlayListPickerPopup != null)
        {
                delete __pPlayListPickerPopup;
@@ -247,7 +248,7 @@ AllListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
        }
        SetEditHeaderStyle();
 
-       if (__editType == IDA_MORE_CONTEXT_MENU_EDIT)
+       if (__editType == IDA_CONTEXT_MENU_ITEM_EDIT)
        {
                pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_ADDTO_DELETE_ADD);
        }
@@ -440,7 +441,7 @@ AllListEditorPanel::SetEditHeaderStyle(void)
        AppLogDebug("ENTER");
        RemoveParentHeaderActionEventListener();
        Header* pHeader = GetParentHeader();
-       if(__editType == IDA_MORE_CONTEXT_MENU_EDIT)
+       if(__editType == IDA_CONTEXT_MENU_ITEM_EDIT)
        {
                String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
                CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
index 9ed218e..a3466af 100644 (file)
@@ -104,6 +104,7 @@ result
 AllListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        RemoveContextMenu();
        if (__pPlayListPickerPopup != null)
        {
@@ -162,13 +163,8 @@ AllListPanel::OnAppControlCompleteResponseReceived(const AppId& appId,
                        }
 
                        delete pContentInfoStruct;
-                       pContentInfoStruct = null;
-
                        delete pContact;
-                       pContact = null;
-
                        delete pAddressbook;
-                       pAddressbook = null;
                }
        }
        AppLogDebug("EXIT");
@@ -278,7 +274,6 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        pFrame->SetEnabled(false);
 
                        delete pAppControl;
-                       pAppControl = null;
                }
                break;
 
@@ -303,7 +298,7 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_FLICK_BUTTON_DELETE:
+       case IDA_FLICK_MENU_ITEM_DELETE:
                {
                        if (__pDeletePopup != null)
                        {
@@ -447,36 +442,16 @@ AllListPanel::CreateItem(const int itemIndex, int itemWidth)
        pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
        CreateTableViewItem(*pItem, *pContentInfoStruct);
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
-
        pItem->SetContextItem(__pContextItem);
+       CommonUtil::SetLayoutFitToContainer(*pItem, *__pContextItem);
        delete pContentInfoStruct;
-       pContentInfoStruct = null;
+
+       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
 
        AppLogDebug("EXIT");
        return pItem;
 }
 
-//bool
-//AllListPanel::DeleteItem(const int itemIndex, TableViewItem* pItem)
-//{
-//     AppLogDebug("ENTER");
-//
-//     delete pItem;
-//     pItem = null;
-//
-//     AppLogDebug("EXIT");
-//     return true;
-//}
-
-//int
-//AllListPanel::GetDefaultItemHeight(void)
-//{
-//     AppLogDebug("ENTER");
-//     AppLogDebug("EXIT");
-//     return ITEM_HEIGHT;
-//}
-
 void
 AllListPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                int itemIndex,
@@ -508,15 +483,6 @@ AllListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::
        AppLogDebug("EXIT");
 }
 
-//void
-//AllListPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-//                                             int itemIndexFrom,
-//                                             int itemIndexTo)
-//{
-//     AppLogDebug("ENTER");
-//     AppLogDebug("EXIT");
-//}
-
 void
 AllListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index)
 {
index a0164c9..0d2f342 100644 (file)
@@ -100,6 +100,7 @@ result
 ArtistAlbumListEditorForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
index f0b3ed3..4d8d08b 100644 (file)
@@ -116,7 +116,7 @@ result
 ArtistAlbumListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-
+       CancelAllThumbnailRequest();
        delete __pContextItem;
        __pContextItem = null;
 
index 7e69933..c4bc922 100644 (file)
@@ -94,6 +94,7 @@ result
 ArtistAllSongListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        delete __pPlayListPickerPopup;
        __pPlayListPickerPopup = null;
        AppLogDebug("EXIT");
index 1b25937..c441558 100644 (file)
@@ -114,6 +114,7 @@ result
 ArtistContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        RemoveCheckedItemMultiHashMap();
 
        delete __pTableViewContextItem;
index 1858da8..2f2156d 100644 (file)
@@ -63,6 +63,7 @@ result
 ArtistListEditorPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
index d87e7b2..0209f8b 100644 (file)
@@ -67,6 +67,7 @@ result
 ArtistListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        RemoveContextMenu();
        AppLogDebug("EXIT");
        return E_SUCCESS;
index 2c792df..652d88d 100644 (file)
@@ -102,9 +102,6 @@ ArtistPickerPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& t
 
        if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
        {
-               //__pPresentationModel->InitializeContentList(itemIndex);
-               //pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ARTIST_CONTENT_PICKER));
-
                ContentInformation* pContentInfoStruct = __pPresentationModel->GetArtistnIfoN(itemIndex);
                if (pContentInfoStruct == null)
                {
@@ -114,9 +111,7 @@ ArtistPickerPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& t
                ArrayList* pData = new (std::nothrow) ArrayList();
                pData->Construct();
                pData->Add(*(new (std::nothrow) String(pContentInfoStruct->ArtistName)));
-
                delete pContentInfoStruct;
-               pContentInfoStruct = null;
 
                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ARTIST_CONTENT_PICKER), pData);
        }
index 6b8f724..34e2aa5 100644 (file)
@@ -78,11 +78,17 @@ ContentDetailForm::OnInitializing(void)
        AudioContentInfo* pAudioInfo = CommonUtil::GetAudioContentInfoN(*(tempPath));
 
        Label* pTitletName = static_cast<Label*>(GetControl(IDC_TITLE_LABEL));
+       pTitletName->SetTextConfig(56,LABEL_TEXT_STYLE_BOLD);
        pTitletName->SetText(pAudioInfo->GetTitle());
 
        Label* pArtistName = static_cast<Label*>(GetControl(IDC_ARTIST_NAME_LABEL));
+       pArtistName->SetTextConfig(37,LABEL_TEXT_STYLE_NORMAL);
        pArtistName->SetText(pAudioInfo->GetArtist());
 
+       Label* pMediaInfo = static_cast<Label*>(GetControl(IDC_MEDIA_INFO_LABEL));
+       pMediaInfo->SetTextConfig(52,LABEL_TEXT_STYLE_NORMAL);
+       pMediaInfo->SetText(L"Media info");
+
        Label* pTitletNameInMediaInfo = static_cast<Label*>(GetControl(IDC_NAME_DATA_LABEL));
        pTitletNameInMediaInfo->SetText(pAudioInfo->GetTitle());
 
index ce8dca7..66333c0 100644 (file)
@@ -102,6 +102,7 @@ result
 FolderContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        __pPresentationModel = null;
        delete __pTableViewContextItem;
        __pTableViewContextItem = null;
index 2024546..982e5b7 100644 (file)
@@ -153,8 +153,6 @@ MusicPlayerApp::OnAppTerminating(AppRegistry& appRegistry, bool forcedTerminatio
        if (pThumbnailProvider != null)
        {
                pThumbnailProvider->Quit();
-               pThumbnailProvider->DestroyInstance();
-       //      Tizen::Base::Runtime::Thread::Sleep(1000);
        }
        AppLogDebug("EXIT");
        return true;
@@ -384,4 +382,4 @@ MusicPlayerApp::GetOperationId(void)
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
        return __operationId;
-}
+}
\ No newline at end of file
index a85d850..b9fee20 100644 (file)
@@ -89,6 +89,7 @@ enum PlayerScreenState
        PLAYER_SCREEN_STATE_NORMAL = PLAYER_SCREEN_STATE_BASE,
        PLAYER_SCREEN_STATE_NO_CONTENT_LIST,
        PLAYER_SCREEN_STATE_APP_CONTROL,
+       PLAYER_SCREEN_STATE_ERROR_CONTENT,
        PLAYER_SCREEN_STATE_MAX
 };
 
@@ -272,9 +273,9 @@ PlayerForm::OnInitializing(void)
        pContentsTableView->SetItemProvider(this);
 
        __pContentsAlbumViewPanel = new (std::nothrow) Panel();
-       if (IsFailed(__pContentsAlbumViewPanel->Construct(IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL)))
+       if (IsFailed(__pContentsAlbumViewPanel->Construct(IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL)))
        {
-               AppLogDebug("Construct(IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               AppLogDebug("Construct(IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
                delete __pContentsAlbumViewPanel;
                return E_FAILURE;
        }
@@ -332,11 +333,12 @@ void
 PlayerForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
 {
        AppLogDebug("ENTER");
-       Label* pAlbumThumbnailLabel = static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
-       FloatDimension floatDimension = pAlbumThumbnailLabel->GetSizeF();
+       FloatDimension floatDimension = static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->GetSizeF();
+
        __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->SetBounds(FloatRectangle(0.0f, 0.0f, floatDimension.width, floatDimension.height));
        __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->SetBounds(FloatRectangle(-604.0, 0.0f, floatDimension.width, floatDimension.height));
        __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->SetBounds(FloatRectangle(836.0, 0.0f, floatDimension.width, floatDimension.height));
+
        rectanglePreviousElement = __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->GetBounds();
        rectangleCurrentElement = __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->GetBounds();
        rectangleNextElement = __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->GetBounds();
@@ -369,6 +371,7 @@ result
 PlayerForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        if (__pAlbumArtElements)
        {
                __pAlbumArtElements->Destroy();
@@ -1081,7 +1084,7 @@ PlayerForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableVie
 
                if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
                {
-//                     SetMoreContentMenuStatus(false);
+                       SetMoreContentMenuStatus(false);
                }
        }
        AppLogDebug("EXIT");
@@ -1156,6 +1159,7 @@ PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
 
                SetContentInfo( __pPlayerPresentationModel->GetCurrentContentIndex());
                OnPlayStateChanged(__pPlayerPresentationModel->GetPlayerState());
+               OnPlayTimeChanged(__pPlayerPresentationModel->GetCurrentDuration(), __pPlayerPresentationModel->GetPlayPosition());
        }
 
        if (__pContentsListViewPanel->GetShowState() == true)
@@ -1178,8 +1182,13 @@ PlayerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
                                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
-       __pPlayerPresentationModel->RemoveMusicPlayerEventListener(*this);
        CancelAllThumbnailRequest();
+       __pPlayerPresentationModel->RemoveMusicPlayerEventListener(*this);
+
+       if (__pVolumePanel != null && __pVolumePanel->GetShowState())
+       {
+               __pVolumePanel->SetShowState(false);
+       }
        AppLogDebug("EXIT");
 }
 
@@ -1239,15 +1248,9 @@ PlayerForm::OnPlayStateChanged(PlayerState playerState)
        AppLogDebug("%d", playerState);
        if (playerState == PLAYER_STATE_ERROR)
        {
+               SetContentInfo( __pPlayerPresentationModel->GetCurrentContentIndex());
+               SetPlayerScreenState(PLAYER_SCREEN_STATE_ERROR_CONTENT);
                ShowMessageBox(L"file play failed");
-               __pPlayStateSlider->SetEnabled(false);
-               SetMoreContentMenuStatus(false);
-       }
-       else
-       {
-//             __pPlayStateSlider->SetEnabled(true);
-//             SetMoreContentMenuStatus(true);
-               __pPlayStateSlider->SetValue(__pPlayerPresentationModel->GetPlayPosition());
        }
 
        TogglePlayPauseImage(playerState);
@@ -1259,6 +1262,7 @@ PlayerForm::OnPlayContentChanged(int currentContentIndex)
 {
        AppLogDebug("ENTER");
        SetContentInfo(currentContentIndex);
+       SetPlayerScreenState(PLAYER_SCREEN_STATE_NORMAL);
        AppLogDebug("EXIT");
 }
 
@@ -1368,16 +1372,9 @@ PlayerForm::SetContentInfo(int currentContentIndex)
        __pTitleName->SetText(pContentInfoStruct->TitleName);
        __pArtistName->SetText(pContentInfoStruct->ArtistName);
 
-//     if (__pHorizontalHeaderPanel != null)
-//     {
-//             __pHorizontalHeaderTitleLabel->SetText(pContentInfoStruct->TitleName);
-//             __pHorizontalHeaderSubTitleLabel->SetText(pContentInfoStruct->ArtistName);
-//     }
-
        __pPlayStateSlider->SetRange(MIN_PLAY_STATE_SLIDER_COUNT, MAX_PLAY_STATE_SLIDER_COUNT);
 
        String totalTime = CommonUtil::GetFormatDate(pContentInfoStruct->Duration);
-       AppLogDebug("%ls", totalTime.GetPointer());
        if (totalTime.Equals(INITIAL_TIME, true) != true)
        {
                __pTotalTimeLabel->SetText(totalTime);
@@ -1402,9 +1399,7 @@ PlayerForm::SetContentInfo(int currentContentIndex)
                        SetMoreContentMenuStatus(true);
                }
        }
-
        delete pContentInfoStruct;
-       pContentInfoStruct = null;
 
        UpdateAnimationAlbumArt(ALBUM_ART_IMAGE_CURRENT);
        Invalidate(true);
@@ -1416,6 +1411,7 @@ PlayerForm::UpdateAnimationAlbumArt(AlbumArtImage position)
 {
        AppLogDebug("ENTER");
        Bitmap* pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT];
+       FloatDimension floatDimension = static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->GetSizeF();
 
        switch (position)
        {
@@ -1424,6 +1420,10 @@ PlayerForm::UpdateAnimationAlbumArt(AlbumArtImage position)
                        pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT] = __pPlayerPresentationModel->GetContentAlbumArtN(__pPlayerPresentationModel->GetCurrentContentIndex());
                        pAlbumArtBitmap[ALBUM_ART_IMAGE_PREVIOUS] = __pPlayerPresentationModel->GetContentAlbumArtN(__pPlayerPresentationModel->GetPreviousContentIndex());
                        pAlbumArtBitmap[ALBUM_ART_IMAGE_NEXT] = __pPlayerPresentationModel->GetContentAlbumArtN(__pPlayerPresentationModel->GetNextContentIndex());
+
+                       pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT]->Scale(floatDimension);
+                       pAlbumArtBitmap[ALBUM_ART_IMAGE_PREVIOUS]->Scale(floatDimension);
+                       pAlbumArtBitmap[ALBUM_ART_IMAGE_NEXT]->Scale(floatDimension);
                }
                break;
 
@@ -1432,6 +1432,8 @@ PlayerForm::UpdateAnimationAlbumArt(AlbumArtImage position)
                        pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT] = null;
                        pAlbumArtBitmap[ALBUM_ART_IMAGE_PREVIOUS] = __pPlayerPresentationModel->GetContentAlbumArtN(__pPlayerPresentationModel->GetPreviousContentIndex());
                        pAlbumArtBitmap[ALBUM_ART_IMAGE_NEXT] = null;
+
+                       pAlbumArtBitmap[ALBUM_ART_IMAGE_PREVIOUS]->Scale(floatDimension);
                }
                break;
 
@@ -1440,6 +1442,8 @@ PlayerForm::UpdateAnimationAlbumArt(AlbumArtImage position)
                        pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT] = null;
                        pAlbumArtBitmap[ALBUM_ART_IMAGE_PREVIOUS] = null;
                        pAlbumArtBitmap[ALBUM_ART_IMAGE_NEXT] = __pPlayerPresentationModel->GetContentAlbumArtN(__pPlayerPresentationModel->GetNextContentIndex());
+
+                       pAlbumArtBitmap[ALBUM_ART_IMAGE_NEXT]->Scale(floatDimension);
                }
                break;
 
@@ -1447,8 +1451,6 @@ PlayerForm::UpdateAnimationAlbumArt(AlbumArtImage position)
                break;
        }
 
-       FloatDimension floatDimension = static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->GetSizeF();
-
        if (pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT] != null)
        {
                Canvas* pCanvas = __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->GetCanvasN();
@@ -1540,7 +1542,7 @@ PlayerForm::SetShuffleButtonImage(bool shuffleEnable)
 
        if (shuffleEnable == false)
        {
-               pOptionShuffleBitmap = ResourceManager::GetBitmapN(L"T02_option_shuffle_on_press.png");
+               pOptionShuffleBitmap = ResourceManager::GetBitmapN(L"T02_option_shuffle_on_dim.png");
        }
        else
        {
@@ -1601,6 +1603,7 @@ PlayerForm::SetPlayButtonImage(void)
        Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_PLAY_BUTTON_ICON_NORMAL);
        __pPlayPauseButton->SetNormalBitmap(point, *pBitmap);
        delete pBitmap;
+
        pBitmap = ResourceManager::GetBitmapN(IDB_PLAY_BUTTON_ICON_PRESSED);
        __pPlayPauseButton->SetPressedBitmap(point, *pBitmap);
        delete pBitmap;
@@ -1608,6 +1611,7 @@ PlayerForm::SetPlayButtonImage(void)
        pBitmap = ResourceManager::GetBitmapN(IDB_PLAY_BUTTON_ICON_DISABLED);
        __pPlayPauseButton->SetDisabledBitmap(point, *pBitmap);
        delete pBitmap;
+
        __pPlayPauseButton->SetActionId(IDA_PLAYER_CONTROLLER_PLAY);
        __pPlayPauseButton->Invalidate(true);
        AppLogDebug("EXIT");
@@ -1621,12 +1625,15 @@ PlayerForm::SetPauseButtonImage(void)
        Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_PAUSE_BUTTON_ICON_NORMAL);
        __pPlayPauseButton->SetNormalBitmap(point, *pBitmap);
        delete pBitmap;
+
        pBitmap = ResourceManager::GetBitmapN(IDB_PAUSE_BUTTON_ICON_PRESSED);
        __pPlayPauseButton->SetPressedBitmap(point, *pBitmap);
        delete pBitmap;
+
        pBitmap = ResourceManager::GetBitmapN(IDB_PAUSE_BUTTON_ICON_DISABLED);
        __pPlayPauseButton->SetDisabledBitmap(point, *pBitmap);
        delete pBitmap;
+
        __pPlayPauseButton->SetActionId(IDA_PLAYER_CONTROLLER_PAUSE);
        __pPlayPauseButton->Invalidate(true);
        AppLogDebug("EXIT");
@@ -1791,8 +1798,28 @@ void
 PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
 {
        AppLogDebug("ENTER");
+       if (__playerScreenState == playerScreenState)
+       {
+               AppLogDebug("EXIT");
+               return;
+       }
+
        switch (playerScreenState)
        {
+       case PLAYER_SCREEN_STATE_NORMAL:
+               {
+                       __pVolumeButton->SetEnabled(true);
+                       __pContentsViewToggleButton->SetEnabled(true);
+                       __pShuffleButton->SetEnabled(true);
+                       __pRepeatButton->SetEnabled(true);
+                       __pRewindButton->SetEnabled(true);
+                       __pPlayPauseButton->SetEnabled(true);
+                       __pForwardButton->SetEnabled(true);
+                       __pPlayStateSlider->SetEnabled(true);
+                       __pMoreContextButton->SetEnabled(true);
+               }
+               break;
+
        case PLAYER_SCREEN_STATE_NO_CONTENT_LIST:
                {
                        __pVolumeButton->SetEnabled(false);
@@ -1820,6 +1847,18 @@ PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
                }
                break;
 
+       case PLAYER_SCREEN_STATE_ERROR_CONTENT:
+               {
+                       __pPlayPauseButton->SetEnabled(false);
+                       __pPlayStateSlider->SetEnabled(false);
+                       __pMoreContextButton->SetEnabled(false);
+                       Bitmap* pThumb = ResourceManager::GetBitmapN(L"music_play_grid_thumb_loading.png");
+                       static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->SetBackgroundBitmap(*pThumb);
+                       delete pThumb;
+                       static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->RemoveTouchEventListener(*this);
+               }
+               break;
+
        default:
                break;
        }
index 1fb194b..c0df9ee 100644 (file)
@@ -42,7 +42,7 @@ using namespace Tizen::Graphics;
 using namespace Tizen::Io;
 using namespace Tizen::Media;
 using namespace Tizen::System;
-/*using namespace Tizen::Telephony;*/
+using namespace Tizen::Telephony;
 using namespace Tizen::Ui::Controls;
 
 #define BUFFER_INFO_OF_PLAYER  0
@@ -106,7 +106,7 @@ PlayerPresentationModel::PlayerPresentationModel(void)
        , __playposition(MIN_SLIDER_COUNT)
        , __previousPlayerState(PLAYER_STATE_ERROR)
        , __xTimesValue(INIT_X_VALUE)
-       /*, __pCallManager(null)*/
+       , __pCallManager(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -172,6 +172,11 @@ PlayerPresentationModel::~PlayerPresentationModel(void)
        delete __pCurrentPlayContentThumbnail;
        delete __pCurrentPlayContentArtist;
 
+       if (__pCallManager != null)
+       {
+               delete __pCallManager;
+       }
+
        if (__pPlayer == null)
        {
                AppLogDebug("EXIT");
@@ -232,26 +237,17 @@ PlayerPresentationModel::DestroyPlayerPresentationModel(void)
        AppLogDebug("EXIT");
 }
 
-/*void
+void
 PlayerPresentationModel::OnTelephonyCallStatusChangedN(Tizen::Telephony::CallStatus callStatus, Tizen::Telephony::CallInfo* pCallInfo)
 {
        AppLogDebug("ENTER");
        AppLogDebug("callStatus : %d", callStatus);
-       if (callStatus == CALL_STATUS_IDLE && __audioFocusChanged == true)
+       if (callStatus == CALL_STATUS_IDLE)
        {
-               AppLogDebug("callStatus : %d", callStatus);
-               if (__pCurrentPlayContentPath->Equals(*GetContentPath(__currentContentIndex)))
-               {
-                       Play(__currentContentIndex, __playposition, true);
-               }
-               else
-               {
-                       Play(__currentContentIndex, __playposition);
-               }
-               __audioFocusChanged = false;
+               CallOnPlayContentChanged(__currentContentIndex);
        }
        AppLogDebug("EXIT");
-}*/
+}
 
 result
 PlayerPresentationModel::Construct(void)
@@ -291,8 +287,8 @@ PlayerPresentationModel::Construct(void)
        __repeatMode = CommonUtil::GetValue(REPEAT_MODE);
        __shuffleEnable = static_cast<bool>(CommonUtil::GetValue(SHUFFLE_MODE));
 
-       /*__pCallManager = new (std::nothrow) CallManager();
-       __pCallManager->Construct(*this);*/
+       __pCallManager = new (std::nothrow) CallManager();
+       __pCallManager->Construct(*this);
 
        InitializePlayer();
 
@@ -1277,6 +1273,23 @@ PlayerPresentationModel::GetPlayPosition(void)
        return __playposition;
 }
 
+String
+PlayerPresentationModel::GetCurrentDuration(void)
+{
+       AppLogDebug("ENTER");
+       String currentDuration;
+       if (__pPlayer != null)
+       {
+               currentDuration = CommonUtil::GetFormatDate(__pPlayer->GetPosition());
+       }
+       else
+       {
+               currentDuration = CommonUtil::GetFormatDate(INIT_VALUE);
+       }
+       AppLogDebug("EXIT");
+       return currentDuration;
+}
+
 result
 PlayerPresentationModel::SetContentList(IList* pArgs)
 {
@@ -1931,8 +1944,12 @@ PlayerPresentationModel::CallOnPlayStateChanged(PlayerState playerState)
        while (pEnum->MoveNext() == E_SUCCESS)
        {
                pEnum->GetCurrent(pListener);
-               pListener->OnPlayStateChanged(playerState);
+               if (pListener != null)
+               {
+                       pListener->OnPlayStateChanged(playerState);
+               }
        }
+       delete pEnum;
        AppLogDebug("EXIT");
 }
 
@@ -1945,8 +1962,12 @@ PlayerPresentationModel::CallOnPlayContentChanged(int currentContentIndex)
        while (pEnum->MoveNext() == E_SUCCESS)
        {
                pEnum->GetCurrent(pListener);
-               pListener->OnPlayContentChanged(currentContentIndex);
+               if (pListener != null)
+               {
+                       pListener->OnPlayContentChanged(currentContentIndex);
+               }
        }
+       delete pEnum;
        AppLogDebug("EXIT");
 }
 
@@ -1959,8 +1980,12 @@ PlayerPresentationModel::CallOnPlayContentRemoved(int removedContentIndex)
        while (pEnum->MoveNext() == E_SUCCESS)
        {
                pEnum->GetCurrent(pListener);
-               pListener->OnPlayContentRemoved(removedContentIndex);
+               if (pListener != null)
+               {
+                       pListener->OnPlayContentRemoved(removedContentIndex);
+               }
        }
+       delete pEnum;
        AppLogDebug("EXIT");
 }
 
@@ -1973,8 +1998,12 @@ PlayerPresentationModel::CallOnPlayTimeChanged(Tizen::Base::String& currentDurat
        while (pEnum->MoveNext() == E_SUCCESS)
        {
                pEnum->GetCurrent(pListener);
-               pListener->OnPlayTimeChanged(currentDuration, currentPosition);
+               if (pListener != null)
+               {
+                       pListener->OnPlayTimeChanged(currentDuration, currentPosition);
+               }
        }
+       delete pEnum;
        AppLogDebug("EXIT");
 }
 
@@ -1987,8 +2016,12 @@ PlayerPresentationModel::CallOnPlayVolumeBarStateChanged(void)
        while (pEnum->MoveNext() == E_SUCCESS)
        {
                pEnum->GetCurrent(pListener);
-               pListener->OnPlayVolumeBarStateChanged();
+               if (pListener != null)
+               {
+                       pListener->OnPlayVolumeBarStateChanged();
+               }
        }
+       delete pEnum;
        AppLogDebug("EXIT");
 }
 
@@ -2001,7 +2034,11 @@ PlayerPresentationModel::CallOnPlayPresentationModelDestroying(void)
        while (pEnum->MoveNext() == E_SUCCESS)
        {
                pEnum->GetCurrent(pListener);
-               pListener->OnPlayPresentationModelDestroying();
+               if (pListener != null)
+               {
+                       pListener->OnPlayPresentationModelDestroying();
+               }
        }
+       delete pEnum;
        AppLogDebug("EXIT");
 }
\ No newline at end of file
index fee3734..21f1bb2 100644 (file)
@@ -101,6 +101,7 @@ result
 PlaylistContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        AppLogDebug("EXIT");
        return ContentListForm::OnTerminating();
 }
index 1859b65..d8e7282 100644 (file)
@@ -66,7 +66,7 @@ PlaylistCreatorForm::OnInitializing(void)
        __pPlaylistEditField = static_cast<EditField*>(GetControl(IDC_EDITFIELD));
        __pPlaylistEditField->AddTextEventListener(*this);
        __pPlaylistEditField->AddKeypadEventListener(*this);
-
+       __pPlaylistEditField->SetOverlayKeypadCommandButtonVisible(false);
        __pPlaylistEditField->SetFocus();
        __pPlaylistEditField->ShowKeypad();
        __pPlaylistEditorPresentationModel = PlaylistEditorPresentationModel::GetInstance();
index 7b47e49..ae9cf49 100644 (file)
@@ -69,6 +69,7 @@ result
 PlaylistListEditorPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
index c9859c4..c252b77 100644 (file)
@@ -97,6 +97,7 @@ result
 PlaylistListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        RemoveContextMenu();
        if (__pDeletePopup != null)
        {
index b01fa33..e3349d0 100644 (file)
@@ -66,7 +66,7 @@ PlaylistReNameForm::OnInitializing(void)
        __pPlaylistEditField = static_cast<EditField*>(GetControl(IDC_EDITFIELD));
        __pPlaylistEditField->AddTextEventListener(*this);
        __pPlaylistEditField->AddKeypadEventListener(*this);
-
+       __pPlaylistEditField->SetOverlayKeypadCommandButtonVisible(false);
        __pPlaylistEditField->SetFocus();
        __pPlaylistEditField->ShowKeypad();
        __pPlaylistEditorPresentationModel = PlaylistEditorPresentationModel::GetInstance();
index aa38b3a..a506132 100644 (file)
@@ -30,7 +30,6 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int H_SEARCH_BAR = 86;
 static const int H_GROUP_NAME = 80;
 static const int X_GAP = 16;
 static const int SEARCH_FONT_SIZE = 50;
@@ -57,7 +56,7 @@ bool
 SearchForm::Initialize(void)
 {
        AppLogDebug("ENTER");
-       Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       Construct(IDL_SEARCH_FORM);
        AppLogDebug("EXIT");
        return true;
 }
@@ -68,18 +67,14 @@ SearchForm::OnInitializing(void)
        AppLogDebug("ENTER");
        GetHeader()->SetTitleText(ResourceManager::GetString("IDS_COM_BODY_SEARCH"));
 
-       __pSearchBar = new (std::nothrow) SearchBar();
-       __pSearchBar->Construct(Rectangle(0, 0, GetClientAreaBounds().width, H_SEARCH_BAR));
+       __pSearchBar = static_cast<SearchBar*>(GetControl(IDC_SEARCHBAR_CONTENT_SEARCH));
        __pSearchBar->SetGuideText(ResourceManager::GetString("IDS_COM_BODY_SEARCH"));
        __pSearchBar->AddSearchBarEventListener(*this);
        __pSearchBar->AddTextEventListener(*this);
        __pSearchBar->AddKeypadEventListener(*this);
        __pSearchBar->SetLowerCaseModeEnabled(true);
 
-       __pSearchTableView = new (std::nothrow) TableView();
-       __pSearchTableView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height - __pSearchBar->GetHeight()),
-                                       true,
-                                       TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
+       __pSearchTableView = static_cast<TableView*>(GetControl(IDC_TABLEVIEW_CONTENT_SEARCH));
        __pSearchTableView->SetItemProvider(this);
        __pSearchTableView->AddTableViewItemEventListener(*this);
        __pSearchTableView->AddTouchEventListener(*this);
@@ -89,8 +84,6 @@ SearchForm::OnInitializing(void)
        GetFooter()->SetBackButton();
        SetFormBackEventListener(this);
 
-       AddControl(*__pSearchBar);
-
        __pPresentationModel = SearchPresentationModel::GetInstance();
 
        AppLogDebug("EXIT");
index 2d71b42..5cc1a0c 100644 (file)
@@ -329,6 +329,13 @@ void
 SettingForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem)
 {
        AppLogDebug("ENTER");
+       if (groupIndex == ID_MAIN_AUTO_OFF_ITEM)
+       {
+               Label* pLabelSubtext = static_cast<Label*>(pItem->GetControl(IDC_LABEL_SUB_TEXT, true));
+               pLabelSubtext->SetText(GetAutoOffString());
+               pLabelSubtext->Invalidate(false);
+       }
+       __pSettingTableView->Invalidate(true);
        AppLogDebug("EXIT");
 }
 
@@ -432,8 +439,8 @@ SettingForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTabl
                                        __pSettingTableView->SetItemChecked(groupIndex, i, false);
                                }
                        }
-                       __pSettingTableView->Invalidate(true);
                        __pPresentationModel->StartAutoOffTimer(__pSettingPresentationModel->SetAutoOffTime(itemIndex));
+                       tableView.RefreshItem(groupIndex, -1, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
                }
                break;
 
index 3872d86..239962f 100644 (file)
@@ -48,6 +48,7 @@ ThumbnailProvider::ThumbnailProvider(void)
        , __pCmdQueue(null)
        , __pDefaultThumbnail(null)
        , __requestId(0)
+       , __isForceClose(false)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
@@ -109,7 +110,7 @@ ThumbnailProvider::Construct(void)
        TryCatch(r == E_SUCCESS, , "[%s] Unable to construct queue", GetErrorMessage(r));
 
        CreateDefaultThumbnailBitmap();
-
+       __isForceClose = false;
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
        return EventDrivenThread::Construct();
 
@@ -146,7 +147,7 @@ ThumbnailProvider::CreateInstance(void)
                return r;
        }
 
-//     std::atexit(DestroyInstance);
+       std::atexit(DestroyInstance);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
        return E_SUCCESS;
 }
@@ -179,7 +180,7 @@ ThumbnailProvider::RequestThumbnail(const ContentId& contentId, const ThumbnailE
        AppLogDebug("[THREAD] Request Job - (MainThread)");
 
        if (contentId.ToString().IsEmpty() == true || event == null
-               || __pMutexCmd == null || __pCmdQueue == null)
+               || __pMutexCmd == null || __pCmdQueue == null || __isForceClose == true)
        {
                AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
                return;
@@ -279,6 +280,16 @@ ThumbnailProvider::OnStop(void)
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
+result
+ThumbnailProvider::Quit(void)
+{
+       AppLogDebug("ENTER");
+       __isForceClose = true;
+       ClearThumbnailRequests();
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return EventDrivenThread::Quit();
+}
+
 void
 ThumbnailProvider::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
 {
@@ -325,7 +336,7 @@ ThumbnailProvider::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                if (pThumbnailJob != null && requestId == pThumbnailJob->GetRequestId())
                {
                        ThumbnailEvent* pThumbnailEvent = const_cast<ThumbnailEvent*>(pThumbnailJob->GetEvent());
-                       if (pThumbnailEvent != null)
+                       if (pThumbnailEvent != null && __isForceClose == false)
                        {
                                ThumbnailEventArg* pSendingArg = new (std::nothrow) ThumbnailEventArg(pThumbnailInfo);
                                pThumbnailEvent->Fire(*pSendingArg);
@@ -370,7 +381,6 @@ ThumbnailProvider::GetThumbnailInfoN(const ContentId& contentId, void* pParam) c
                                {
                                        delete pContentInfo;
                                        return null;
-                               //      pBitmap = ResourceManager::GetBitmapN(IDB_NO_CONTENTS_BROKEN);
                                }
                        }
 
@@ -440,40 +450,4 @@ ThumbnailProvider::DestroyDefaultThumbnailBitmap(void)
        delete __pDefaultThumbnail;
        __pDefaultThumbnail = null;
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
-}
-
-/*String
-ThumbnailProvider::GetFileNameFromFullPath(const String& fullPath, bool withExt) const
-{
-       AppLogDebug("ENTER");
-       if (fullPath.CompareTo(EMPTY_SPACE) == 0)
-       {
-               AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
-
-               return EMPTY_SPACE;
-       }
-
-       String delim(DIRECTORY_SEPARATOR);
-       StringTokenizer st(fullPath,delim);
-       String token;
-       while (st.HasMoreTokens())
-       {
-               st.GetNextToken(token);
-       }
-
-       if (withExt == true)
-       {
-               AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
-               return token;
-       }
-       else
-       {
-               String subDelim(FILE_EXT_SEPARATOR);
-               StringTokenizer subSt(token, subDelim);
-               String subToken;
-               subSt.GetNextToken(subToken);
-               AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
-               return subToken;
-       }
-}
-*/
+}
\ No newline at end of file
index 9f7c5fe..3a71692 100644 (file)
@@ -51,7 +51,7 @@ const wchar_t* IDL_CONTENTS_LIBARY_ITEM_PANEL = L"IDL_CONTENTS_LIBARY_ITEM_PANEL
 const wchar_t* IDL_CONTENTS_LIBARY_EDITOR_PANEL = L"IDL_CONTENTS_LIBARY_EDITOR_PANEL";
 const wchar_t* IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL = L"IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL";
 const wchar_t* IDL_MUSIC_PLAYER_FORM = L"IDL_MUSIC_PLAYER_FORM";
-const wchar_t* IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL = L"IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL";
+const wchar_t* IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL = L"IDL_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL";
 const wchar_t* IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL = L"IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL";
 const wchar_t* IDL_PLAYLIST_CREATOR_FORM = L"IDL_PLAYLIST_CREATOR_FORM";
 const wchar_t* IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL = L"IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL";
@@ -80,6 +80,7 @@ const wchar_t* IDL_CONTENT_LIST_ARTIST_FORM = L"IDL_CONTENT_LIST_ARTIST_FORM";
 const wchar_t* IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL = L"IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL";
 const wchar_t* IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL = L"IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL";
 const wchar_t* IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL = L"IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL";
+const wchar_t* IDL_SEARCH_FORM = L"IDL_SEARCH_FORM";
 //_XML_IDL_
 
 //_XML_IDC_
@@ -153,6 +154,9 @@ const wchar_t* IDC_CONTENT_GROUPED_TABLEVIEW = L"IDC_CONTENT_GROUPED_TABLEVIEW";
 const wchar_t* IDC_LABEL_MAIN_TEXT = L"IDC_LABEL_MAIN_TEXT";
 const wchar_t* IDC_LABEL_SUB_TEXT = L"IDC_LABEL_SUB_TEXT";
 const wchar_t* IDC_LABEL_EX = L"IDC_LABEL_EX";
+const wchar_t* IDC_SEARCHBAR_CONTENT_SEARCH = L"IDC_SEARCHBAR_CONTENT_SEARCH";
+const wchar_t* IDC_TABLEVIEW_CONTENT_SEARCH = L"IDC_TABLEVIEW_CONTENT_SEARCH";
+const wchar_t* IDC_MEDIA_INFO_LABEL = L"IDC_MEDIA_INFO_LABEL";
 //__XML_IDC_
 
 //<--__XML_IDC_ORDERING PREFIX : IDC_CONTROLTYPE_ EX) IDC_BUTTON_TOGGLE_PLAY
index 8480538..7d80924 100644 (file)
@@ -96,6 +96,7 @@ result
 UserPlaylistContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        __pPresentationModel = null;
        AppLogDebug("EXIT");
        return ContentListForm::OnTerminating();