Fixed jira issue and add operation process for sound source that did not get the...

Change-Id: I5123c0bf284ec5b648e6ea82e7237a6414b521ce

diff --git a/inc/MpArtistListPresentationModel.h b/inc/MpArtistListPresentationModel.h
index 222375b..a5fb302 100644 (file)
--- a/inc/MpArtistListPresentationModel.h
+++ b/inc/MpArtistListPresentationModel.h
@@ -64,6 +64,8 @@ private:
        Tizen::Base::Collection::IList* __pArtistContentList;
        Tizen::Base::Collection::IList* __pArtistAlbumContentList;
        Tizen::Base::Collection::ArrayList* __pArtistAlbumList;
+       Tizen::Base::String __keyWord;
+
        static ArtistListPresentationModel* pArtistListPresentationModelInstance;
        int __currentArtistAlbumIndex;
 };

diff --git a/inc/MpContentListForm.h b/inc/MpContentListForm.h
index f72259e..2c0af3e 100644 (file)
--- a/inc/MpContentListForm.h
+++ b/inc/MpContentListForm.h
@@ -125,7 +125,7 @@ private:
        Tizen::Ui::Container* __pContentList;
        Tizen::Ui::Controls::ContextMenu* __pContextMenu;
        Tizen::Ui::Controls::Popup* __pCommonUtilPopupHandler;
-       Tizen::Ui::Controls::Label* __pNoContent;
+       Tizen::Ui::Controls::Panel* __pNoContent;
        Tizen::Ui::Controls::Label* __pNoContentText;
        Tizen::Ui::Controls::Panel* __pExtraInformaionArea;
        Tizen::Ui::Controls::Label* __pBallonTooltip;

diff --git a/inc/MpContentPanel.h b/inc/MpContentPanel.h
index b9233d2..c8b3630 100644 (file)
--- a/inc/MpContentPanel.h
+++ b/inc/MpContentPanel.h
@@ -79,8 +79,7 @@ protected:
 \r
 protected:\r
        Tizen::Ui::Controls::TableView* __pContentTableView;\r
-       Tizen::Ui::Controls::Label* __pNoContentLabel;\r
-       Tizen::Ui::Controls::Label* __pNoContenttextLabel;\r
+       Tizen::Ui::Controls::Panel* __pNoContentLabel;\r
        FooterButtonStyle __footerButtonStyle;\r
 };\r
 \r

diff --git a/inc/MpPlaylistEditorPresentationModel.h b/inc/MpPlaylistEditorPresentationModel.h
index 9783b3b..ce076ea 100644 (file)
--- a/inc/MpPlaylistEditorPresentationModel.h
+++ b/inc/MpPlaylistEditorPresentationModel.h
@@ -40,6 +40,7 @@ public:
        Tizen::Graphics::Bitmap* GetPlayListItemBitmap(Tizen::Base::String& playlist);
        Tizen::Content::ContentId GetPlayListItemContentId(Tizen::Base::String& playlist);
        result SetPlayListName(const Tizen::Base::String& oldPlayListName, const Tizen::Base::String& newPlayListName);
+       bool IsPlaylistExist(Tizen::Base::String& playlist);
        void RemovePlayList(Tizen::Base::String& playlistName);
        void AddItem(const Tizen::Content::ContentId& contentId, Tizen::Base::String& name);
 

diff --git a/inc/MpPlaylistReNameForm.h b/inc/MpPlaylistReNameForm.h
index a435acb..f396791 100644 (file)
--- a/inc/MpPlaylistReNameForm.h
+++ b/inc/MpPlaylistReNameForm.h
@@ -28,6 +28,7 @@
 #include <FUi.h>
 #include <FUiControl.h>
 #include <FUiCtrlButtonItem.h>
+#include "MpIMusicContentUpdateEventListner.h"
 
 class PlaylistEditorPresentationModel;
 
@@ -38,6 +39,7 @@ class PlaylistReNameForm
        , public Tizen::Ui::IActionEventListener
        , public Tizen::Ui::ITextEventListener
        , public Tizen::Ui::Scenes::ISceneEventListener
+       , public IMusicContentUpdateEventListner
 {
 public:
        PlaylistReNameForm(void);
@@ -63,11 +65,13 @@ public:
        virtual void OnTextValueChanged(const Tizen::Ui::Control& source);
        virtual void OnTextValueChangeCanceled(const Tizen::Ui::Control& source);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+       virtual void OnMusicContentUpdateCompleted(void);
 
 private:
        PlaylistEditorPresentationModel* __pPlaylistEditorPresentationModel;
        Tizen::Ui::Controls::EditField* __pPlaylistEditField;
        Tizen::Base::String __playlistName;
+       Tizen::Base::String __orignalPlaylistName;
        int __selectedPlaylistIndex;
 };
 

diff --git a/inc/MpTypes.h b/inc/MpTypes.h
index 527068a..d9ceef5 100644 (file)
--- a/inc/MpTypes.h
+++ b/inc/MpTypes.h
@@ -546,8 +546,7 @@ extern const wchar_t* IDC_SIZE_LABEL;
 extern const wchar_t* IDC_FORWARDING_LABEL;
 extern const wchar_t* IDC_DATE_LABEL;
 extern const wchar_t* IDC_LOCATION_LABEL;
-extern const wchar_t* IDC_NO_CONTENTS_ICON;
-extern const wchar_t* IDC_NO_CONTENTS_TEXT;
+extern const wchar_t* IDC_NO_CONTENTS_PANEL;
 //_XML IDC_
 
 //<--__XML_IDC_ORDERING PREFIX : IDC_CONTROLTYPE_ EX) IDC_BUTTON_TOGGLE_PLAY

diff --git a/res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_PANEL.xml b/res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_PANEL.xml
index fa0863e..44a5dd7 100644 (file)
--- a/res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_PANEL.xml
+++ b/res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_PANEL.xml
@@ -19,19 +19,19 @@
         <layout bottomRelation="IDC_ITEM_SELECTED_COUNT_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="408.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>\r
         <layout bottomRelation="IDC_ITEM_SELECTED_COUNT_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="552.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="800.0" x="0.0" y="0.0"/>\r
     </TableView>\r
-    <Panel id="IDC_PANEL1" parent="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
+    <Panel id="IDC_NO_CONTENTS_PANEL" parent="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="188.0" y="56.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="228.0" y="128.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="188.0" y="56.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="228.0" y="128.0"/>\r
     </Panel>\r
-    <Label id="IDC_NO_CONTENTS_ICON" parent="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
+    <Label id="IDC_LABEL1" parent="IDC_NO_CONTENTS_PANEL">\r
         <property accessibilityHint="" backgroundBitmapPath="T02_nocomposers.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="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="56.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="260.0" y="128.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="0.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="0.0"/>\r
     </Label>\r
-    <Label id="IDC_NO_CONTENTS_TEXT" parent="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
+    <Label id="IDC_LABEL2" parent="IDC_NO_CONTENTS_PANEL">\r
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="::IDS_MUSIC_HEADER_NO_SONGS" textColor="" textSize="28.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_ICON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="336.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_ICON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="260.0" y="408.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="280.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="280.0"/>\r
     </Label>\r
 </ScenePanel>\r

diff --git a/res/screen-size-normal/IDL_CONTENT_LIBARY_ALL_LIST_PANEL.xml b/res/screen-size-normal/IDL_CONTENT_LIBARY_ALL_LIST_PANEL.xml
index 0a7473e..524a435 100644 (file)
--- a/res/screen-size-normal/IDL_CONTENT_LIBARY_ALL_LIST_PANEL.xml
+++ b/res/screen-size-normal/IDL_CONTENT_LIBARY_ALL_LIST_PANEL.xml
@@ -19,19 +19,19 @@
         <layout bottomRelation="IDC_MINI_PLAYER_REGISTER_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="456.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIBARY_ALL_LIST_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENT_LIBARY_ALL_LIST_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIBARY_ALL_LIST_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>\r
         <layout bottomRelation="IDC_MINI_PLAYER_REGISTER_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="600.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIBARY_ALL_LIST_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENT_LIBARY_ALL_LIST_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIBARY_ALL_LIST_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="800.0" x="0.0" y="0.0"/>\r
     </TableView>\r
-    <Panel id="IDC_PANEL1" parent="IDL_CONTENT_LIBARY_ALL_LIST_PANEL">\r
+    <Panel id="IDC_NO_CONTENTS_PANEL" parent="IDL_CONTENT_LIBARY_ALL_LIST_PANEL">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="188.0" y="56.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="228.0" y="128.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="188.0" y="56.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="228.0" y="128.0"/>\r
     </Panel>\r
-    <Label id="IDC_NO_CONTENTS_ICON" parent="IDL_CONTENT_LIBARY_ALL_LIST_PANEL">\r
+    <Label id="IDC_LABEL1" parent="IDC_NO_CONTENTS_PANEL">\r
         <property accessibilityHint="" backgroundBitmapPath="T02_nocomposers.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="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="56.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="260.0" y="128.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="0.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="0.0"/>\r
     </Label>\r
-    <Label id="IDC_NO_CONTENTS_TEXT" parent="IDL_CONTENT_LIBARY_ALL_LIST_PANEL">\r
+    <Label id="IDC_LABEL2" parent="IDC_NO_CONTENTS_PANEL">\r
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="::IDS_MUSIC_HEADER_NO_SONGS" textColor="" textSize="28.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_ICON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="336.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_ICON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="260.0" y="408.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="280.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="280.0"/>\r
     </Label>\r
 </ScenePanel>\r

diff --git a/res/screen-size-normal/IDL_CONTENT_LIBARY_COMMON_PANEL.xml b/res/screen-size-normal/IDL_CONTENT_LIBARY_COMMON_PANEL.xml
index 9617846..68919d9 100644 (file)
--- a/res/screen-size-normal/IDL_CONTENT_LIBARY_COMMON_PANEL.xml
+++ b/res/screen-size-normal/IDL_CONTENT_LIBARY_COMMON_PANEL.xml
@@ -21,17 +21,17 @@
     </TableView>\r
     <Panel id="IDC_NO_CONTENTS_PANEL" parent="IDL_CONTENT_LIBARY_COMMON_PANEL">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="188.0" y="56.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="228.0" y="128.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="188.0" y="56.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="228.0" y="128.0"/>\r
     </Panel>\r
-    <Label id="IDC_NO_CONTENTS_ICON" parent="IDL_CONTENT_LIBARY_COMMON_PANEL">\r
+    <Label id="IDC_LABEL1" parent="IDC_NO_CONTENTS_PANEL">\r
         <property accessibilityHint="" backgroundBitmapPath="T02_nocomposers.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="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="56.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="260.0" y="128.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="0.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="0.0"/>\r
     </Label>\r
-    <Label id="IDC_NO_CONTENTS_TEXT" parent="IDL_CONTENT_LIBARY_COMMON_PANEL">\r
+    <Label id="IDC_LABEL2" parent="IDC_NO_CONTENTS_PANEL">\r
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="::IDS_MUSIC_HEADER_NO_SONGS" textColor="" textSize="28.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_ICON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="336.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_ICON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="260.0" y="408.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="280.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="280.0"/>\r
     </Label>\r
 </ScenePanel>\r

diff --git a/res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_FORM.xml b/res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_FORM.xml
index faf6358..8e40260 100644 (file)
--- a/res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_FORM.xml
+++ b/res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_FORM.xml
@@ -28,19 +28,19 @@
         <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="963.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ARTIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ARTIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_ARTIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>\r
         <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="475.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ARTIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ARTIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_ARTIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>\r
     </GroupedTableView>\r
-    <Panel id="IDC_PANEL1" parent="IDL_CONTENT_LIST_ARTIST_FORM">\r
+    <Panel id="IDC_NO_CONTENTS_PANEL" parent="IDL_CONTENT_LIST_ARTIST_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="188.0" y="333.5"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="468.0" y="89.5"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="188.0" y="333.5"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="468.0" y="89.5"/>\r
     </Panel>\r
-    <Label id="IDC_NO_CONTENTS_ICON" parent="IDL_CONTENT_LIST_ARTIST_FORM">\r
+    <Label id="IDC_LABEL1" parent="IDC_NO_CONTENTS_PANEL">\r
         <property accessibilityHint="" backgroundBitmapPath="T02_nocomposers.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="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="333.5"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="500.0" y="89.5"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="0.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="0.0"/>\r
     </Label>\r
-    <Label id="IDC_NO_CONTENTS_TEXT" parent="IDL_CONTENT_LIST_ARTIST_FORM">\r
+    <Label id="IDC_LABEL2" parent="IDC_NO_CONTENTS_PANEL">\r
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="::IDS_MUSIC_HEADER_NO_SONGS" textColor="" textSize="28.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_ICON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="613.5"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_ICON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="500.0" y="369.5"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="280.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="280.0"/>\r
     </Label>\r
 </Scene>\r

diff --git a/res/screen-size-normal/IDL_CONTENT_LIST_FORM.xml b/res/screen-size-normal/IDL_CONTENT_LIST_FORM.xml
index d9923e7..c226e73 100644 (file)
--- a/res/screen-size-normal/IDL_CONTENT_LIST_FORM.xml
+++ b/res/screen-size-normal/IDL_CONTENT_LIST_FORM.xml
@@ -33,19 +33,19 @@
         <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="1011.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL_CONTENT_ADDITIONAL_INFO" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>\r
         <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="523.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL_CONTENT_ADDITIONAL_INFO" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>\r
     </TableView>\r
-    <Panel id="IDC_PANEL1" parent="IDL_CONTENT_LIST_FORM">\r
+    <Panel id="IDC_NO_CONTENTS_PANEL" parent="IDL_CONTENT_LIST_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="188.0" y="316.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="468.0" y="89.5"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="188.0" y="316.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="344.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="344.0" x="468.0" y="89.5"/>\r
     </Panel>\r
-    <Label id="IDC_NO_CONTENTS_ICON" parent="IDL_CONTENT_LIST_FORM">\r
+    <Label id="IDC_LABEL1" parent="IDC_NO_CONTENTS_PANEL">\r
         <property accessibilityHint="" backgroundBitmapPath="T02_nocomposers.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="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="316.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="500.0" y="89.5"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="0.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="0.0"/>\r
     </Label>\r
-    <Label id="IDC_NO_CONTENTS_TEXT" parent="IDL_CONTENT_LIST_FORM">\r
+    <Label id="IDC_LABEL2" parent="IDC_NO_CONTENTS_PANEL">\r
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="::IDS_MUSIC_HEADER_NO_SONGS" textColor="" textSize="28.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_ICON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="596.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NO_CONTENTS_ICON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="500.0" y="369.5"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="280.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NO_CONTENTS_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="32.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="32.0" y="280.0"/>\r
     </Label>\r
 </Scene>\r

diff --git a/src/MpAlbumListPanel.cpp b/src/MpAlbumListPanel.cpp
index 0dea549..e4ff43c 100644 (file)
--- a/src/MpAlbumListPanel.cpp
+++ b/src/MpAlbumListPanel.cpp
@@ -423,4 +423,4 @@ AlbumListPanel::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType
 
        AppLogDebug("EXIT");
        return __pPresentationModel->GetContentPathListN(__itemIndex);
-}
+}
\ No newline at end of file

diff --git a/src/MpAllListPanel.cpp b/src/MpAllListPanel.cpp
index d94c42a..709b966 100644 (file)
--- a/src/MpAllListPanel.cpp
+++ b/src/MpAllListPanel.cpp
@@ -706,4 +706,4 @@ AllListPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pIte
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file

diff --git a/src/MpArtistListPanel.cpp b/src/MpArtistListPanel.cpp
index 76bcdf1..f8c6e35 100644 (file)
--- a/src/MpArtistListPanel.cpp
+++ b/src/MpArtistListPanel.cpp
@@ -460,4 +460,4 @@ ArtistListPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* p
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file

diff --git a/src/MpArtistListPresentationModel.cpp b/src/MpArtistListPresentationModel.cpp
index 122b888..f97efda 100644 (file)
--- a/src/MpArtistListPresentationModel.cpp
+++ b/src/MpArtistListPresentationModel.cpp
@@ -55,6 +55,7 @@ ArtistListPresentationModel::ArtistListPresentationModel(void)
        , __pArtistContentList(null)
        , __pArtistAlbumContentList(null)
        , __pArtistAlbumList(null)
+       , __keyWord(null)
        , __currentArtistAlbumIndex(-1)
 {
        AppLogDebug("ENTER");
@@ -294,6 +295,8 @@ ArtistListPresentationModel::InitializeArtistAlbumList(Tizen::Base::String& keyW
                delete __pArtistContentList;
        }
 
+       __keyWord = keyWord;
+
        IList* pContentSearchResultList = CommonUtil::ContentSearchResultListN(keyWord, STRING_SORT_ARTIST, STRING_SORT_ALBUM);
        if (pContentSearchResultList == null)
        {
@@ -370,7 +373,25 @@ ArtistListPresentationModel::InitializeContentList(int albumIndex)
                return;
        }
 
-       __pArtistAlbumContentList = CommonUtil::ContentSearchResultListN(*pContentFileName, STRING_SORT_ALBUM, STRING_SORT_TITLE);
+       if (__keyWord == null)
+       {
+               __pArtistAlbumContentList = CommonUtil::ContentSearchResultListN(*pContentFileName, STRING_SORT_ALBUM, STRING_SORT_TITLE);
+       }
+       else
+       {
+               String WhereExpr = null;
+               WhereExpr = CommonUtil::SpecialReplaceChange(__keyWord);
+               WhereExpr = CommonUtil::MakeQuery(STRING_SORT_ARTIST, WhereExpr);
+
+               String SearchKeyword(WhereExpr);
+               SearchKeyword.Append(L" AND ");
+
+               WhereExpr = CommonUtil::SpecialReplaceChange(*pContentFileName);
+               WhereExpr = CommonUtil::MakeQuery(STRING_SORT_ALBUM, WhereExpr);
+
+               SearchKeyword.Append(WhereExpr);
+               __pArtistAlbumContentList = CommonUtil::SearchContentList(SearchKeyword, STRING_SORT_TITLE);
+       }
        __currentArtistAlbumIndex = albumIndex;
        AppLogDebug("EXIT");
 }

diff --git a/src/MpContentEditPanel.cpp b/src/MpContentEditPanel.cpp
index 1cbdce7..24517f7 100644 (file)
--- a/src/MpContentEditPanel.cpp
+++ b/src/MpContentEditPanel.cpp
@@ -74,8 +74,7 @@ ContentEditPanel::Construct(void)
        __pContentTableView->SetItemProvider(this);\r
        __pContentTableView->AddTableViewItemEventListener(*this);\r
        __pBallonTooltip = static_cast<Label*>(GetControl(IDC_ITEM_SELECTED_COUNT_LABEL));\r
-       __pNoContentLabel = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_ICON));\r
-       __pNoContenttextLabel = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_TEXT));\r
+       __pNoContentLabel = static_cast<Panel*>(GetControl(IDC_NO_CONTENTS_PANEL));\r
        SetControlAlwaysOnTop(*__pBallonTooltip, true);\r
        AppLogDebug("EXIT");\r
        return E_SUCCESS;\r

diff --git a/src/MpContentListForm.cpp b/src/MpContentListForm.cpp
index 709591d..3963a9c 100644 (file)
--- a/src/MpContentListForm.cpp
+++ b/src/MpContentListForm.cpp
@@ -46,7 +46,6 @@ ContentListForm::ContentListForm(void)
        , __pContextMenu(null)
        , __pCommonUtilPopupHandler(null)
        , __pNoContent(null)
-       , __pNoContentText(null)
        , __pExtraInformaionArea(null)
        , __pBallonTooltip(null)
        , __pPlayListPicker(null)
@@ -75,7 +74,6 @@ ContentListForm::OnTerminating(void)
 
        __pContentList = null;
        __pNoContent = null;
-       __pNoContentText = null;
        __pExtraInformaionArea = null;
        __pBallonTooltip = null;
        AppLogDebug("EXIT");
@@ -100,8 +98,7 @@ result
 ContentListForm::Construct(void)
 {
        AppLogDebug("ENTER");
-       __pNoContent = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_ICON));
-       __pNoContentText = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_TEXT));
+       __pNoContent = static_cast<Panel*>(GetControl(IDC_NO_CONTENTS_PANEL));
        __pBallonTooltip = static_cast<Label*>(GetControl(IDC_LABEL_BALLOON_TOOLTIP));
 
        __pExtraInformaionArea = static_cast<Panel*>(GetControl(IDC_LABEL_CONTENT_ADDITIONAL_INFO));
@@ -421,7 +418,6 @@ ContentListForm::SetShowStateNoContent(bool isShow)
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
        CommonUtil::SetShowStateControl(*__pNoContent, isShow);
-       CommonUtil::SetShowStateControl(*__pNoContentText, isShow);
        return E_SUCCESS;
 }
 

diff --git a/src/MpContentListPanel.cpp b/src/MpContentListPanel.cpp
index f439ba3..84e68ee 100644 (file)
--- a/src/MpContentListPanel.cpp
+++ b/src/MpContentListPanel.cpp
@@ -91,8 +91,7 @@ ContentLibaryPanel::Construct(void)
        __pContentTableView->AddTableViewItemEventListener(*this);\r
 \r
        __pMiniPlayerRegisterBar = static_cast<Panel*>(GetControl(IDC_MINI_PLAYER_REGISTER_BAR));\r
-       __pNoContentLabel = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_ICON));\r
-       __pNoContenttextLabel = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_TEXT));\r
+       __pNoContentLabel = static_cast<Panel*>(GetControl(IDC_NO_CONTENTS_PANEL));\r
        AppLogDebug("EXIT");\r
        return E_SUCCESS;\r
 }\r

diff --git a/src/MpContentPanel.cpp b/src/MpContentPanel.cpp
index 85e7315..1337e75 100644 (file)
--- a/src/MpContentPanel.cpp
+++ b/src/MpContentPanel.cpp
@@ -31,7 +31,6 @@ using namespace Tizen::Ui::Controls;
 ContentPanel::ContentPanel(void)\r
        : __pContentTableView(null)\r
        , __pNoContentLabel(null)\r
-       , __pNoContenttextLabel(null)\r
        , __footerButtonStyle(STYLE_MAX)\r
 {\r
        AppLogDebug("ENTER");\r
@@ -54,13 +53,6 @@ ContentPanel::SetShowStateNoContent(bool isShow)
                __pNoContentLabel->SetShowState(isShow);\r
                __pNoContentLabel->Invalidate(true);\r
        }\r
-\r
-       if (__pNoContenttextLabel != null && __pNoContenttextLabel->GetShowState() != isShow)\r
-       {\r
-               __pNoContenttextLabel->SetShowState(isShow);\r
-               __pNoContenttextLabel->Invalidate(true);\r
-       }\r
-\r
        AppLogDebug("EXIT");\r
        return r;\r
 }\r

diff --git a/src/MpFolderListPanel.cpp b/src/MpFolderListPanel.cpp
index 0cc51ee..991da17 100644 (file)
--- a/src/MpFolderListPanel.cpp
+++ b/src/MpFolderListPanel.cpp
@@ -373,4 +373,4 @@ FolderListPanel::CreateTableViewItem(Tizen::Ui::Container& parent, const Tizen::
 
        AppLogDebug("EXIT");
        return E_SUCCESS;
-}
+}
\ No newline at end of file

diff --git a/src/MpMusicPlayerForm.cpp b/src/MpMusicPlayerForm.cpp
index f5c7973..cd98631 100644 (file)
--- a/src/MpMusicPlayerForm.cpp
+++ b/src/MpMusicPlayerForm.cpp
@@ -90,6 +90,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_INVALID_CONTENT_ID,
        PLAYER_SCREEN_STATE_ERROR_CONTENT,
        PLAYER_SCREEN_STATE_DURING_CALL,
        PLAYER_SCREEN_STATE_MAX
@@ -1437,7 +1438,7 @@ PlayerForm::SetContentInfo(int currentContentIndex)
 
        if (pContentInfoStruct->contentId.ToString().Equals(INVALID_VALUE_OF_CONTENT_ID, true))
        {
-               SetFileNotExistState(false);
+               SetPlayerScreenState(PLAYER_SCREEN_STATE_INVALID_CONTENT_ID);
        }
        else
        {
@@ -2003,6 +2004,13 @@ PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
                        __pPlayStateSlider->SetEnabled(true);
                        __pMoreContextButton->SetEnabled(true);
 
+                       if (__playerScreenState == PLAYER_SCREEN_STATE_INVALID_CONTENT_ID)
+                       {
+                               __pContentsViewToggleButton->SetEnabled(false);
+                               __pShuffleButton->SetEnabled(false);
+                               __pMoreContextButton->SetEnabled(false);
+                       }
+
                        if (__isRunByAppControl == false)
                        {
                                break;
@@ -2012,14 +2020,21 @@ PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
        case PLAYER_SCREEN_STATE_APP_CONTROL:
                {
                        __pContentsViewToggleButton->SetEnabled(false);
-                       __pContentsViewToggleButton->Invalidate(true);
                        __pShuffleButton->SetEnabled(false);
-                       __pRepeatButton->SetEnabled(false);
 
                        __isRunByAppControl = true;
                }
                break;
 
+       case PLAYER_SCREEN_STATE_INVALID_CONTENT_ID:
+               {
+                       __pContentsViewToggleButton->SetEnabled(false);
+                       __pContentsViewToggleButton->Invalidate(true);
+                       __pRepeatButton->SetEnabled(false);
+                       __pMoreContextButton->SetEnabled(false);
+               }
+               break;
+
        case PLAYER_SCREEN_STATE_NO_CONTENT_LIST:
                {
                        __pVolumeButton->SetEnabled(false);

diff --git a/src/MpPlaylistEditorPresentationModel.cpp b/src/MpPlaylistEditorPresentationModel.cpp
index 46c5ef1..6963194 100644 (file)
--- a/src/MpPlaylistEditorPresentationModel.cpp
+++ b/src/MpPlaylistEditorPresentationModel.cpp
@@ -229,6 +229,22 @@ PlaylistEditorPresentationModel::GetPlayListItemContentId(Tizen::Base::String& p
        return contentId;
 }
 
+bool
+PlaylistEditorPresentationModel::IsPlaylistExist(Tizen::Base::String& playlist)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("CATCH %ls", playlist.GetPointer());
+       PlayList* pPlaylist = PlayListManager::GetInstance()->GetPlayListN(playlist);
+       if (pPlaylist != null)
+       {
+               delete pPlaylist;
+               AppLogDebug("EXIT");
+               return true;
+       }
+       AppLogDebug("EXIT");
+       return false;
+}
+
 void
 PlaylistEditorPresentationModel::RemovePlayList(Tizen::Base::String& playlistName)
 {

diff --git a/src/MpPlaylistListPanel.cpp b/src/MpPlaylistListPanel.cpp
index d324da7..9feb07e 100644 (file)
--- a/src/MpPlaylistListPanel.cpp
+++ b/src/MpPlaylistListPanel.cpp
@@ -579,4 +579,4 @@ PlaylistListPanel::IsEmptyContentList(void)
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
        return false;
-}
+}
\ No newline at end of file

diff --git a/src/MpPlaylistReNameForm.cpp b/src/MpPlaylistReNameForm.cpp
index 21af9c0..9f7c4ad 100644 (file)
--- a/src/MpPlaylistReNameForm.cpp
+++ b/src/MpPlaylistReNameForm.cpp
@@ -39,6 +39,7 @@ PlaylistReNameForm::PlaylistReNameForm(void)
        : __pPlaylistEditorPresentationModel(null)
        , __pPlaylistEditField(null)
        , __playlistName(null)
+       , __orignalPlaylistName(null)
        , __selectedPlaylistIndex(0)
 {
        AppLogDebug("ENTER");
@@ -131,6 +132,7 @@ PlaylistReNameForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
        pPlaylistList = __pPlaylistEditorPresentationModel->GetAllPlayListNameN();
 
        __playlistName = *static_cast<String*>(pPlaylistList->GetAt(__selectedPlaylistIndex));
+       __orignalPlaylistName = __playlistName;
        __pPlaylistEditField->SetText(__playlistName);
        __pPlaylistEditField->ShowKeypad();
 
@@ -204,4 +206,20 @@ PlaylistReNameForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        SceneManager* pSceneManager = SceneManager::GetInstance();
        pSceneManager->GoBackward(BackwardSceneTransition());
        AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::OnMusicContentUpdateCompleted(void)
+{
+       AppLogDebug("ENTER");
+       Footer* pFooter = GetFooter();
+       if (__pPlaylistEditorPresentationModel->IsPlaylistExist(__orignalPlaylistName) == false)
+       {
+               CommonUtil::SetFooterItemEnabled(*pFooter, false);
+       }
+       else
+       {
+               CommonUtil::SetFooterItemEnabled(*pFooter, true);
+       }
+       AppLogDebug("EXIT");
 }
\ No newline at end of file

diff --git a/src/MpTypes.cpp b/src/MpTypes.cpp
index 2b9ec74..178046c 100644 (file)
--- a/src/MpTypes.cpp
+++ b/src/MpTypes.cpp
@@ -161,8 +161,7 @@ const wchar_t* IDC_SIZE_LABEL = L"IDC_SIZE_LABEL";
 const wchar_t* IDC_FORWARDING_LABEL = L"IDC_FORWARDING_LABEL";
 const wchar_t* IDC_DATE_LABEL = L"IDC_DATE_LABEL";
 const wchar_t* IDC_LOCATION_LABEL = L"IDC_LOCATION_LABEL";
-const wchar_t* IDC_NO_CONTENTS_ICON = L"IDC_NO_CONTENTS_ICON";
-const wchar_t* IDC_NO_CONTENTS_TEXT = L"IDC_NO_CONTENTS_TEXT";
+const wchar_t* IDC_NO_CONTENTS_PANEL = L"IDC_NO_CONTENTS_PANEL";
 //__XML_IDC_
 
 //<--__XML_IDC_ORDERING PREFIX : IDC_CONTROLTYPE_ EX) IDC_BUTTON_TOGGLE_PLAY