[MusicPlayer] Modify prevent issue and modify ContentUpdate popup and add popup gener...

author Myunkyu <mk70.kang@partner.samsung.com>

Wed, 10 Apr 2013 11:51:39 +0000 (20:51 +0900)

committer Myunkyu <mk70.kang@partner.samsung.com>

Wed, 10 Apr 2013 12:21:25 +0000 (21:21 +0900)
author Myunkyu <mk70.kang@partner.samsung.com>
Wed, 10 Apr 2013 11:51:39 +0000 (20:51 +0900)
committer Myunkyu <mk70.kang@partner.samsung.com>
Wed, 10 Apr 2013 12:21:25 +0000 (21:21 +0900)
diff --git a/inc/MpAlbumListEditorPanel.h b/inc/MpAlbumListEditorPanel.h

index 388d197..0fe7bf9 100644 (file)
--- a/inc/MpAlbumListEditorPanel.h
+++ b/inc/MpAlbumListEditorPanel.h
@@ -28,8 +28,6 @@
  #include "MpThumbnailBase.h"
  #include "MpTypes.h"
  
-class PlayListPickerPopup;
-
  class AlbumListEditorPanel
         : public ContentEditPanel
         , public ThumbnailBase
@@ -37,6 +35,7 @@ class AlbumListEditorPanel
  public:
         AlbumListEditorPanel(void);
         virtual ~AlbumListEditorPanel(void);
+
         virtual result OnInitializing(void);
         virtual result OnTerminating(void);
         virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
@@ -57,22 +56,20 @@ public:
                                                         Tizen::Ui::Controls::TableViewItemStatus status);
  
         virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
-       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
         virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
  
  protected:
-       virtual int GetCheckedItemCount(void);
+       virtual bool IsEmptyContentList(void);
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
+       virtual void UpdateContentList(void);
  
  private:
         result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
-       void UpdateContentList(void);
+
         void SetEditHeaderStyle(void);
         void SetTabHeaderStyle(void);
-       void SetDisableIconAllCheckButton(void);
  
  private:
-       int __checkedItemCount;
-       PlayListPickerPopup* __pPlayListPickerPopup;
         AlbumListPresentationModel* __pPresentationModel;
         Tizen::Graphics::Bitmap* __pThumbnail;
  };
diff --git a/inc/MpAllListEditorPanel.h b/inc/MpAllListEditorPanel.h

index 121ad2a..2fa42af 100644 (file)
--- a/inc/MpAllListEditorPanel.h
+++ b/inc/MpAllListEditorPanel.h
@@ -36,9 +36,6 @@
  #include "MpThumbnailBase.h"
  #include "MpTypes.h"
  
-class PlayListPickerPopup;
-class SharePopup;
-
  class AllListEditorPanel
         : public ContentEditPanel
         , public ThumbnailBase
@@ -51,7 +48,6 @@ public:
         result OnTerminating(void);
  
         void SetTabHeaderStyle(void);
-       void SetDisableIconAllCheckButton(void);
  
         virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
         virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
@@ -69,23 +65,18 @@ public:
                                                         Tizen::Ui::Controls::TableViewItemStatus status);
  
         virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
-       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
         virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
  
  protected:
-       virtual int GetCheckedItemCount(void);
+       virtual bool IsEmptyContentList(void);
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
         virtual void UpdateContentList(void);
  
  private:
         result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
         void SetEditHeaderStyle(void);
  
-private:
-       PlayListPickerPopup* __pPlayListPickerPopup;
-       SharePopup* __pSharePopup;
-
  protected:
-       int __checkedItemCount;
         AllListPresentationModel* __pPresentationModel;
         Tizen::Graphics::Bitmap* __pThumbnail;
         int __editType;
diff --git a/inc/MpArtistListEditorPanel.h b/inc/MpArtistListEditorPanel.h

index 0c65b97..d5f7c0d 100644 (file)
--- a/inc/MpArtistListEditorPanel.h
+++ b/inc/MpArtistListEditorPanel.h
@@ -33,8 +33,6 @@
  #include "MpThumbnailBase.h"
  #include "MpTypes.h"
  
-class PlayListPickerPopup;
-
  class ArtistListEditorPanel
         : public ContentEditPanel
         , public ThumbnailBase
@@ -65,25 +63,21 @@ public:
                                                         Tizen::Ui::Controls::TableViewItemStatus status);
  
         virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
-       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
         virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
  
  protected:
-       virtual int GetCheckedItemCount(void);
+       virtual bool IsEmptyContentList(void);
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
+       virtual void UpdateContentList(void);
  
  private:
         result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
-       void UpdateContentList(void);
+
         void SetEditHeaderStyle(void);
         void SetTabHeaderStyle(void);
-       void SetDisableIconAllCheckButton(void);
-       void SetCheckedIconAllCheckButton(void);
-       void SetUnCheckedIconAllCheckButton(void);
  
  protected:
-       int __checkedItemCount;
         Tizen::Graphics::Bitmap* __pThumbnail;
-       PlayListPickerPopup* __pPlayListPickerPopup;
         ArtistListPresentationModel* __pPresentationModel;
  };
  
diff --git a/inc/MpContentEditPanel.h b/inc/MpContentEditPanel.h

index e821296..299ef94 100644 (file)
--- a/inc/MpContentEditPanel.h
+++ b/inc/MpContentEditPanel.h
@@ -23,39 +23,55 @@
  #define _MP_CONTENT_EDIT_PANEL_H_\r
  \r
  #include "MpContentPanel.h"\r
-#include "MpMusicContentUpdateEventListner.h"\r
+#include "MpIMusicContentUpdateEventListner.h"\r
  \r
  class ContentForm;\r
+class SharePopup;\r
+class PlayListPickerPopup;\r
  \r
  class ContentEditPanel\r
         : public ContentPanel\r
-       , public MusicContentUpdateEventListner\r
+       , public IMusicContentUpdateEventListner\r
  {\r
  public:\r
         ContentEditPanel(void);\r
         virtual ~ContentEditPanel(void);\r
  \r
         virtual bool Initialize(void);\r
+\r
+       virtual result OnTerminating(void);\r
         virtual void OnMusicContentUpdateCompleted(void);\r
+       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);\r
  \r
  protected:\r
-       Tizen::Ui::Controls::Header* GetParentHeader(void);\r
-       result AddParentHeaderActionEventListener(void);\r
-       result RemoveParentHeaderActionEventListener(void);\r
+       result LanucherPicker(PickerType pickerType, PickerArgumentType argumentType = PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL);\r
  \r
-       result SetShowStateBalloonTooltip(bool isShow);\r
         void SetCheckedCountBallonTooltip(unsigned int checkedItemCount);\r
-       void SetNoContentSongs(bool isNoContents);\r
         void SetContentEditHeader(void);\r
+       void SetItemCheckedAll(bool isChecked);\r
+       void UpdateContentEditScreenState(void);\r
  \r
-       virtual int GetCheckedItemCount(void) = 0;\r
+       virtual bool IsEmptyContentList(void) = 0;\r
         virtual void OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orientationStatus);\r
         virtual void UpdateContentList(void) = 0;\r
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);\r
  \r
  private:\r
         result Construct(void);\r
+       result SetShowStateBalloonTooltip(bool isShow);\r
+       result ShowPlayListPicker(Tizen::Base::Collection::IList* pIList);\r
+       result ShowSharePicker(Tizen::Base::Collection::IList* pIList);\r
+\r
+       void SetNoContentSongs(bool isNoContents);\r
+       void RemovePlayListPicker(void);\r
+       void RemoveSharePicker(void);\r
+\r
+protected:\r
+       int __checkedItemCount;\r
  \r
  private:\r
+       PlayListPickerPopup* __pPlayListPicker;\r
+       SharePopup* __pSharePicker;\r
         Tizen::Ui::Controls::Label* __pBallonTooltip;\r
  };\r
  \r
diff --git a/inc/MpContentLibaryPanel.h b/inc/MpContentLibaryPanel.h

index f7fc1f3..3d18ed7 100644 (file)
--- a/inc/MpContentLibaryPanel.h
+++ b/inc/MpContentLibaryPanel.h
@@ -22,11 +22,11 @@
  #define _MP_CONTENT_LIBARY_PANEL_H_\r
  \r
  #include "MpContentPanel.h"\r
-#include "MpMusicContentUpdateEventListner.h"\r
+#include "MpIMusicContentUpdateEventListner.h"\r
  \r
  class ContentLibaryPanel\r
         : public ContentPanel\r
-       , public MusicContentUpdateEventListner\r
+       , public IMusicContentUpdateEventListner\r
  {\r
  public:\r
         ContentLibaryPanel(void);\r
diff --git a/inc/MpContentListForm.h b/inc/MpContentListForm.h

index 4a975f7..c531c02 100644 (file)
--- a/inc/MpContentListForm.h
+++ b/inc/MpContentListForm.h
@@ -28,7 +28,7 @@
  #include <FSystem.h>
  #include <FUi.h>
  #include "MpCommonUtil.h"
-#include "MpMusicContentUpdateEventListner.h"
+#include "MpIMusicContentUpdateEventListner.h"
  #include "MpResourceManager.h"
  #include "MpSceneRegister.h"
  
@@ -36,7 +36,7 @@ class PlayListPickerPopup;
  class SharePopup;
  
  class ContentListForm
-       : public MusicContentUpdateEventListner
+       : public IMusicContentUpdateEventListner
         , public Tizen::Ui::Controls::Form
         , public Tizen::Ui::Controls::IScrollEventListener
         , public Tizen::Ui::Controls::IFormBackEventListener
diff --git a/inc/MpFolderListEditorPanel.h b/inc/MpFolderListEditorPanel.h

index 840249e..fa437e0 100644 (file)
--- a/inc/MpFolderListEditorPanel.h
+++ b/inc/MpFolderListEditorPanel.h
@@ -33,8 +33,6 @@
  #include "MpSceneRegister.h"
  #include "MpTypes.h"
  
-class PlayListPickerPopup;
-
  class FolderListEditorPanel
         : public ContentEditPanel
  {
@@ -71,21 +69,17 @@ public:
                                                 int itemIndexTo);
  
         virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
-       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
  
  protected:
-       virtual int GetCheckedItemCount(void);
+       virtual bool IsEmptyContentList(void);
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
         virtual void UpdateContentList(void);
  
  private:
         result CreateTableViewItem(Tizen::Ui::Container& parent, const Tizen::Base::String& contentPath, int contentCount);
-
         void SetEditHeaderStyle(void);
-       void SetDisableIconAllCheckButton(void);
  
  protected:
-       int __checkedItemCount;
-       PlayListPickerPopup* __pPlayListPickerPopup;
         FolderListPresentationModel* __pPresentationModel;
  };
  
diff --git a/inc/MpMusicContentUpdateEventListner.h b/inc/MpIMusicContentUpdateEventListner.h

similarity index 76%

rename from inc/MpMusicContentUpdateEventListner.h

rename to inc/MpIMusicContentUpdateEventListner.h

index 067c1a5..495edd5 100644 (file)
--- a/inc/MpMusicContentUpdateEventListner.h
+++ b/inc/MpIMusicContentUpdateEventListner.h
@@ -15,17 +15,17 @@
  //\r
  \r
  /**\r
- * @file               MpMusicContentUpdateEventListner.h\r
- * @brief              This is the header file for MusicContentUpdateEventListner class.\r
+ * @file               MpIMusicContentUpdateEventListner.h\r
+ * @brief              This is the header file for IMusicContentUpdateEventListner class.\r
   */\r
  \r
  #ifndef _MP_MUSIC_CONTENT_UPDATE_EVENT_LISTNER_H_\r
  #define _MP_MUSIC_CONTENT_UPDATE_EVENT_LISTNER_H_\r
  \r
-class MusicContentUpdateEventListner\r
+class IMusicContentUpdateEventListner\r
  {\r
  public:\r
-       virtual ~MusicContentUpdateEventListner(void){}\r
+       virtual ~IMusicContentUpdateEventListner(void){}\r
  \r
  //     virtual void OnMusicContentCreated(void) = 0;\r
  //     virtual void OnMusicContentUpdated(void) = 0;\r
diff --git a/inc/MpMusicPlayerApp.h b/inc/MpMusicPlayerApp.h

index 4e0d41e..0b5c38d 100644 (file)
--- a/inc/MpMusicPlayerApp.h
+++ b/inc/MpMusicPlayerApp.h
@@ -73,18 +73,23 @@ public:
  
  private:
         void ParsingArgument(const Tizen::Base::String* pUriData, const Tizen::Base::Collection::IMap* pArgs);
-       void ReStartTimerToContentUpdate(void);
-       void FireImpleContentUpdate(void);
+       void ReStartContentUpdateTimer(void);
+       void CallContentUpdate(void);
+
+       void ShowContentUpdateInProgressPopup(void);
+       void HideContentUpdateInProgressPopup(void);
  
  private:
         RequestId __requestId;
         Tizen::Base::String __operationId;
         Tizen::Ui::Scenes::SceneId __sceneId;
         Tizen::Base::Collection::ArrayList* __pDataList;
+
         MainFrame* __pMainFrame;
  
         Tizen::Content::ContentManager* __pContentManager;
         Tizen::Base::Runtime::Timer* __pContentUpdateCompleteTimer;
+       Tizen::Ui::Controls::Popup* __pContentUpdateInProgressPopup;
  };
  
  #endif // _MP_MUSIC_PLAYER_APP_H_
 \ No newline at end of file
diff --git a/inc/MpMusicPlayerForm.h b/inc/MpMusicPlayerForm.h

index 076d589..1a6e1ca 100644 (file)
--- a/inc/MpMusicPlayerForm.h
+++ b/inc/MpMusicPlayerForm.h
@@ -26,6 +26,7 @@
  #include <FApp.h>
  #include <FSystem.h>
  #include <FUi.h>
+#include "MpIMusicContentUpdateEventListner.h"
  #include "MpIMusicPlayerEventListener.h"
  #include "MpIMusicSettingEventListener.h"
  #include "MpThumbnailBase.h"
@@ -50,6 +51,7 @@ class PlayerForm
         , public Tizen::Ui::ITouchEventListener
         , public Tizen::Ui::IKeyEventListener
         , public Tizen::Ui::Animations::IAnimationTransactionEventListener
+       , public IMusicContentUpdateEventListner
         , public IMusicPlayerEventListener
         , public IMusicSettingEventListener
         , public Tizen::Ui::Scenes::ISceneEventListener
@@ -122,6 +124,7 @@ public:
         virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
  
         virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
+       virtual void OnMusicContentUpdateCompleted(void);
  
  private:
         result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
@@ -130,7 +133,7 @@ private:
         void SetPlayButtonImage(void);
         void SetRepeatButtonImage(int repeatValue);
         void SetShuffleButtonImage(bool shuffleEnable);
-       void SetMoreContentMenuStatus(bool buttonEnable);
+       void SetFileNotExistState(bool isFileExist);
         result ShowMessageBox(const Tizen::Base::String& showText);
         void SetContentInfo(int currentContentIndex);
         void UpdateAnimationAlbumArt(AlbumArtImage position);
diff --git a/inc/MpPlaylistListEditorPanel.h b/inc/MpPlaylistListEditorPanel.h

index c35cc5d..7b2bcfa 100644 (file)
--- a/inc/MpPlaylistListEditorPanel.h
+++ b/inc/MpPlaylistListEditorPanel.h
@@ -68,7 +68,7 @@ public:
         virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
  
  protected:
-       virtual int GetCheckedItemCount(void);
+       virtual bool IsEmptyContentList(void);
         virtual void UpdateContentList(void);
  
  private:
@@ -76,13 +76,10 @@ private:
  
         void SetEditHeaderStyle(void);
         void SetTabHeaderStyle(void);
-       void SetDisableIconAllCheckButton(void);
  
  private:
         int __selectedItemIndex;
-       int __checkedItemCount;
         Tizen::Ui::Controls::CheckButton* __pSelectAllCheckedButton;
-       Tizen::Ui::Controls::Label* __pCheckedCountLabel;
         Tizen::Graphics::Bitmap* __pThumbnail;
         PlaylistEditorPresentationModel* __pPresentationModel;
         Tizen::Base::String* __pPlaylistName;
diff --git a/inc/MpTypes.h b/inc/MpTypes.h

index 9edb0e1..1dc2e8a 100644 (file)
--- a/inc/MpTypes.h
+++ b/inc/MpTypes.h
@@ -429,6 +429,7 @@ extern const wchar_t* IDL_CONTENT_LIBARY_COMMON_PANEL;
  extern const wchar_t* IDL_CONTENT_FORM;
  extern const wchar_t* IDL_MINI_PLYAER_PANEL;
  extern const wchar_t* IDL_CONTENTS_DELETE_POPUP;
+extern const wchar_t* IDL_CONTENTS_UPDATE_POPUP;
  extern const wchar_t* IDL_CREATE_PLAYLIST_POPUP;
  extern const wchar_t* IDL_SHARE_VIA_POPUP;
  extern const wchar_t* IDL_SWEEP_QUICK_MENU_ITEM_PANEL;
@@ -531,7 +532,7 @@ extern const wchar_t* IDC_SIZE_DATA_LABEL;
  extern const wchar_t* IDC_FORWARDING_DATA_LABEL;
  extern const wchar_t* IDC_DATE_DATA_LABEL;
  extern const wchar_t* IDC_LOCATION_DATA_LABEL;
-extern const wchar_t* IDC_TITLE_LABEL;
+//extern const wchar_t* IDC_TITLE_LABEL;
  extern const wchar_t* IDC_BALLOON_TOOLTIP_LABEL;
  extern const wchar_t* IDC_NO_CONTENT_LABEL;
  extern const wchar_t* IDC_CONTENT_GROUPED_TABLEVIEW;
diff --git a/inc/MpUserPlaylistContentListForm.h b/inc/MpUserPlaylistContentListForm.h

index 9992ffe..1d949f7 100644 (file)
--- a/inc/MpUserPlaylistContentListForm.h
+++ b/inc/MpUserPlaylistContentListForm.h
@@ -25,7 +25,6 @@
  #include "MpContentListForm.h"
  #include "MpThumbnailBase.h"
  
-class NowPlayContentPanel;
  class PlaylistListPresentationModel;
  
  class UserPlaylistContentListForm
diff --git a/res/screen-size-normal/IDL_CONTENTS_DETAIL_FORM.xml b/res/screen-size-normal/IDL_CONTENTS_DETAIL_FORM.xml

index 0511882..fa8f961 100644 (file)
--- a/res/screen-size-normal/IDL_CONTENTS_DETAIL_FORM.xml
+++ b/res/screen-size-normal/IDL_CONTENTS_DETAIL_FORM.xml
@@ -3,90 +3,89 @@
         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.201304041648" Dversion="20120315">\r
+<Scene Bversion="2.0.0.201304081058" 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
+        <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
-    <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
+    <Header>\r
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor="#3B73B6"/>\r
+        <itemSet/>\r
+    </Header>\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
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_DETAIL_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="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_DETAIL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.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
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="62.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="26.0" marginTop="20.0" mode="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_ARTIST_NAME_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="668.0" x="26.0" y="60.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="62.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="26.0" marginTop="20.0" mode="Landscape" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_ARTIST_NAME_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1228.0" x="26.0" y="60.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
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="26.0" marginTop="28.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_MEDIA_INFO_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="134.0" x="26.0" y="150.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="28.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_MEDIA_INFO_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="135.0" x="26.0" y="150.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
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_NAME_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="155.0" x="26.0" y="200.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_NAME_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="155.0" x="26.0" y="200.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
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_FORMAT_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="105.0" x="26.0" y="250.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_FORMAT_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="105.0" x="26.0" y="250.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
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_SIZE_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="225.0" x="26.0" y="300.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_SIZE_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="225.0" x="26.0" y="300.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
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_FORWARDING_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="250.0" x="26.0" y="350.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_FORWARDING_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="250.0" x="26.0" y="350.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
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_DATE_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="180.0" x="26.0" y="400.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_DATE_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="180.0" x="26.0" y="400.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
+        <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="150.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="150.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
+        <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="200.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="200.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
+        <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="IDC_FORMAT_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="563.0" x="131.0" y="250.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="250.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
+        <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="300.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="300.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_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_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
+        <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_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="418.0" x="276.0" y="350.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="350.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="IDC_DATE_DATA_LABEL" 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_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_DATE_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1048.0" x="206.0" y="500.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="Portrait" rightRelation="IDL_CONTENTS_DETAIL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_DATE_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="488.0" x="206.0" y="400.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_DATE_DATA_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1048.0" x="206.0" y="400.0"/>\r
      </Label>\r
  </Scene>\r
diff --git a/res/screen-size-normal/IDL_CONTENTS_UPDATE_POPUP.xml b/res/screen-size-normal/IDL_CONTENTS_UPDATE_POPUP.xml

new file mode 100644 (file)

index 0000000..b082e1f
--- /dev/null
+++ b/res/screen-size-normal/IDL_CONTENTS_UPDATE_POPUP.xml
@@ -0,0 +1,18 @@
+<?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 ScenePopup SYSTEM "UIForm.dtd">\r
+\r
+<ScenePopup Bversion="2.0.0.201304041648" Dversion="20120315">\r
+    <Popup id="IDL_CONTENTS_UPDATE_POPUP">\r
+        <property accessibilityHint="" color="" titleText="" titleTextColor=""/>\r
+        <layout height="140.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="600.0"/>\r
+        <layout height="140.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="600.0"/>\r
+    </Popup>\r
+    <Label id="IDC_LABEL_CONTENTS_UPDATE" parent="IDL_CONTENTS_UPDATE_POPUP">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BT_BODY_UPDATING_ING" textColor="" textSize="40.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_CONTENTS_UPDATE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="100.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_UPDATE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="20.0" marginTop="20.0" mode="Portrait" rightRelation="IDL_CONTENTS_UPDATE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_UPDATE_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="20.0" y="20.0"/>\r
+        <layout bottomRelation="IDL_CONTENTS_UPDATE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="100.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_UPDATE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="20.0" marginTop="20.0" mode="Landscape" rightRelation="IDL_CONTENTS_UPDATE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_UPDATE_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="20.0" y="20.0"/>\r
+    </Label>\r
+</ScenePopup>\r
diff --git a/res/screen-size-normal/IDL_CREATE_PLAYLIST_POPUP.xml b/res/screen-size-normal/IDL_CREATE_PLAYLIST_POPUP.xml

index 041ea56..1d2c3c7 100644 (file)
--- a/res/screen-size-normal/IDL_CREATE_PLAYLIST_POPUP.xml
+++ b/res/screen-size-normal/IDL_CREATE_PLAYLIST_POPUP.xml
@@ -11,7 +11,7 @@
          <layout height="630.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="688.0"/>
      </Popup>
      <Button id="IDC_CREATE_BUTTON" parent="IDL_CREATE_PLAYLIST_POPUP">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Create" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_COM_BODY_CREATE" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
          <layout bottomRelation="IDL_CREATE_PLAYLIST_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CREATE_PLAYLIST_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="20.0" y="458.0"/>
          <layout bottomRelation="IDL_CREATE_PLAYLIST_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CREATE_PLAYLIST_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="20.0" y="458.0"/>
      </Button>
@@ -21,7 +21,7 @@
          <layout bottomRelation="IDC_CREATE_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="true" centerVertical="false" height="418.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="20.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_CREATE_PLAYLIST_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="20.0" y="20.0"/>
      </TableView>
      <Button id="IDC_CANCEL_BUTTON" parent="IDL_CREATE_PLAYLIST_POPUP">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_COM_BODY_EDIT_CANCEL" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
          <layout bottomRelation="IDL_CREATE_PLAYLIST_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="20.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CREATE_PLAYLIST_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="354.0" y="458.0"/>
          <layout bottomRelation="IDL_CREATE_PLAYLIST_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="None" leftRelationType="" marginBottom="20.0" marginLeft="20.0" marginRight="20.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CREATE_PLAYLIST_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="354.0" y="458.0"/>
      </Button>
diff --git a/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml b/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml

index c179fa5..286f736 100644 (file)
--- a/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml
+++ b/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml
@@ -3,101 +3,101 @@
         This XML file was automatically generated by UiBuilder - do not modify by hand.\r
  -->\r
  <!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
-<Scene Bversion="2.0.0.201303041025" Dversion="20120315">\r
+<Scene Bversion="2.0.0.201304081058" Dversion="20120315">\r
      <LogicalCoordinate>720</LogicalCoordinate>\r
      <Form id="IDL_MUSIC_PLAYER_FORM">\r
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
          <layout mode="Portrait" style="FORM_STYLE_INDICATOR" type="LAYOUT_RELATIVE"/>\r
          <layout mode="Landscape" style="FORM_STYLE_INDICATOR" type="LAYOUT_RELATIVE"/>\r
      </Form>\r
      <Button id="IDC_CONTENTS_VIEW_TOGGLE_BUTTON" parent="IDL_MUSIC_PLAYER_FORM">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_icon_play_list_web_dim.png" disabledColor="#656565" disabledColorOpacity="30" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_icon_play_list_web.png" normalBitmapPath="" normalColor="#656565" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_icon_play_list_web_press.png" pressedBitmapPath="" pressedColor="#4093F7" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="32" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="68" x="626" y="32"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="32" mode="Landscape" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="1191" y="32"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_icon_play_list_web_dim.png" disabledColor="#656565" disabledColorOpacity="30" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_icon_play_list_web.png" normalBitmapPath="" normalColor="#656565" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_icon_play_list_web_press.png" pressedBitmapPath="" pressedColor="#4093F7" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="32.0" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="68.0" x="626.0" y="32.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="32.0" mode="Landscape" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="1191.0" y="32.0"/>\r
      </Button>\r
+    <Panel id="IDC_PANEL_REGISTER_BAR" parent="IDL_MUSIC_PLAYER_FORM">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="683.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="25.0" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_ARTIST_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="165.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="660.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="None" rightRelationType="" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="547.0" x="0.0" y="0.0"/>\r
+    </Panel>\r
      <Label id="IDC_SPLIT_BAR" parent="IDL_MUSIC_PLAYER_FORM">\r
-        <property backgroundBitmapPath="" backgroundColor="#959595" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="13" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="835"/>\r
-        <layout bottomRelation="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="660" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="13" x="547" y="0"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#959595" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="13.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="835.0"/>\r
+        <layout bottomRelation="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="660.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_REGISTER_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="13.0" x="547.0" y="0.0"/>\r
      </Label>\r
      <Panel id="IDC_PLAYER_CONTROL_BAR" parent="IDL_MUSIC_PLAYER_FORM">\r
          <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="372" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="848"/>\r
-        <layout bottomRelation="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="367" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SPLIT_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="560" y="293"/>\r
+        <layout bottomRelation="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="372.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="848.0"/>\r
+        <layout bottomRelation="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="367.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SPLIT_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="560.0" y="293.0"/>\r
      </Panel>\r
      <Button id="IDC_OPTION_VOLUMN" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_option_volume_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_03.png" normalBitmapPath="T02_option_volume.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_03_press.png" pressedBitmapPath="T02_option_volume_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="18" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="26" y="18"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="18" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="26" y="18"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_option_volume_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_03.png" normalBitmapPath="T02_option_volume.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_03_press.png" pressedBitmapPath="T02_option_volume_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="18.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90.0" x="26.0" y="18.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="18.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90.0" x="26.0" y="18.0"/>\r
      </Button>\r
      <Button id="IDC_OPTION_SHUFFLE" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_option_shuffle_on_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_03.png" normalBitmapPath="T02_option_shuffle_on.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_03_press.png" pressedBitmapPath="T02_option_shuffle_on_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_OPTION_VOLUMN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="54" marginRight="0" marginTop="18" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="170" y="18"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_OPTION_VOLUMN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="54" marginRight="0" marginTop="18" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="170" y="18"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_option_shuffle_on_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_03.png" normalBitmapPath="T02_option_shuffle_on.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_03_press.png" pressedBitmapPath="T02_option_shuffle_on_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_OPTION_VOLUMN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="54.0" marginRight="0.0" marginTop="18.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90.0" x="170.0" y="18.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_OPTION_VOLUMN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="54.0" marginRight="0.0" marginTop="18.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90.0" x="170.0" y="18.0"/>\r
      </Button>\r
      <Button id="IDC_OPTION_PLAY_LIST_ADD" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_03.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_03_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="28" marginRight="26" marginTop="18" mode="Portrait" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="604" y="18"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="18" mode="Landscape" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="604" y="18"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_03.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_03_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="28.0" marginRight="26.0" marginTop="18.0" mode="Portrait" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90.0" x="604.0" y="18.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="18.0" mode="Landscape" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90.0" x="604.0" y="18.0"/>\r
      </Button>\r
      <Button id="IDC_OPTION_REPEAT" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_option_rep_A_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_03.png" normalBitmapPath="T02_option_rep_A.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_03_press.png" pressedBitmapPath="T02_option_rep_A_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="28" marginRight="54" marginTop="18" mode="Portrait" rightRelation="IDC_OPTION_PLAY_LIST_ADD" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="460" y="18"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="54" marginTop="18" mode="Landscape" rightRelation="IDC_OPTION_PLAY_LIST_ADD" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="460" y="18"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_option_rep_A_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_03.png" normalBitmapPath="T02_option_rep_A.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_03_press.png" pressedBitmapPath="T02_option_rep_A_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="28.0" marginRight="54.0" marginTop="18.0" mode="Portrait" rightRelation="IDC_OPTION_PLAY_LIST_ADD" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90.0" x="460.0" y="18.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="54.0" marginTop="18.0" mode="Landscape" rightRelation="IDC_OPTION_PLAY_LIST_ADD" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90.0" x="460.0" y="18.0"/>\r
      </Button>\r
      <Label id="IDC_CURRENT_PLAYING_TIME" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="00:00" textColor="#3A3A3A" textSize="28" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="32" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="29" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="112" x="0" y="137"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="32" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="29" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="122" x="0" y="137"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="00:00" textColor="#3A3A3A" textSize="28.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="32.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="29.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="0.0" y="137.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="32.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="29.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="122.0" x="0.0" y="137.0"/>\r
      </Label>\r
      <Label id="IDC_CONTENT_TOTAL_TIME" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="00:00" textColor="#3A3A3A" textSize="28" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="32" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="29" mode="Portrait" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="112" x="608" y="137"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="32" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="29" mode="Landscape" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="122" x="598" y="137"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="00:00" textColor="#3A3A3A" textSize="28.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="32.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="29.0" mode="Portrait" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="608.0" y="137.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="32.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="29.0" mode="Landscape" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="122.0" x="598.0" y="137.0"/>\r
      </Label>\r
      <Slider id="IDC_SLIDER_BAR" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property backgroundColor="" backgroundStyle="BACKGROUND_STYLE_NONE" barColor="" color="#000000" colorOfTitleText="" colorOpacity="100" disabledThumbBitmap="" disabledThumbTextColor="#000000" groupStyle="GROUP_STYLE_NONE" highlightedThumbBitmap="" highlightedThumbTextColor="" leftIconBitmapPath="" max="100" min="0" normalThumbBitmap="T02_control_progress_handle.png" normalThumbTextColor="#FFFFFF" pressedThumbBitmap="T02_control_progress_handle.png" pressedThumbTextColor="#FFFFFF" rightIconBitmapPath="" showTitleText="false" titleText="" value="0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="496" x="112" y="108"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CURRENT_PLAYING_TIME" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_CONTENT_TOTAL_TIME" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="476" x="122" y="108"/>\r
+        <property accessibilityHint="" backgroundColor="" backgroundStyle="BACKGROUND_STYLE_NONE" barBGColor="" barColor="" color="#000000" colorOfTitleText="" colorOpacity="100" disabledThumbBitmap="" disabledThumbTextColor="#000000" groupStyle="GROUP_STYLE_NONE" highlightedThumbBitmap="" highlightedThumbTextColor="" leftIconBitmapPath="" max="100" min="0" normalThumbBitmap="T02_control_progress_handle.png" normalThumbTextColor="#FFFFFF" pressedThumbBitmap="T02_control_progress_handle.png" pressedThumbTextColor="#FFFFFF" rightIconBitmapPath="" showTitleText="false" titleText="" value="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="496.0" x="112.0" y="108.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CURRENT_PLAYING_TIME" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_CONTENT_TOTAL_TIME" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="476.0" x="122.0" y="108.0"/>\r
      </Slider>\r
      <Button id="IDC_MORE_CONTEXT_MENU_BUTTON" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_more_web.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_more_press_web.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="17" marginLeft="26" marginRight="0" marginTop="375" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="292"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="11" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="293"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_more_web.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_more_press_web.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="17.0" marginLeft="26.0" marginRight="0.0" marginTop="375.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="26.0" y="292.0"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="11.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="26.0" y="293.0"/>\r
      </Button>\r
      <Button id="IDC_PALY_TOGGLE_CONTROL_BUTTON" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_control_circle_icon_play_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_01.png" normalBitmapPath="T02_control_circle_icon_play.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_01_press.png" pressedBitmapPath="T02_control_circle_icon_play_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="154" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="0" marginTop="7" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="154" x="283" y="198"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="154" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="16" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="154" x="283" y="197"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_control_circle_icon_play_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_01.png" normalBitmapPath="T02_control_circle_icon_play.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_01_press.png" pressedBitmapPath="T02_control_circle_icon_play_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="154.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="7.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="154.0" x="283.0" y="198.0"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="154.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="16.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="154.0" x="283.0" y="197.0"/>\r
      </Button>\r
      <Button id="IDC_NEXT_CONTROL_BUTTON" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_control_circle_icon_next_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_02.png" normalBitmapPath="T02_control_circle_icon_next.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_02_press.png" pressedBitmapPath="T02_control_circle_icon_next_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="122" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PALY_TOGGLE_CONTROL_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="36" marginLeft="28" marginRight="0" marginTop="27" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="122" x="465" y="214"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="122" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PALY_TOGGLE_CONTROL_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="32" marginLeft="28" marginRight="28" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="122" x="465" y="213"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_control_circle_icon_next_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_02.png" normalBitmapPath="T02_control_circle_icon_next.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_02_press.png" pressedBitmapPath="T02_control_circle_icon_next_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="122.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PALY_TOGGLE_CONTROL_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="36.0" marginLeft="28.0" marginRight="0.0" marginTop="27.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="122.0" x="465.0" y="214.0"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="122.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PALY_TOGGLE_CONTROL_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="32.0" marginLeft="28.0" marginRight="28.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="122.0" x="465.0" y="213.0"/>\r
      </Button>\r
      <Button id="IDC_PREVIOUS_CONTROL_BUTTON" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_control_circle_icon_previous_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_02.png" normalBitmapPath="T02_control_circle_icon_previous.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_02_press.png" pressedBitmapPath="T02_control_circle_icon_previous_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="122" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="36" marginLeft="28" marginRight="28" marginTop="27" mode="Portrait" rightRelation="IDC_PALY_TOGGLE_CONTROL_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="122" x="133" y="214"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="122" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="32" marginLeft="0" marginRight="28" marginTop="0" mode="Landscape" rightRelation="IDC_PALY_TOGGLE_CONTROL_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="122" x="133" y="213"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_control_circle_icon_previous_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_02.png" normalBitmapPath="T02_control_circle_icon_previous.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_02_press.png" pressedBitmapPath="T02_control_circle_icon_previous_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="122.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="36.0" marginLeft="28.0" marginRight="28.0" marginTop="27.0" mode="Portrait" rightRelation="IDC_PALY_TOGGLE_CONTROL_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="122.0" x="133.0" y="214.0"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="122.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="32.0" marginLeft="0.0" marginRight="28.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PALY_TOGGLE_CONTROL_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="122.0" x="133.0" y="213.0"/>\r
      </Button>\r
      <Button id="IDC_BACK_BUTTON" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_Back_02_web.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_Back_02_press_web.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="17" marginLeft="0" marginRight="26" marginTop="375" mode="Portrait" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="631" y="292"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="11" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="631" y="293"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_Back_02_web.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_Back_02_press_web.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="17.0" marginLeft="0.0" marginRight="26.0" marginTop="375.0" mode="Portrait" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="631.0" y="292.0"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="11.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="631.0" y="293.0"/>\r
      </Button>\r
      <Label id="IDC_CONTENTS_ARTIST_NAME" parent="IDL_MUSIC_PLAYER_FORM">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Artist Name" textColor="#4A4947" textSize="37" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="16" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="594" x="16" y="100"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SPLIT_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="16" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="602" x="573" y="100"/>\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_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="594.0" x="16.0" y="100.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SPLIT_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="602.0" x="573.0" y="100.0"/>\r
      </Label>\r
-    <Panel id="IDC_PANEL_REGISTER_BAR" parent="IDL_MUSIC_PLAYER_FORM">\r
-        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="683" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="25" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_ARTIST_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="165"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="660" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="547" x="0" y="0"/>\r
-    </Panel>\r
      <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_MUSIC_PLAYER_FORM">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Title Name" textColor="#3B73B6" textSize="56" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="16" marginTop="32" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="594" x="16" y="32"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SPLIT_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="16" marginTop="32" mode="Landscape" rightRelation="IDC_CONTENTS_VIEW_TOGGLE_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="602" x="573" y="32"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Title Name" textColor="#3B73B6" textSize="56.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="32.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="594.0" x="16.0" y="32.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SPLIT_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="32.0" mode="Landscape" rightRelation="IDC_CONTENTS_VIEW_TOGGLE_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="602.0" x="573.0" y="32.0"/>\r
      </Label>\r
  </Scene>\r
diff --git a/res/screen-size-normal/IDL_PLAYLIST_CREATOR_FORM.xml b/res/screen-size-normal/IDL_PLAYLIST_CREATOR_FORM.xml

index e072989..ae2f464 100644 (file)
--- a/res/screen-size-normal/IDL_PLAYLIST_CREATOR_FORM.xml
+++ b/res/screen-size-normal/IDL_PLAYLIST_CREATOR_FORM.xml
@@ -17,7 +17,7 @@
          </itemSet>\r
      </Footer>\r
      <Header>\r
-        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Create playlist" titleTextColor=""/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="::IDS_MUSIC_BODY_CREATE_PLAYLIST" titleTextColor=""/>\r
          <itemSet/>\r
      </Header>\r
      <EditField id="IDC_EDITFIELD" parent="IDL_PLAYLIST_CREATOR_FORM">\r
diff --git a/res/screen-size-normal/IDL_SETTING_OFF_SET_ITEM_PANEL.xml b/res/screen-size-normal/IDL_SETTING_OFF_SET_ITEM_PANEL.xml

index 14992c8..325a679 100644 (file)
--- a/res/screen-size-normal/IDL_SETTING_OFF_SET_ITEM_PANEL.xml
+++ b/res/screen-size-normal/IDL_SETTING_OFF_SET_ITEM_PANEL.xml
@@ -3,7 +3,7 @@
         This XML file was automatically generated by UiBuilder - do not modify by hand.\r
  -->\r
  <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
-<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
+<ScenePanel Bversion="2.0.0.201304081058" Dversion="20120315">\r
      <Panel id="IDL_SETTING_OFF_SET_ITEM_PANEL">\r
          <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
          <layout height="112.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="0.0"/>\r
@@ -15,13 +15,13 @@
          <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="76.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="20.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="76.0" x="1184.0" y="18.0"/>\r
      </Label>\r
      <Label id="IDC_LABEL_MAIN_TEXT" parent="IDL_SETTING_OFF_SET_ITEM_PANEL">\r
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Music auto off" textColor="" textSize="44.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_MUSIC_BODY_MUSIC_AUTO_OFF" textColor="" textSize="44.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
          <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="16.0" marginTop="6.0" mode="Portrait" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="592.0" x="20.0" y="6.0"/>\r
          <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="26.0" marginTop="6.0" mode="Landscape" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1138.0" x="20.0" y="6.0"/>\r
      </Label>\r
      <Label id="IDC_LABEL_SUB_TEXT" parent="IDL_SETTING_OFF_SET_ITEM_PANEL">\r
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Sub text" textColor="#FF8040" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_LABEL_MAIN_TEXT" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="592.0" x="20.0" y="60.0"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Sub text" textColor="#FF8040" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_LABEL_MAIN_TEXT" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="592.0" x="20.0" y="60.0"/>\r
          <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="6.0" marginLeft="20.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_LABEL_MAIN_TEXT" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1138.0" x="20.0" y="60.0"/>\r
      </Label>\r
  </ScenePanel>\r
diff --git a/src/MpAlbumContentListForm.cpp b/src/MpAlbumContentListForm.cpp

index 0d06cb2..5cc45c1 100644 (file)
--- a/src/MpAlbumContentListForm.cpp
+++ b/src/MpAlbumContentListForm.cpp
@@ -171,8 +171,8 @@ AlbumContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
         case IDA_FOOTER_BUTTON_DELETE:
                 {
                         RemoveCheckedTableviewItem(true);
-                       UpdateScreenState();
-                       UpdateTableView();
+//                     UpdateScreenState();
+//                     UpdateTableView();
                 }
                 break;
  
@@ -219,10 +219,7 @@ AlbumContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previo
                         static_cast<Label*>(pContentInfoPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->SetBackgroundBitmap(*GetDefaultThumbnail());
                         static_cast<Label*>(pContentInfoPanel->GetControl(IDC_CONTENTS_TITLE_NAME))->SetText(pContentInfo->AlbumName);
                         static_cast<Label*>(pContentInfoPanel->GetControl(IDC_CONTENTS_ARTIST_NAME))->SetText(pContentInfo->ArtistName);
-
-                       String albumCount = null;
-                       albumCount.Format(255, L"%d songs", __pPresentationModel->GetContentCount(__currentAlbumIndex));
-                       static_cast<Label*>(pContentInfoPanel->GetControl(IDC_PLAY_CONTENT_COUNT))->SetText(albumCount);
+                       static_cast<Label*>(pContentInfoPanel->GetControl(IDC_PLAY_CONTENT_COUNT))->SetText(CommonUtil::SetSongsString(__pPresentationModel->GetContentCount(__currentAlbumIndex)));
  
                         Bitmap* pBgBitmap = ResourceManager::GetBitmapN(L"T02_album_bg.png");
                         Label* pBgLabel = static_cast<Label*>(pContentInfoPanel->GetControl(IDC_LABEL_ALBUM_BACKGROUND));
@@ -242,10 +239,6 @@ AlbumContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previo
                 UpdateScreenState();
                 UpdateTableView();
         }
-       else
-       {
-               UpdateScreenState();
-       }
         AppLogDebug("EXIT");
  }
  
@@ -379,11 +372,18 @@ AlbumContentListForm::MakePlayerSceneParam(int startIndex)
  {
         AppLogDebug("ENTER");
         ArrayList* pTempList = new (std::nothrow) ArrayList();
+       if (pTempList == null)
+       {
+               AppLogDebug("EXIT");
+               return null;
+       }
+
         ArrayList* pSelectedMusicContent = null;
  
         pSelectedMusicContent = __pPresentationModel->GetContentPathListN(__currentAlbumIndex);
-       if (pTempList == null || pSelectedMusicContent == null)
+       if (pSelectedMusicContent == null)
         {
+               delete pTempList;
                 AppLogDebug("EXIT");
                 return null;
         }
@@ -607,12 +607,12 @@ AlbumContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
                                 delete pContentInfo;
                         }
                 }
-               __pPresentationModel->RefreshContentList(__currentAlbumIndex);
+//             __pPresentationModel->RefreshContentList(__currentAlbumIndex);
+       }
+       else
+       {
+               SetItemCheckedAll(false);
         }
-
-       __checkedItemCount = INIT_VALUE;
-       SetCheckedCountBallonTooltip(GetCheckedItemCount());
-       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
         AppLogDebug("EXIT");
  }
  
diff --git a/src/MpAlbumContentPickerPanel.cpp b/src/MpAlbumContentPickerPanel.cpp

index bbd5479..56bf3be 100644 (file)
--- a/src/MpAlbumContentPickerPanel.cpp
+++ b/src/MpAlbumContentPickerPanel.cpp
@@ -145,7 +145,10 @@ AlbumContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                         {
                                 if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->AddContent(*new (std::nothrow) String(CommonUtil::GetAddtoPlaylistName()), iCount);
+                                       String playlistName;
+                                       playlistName = CommonUtil::GetAddtoPlaylistName();
+//                                     AppLogDebug("CATCH %ls", playlistName.GetPointer());
+                                       __pPresentationModel->AddContent(playlistName, iCount);
                                         __pContentTableView->SetItemChecked(iCount, false);
                                 }
                         }
diff --git a/src/MpAlbumListEditorPanel.cpp b/src/MpAlbumListEditorPanel.cpp

index 8cbaf39..27188ca 100644 (file)
--- a/src/MpAlbumListEditorPanel.cpp
+++ b/src/MpAlbumListEditorPanel.cpp
@@ -20,7 +20,6 @@
   */
  
  #include "MpAlbumListEditorPanel.h"
-#include "MpPlaylistPickerPopup.h"
  #include "MpThumbnailInfo.h"
  
  using namespace Tizen::Base;
@@ -35,8 +34,6 @@ using namespace Tizen::Ui::Scenes;
  AlbumListEditorPanel::AlbumListEditorPanel(void)
         : ContentEditPanel::ContentEditPanel()
         , ThumbnailBase::ThumbnailBase()
-       , __checkedItemCount(0)
-       , __pPlayListPickerPopup(null)
         , __pThumbnail(null)
  {
         AppLogDebug("ENTER");
@@ -55,6 +52,7 @@ AlbumListEditorPanel::OnInitializing(void)
         AppLogDebug("ENTER");
         SetLayoutFitToForm();
         __pPresentationModel = AlbumListPresentationModel::GetInstance();
+       UpdateContentList();
         AppLogDebug("EXIT");
         return ThumbnailBase::Construct();
  }
@@ -64,23 +62,14 @@ AlbumListEditorPanel::OnTerminating(void)
  {
         AppLogDebug("ENTER");
         ThumbnailBase::Stop();
-       if (__pPlayListPickerPopup != null)
-       {
-               delete __pPlayListPickerPopup;
-               __pPlayListPickerPopup = null;
-       }
-
         AppLogDebug("EXIT");
-       return E_SUCCESS;
+       return ContentEditPanel::OnTerminating();
  }
  
  void
  AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
  {
         AppLogDebug("ENTER %d",actionId);
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       Footer* pFooter = pForm->GetFooter();
-
         SceneManager* pSceneManager = SceneManager::GetInstance();
         AppAssert(pSceneManager);
  
@@ -92,43 +81,18 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                 {
                         if (totalCount == __checkedItemCount)
                         {
-                               __checkedItemCount = INIT_VALUE;
-                               CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBallonTooltip(__checkedItemCount);
-                               CommonUtil::SetFooterItemEnabled(*pFooter, false);
-                               break;
+                               SetItemCheckedAll(false);
+                       }
+                       else
+                       {
+                               SetItemCheckedAll(true);
                         }
-
-                       __checkedItemCount = totalCount;
-                       CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
-                       CommonUtil::SetFooterItemEnabled(*pFooter, true);
                 }
                 break;
  
         case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
                 {
-                       if (__checkedItemCount <= INIT_VALUE)
-                       {
-                               return;
-                       }
-
-                       ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       pDataList->Construct();
-
-                       int totalCount = __pPresentationModel->GetAllAlbumCount();
-                       for (int iCount = 0; iCount < totalCount; iCount++)
-                       {
-                               if (__pContentTableView->IsItemChecked(iCount) == true)
-                               {
-                                       pDataList->AddItems(*(__pPresentationModel->GetContentPathListN(iCount)));
-                               }
-                       }
-
-                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-                       __pPlayListPickerPopup->Initialize(this, pDataList);
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER);
                 }
                 break;
  
@@ -136,31 +100,38 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                 {
                         if (__checkedItemCount <= INIT_VALUE)
                         {
-                               return;
+                               break;
                         }
  
                         int totalCount = __pPresentationModel->GetAllAlbumCount();
-                       for (int index = totalCount - 1; index >= 0; index--)
+                       for (int iCount = 0; iCount < totalCount; iCount++)
                         {
-                               if (__pContentTableView->IsItemChecked(index) == true)
+                               if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->RemoveAlbumList(index);
-                                       __pContentTableView->RefreshItem(index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+                                       __pPresentationModel->RemoveAlbumList(iCount);
                                 }
                         }
-                       __pPresentationModel->UpdateAlbumList();
-                       if (__pPresentationModel->GetAllAlbumCount() != 0)
-                       {
-
-                       }
-                       else
-                       {
-                               SetNoContentSongs(true);
-                               SetDisableIconAllCheckButton();
-                       }
-                       __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
-                       CommonUtil::SetFooterItemEnabled(*pFooter, false);
+//                     int totalCount = __pPresentationModel->GetAllAlbumCount();
+//                     for (int index = totalCount - 1; index >= 0; index--)
+//                     {
+//                             if (__pContentTableView->IsItemChecked(index) == true)
+//                             {
+//                                     __pPresentationModel->RemoveAlbumList(index);
+//                                     __pContentTableView->RefreshItem(index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+//                             }
+//                     }
+//                     __pPresentationModel->UpdateAlbumList();
+//                     if (__pPresentationModel->GetAllAlbumCount() != 0)
+//                     {
+//
+//                     }
+//                     else
+//                     {
+//                             SetNoContentSongs(true);
+//                             SetDisableIconAllCheckButton();
+//                     }
+//                     __checkedItemCount = INIT_VALUE;
+//                     SetCheckedCountBallonTooltip(__checkedItemCount);
                 }
                 break;
  
@@ -176,6 +147,8 @@ AlbumListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previo
                                                                         Tizen::Base::Collection::IList* pArgs)
  {
         AppLogDebug("ENTER");
+       ContentPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
+
         Form* pForm = dynamic_cast<Form*>(GetParent());
         Footer* pFooter = null;
         AppAssert(pForm);
@@ -187,18 +160,7 @@ AlbumListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previo
         pFooter->SetShowState(true);
         CommonUtil::SetFooterItemEnabled(*pFooter, false);
  
-       UpdateContentList();
-       SetCheckedCountBallonTooltip(INIT_VALUE);
-
-       if (__pPresentationModel->GetAllAlbumCount() != INIT_VALUE)
-       {
-               SetNoContentSongs(false);
-       }
-       else
-       {
-               SetNoContentSongs(true);
-               SetDisableIconAllCheckButton();
-       }
+       UpdateContentEditScreenState();
  
         if (pArgs != null)
         {
@@ -213,6 +175,8 @@ AlbumListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curre
                                                                                 const Tizen::Ui::Scenes::SceneId& nextSceneId)
  {
         AppLogDebug("ENTER");
+       ContentPanel::OnSceneDeactivated(currentSceneId, nextSceneId);
+
         Form* pForm = dynamic_cast<Form*>(GetParent());
         AppAssert(pForm);
  
@@ -286,8 +250,6 @@ AlbumListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView
         Form* pForm = dynamic_cast<Form*>(GetParent());
         AppAssert(pForm);
  
-       Footer* pFooter = pForm->GetFooter();
-
         switch (status)
         {
         case TABLE_VIEW_ITEM_STATUS_CHECKED:
@@ -310,10 +272,12 @@ AlbumListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView
  
         if (__checkedItemCount > INIT_VALUE)
         {
+               Footer* pFooter = pForm->GetFooter();
                 CommonUtil::SetFooterItemEnabled(*pFooter, true);
         }
         else
         {
+               Footer* pFooter = pForm->GetFooter();
                 CommonUtil::SetFooterItemEnabled(*pFooter, false);
         }
  
@@ -349,10 +313,9 @@ void
  AlbumListEditorPanel::UpdateContentList(void)
  {
         AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
+       if (__pPresentationModel != null)
         {
                 __pPresentationModel->UpdateAlbumList();
-               __pContentTableView->UpdateTableView();
         }
         AppLogDebug("EXIT");
  }
@@ -361,11 +324,9 @@ void
  AlbumListEditorPanel::SetEditHeaderStyle(void)
  {
         AppLogDebug("ENTER");
-       RemoveParentHeaderActionEventListener();
-       Header* pHeader = GetParentHeader();
+       Header* pHeader = GetHeader();
         String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
         CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
-       pHeader->AddActionEventListener(*this);
         pHeader->Invalidate(true);
         AppLogDebug("EXIT");
  }
@@ -374,20 +335,8 @@ void
  AlbumListEditorPanel::SetTabHeaderStyle(void)
  {
         AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       pHeader->RemoveActionEventListener(*this);
+       Header* pHeader = GetHeader();
         CommonUtil::SetTabHeaderStyle(*pHeader);
-       AddParentHeaderActionEventListener();
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-AlbumListEditorPanel::SetDisableIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
         pHeader->Invalidate(true);
         AppLogDebug("EXIT");
  }
@@ -409,48 +358,6 @@ AlbumListEditorPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
  }
  
  void
-AlbumListEditorPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("OnUserEventReceivedN %d", requestId);
-       if (requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP)
-       {
-               if (__pPlayListPickerPopup != null)
-               {
-                       delete __pPlayListPickerPopup;
-                       __pPlayListPickerPopup = null;
-               }
-
-               if (pArgs == null)
-               {
-                       AppLogDebug("EXIT_1");
-                       return;
-               }
-
-               Boolean* pIsInitialize = static_cast<Boolean*>(pArgs->GetAt(0));
-               if (pIsInitialize->Equals(true))
-               {
-                       __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
-
-                       int totalCount = __pPresentationModel->GetAllAlbumCount();
-                       for (int iCount = 0; iCount < totalCount; iCount++)
-                       {
-                               __pContentTableView->SetItemChecked(iCount, false);
-                       }
-
-                       Form* pForm = dynamic_cast<Form*>(GetParent());
-                       Footer* pFooter = pForm->GetFooter();
-                       CommonUtil::SetFooterItemEnabled(*pFooter, false);
-                       Invalidate(true);
-               }
-               pArgs->RemoveAll(true);
-               delete pArgs;
-       }
-       AppLogDebug("EXIT");
-}
-
-void
  AlbumListEditorPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
  {
         AppLogDebug("ENTER");
@@ -490,10 +397,50 @@ AlbumListEditorPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewIt
         AppLogDebug("EXIT");
  }
  
-int
-AlbumListEditorPanel::GetCheckedItemCount(void)
+bool
+AlbumListEditorPanel::IsEmptyContentList(void)
+{
+       AppLogDebug("ENTER");
+       if (__pPresentationModel->GetAllAlbumCount() == INIT_VALUE)
+       {
+               AppLogDebug("EXIT");
+               return true;
+       }
+       AppLogDebug("EXIT");
+       return false;
+}
+
+Tizen::Base::Collection::IList*
+AlbumListEditorPanel::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)
  {
         AppLogDebug("ENTER");
+       ArrayList* pContentPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       result r = pContentPathList->Construct();
+       if (IsFailed(r))
+       {
+               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(r));
+               delete pContentPathList;
+               return null;
+       }
+
+       if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER && argumentType == PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL)
+       {
+               int totalCount = __pPresentationModel->GetAllAlbumCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentTableView->IsItemChecked(iCount) == true)
+                       {
+                               pContentPathList->AddItems(*(__pPresentationModel->GetContentPathListN(iCount)));
+                       }
+               }
+       }
+       else
+       {
+               AppLogDebug("EXIT");
+               delete pContentPathList;
+               return null;
+       }
+
         AppLogDebug("EXIT");
-       return __checkedItemCount;
+       return pContentPathList;
  }
 \ No newline at end of file
diff --git a/src/MpAlbumListPresentationModel.cpp b/src/MpAlbumListPresentationModel.cpp

index e972ada..fc34913 100644 (file)
--- a/src/MpAlbumListPresentationModel.cpp
+++ b/src/MpAlbumListPresentationModel.cpp
@@ -235,9 +235,7 @@ AlbumListPresentationModel::RemoveAlbumList(int albumIndex)
                 {
                         pContentInformation = CommonUtil::GetContentInformationN(*static_cast<AudioContentInfo*>(pResult->GetContentInfo()));
                         contentManager.DeleteContent(pContentInformation->contentId);
-
                         delete pContentInformation;
-                       pContentInformation = null;
                 }
         }
  
diff --git a/src/MpAlbumPickerPanel.cpp b/src/MpAlbumPickerPanel.cpp

index 453731b..5685bf4 100644 (file)
--- a/src/MpAlbumPickerPanel.cpp
+++ b/src/MpAlbumPickerPanel.cpp
@@ -58,15 +58,6 @@ AlbumPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSc
         CommonUtil::CreateCancelFooter(*pForm);
         pForm->SetFormBackEventListener(this);
         __pPresentationModel->UpdateAlbumList();
-       if (__pPresentationModel != null)
-       {
-               // Empty statement
-       }
-
-       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
-       {
-               // Empty statement
-       }
  
         if (pArgs != null)
         {
diff --git a/src/MpAllContentPickerPanel.cpp b/src/MpAllContentPickerPanel.cpp

index 78f0dd4..8c05799 100644 (file)
--- a/src/MpAllContentPickerPanel.cpp
+++ b/src/MpAllContentPickerPanel.cpp
@@ -90,7 +90,7 @@ AllContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                         {
                                 if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->AddContent(*new (std::nothrow) String(CommonUtil::GetAddtoPlaylistName()), iCount);
+                                       __pPresentationModel->AddContent(CommonUtil::GetAddtoPlaylistName(), iCount);
                                         __pContentTableView->SetItemChecked(iCount, false);
                                 }
                         }
@@ -114,9 +114,11 @@ AllContentPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
                                                 Tizen::Base::Collection::IList* pArgs)
  {
         AppLogDebug("ENTER");
+       ContentPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
+       GetHeader()->SetItemSelected(INDEX_ALL_SONG_TAB);
+
         Form* pForm = dynamic_cast<Form*>(GetParent());
         AppAssert(pForm);
-       pForm->GetHeader()->SetItemSelected(INDEX_ALL_SONG_TAB);
  
         pForm->SetFormBackEventListener(this);
  
@@ -126,18 +128,7 @@ AllContentPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
         CommonUtil::SetFooterItemEnabled(*pFooter, false);
  
         SetAddHeaderStyle();
-       UpdateContentList();
-       SetCheckedCountBallonTooltip(INIT_VALUE);
-
-       if (__pPresentationModel->GetTotalCount() != INIT_VALUE)
-       {
-               SetNoContentSongs(false);
-       }
-       else
-       {
-               SetNoContentSongs(true);
-               SetDisableIconAllCheckButton();
-       }
+       UpdateContentEditScreenState();
  
         if (pArgs != null)
         {
@@ -152,11 +143,11 @@ AllContentPickerPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
                                                         const Tizen::Ui::Scenes::SceneId& nextSceneId)
  {
         AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-       pForm->GetHeader()->SetItemSelected(INDEX_PLAY_LIST_TAB);
+       ContentPanel::OnSceneDeactivated(currentSceneId, nextSceneId);
  
-       Footer* pFooter = pForm->GetFooter();
+       GetHeader()->SetItemSelected(INDEX_PLAY_LIST_TAB);
+
+       Footer* pFooter = GetFooter();
         pFooter->RemoveAllButtons();
         pFooter->RemoveAllItems();
         pFooter->RemoveActionEventListener(*this);
@@ -167,12 +158,9 @@ void
  AllContentPickerPanel::SetAddHeaderStyle(void)
  {
         AppLogDebug("ENTER");
-       RemoveParentHeaderActionEventListener();
-       Header* pHeader = GetParentHeader();
+       Header* pHeader = GetHeader();
         String titleText(ResourceManager::GetString(L"IDS_MUSIC_TAB4_ALL"));
         CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
-
-       pHeader->AddActionEventListener(*this);
         pHeader->Invalidate(true);
         AppLogDebug("EXIT");
  }
 \ No newline at end of file
diff --git a/src/MpAllListEditorPanel.cpp b/src/MpAllListEditorPanel.cpp

index 7b42c19..6f290f6 100644 (file)
--- a/src/MpAllListEditorPanel.cpp
+++ b/src/MpAllListEditorPanel.cpp
@@ -21,8 +21,6 @@
  
  #include "MpAllListEditorPanel.h"
  #include "MpAllListPresentationModel.h"
-#include "MpPlaylistPickerPopup.h"
-#include "MpSharePopup.h"
  #include "MpThumbnailInfo.h"
  
  using namespace Tizen::App;
@@ -38,9 +36,6 @@ using namespace Tizen::Ui::Scenes;
  AllListEditorPanel::AllListEditorPanel(void)
         : ContentEditPanel::ContentEditPanel()
         , ThumbnailBase::ThumbnailBase()
-       , __pPlayListPickerPopup(null)
-       , __pSharePopup(null)
-       , __checkedItemCount(0)
         , __pThumbnail(null)
         , __editType(0)
  {
@@ -59,6 +54,7 @@ AllListEditorPanel::OnInitializing(void)
  {
         AppLogDebug("ENTER");
         __pPresentationModel = AllListPresentationModel::GetInstance();
+       UpdateContentList();
         SetLayoutFitToForm();
         AppLogDebug("EXIT");
         return ThumbnailBase::Construct();
@@ -69,19 +65,8 @@ AllListEditorPanel::OnTerminating(void)
  {
         AppLogDebug("ENTER");
         ThumbnailBase::Stop();
-       if (__pPlayListPickerPopup != null)
-       {
-               delete __pPlayListPickerPopup;
-               __pPlayListPickerPopup = null;
-       }
-       if (__pSharePopup != null)
-       {
-               delete __pSharePopup;
-               __pSharePopup = null;
-       }
-
         AppLogDebug("EXIT");
-       return E_SUCCESS;
+       return ContentEditPanel::OnTerminating();
  }
  
  void
@@ -104,17 +89,12 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
                 {
                         if (totalCount == __checkedItemCount)
                         {
-                               __checkedItemCount = INIT_VALUE;
-                               CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBallonTooltip(__checkedItemCount);
-                               CommonUtil::SetFooterItemEnabled(*pFooter, false);
-                               break;
+                               SetItemCheckedAll(false);
+                       }
+                       else
+                       {
+                               SetItemCheckedAll(true);
                         }
-
-                       __checkedItemCount = totalCount;
-                       CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
-                       CommonUtil::SetFooterItemEnabled(*pFooter, true);
                 }
                 break;
  
@@ -126,98 +106,47 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
                         }
  
                         int totalCount = __pPresentationModel->GetTotalCount();
-                       for (int index = totalCount - 1; index >= 0; index--)
+                       for (int iCount = 0; iCount < totalCount; iCount++)
                         {
-                               if (__pContentTableView->IsItemChecked(index) == true)
+                               if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->RemoveContent(index);
-                                       __pContentTableView->RefreshItem(index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+                                       __pPresentationModel->RemoveContent(iCount);
                                 }
                         }
-
-                       if (__pPresentationModel->GetTotalCount() != 0)
-                       {
-                               // Empty statement
-                       }
-                       else
-                       {
-                               SetNoContentSongs(true);
-                               SetDisableIconAllCheckButton();
-                       }
-                       __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
+//                     int totalCount = __pPresentationModel->GetTotalCount();
+//                     for (int index = totalCount - 1; index >= 0; index--)
+//                     {
+//                             if (__pContentTableView->IsItemChecked(index) == true)
+//                             {
+//                                     __pPresentationModel->RemoveContent(index);
+//                                     __pContentTableView->RefreshItem(index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+//                             }
+//                     }
+//
+//                     if (__pPresentationModel->GetTotalCount() != 0)
+//                     {
+//                             // Empty statement
+//                     }
+//                     else
+//                     {
+//                             SetNoContentSongs(true);
+//                             SetDisableIconAllCheckButton();
+//                     }
+//                     __checkedItemCount = INIT_VALUE;
+//                     SetCheckedCountBallonTooltip(__checkedItemCount);
                         CommonUtil::SetFooterItemEnabled(*pFooter, false);
                 }
                 break;
  
         case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
                 {
-                       if (__checkedItemCount <= INIT_VALUE)
-                       {
-                               return;
-                       }
-
-                       Tizen::Base::Collection::ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       pDataList->Construct();
-
-                       ContentManager contentManager;
-                       contentManager.Construct();
-
-                       int totalCount = __pPresentationModel->GetTotalCount();
-                       for (int iCount = 0; iCount < totalCount; iCount++)
-                       {
-                               if (__pContentTableView->IsItemChecked(iCount) == true)
-                               {
-                                       pDataList->Add(__pPresentationModel->GetCheckedContent(iCount));
-                               }
-                       }
-
-                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-                       __pPlayListPickerPopup->Initialize(this, pDataList);
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER);
                 }
                 break;
  
         case IDA_FOOTER_BUTTON_SHARE:
                 {
-                       if (__checkedItemCount <= INIT_VALUE)
-                       {
-                               return;
-                       }
-
-                       Tizen::Base::Collection::ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       int totalCount = __pPresentationModel->GetTotalCount();
-
-                       pDataList->Construct();
-
-                       for (int iCount = 0; iCount < totalCount; iCount++)
-                       {
-                               if (__pContentTableView->IsItemChecked(iCount) == true)
-                               {
-                                       ContentInformation* pContentInfoStruct = __pPresentationModel->GetContentInfoN(iCount);
-                                       if (pContentInfoStruct == null)
-                                       {
-                                               pDataList->RemoveAll(true);
-                                               delete pDataList;
-                                               pDataList = null;
-                                               return;
-                                       }
-                                       pDataList->Add(*(new (std::nothrow) String(L"attachment:" + pContentInfoStruct->ContentFilePath)));
-
-                                       delete pContentInfoStruct;
-                                       pContentInfoStruct = null;
-                               }
-                       }
-
-                       if (__pSharePopup == null)
-                       {
-                               __pSharePopup = new (std::nothrow) SharePopup();
-                               __pSharePopup->Initialize(this);
-                       }
-                       __pSharePopup->SetShowState(true);
-                       __pSharePopup->Show();
-                       __pSharePopup->SetArguments(pDataList);
+                       LanucherPicker(PICKER_TYPE_SHARE_PICKER);
                 }
                 break;
  
@@ -233,6 +162,8 @@ AllListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
                                                                         Tizen::Base::Collection::IList* pArgs)
  {
         AppLogDebug("ENTER");
+       ContentPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
+
         Form* pForm = dynamic_cast<Form*>(GetParent());
         Footer* pFooter = null;
         AppAssert(pForm);
@@ -242,10 +173,7 @@ AllListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
         {
                 __editType = static_cast<Integer*>(pArgs->GetAt(0))->ToInt();
         }
-       else
-       {
-               // Empty statement
-       }
+
         SetEditHeaderStyle();
  
         if (__editType == IDA_CONTEXT_MENU_ITEM_EDIT)
@@ -260,18 +188,7 @@ AllListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
         pFooter->SetShowState(true);
         CommonUtil::SetFooterItemEnabled(*pFooter, false);
  
-       UpdateContentList();
-       SetCheckedCountBallonTooltip(INIT_VALUE);
-
-       if (__pPresentationModel->GetTotalCount() != INIT_VALUE)
-       {
-               SetNoContentSongs(false);
-       }
-       else
-       {
-               SetNoContentSongs(true);
-               SetDisableIconAllCheckButton();
-       }
+       UpdateContentEditScreenState();
  
         if (pArgs != null)
         {
@@ -286,6 +203,8 @@ AllListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& current
                                                                                 const Tizen::Ui::Scenes::SceneId& nextSceneId)
  {
         AppLogDebug("ENTER");
+       ContentPanel::OnSceneDeactivated(currentSceneId, nextSceneId);
+
         Form* pForm = dynamic_cast<Form*>(GetParent());
         AppAssert(pForm);
  
@@ -424,10 +343,9 @@ void
  AllListEditorPanel::UpdateContentList(void)
  {
         AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
+       if (__pPresentationModel != null)
         {
                 __pPresentationModel->UpdateContentList();
-               __pContentTableView->UpdateTableView();
         }
         AppLogDebug("EXIT");
  }
@@ -436,8 +354,7 @@ void
  AllListEditorPanel::SetEditHeaderStyle(void)
  {
         AppLogDebug("ENTER");
-       RemoveParentHeaderActionEventListener();
-       Header* pHeader = GetParentHeader();
+       Header* pHeader = GetHeader();
         if(__editType == IDA_CONTEXT_MENU_ITEM_EDIT)
         {
                 String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
@@ -448,8 +365,6 @@ AllListEditorPanel::SetEditHeaderStyle(void)
                 String titleText(ResourceManager::GetString(L"IDS_IV_BODY_SHARE_VIA"));
                 CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
         }
-
-       pHeader->AddActionEventListener(*this);
         pHeader->Invalidate(true);
         AppLogDebug("EXIT");
  }
@@ -458,20 +373,8 @@ void
  AllListEditorPanel::SetTabHeaderStyle(void)
  {
         AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       pHeader->RemoveActionEventListener(*this);
+       Header* pHeader = GetHeader();
         CommonUtil::SetTabHeaderStyle(*pHeader);
-       AddParentHeaderActionEventListener();
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-AllListEditorPanel::SetDisableIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
         pHeader->Invalidate(true);
         AppLogDebug("EXIT");
  }
@@ -493,66 +396,6 @@ AllListEditorPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
  }
  
  void
-AllListEditorPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("OnUserEventReceivedN %d", requestId);
-       switch (requestId)
-       {
-       case ID_DESTORY_PLAY_LIST_PICKER_POPUP:
-               // fall through
-       case ID_DESTORY_SHARE_POPUP:
-               {
-                       if (__pPlayListPickerPopup != null)
-                       {
-                               delete __pPlayListPickerPopup;
-                               __pPlayListPickerPopup = null;
-                       }
-
-                       if (__pSharePopup != null)
-                       {
-                               delete __pSharePopup;
-                               __pSharePopup = null;
-                       }
-
-                       if (pArgs == null)
-                       {
-                               AppLogDebug("EXIT_1");
-                               return;
-                       }
-
-                       Boolean* pIsInitialize = static_cast<Boolean*>(pArgs->GetAt(0));
-                       if (pIsInitialize->Equals(true))
-                       {
-                               __checkedItemCount = INIT_VALUE;
-                               SetCheckedCountBallonTooltip(__checkedItemCount);
-
-                               int totalCount = __pPresentationModel->GetTotalCount();
-                               for (int iCount = 0; iCount < totalCount; iCount++)
-                               {
-                                       __pContentTableView->SetItemChecked(iCount, false);
-                               }
-
-                               Form* pForm = dynamic_cast<Form*>(GetParent());
-                               Footer* pFooter = pForm->GetFooter();
-                               CommonUtil::SetFooterItemEnabled(*pFooter, false);
-                               Invalidate(true);
-                       }
-                       pArgs->RemoveAll(true);
-                       delete pArgs;
-               }
-               break;
-
-       default:
-               {
-                       // Empty statement
-               }
-               break;
-       }
-       AppLogDebug("EXIT");
-}
-
-void
  AllListEditorPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
  {
         AppLogDebug("ENTER");
@@ -600,10 +443,71 @@ AllListEditorPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem
         AppLogDebug("EXIT");
  }
  
-int
-AllListEditorPanel::GetCheckedItemCount(void)
+bool
+AllListEditorPanel::IsEmptyContentList(void)
  {
         AppLogDebug("ENTER");
+       if (__pPresentationModel->GetTotalCount() == INIT_VALUE)
+       {
+               AppLogDebug("EXIT");
+               return true;
+       }
+       AppLogDebug("EXIT");
+       return false;
+}
+
+Tizen::Base::Collection::IList*
+AllListEditorPanel::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)
+{
+       AppLogDebug("ENTER");
+       ArrayList* pContentPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       result r = pContentPathList->Construct();
+       if (IsFailed(r))
+       {
+               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(r));
+               delete pContentPathList;
+               return null;
+       }
+
+       if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER && argumentType == PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL)
+       {
+               int totalCount = __pPresentationModel->GetTotalCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentTableView->IsItemChecked(iCount) == true)
+                       {
+                               pContentPathList->Add(__pPresentationModel->GetCheckedContent(iCount));
+                       }
+               }
+       }
+       else if (pickerType == PICKER_TYPE_SHARE_PICKER && argumentType == PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL)
+       {
+               int totalCount = __pPresentationModel->GetTotalCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentTableView->IsItemChecked(iCount) == true)
+                       {
+                               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(iCount);
+                               if (pContentInfo == null)
+                               {
+                                       pContentPathList->RemoveAll(true);
+                                       delete pContentPathList;
+
+                                       AppLogDebug("EXIT");
+                                       return null;
+                               }
+                               pContentPathList->Add(*(new (std::nothrow) String(L"attachment:" + pContentInfo->ContentFilePath)));
+                               delete pContentInfo;
+                       }
+               }
+       }
+       else
+       {
+               AppLogDebug("EXIT");
+               delete pContentPathList;
+               return null;
+       }
+
         AppLogDebug("EXIT");
-       return __checkedItemCount;
+       return pContentPathList;
  }
 \ No newline at end of file
diff --git a/src/MpArtistContentListForm.cpp b/src/MpArtistContentListForm.cpp

index cfd5787..6a84800 100644 (file)
--- a/src/MpArtistContentListForm.cpp
+++ b/src/MpArtistContentListForm.cpp
@@ -258,6 +258,7 @@ ArtistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
  
                                 SetItemCheckedAll(false);
                                 __pContentGroupedTableView->RefreshItem(__activatedStateContextItem.__groupIndex, __activatedStateContextItem.__itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);;
+                               delete pContentInfo;
                         }
                 }
                 break;
@@ -306,8 +307,8 @@ ArtistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
         case IDA_FOOTER_BUTTON_DELETE:
                 {
                         RemoveConentCheckedAll();
-                       UpdateScreenState();
-                       UpdateTableView();
+//                     UpdateScreenState();
+//                     UpdateTableView();
                 }
                 break;
  
@@ -968,6 +969,7 @@ ArtistContentListForm::EventHandlerContextMenuItemCaller(void)
         if (IsFailed(r))
         {
                 AppLogDebug("pDataList->Construct() failed(%s)", GetErrorMessage(r));
+               delete pDataList;
                 return r;
         }
  
@@ -1074,11 +1076,11 @@ ArtistContentListForm::RemoveConentCheckedAll(void)
                 }
         }
         delete pMapEnum;
-
-       SetItemCheckedAll(false);
-
-       __pPresentationModel->InitializeArtistAlbumList(__headerTitle);
-       __pPresentationModel->InitializeContentList(INIT_VALUE);
+//
+//     SetItemCheckedAll(false);
+//
+//     __pPresentationModel->InitializeArtistAlbumList(__headerTitle);
+//     __pPresentationModel->InitializeContentList(INIT_VALUE);
  
         AppLogDebug("EXIT");
         return E_SUCCESS;
diff --git a/src/MpArtistContentPickerPanel.cpp b/src/MpArtistContentPickerPanel.cpp

index cf275bd..a8e536d 100644 (file)
--- a/src/MpArtistContentPickerPanel.cpp
+++ b/src/MpArtistContentPickerPanel.cpp
@@ -144,7 +144,7 @@ ArtistContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, in
                         {
                                 if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->AddContent(*new (std::nothrow) String(CommonUtil::GetAddtoPlaylistName()), iCount);
+                                       __pPresentationModel->AddContent(CommonUtil::GetAddtoPlaylistName(), iCount);
                                         __pContentTableView->SetItemChecked(iCount, false);
                                 }
                         }
diff --git a/src/MpArtistListEditorPanel.cpp b/src/MpArtistListEditorPanel.cpp

index af07971..28f5be8 100644 (file)
--- a/src/MpArtistListEditorPanel.cpp
+++ b/src/MpArtistListEditorPanel.cpp
@@ -20,7 +20,6 @@
   */
  
  #include "MpArtistListEditorPanel.h"
-#include "MpPlaylistPickerPopup.h"
  #include "MpThumbnailInfo.h"
  
  using namespace Tizen::Base;
@@ -35,9 +34,7 @@ using namespace Tizen::Ui::Scenes;
  ArtistListEditorPanel::ArtistListEditorPanel(void)
         : ContentEditPanel::ContentEditPanel()
         , ThumbnailBase::ThumbnailBase()
-       , __checkedItemCount(0)
         , __pThumbnail(null)
-       , __pPlayListPickerPopup(null)
  {
         AppLogDebug("ENTER");
         AppLogDebug("EXIT");
@@ -54,6 +51,7 @@ ArtistListEditorPanel::OnInitializing(void)
  {
         AppLogDebug("ENTER");
         __pPresentationModel = ArtistListPresentationModel::GetInstance();
+       UpdateContentList();
         SetLayoutFitToForm();
         AppLogDebug("EXIT");
         return ThumbnailBase::Construct();
@@ -65,17 +63,13 @@ ArtistListEditorPanel::OnTerminating(void)
         AppLogDebug("ENTER");
         ThumbnailBase::Stop();
         AppLogDebug("EXIT");
-       return E_SUCCESS;
+       return ContentEditPanel::OnTerminating();
  }
  
  void
  ArtistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
  {
         AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-       Footer* pFooter = pForm->GetFooter();
-
         SceneManager* pSceneManager = SceneManager::GetInstance();
         AppAssert(pSceneManager);
  
@@ -87,44 +81,18 @@ ArtistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                 {
                         if (totalCount == __checkedItemCount)
                         {
-                               __checkedItemCount = INIT_VALUE;
-                               CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBallonTooltip(__checkedItemCount);
-                               SetUnCheckedIconAllCheckButton();
-                               CommonUtil::SetFooterItemEnabled(*pFooter, false);
-                               break;
+                               SetItemCheckedAll(false);
+                       }
+                       else
+                       {
+                               SetItemCheckedAll(true);
                         }
-
-                       __checkedItemCount = totalCount;
-                       CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
-                       SetCheckedIconAllCheckButton();
-                       CommonUtil::SetFooterItemEnabled(*pFooter, true);
                 }
                 break;
  
         case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
                 {
-                       if (__checkedItemCount <= INIT_VALUE)
-                       {
-                               return;
-                       }
-
-                       ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       pDataList->Construct();
-
-                       for (int iCount = 0; iCount < totalCount; iCount++)
-                       {
-                               if (__pContentTableView->IsItemChecked(iCount) == true)
-                               {
-                                       pDataList->AddItems(*(__pPresentationModel->GetContentPathListN(iCount)));
-                               }
-                       }
-
-                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-                       __pPlayListPickerPopup->Initialize(this, pDataList);
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER);
                 }
                 break;
  
@@ -135,29 +103,36 @@ ArtistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                                 return;
                         }
  
-                       for (int index = totalCount - 1; index >= 0; index--)
+                       for (int iCount = 0; iCount < totalCount; iCount++)
                         {
-                               if (__pContentTableView->IsItemChecked(index) == true)
+                               if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->RemoveArtistList(index);
-                                       __pContentTableView->RefreshItem(index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+                                       __pPresentationModel->RemoveArtistList(iCount);
                                 }
                         }
-                       __pPresentationModel->UpdateArtistList();
-
-                       if (__pPresentationModel->GetArtistListCount() != 0)
-                       {
  
-                       }
-                       else
-                       {
-                               SetNoContentSongs(true);
-                       }
-                       __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
-                       SetUnCheckedIconAllCheckButton();
-
-                       CommonUtil::SetFooterItemEnabled(*pFooter, false);
+//                     for (int index = totalCount - 1; index >= 0; index--)
+//                     {
+//                             if (__pContentTableView->IsItemChecked(index) == true)
+//                             {
+//                                     __pPresentationModel->RemoveArtistList(index);
+//                                     __pContentTableView->RefreshItem(index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+//                             }
+//                     }
+//                     __pPresentationModel->UpdateArtistList();
+//
+//                     if (__pPresentationModel->GetArtistListCount() != 0)
+//                     {
+//
+//                     }
+//                     else
+//                     {
+//                             SetNoContentSongs(true);
+//                     }
+//                     __checkedItemCount = INIT_VALUE;
+//                     SetCheckedCountBallonTooltip(__checkedItemCount);
+//                     SetUnCheckedIconAllCheckButton();
+//                     CommonUtil::SetFooterItemEnabled(*pFooter, false);
                 }
                 break;
  
@@ -184,18 +159,7 @@ ArtistListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
         pFooter->SetShowState(true);
         CommonUtil::SetFooterItemEnabled(*pFooter, false);
  
-       UpdateContentList();
-       SetCheckedCountBallonTooltip(INIT_VALUE);
-
-       if (__pPresentationModel->GetArtistListCount() != INIT_VALUE)
-       {
-               SetNoContentSongs(false);
-       }
-       else
-       {
-               SetNoContentSongs(true);
-               SetDisableIconAllCheckButton();
-       }
+       UpdateContentEditScreenState();
  
         if (pArgs != null)
         {
@@ -312,14 +276,6 @@ ArtistListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
                 CommonUtil::SetFooterItemEnabled(*pFooter, false);
         }
  
-       if (__checkedItemCount == __pPresentationModel->GetArtistListCount())
-       {
-               SetCheckedIconAllCheckButton();
-       }
-       else
-       {
-               SetUnCheckedIconAllCheckButton();
-       }
         SetCheckedCountBallonTooltip(__checkedItemCount);
         Invalidate(true);
         AppLogDebug("EXIT");
@@ -353,10 +309,9 @@ void
  ArtistListEditorPanel::UpdateContentList(void)
  {
         AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
+       if (__pPresentationModel != null)
         {
                 __pPresentationModel->UpdateArtistList();
-               __pContentTableView->UpdateTableView();
         }
         AppLogDebug("EXIT");
  }
@@ -365,11 +320,9 @@ void
  ArtistListEditorPanel::SetEditHeaderStyle(void)
  {
         AppLogDebug("ENTER");
-       RemoveParentHeaderActionEventListener();
-       Header* pHeader = GetParentHeader();
+       Header* pHeader = GetHeader();
         String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
         CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
-       pHeader->AddActionEventListener(*this);
         pHeader->Invalidate(true);
         AppLogDebug("EXIT");
  }
@@ -378,42 +331,8 @@ void
  ArtistListEditorPanel::SetTabHeaderStyle(void)
  {
         AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       pHeader->RemoveActionEventListener(*this);
+       Header* pHeader = GetHeader();
         CommonUtil::SetTabHeaderStyle(*pHeader);
-       AddParentHeaderActionEventListener();
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-ArtistListEditorPanel::SetDisableIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-ArtistListEditorPanel::SetCheckedIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-ArtistListEditorPanel::SetUnCheckedIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
         pHeader->Invalidate(true);
         AppLogDebug("EXIT");
  }
@@ -435,22 +354,6 @@ ArtistListEditorPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
  }
  
  void
-ArtistListEditorPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("OnUserEventReceivedN %d", requestId);
-       if (requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP)
-       {
-               if (__pPlayListPickerPopup != null)
-               {
-                       delete __pPlayListPickerPopup;
-                       __pPlayListPickerPopup = null;
-               }
-       }
-       AppLogDebug("EXIT");
-}
-
-void
  ArtistListEditorPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
  {
         AppLogDebug("ENTER");
@@ -490,10 +393,50 @@ ArtistListEditorPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewI
         AppLogDebug("EXIT");
  }
  
-int
-ArtistListEditorPanel::GetCheckedItemCount(void)
+bool
+ArtistListEditorPanel::IsEmptyContentList(void)
  {
         AppLogDebug("ENTER");
+       if (__pPresentationModel->GetArtistListCount() == INIT_VALUE)
+       {
+               AppLogDebug("EXIT");
+               return true;
+       }
+       AppLogDebug("EXIT");
+       return false;
+}
+
+Tizen::Base::Collection::IList*
+ArtistListEditorPanel::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)
+{
+       AppLogDebug("ENTER");
+       ArrayList* pContentPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       result r = pContentPathList->Construct();
+       if (IsFailed(r))
+       {
+               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(r));
+               delete pContentPathList;
+               return null;
+       }
+
+       if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER && argumentType == PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL)
+       {
+               int totalCount = __pPresentationModel->GetArtistListCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentTableView->IsItemChecked(iCount) == true)
+                       {
+                               pContentPathList->AddItems(*(__pPresentationModel->GetContentPathListN(iCount)));
+                       }
+               }
+       }
+       else
+       {
+               AppLogDebug("EXIT");
+               delete pContentPathList;
+               return null;
+       }
+
         AppLogDebug("EXIT");
-       return __checkedItemCount;
+       return pContentPathList;
  }
 \ No newline at end of file
diff --git a/src/MpArtistPickerPanel.cpp b/src/MpArtistPickerPanel.cpp

index 652d88d..8f77055 100644 (file)
--- a/src/MpArtistPickerPanel.cpp
+++ b/src/MpArtistPickerPanel.cpp
@@ -58,15 +58,6 @@ ArtistPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousS
         CommonUtil::CreateCancelFooter(*pForm);
         pForm->SetFormBackEventListener(this);
         __pPresentationModel->UpdateArtistList();
-       if (__pPresentationModel != null)
-       {
-               // Empty statement
-       }
-
-       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
-       {
-               // Empty statement
-       }
  
         if (pArgs != null)
         {
diff --git a/src/MpCommonUtil.cpp b/src/MpCommonUtil.cpp

index 71426eb..b520e58 100644 (file)
--- a/src/MpCommonUtil.cpp
+++ b/src/MpCommonUtil.cpp
@@ -130,7 +130,6 @@ CommonUtil::ContentSearchResultListN(const Tizen::Base::String& contentFileName,
         Tizen::Base::Collection::IList* pSearchList = CommonUtil::SearchContentList(WhereExpr, sortColumn);
         if (pSearchList == null)
         {
-               delete pSearchList;
                 SetLastResult(E_FAILURE);
                 AppLogDebug("CommonUtil::SearchContentList failed");
                 return null;
@@ -786,6 +785,7 @@ CommonUtil::CreateFlickMenuN(Tizen::Ui::IActionEventListener& listener, FlickMen
                 if (IsFailed(pFlickMenuPanel->Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL)))
                 {
                         AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                       delete pFlickMenuPanel;
                         return null;
                 }
         }
@@ -794,6 +794,7 @@ CommonUtil::CreateFlickMenuN(Tizen::Ui::IActionEventListener& listener, FlickMen
                 if (IsFailed(pFlickMenuPanel->Construct(IDL_SWEEP_QUICK_ALBUM_PANEL)))
                 {
                         AppLogDebug("Construct(IDL_SWEEP_QUICK_ALBUM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                       delete pFlickMenuPanel;
                         return null;
                 }
         }
@@ -802,6 +803,7 @@ CommonUtil::CreateFlickMenuN(Tizen::Ui::IActionEventListener& listener, FlickMen
                 if (IsFailed(pFlickMenuPanel->Construct(IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL)))
                 {
                         AppLogDebug("Construct(IDL_SWEEP_QUICK_ALBUM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                       delete pFlickMenuPanel;
                         return null;
                 }
         }
@@ -810,12 +812,14 @@ CommonUtil::CreateFlickMenuN(Tizen::Ui::IActionEventListener& listener, FlickMen
                 if (IsFailed(pFlickMenuPanel->Construct(IDL_SWEEP_QUICK_ITEM2_PANEL)))
                 {
                         AppLogDebug("Construct(IDL_SWEEP_QUICK_ALBUM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                       delete pFlickMenuPanel;
                         return null;
                 }
         }
         else
         {
                 AppLogDebug("EXIT");
+               delete pFlickMenuPanel;
                 return null;
         }
  
diff --git a/src/MpComposerContentPickerPanel.cpp b/src/MpComposerContentPickerPanel.cpp

index c52d620..9eac387 100644 (file)
--- a/src/MpComposerContentPickerPanel.cpp
+++ b/src/MpComposerContentPickerPanel.cpp
@@ -144,7 +144,7 @@ ComposerContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source,
                         {
                                 if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->AddContent(*new (std::nothrow) String(CommonUtil::GetAddtoPlaylistName()), iCount);
+                                       __pPresentationModel->AddContent(CommonUtil::GetAddtoPlaylistName(), iCount);
                                         __pContentTableView->SetItemChecked(iCount, false);
                                 }
                         }
diff --git a/src/MpComposerPickerPanel.cpp b/src/MpComposerPickerPanel.cpp

index dc24709..6695902 100644 (file)
--- a/src/MpComposerPickerPanel.cpp
+++ b/src/MpComposerPickerPanel.cpp
@@ -58,10 +58,7 @@ ComposerPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previou
         SceneManager* pSceneManager = SceneManager::GetInstance();
         AppAssert(pSceneManager);
         __pPresentationModel->UpdateComposerList();
-       if (__pPresentationModel != null)
-       {
-//             CommonUtil::ShowNoContentImage(__pPresentationModel->GetAllComposerCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
-       }
+//     CommonUtil::ShowNoContentImage(__pPresentationModel->GetAllComposerCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
  
         if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
         {
diff --git a/src/MpContentDetailForm.cpp b/src/MpContentDetailForm.cpp

index a454156..a75f906 100644 (file)
--- a/src/MpContentDetailForm.cpp
+++ b/src/MpContentDetailForm.cpp
@@ -77,9 +77,11 @@ ContentDetailForm::OnInitializing(void)
         String* tempPath = __pPlayerPresentationModel->GetContentPath(currentContentIndex);
         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* pTitletName = static_cast<Label*>(GetControl(IDC_TITLE_LABEL));
+//     pTitletName->SetTextConfig(56,LABEL_TEXT_STYLE_BOLD);
+//     pTitletName->SetText(pAudioInfo->GetTitle());
+
+       GetHeader()->SetTitleText(pAudioInfo->GetTitle());
  
         Label* pArtistName = static_cast<Label*>(GetControl(IDC_ARTIST_NAME_LABEL));
         pArtistName->SetTextConfig(37,LABEL_TEXT_STYLE_NORMAL);
diff --git a/src/MpContentEditPanel.cpp b/src/MpContentEditPanel.cpp

index c9c4a58..dd718fd 100644 (file)
--- a/src/MpContentEditPanel.cpp
+++ b/src/MpContentEditPanel.cpp
@@ -23,9 +23,12 @@
  #include "MpContentEditPanel.h"\r
  #include "MpContentForm.h"\r
  #include "MpCommonUtil.h"\r
+#include "MpPlaylistPickerPopup.h"\r
+#include "MpSharePopup.h"\r
  #include "MpTypes.h"\r
  \r
  using namespace Tizen::Base;\r
+using namespace Tizen::Base::Collection;\r
  using namespace Tizen::Graphics;\r
  using namespace Tizen::Ui;\r
  using namespace Tizen::Ui::Controls;\r
@@ -34,6 +37,9 @@ static const int H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP = 48;
  \r
  ContentEditPanel::ContentEditPanel(void)\r
         : ContentPanel::ContentPanel()\r
+       , __checkedItemCount(0)\r
+       , __pPlayListPicker(null)\r
+       , __pSharePicker(null)\r
         , __pBallonTooltip(null)\r
  {\r
         AppLogDebug("ENTER");\r
@@ -69,59 +75,122 @@ ContentEditPanel::Construct(void)
         __pContentTableView->AddTableViewItemEventListener(*this);\r
         __pBallonTooltip = static_cast<Label*>(GetControl(IDC_ITEM_SELECTED_COUNT_LABEL));\r
         __pNoContentLabel = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_LABEL));\r
-\r
+       SetControlAlwaysOnTop(*__pBallonTooltip, true);\r
         AppLogDebug("EXIT");\r
         return E_SUCCESS;\r
  }\r
  \r
-Tizen::Ui::Controls::Header*\r
-ContentEditPanel::GetParentHeader(void)\r
+result\r
+ContentEditPanel::OnTerminating(void)\r
+{\r
+       RemovePlayListPicker();\r
+       RemoveSharePicker();\r
+       return ContentPanel::OnTerminating();\r
+}\r
+\r
+result\r
+ContentEditPanel::LanucherPicker(PickerType pickerType, PickerArgumentType argumentType)\r
  {\r
         AppLogDebug("ENTER");\r
-       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
-       AppAssert(pForm);\r
+       IList* pArgumentList = GetPickerArgumentListN(pickerType, argumentType);\r
+       if (pArgumentList == null)\r
+       {\r
+               AppLogDebug("GetPickerArgumentListN is null");\r
+               return E_FAILURE;\r
+       }\r
+\r
+       result r = E_FAILURE;\r
+       if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER)\r
+       {\r
+               r = ShowPlayListPicker(pArgumentList);\r
+       }\r
+       else if (pickerType == PICKER_TYPE_SHARE_PICKER)\r
+       {\r
+               r = ShowSharePicker(pArgumentList);\r
+       }\r
+\r
+       if (IsFailed(r))\r
+       {\r
+               AppLogDebug("ShowPlayListPicker failed(%s)", GetErrorMessage(r));\r
+               delete pArgumentList;\r
+       }\r
+\r
         AppLogDebug("EXIT");\r
-       return pForm->GetHeader();\r
+       return r;\r
+}\r
+\r
+Tizen::Base::Collection::IList*\r
+ContentEditPanel::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+       return null;\r
  }\r
  \r
  result\r
-ContentEditPanel::RemoveParentHeaderActionEventListener(void)\r
+ContentEditPanel::ShowPlayListPicker(Tizen::Base::Collection::IList* pIList)\r
  {\r
         AppLogDebug("ENTER");\r
-       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
-       AppAssert(pForm);\r
+       RemovePlayListPicker();\r
  \r
-       ContentForm* pContentForm = dynamic_cast<ContentForm*>(const_cast<Form*>(pForm));\r
-       if (pContentForm == null)\r
+       __pPlayListPicker = new (std::nothrow) PlayListPickerPopup();\r
+       if (IsFailed(__pPlayListPicker->Initialize(this, pIList)))\r
         {\r
-               AppLogDebug("dynamic_cast<ContentForm*>(const_cast<Form*>(pForm)) is null");\r
+               AppLogDebug("__pSharePicker->Initialize failed(%s)", GetErrorMessage(E_FAILURE));\r
+               RemovePlayListPicker();\r
                 return E_FAILURE;\r
         }\r
  \r
-       Header* pHeader = pContentForm->GetHeader();\r
-       pHeader->RemoveActionEventListener(*pContentForm);\r
+       __pPlayListPicker->SetShowState(true);\r
+       __pPlayListPicker->Show();\r
  \r
         AppLogDebug("EXIT");\r
         return E_SUCCESS;\r
+}\r
  \r
+void\r
+ContentEditPanel::RemoveSharePicker(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pSharePicker != null)\r
+       {\r
+               CommonUtil::SetShowStateControl(*__pSharePicker, false);\r
+               delete __pSharePicker;\r
+               __pSharePicker = null;\r
+       }\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentEditPanel::RemovePlayListPicker(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pPlayListPicker != null )\r
+       {\r
+               CommonUtil::SetShowStateControl(*__pPlayListPicker, false);\r
+               delete __pPlayListPicker;\r
+               __pPlayListPicker = null;\r
+       }\r
+       AppLogDebug("EXIT");\r
  }\r
  \r
  result\r
-ContentEditPanel::AddParentHeaderActionEventListener(void)\r
+ContentEditPanel::ShowSharePicker(Tizen::Base::Collection::IList* pIList)\r
  {\r
         AppLogDebug("ENTER");\r
-       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
-       AppAssert(pForm);\r
+       RemoveSharePicker();\r
  \r
-       ContentForm* pContentForm = dynamic_cast<ContentForm*>(const_cast<Form*>(pForm));\r
-       if (pContentForm == null)\r
+       __pSharePicker = new (std::nothrow) SharePopup();\r
+       if (IsFailed(__pSharePicker->Initialize(this)))\r
         {\r
-               AppLogDebug("dynamic_cast<ContentForm*>(const_cast<Form*>(pForm)) is null");\r
+               AppLogDebug("__pSharePicker->Initialize failed(%s)", GetErrorMessage(E_FAILURE));\r
+               RemoveSharePicker();\r
                 return E_FAILURE;\r
         }\r
  \r
-       Header* pHeader = pContentForm->GetHeader();\r
-       pHeader->AddActionEventListener(*pContentForm);\r
+       __pSharePicker->SetArguments(pIList);\r
+       __pSharePicker->SetShowState(true);\r
+       __pSharePicker->Show();\r
  \r
         AppLogDebug("EXIT");\r
         return E_SUCCESS;\r
@@ -132,7 +201,7 @@ ContentEditPanel::SetShowStateBalloonTooltip(bool isShow)
  {\r
         AppLogDebug("ENTER");\r
         int balloonTooltipHeight = INIT_VALUE;\r
-       if (isShow == true && GetCheckedItemCount() != INIT_VALUE)\r
+       if (isShow == true && __checkedItemCount != INIT_VALUE)\r
         {\r
                 balloonTooltipHeight = H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP;\r
         }\r
@@ -191,7 +260,25 @@ ContentEditPanel::SetContentEditHeader(void)
  {\r
         AppLogDebug("ENTER");\r
         CommonUtil::SetSimpleTitleStyle(*GetHeader(), ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));\r
-       CommonUtil::SetButtonItemUnCheckedIcon(*GetParentHeader());\r
+       CommonUtil::SetButtonItemUnCheckedIcon(*GetHeader());\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentEditPanel::SetItemCheckedAll(bool isChecked)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (isChecked == true)\r
+       {\r
+               __checkedItemCount = __pContentTableView->GetItemCount();\r
+       }\r
+       else\r
+       {\r
+               __checkedItemCount = INIT_VALUE;\r
+       }\r
+       CommonUtil::SetItemCheckedAll(isChecked, *__pContentTableView);\r
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);\r
+       SetCheckedCountBallonTooltip(__checkedItemCount);\r
         AppLogDebug("EXIT");\r
  }\r
  \r
@@ -207,6 +294,67 @@ void
  ContentEditPanel::OnMusicContentUpdateCompleted(void)\r
  {\r
         AppLogDebug("ENTER");\r
+       __checkedItemCount = INIT_VALUE;\r
         UpdateContentList();\r
+       UpdateContentEditScreenState();\r
+\r
+       RemovePlayListPicker();\r
+       RemoveSharePicker();\r
+\r
+       if (__pContentTableView != null && IsEmptyContentList() == false)\r
+       {\r
+               CommonUtil::SetAllCheckState(false, *__pContentTableView, __pContentTableView->GetItemCount());\r
+               __pContentTableView->UpdateTableView();\r
+       }\r
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentEditPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if ((requestId != ID_DESTORY_PLAY_LIST_PICKER_POPUP) && (requestId != ID_DESTORY_SHARE_POPUP))\r
+       {\r
+               AppLogDebug("EXIT");\r
+               return;\r
+       }\r
+\r
+       if (pArgs != null)\r
+       {\r
+               Boolean* pIsInitialize = static_cast<Boolean*>(pArgs->GetAt(0));\r
+               if (pIsInitialize->Equals(true))\r
+               {\r
+                       CommonUtil::SetAllCheckState(false, *__pContentTableView, __pContentTableView->GetItemCount());\r
+               }\r
+               pArgs->RemoveAll(true);\r
+               delete pArgs;\r
+       }\r
+\r
+       RemovePlayListPicker();\r
+       RemoveSharePicker();\r
+\r
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentEditPanel::UpdateContentEditScreenState(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (IsEmptyContentList() == true)\r
+       {\r
+               SetShowStateContentTableview(false);\r
+               SetShowStateNoContent(true);\r
+\r
+               GetHeader()->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);\r
+               GetHeader()->Invalidate(true);\r
+               AppLogDebug("EXIT");\r
+               return;\r
+       }\r
+\r
+       SetCheckedCountBallonTooltip(__checkedItemCount);\r
+       SetShowStateNoContent(false);\r
+       SetShowStateContentTableview(true);\r
         AppLogDebug("EXIT");\r
  }
 \ No newline at end of file
diff --git a/src/MpContentListForm.cpp b/src/MpContentListForm.cpp

index d9bebbf..647f87e 100644 (file)
--- a/src/MpContentListForm.cpp
+++ b/src/MpContentListForm.cpp
@@ -262,6 +262,7 @@ ContentListForm::RemoveSharePicker(void)
         AppLogDebug("ENTER");
         if (__pSharePicker != null)
         {
+               CommonUtil::SetShowStateControl(*__pSharePicker, false);
                 delete __pSharePicker;
                 __pSharePicker = null;
         }
@@ -274,6 +275,7 @@ ContentListForm::RemovePlayListPicker(void)
         AppLogDebug("ENTER");
         if (__pPlayListPicker != null )
         {
+               CommonUtil::SetShowStateControl(*__pPlayListPicker, false);
                 delete __pPlayListPicker;
                 __pPlayListPicker = null;
         }
@@ -395,6 +397,11 @@ ContentListForm::OnMusicContentUpdateCompleted(void)
  {
         AppLogDebug("ENTER");
         UpdateContentList();
+       SetItemCheckedAll(false);
+       RemovePlayListPicker();
+       RemoveSharePicker();
+       UpdateScreenState();
+       UpdateTableView();
         AppLogDebug("EXIT");
  }
  
diff --git a/src/MpContentListPanel.cpp b/src/MpContentListPanel.cpp

index 3543321..e179a2c 100644 (file)
--- a/src/MpContentListPanel.cpp
+++ b/src/MpContentListPanel.cpp
@@ -94,6 +94,10 @@ ContentLibaryPanel::ReSizingMiniPlayerRegisterBar(void)
         if (IsExistMiniPlayer() == true)\r
         {\r
                 const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+               if (pForm == null)\r
+               {\r
+                       return E_FAILURE;\r
+               }\r
                 __pMiniPlayerRegisterBar->SetSize(__pMiniPlayerRegisterBar->GetWidth(),\r
                                 ((pForm->GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT) || (pForm->GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT_REVERSE))\r
                                 ? H_SHOW_MINI_PLAYER_STATUS_PORTRAIT_REGISTER_BAR : H_SHOW_MINI_PLAYER_STATUS_LANDSCAPE_REGISTER_BAR);\r
@@ -126,6 +130,10 @@ ContentLibaryPanel::GetCurrentOrientationMode(void)
  {\r
         AppLogDebug("ENTER");\r
         const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       if (pForm == null)\r
+       {\r
+               return ORIENTATION_STATUS_NONE;\r
+       }\r
         AppLogDebug("EXIT");\r
         return pForm->GetOrientationStatus();\r
  }\r
@@ -184,6 +192,7 @@ ContentLibaryPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
                 if (IsFailed(pMiniPlayer->MiniPlayerActivate()))\r
                 {\r
                         RemoveMiniPlayer();\r
+                       SetShowStateFooter(true);\r
                 }\r
                 else\r
                 {\r
diff --git a/src/MpContentPanel.cpp b/src/MpContentPanel.cpp

index ef394d3..f8226d2 100644 (file)
--- a/src/MpContentPanel.cpp
+++ b/src/MpContentPanel.cpp
@@ -78,6 +78,11 @@ ContentPanel::GetHeader(void)
  {\r
         AppLogDebug("ENTER");\r
         const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       if (pForm == null)\r
+       {\r
+               AppLogDebug("EXIT");\r
+               return null;\r
+       }\r
         AppLogDebug("EXIT");\r
         return pForm->GetHeader();\r
  }\r
@@ -87,6 +92,11 @@ ContentPanel::GetFooter(void)
  {\r
         AppLogDebug("ENTER");\r
         const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       if (pForm == null)\r
+       {\r
+               AppLogDebug("EXIT");\r
+               return null;\r
+       }\r
         AppLogDebug("EXIT");\r
         return pForm->GetFooter();\r
  }\r
@@ -134,6 +144,11 @@ ContentPanel::SetLayoutFitToForm(void)
  {\r
         AppLogDebug("ENTER");\r
         const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       if (pForm == null)\r
+       {\r
+               AppLogDebug("EXIT");\r
+               return;\r
+       }\r
         AppAssert(pForm);\r
  \r
         CommonUtil::SetLayoutFitToContainer(*pForm, *this);\r
diff --git a/src/MpFolderContentListForm.cpp b/src/MpFolderContentListForm.cpp

index e00163a..49a852b 100644 (file)
--- a/src/MpFolderContentListForm.cpp
+++ b/src/MpFolderContentListForm.cpp
@@ -254,9 +254,13 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
         case IDA_COMMON_POPUP_DELETE:
                 {
                         ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
-                       RemoveContentAt(pContentInfo->contentId);
-                       __pPresentationModel->RefreshContentList(__currentFolderIndex);
-                       __pContentListTableView->RefreshItem(__activatedStateContextItem, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+                       if (pContentInfo != null)
+                       {
+                               RemoveContentAt(pContentInfo->contentId);
+                               __pPresentationModel->RefreshContentList(__currentFolderIndex);
+                               __pContentListTableView->RefreshItem(__activatedStateContextItem, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+                               delete pContentInfo;
+                       }
                 }
                 break;
  
@@ -344,10 +348,10 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
         case IDA_FOOTER_BUTTON_DELETE:
                 {
                         RemoveCheckedTableviewItem(true);
-                       __pPresentationModel->RefreshContentList(__currentFolderIndex);
-
-                       UpdateScreenState();
-                       UpdateTableView();
+//                     __pPresentationModel->RefreshContentList(__currentFolderIndex);
+//
+//                     UpdateScreenState();
+//                     UpdateTableView();
                 }
                 break;
  
@@ -474,14 +478,14 @@ Tizen::Base::Collection::ArrayList*
  FolderContentListForm::MakePlayerSceneParam(int startIndex)
  {
         AppLogDebug("ENTER");
-       ArrayList* pTempList = new (std::nothrow) ArrayList();
-       ArrayList* pSelectedMusicContent = null;
-
-       pSelectedMusicContent = __pPresentationModel->GetContentPathListN(__currentFolderIndex);
-       if (pTempList == null || pSelectedMusicContent == null)
+       ArrayList* pSelectedMusicContent = __pPresentationModel->GetContentPathListN(__currentFolderIndex);
+       if (pSelectedMusicContent == null)
         {
+               AppLogDebug("EXIT");
                 return null;
         }
+
+       ArrayList* pTempList = new (std::nothrow) ArrayList();
         pTempList->Construct();
         pTempList->Add(*(new (std::nothrow) String(MUSIC)));
         pTempList->Add(*(new (std::nothrow) Integer(startIndex)));
@@ -796,10 +800,10 @@ FolderContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
                         }
                 }
         }
-
-       __checkedItemCount = INIT_VALUE;
-       SetCheckedCountBallonTooltip(GetCheckedItemCount());
-       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+       else
+       {
+               SetItemCheckedAll(false);
+       }
         AppLogDebug("EXIT");
  }
  
diff --git a/src/MpFolderContentPickerPanel.cpp b/src/MpFolderContentPickerPanel.cpp

index c0fba6f..2782677 100644 (file)
--- a/src/MpFolderContentPickerPanel.cpp
+++ b/src/MpFolderContentPickerPanel.cpp
@@ -144,7 +144,7 @@ FolderContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, in
                         {
                                 if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->AddContent(*new (std::nothrow) String(CommonUtil::GetAddtoPlaylistName()), iCount);
+                                       __pPresentationModel->AddContent(CommonUtil::GetAddtoPlaylistName(), iCount);
                                         __pContentTableView->SetItemChecked(iCount, false);
                                 }
                         }
diff --git a/src/MpFolderListEditorPanel.cpp b/src/MpFolderListEditorPanel.cpp

index 4956598..d972619 100644 (file)
--- a/src/MpFolderListEditorPanel.cpp
+++ b/src/MpFolderListEditorPanel.cpp
@@ -20,7 +20,6 @@
   */
  
  #include "MpFolderListEditorPanel.h"
-#include "MpPlaylistPickerPopup.h"
  
  using namespace Tizen::Base;
  using namespace Tizen::Base::Collection;
@@ -34,8 +33,6 @@ using namespace Tizen::Ui::Scenes;
  
  FolderListEditorPanel::FolderListEditorPanel(void)
         : ContentEditPanel::ContentEditPanel()
-       , __checkedItemCount(0)
-       , __pPlayListPickerPopup(null)
         , __pPresentationModel(null)
  {
         AppLogDebug("ENTER");
@@ -53,6 +50,7 @@ FolderListEditorPanel::OnInitializing(void)
  {
         AppLogDebug("ENTER");
         __pPresentationModel = FolderListPresentationModel::GetInstance();
+       UpdateContentList();
         SetLayoutFitToForm();
         AppLogDebug("EXIT");
         return E_SUCCESS;
@@ -62,23 +60,14 @@ result
  FolderListEditorPanel::OnTerminating(void)
  {
         AppLogDebug("ENTER");
-       if (__pPlayListPickerPopup != null)
-       {
-               delete __pPlayListPickerPopup;
-               __pPlayListPickerPopup = null;
-       }
-
         AppLogDebug("EXIT");
-       return E_SUCCESS;
+       return ContentEditPanel::OnTerminating();
  }
  
  void
  FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
  {
         AppLogDebug("ENTER %d", actionId);
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       Footer* pFooter = pForm->GetFooter();
-
         SceneManager* pSceneManager = SceneManager::GetInstance();
         AppAssert(pSceneManager);
  
@@ -90,43 +79,18 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                 {
                         if (totalCount == __checkedItemCount)
                         {
-                               __checkedItemCount = INIT_VALUE;
-                               CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBallonTooltip(__checkedItemCount);
-                               CommonUtil::SetFooterItemEnabled(*pFooter, false);
-                               break;
+                               SetItemCheckedAll(false);
+                       }
+                       else
+                       {
+                               SetItemCheckedAll(true);
                         }
-
-                       __checkedItemCount = totalCount;
-                       CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
-                       CommonUtil::SetFooterItemEnabled(*pFooter, true);
                 }
                 break;
  
         case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
                 {
-                       if (__checkedItemCount <= INIT_VALUE)
-                       {
-                               return;
-                       }
-
-                       ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       pDataList->Construct();
-
-                       int totalCount = __pPresentationModel->GetAllFolderCount();
-                       for (int iCount = 0; iCount < totalCount; iCount++)
-                       {
-                               if (__pContentTableView->IsItemChecked(iCount) == true)
-                               {
-                                       pDataList->AddItems(*(__pPresentationModel->GetContentPathListN(iCount)));
-                               }
-                       }
-
-                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-                       __pPlayListPickerPopup->Initialize(this, pDataList);
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER);
                 }
                 break;
  
@@ -138,27 +102,35 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                         }
  
                         int totalCount = __pPresentationModel->GetAllFolderCount();
-                       for (int index = totalCount - 1; index >= 0; index--)
+                       for (int iCount = 0; iCount < totalCount; iCount++)
                         {
-                               if (__pContentTableView->IsItemChecked(index) == true)
+                               if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->RemoveFolderList(index);
-                                       __pContentTableView->RefreshItem(index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+                                       __pPresentationModel->RemoveFolderList(iCount);
                                 }
                         }
-                       __pPresentationModel->UpdateFolderPathList();
-                       if (__pPresentationModel->GetAllFolderCount() != 0)
-                       {
-                               // Empty statement
-                       }
-                       else
-                       {
-                               SetNoContentSongs(true);
-                               SetDisableIconAllCheckButton();
-                       }
-                       __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
-                       CommonUtil::SetFooterItemEnabled(*pFooter, false);
+//                     int totalCount = __pPresentationModel->GetAllFolderCount();
+//                     for (int index = totalCount - 1; index >= 0; index--)
+//                     {
+//                             if (__pContentTableView->IsItemChecked(index) == true)
+//                             {
+//                                     __pPresentationModel->RemoveFolderList(index);
+//                                     __pContentTableView->RefreshItem(index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+//                             }
+//                     }
+//                     __pPresentationModel->UpdateFolderPathList();
+//                     if (__pPresentationModel->GetAllFolderCount() != 0)
+//                     {
+//                             // Empty statement
+//                     }
+//                     else
+//                     {
+//                             SetNoContentSongs(true);
+//                             SetDisableIconAllCheckButton();
+//                     }
+//                     __checkedItemCount = INIT_VALUE;
+//                     SetCheckedCountBallonTooltip(__checkedItemCount);
+//                     CommonUtil::SetFooterItemEnabled(*pFooter, false);
                 }
                 break;
  
@@ -174,32 +146,19 @@ FolderListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
                                                                         Tizen::Base::Collection::IList* pArgs)
  {
         AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       pHeader->RemoveActionEventListener(*this);
+       ContentPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
  
         Form* pForm = dynamic_cast<Form*>(GetParent());
-       Footer* pFooter = null;
         AppAssert(pForm);
         pForm->SetFormBackEventListener(this);
         SetEditHeaderStyle();
  
-       pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_ADDTO_DELETE_ADD);
+       Footer* pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_ADDTO_DELETE_ADD);
         pFooter->AddActionEventListener(*this);
         pFooter->SetShowState(true);
         CommonUtil::SetFooterItemEnabled(*pFooter, false);
  
-       UpdateContentList();
-       SetCheckedCountBallonTooltip(INIT_VALUE);
-
-       if (__pPresentationModel->GetAllFolderCount() != INIT_VALUE)
-       {
-               SetNoContentSongs(false);
-       }
-       else
-       {
-               SetNoContentSongs(true);
-               SetDisableIconAllCheckButton();
-       }
+       UpdateContentEditScreenState();
  
         if (pArgs != null)
         {
@@ -214,10 +173,9 @@ FolderListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
                                                 const Tizen::Ui::Scenes::SceneId& nextSceneId)
  {
         AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
+       ContentPanel::OnSceneDeactivated(currentSceneId, nextSceneId);
  
-       Footer* pFooter = pForm->GetFooter();
+       Footer* pFooter = GetFooter();
         pFooter->RemoveAllButtons();
         pFooter->RemoveAllItems();
         pFooter->RemoveActionEventListener(*this);
@@ -368,63 +326,12 @@ FolderListEditorPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
  }
  
  void
-FolderListEditorPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("OnUserEventReceivedN %d", requestId);
-       if (requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP)
-       {
-               if (__pPlayListPickerPopup != null)
-               {
-                       delete __pPlayListPickerPopup;
-                       __pPlayListPickerPopup = null;
-               }
-
-               if (pArgs == null)
-               {
-                       AppLogDebug("EXIT_1");
-                       return;
-               }
-
-               Boolean* pIsInitialize = static_cast<Boolean*>(pArgs->GetAt(0));
-               if (pIsInitialize->Equals(true))
-               {
-                       __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
-
-                       int totalCount = __pPresentationModel->GetAllFolderCount();
-                       for (int iCount = 0; iCount < totalCount; iCount++)
-                       {
-                               __pContentTableView->SetItemChecked(iCount, false);
-                       }
-
-                       Form* pForm = dynamic_cast<Form*>(GetParent());
-                       Footer* pFooter = pForm->GetFooter();
-                       CommonUtil::SetFooterItemEnabled(*pFooter, false);
-                       Invalidate(true);
-               }
-               pArgs->RemoveAll(true);
-               delete pArgs;
-       }
-       AppLogDebug("EXIT");
-}
-
-int
-FolderListEditorPanel::GetCheckedItemCount(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return __checkedItemCount;
-}
-
-void
  FolderListEditorPanel::UpdateContentList(void)
  {
         AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
+       if (__pPresentationModel != null)
         {
                 __pPresentationModel->UpdateFolderPathList();
-               __pContentTableView->UpdateTableView();
         }
         AppLogDebug("EXIT");
  }
@@ -433,20 +340,9 @@ void
  FolderListEditorPanel::SetEditHeaderStyle(void)
  {
         AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
+       Header* pHeader = GetHeader();
         String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
         CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
-       pHeader->AddActionEventListener(*this);
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListEditorPanel::SetDisableIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
         pHeader->Invalidate(true);
         AppLogDebug("EXIT");
  }
@@ -501,4 +397,52 @@ FolderListEditorPanel::CreateTableViewItem(Tizen::Ui::Container& parent, const T
  
         AppLogDebug("EXIT");
         return E_SUCCESS;
+}
+
+bool
+FolderListEditorPanel::IsEmptyContentList(void)
+{
+       AppLogDebug("ENTER");
+       if (__pPresentationModel->GetAllFolderCount() == INIT_VALUE)
+       {
+               AppLogDebug("EXIT");
+               return true;
+       }
+       AppLogDebug("EXIT");
+       return false;
+}
+
+Tizen::Base::Collection::IList*
+FolderListEditorPanel::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)
+{
+       AppLogDebug("ENTER");
+       ArrayList* pContentPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       result r = pContentPathList->Construct();
+       if (IsFailed(r))
+       {
+               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(r));
+               delete pContentPathList;
+               return null;
+       }
+
+       if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER && argumentType == PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL)
+       {
+               int totalCount = __pPresentationModel->GetAllFolderCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentTableView->IsItemChecked(iCount) == true)
+                       {
+                               pContentPathList->AddItems(*(__pPresentationModel->GetContentPathListN(iCount)));
+                       }
+               }
+       }
+       else
+       {
+               AppLogDebug("EXIT");
+               delete pContentPathList;
+               return null;
+       }
+
+       AppLogDebug("EXIT");
+       return pContentPathList;
  }
 \ No newline at end of file
diff --git a/src/MpFolderPickerPanel.cpp b/src/MpFolderPickerPanel.cpp

index 01fc78d..81358b5 100644 (file)
--- a/src/MpFolderPickerPanel.cpp
+++ b/src/MpFolderPickerPanel.cpp
@@ -58,15 +58,6 @@ FolderPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousS
         SceneManager* pSceneManager = SceneManager::GetInstance();
         AppAssert(pSceneManager);
         __pPresentationModel->UpdateFolderPathList();
-       if (__pPresentationModel != null)
-       {
-               // Empty statement
-       }
-
-       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
-       {
-               // Empty statement
-       }
  
         if (pArgs != null)
         {
diff --git a/src/MpGenreContentPickerPanel.cpp b/src/MpGenreContentPickerPanel.cpp

index 60605f1..fd417d2 100644 (file)
--- a/src/MpGenreContentPickerPanel.cpp
+++ b/src/MpGenreContentPickerPanel.cpp
@@ -146,7 +146,7 @@ GenreContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                         {
                                 if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->AddContent(*new (std::nothrow) String(CommonUtil::GetAddtoPlaylistName()), iCount);
+                                       __pPresentationModel->AddContent(CommonUtil::GetAddtoPlaylistName(), iCount);
                                         __pContentTableView->SetItemChecked(iCount, false);
                                 }
                         }
diff --git a/src/MpGenrePickerPanel.cpp b/src/MpGenrePickerPanel.cpp

index 2abcc5c..59a88de 100644 (file)
--- a/src/MpGenrePickerPanel.cpp
+++ b/src/MpGenrePickerPanel.cpp
@@ -58,10 +58,7 @@ GenrePickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSc
         SceneManager* pSceneManager = SceneManager::GetInstance();
         AppAssert(pSceneManager);
         __pPresentationModel->UpdateGnereList();
-       if (__pPresentationModel != null)
-       {
-//             CommonUtil::ShowNoContentImage(__pPresentationModel->GetAllGenreCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
-       }
+//     CommonUtil::ShowNoContentImage(__pPresentationModel->GetAllGenreCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
  
         if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
         {
diff --git a/src/MpMiniPlayer.cpp b/src/MpMiniPlayer.cpp

index 2848c20..92abadc 100644 (file)
--- a/src/MpMiniPlayer.cpp
+++ b/src/MpMiniPlayer.cpp
@@ -346,6 +346,13 @@ MiniPlayer::OnPlayStateChanged(Tizen::Media::PlayerState playerState)
         }\r
  \r
         SetPlayButtonImage();\r
+       if (playerState == PLAYER_STATE_PAUSED)\r
+       {\r
+               if (__pPresentationModel->IsDuringCall() == true)\r
+               {\r
+                       __pMinPlayerPlayToggleButton->SetEnabled(false);\r
+               }\r
+       }\r
         AppLogDebug("EXIT");\r
  }\r
  \r
@@ -354,6 +361,10 @@ MiniPlayer::OnPlayContentChanged(int currentContentIndex)
  {\r
         AppLogDebug("ENTER");\r
         SetContentInfo(currentContentIndex);\r
+       if ((__pMinPlayerPlayToggleButton->IsEnabled() == false) && (__pPresentationModel->IsDuringCall() == false))\r
+       {\r
+               __pMinPlayerPlayToggleButton->SetEnabled(true);\r
+       }\r
         Invalidate(true);\r
         AppLogDebug("EXIT");\r
  }\r
@@ -538,6 +549,11 @@ MiniPlayer::MiniPlayerActivate(void)
                 return r;\r
         }\r
  \r
+       if (__pPresentationModel->IsDuringCall() == true)\r
+       {\r
+               __pMinPlayerPlayToggleButton->SetEnabled(false);\r
+       }\r
+\r
         switch (__pPresentationModel->GetPlayerState())\r
         {\r
         case PLAYER_STATE_PLAYING:\r
@@ -553,6 +569,9 @@ MiniPlayer::MiniPlayerActivate(void)
                 break;\r
  \r
         default:\r
+               {\r
+                       SetPlayButtonImage();\r
+               }\r
                 break;\r
         }\r
  \r
diff --git a/src/MpMusicPlayerApp.cpp b/src/MpMusicPlayerApp.cpp

index da37e66..923b6cf 100644 (file)
--- a/src/MpMusicPlayerApp.cpp
+++ b/src/MpMusicPlayerApp.cpp
@@ -19,10 +19,11 @@
   * @brief              This is the implementation file for MusicPlayerApp class.
   */
  
+#include <FGraphics.h>
  #include "MpBaseForm.h"
  #include "MpBasePanel.h"
  #include "MpCommonUtil.h"
-#include "MpMusicContentUpdateEventListner.h"
+#include "MpIMusicContentUpdateEventListner.h"
  #include "MpMusicPlayerApp.h"
  #include "MpMusicPlayerForm.h"
  #include "MpResourceManager.h"
@@ -35,6 +36,7 @@ using namespace Tizen::Base;
  using namespace Tizen::Base::Collection;
  using namespace Tizen::Base::Runtime;
  using namespace Tizen::Content;
+using namespace Tizen::Graphics;
  using namespace Tizen::System;
  using namespace Tizen::Ui;
  using namespace Tizen::Ui::Controls;
@@ -58,6 +60,7 @@ MusicPlayerApp::MusicPlayerApp(void)
         , __pMainFrame(null)
         , __pContentManager(null)
         , __pContentUpdateCompleteTimer(null)
+       , __pContentUpdateInProgressPopup(null)
  {
         AppLogDebug("ENTER");
         AppLogDebug("EXIT");
@@ -416,7 +419,7 @@ MusicPlayerApp::OnContentFileCreated(Tizen::Content::ContentId contentId, Tizen:
         AppLogDebug("ENTER");
         if (contentType == CONTENT_TYPE_AUDIO && !IsFailed(r))
         {
-               ReStartTimerToContentUpdate();
+               ReStartContentUpdateTimer();
         }
         AppLogDebug("EXIT");
  }
@@ -427,7 +430,7 @@ MusicPlayerApp::OnContentFileUpdated(Tizen::Content::ContentId contentId, Tizen:
         AppLogDebug("ENTER");
         if (contentType == CONTENT_TYPE_AUDIO && !IsFailed(r))
         {
-               ReStartTimerToContentUpdate();
+               ReStartContentUpdateTimer();
         }
         AppLogDebug("EXIT");
  }
@@ -438,7 +441,7 @@ MusicPlayerApp::OnContentFileDeleted(Tizen::Content::ContentId contentId, Tizen:
         AppLogDebug("ENTER");
         if (contentType == CONTENT_TYPE_AUDIO && !IsFailed(r))
         {
-               ReStartTimerToContentUpdate();
+               ReStartContentUpdateTimer();
         }
         AppLogDebug("EXIT");
  }
@@ -449,24 +452,65 @@ MusicPlayerApp::OnContentDirectoryScanCompleted(const Tizen::Base::String& direc
         AppLogDebug("ENTER");
         if (!IsFailed(r))
         {
-               ReStartTimerToContentUpdate();
+               ReStartContentUpdateTimer();
         }
         AppLogDebug("EXIT");
  }
  
  void
-MusicPlayerApp::ReStartTimerToContentUpdate(void)
+MusicPlayerApp::ReStartContentUpdateTimer(void)
  {
         AppLogDebug("ENTER");
         if (__pContentUpdateCompleteTimer != null)
         {
                 __pContentUpdateCompleteTimer->Cancel();
                 __pContentUpdateCompleteTimer->Start(TIMER_CONTENT_UPDATE_DELAY);
+               ShowContentUpdateInProgressPopup();
         }
         AppLogDebug("EXIT");
  }
  
  void
+MusicPlayerApp::ShowContentUpdateInProgressPopup(void)
+{
+       AppLogDebug("ENTER");
+       if (__pContentUpdateInProgressPopup != null)
+       {
+               AppLogDebug("EXIT");
+               return;
+       }
+
+       __pContentUpdateInProgressPopup = new (std::nothrow) Popup();
+       result r = __pContentUpdateInProgressPopup->Construct(IDL_CONTENTS_UPDATE_POPUP);
+       if (IsFailed(r))
+       {
+               AppLogDebug("EXIT(%s)", GetErrorMessage(r));
+               delete __pContentUpdateInProgressPopup;
+               return;
+       }
+
+       __pContentUpdateInProgressPopup->SetShowState(true);
+       __pContentUpdateInProgressPopup->Show();
+       AppLogDebug("EXIT");
+}
+
+void
+MusicPlayerApp::HideContentUpdateInProgressPopup(void)
+{
+       AppLogDebug("ENTER");
+       if (__pContentUpdateInProgressPopup == null)
+       {
+               AppLogDebug("EXIT");
+               return;
+       }
+
+       __pContentUpdateInProgressPopup->SetShowState(false);
+       delete __pContentUpdateInProgressPopup;
+       __pContentUpdateInProgressPopup = null;
+       AppLogDebug("EXIT");
+}
+
+void
  MusicPlayerApp::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
  {
         AppLogDebug("ENTER");
@@ -476,12 +520,13 @@ MusicPlayerApp::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
                 return;
         }
  
-       FireImpleContentUpdate();
+       CallContentUpdate();
+       HideContentUpdateInProgressPopup();
         AppLogDebug("EXIT");
  }
  
  void
-MusicPlayerApp::FireImpleContentUpdate(void)
+MusicPlayerApp::CallContentUpdate(void)
  {
         AppLogDebug("ENTER");
         UiApp* pApp = UiApp::GetInstance();
@@ -492,10 +537,10 @@ MusicPlayerApp::FireImpleContentUpdate(void)
                 SceneManager* pSceneManager = SceneManager::GetInstance();
                 AppAssert(pSceneManager);
  
-               MusicContentUpdateEventListner* pEventListner = dynamic_cast<MusicContentUpdateEventListner*>(pSceneManager->GetCurrentScene()->GetForm());
+               IMusicContentUpdateEventListner* pEventListner = dynamic_cast<IMusicContentUpdateEventListner*>(pSceneManager->GetCurrentScene()->GetForm());
                 if (pEventListner == null)
                 {
-                       pEventListner = dynamic_cast<MusicContentUpdateEventListner*>(pSceneManager->GetCurrentScene()->GetPanel());
+                       pEventListner = dynamic_cast<IMusicContentUpdateEventListner*>(pSceneManager->GetCurrentScene()->GetPanel());
                 }
  
                 if (pEventListner != null)
@@ -516,7 +561,7 @@ MusicPlayerApp::FireImpleContentUpdate(void)
                         continue;
                 }
  
-               MusicContentUpdateEventListner* pEventListner = dynamic_cast<MusicContentUpdateEventListner*>(pForm);
+               IMusicContentUpdateEventListner* pEventListner = dynamic_cast<IMusicContentUpdateEventListner*>(pForm);
                 if (pEventListner != null)
                 {
                         pEventListner->OnMusicContentUpdateCompleted();
@@ -526,7 +571,7 @@ MusicPlayerApp::FireImpleContentUpdate(void)
                 int formChildControlCount = pForm->GetControlCount();
                 for (int iCount = 0; iCount < formChildControlCount; iCount++)
                 {
-                       MusicContentUpdateEventListner* pEventListner = dynamic_cast<MusicContentUpdateEventListner*>(pForm->GetControl(iCount));
+                       IMusicContentUpdateEventListner* pEventListner = dynamic_cast<IMusicContentUpdateEventListner*>(pForm->GetControl(iCount));
                         if (pEventListner != null)
                         {
                                 pEventListner->OnMusicContentUpdateCompleted();
@@ -534,4 +579,4 @@ MusicPlayerApp::FireImpleContentUpdate(void)
                 }
         }
         AppLogDebug("EXIT");
-}
+}
+\ No newline at end of file
diff --git a/src/MpMusicPlayerForm.cpp b/src/MpMusicPlayerForm.cpp

index dd33b40..6d9b20d 100644 (file)
--- a/src/MpMusicPlayerForm.cpp
+++ b/src/MpMusicPlayerForm.cpp
@@ -25,6 +25,7 @@
  #include <FMedia.h>
  #include <FUi.h>
  #include <FUiScenes.h>
+#include "MpAllListPresentationModel.h"
  #include "MpCommonUtil.h"
  #include "MpMusicPlayerApp.h"
  #include "MpMusicPlayerForm.h"
@@ -512,7 +513,7 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
  
                         if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
                         {
-                               SetMoreContentMenuStatus(false);
+                               SetFileNotExistState(false);
                         }
                 }
                 break;
@@ -1036,7 +1037,7 @@ PlayerForm::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
                 }
                 if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
                 {
-                       SetMoreContentMenuStatus(false);
+                       SetFileNotExistState(false);
                 }
         }
         AppLogDebug("EXIT");
@@ -1114,7 +1115,7 @@ PlayerForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableVie
  
                 if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
                 {
-                       SetMoreContentMenuStatus(false);
+                       SetFileNotExistState(false);
                 }
         }
         AppLogDebug("EXIT");
@@ -1167,6 +1168,7 @@ PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                 __pPlayerPresentationModel->Play(static_cast<Integer*>(pArgs->GetAt(1))->ToInt(), MIN_PLAY_STATE_SLIDER_COUNT);
                 SetRepeatButtonImage(__pPlayerPresentationModel->GetRepeatState());// 0 - 2 (OFF, ONE, ALL)
                 SetShuffleButtonImage(__pPlayerPresentationModel->IsShuffleEnable());// 0 - 1 (OFF, ON)
+               TogglePlayPauseImage(__pPlayerPresentationModel->GetPlayerState());
  
                 if (!static_cast<String*>(pArgs->GetAt(0))->Equals(MUSIC, false))
                 {
@@ -1198,7 +1200,7 @@ PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
  
         if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
         {
-               SetMoreContentMenuStatus(false);
+               SetFileNotExistState(false);
         }
  
         Invalidate(true);
@@ -1244,7 +1246,7 @@ PlayerForm::OnChangedContentList(Tizen::Base::Collection::IList* pArgs)
  
         if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
         {
-               SetMoreContentMenuStatus(false);
+               SetFileNotExistState(false);
         }
         Invalidate(true);
         AppLogDebug("EXIT");
@@ -1255,7 +1257,7 @@ PlayerForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::I
  {
         AppLogDebug("ENTER");
         AppLogDebug("OnUserEventReceivedN %d", requestId);
-       if (requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP || requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP)
+       if (requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP || requestId == ID_DESTORY_SHARE_POPUP)
         {
                 RemovePlayListPicker();
                 RemoveSharePicker();
@@ -1421,7 +1423,7 @@ PlayerForm::SetContentInfo(int currentContentIndex)
  
         if (pContentInfoStruct->contentId.ToString().Equals(INVALID_VALUE_OF_CONTENT_ID, true))
         {
-               SetMoreContentMenuStatus(false);
+               SetFileNotExistState(false);
         }
         else
         {
@@ -1431,7 +1433,7 @@ PlayerForm::SetContentInfo(int currentContentIndex)
                         {
                                 __pPlayStateSlider->SetEnabled(true);
                         }
-                       SetMoreContentMenuStatus(true);
+                       SetFileNotExistState(true);
                 }
         }
         delete pContentInfoStruct;
@@ -1445,7 +1447,7 @@ void
  PlayerForm::UpdateAnimationAlbumArt(AlbumArtImage position)
  {
         AppLogDebug("ENTER");
-       Bitmap* pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT];
+       Bitmap* pAlbumArtBitmap[ALBUM_ART_IMAGE_COUNT] = {null, };
         FloatDimension floatDimension = static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->GetSizeF();
  
         switch (position)
@@ -1594,10 +1596,15 @@ PlayerForm::SetShuffleButtonImage(bool shuffleEnable)
  }
  
  void
-PlayerForm::SetMoreContentMenuStatus(bool buttonEnable)
+PlayerForm::SetFileNotExistState(bool isFileExist)
  {
-       __pMoreContextButton->SetEnabled(buttonEnable);
+       AppLogDebug("ENTER");
+       __pMoreContextButton->SetEnabled(isFileExist);
         __pMoreContextButton->Invalidate(true);
+
+       __pContentsViewToggleButton->SetEnabled(isFileExist);
+       __pContentsViewToggleButton->Invalidate(true);
+       AppLogDebug("EXIT");
  }
  
  void
@@ -1821,6 +1828,66 @@ PlayerForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
  }
  
  void
+PlayerForm::OnMusicContentUpdateCompleted(void)
+{
+       AppLogDebug("ENTER");
+       AllListPresentationModel* pPresentationModel = AllListPresentationModel::GetInstance();
+       if (pPresentationModel == null)
+       {
+               AppLogDebug("EXIT");
+               return;
+       }
+
+       IList* pList = pPresentationModel->GetContentListN();
+       if (pList == null || pList->GetCount() == INIT_VALUE)
+       {
+               AppLogDebug("EXIT");
+               delete pList;
+               return;
+       }
+
+       bool isFind = false;
+       int iContentListCount = __pPlayerPresentationModel->GetContentListCount();
+       for (int iCount =  iContentListCount - 1; iCount >= 0; iCount--)
+       {
+               String* pContentPath = __pPlayerPresentationModel->GetContentPath(iCount);
+
+               IEnumerator* pIEnum = pList->GetEnumeratorN();
+               while (pIEnum->MoveNext() == E_SUCCESS)
+               {
+                       String* pCurrentPath = static_cast<String*>(pIEnum->GetCurrent());
+                       if (pCurrentPath == null)
+                       {
+                               continue;
+                       }
+
+                       if (pContentPath->Equals(*pCurrentPath, false))
+                       {
+                               isFind = true;
+                               break;
+                       }
+               }
+               delete pIEnum;
+
+               if (isFind == false)
+               {
+                       __pPlayerPresentationModel->RemoveContent(*pContentPath);
+               }
+       }
+
+       if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
+       {
+               SetFileNotExistState(false);
+       }
+
+       if (__pContentsListViewPanel->GetShowState() == true &&  __pPlayerPresentationModel->GetContentListCount() != INIT_VALUE)
+       {
+               static_cast<TableView*>(__pContentsListViewPanel->GetControl(IDC_CONTENTS_TABLEVIEW))->UpdateTableView();
+       }
+       AppLogDebug("EXIT");
+}
+
+void
  PlayerForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
  {
         AppLogDebug("ENTER");
@@ -1888,7 +1955,7 @@ PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
                         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);
+//                     static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->RemoveTouchEventListener(*this);
                 }
                 break;
  
@@ -1910,7 +1977,7 @@ PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
                         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);
+//                     static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->RemoveTouchEventListener(*this);
                 }
                 break;
  
diff --git a/src/MpMusicPlayerPresentationModel.cpp b/src/MpMusicPlayerPresentationModel.cpp

index 059f2f3..6e947b9 100644 (file)
--- a/src/MpMusicPlayerPresentationModel.cpp
+++ b/src/MpMusicPlayerPresentationModel.cpp
@@ -606,15 +606,15 @@ PlayerPresentationModel::GetContentInfoN(int contentIndex)
                 return null;
         }
  
-       Tizen::Base::String contentPath = *static_cast<String*>(__pPlayContentList->GetAt(contentIndex));
-       if (File::IsFileExist(contentPath) == false)
+       Tizen::Base::String* contentPath = static_cast<String*>(__pPlayContentList->GetAt(contentIndex));
+       if (contentPath == null || File::IsFileExist(*contentPath) == false)
         {
                 AppLogDebug("EXIT");
                 return null;
         }
  
         ContentInformation* pContentInfo = new (std::nothrow) ContentInformation();
-       AudioContentInfo* pAudioContentInfo = CommonUtil::GetAudioContentInfoN(contentPath);
+       AudioContentInfo* pAudioContentInfo = CommonUtil::GetAudioContentInfoN(*contentPath);
         if (pAudioContentInfo != null)
         {
                 if (pAudioContentInfo->GetArtist() == null)
@@ -724,7 +724,6 @@ PlayerPresentationModel::Play(int contentIndex, int sliderPosition, bool bPauseP
         {
                 ClosePlayer();
                 InitializeProgress();
-               return E_FAILURE;
         }
  
         PlayerState playerState;
diff --git a/src/MpPlaylistContentListForm.cpp b/src/MpPlaylistContentListForm.cpp

index 2f056cf..e6124f4 100644 (file)
--- a/src/MpPlaylistContentListForm.cpp
+++ b/src/MpPlaylistContentListForm.cpp
@@ -181,19 +181,17 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int
                                                 {
                                                         return;
                                                 }
-                                               __pContentListTableView->SetItemChecked(iCount, false);
+//                                             __pContentListTableView->SetItemChecked(iCount, false);
                                                 __pPresentationModel->DeleteContent(__currentContentType, *pContentInfoStruct);
  
                                                 delete pContentInfoStruct;
-                                               pContentInfoStruct = null;
                                         }
                                 }
                                 RemoveCheckedTableviewItem(false);
+                               __pPresentationModel->UpdatePlaylistContentList(__currentContentType, __headerTitle);
+                               UpdateScreenState();
+                               UpdateTableView();
                         }
-
-                       __pPresentationModel->UpdatePlaylistContentList(__currentContentType, __headerTitle);
-                       UpdateScreenState();
-                       UpdateTableView();
                 }
                 break;
  
@@ -648,10 +646,10 @@ PlaylistContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
                         }
                 }
         }
-
-       __checkedItemCount = INIT_VALUE;
-       SetCheckedCountBallonTooltip(GetCheckedItemCount());
-       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+       else
+       {
+               SetItemCheckedAll(false);
+       }
         AppLogDebug("EXIT");
  }
  
diff --git a/src/MpPlaylistCreatorForm.cpp b/src/MpPlaylistCreatorForm.cpp

index d382fb9..b2195a8 100644 (file)
--- a/src/MpPlaylistCreatorForm.cpp
+++ b/src/MpPlaylistCreatorForm.cpp
@@ -272,7 +272,7 @@ PlaylistCreatorForm::OnActionPerformed(const Tizen::Ui::Control& source, int act
                                         __pPlaylistEditField->ShowKeypad();
                                         break;
                                 }
-                               r = E_FAILURE;
+
                                 if (__pDataList != null)
                                 {
                                         for (int index = 0; index < __pDataList->GetCount(); index++)
diff --git a/src/MpPlaylistListEditorPanel.cpp b/src/MpPlaylistListEditorPanel.cpp

index e1939a6..3dbb208 100644 (file)
--- a/src/MpPlaylistListEditorPanel.cpp
+++ b/src/MpPlaylistListEditorPanel.cpp
@@ -37,11 +37,10 @@ using namespace Tizen::Ui::Scenes;
  static const int IDA_RENAME_EDIT_BUTTON = 101;
  
  PlaylistListEditorPanel::PlaylistListEditorPanel(void)
-       : ThumbnailBase::ThumbnailBase()
-       , __selectedItemIndex(-1)
-       , __checkedItemCount(0)
+       : ContentEditPanel::ContentEditPanel()
+       , ThumbnailBase::ThumbnailBase()
+       , __selectedItemIndex(0)
         , __pSelectAllCheckedButton(null)
-       , __pCheckedCountLabel(null)
         , __pThumbnail(null)
         , __pPlaylistName(null)
  {
@@ -71,7 +70,7 @@ PlaylistListEditorPanel::OnTerminating(void)
         AppLogDebug("ENTER");
         ThumbnailBase::Stop();
         AppLogDebug("EXIT");
-       return E_SUCCESS;
+       return ContentEditPanel::OnTerminating();
  }
  
  void
@@ -94,17 +93,12 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                 {
                         if (totalCount == __checkedItemCount)
                         {
-                               __checkedItemCount = INIT_VALUE;
-                               CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBallonTooltip(__checkedItemCount);
-                               CommonUtil::SetFooterItemEnabled(*pFooter, false);
-                               break;
+                               SetItemCheckedAll(false);
+                       }
+                       else
+                       {
+                               SetItemCheckedAll(true);
                         }
-
-                       __checkedItemCount = totalCount;
-                       CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
-                       CommonUtil::SetFooterItemEnabled(*pFooter, true);
                 }
                 break;
  
@@ -139,18 +133,22 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                                 }
                         }
  
-                       if (__pPresentationModel->GetAllPlayListCount() != INIT_VALUE)
-                       {
-                               // Empty statement
-                       }
-                       else
-                       {
-                               SetNoContentSongs(true);
-                               SetDisableIconAllCheckButton();
-                       }
                         __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBallonTooltip(__checkedItemCount);
                         CommonUtil::SetFooterItemEnabled(*pFooter, false);
+                       UpdateContentEditScreenState();
+
+//                     if (__pPresentationModel->GetAllPlayListCount() != INIT_VALUE)
+//                     {
+//                             // Empty statement
+//                     }
+//                     else
+//                     {
+//                             SetNoContentSongs(true);
+//                             SetDisableIconAllCheckButton();
+//                     }
+//                     __checkedItemCount = INIT_VALUE;
+//                     SetCheckedCountBallonTooltip(__checkedItemCount);
+//                     CommonUtil::SetFooterItemEnabled(*pFooter, false);
                 }
                 break;
  
@@ -177,22 +175,21 @@ PlaylistListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& pre
                                                                                 Tizen::Base::Collection::IList* pArgs)
  {
         AppLogDebug("ENTER");
+       ContentPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
+
         Form* pForm = dynamic_cast<Form*>(GetParent());
-       Footer* pFooter = null;
         AppAssert(pForm);
  
         SetEditHeaderStyle();
         pForm->SetFormBackEventListener(this);
  
-       pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_DELETE_ADD);
+       Footer* pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_DELETE_ADD);
         pFooter->AddActionEventListener(*this);
         pFooter->SetShowState(true);
         CommonUtil::SetFooterItemEnabled(*pFooter, false);
  
-       UpdateContentList();
-       SetCheckedCountBallonTooltip(INIT_VALUE);
+       UpdateContentEditScreenState();
  
-       SetNoContentSongs(false);
         if (pArgs != null)
         {
                 pArgs->RemoveAll(true);
@@ -206,10 +203,9 @@ PlaylistListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& cu
                                                         const Tizen::Ui::Scenes::SceneId& nextSceneId)
  {
         AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
+       ContentPanel::OnSceneDeactivated(currentSceneId, nextSceneId);
  
-       Footer* pFooter = pForm->GetFooter();
+       Footer* pFooter = GetFooter();
         pFooter->SetItemEnabled(0, true);
  
         pFooter->RemoveAllButtons();
@@ -363,11 +359,6 @@ void
  PlaylistListEditorPanel::UpdateContentList(void)
  {
         AppLogDebug( "ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
-       {
-//             __pPresentationModel->RefreshContent();
-               __pContentTableView->UpdateTableView();
-       }
         AppLogDebug( "EXIT");
  }
  
@@ -375,11 +366,9 @@ void
  PlaylistListEditorPanel::SetEditHeaderStyle(void)
  {
         AppLogDebug("ENTER");
-       RemoveParentHeaderActionEventListener();
-       Header* pHeader = GetParentHeader();
+       Header* pHeader = GetHeader();
         String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
         CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
-       pHeader->AddActionEventListener(*this);
         pHeader->Invalidate(true);
         AppLogDebug("EXIT");
  }
@@ -388,20 +377,8 @@ void
  PlaylistListEditorPanel::SetTabHeaderStyle(void)
  {
         AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       pHeader->RemoveActionEventListener(*this);
+       Header* pHeader = GetHeader();
         CommonUtil::SetTabHeaderStyle(*pHeader);
-       AddParentHeaderActionEventListener();
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListEditorPanel::SetDisableIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
         pHeader->Invalidate(true);
         AppLogDebug("EXIT");
  }
@@ -434,14 +411,6 @@ PlaylistListEditorPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
         AppLogDebug("EXIT");
  }
  
-int
-PlaylistListEditorPanel::GetCheckedItemCount(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return __checkedItemCount;
-}
-
  result
  PlaylistListEditorPanel::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const Tizen::Base::String& title, int itemIndex)
  {
@@ -484,4 +453,17 @@ PlaylistListEditorPanel::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem&
  
         AppLogDebug("EXIT");
         return E_SUCCESS;
+}
+
+bool
+PlaylistListEditorPanel::IsEmptyContentList(void)
+{
+       AppLogDebug("ENTER");
+       if (__pPresentationModel->GetAllPlayListCount() == INIT_VALUE)
+       {
+               AppLogDebug("EXIT");
+               return true;
+       }
+       AppLogDebug("EXIT");
+       return false;
  }
 \ No newline at end of file
diff --git a/src/MpPlaylistListPresentationModel.cpp b/src/MpPlaylistListPresentationModel.cpp

index 3b053eb..9e0f83a 100644 (file)
--- a/src/MpPlaylistListPresentationModel.cpp
+++ b/src/MpPlaylistListPresentationModel.cpp
@@ -248,11 +248,9 @@ PlaylistListPresentationModel::GetContentPathListN(int contentType)
                                         __pPlaylistContentList->Add(*(new (std::nothrow) String(contentPath)));
                                 }
                         }
+                       delete pDbEnumerator;
                 }
  
-               delete pDbEnumerator;
-               pDbEnumerator = null;
-
                 if (pTempList != null)
                 {
                         for (int i = 0; i < pTempList->GetCount(); i++)
@@ -260,9 +258,10 @@ PlaylistListPresentationModel::GetContentPathListN(int contentType)
                                 playlistDB->Delete(*static_cast<String*>(pTempList->GetAt(i)));
                         }
  
+                       pTempList->RemoveAll();
                         delete pTempList;
-                       pTempList = null;
                 }
+               delete playlistDB;
         }
         else if (contentType == RECENTLY_ADDED_CONTENT)
         {
@@ -458,6 +457,9 @@ PlaylistListPresentationModel::UpdatePlaylistContentList(const int contentType,
  
                 delete pDbEnumerator;
                 pDbEnumerator = null;
+
+               delete playlistDB;
+               playlistDB = null;
         }
         else if (contentType == RECENTLY_ADDED_CONTENT)
         {
@@ -597,7 +599,6 @@ PlaylistListPresentationModel::DeleteContent(int contentType, const ContentInfor
                         }
  
                         delete pTempList;
-                       pTempList = null;
  
                         pTempList = playlistDB->ReadValueN(contentId);
                         playCount = static_cast<Integer*>(pTempList->GetAt(0))->ToInt();
@@ -609,8 +610,8 @@ PlaylistListPresentationModel::DeleteContent(int contentType, const ContentInfor
                                 playlistDB->Delete(contentId);
                         }
  
+                       delete playlistDB;
                         delete pTempList;
-                       pTempList = null;
                 }
                 break;
  
diff --git a/src/MpSearchForm.cpp b/src/MpSearchForm.cpp

index 13789f3..50a708d 100644 (file)
--- a/src/MpSearchForm.cpp
+++ b/src/MpSearchForm.cpp
@@ -326,7 +326,10 @@ SearchForm::CreateItem(const int itemIndex, int itemWidth)
  
  CATCH:
         AppLogDebug("EXIT(%ls)", GetErrorMessage(GetLastResult()));
-       delete pContentInfo;
+       if (pContentInfo != null)
+       {
+               delete pContentInfo;
+       }
         return null;
  }
  
diff --git a/src/MpSettingForm.cpp b/src/MpSettingForm.cpp

index a8b9cb8..ac5d12d 100644 (file)
--- a/src/MpSettingForm.cpp
+++ b/src/MpSettingForm.cpp
@@ -191,9 +191,7 @@ SettingForm::CreateGroupItem(int groupIndex, int itemWidth)
                                 AppLogDebug("Construct(IDL_SETTING_PLAYLIST_SET_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
                                 return null;
                         }
-                       Label* pMainText = static_cast<Label*>(pGroupTableViewItem->GetControl(IDC_LABEL_MAIN_TEXT));
                         Label* pSubText = static_cast<Label*>(pGroupTableViewItem->GetControl(IDC_LABEL_SUB_TEXT));
-                       pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_MUSIC_AUTO_OFF"));
                         pSubText->SetText(GetAutoOffString());
                 }
                 break;
@@ -558,9 +556,6 @@ SettingForm::GetAutoOffString(void)
                 break;
  
         default:
-               {
-                       return ResourceManager::GetString(L"IDS_MUSIC_BODY_NOT_USED");
-               }
                 break;
         }
  
diff --git a/src/MpTypes.cpp b/src/MpTypes.cpp

index 4da4bab..4276faa 100644 (file)
--- a/src/MpTypes.cpp
+++ b/src/MpTypes.cpp
@@ -44,6 +44,7 @@ const wchar_t* IDL_CONTENT_LIBARY_COMMON_PANEL = L"IDL_CONTENT_LIBARY_COMMON_PAN
  const wchar_t* IDL_CONTENT_FORM = L"IDL_CONTENT_FORM";
  const wchar_t* IDL_MINI_PLYAER_PANEL = L"IDL_MINI_PLYAER_PANEL";
  const wchar_t* IDL_CONTENTS_DELETE_POPUP = L"IDL_CONTENTS_DELETE_POPUP";
+const wchar_t* IDL_CONTENTS_UPDATE_POPUP = L"IDL_CONTENTS_UPDATE_POPUP";
  const wchar_t* IDL_CREATE_PLAYLIST_POPUP = L"IDL_CREATE_PLAYLIST_POPUP";
  const wchar_t* IDL_SHARE_VIA_POPUP = L"IDL_SHARE_VIA_POPUP";
  const wchar_t* IDL_SWEEP_QUICK_MENU_ITEM_PANEL = L"IDL_SWEEP_QUICK_MENU_ITEM_PANEL";
@@ -146,7 +147,7 @@ const wchar_t* IDC_SIZE_DATA_LABEL = L"IDC_SIZE_DATA_LABEL";
  const wchar_t* IDC_FORWARDING_DATA_LABEL = L"IDC_FORWARDING_DATA_LABEL";
  const wchar_t* IDC_DATE_DATA_LABEL = L"IDC_DATE_DATA_LABEL";
  const wchar_t* IDC_LOCATION_DATA_LABEL = L"IDC_LOCATION_DATA_LABEL";
-const wchar_t* IDC_TITLE_LABEL = L"IDC_TITLE_LABEL";
+//const wchar_t* IDC_TITLE_LABEL = L"IDC_TITLE_LABEL";
  const wchar_t* IDC_BALLOON_TOOLTIP_LABEL = L"IDC_BALLOON_TOOLTIP_LABEL";
  const wchar_t* IDC_NO_CONTENT_LABEL = L"IDC_NO_CONTENT_LABEL";
  const wchar_t* IDC_CONTENT_GROUPED_TABLEVIEW = L"IDC_CONTENT_GROUPED_TABLEVIEW";
diff --git a/src/MpUserPlaylistContentListForm.cpp b/src/MpUserPlaylistContentListForm.cpp

index 419f78d..05c51ed 100644 (file)
--- a/src/MpUserPlaylistContentListForm.cpp
+++ b/src/MpUserPlaylistContentListForm.cpp
@@ -19,7 +19,6 @@
   * @brief              This is the implementation file for UserPlaylistContentListForm class.
   */
  
-#include "MpNowPlayContentPanel.h"
  #include "MpPlaylistListPresentationModel.h"
  #include "MpPlaylistPickerPopup.h"
  #include "MpSharePopup.h"
@@ -188,7 +187,6 @@ UserPlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source,
                                         __pPresentationModel->DeleteContent(USER_CONTENT, *pContentInfoStruct);
  
                                         delete pContentInfoStruct;
-                                       pContentInfoStruct = null;
                                 }
                         }
                         RemoveCheckedTableviewItem(false);
@@ -235,12 +233,12 @@ UserPlaylistContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId&
                 pArgs->RemoveAll(true);
                 delete pArgs;
         }
-       else if (!(__headerTitle.Equals(L"", false)))
-       {
-               __pPresentationModel->UpdatePlaylistContentList(USER_CONTENT, __headerTitle);
-               UpdateScreenState();
-               UpdateTableView();
-       }
+//     else if (!(__headerTitle.Equals(L"", false)))
+//     {
+//             __pPresentationModel->UpdatePlaylistContentList(USER_CONTENT, __headerTitle);
+//             UpdateScreenState();
+//             UpdateTableView();
+//     }
         AppLogDebug("EXIT");
  }
  
diff --git a/src/MpYearContentPickerPanel.cpp b/src/MpYearContentPickerPanel.cpp

index f9a15a6..62fdd06 100644 (file)
--- a/src/MpYearContentPickerPanel.cpp
+++ b/src/MpYearContentPickerPanel.cpp
@@ -145,7 +145,7 @@ YearContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                         {
                                 if (__pContentTableView->IsItemChecked(iCount) == true)
                                 {
-                                       __pPresentationModel->AddContent(*new (std::nothrow) String(CommonUtil::GetAddtoPlaylistName()), iCount);
+                                       __pPresentationModel->AddContent(CommonUtil::GetAddtoPlaylistName(), iCount);
                                         __pContentTableView->SetItemChecked(iCount, false);
                                 }
                         }
diff --git a/src/MpYearPickerPanel.cpp b/src/MpYearPickerPanel.cpp

index 74c8e4f..c87ba1e 100644 (file)
--- a/src/MpYearPickerPanel.cpp
+++ b/src/MpYearPickerPanel.cpp
@@ -58,10 +58,7 @@ YearPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSce
         SceneManager* pSceneManager = SceneManager::GetInstance();
         AppAssert(pSceneManager);
         __pPresentationModel->UpdateYearList();
-       if (__pPresentationModel != null)
-       {
-//             CommonUtil::ShowNoContentImage(__pPresentationModel->GetAllYearCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
-       }
+//     CommonUtil::ShowNoContentImage(__pPresentationModel->GetAllYearCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
  
         if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
         {
author	Myunkyu <mk70.kang@partner.samsung.com>
	Wed, 10 Apr 2013 11:51:39 +0000 (20:51 +0900)
committer	Myunkyu <mk70.kang@partner.samsung.com>
	Wed, 10 Apr 2013 12:21:25 +0000 (21:21 +0900)
inc/MpAlbumListEditorPanel.h		patch \| blob \| history
inc/MpAllListEditorPanel.h		patch \| blob \| history
inc/MpArtistListEditorPanel.h		patch \| blob \| history
inc/MpContentEditPanel.h		patch \| blob \| history
inc/MpContentLibaryPanel.h		patch \| blob \| history
inc/MpContentListForm.h		patch \| blob \| history
inc/MpFolderListEditorPanel.h		patch \| blob \| history
inc/MpIMusicContentUpdateEventListner.h	[moved from inc/MpMusicContentUpdateEventListner.h with 76% similarity]	patch \| blob \| history
inc/MpMusicPlayerApp.h		patch \| blob \| history
inc/MpMusicPlayerForm.h		patch \| blob \| history
inc/MpPlaylistListEditorPanel.h		patch \| blob \| history
inc/MpTypes.h		patch \| blob \| history
inc/MpUserPlaylistContentListForm.h		patch \| blob \| history
res/screen-size-normal/IDL_CONTENTS_DETAIL_FORM.xml		patch \| blob \| history
res/screen-size-normal/IDL_CONTENTS_UPDATE_POPUP.xml	[new file with mode: 0644]	patch \| blob
res/screen-size-normal/IDL_CREATE_PLAYLIST_POPUP.xml		patch \| blob \| history
res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml		patch \| blob \| history
res/screen-size-normal/IDL_PLAYLIST_CREATOR_FORM.xml		patch \| blob \| history
res/screen-size-normal/IDL_SETTING_OFF_SET_ITEM_PANEL.xml		patch \| blob \| history
src/MpAlbumContentListForm.cpp		patch \| blob \| history
src/MpAlbumContentPickerPanel.cpp		patch \| blob \| history
src/MpAlbumListEditorPanel.cpp		patch \| blob \| history
src/MpAlbumListPresentationModel.cpp		patch \| blob \| history
src/MpAlbumPickerPanel.cpp		patch \| blob \| history
src/MpAllContentPickerPanel.cpp		patch \| blob \| history
src/MpAllListEditorPanel.cpp		patch \| blob \| history
src/MpArtistContentListForm.cpp		patch \| blob \| history
src/MpArtistContentPickerPanel.cpp		patch \| blob \| history
src/MpArtistListEditorPanel.cpp		patch \| blob \| history
src/MpArtistPickerPanel.cpp		patch \| blob \| history
src/MpCommonUtil.cpp		patch \| blob \| history
src/MpComposerContentPickerPanel.cpp		patch \| blob \| history
src/MpComposerPickerPanel.cpp		patch \| blob \| history
src/MpContentDetailForm.cpp		patch \| blob \| history
src/MpContentEditPanel.cpp		patch \| blob \| history
src/MpContentListForm.cpp		patch \| blob \| history
src/MpContentListPanel.cpp		patch \| blob \| history
src/MpContentPanel.cpp		patch \| blob \| history
src/MpFolderContentListForm.cpp		patch \| blob \| history
src/MpFolderContentPickerPanel.cpp		patch \| blob \| history
src/MpFolderListEditorPanel.cpp		patch \| blob \| history
src/MpFolderPickerPanel.cpp		patch \| blob \| history
src/MpGenreContentPickerPanel.cpp		patch \| blob \| history
src/MpGenrePickerPanel.cpp		patch \| blob \| history
src/MpMiniPlayer.cpp		patch \| blob \| history
src/MpMusicPlayerApp.cpp		patch \| blob \| history
src/MpMusicPlayerForm.cpp		patch \| blob \| history
src/MpMusicPlayerPresentationModel.cpp		patch \| blob \| history
src/MpPlaylistContentListForm.cpp		patch \| blob \| history
src/MpPlaylistCreatorForm.cpp		patch \| blob \| history
src/MpPlaylistListEditorPanel.cpp		patch \| blob \| history
src/MpPlaylistListPresentationModel.cpp		patch \| blob \| history
src/MpSearchForm.cpp		patch \| blob \| history
src/MpSettingForm.cpp		patch \| blob \| history
src/MpTypes.cpp		patch \| blob \| history
src/MpUserPlaylistContentListForm.cpp		patch \| blob \| history
src/MpYearContentPickerPanel.cpp		patch \| blob \| history
src/MpYearPickerPanel.cpp		patch \| blob \| history