sync with master
authorJinkun Jang <jinkun.jang@samsung.com>
Sun, 17 Mar 2013 06:23:07 +0000 (15:23 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Sun, 17 Mar 2013 06:23:07 +0000 (15:23 +0900)
209 files changed:
inc/MpAlbumListPanel.h [changed mode: 0755->0644]
inc/MpAllListEditorPanel.h [changed mode: 0755->0644]
inc/MpAllListPanel.h [changed mode: 0755->0644]
inc/MpArtistListPanel.h [changed mode: 0755->0644]
inc/MpCommonUtil.h [changed mode: 0755->0644]
inc/MpContentEditPanel.h [new file with mode: 0644]
inc/MpContentForm.h [changed mode: 0755->0644]
inc/MpContentLibaryPanel.h [new file with mode: 0644]
inc/MpContentPanel.h [new file with mode: 0644]
inc/MpFolderListPanel.h [changed mode: 0755->0644]
inc/MpFormFactory.h [changed mode: 0755->0644]
inc/MpMiniPlayer.h [new file with mode: 0644]
inc/MpMusicPlayerForm.h [changed mode: 0755->0644]
inc/MpPlaylistCreatorForm.h [changed mode: 0755->0644]
inc/MpPlaylistListEditorPanel.h [changed mode: 0755->0644]
inc/MpPlaylistListPanel.h [changed mode: 0755->0644]
inc/MpPlaylistPickerPopup.h [changed mode: 0755->0644]
inc/MpPlaylistReNameForm.h [new file with mode: 0644]
inc/MpSceneRegister.h
inc/MpTypes.h
res/screen-density-xhigh/00_check_bg.png [new file with mode: 0644]
res/screen-density-xhigh/00_check_bg_dim.png [new file with mode: 0644]
res/screen-density-xhigh/00_check_bg_press.png [new file with mode: 0644]
res/screen-density-xhigh/00_check_checking.png [new file with mode: 0644]
res/screen-density-xhigh/00_icon_edit.png [new file with mode: 0644]
res/screen-density-xhigh/00_icon_edit_ef.png [new file with mode: 0644]
res/screen-density-xhigh/00_icon_more.png [new file with mode: 0644]
res/screen-density-xhigh/00_icon_more_ef.png [new file with mode: 0644]
res/screen-density-xhigh/T02_album_thumbnail_bg.png [new file with mode: 0644]
res/screen-density-xhigh/T02_album_thumbnail_h_bg.PNG [new file with mode: 0644]
res/screen-density-xhigh/T02_album_turn_table.png [new file with mode: 0644]
res/screen-density-xhigh/T02_album_turn_table_h.PNG [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_button_01.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_button_01_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_button_02.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_button_02_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_button_03.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_button_03_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_next.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_next_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_next_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_pause.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_pause_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_pause_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_play.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_play_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_play_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_previous.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_previous_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_circle_icon_previous_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_control_progress_handle.png [new file with mode: 0644]
res/screen-density-xhigh/T02_folder_storage_icon_inner_memory.png [new file with mode: 0644]
res/screen-density-xhigh/T02_folder_storage_icon_inner_memory_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_folder_storage_icon_memory.png [new file with mode: 0644]
res/screen-density-xhigh/T02_folder_storage_icon_memory_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_icon_play_list.png [new file with mode: 0644]
res/screen-density-xhigh/T02_icon_play_list_web.png [new file with mode: 0644]
res/screen-density-xhigh/T02_icon_play_list_web_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_icon_play_list_web_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_icon_search.png [new file with mode: 0644]
res/screen-density-xhigh/T02_icon_search__.png [new file with mode: 0644]
res/screen-density-xhigh/T02_icon_search_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_icon_search_web.png [new file with mode: 0644]
res/screen-density-xhigh/T02_icon_search_web_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_icon_search_web_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_button_01.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_button_01_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_button_02.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_button_02_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_next.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_next_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_next_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_pause.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_pause_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_pause_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_play.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_play_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_play_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_previous.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_previous_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_control_circle_icon_previous_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_eq_ani_01.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_eq_ani_02.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_eq_ani_03.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_eq_ani_04.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_eq_ani_05.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_eq_ani_06.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_eq_ani_07.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_eq_ani_08.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_icon_now_playing.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_player_bg.png [new file with mode: 0644]
res/screen-density-xhigh/T02_mini_progress_bar.png [new file with mode: 0644]
res/screen-density-xhigh/T02_music_line.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_SA.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_SA_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_SA_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_rep_1.png [changed mode: 0755->0644]
res/screen-density-xhigh/T02_option_rep_1_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_rep_1_press.png [changed mode: 0755->0644]
res/screen-density-xhigh/T02_option_rep_A.png [changed mode: 0755->0644]
res/screen-density-xhigh/T02_option_rep_A_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_rep_A_press.png [changed mode: 0755->0644]
res/screen-density-xhigh/T02_option_rep_all.png [changed mode: 0755->0644]
res/screen-density-xhigh/T02_option_rep_all_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_rep_all_press.png [changed mode: 0755->0644]
res/screen-density-xhigh/T02_option_rep_section copy.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_rep_section copy_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_rep_section copy_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_shuffle_on.png [changed mode: 0755->0644]
res/screen-density-xhigh/T02_option_shuffle_on_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_shuffle_on_press.png [changed mode: 0755->0644]
res/screen-density-xhigh/T02_option_volume.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_volume_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T02_option_volume_press.png [new file with mode: 0644]
res/screen-density-xhigh/T02_volume_popup_bg.png [new file with mode: 0644]
res/screen-density-xhigh/T02_volume_popup_progress_bar.png [new file with mode: 0644]
res/screen-density-xhigh/T02_volume_popup_progress_bg.png [new file with mode: 0644]
res/screen-density-xhigh/T02_volume_popup_progress_handle.png [new file with mode: 0644]
res/screen-density-xhigh/music_btn_back.png [new file with mode: 0644]
res/screen-density-xhigh/music_btn_back_dim.png [new file with mode: 0644]
res/screen-density-xhigh/music_btn_back_press.png [new file with mode: 0644]
res/screen-size-normal/IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENTS_DELETE_POPUP.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENTS_LIBARY_ITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENTS_LIBARY_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENT_FORM.xml
res/screen-size-normal/IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTEXT_ITEM_PLAYALL_ADDTO.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CREATE_PLAYLIST_POPUP.xml [new file with mode: 0644]
res/screen-size-normal/IDL_MINI_PLYAER_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml [new file with mode: 0644]
res/screen-size-normal/IDL_PLAYLIST_CREATOR_FORM.xml [new file with mode: 0644]
res/screen-size-normal/IDL_PLAYLIST_RENAME_FORM.xml [new file with mode: 0644]
res/screen-size-normal/IDL_SHARE_VIA_POPUP.xml [new file with mode: 0644]
res/screen-size-normal/IDL_SWEEP_QUICK_ALBUM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_SWEEP_QUICK_ITEM2_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_SWEEP_QUICK_MENU_ITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL.xml [new file with mode: 0644]
src/MpAlbumContentListForm.cpp
src/MpAlbumContentPickerPanel.cpp
src/MpAlbumListEditorPanel.cpp
src/MpAlbumListPanel.cpp
src/MpAlbumPickerPanel.cpp
src/MpAllContentPickerPanel.cpp
src/MpAllListEditorPanel.cpp
src/MpAllListPanel.cpp [changed mode: 0755->0644]
src/MpArtistAlbumListEditorForm.cpp
src/MpArtistAlbumListForm.cpp
src/MpArtistAllSongListForm.cpp
src/MpArtistContentListForm.cpp
src/MpArtistContentPickerPanel.cpp
src/MpArtistListEditorPanel.cpp
src/MpArtistListPanel.cpp
src/MpArtistListPresentationModel.cpp
src/MpArtistPickerPanel.cpp
src/MpCommonUtil.cpp
src/MpComposerContentListForm.cpp
src/MpComposerContentPickerPanel.cpp
src/MpComposerListEditorPanel.cpp
src/MpComposerListPanel.cpp
src/MpContentDetailForm.cpp
src/MpContentEditPanel.cpp [new file with mode: 0644]
src/MpContentForm.cpp [changed mode: 0755->0644]
src/MpContentListPanel.cpp [new file with mode: 0644]
src/MpContentPanel.cpp [new file with mode: 0644]
src/MpFolderContentListForm.cpp
src/MpFolderContentPickerPanel.cpp
src/MpFolderListEditorPanel.cpp
src/MpFolderListPanel.cpp
src/MpFolderListPresentationModel.cpp
src/MpFolderPickerPanel.cpp
src/MpFormFactory.cpp [changed mode: 0755->0644]
src/MpGenreContentListForm.cpp
src/MpGenreContentPickerPanel.cpp
src/MpGenreListEditorPanel.cpp
src/MpGenreListPanel.cpp
src/MpGenreListPresentationModel.cpp
src/MpMiniPlayer.cpp [new file with mode: 0644]
src/MpMusicPlayerApp.cpp
src/MpMusicPlayerForm.cpp
src/MpMusicPlayerPresentationModel.cpp
src/MpNowPlayContentPanel.cpp
src/MpPanelFactory.cpp [changed mode: 0755->0644]
src/MpPlaylistContentListForm.cpp
src/MpPlaylistCreatorForm.cpp
src/MpPlaylistEditorPresentationModel.cpp
src/MpPlaylistListEditorPanel.cpp
src/MpPlaylistListPanel.cpp
src/MpPlaylistListPresentationModel.cpp
src/MpPlaylistPickerPopup.cpp
src/MpPlaylistReNameForm.cpp [new file with mode: 0644]
src/MpResourceManager.cpp [changed mode: 0755->0644]
src/MpSceneRegister.cpp
src/MpSearchForm.cpp
src/MpSetAsPopup.cpp
src/MpSharePopup.cpp
src/MpThumbnailProvider.cpp
src/MpTypes.cpp
src/MpUserPlaylistContentListForm.cpp
src/MpYearContentListForm.cpp
src/MpYearContentPickerPanel.cpp
src/MpYearListEditorPanel.cpp
src/MpYearListPanel.cpp

old mode 100755 (executable)
new mode 100644 (file)
index db0e5ec..2441db8
 #define _MP_ALBUM_LIST_PANEL_H_
 
 #include "MpAlbumListPresentationModel.h"
-#include "MpBasePanel.h"
+#include "MpCommonUtil.h"
+#include "MpContentLibaryPanel.h"
+#include "MpResourceManager.h"
 #include "MpSceneRegister.h"
 #include "MpThumbnailBase.h"
 #include "MpTypes.h"
 
 class PlayListPickerPopup;
-class NowPlayContentPanel;
 
 class AlbumListPanel
-       : public BasePanel
+       : public ContentLibaryPanel
        , public ThumbnailBase
-       , public Tizen::Ui::Controls::ITableViewItemProvider
-       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public Tizen::Ui::Controls::IFastScrollListener
-       , public Tizen::Ui::Controls::IFormBackEventListener
-       , public Tizen::Ui::IActionEventListener
-       , public Tizen::Ui::Scenes::ISceneEventListener
 {
-
 public:
        AlbumListPanel(void);
        virtual ~AlbumListPanel(void);
-       bool Initialize(void);
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
+
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
        virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
@@ -60,9 +55,7 @@ public:
        virtual int GetItemCount(void);
     
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual bool DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
        virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
-       virtual int GetDefaultItemHeight(void);
 
        virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
@@ -72,10 +65,6 @@ public:
                                                                        int itemIndex,
                                                                        Tizen::Ui::Controls::TableViewContextItem* pContextItem,
                                                                        bool activated);
-       virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndexFrom,
-                                               int itemIndexTo);
-
        virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
        virtual void OnUpdateContentList(void);
@@ -87,19 +76,18 @@ private:
        result CreateTableViewItem(Tizen::Ui::Container& parent,
                                                                const ContentInformation& contentInfoStruct,
                                                                const int contentTotalCount);
+       Tizen::Ui::Controls::TableViewContextItem* CreateTableViewContextItem(void);
        Tizen::Base::Collection::ArrayList* GetContentListN(int itemIndex);
        void UpdateContentList(void);
+       virtual bool IsEmptyContentList(void);
 
 protected:
        int __itemIndex;
-       NowPlayContentPanel* __pNowPlayContentPanel;
        PlayListPickerPopup* __pPlayListPickerPopup;
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem;
-       Tizen::Ui::Controls::TableView* __pContentTableView;
-       Tizen::Ui::Controls::Label* __pNoContentImageLabel;
-       Tizen::Ui::Controls::Label* __pNoContentTextLabel;
        AlbumListPresentationModel* __pPresentationModel;
        Tizen::Graphics::Bitmap* __pThumbnail;
+       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
 };
 
 #endif // _MP_ALBUM_LIST_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 142a5f4..440a793
@@ -30,7 +30,7 @@
 #include <FUi.h>
 #include <FUiScenes.h>
 #include "MpAllListPresentationModel.h"
-#include "MpBasePanel.h"
+#include "MpContentEditPanel.h"
 #include "MpCommonUtil.h"
 #include "MpSceneRegister.h"
 #include "MpThumbnailBase.h"
@@ -40,20 +40,15 @@ class PlayListPickerPopup;
 class SharePopup;
 
 class AllListEditorPanel
-       : public BasePanel
+       : public ContentEditPanel
        , public ThumbnailBase
-       , public Tizen::Ui::Controls::ITableViewItemProvider
-       , public Tizen::Ui::Controls::ITableViewItemEventListener
-       , public Tizen::Ui::IActionEventListener
-       , public Tizen::Ui::Scenes::ISceneEventListener
 {
 public:
        AllListEditorPanel(void);
-       ~AllListEditorPanel(void);
-       bool Initialize(void);
+       virtual ~AllListEditorPanel(void);
 
-       virtual result OnInitializing(void);
-       virtual result OnTerminating(void);
+       result OnInitializing(void);
+       result OnTerminating(void);
 
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
@@ -63,46 +58,40 @@ public:
                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId);
 
        virtual int GetItemCount(void);
-    
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual bool DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
        virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
-       virtual int GetDefaultItemHeight(void);
-
        virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
                                                        Tizen::Ui::Controls::TableViewItem* pItem,
                                                        Tizen::Ui::Controls::TableViewItemStatus status);
-       virtual void OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                                       int itemIndex,
-                                                                       Tizen::Ui::Controls::TableViewContextItem* pContextItem,
-                                                                       bool activated);
-       virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndexFrom,
-                                               int itemIndexTo);
 
        virtual void OnUpdateContentList(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
 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);
+
 private:
        PlayListPickerPopup* __pPlayListPickerPopup;
        SharePopup* __pSharePopup;
 
 protected:
        int __checkedItemCount;
-       Tizen::Ui::Controls::TableView* __pContentTableView;
        Tizen::Ui::Controls::CheckButton* __pSelectAllCheckedButton;
        Tizen::Ui::Controls::Label* __pCheckedCountLabel;
        AllListPresentationModel* __pPresentationModel;
        Tizen::Graphics::Bitmap* __pThumbnail;
-       Tizen::Ui::Controls::Label* __pNoContentImageLabel;
-       Tizen::Ui::Controls::Label* __pNoContentTextLabel;
+       int __editType;
 };
 
 #endif // _MP_ALL_LIST_EDITOR_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 6eea3bd..145b5a1
 #define _MP_ALL_LIST_PANEL_H_
 
 #include "MpAllListPresentationModel.h"
-#include "MpBasePanel.h"
 #include "MpCommonUtil.h"
+#include "MpContentLibaryPanel.h"
 #include "MpResourceManager.h"
 #include "MpSceneRegister.h"
 #include "MpThumbnailBase.h"
 #include "MpTypes.h"
 
-class NowPlayContentPanel;
 class PlayListPickerPopup;
 class SharePopup;
 
 class AllListPanel
-       : public BasePanel
+       : public ContentLibaryPanel
        , public ThumbnailBase
-       , public Tizen::Ui::Controls::ITableViewItemProvider
-       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public Tizen::Ui::Controls::IFastScrollListener
-       , public Tizen::Ui::Controls::IScrollEventListener
-       , public Tizen::Ui::Controls::IFormBackEventListener
        , public Tizen::App::IAppControlResponseListener
-       , public Tizen::Ui::IActionEventListener
-       , public Tizen::Ui::Scenes::ISceneEventListener
 {
 public:
        AllListPanel(void);
        virtual ~AllListPanel(void);
-       bool Initialize(void);
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
@@ -66,13 +58,10 @@ public:
        virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId);
 
-       virtual int GetItemCount(void);
     
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual bool DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
        virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
-       virtual int GetDefaultItemHeight(void);
-
+       virtual int GetItemCount(void);
        virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
                                                        Tizen::Ui::Controls::TableViewItem* pItem,
@@ -81,16 +70,8 @@ public:
                                                                        int itemIndex,
                                                                        Tizen::Ui::Controls::TableViewContextItem* pContextItem,
                                                                        bool activated);
-       virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndexFrom,
-                                               int itemIndexTo);
-
        virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
 
-       virtual void OnScrollEndReached (Tizen::Ui::Control &source, Tizen::Ui::Controls::ScrollEndEvent type);
-       virtual void OnScrollPositionChanged (Tizen::Ui::Control &source, int scrollPos);
-       virtual void OnScrollStopped (Tizen::Ui::Control &source);
-
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
        virtual void OnUpdateContentList(void);
 
@@ -98,26 +79,23 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 private:
-       result CreateTableViewContextItem(Tizen::Ui::Controls::TableViewContextItem& parent);
+       Tizen::Ui::Controls::TableViewContextItem* CreateTableViewContextItem(void);
        result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
        Tizen::Base::Collection::ArrayList* GetContentListN(int itemIndex);
        void UpdateContentList(void);
+       virtual bool IsEmptyContentList(void);
 
 private:
-       Tizen::Ui::Controls::TableView* __pContentTableView;
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem;
        Tizen::Ui::Controls::ContextMenu* __pShareContextMenu;
        Tizen::Ui::Controls::ContextMenu* __pSetContextMenu;
+       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
        Tizen::Ui::Controls::Popup* __pDeletePopup;
-       Tizen::Ui::Controls::Label* __pNoContentImageLabel;
-       Tizen::Ui::Controls::Label* __pNoContentTextLabel;
        Tizen::Graphics::Bitmap* __pThumbnail;
-       NowPlayContentPanel* __pNowPlayContentPanel;
        PlayListPickerPopup* __pPlayListPickerPopup;
        AllListPresentationModel* __pPresentationModel;
 
        int __itemIndex;
-       int __scrolledDistance;
 };
 
 #endif // _MP_ALL_LIST_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 7f85e90..eb0200a
 #ifndef _MP_ARTIST_LIST_PANEL_H_
 #define _MP_ARTIST_LIST_PANEL_H_
 
-#include <new>
-#include <FApp.h>
-#include <FSocial.h>
-#include <FUi.h>
-#include <FUiScenes.h>
 #include "MpArtistListPresentationModel.h"
-#include "MpBasePanel.h"
+#include "MpCommonUtil.h"
+#include "MpContentLibaryPanel.h"
+#include "MpResourceManager.h"
 #include "MpSceneRegister.h"
 #include "MpThumbnailBase.h"
 #include "MpTypes.h"
 
 class PlayListPickerPopup;
-class NowPlayContentPanel;
 
 class ArtistListPanel
-       : public BasePanel
+       : public ContentLibaryPanel
        , public ThumbnailBase
-       , public Tizen::Ui::Controls::ITableViewItemProvider
-       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public Tizen::Ui::Controls::IFastScrollListener
-       , public Tizen::Ui::Controls::IFormBackEventListener
-       , public Tizen::Ui::IActionEventListener
-       , public Tizen::Ui::Scenes::ISceneEventListener
 {
 public:
        ArtistListPanel(void);
        virtual ~ArtistListPanel(void);
-       bool Initialize(void);
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
@@ -65,9 +55,7 @@ public:
        virtual int GetItemCount(void);
     
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual bool DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
        virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
-       virtual int GetDefaultItemHeight(void);
 
        virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
@@ -77,9 +65,6 @@ public:
                                                                        int itemIndex,
                                                                        Tizen::Ui::Controls::TableViewContextItem* pContextItem,
                                                                        bool activated);
-       virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndexFrom,
-                                               int itemIndexTo);
 
        virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
@@ -89,18 +74,20 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 private:
+       result CreateTableViewItem(Tizen::Ui::Container& parent,
+                                                                       const ContentInformation& contentInfoStruct,
+                                                                       const int contentTotalCount);
+       Tizen::Ui::Controls::TableViewContextItem* CreateTableViewContextItem(void);
        void UpdateContentList(void);
+       virtual bool IsEmptyContentList(void);
 
 protected:
        int __itemIndex;
-       NowPlayContentPanel* __pNowPlayContentPanel;
        PlayListPickerPopup* __pPlayListPickerPopup;
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem;
-       Tizen::Ui::Controls::TableView* __pContentTableView;
-       Tizen::Ui::Controls::Label* __pNoContentImageLabel;
-       Tizen::Ui::Controls::Label* __pNoContentTextLabel;
        Tizen::Graphics::Bitmap* __pThumbnail;
        ArtistListPresentationModel* __pPresentationModel;
+       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
 };
 
 #endif // _MP_ARTIST_LIST_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 1082378..282bdae
@@ -66,6 +66,29 @@ public:
        static void ShowSelectAllCheckButton(Tizen::Ui::Controls::CheckButton& checkButton);
        static void SetAllCheckState(bool state, Tizen::Ui::Controls::TableView& tableView, int totalCount);
 
+       static result SetFastScrollIndex(Tizen::Ui::Controls::TableView& tableview);
+       static void SetLayoutFitToForm(const Tizen::Ui::Controls::Form& form, Tizen::Ui::Control& childControl);
+       static void SetLayoutFitToContainer(const Tizen::Ui::Container& container, Tizen::Ui::Control& childControl);
+       static void SetHorizontalLayoutFitToContainer(const Tizen::Ui::Container& container, Tizen::Ui::Control& childControl);
+       static void SetFooterItemEnabled(Tizen::Ui::Controls::Footer& pFooter, bool enable);
+       static void SetTabHeaderStyle(Tizen::Ui::Controls::Header& pHeader);
+       static void SetEditHeaderStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText, int actionId, bool isChecked = false);
+       static void SetSimpleTitleStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText);
+       static void SetTitleWithSearchIconStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText,
+                                                                                                                               const Tizen::Base::String& descriptionText, int actionId);
+       static void SetTitleDescriptionWithIconStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText,
+                                                                                               Tizen::Base::String& descriptionText, int actionId, Tizen::Graphics::Bitmap* icon);
+       static void SetTitleDescriptionStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText,
+                                                                                                                                               const Tizen::Base::String& descriptionText);
+       static void SetIconButtonItem(Tizen::Ui::Controls::ButtonItem& buttonItem, Tizen::Graphics::Bitmap* normalButtonIcon,
+                                                                               Tizen::Graphics::Bitmap* pressedButtonIcon, Tizen::Graphics::Bitmap* disableButtonIcon);
+       static void SetBackgroundBitmapButtonItem(Tizen::Ui::Controls::ButtonItem& buttonItem, Tizen::Graphics::Bitmap* normalButtonIcon,
+                                                                               Tizen::Graphics::Bitmap* pressedButtonIcon, Tizen::Graphics::Bitmap* disableButtonIcon);
+       static void SetBackgroundBitmapHeaderItem(Tizen::Ui::Controls::HeaderItem& headerItem, Tizen::Graphics::Bitmap* normal,
+                                               Tizen::Graphics::Bitmap* pressed, Tizen::Graphics::Bitmap* selected, Tizen::Graphics::Bitmap* disable);
+
+       static Tizen::Ui::Controls::Popup* CreateContentDeletePopup(Tizen::Ui::IActionEventListener& listener, int deleteActionId, int cancelActionId);
+
        static Tizen::Ui::Controls::Footer* CreateContentListFooter(const Tizen::Ui::Controls::Form& form);
        static Tizen::Ui::Controls::Footer* CreatePlaylistEditFooter(const Tizen::Ui::Controls::Form& form);
        static Tizen::Ui::Controls::Footer* CreateDefaultPlaylistContentListFooter(const Tizen::Ui::Controls::Form& form);
@@ -76,7 +99,9 @@ public:
        static Tizen::Ui::Controls::Footer* CreateEditFooter(const Tizen::Ui::Controls::Form& form);
        static Tizen::Ui::Controls::Footer* CreateDeleteFooter(const Tizen::Ui::Controls::Form& form);
        static Tizen::Ui::Controls::Footer* CreateCancelFooter(const Tizen::Ui::Controls::Form& form);
+       static Tizen::Ui::Controls::Footer* CreateBackButtonStyleFooter(const Tizen::Ui::Controls::Form& form, FooterButtonStyle style);
 
+       static void SetBackButtonStyleFooter(Tizen::Ui::Controls::Footer& footer, FooterButtonStyle style);
        static ContentInformation* GetContentInformationN(const Tizen::Content::AudioContentInfo& audioContentInfo);
 
        static void CreateTableViewItem(Tizen::Ui::Container& parent,
diff --git a/inc/MpContentEditPanel.h b/inc/MpContentEditPanel.h
new file mode 100644 (file)
index 0000000..929a182
--- /dev/null
@@ -0,0 +1,56 @@
+//\r
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Flora License, Version 1.0 (the License);\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//     http://floralicense.org/license/\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an AS IS BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+/**\r
+ * @file               MpContentEditPanel.h\r
+ * @brief              This is the header file for ContentEditPanel class.\r
+ */\r
+\r
+#ifndef _MP_CONTENT_EDIT_PANEL_H_\r
+#define _MP_CONTENT_EDIT_PANEL_H_\r
+\r
+#include "MpContentPanel.h"\r
+\r
+class ContentForm;\r
+\r
+class ContentEditPanel\r
+       : public ContentPanel\r
+{\r
+public:\r
+       ContentEditPanel(void);\r
+       virtual ~ContentEditPanel(void);\r
+\r
+       virtual bool Initialize(void);\r
+\r
+protected:\r
+       Tizen::Ui::Controls::Header* GetParentHeader(void);\r
+       result AddParentHeaderActionEventListener(void);\r
+       result RemoveParentHeaderActionEventListener(void);\r
+\r
+       result SetShowStateBalloonPopup(bool isShow);\r
+       void SetCheckedCountBalloonPopup(int itemCount);\r
+       void SetNoContentSongs(bool isNoContents);\r
+\r
+       void ReSizingItemCheckedBalloonPopup(void); //ReSizingMiniPlayerBar\r
+\r
+private:\r
+       result Construct(void);\r
+\r
+private:\r
+       Tizen::Ui::Controls::Label* __pItemCheckedCountBallooPopup;\r
+};\r
+\r
+#endif // _MP_CONTENT_EDIT_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 9db5eb5..13f887f
@@ -39,6 +39,7 @@ class ContentForm
        : public Tizen::Ui::Controls::Form
        , public Tizen::Ui::IActionEventListener
        , public IMusicSettingEventListener
+       , public Tizen::Ui::IOrientationEventListener
 {
 public:
        ContentForm(void);
@@ -46,13 +47,13 @@ public:
        bool Initialize(void);
 
 private:
-       result InitializeHeaderItem(Tizen::Ui::Controls::Header& pHeader);
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
        virtual void OnAutoOffTimeChanged(int autoOffTime){}
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
 };
 
 #endif // _MP_CONTENTS_FORM_H_
\ No newline at end of file
diff --git a/inc/MpContentLibaryPanel.h b/inc/MpContentLibaryPanel.h
new file mode 100644 (file)
index 0000000..103c99a
--- /dev/null
@@ -0,0 +1,59 @@
+//\r
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Flora License, Version 1.0 (the License);\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//     http://floralicense.org/license/\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an AS IS BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+/**\r
+ * @file               MpContentLibaryPanel.h\r
+ * @brief              This is the header file for ContentLibaryPanel class.\r
+ */\r
+#ifndef _MP_CONTENT_LIBARY_PANEL_H_\r
+#define _MP_CONTENT_LIBARY_PANEL_H_\r
+\r
+#include "MpContentPanel.h"\r
+\r
+class ContentLibaryPanel\r
+       : public ContentPanel\r
+//     , public Tizen::Ui::Scenes::ISceneEventListener\r
+//     , public Tizen::Ui::IActionEventListener\r
+{\r
+public:\r
+       ContentLibaryPanel(void);\r
+       virtual ~ContentLibaryPanel(void);\r
+\r
+       virtual bool Initialize(void);\r
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);\r
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId,\r
+                                                                       Tizen::Base::Collection::IList* pArgs);\r
+       virtual void OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orientationStatus);\r
+       virtual void OnUpdateContentList(void) = 0;\r
+\r
+protected:\r
+       result AddMiniPlayer(Tizen::Ui::Control& control);\r
+       result ReSizingMiniPlayerRegisterBar(void);\r
+       void RemoveMiniPlayer(void);\r
+       bool IsExistMiniPlayer(void);\r
+       void TryRegisterMiniPlayer(void);\r
+       void UpdateContentLibaryScreenState(void);\r
+\r
+private:\r
+       result Construct(void);\r
+\r
+       virtual bool IsEmptyContentList(void);\r
+\r
+private:\r
+       Tizen::Ui::Controls::Panel* __pMiniPlayerRegisterBar;\r
+};\r
+\r
+#endif // _MP_CONTENT_LIBARY_PANEL_H_
\ No newline at end of file
diff --git a/inc/MpContentPanel.h b/inc/MpContentPanel.h
new file mode 100644 (file)
index 0000000..d7ba986
--- /dev/null
@@ -0,0 +1,85 @@
+//\r
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Flora License, Version 1.0 (the License);\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//     http://floralicense.org/license/\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an AS IS BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+/**\r
+ * @file               MpContentPanel.h\r
+ * @brief              This is the header file for ContentPanel class.\r
+ */\r
+\r
+#ifndef _MP_CONTENT_PANEL_H_\r
+#define _MP_CONTENT_PANEL_H_\r
+\r
+#include <FUi.h>\r
+#include "MpSceneRegister.h"\r
+#include "MpTypes.h"\r
+\r
+class ContentPanel\r
+       : public Tizen::Ui::Controls::Panel\r
+       , public Tizen::Ui::Controls::ITableViewItemProvider\r
+       , public Tizen::Ui::Controls::ITableViewItemEventListener\r
+       , public Tizen::Ui::Controls::IFormBackEventListener\r
+       , public Tizen::Ui::IActionEventListener\r
+       , public Tizen::Ui::Scenes::ISceneEventListener\r
+{\r
+public:\r
+       ContentPanel(void);\r
+       virtual ~ContentPanel(void);\r
+\r
+       virtual bool Initialize(void) = 0;\r
+\r
+       virtual int GetItemCount(void);\r
+       virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);\r
+       virtual bool DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);\r
+       virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);\r
+       virtual int GetDefaultItemHeight(void);\r
+\r
+       virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,\r
+                                                       int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem,\r
+                                                       Tizen::Ui::Controls::TableViewItemStatus status);\r
+       virtual void OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex,\r
+                                                                       Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated);\r
+       virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView, int itemIndexFrom, int itemIndexTo);\r
+\r
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);\r
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId,\r
+                                                                       Tizen::Base::Collection::IList* pArgs);\r
+       virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId){}\r
+       virtual void OnUpdateContentList(void) = 0;\r
+       virtual void OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orientationStatus);\r
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);\r
+\r
+protected:\r
+       Tizen::Ui::Controls::Header* GetHeader(void);\r
+       Tizen::Ui::Controls::Footer* GetFooter(void);\r
+       void SetLayoutFitToForm(void);\r
+\r
+       result SetShowStateContentTableview(bool isShow);\r
+       result SetShowStateNoContent(bool isShow);\r
+\r
+       void SetFooter(FooterButtonStyle footerButtonStyle);\r
+       void SetFooterStyle(FooterButtonStyle footerButtonStyle);\r
+       FooterButtonStyle GetCurrentFooterStyle(void);\r
+       void SetBackEventListner(void);\r
+       void RemoveBackEventListner(void);\r
+       void SetShowStateFooter(bool isShow);\r
+\r
+protected:\r
+       Tizen::Ui::Controls::TableView* __pContentTableView;\r
+       Tizen::Ui::Controls::Label* __pNoContentLabel;\r
+       FooterButtonStyle __footerButtonStyle;\r
+};\r
+\r
+#endif // _MP_CONTENT_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index ebb362b..76def6d
 #include <FSocial.h>
 #include <FSystem.h>
 #include <FUi.h>
-#include "MpBasePanel.h"
+#include "MpContentLibaryPanel.h"
 #include "MpFolderListPresentationModel.h"
-#include "MpSceneRegister.h"
-#include "MpTypes.h"
 
+class MiniPlayer;
 class PlayListPickerPopup;
-class NowPlayContentPanel;
 
 class FolderListPanel
-       : public Tizen::Ui::Controls::Panel
-       , public Tizen::Ui::Controls::ITableViewItemProvider
-       , public Tizen::Ui::Controls::ITableViewItemEventListener
+       : public ContentLibaryPanel
        , public Tizen::Ui::Controls::IFastScrollListener
        , public Tizen::Ui::Controls::IScrollEventListener
-       , public Tizen::Ui::Controls::IFormBackEventListener
-       , public Tizen::Ui::IActionEventListener
-       , public Tizen::Ui::IKeypadEventListener
-       /*, public Tizen::Ui::ITouchEventListener*/
-       , public Tizen::Ui::Scenes::ISceneEventListener
 {
 public:
        FolderListPanel(void);
        virtual ~FolderListPanel(void);
-       bool Initialize(void);
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
@@ -64,56 +54,31 @@ public:
        virtual int GetItemCount(void);
 
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual bool DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
-       virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
-       virtual int GetDefaultItemHeight(void);
-
        virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
        virtual void OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated);
-       virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView, int itemIndexFrom, int itemIndexTo);
-
        virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
 
-       virtual void OnKeypadActionPerformed(Tizen::Ui::Control &source, Tizen::Ui::KeypadAction keypadAction);
-       virtual void OnKeypadClosed(Tizen::Ui::Control& source);
-       virtual void OnKeypadOpened(Tizen::Ui::Control& source);
-       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source);
-
-       /*virtual void OnTouchCanceled(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchDoublePressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);*/
-
        virtual void OnScrollEndReached(Tizen::Ui::Control &source, Tizen::Ui::Controls::ScrollEndEvent type);
        virtual void OnScrollPositionChanged (Tizen::Ui::Control& source, int scrollPos);
-       virtual void OnScrollStopped(Tizen::Ui::Control& source);
+       virtual void OnScrollStopped(Tizen::Ui::Control& source){}
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
        virtual void OnUpdateContentList(void);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 private:
-       /*result CreateTableViewContextItem(Tizen::Ui::Controls::TableViewContextItem& parent);*/
-       void HideKeypadAndRenamePanel(void);
        void UpdateContentList(void);
+       Tizen::Ui::Controls::TableViewContextItem* CreatePlayallAddtoContextItem(void);
+       virtual bool IsEmptyContentList(void);
 
 private:
        int __itemIndex;
 
 protected:
-       NowPlayContentPanel* __pNowPlayContentPanel;
        PlayListPickerPopup* __pPlayListPickerPopup;
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem;
-       Tizen::Ui::Controls::TableView* __pContentTableView;
-       Tizen::Ui::Controls::Label* __pNoContentImageLabel;
-       Tizen::Ui::Controls::Label* __pNoContentTextLabel;
-       Tizen::Ui::Controls::EditArea* __pRenameEditArea;
-       Tizen::Ui::Controls::Panel* __pRenamePanel;
        int __scrolledDistance;
        FolderListPresentationModel* __pPresentationModel;
+       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
 };
 
 #endif // _MP_FOLDERS_LIST_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index d3f9c16..f8d7902
@@ -37,6 +37,7 @@
 #include "MpMusicPlayerForm.h"
 #include "MpPlaylistContentListForm.h"
 #include "MpPlaylistCreatorForm.h"
+#include "MpPlaylistReNameForm.h"
 #include "MpSettingForm.h"
 #include "MpSearchForm.h"
 #include "MpUserPlaylistContentListForm.h"
@@ -56,6 +57,7 @@ extern const wchar_t* IDC_SEARCH_FORM;
 extern const wchar_t* IDC_CONTENT_EDIT_FORM;
 extern const wchar_t* IDC_ALBUM_CONTENT_LIST_FORM;
 extern const wchar_t* IDC_PLAYLIST_CREATOR_FORM;
+extern const wchar_t* IDC_PLAYLIST_RENAME_FORM;
 extern const wchar_t* IDC_USER_PLAYLIST_CONTENT_LIST_FORM;
 extern const wchar_t* IDC_CONTENT_DETAIL_FORM;
 extern const wchar_t* IDC_ARTIST_ALBUM_LIST_FORM;
diff --git a/inc/MpMiniPlayer.h b/inc/MpMiniPlayer.h
new file mode 100644 (file)
index 0000000..76a18d3
--- /dev/null
@@ -0,0 +1,94 @@
+//\r
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Flora License, Version 1.0 (the License);\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//     http://floralicense.org/license/\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an AS IS BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+/**\r
+ * @file               MpMiniPlayer.h\r
+ * @brief              This is the header file for MiniPlayer class.\r
+ */\r
+\r
+#ifndef _MP_MINI_PLAYER_H_\r
+#define _MP_MINI_PLAYER_H_\r
+\r
+#include <new>\r
+#include <FApp.h>\r
+#include <FBase.h>\r
+#include <FGraphics.h>\r
+#include <FSocial.h>\r
+#include <FUi.h>\r
+#include "MpCommonUtil.h"\r
+#include "MpIMusicPlayerEventListener.h"\r
+#include "MpMusicPlayerPresentationModel.h"\r
+\r
+class MiniPlayer\r
+       : public Tizen::Ui::Controls::Panel\r
+       , public Tizen::Ui::IActionEventListener\r
+       , public Tizen::Ui::ITouchEventListener\r
+       , public IMusicPlayerEventListener\r
+{\r
+public:\r
+       MiniPlayer(void);\r
+       virtual ~MiniPlayer(void);\r
+\r
+       result Construct(void);\r
+       bool GetPlayStatus(void);\r
+\r
+       void SetMoreContextMenuActionEventListner(Tizen::Ui::IActionEventListener* listener, int actionId);\r
+       void SetBackActionEventListner(Tizen::Ui::IActionEventListener& listener, int actionId);\r
+       void RemoveMoreContextMenuActionEventListner(Tizen::Ui::IActionEventListener& listener);\r
+       void RemoveBackActionEventListner(Tizen::Ui::IActionEventListener& listener, int actionId);\r
+\r
+       void MiniPlayerActivate(void);\r
+       void MiniPlayerDeactivate(void);\r
+\r
+protected:\r
+       virtual void OnPlayStateChanged(Tizen::Media::PlayerState playerState);\r
+       virtual void OnPlayContentChanged(int currentContentIndex);\r
+       virtual void OnPlayTimeChanged(const Tizen::Base::String& currentDuration, int currentPosition);\r
+       virtual void OnPlayVolumeBarStateChanged(void);\r
+       virtual void OnPlayPresentationModelDestroying(void);\r
+\r
+       virtual void OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);\r
+       virtual void OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);\r
+       virtual void OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);\r
+       virtual void OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}\r
+       virtual void OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}\r
+       virtual void OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}\r
+\r
+       virtual result OnDraw(void);\r
+       virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);\r
+\r
+private:\r
+       void SetPauseButtonImage(void);\r
+       void SetPlayButtonImage(void);\r
+\r
+//     void DrawContentsTitleName(Tizen::Graphics::Canvas& canvas);\r
+       void DrawBackground(Tizen::Graphics::Canvas& canvas);\r
+\r
+private:\r
+       Tizen::Ui::Controls::Button* __pMinPlayerPlayToggleButton;\r
+       Tizen::Ui::Controls::Button* __pMinPlayerNextButton;\r
+       Tizen::Ui::Controls::Button* __pMinPlayerPrevButton;\r
+       Tizen::Ui::Controls::Label* __pThumbnailLabel;\r
+       Tizen::Ui::Controls::Label* __pTitleLabel;\r
+       Tizen::Ui::Controls::Label* __pArtistLabel;\r
+       Tizen::Ui::Controls::Progress* __pProgressBar;\r
+       PlayerPresentationModel* __pPresentationModel;\r
+\r
+//     Tizen::Base::String __titleName;\r
+//     Tizen::Base::String __artistName;\r
+};\r
+\r
+#endif // _MP_MINI_PLAYER_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 3cb4e90..634de46
@@ -26,9 +26,9 @@
 #include <FApp.h>
 #include <FSystem.h>
 #include <FUi.h>
-#include "MpBaseForm.h"
 #include "MpIMusicPlayerEventListener.h"
 #include "MpIMusicSettingEventListener.h"
+#include "MpThumbnailBase.h"
 #include "MpTypes.h"
 
 class PlayListPickerPopup;
@@ -39,7 +39,8 @@ class SharePopup;
 class SoundPathPopup;
 
 class PlayerForm
-       : public BaseForm
+       : public ThumbnailBase
+       , public Tizen::Ui::Controls::Form
        , public Tizen::Ui::Controls::IFormBackEventListener
        , public Tizen::Ui::Controls::ITableViewItemProvider
        , public Tizen::Ui::Controls::ITableViewItemEventListener
@@ -57,7 +58,7 @@ class PlayerForm
 public:
        PlayerForm(void);
        virtual ~PlayerForm(void);
-       void Initialize(void);
+       result Initialize(void);
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
@@ -120,12 +121,16 @@ public:
        virtual void OnChangedContentList(Tizen::Base::Collection::IList* pArgs);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
+       virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
+
 private:
-       void SetControlButtonImage(void);
-       void SetPlayPauseButtonImage(Tizen::Media::PlayerState playerState);
+       result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
+       void TogglePlayPauseImage(Tizen::Media::PlayerState playerState);
+       void SetPauseButtonImage(void);
+       void SetPlayButtonImage(void);
        void SetRepeatButtonImage(int repeatValue);
        void SetShuffleButtonImage(bool shuffleEnable);
-       void SetAddToPlaylistButtonImage(bool buttonEnable);
+       void SetMoreContentMenuStatus(bool buttonEnable);
        result ShowMessageBox(const Tizen::Base::String& showText);
        void SetContentInfo(int currentContentIndex);
        void UpdateAnimationAlbumArt(AlbumArtImage position);
@@ -134,24 +139,26 @@ private:
        void PlayAnimation(void);
        void StopAnimation(void);
 
+       void UpdateSplitBarState(void);
+
 private:
        PlayerPresentationModel* __pPlayerPresentationModel;
 
        Tizen::Ui::Animations::VisualElement* __pAlbumArtElements;
        Tizen::Ui::Animations::VisualElement* __pAlbumArtElement[ALBUM_ART_IMAGE_COUNT];
 
-       Tizen::Ui::Controls::Panel* __pHorizontalHeaderPanel;
        Tizen::Ui::Controls::Panel* __pVolumePanel;
        Tizen::Ui::Controls::Panel* __pControllerPanel;
-       Tizen::Ui::Controls::Panel* __pControllerSeperatorPanel;
+       Tizen::Ui::Controls::Panel* __pPanelRegisterBar;
+       Tizen::Ui::Controls::Panel* __pContentsAlbumViewPanel;
 
 //     Tizen::Ui::Controls::Label* __pAlbumArtLabel;
-       Tizen::Ui::Controls::Label* __pHorizontalHeaderTitleLabel;
-       Tizen::Ui::Controls::Label* __pHorizontalHeaderSubTitleLabel;
+       Tizen::Ui::Controls::Panel* __pContentsListViewPanel;
+
        Tizen::Ui::Controls::Label* __pCurrentTimeLabel;
        Tizen::Ui::Controls::Label* __pTotalTimeLabel;
-       Tizen::Ui::Controls::Label* __pControllerLeftButtonSeperatorLabel;
-       Tizen::Ui::Controls::Label* __pControllerRightButtonSeperatorLabel;
+       Tizen::Ui::Controls::Label* __pTitleName;
+       Tizen::Ui::Controls::Label* __pArtistName;
 
        Tizen::Ui::Controls::Button* __pRewindButton;
        Tizen::Ui::Controls::Button* __pForwardButton;
@@ -161,13 +168,16 @@ private:
        Tizen::Ui::Controls::Button* __pHorizontalHeaderRightButton;
        Tizen::Ui::Controls::Button* __pRepeatButton;
        Tizen::Ui::Controls::Button* __pShuffleButton;
-       Tizen::Ui::Controls::Button* __pAddToPlaylistButton;
+//     Tizen::Ui::Controls::Button* __pAddToPlaylistButton;
+       Tizen::Ui::Controls::Button* __pContentsViewToggleButton;
+       Tizen::Ui::Controls::Button* __pMoreContextButton;
 
        Tizen::Ui::Controls::Slider* __pPlayStateSlider;
        Tizen::Ui::Controls::Slider* __pVolumeSlider;
 
-       Tizen::Ui::Controls::TableView* __pHorizontalListView;
+//     Tizen::Ui::Controls::TableView* __pContentsListView;
        Tizen::Ui::Controls::ContextMenu* __pContextMenuIconText;
+       Tizen::Graphics::Bitmap* __pThumbnail;
 
        PlayListPickerPopup* __pPlayListPickerPopup;
        SoundPathPopup* __pSoundPathPopup;
@@ -181,6 +191,7 @@ private:
        Tizen::Base::Runtime::Timer* __pContentPlayTimer;
        Tizen::Ui::Scenes::SceneId __pPreviousSceneId;
        Tizen::Base::String* __pPath;
+       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
 };
 
 #endif // _MP_MUSIC_PLAYER_FORM_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 44b9fe8..ca2cb51
@@ -33,6 +33,7 @@ class PlaylistEditorPresentationModel;
 
 class PlaylistCreatorForm
        : public Tizen::Ui::Controls::Form
+       , public Tizen::Ui::Controls::IFormBackEventListener
        , public Tizen::Ui::IKeypadEventListener
        , public Tizen::Ui::IActionEventListener
        , public Tizen::Ui::ITextEventListener
@@ -61,6 +62,7 @@ public:
 
        virtual void OnTextValueChanged(const Tizen::Ui::Control& source);
        virtual void OnTextValueChangeCanceled(const Tizen::Ui::Control& source);
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
 private:
        PlaylistEditorPresentationModel* __pPlaylistEditorPresentationModel;
old mode 100755 (executable)
new mode 100644 (file)
index 0ee758f..e5a27b2
 #include <FSocial.h>
 #include <FUi.h>
 #include <FUiScenes.h>
-#include "MpBasePanel.h"
 #include "MpCommonUtil.h"
+#include "MpContentEditPanel.h"
 #include "MpSceneRegister.h"
 #include "MpThumbnailBase.h"
 #include "MpTypes.h"
 
-class SharePopup;
-class PlayListPickerPopup;
 class PlaylistEditorPresentationModel;
 
 class PlaylistListEditorPanel
-       : public BasePanel
+       : public ContentEditPanel
        , public ThumbnailBase
-       , public Tizen::Ui::Controls::ITableViewItemProvider
-       , public Tizen::Ui::Controls::ITableViewItemEventListener
-       , public Tizen::Ui::IKeypadEventListener
-       , public Tizen::Ui::IActionEventListener
-       , public Tizen::Ui::ITextEventListener
-       , public Tizen::Ui::Scenes::ISceneEventListener
+//     , public Tizen::Ui::IActionEventListener
+//     , public Tizen::Ui::Scenes::ISceneEventListener
 {
 public:
        PlaylistListEditorPanel(void);
        ~PlaylistListEditorPanel(void);
-       bool Initialize(void);
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
@@ -63,58 +56,35 @@ public:
        virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId);
 
-       virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source,
-                                                                               Tizen::Ui::KeypadAction keypadAction);
-       virtual void OnKeypadClosed(Tizen::Ui::Control& source);
-       virtual void OnKeypadOpened(Tizen::Ui::Control& source);
-       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source);
-
        virtual int GetItemCount(void);
     
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual bool DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
        virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
-       virtual int GetDefaultItemHeight(void);
 
        virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
                                                        Tizen::Ui::Controls::TableViewItem* pItem,
                                                        Tizen::Ui::Controls::TableViewItemStatus status);
-       virtual void OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                                       int itemIndex,
-                                                                       Tizen::Ui::Controls::TableViewContextItem* pContextItem,
-                                                                       bool activated);
-       virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndexFrom,
-                                               int itemIndexTo);
-
-       virtual void OnTextValueChanged(const Tizen::Ui::Control& source);
-       virtual void OnTextValueChangeCanceled(const Tizen::Ui::Control& source);
-
        virtual void OnUpdateContentList(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
 private:
-       void ShowFooter(void);
-       void HideFooter(void);
-       void SetBoundList(void);
        void UpdateContentList(void);
+       void SetEditHeaderStyle(void);
+       void SetTabHeaderStyle(void);
+       void SetCheckedIconAllCheckButton(void);
+       void SetUnCheckedIconAllCheckButton(void);
 
 private:
-       bool __isEditMode;
        int __selectedItemIndex;
        int __checkedItemCount;
-       Tizen::Ui::Controls::TableView* __pContentTableView;
        Tizen::Ui::Controls::CheckButton* __pSelectAllCheckedButton;
        Tizen::Ui::Controls::Label* __pCheckedCountLabel;
        Tizen::Graphics::Bitmap* __pThumbnail;
-       PlayListPickerPopup* __pPlayListPickerPopup;
-       SharePopup* __pSharePopup;
        PlaylistEditorPresentationModel* __pPresentationModel;
        Tizen::Base::String* __pPlaylistName;
-       Tizen::Ui::Controls::EditArea* __pEditingArea;
-       Tizen::Graphics::Color __pItemPressedBackgroundColor;
 };
 
 #endif // _MP_PLAYLIST_LIST_EDITOR_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 1a71e4c..fc6fc60
 #include <FSocial.h>
 #include <FUi.h>
 #include <FUiScenes.h>
-#include "MpBasePanel.h"
+#include "MpContentLibaryPanel.h"
 #include "MpThumbnailBase.h"
 
 class PlaylistListPresentationModel;
-class NowPlayContentPanel;
 
 class PlaylistListPanel
-       : public BasePanel
+       : public ContentLibaryPanel
        , public ThumbnailBase
-       , public Tizen::Ui::Controls::ITableViewItemProvider
-       , public Tizen::Ui::Controls::ITableViewItemEventListener
-       , public Tizen::Ui::Controls::IFormBackEventListener
-       , public Tizen::Ui::IKeypadEventListener
-       , public Tizen::Ui::IActionEventListener
-       , public Tizen::Ui::ITextEventListener
-       , public Tizen::Ui::Scenes::ISceneEventListener
 {
 public:
        PlaylistListPanel(void);
        virtual ~PlaylistListPanel(void);
-       bool Initialize(void);
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
@@ -63,14 +54,6 @@ public:
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
        virtual bool DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
        virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
-       virtual int GetDefaultItemHeight(void);
-
-       virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source,
-                                                                               Tizen::Ui::KeypadAction keypadAction);
-       virtual void OnKeypadClosed(Tizen::Ui::Control& source);
-       virtual void OnKeypadOpened(Tizen::Ui::Control& source);
-       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source);
-
        virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
                                                        Tizen::Ui::Controls::TableViewItem* pItem,
@@ -79,40 +62,29 @@ public:
                                                                        int itemIndex,
                                                                        Tizen::Ui::Controls::TableViewContextItem* pContextItem,
                                                                        bool activated);
-       virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndexFrom,
-                                               int itemIndexTo);
-
-       virtual void OnTextValueChanged(const Tizen::Ui::Control& source);
-       virtual void OnTextValueChangeCanceled(const Tizen::Ui::Control& source);
-
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
        virtual void OnUpdateContentList(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
 
 private:
+       Tizen::Ui::Controls::TableViewContextItem* CreateTableViewContextItem(int playListType);
        result CreateTableViewItem(Tizen::Ui::Container& parent,
                                                        Tizen::Base::String& labelName,
                                                        const Tizen::Graphics::Bitmap& bitmap,
                                                        int totalCount);
-       void ShowFooter(void);
-       void HideFooter(void);
-       void SetBoundList(void);
        void UpdateContentList(void);
+       virtual bool IsEmptyContentList(void);
 
 private:
        PlaylistListPresentationModel* __pPlaylistListPresentationModel;
        Tizen::Graphics::Bitmap* __pThumbnail;
-       Tizen::Ui::Controls::TableView* __pContentTableView;
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem_default;
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem_user;
        Tizen::Ui::Controls::Popup* __pDeletePopup;
-       NowPlayContentPanel* __pNowPlayContentPanel;
-       bool __isEditMode;
        int __selectedItemIndex;
        Tizen::Base::String* __pPlaylistName;
-       Tizen::Ui::Controls::EditArea* __pEditingArea;
+       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
 };
 
 #endif // _MP_PLAY_LIST_LIST_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 6b6a5e6..ba35b61
@@ -101,6 +101,7 @@ private:
        PlaylistListPresentationModel* __pPlaylistListPresentationModel;
        Tizen::Ui::Controls::TableView* __pPlaylistTableView;
        Tizen::Ui::Controls::Button* __pCancelButton;
+       Tizen::Ui::Controls::Button* __pCreateButton;
        int __itemIndex;
        Tizen::Base::Collection::IList* __pPlaylistContentList;
        Tizen::Ui::Control* __pControl;
diff --git a/inc/MpPlaylistReNameForm.h b/inc/MpPlaylistReNameForm.h
new file mode 100644 (file)
index 0000000..a435acb
--- /dev/null
@@ -0,0 +1,74 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               MpPlaylistReNameForm.h
+ * @brief              This is the header file for PlaylistReNameForm class.
+ */
+
+#ifndef _MP_PLAYLIST_RENAME_FORM_H_
+#define _MP_PLAYLIST_RENAME_FORM_H_
+
+#include <new>
+#include <FBase.h>
+#include <FGraphics.h>
+#include <FUi.h>
+#include <FUiControl.h>
+#include <FUiCtrlButtonItem.h>
+
+class PlaylistEditorPresentationModel;
+
+class PlaylistReNameForm
+       : public Tizen::Ui::Controls::Form
+       , public Tizen::Ui::Controls::IFormBackEventListener
+       , public Tizen::Ui::IKeypadEventListener
+       , public Tizen::Ui::IActionEventListener
+       , public Tizen::Ui::ITextEventListener
+       , public Tizen::Ui::Scenes::ISceneEventListener
+{
+public:
+       PlaylistReNameForm(void);
+       ~PlaylistReNameForm(void);
+       void Initialize(void);
+       virtual result OnInitializing(void);
+       virtual result OnTerminating(void);
+
+       virtual void OnKeypadActionPerformed(Tizen::Ui::Control &source,
+                                                                               Tizen::Ui::KeypadAction keypadAction);
+       virtual void OnKeypadClosed(Tizen::Ui::Control& source);
+       virtual void OnKeypadOpened(Tizen::Ui::Control& source);
+       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source);
+
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
+                                                                       const Tizen::Ui::Scenes::SceneId& currentSceneId,
+                                                                       Tizen::Base::Collection::IList* pArgs);
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
+                                                                       const Tizen::Ui::Scenes::SceneId& nextSceneId);
+
+       virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+
+       virtual void OnTextValueChanged(const Tizen::Ui::Control& source);
+       virtual void OnTextValueChangeCanceled(const Tizen::Ui::Control& source);
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+
+private:
+       PlaylistEditorPresentationModel* __pPlaylistEditorPresentationModel;
+       Tizen::Ui::Controls::EditField* __pPlaylistEditField;
+       Tizen::Base::String __playlistName;
+       int __selectedPlaylistIndex;
+};
+
+#endif // _MP_PLAYLIST_RENAME_FORM_H_
\ No newline at end of file
index e928e4d..96a0a91 100644 (file)
@@ -32,6 +32,7 @@ extern const wchar_t* IDSCN_ALL_CONTENT_PICKER;
 extern const wchar_t* IDSCN_PLAYLIST_LIST;
 extern const wchar_t* IDSCN_PLAYLIST_LIST_EDITOR;
 extern const wchar_t* IDSCN_PLAYLIST_CREATOR;
+extern const wchar_t* IDSCN_PLAYLIST_RENAME;
 extern const wchar_t* IDSCN_PLAYLIST_NAME_EDITOR;
 
 extern const wchar_t* IDSCN_ALBUM_LIST;
index b369fdf..5651bee 100644 (file)
@@ -49,6 +49,8 @@ enum IDAFooterButtonId
        IDA_FOOTER_BUTTON_SEARCH,
        IDA_FOOTER_BUTTON_BACK,
        IDA_FOOTER_BUTTON_CREATE_PLAYLIST,
+       IDA_FOOTER_BUTTON_MORE,
+       IDA_FOOTER_BUTTON_SAVE,
 };
 
 enum IDAFlickButton
@@ -101,18 +103,41 @@ enum SearchMode
        SEARCH_MODE_ARTIST_ALBUM,
 };
 
+enum FooterButtonStyle
+{
+       STYLE_MORE_ADD = 0,
+       STYLE_ADDTO_DELETE_ADD,
+       STYLE_SHARE_ADD,
+       STYLE_DELETE_ADD,
+       STYLE_MORE_EDIT_ADD,
+       STYLE_MAX,
+};
+
 static const int ADD_TO_PLAYLIST_BUTTON_ID = 0;
 
-static const int IDA_CHECK_BUTTON = 2000;
-static const int IDA_UNCHECK_BUTTON = 2001;
+static const int IDA_HEADER_ALL_CHECK_BUTTON = 2000;
+static const int IDA_CHECK_BUTTON = 2005;
+static const int IDA_UNCHECK_BUTTON = 2006;
 static const int IDA_CONTEXT_ADD_TO_PLAYLIST = 5000;
 static const int IDA_BUTTON_CANCEL = 1000;
+static const int IDA_BUTTON_CREATE = 1001;
 static const int IDA_RENAME_CANCEL_BUTTON = 102;
 
-static const int IDA_SHARE_CONTEXT_MENU_EMAIL = 300;
-static const int IDA_SHARE_CONTEXT_MENU_MESSAGE = 301;
 static const int IDA_SET_CONTEXT_MENU_CALL = 200;
 static const int IDA_SET_CONTEXT_MENU_CALLER = 201;
+static const int IDA_SET_CONTEXT_MENU_ALARM = 202;
+
+static const int IDA_SHARE_CONTEXT_MENU_MESSAGE = 300;
+static const int IDA_SHARE_CONTEXT_MENU_EMAIL = 301;
+static const int IDA_SHARE_CONTEXT_MENU_BLUETOOTH = 302;
+
+static const int IDA_MORE_CONTEXT_MENU_SEARCH = 400;
+static const int IDA_MORE_CONTEXT_MENU_SHARE_VIA = 401;
+static const int IDA_MORE_CONTEXT_MENU_EDIT = 402;
+static const int IDA_MORE_CONTEXT_MENU_FOLDER_VIEW = 403;
+static const int IDA_MORE_CONTEXT_MENU_SETTINGS = 404;
+static const int IDA_MORE_CONTEXT_MENU_CREATE_PLAYLIST = 405;
+static const int IDA_MORE_CONTEXT_MENU_GO_TO_LIBRARY = 406;
 
 static const int POPUP_ITEM_WIDTH = 560;
 
@@ -138,14 +163,14 @@ static const int X_GAP_THUMBNAIL = 16;
 static const int Y_GAP_THUMBNAIL = 8;
 static const int W_TABLE_VIEW_MARK = 118;
 static const int ICON_TOTAL_CONUT = 16;
-static const int HEAD_ITEM_COUNT = 8;
+static const int HEAD_ITEM_COUNT = 4; //8;
 static const int FONT_SIZE = 30;
 static const int INIT_VALUE = 0;
 static const int MAIN_TEXT_SIZE = 36;
 static const int SUB_TEXT_SIZE = 32;
 static const int SEARCH_PAGE_NO = 1;
 static const int SEARCH_COUNT_PER_PAGE = 30000;
-static const int ITEM_HEIGHT = 128;
+static const int ITEM_HEIGHT = 140;
 static const int STRING_LENGTH = 90;
 static const int H_NOW_PLAY_BAR = 120;
 static const int W_NOW_PLAY_BAR = 720;
@@ -160,6 +185,9 @@ static const int INDEX_FOOTER_SHARE = 1;
 static const int INDEX_FOOTER_ADDTOPLATLIST = 2;
 static const int INDEX_FOOTER_EDIT = 0;
 
+static const int INDEX_FOOTER_STYLE_ADDTO_DELETE_ADD_ADDTO = 0;
+static const int INDEX_FOOTER_STYLE_ADDTO_DELETE_ADD_DELETE = 1;
+
 static const int INDEX_ADDTOPLAYLIST_FOOTER_ADDTOPLAYLIST = 0;
 
 static const int INDEX_EDITCONTENTLIST_FOOTER_EDIT = 0;
@@ -180,9 +208,9 @@ static const Tizen::Base::String STRING_UNKNOWN = L"Unknown";
 static const Tizen::Base::String STRING_SORT_GAP = L"";
 static const Tizen::Base::String STRING_ITEM_DELETE = L"itemDelete";
 
-static const Tizen::Base::String STORAGE_SDCARD_BITMAP = L"T02_memory card_01.png";
-static const Tizen::Base::String STORAGE_PHONE_BITMAP = L"T02_phone_01.png";
-static const Tizen::Base::String STORAGE_EXTERNAL_BITMAP = L"T02_external_storage_01.png";
+static const Tizen::Base::String STORAGE_SDCARD_BITMAP = L"T02_folder_storage_icon_memory.png";
+static const Tizen::Base::String STORAGE_PHONE_BITMAP = L"T02_folder_storage_icon_inner_memory.png";
+static const Tizen::Base::String STORAGE_EXTERNAL_BITMAP = L"T02_folder_storage_icon_memory.png";
 static const Tizen::Base::String NO_CONTENT_BITMAP = L"T02_nocomposers.png";
 
 static const Tizen::Base::String IDS_BLANK = L"";
@@ -209,11 +237,15 @@ static const Tizen::Base::String SET_BUTTON_NAME = L"SetButton";
 static const int H_INITIAL_PANEL = 10;
 static const int W_INITIAL_PANEL = 10;
 
+static const int X_MORE_POPUP = 0;
+static const int Y_MORE_POPUP = 1194;
+
 static const Tizen::Graphics::Color COLOR_MAIN_TEXT (0, 0, 0);
 static const Tizen::Graphics::Color COLOR_SUB_TEXT (124, 124, 124);
 static const Tizen::Graphics::Color COLOR_LABEL_BG (136, 136, 136);
 static const Tizen::Graphics::Color COLOR_SELECT_ALL (255, 255, 255);
 static const Tizen::Graphics::Color COLOR_SMALL_POPUP (215, 225, 232);
+static const Tizen::Graphics::Color COLOR_RED (255, 0, 0);
 static const Tizen::Graphics::Color COLOR_ITEM (255, 255, 255);
 
 extern const unsigned int COLOR_PANEL_BACKGROUND_GRAY_BLUE;
@@ -242,7 +274,125 @@ extern const wchar_t* TIZEN_APPCONTORL_PROVIDER_AUDIO;                                            // Provider Id
 extern const wchar_t* TIZEN_APPCONTROL_OPERATION_PLAY;                                         // Operation Id
 extern const wchar_t* TIZEN_APPCONTROL_OPERATION_VIEW;
 
+//XML
+extern const wchar_t* IDL_CONTENT_LIST_PANEL;
+extern const wchar_t* IDC_CONTENT_LIST_TABLEVIEW;
+extern const wchar_t* IDC_MINI_PLAYER_REGISTER_BAR;
+
+extern const wchar_t* IDL_CONTENT_EDITOR_PANEL;
+extern const wchar_t* IDC_CONTENT_EDITOR_TABLEVIEW;
+extern const wchar_t* IDC_NO_CONTENT_IMAGE_LABEL;
+extern const wchar_t* IDC_NO_CONTENT_TEXT_LABEL;
+extern const wchar_t* IDC_CHECKED_ITEM_COUNT_TEXT_LABEL;
+
+//_XML IDL_
 extern const wchar_t* IDL_CONTENT_FORM;
+extern const wchar_t* IDL_MINI_PLYAER_PANEL;
+extern const wchar_t* IDL_CONTENTS_LIBARY_PANEL;
+extern const wchar_t* IDL_CONTENTS_DELETE_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;
+extern const wchar_t* IDL_CONTENTS_LIBARY_ITEM_PANEL;
+extern const wchar_t* IDL_CONTENTS_LIBARY_EDITOR_PANEL;
+extern const wchar_t* IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL;
+extern const wchar_t* IDL_MUSIC_PLAYER_FORM;
+extern const wchar_t* IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL;
+extern const wchar_t* IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL;
+extern const wchar_t* IDL_PLAYLIST_CREATOR_FORM;
+extern const wchar_t* IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL;
+extern const wchar_t* IDL_SWEEP_QUICK_ITEM2_PANEL;
+extern const wchar_t* IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL;
+extern const wchar_t* IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL;
+extern const wchar_t* IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL;
+extern const wchar_t* IDL_CONTEXT_ITEM_PLAYALL_ADDTO;
+extern const wchar_t* IDL_PLAYLIST_RENAME_FORM;
+extern const wchar_t* IDL_SWEEP_QUICK_ALBUM_PANEL;
+extern const wchar_t* IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL;
+//_XML IDL_
+
+//_XML IDC_
+extern const wchar_t* IDC_PALY_TOGGLE_CONTROL_BUTTON;
+extern const wchar_t* IDC_PREVIOUS_CONTROL_BUTTON;
+extern const wchar_t* IDC_NEXT_CONTROL_BUTTON;
+extern const wchar_t* IDC_NOW_PLAYING_STATE;
+extern const wchar_t* IDC_PROGRESS_BAR;
+extern const wchar_t* IDC_BACK_BUTTON;
+extern const wchar_t* IDC_MORE_CONTEXT_MENU_BUTTON;
+extern const wchar_t* IDC_CONTENTS_THUMBNAIL;
+extern const wchar_t* IDC_CONTENTS_ARTIST_NAME;
+extern const wchar_t* IDC_CONTENTS_TITLE_NAME;
+extern const wchar_t* IDC_MINI_PLAYER_REGISTER_BAR;
+extern const wchar_t* IDC_NO_CONTENTS_LABEL;
+extern const wchar_t* IDC_CONTENTS_TABLEVIEW;
+extern const wchar_t* IDC_DELETE_BUTTON;
+extern const wchar_t* IDC_CANCEL_BUTTON;
+extern const wchar_t* IDC_LABEL_DELETE_Q;
+extern const wchar_t* IDC_SHARE_BUTTON;
+extern const wchar_t* IDC_SET_AS_BUTTON;
+extern const wchar_t* IDC_ADD_TO_BUTTON;
+extern const wchar_t* IDC_BUTTON_DELETE;
+extern const wchar_t* IDC_PLAY_CONTENT_DURATION;
+extern const wchar_t* IDC_CONTENTS_EDIT_TABLEVIEW;
+extern const wchar_t* IDC_ITEM_SELECTED_COUNT_LABEL;
+extern const wchar_t* IDC_PANEL_REGISTER_BAR;
+extern const wchar_t* IDC_PLAYER_CONTROL_BAR;
+extern const wchar_t* IDC_OPTION_VOLUMN;
+extern const wchar_t* IDC_OPTION_SHUFFLE;
+extern const wchar_t* IDC_OPTION_PLAY_LIST_ADD;
+extern const wchar_t* IDC_OPTION_REPEAT;
+extern const wchar_t* IDC_CURRENT_PLAYING_TIME;
+extern const wchar_t* IDC_CONTENT_TOTAL_TIME;
+extern const wchar_t* IDC_ALBUM_THUMBANIL_BACKGROUND;
+extern const wchar_t* IDC_ALBUM_TURN_TABLE;
+extern const wchar_t* IDC_CONTENTS_VIEW_TOGGLE_BUTTON;
+extern const wchar_t* IDC_SLIDER_BAR;
+extern const wchar_t* IDC_SPLIT_BAR;
+extern const wchar_t* IDC_CREATE_BUTTON;
+extern const wchar_t* IDC_TABLEVIEW;
+extern const wchar_t* IDC_SPLIT_BAR;
+extern const wchar_t* IDC_EDITFIELD;
+extern const wchar_t* IDC_CONTENT_TOTAL_COUNT;
+extern const wchar_t* IDC_PLAY_ALL_BUTTON;
+extern const wchar_t* IDC_STORAGE_TYPE_ICON;
+extern const wchar_t* IDC_FOLDER_PATH;
+extern const wchar_t* IDC_FOLDER_NAME;
+extern const wchar_t* IDC_CONTENTS_ITEM_COUNT;
+extern const wchar_t* IDC_BUTTON_EDIT;
+extern const wchar_t* IDC_PLAY_ALL;
+extern const wchar_t* IDC_ADD_TO_PLAYLIST;
+extern const wchar_t* IDC_PLAY_CONTENT_COUNT;
+//_XML IDC_
+
+//HEADER
+extern const unsigned int COLOR_HEADER_TITLE_TEXT;
+extern const unsigned int COLOR_HEADER_DESCRIPTION_TEXT;
+
+extern const wchar_t* IDB_MUSIC_LINE_CONTENT_FORM;
+
+static const Tizen::Base::String CheckedName[HEAD_ITEM_COUNT] =
+{
+       L"SONGS_TAB",
+       L"PLAYERLISTS_TAB",
+       L"ALBUMS_TAB",
+       L"ARTISTS_TAB",
+//     L"GENRES_TAB",
+//     L"COMPOSERS_TAB",
+//     L"YEARS_TAB",
+//     L"FOLDERS_TAB"
+};
+
+static const Tizen::Base::String TabNameId[HEAD_ITEM_COUNT] =
+{
+       L"IDS_MUSIC_ITAB4_ALL",
+       L"IDS_MUSIC_TAB4_PLAYLISTS",
+       L"IDS_MUSIC_TAB4_ALBUMS",
+       L"IDS_MUSIC_TAB4_ARTISTS",
+//     L"IDS_MUSIC_TAB4_GENRES",
+//     L"IDS_MUSIC_BODY_COMPOSERS",
+//     L"IDS_MUSIC_TAB4_YEARS",
+//     L"IDS_MUSIC_TAB4_FOLDERS",
+};
 
 static const int TIMER_INTERVAL = 100;
 static const int MIN_REWIND_POSITION = 2;
diff --git a/res/screen-density-xhigh/00_check_bg.png b/res/screen-density-xhigh/00_check_bg.png
new file mode 100644 (file)
index 0000000..80398ed
Binary files /dev/null and b/res/screen-density-xhigh/00_check_bg.png differ
diff --git a/res/screen-density-xhigh/00_check_bg_dim.png b/res/screen-density-xhigh/00_check_bg_dim.png
new file mode 100644 (file)
index 0000000..72ced60
Binary files /dev/null and b/res/screen-density-xhigh/00_check_bg_dim.png differ
diff --git a/res/screen-density-xhigh/00_check_bg_press.png b/res/screen-density-xhigh/00_check_bg_press.png
new file mode 100644 (file)
index 0000000..834918e
Binary files /dev/null and b/res/screen-density-xhigh/00_check_bg_press.png differ
diff --git a/res/screen-density-xhigh/00_check_checking.png b/res/screen-density-xhigh/00_check_checking.png
new file mode 100644 (file)
index 0000000..eae81d5
Binary files /dev/null and b/res/screen-density-xhigh/00_check_checking.png differ
diff --git a/res/screen-density-xhigh/00_icon_edit.png b/res/screen-density-xhigh/00_icon_edit.png
new file mode 100644 (file)
index 0000000..8b6423b
Binary files /dev/null and b/res/screen-density-xhigh/00_icon_edit.png differ
diff --git a/res/screen-density-xhigh/00_icon_edit_ef.png b/res/screen-density-xhigh/00_icon_edit_ef.png
new file mode 100644 (file)
index 0000000..a7a5b7d
Binary files /dev/null and b/res/screen-density-xhigh/00_icon_edit_ef.png differ
diff --git a/res/screen-density-xhigh/00_icon_more.png b/res/screen-density-xhigh/00_icon_more.png
new file mode 100644 (file)
index 0000000..8e90481
Binary files /dev/null and b/res/screen-density-xhigh/00_icon_more.png differ
diff --git a/res/screen-density-xhigh/00_icon_more_ef.png b/res/screen-density-xhigh/00_icon_more_ef.png
new file mode 100644 (file)
index 0000000..3c8323a
Binary files /dev/null and b/res/screen-density-xhigh/00_icon_more_ef.png differ
diff --git a/res/screen-density-xhigh/T02_album_thumbnail_bg.png b/res/screen-density-xhigh/T02_album_thumbnail_bg.png
new file mode 100644 (file)
index 0000000..d07b90a
Binary files /dev/null and b/res/screen-density-xhigh/T02_album_thumbnail_bg.png differ
diff --git a/res/screen-density-xhigh/T02_album_thumbnail_h_bg.PNG b/res/screen-density-xhigh/T02_album_thumbnail_h_bg.PNG
new file mode 100644 (file)
index 0000000..62a825a
Binary files /dev/null and b/res/screen-density-xhigh/T02_album_thumbnail_h_bg.PNG differ
diff --git a/res/screen-density-xhigh/T02_album_turn_table.png b/res/screen-density-xhigh/T02_album_turn_table.png
new file mode 100644 (file)
index 0000000..560d13a
Binary files /dev/null and b/res/screen-density-xhigh/T02_album_turn_table.png differ
diff --git a/res/screen-density-xhigh/T02_album_turn_table_h.PNG b/res/screen-density-xhigh/T02_album_turn_table_h.PNG
new file mode 100644 (file)
index 0000000..efdae96
Binary files /dev/null and b/res/screen-density-xhigh/T02_album_turn_table_h.PNG differ
diff --git a/res/screen-density-xhigh/T02_control_circle_button_01.png b/res/screen-density-xhigh/T02_control_circle_button_01.png
new file mode 100644 (file)
index 0000000..1e3aecc
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_button_01.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_button_01_press.png b/res/screen-density-xhigh/T02_control_circle_button_01_press.png
new file mode 100644 (file)
index 0000000..493d980
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_button_01_press.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_button_02.png b/res/screen-density-xhigh/T02_control_circle_button_02.png
new file mode 100644 (file)
index 0000000..c8bf4cc
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_button_02.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_button_02_press.png b/res/screen-density-xhigh/T02_control_circle_button_02_press.png
new file mode 100644 (file)
index 0000000..324d3ce
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_button_02_press.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_button_03.png b/res/screen-density-xhigh/T02_control_circle_button_03.png
new file mode 100644 (file)
index 0000000..9b79838
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_button_03.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_button_03_press.png b/res/screen-density-xhigh/T02_control_circle_button_03_press.png
new file mode 100644 (file)
index 0000000..8d34162
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_button_03_press.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_next.png b/res/screen-density-xhigh/T02_control_circle_icon_next.png
new file mode 100644 (file)
index 0000000..0874dd1
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_next.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_next_dim.png b/res/screen-density-xhigh/T02_control_circle_icon_next_dim.png
new file mode 100644 (file)
index 0000000..da2c293
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_next_dim.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_next_press.png b/res/screen-density-xhigh/T02_control_circle_icon_next_press.png
new file mode 100644 (file)
index 0000000..31b6d65
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_next_press.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_pause.png b/res/screen-density-xhigh/T02_control_circle_icon_pause.png
new file mode 100644 (file)
index 0000000..b39b66f
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_pause.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_pause_dim.png b/res/screen-density-xhigh/T02_control_circle_icon_pause_dim.png
new file mode 100644 (file)
index 0000000..5004f19
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_pause_dim.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_pause_press.png b/res/screen-density-xhigh/T02_control_circle_icon_pause_press.png
new file mode 100644 (file)
index 0000000..20be8d9
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_pause_press.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_play.png b/res/screen-density-xhigh/T02_control_circle_icon_play.png
new file mode 100644 (file)
index 0000000..4425c44
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_play.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_play_dim.png b/res/screen-density-xhigh/T02_control_circle_icon_play_dim.png
new file mode 100644 (file)
index 0000000..ddbbbc4
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_play_dim.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_play_press.png b/res/screen-density-xhigh/T02_control_circle_icon_play_press.png
new file mode 100644 (file)
index 0000000..fd24423
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_play_press.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_previous.png b/res/screen-density-xhigh/T02_control_circle_icon_previous.png
new file mode 100644 (file)
index 0000000..dd510b9
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_previous.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_previous_dim.png b/res/screen-density-xhigh/T02_control_circle_icon_previous_dim.png
new file mode 100644 (file)
index 0000000..c1fb1a4
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_previous_dim.png differ
diff --git a/res/screen-density-xhigh/T02_control_circle_icon_previous_press.png b/res/screen-density-xhigh/T02_control_circle_icon_previous_press.png
new file mode 100644 (file)
index 0000000..42fa95e
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_circle_icon_previous_press.png differ
diff --git a/res/screen-density-xhigh/T02_control_progress_handle.png b/res/screen-density-xhigh/T02_control_progress_handle.png
new file mode 100644 (file)
index 0000000..1802660
Binary files /dev/null and b/res/screen-density-xhigh/T02_control_progress_handle.png differ
diff --git a/res/screen-density-xhigh/T02_folder_storage_icon_inner_memory.png b/res/screen-density-xhigh/T02_folder_storage_icon_inner_memory.png
new file mode 100644 (file)
index 0000000..af3ad24
Binary files /dev/null and b/res/screen-density-xhigh/T02_folder_storage_icon_inner_memory.png differ
diff --git a/res/screen-density-xhigh/T02_folder_storage_icon_inner_memory_press.png b/res/screen-density-xhigh/T02_folder_storage_icon_inner_memory_press.png
new file mode 100644 (file)
index 0000000..01e2bdc
Binary files /dev/null and b/res/screen-density-xhigh/T02_folder_storage_icon_inner_memory_press.png differ
diff --git a/res/screen-density-xhigh/T02_folder_storage_icon_memory.png b/res/screen-density-xhigh/T02_folder_storage_icon_memory.png
new file mode 100644 (file)
index 0000000..27fa972
Binary files /dev/null and b/res/screen-density-xhigh/T02_folder_storage_icon_memory.png differ
diff --git a/res/screen-density-xhigh/T02_folder_storage_icon_memory_press.png b/res/screen-density-xhigh/T02_folder_storage_icon_memory_press.png
new file mode 100644 (file)
index 0000000..1b773e1
Binary files /dev/null and b/res/screen-density-xhigh/T02_folder_storage_icon_memory_press.png differ
diff --git a/res/screen-density-xhigh/T02_icon_play_list.png b/res/screen-density-xhigh/T02_icon_play_list.png
new file mode 100644 (file)
index 0000000..9408f02
Binary files /dev/null and b/res/screen-density-xhigh/T02_icon_play_list.png differ
diff --git a/res/screen-density-xhigh/T02_icon_play_list_web.png b/res/screen-density-xhigh/T02_icon_play_list_web.png
new file mode 100644 (file)
index 0000000..0982581
Binary files /dev/null and b/res/screen-density-xhigh/T02_icon_play_list_web.png differ
diff --git a/res/screen-density-xhigh/T02_icon_play_list_web_dim.png b/res/screen-density-xhigh/T02_icon_play_list_web_dim.png
new file mode 100644 (file)
index 0000000..0039e23
Binary files /dev/null and b/res/screen-density-xhigh/T02_icon_play_list_web_dim.png differ
diff --git a/res/screen-density-xhigh/T02_icon_play_list_web_press.png b/res/screen-density-xhigh/T02_icon_play_list_web_press.png
new file mode 100644 (file)
index 0000000..f3ad5c5
Binary files /dev/null and b/res/screen-density-xhigh/T02_icon_play_list_web_press.png differ
diff --git a/res/screen-density-xhigh/T02_icon_search.png b/res/screen-density-xhigh/T02_icon_search.png
new file mode 100644 (file)
index 0000000..6bebef3
Binary files /dev/null and b/res/screen-density-xhigh/T02_icon_search.png differ
diff --git a/res/screen-density-xhigh/T02_icon_search__.png b/res/screen-density-xhigh/T02_icon_search__.png
new file mode 100644 (file)
index 0000000..2fee6ae
Binary files /dev/null and b/res/screen-density-xhigh/T02_icon_search__.png differ
diff --git a/res/screen-density-xhigh/T02_icon_search_press.png b/res/screen-density-xhigh/T02_icon_search_press.png
new file mode 100644 (file)
index 0000000..50d1da0
Binary files /dev/null and b/res/screen-density-xhigh/T02_icon_search_press.png differ
diff --git a/res/screen-density-xhigh/T02_icon_search_web.png b/res/screen-density-xhigh/T02_icon_search_web.png
new file mode 100644 (file)
index 0000000..e926fc4
Binary files /dev/null and b/res/screen-density-xhigh/T02_icon_search_web.png differ
diff --git a/res/screen-density-xhigh/T02_icon_search_web_dim.png b/res/screen-density-xhigh/T02_icon_search_web_dim.png
new file mode 100644 (file)
index 0000000..db3393c
Binary files /dev/null and b/res/screen-density-xhigh/T02_icon_search_web_dim.png differ
diff --git a/res/screen-density-xhigh/T02_icon_search_web_press.png b/res/screen-density-xhigh/T02_icon_search_web_press.png
new file mode 100644 (file)
index 0000000..8a70cf8
Binary files /dev/null and b/res/screen-density-xhigh/T02_icon_search_web_press.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_button_01.png b/res/screen-density-xhigh/T02_mini_control_circle_button_01.png
new file mode 100644 (file)
index 0000000..185d0ad
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_button_01.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_button_01_press.png b/res/screen-density-xhigh/T02_mini_control_circle_button_01_press.png
new file mode 100644 (file)
index 0000000..384aba9
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_button_01_press.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_button_02.png b/res/screen-density-xhigh/T02_mini_control_circle_button_02.png
new file mode 100644 (file)
index 0000000..b446d34
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_button_02.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_button_02_press.png b/res/screen-density-xhigh/T02_mini_control_circle_button_02_press.png
new file mode 100644 (file)
index 0000000..690af55
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_button_02_press.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_next.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_next.png
new file mode 100644 (file)
index 0000000..5c35cfe
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_next.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_next_dim.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_next_dim.png
new file mode 100644 (file)
index 0000000..86a0e26
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_next_dim.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_next_press.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_next_press.png
new file mode 100644 (file)
index 0000000..11a4113
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_next_press.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_pause.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_pause.png
new file mode 100644 (file)
index 0000000..c6da9b4
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_pause.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_pause_dim.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_pause_dim.png
new file mode 100644 (file)
index 0000000..abda1f0
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_pause_dim.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_pause_press.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_pause_press.png
new file mode 100644 (file)
index 0000000..47d2c93
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_pause_press.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_play.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_play.png
new file mode 100644 (file)
index 0000000..da6b46e
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_play.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_play_dim.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_play_dim.png
new file mode 100644 (file)
index 0000000..a64e264
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_play_dim.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_play_press.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_play_press.png
new file mode 100644 (file)
index 0000000..598b6ee
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_play_press.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_previous.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_previous.png
new file mode 100644 (file)
index 0000000..50c2579
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_previous.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_previous_dim.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_previous_dim.png
new file mode 100644 (file)
index 0000000..f4c072b
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_previous_dim.png differ
diff --git a/res/screen-density-xhigh/T02_mini_control_circle_icon_previous_press.png b/res/screen-density-xhigh/T02_mini_control_circle_icon_previous_press.png
new file mode 100644 (file)
index 0000000..dc3d228
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_control_circle_icon_previous_press.png differ
diff --git a/res/screen-density-xhigh/T02_mini_eq_ani_01.png b/res/screen-density-xhigh/T02_mini_eq_ani_01.png
new file mode 100644 (file)
index 0000000..7cfc3db
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_eq_ani_01.png differ
diff --git a/res/screen-density-xhigh/T02_mini_eq_ani_02.png b/res/screen-density-xhigh/T02_mini_eq_ani_02.png
new file mode 100644 (file)
index 0000000..4b810ae
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_eq_ani_02.png differ
diff --git a/res/screen-density-xhigh/T02_mini_eq_ani_03.png b/res/screen-density-xhigh/T02_mini_eq_ani_03.png
new file mode 100644 (file)
index 0000000..8668fae
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_eq_ani_03.png differ
diff --git a/res/screen-density-xhigh/T02_mini_eq_ani_04.png b/res/screen-density-xhigh/T02_mini_eq_ani_04.png
new file mode 100644 (file)
index 0000000..e45f152
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_eq_ani_04.png differ
diff --git a/res/screen-density-xhigh/T02_mini_eq_ani_05.png b/res/screen-density-xhigh/T02_mini_eq_ani_05.png
new file mode 100644 (file)
index 0000000..b0360b7
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_eq_ani_05.png differ
diff --git a/res/screen-density-xhigh/T02_mini_eq_ani_06.png b/res/screen-density-xhigh/T02_mini_eq_ani_06.png
new file mode 100644 (file)
index 0000000..24de773
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_eq_ani_06.png differ
diff --git a/res/screen-density-xhigh/T02_mini_eq_ani_07.png b/res/screen-density-xhigh/T02_mini_eq_ani_07.png
new file mode 100644 (file)
index 0000000..48d086a
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_eq_ani_07.png differ
diff --git a/res/screen-density-xhigh/T02_mini_eq_ani_08.png b/res/screen-density-xhigh/T02_mini_eq_ani_08.png
new file mode 100644 (file)
index 0000000..a998f44
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_eq_ani_08.png differ
diff --git a/res/screen-density-xhigh/T02_mini_icon_now_playing.png b/res/screen-density-xhigh/T02_mini_icon_now_playing.png
new file mode 100644 (file)
index 0000000..041e6ab
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_icon_now_playing.png differ
diff --git a/res/screen-density-xhigh/T02_mini_player_bg.png b/res/screen-density-xhigh/T02_mini_player_bg.png
new file mode 100644 (file)
index 0000000..f599aa2
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_player_bg.png differ
diff --git a/res/screen-density-xhigh/T02_mini_progress_bar.png b/res/screen-density-xhigh/T02_mini_progress_bar.png
new file mode 100644 (file)
index 0000000..cc21549
Binary files /dev/null and b/res/screen-density-xhigh/T02_mini_progress_bar.png differ
diff --git a/res/screen-density-xhigh/T02_music_line.png b/res/screen-density-xhigh/T02_music_line.png
new file mode 100644 (file)
index 0000000..92295f4
Binary files /dev/null and b/res/screen-density-xhigh/T02_music_line.png differ
diff --git a/res/screen-density-xhigh/T02_option_SA.png b/res/screen-density-xhigh/T02_option_SA.png
new file mode 100644 (file)
index 0000000..db4d39b
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_SA.png differ
diff --git a/res/screen-density-xhigh/T02_option_SA_dim.png b/res/screen-density-xhigh/T02_option_SA_dim.png
new file mode 100644 (file)
index 0000000..54fe851
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_SA_dim.png differ
diff --git a/res/screen-density-xhigh/T02_option_SA_press.png b/res/screen-density-xhigh/T02_option_SA_press.png
new file mode 100644 (file)
index 0000000..649b063
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_SA_press.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 8f6e2bd..0e7744b
Binary files a/res/screen-density-xhigh/T02_option_rep_1.png and b/res/screen-density-xhigh/T02_option_rep_1.png differ
diff --git a/res/screen-density-xhigh/T02_option_rep_1_dim.png b/res/screen-density-xhigh/T02_option_rep_1_dim.png
new file mode 100644 (file)
index 0000000..63eecea
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_rep_1_dim.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 8f6e2bd..ae8d5bc
Binary files a/res/screen-density-xhigh/T02_option_rep_1_press.png and b/res/screen-density-xhigh/T02_option_rep_1_press.png differ
old mode 100755 (executable)
new mode 100644 (file)
index bc53fab..ad65f39
Binary files a/res/screen-density-xhigh/T02_option_rep_A.png and b/res/screen-density-xhigh/T02_option_rep_A.png differ
diff --git a/res/screen-density-xhigh/T02_option_rep_A_dim.png b/res/screen-density-xhigh/T02_option_rep_A_dim.png
new file mode 100644 (file)
index 0000000..6f7d610
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_rep_A_dim.png differ
old mode 100755 (executable)
new mode 100644 (file)
index bc53fab..fd71f02
Binary files a/res/screen-density-xhigh/T02_option_rep_A_press.png and b/res/screen-density-xhigh/T02_option_rep_A_press.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 1eee006..57a1745
Binary files a/res/screen-density-xhigh/T02_option_rep_all.png and b/res/screen-density-xhigh/T02_option_rep_all.png differ
diff --git a/res/screen-density-xhigh/T02_option_rep_all_dim.png b/res/screen-density-xhigh/T02_option_rep_all_dim.png
new file mode 100644 (file)
index 0000000..ac21004
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_rep_all_dim.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 1eee006..27a5452
Binary files a/res/screen-density-xhigh/T02_option_rep_all_press.png and b/res/screen-density-xhigh/T02_option_rep_all_press.png differ
diff --git a/res/screen-density-xhigh/T02_option_rep_section copy.png b/res/screen-density-xhigh/T02_option_rep_section copy.png
new file mode 100644 (file)
index 0000000..d894b68
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_rep_section copy.png differ
diff --git a/res/screen-density-xhigh/T02_option_rep_section copy_dim.png b/res/screen-density-xhigh/T02_option_rep_section copy_dim.png
new file mode 100644 (file)
index 0000000..0bc97ef
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_rep_section copy_dim.png differ
diff --git a/res/screen-density-xhigh/T02_option_rep_section copy_press.png b/res/screen-density-xhigh/T02_option_rep_section copy_press.png
new file mode 100644 (file)
index 0000000..61a589a
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_rep_section copy_press.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 4615d7f..3141542
Binary files a/res/screen-density-xhigh/T02_option_shuffle_on.png and b/res/screen-density-xhigh/T02_option_shuffle_on.png differ
diff --git a/res/screen-density-xhigh/T02_option_shuffle_on_dim.png b/res/screen-density-xhigh/T02_option_shuffle_on_dim.png
new file mode 100644 (file)
index 0000000..de94644
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_shuffle_on_dim.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 4615d7f..e85c043
Binary files a/res/screen-density-xhigh/T02_option_shuffle_on_press.png and b/res/screen-density-xhigh/T02_option_shuffle_on_press.png differ
diff --git a/res/screen-density-xhigh/T02_option_volume.png b/res/screen-density-xhigh/T02_option_volume.png
new file mode 100644 (file)
index 0000000..c43c7b8
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_volume.png differ
diff --git a/res/screen-density-xhigh/T02_option_volume_dim.png b/res/screen-density-xhigh/T02_option_volume_dim.png
new file mode 100644 (file)
index 0000000..8466ba4
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_volume_dim.png differ
diff --git a/res/screen-density-xhigh/T02_option_volume_press.png b/res/screen-density-xhigh/T02_option_volume_press.png
new file mode 100644 (file)
index 0000000..f7f6532
Binary files /dev/null and b/res/screen-density-xhigh/T02_option_volume_press.png differ
diff --git a/res/screen-density-xhigh/T02_volume_popup_bg.png b/res/screen-density-xhigh/T02_volume_popup_bg.png
new file mode 100644 (file)
index 0000000..7e323e8
Binary files /dev/null and b/res/screen-density-xhigh/T02_volume_popup_bg.png differ
diff --git a/res/screen-density-xhigh/T02_volume_popup_progress_bar.png b/res/screen-density-xhigh/T02_volume_popup_progress_bar.png
new file mode 100644 (file)
index 0000000..95e5edb
Binary files /dev/null and b/res/screen-density-xhigh/T02_volume_popup_progress_bar.png differ
diff --git a/res/screen-density-xhigh/T02_volume_popup_progress_bg.png b/res/screen-density-xhigh/T02_volume_popup_progress_bg.png
new file mode 100644 (file)
index 0000000..20452e2
Binary files /dev/null and b/res/screen-density-xhigh/T02_volume_popup_progress_bg.png differ
diff --git a/res/screen-density-xhigh/T02_volume_popup_progress_handle.png b/res/screen-density-xhigh/T02_volume_popup_progress_handle.png
new file mode 100644 (file)
index 0000000..769c799
Binary files /dev/null and b/res/screen-density-xhigh/T02_volume_popup_progress_handle.png differ
diff --git a/res/screen-density-xhigh/music_btn_back.png b/res/screen-density-xhigh/music_btn_back.png
new file mode 100644 (file)
index 0000000..d9162e6
Binary files /dev/null and b/res/screen-density-xhigh/music_btn_back.png differ
diff --git a/res/screen-density-xhigh/music_btn_back_dim.png b/res/screen-density-xhigh/music_btn_back_dim.png
new file mode 100644 (file)
index 0000000..b6b19e3
Binary files /dev/null and b/res/screen-density-xhigh/music_btn_back_dim.png differ
diff --git a/res/screen-density-xhigh/music_btn_back_press.png b/res/screen-density-xhigh/music_btn_back_press.png
new file mode 100644 (file)
index 0000000..888e57f
Binary files /dev/null and b/res/screen-density-xhigh/music_btn_back_press.png differ
diff --git a/res/screen-size-normal/IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL.xml b/res/screen-size-normal/IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL.xml
new file mode 100644 (file)
index 0000000..dcf61dd
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+    <Panel id="IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="669" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="700" mode="Landscape" type="LAYOUT_RELATIVE" width="547" x="0" y="0"/>\r
+    </Panel>\r
+    <Label id="IDC_ALBUM_THUMBANIL_BACKGROUND" parent="IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\r
+        <property backgroundBitmapPath="T02_album_thumbnail_h_bg.PNG" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="525" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="19" marginRight="0" marginTop="90" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="525" x="19" y="90"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="406" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MUSIC_PLAYER_ALBUM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="406" x="16" y="147"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="492" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="8" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="492" x="35" y="98"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="374" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="8" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="374" x="32" y="155"/>\r
+    </Label>\r
+    <Label id="IDC_ALBUM_TURN_TABLE" parent="IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL">\r
+        <property backgroundBitmapPath="T02_album_turn_table_h.PNG" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="484" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="198" marginRight="19" marginTop="14" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="497" x="204" y="104"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="368" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="14" marginTop="12" mode="Landscape" rightRelation="IDC_MUSIC_PLAYER_ALBUM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_ALBUM_THUMBANIL_BACKGROUND" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="369" x="164" y="159"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CONTENTS_DELETE_POPUP.xml b/res/screen-size-normal/IDL_CONTENTS_DELETE_POPUP.xml
new file mode 100644 (file)
index 0000000..3240353
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">\r
+<ScenePopup Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <Popup id="IDL_CONTENTS_DELETE_POPUP">\r
+        <property color="" titleText="" titleTextColor=""/>\r
+        <layout height="220" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688"/>\r
+        <layout height="220" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="1280"/>\r
+    </Popup>\r
+    <Button id="IDC_DELETE_BUTTON" parent="IDL_CONTENTS_DELETE_POPUP">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="#F8F6EF" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="#D05252" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#D05252" normalColorOpacity="100" normalTextColor="#F8F6EF" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="#C24747" pressedColorOpacity="100" pressedTextColor="" text="Delete" textSize="36" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="None" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314" x="334" y="126"/>\r
+        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="None" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="610" x="630" y="126"/>\r
+    </Button>\r
+    <Button id="IDC_CANCEL_BUTTON" parent="IDL_CONTENTS_DELETE_POPUP">\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="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="36" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="None" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314" x="0" y="126"/>\r
+        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="None" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="610" x="0" y="126"/>\r
+    </Button>\r
+    <Label id="IDC_LABEL_DELETE_Q" parent="IDL_CONTENTS_DELETE_POPUP">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="Delete?" textColor="" textSize="42" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="40" marginLeft="0" marginRight="0" marginTop="32" mode="Portrait" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_DELETE_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="32"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="32" mode="Landscape" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_DELETE_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1240" x="0" y="32"/>\r
+    </Label>\r
+</ScenePopup>\r
diff --git a/res/screen-size-normal/IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL.xml b/res/screen-size-normal/IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..2735a0e
--- /dev/null
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <Panel id="IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Label id="IDC_PLAY_CONTENT_COUNT" parent="IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="song" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="22" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="206" x="488" y="22"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="22" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="206" x="1048" y="22"/>\r
+    </Label>\r
+    <Label id="IDC_THUMBNAIL_INNER_STROKE" parent="IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="20" y="16"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="20" y="16"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Title Name" textColor="#000000" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="22" mode="Portrait" rightRelation="IDC_PLAY_CONTENT_DURATION" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="334" x="154" y="22"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="22" mode="Landscape" rightRelation="IDC_PLAY_CONTENT_DURATION" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="894" x="154" y="22"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_ARTIST_NAME" parent="IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Artist Name" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="540" x="154" y="76"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1100" x="154" y="76"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL">\r
+        <property backgroundBitmapPath="34_thumb_07.png" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="22" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="22" y="18"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="22" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="22" y="18"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL.xml b/res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..942ecd3
--- /dev/null
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+    <Panel id="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Button id="IDC_BUTTON1" parent="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="00_check_bg_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_check_bg.png" normalBitmapPath="00_check_bg.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_check_bg_press.png" pressedBitmapPath="00_check_bg_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="38"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="38"/>\r
+    </Button>\r
+    <Label id="IDC_THUMBNAIL_INNER_STROKE" parent="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="105" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="105" y="16"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="105" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="105" y="16"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL">\r
+        <property backgroundBitmapPath="34_thumb_07.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="107" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="107" y="18"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="107" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="107" y="18"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Title Name" textColor="#000000" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="22" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="455" x="239" y="22"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="22" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1015" x="239" y="22"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_ARTIST_NAME" parent="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Artist Name" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="44" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="455" x="239" y="76"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="44" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1015" x="239" y="76"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_PANEL.xml b/res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_PANEL.xml
new file mode 100644 (file)
index 0000000..e7f4008
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <Panel id="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="888" mode="Portrait" type="LAYOUT_RELATIVE" width="600" x="0" y="0"/>\r
+        <layout height="600" mode="Landscape" type="LAYOUT_RELATIVE" width="800" x="0" y="0"/>\r
+    </Panel>\r
+    <Label id="IDC_ITEM_SELECTED_COUNT_LABEL" parent="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="%d items are selected." textColor="#FFFFFF" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="600" x="0" y="840"/>\r
+        <layout bottomRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="800" x="0" y="552"/>\r
+    </Label>\r
+    <TableView id="IDC_CONTENTS_EDIT_TABLEVIEW" parent="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
+        <layout bottomRelation="IDC_ITEM_SELECTED_COUNT_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="840" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="600" x="0" y="0"/>\r
+        <layout bottomRelation="IDC_ITEM_SELECTED_COUNT_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="552" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="800" x="0" y="0"/>\r
+    </TableView>\r
+    <Label id="IDC_NO_CONTENTS_LABEL" parent="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
+        <property backgroundBitmapPath="T02_nocomposers.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="No Songs" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_BOTTOM"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="160" y="304"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="260" y="160"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CONTENTS_LIBARY_ITEM_PANEL.xml b/res/screen-size-normal/IDL_CONTENTS_LIBARY_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..182047a
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+    <Panel id="IDL_CONTENTS_LIBARY_ITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Label id="IDC_THUMBNAIL_INNER_STROKE" parent="IDL_CONTENTS_LIBARY_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="20" y="16"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="20" y="16"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_CONTENTS_LIBARY_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Title Name" textColor="#000000" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="22" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="540" x="154" y="22"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="22" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1100" x="154" y="22"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_ARTIST_NAME" parent="IDL_CONTENTS_LIBARY_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Artist Name" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="540" x="154" y="76"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1100" x="154" y="76"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDL_CONTENTS_LIBARY_ITEM_PANEL">\r
+        <property backgroundBitmapPath="34_thumb_07.png" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="22" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="22" y="18"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="22" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="22" y="18"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL.xml b/res/screen-size-normal/IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL.xml
new file mode 100644 (file)
index 0000000..0687fb3
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <Panel id="IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL">\r
+        <property backgroundBitmapPath="34_thumb_07.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="20" y="16"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="22" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="22" y="16"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="List item 1" textColor="" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="64" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="22" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="360" x="154" y="38"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="64" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CONTENTS_THUMBNAIL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="None" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="800" x="156" y="38"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENT_TOTAL_COUNT" parent="IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="Sub text" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="16" marginRight="26" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="180" x="514" y="49"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="64" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CONTENTS_TITLE_NAME" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="298" x="956" y="38"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CONTENTS_LIBARY_PANEL.xml b/res/screen-size-normal/IDL_CONTENTS_LIBARY_PANEL.xml
new file mode 100644 (file)
index 0000000..bc9be29
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+    <Panel id="IDL_CONTENTS_LIBARY_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="456" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="600" mode="Landscape" type="LAYOUT_RELATIVE" width="800" x="0" y="0"/>\r
+    </Panel>\r
+    <Panel id="IDC_MINI_PLAYER_REGISTER_BAR" parent="IDL_CONTENTS_LIBARY_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout bottomRelation="IDL_CONTENTS_LIBARY_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="456"/>\r
+        <layout bottomRelation="IDL_CONTENTS_LIBARY_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="800" x="0" y="600"/>\r
+    </Panel>\r
+    <TableView id="IDC_CONTENTS_TABLEVIEW" parent="IDL_CONTENTS_LIBARY_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="ABCDEFGHIJKLMNOPQRSTUVWXYZ#0" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FAST_SCROLL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
+        <layout bottomRelation="IDC_MINI_PLAYER_REGISTER_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="456" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>\r
+        <layout bottomRelation="IDC_MINI_PLAYER_REGISTER_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="600" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="800" x="0" y="0"/>\r
+    </TableView>\r
+    <Label id="IDC_NO_CONTENTS_LABEL" parent="IDL_CONTENTS_LIBARY_PANEL">\r
+        <property backgroundBitmapPath="T02_nocomposers.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="No Songs" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_BOTTOM"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="220" y="88"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="260" y="160"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL.xml b/res/screen-size-normal/IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..464ec09
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <Panel id="IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Button id="IDC_BUTTON1" parent="IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="00_check_bg_dim.png" disabledBitmapPath="00_check_bg_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_check_bg.png" normalBitmapPath="00_check_bg.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_check_bg_press.png" pressedBitmapPath="00_check_bg_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="38"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="38"/>\r
+    </Button>\r
+    <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL">\r
+        <property backgroundBitmapPath="34_thumb_07.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="107" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="107" y="16"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="107" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="107" y="18"/>\r
+    </Label>\r
+    <Button id="IDC_BUTTON_EDIT" parent="IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL">\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="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="64" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64" x="630" y="38"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="64" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64" x="1190" y="38"/>\r
+    </Button>\r
+    <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Title Name" textColor="#000000" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="64" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="16" marginTop="22" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="375" x="239" y="38"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="64" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="16" marginTop="22" mode="Landscape" rightRelation="IDC_BUTTON_EDIT" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="935" x="239" y="38"/>\r
+    </Label>\r
+</ScenePanel>\r
index 39bee22..fe917cb 100644 (file)
@@ -11,7 +11,7 @@
         <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_TAB" 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="false"/>\r
+        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/>\r
         <itemSet/>\r
     </Footer>\r
     <Header>\r
diff --git a/res/screen-size-normal/IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL.xml b/res/screen-size-normal/IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..576e968
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+    <Panel id="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Label id="IDC_STORAGE_TYPE_ICON" parent="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL">\r
+        <property backgroundBitmapPath="00_slider_button_brightness_02_web.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="20" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="26" y="33"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_ITEM_COUNT" parent="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="Label1" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="26" marginRight="26" marginTop="22" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="206" x="488" y="22"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="22" mode="Landscape" rightRelation="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="206" x="1048" y="22"/>\r
+    </Label>\r
+    <Label id="IDC_FOLDER_NAME" parent="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Main text 1" textColor="" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STORAGE_TYPE_ICON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="22" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="368" x="120" y="22"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STORAGE_TYPE_ICON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="22" mode="Landscape" rightRelation="IDC_CONTENTS_ITEM_COUNT" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="922" x="126" y="22"/>\r
+    </Label>\r
+    <Label id="IDC_FOLDER_PATH" parent="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Sub text2" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STORAGE_TYPE_ICON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="574" x="120" y="75"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STORAGE_TYPE_ICON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_FOLDER_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1128" x="126" y="76"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CONTEXT_ITEM_PLAYALL_ADDTO.xml b/res/screen-size-normal/IDL_CONTEXT_ITEM_PLAYALL_ADDTO.xml
new file mode 100644 (file)
index 0000000..98e8c8c
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+    <Panel id="IDL_CONTEXT_ITEM_PLAYALL_ADDTO">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Button id="IDC_PLAY_ALL" parent="IDL_CONTEXT_ITEM_PLAYALL_ADDTO">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Play all" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTEXT_ITEM_PLAYALL_ADDTO" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Portrait" rightRelation="None" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="326" x="26" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTEXT_ITEM_PLAYALL_ADDTO" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="601" x="26" y="33"/>\r
+    </Button>\r
+    <Button id="IDC_ADD_TO_PLAYLIST" parent="IDL_CONTEXT_ITEM_PLAYALL_ADDTO">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Add to Playlist" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_CONTEXT_ITEM_PLAYALL_ADDTO" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="326" x="368" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CONTEXT_ITEM_PLAYALL_ADDTO" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="601" x="653" y="33"/>\r
+    </Button>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CREATE_PLAYLIST_POPUP.xml b/res/screen-size-normal/IDL_CREATE_PLAYLIST_POPUP.xml
new file mode 100644 (file)
index 0000000..6ffc647
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">\r
+<ScenePopup Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <Popup id="IDL_CREATE_PLAYLIST_POPUP">\r
+        <property color="" titleText="Title" titleTextColor=""/>\r
+        <layout height="630" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688"/>\r
+        <layout height="576" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="1280"/>\r
+    </Popup>\r
+    <Button id="IDC_CANCEL_BUTTON" parent="IDL_CREATE_PLAYLIST_POPUP">\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="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="36" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314" x="334" y="456"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="610" x="630" y="402"/>\r
+    </Button>\r
+    <Button id="IDC_CREATE_BUTTON" parent="IDL_CREATE_PLAYLIST_POPUP">\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="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Create" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314" x="0" y="456"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="610" x="0" y="402"/>\r
+    </Button>\r
+    <TableView id="IDC_TABLEVIEW" parent="IDL_CREATE_PLAYLIST_POPUP">\r
+        <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_NONE" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="436" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="385" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1240" x="0" y="0"/>\r
+    </TableView>\r
+</ScenePopup>\r
diff --git a/res/screen-size-normal/IDL_MINI_PLYAER_PANEL.xml b/res/screen-size-normal/IDL_MINI_PLYAER_PANEL.xml
new file mode 100644 (file)
index 0000000..0034007
--- /dev/null
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+    <Panel id="IDL_MINI_PLYAER_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="236" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="144" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Button id="IDC_PALY_TOGGLE_CONTROL_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="T02_mini_control_circle_icon_play_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_mini_control_circle_button_02.png" normalBitmapPath="T02_mini_control_circle_icon_play.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_mini_control_circle_button_02_press.png" pressedBitmapPath="T02_mini_control_circle_icon_play_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="102" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="12" marginLeft="18" marginRight="18" marginTop="30" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="102" x="309" y="122"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="102" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="11" marginLeft="0" marginRight="18" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="102" x="940" y="31"/>\r
+    </Button>\r
+    <Button id="IDC_PREVIOUS_CONTROL_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_mini_control_circle_button_01.png" normalBitmapPath="T02_mini_control_circle_icon_previous.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_mini_control_circle_button_01_press.png" pressedBitmapPath="T02_mini_control_circle_icon_previous_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="22" marginLeft="209" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="209" y="132"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="21" marginLeft="0" marginRight="18" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="840" y="41"/>\r
+    </Button>\r
+    <Button id="IDC_NEXT_CONTROL_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="T02_mini_control_circle_icon_next_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_mini_control_circle_button_01.png" normalBitmapPath="T02_mini_control_circle_icon_next.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_mini_control_circle_button_01_press.png" pressedBitmapPath="T02_mini_control_circle_icon_next_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="22" marginLeft="18" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="429" y="132"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="21" marginLeft="0" marginRight="138" marginTop="0" mode="Landscape" rightRelation="IDL_MINI_PLYAER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="1060" y="41"/>\r
+    </Button>\r
+    <Label id="IDC_THUMBNAIL_INNER_STROKE" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="34" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_MINI_PLYAER_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="20" y="34"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="118" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="118" y="35"/>\r
+    </Label>\r
+    <Label id="IDC_NOW_PLAYING_STATE" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property backgroundBitmapPath="T02_mini_icon_now_playing.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="45" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="34" marginTop="50" mode="Portrait" rightRelation="IDL_MINI_PLYAER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_MINI_PLYAER_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="33" x="653" y="50"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="38" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="38" x="1208" y="8"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Title name" textColor="#000000" textSize="30" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="32" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="8" marginRight="16" marginTop="32" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MINI_PLYAER_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="519" x="118" y="32"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="38" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="396" x="208" y="35"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_ARTIST_NAME" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="- Artist name" textColor="#808080" textSize="26" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="32" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="8" marginRight="16" marginTop="0" mode="Portrait" rightRelation="IDC_NOW_PLAYING_STATE" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="519" x="118" y="64"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="38" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="54" marginTop="0" mode="Landscape" rightRelation="IDC_PREVIOUS_CONTROL_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="182" x="604" y="35"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property backgroundBitmapPath="34_thumb_07.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="88" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="22" marginRight="0" marginTop="36" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_MINI_PLYAER_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="88" x="22" y="36"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="2" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="120" y="36"/>\r
+    </Label>\r
+    <Progress id="IDC_PROGRESS_BAR" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property backgroundColor="" barColor="" leftText="" max="100" min="0" rightText="" showValueState="true" value="0"/>\r
+        <layout bottomRelation="IDC_THUMBNAIL_INNER_STROKE" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="45" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="8" marginRight="30" marginTop="0" mode="Portrait" rightRelation="IDL_MINI_PLYAER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="PROGRESS_STYLE_NONE" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="572" x="118" y="79"/>\r
+        <layout bottomRelation="IDC_THUMBNAIL_INNER_STROKE" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="45" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="14" marginRight="54" marginTop="0" mode="Landscape" rightRelation="IDC_PREVIOUS_CONTROL_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="PROGRESS_STYLE_NONE" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="580" x="206" y="64"/>\r
+    </Progress>\r
+    <Button id="IDC_BACK_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="music_btn_back_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="music_btn_back.png" normalBitmapPath="music_btn_back.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="music_btn_back_press.png" pressedBitmapPath="music_btn_back_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="23" marginLeft="0" marginRight="23" marginTop="0" mode="Portrait" rightRelation="IDL_MINI_PLYAER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="634" y="150"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="1195" y="45"/>\r
+    </Button>\r
+    <Button id="IDC_MORE_CONTEXT_MENU_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_more_ef.png" normalBitmapPath="00_icon_more_ef.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_more_ef.png" pressedBitmapPath="00_icon_more_ef.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="23" marginLeft="25" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="25" y="150"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="15" y="44"/>\r
+    </Button>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL.xml b/res/screen-size-normal/IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL.xml
new file mode 100644 (file)
index 0000000..958fcbc
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+    <Panel id="IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="683" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="600" mode="Landscape" type="LAYOUT_RELATIVE" width="600" x="0" y="0"/>\r
+    </Panel>\r
+    <TableView id="IDC_CONTENTS_TABLEVIEW" parent="IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="683" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="720" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="600" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="600" x="0" y="0"/>\r
+    </TableView>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml b/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml
new file mode 100644 (file)
index 0000000..b29783f
--- /dev/null
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
+<Scene Bversion="2.0.0.201303041025" 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
+        <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
+    </Button>\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
+    </Label>\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_CONTENT_PLAY_LIST_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
+    </Label>\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="IDC_CONTENT_PLAY_LIST_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_CONTENTS_TITLE_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="602" x="573" y="100"/>\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="" leftRelationType="" 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
+    </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
+    </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="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="28" 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="144" 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
+    </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
+    </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="28" marginTop="18" mode="Portrait" rightRelation="" 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="486" 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
+    </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
+    </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
+    </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
+    </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="00_icon_more.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_more_ef.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_more_ef.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="20" marginLeft="26" marginRight="0" marginTop="375" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="289"/>\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="16" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="288"/>\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
+    </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
+    </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
+    </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="music_btn_back_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="music_btn_back.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="music_btn_back_press.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="20" 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="289"/>\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="16" 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="288"/>\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_SPLIT_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="670" 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
+</Scene>\r
diff --git a/res/screen-size-normal/IDL_PLAYLIST_CREATOR_FORM.xml b/res/screen-size-normal/IDL_PLAYLIST_CREATOR_FORM.xml
new file mode 100644 (file)
index 0000000..b09eccf
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
+<Scene Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <LogicalCoordinate>720</LogicalCoordinate>\r
+    <Form id="IDL_PLAYLIST_CREATOR_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
+        <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
+            <footerItem actionId="3009" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="Save"/>\r
+        </itemSet>\r
+    </Footer>\r
+    <Header>\r
+        <property backgroundBitmapPath="T02_music_line.png" 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
+        <itemSet/>\r
+    </Header>\r
+    <EditField id="IDC_EDITFIELD" parent="IDL_PLAYLIST_CREATOR_FORM">\r
+        <property commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="45" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12" viewMode="false"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="708" x="6" y="1"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="89" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="426" x="232" y="306"/>\r
+    </EditField>\r
+</Scene>\r
diff --git a/res/screen-size-normal/IDL_PLAYLIST_RENAME_FORM.xml b/res/screen-size-normal/IDL_PLAYLIST_RENAME_FORM.xml
new file mode 100644 (file)
index 0000000..8bdc194
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
+<Scene Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <LogicalCoordinate>720</LogicalCoordinate>\r
+    <Form id="IDL_PLAYLIST_RENAME_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
+        <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
+            <footerItem actionId="3009" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="Save"/>\r
+        </itemSet>\r
+    </Footer>\r
+    <Header>\r
+        <property backgroundBitmapPath="T02_music_line.png" 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="Rename playlist" titleTextColor=""/>\r
+        <itemSet/>\r
+    </Header>\r
+    <EditField id="IDC_EDITFIELD" parent="IDL_PLAYLIST_RENAME_FORM">\r
+        <property commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="45" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12" viewMode="false"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="708" x="6" y="1"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="89" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="426" x="232" y="306"/>\r
+    </EditField>\r
+</Scene>\r
diff --git a/res/screen-size-normal/IDL_SHARE_VIA_POPUP.xml b/res/screen-size-normal/IDL_SHARE_VIA_POPUP.xml
new file mode 100644 (file)
index 0000000..5c5a527
--- /dev/null
@@ -0,0 +1,22 @@
+<?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
+<ScenePopup Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <Popup id="IDL_SHARE_VIA_POPUP">\r
+        <property color="" titleText="Share via" titleTextColor=""/>\r
+        <layout height="532" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688"/>\r
+        <layout height="576" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="430"/>\r
+    </Popup>\r
+    <Button id="IDC_CANCEL_BUTTON" parent="IDL_SHARE_VIA_POPUP">\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="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="36" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_POPUP_LIST3" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="394" x="127" y="358"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="154" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="180" x="123" y="342"/>\r
+    </Button>\r
+    <TableView id="IDC_TABLEVIEW" parent="IDL_SHARE_VIA_POPUP">\r
+        <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_NONE" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
+        <layout bottomRelation="IDC_CANCEL_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="338" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SHARE_VIA_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_SHARE_VIA_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="252" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="337" x="53" y="244"/>\r
+    </TableView>\r
+</ScenePopup>\r
diff --git a/res/screen-size-normal/IDL_SWEEP_QUICK_ALBUM_PANEL.xml b/res/screen-size-normal/IDL_SWEEP_QUICK_ALBUM_PANEL.xml
new file mode 100644 (file)
index 0000000..66ba989
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <Panel id="IDL_SWEEP_QUICK_ALBUM_PANEL">\r
+        <property backgroundColor="#F8F6EF" backgroundColorOpacity="100" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Button id="IDC_PLAY_ALL_BUTTON" parent="IDL_SWEEP_QUICK_ALBUM_PANEL">\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="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Play all" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="20" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="322" x="26" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="604" x="26" y="33"/>\r
+    </Button>\r
+    <Button id="IDC_ADD_TO_BUTTON" parent="IDL_SWEEP_QUICK_ALBUM_PANEL">\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="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Add to Playlist" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="322" x="372" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="604" x="650" y="33"/>\r
+    </Button>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_SWEEP_QUICK_ITEM2_PANEL.xml b/res/screen-size-normal/IDL_SWEEP_QUICK_ITEM2_PANEL.xml
new file mode 100644 (file)
index 0000000..7a73244
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <Panel id="IDL_SWEEP_QUICK_ITEM2_PANEL">\r
+        <property backgroundColor="#F8F6EF" backgroundColorOpacity="100" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Button id="IDC_PLAY_ALL_BUTTON" parent="IDL_SWEEP_QUICK_ITEM2_PANEL">\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="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Play all" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SWEEP_QUICK_ITEM2_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="20" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="322" x="26" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SWEEP_QUICK_ITEM2_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="604" x="26" y="33"/>\r
+    </Button>\r
+    <Button id="IDC_BUTTON_DELETE" parent="IDL_SWEEP_QUICK_ITEM2_PANEL">\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="#D05252" highlightedColorOpacity="40" highlightedTextColor="#F8F7EF" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#D05252" normalColorOpacity="100" normalTextColor="#F8F7EF" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="#C24747" pressedColorOpacity="100" pressedTextColor="" text="Delete" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_SWEEP_QUICK_ITEM2_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="322" x="372" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_SWEEP_QUICK_ITEM2_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="604" x="650" y="33"/>\r
+    </Button>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_SWEEP_QUICK_MENU_ITEM_PANEL.xml b/res/screen-size-normal/IDL_SWEEP_QUICK_MENU_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..b158e9d
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+    <Panel id="IDL_SWEEP_QUICK_MENU_ITEM_PANEL">\r
+        <property backgroundColor="#F8F6EF" backgroundColorOpacity="100" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Button id="IDC_SHARE_BUTTON" parent="IDL_SWEEP_QUICK_MENU_ITEM_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Share" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SWEEP_QUICK_MENU_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_CONTENTS_ARTIST_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="155" x="26" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SWEEP_QUICK_MENU_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="295" x="26" y="33"/>\r
+    </Button>\r
+    <Button id="IDC_SET_AS_BUTTON" parent="IDL_SWEEP_QUICK_MENU_ITEM_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Set As" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SHARE_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_CONTENTS_ARTIST_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="155" x="197" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SHARE_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="295" x="337" y="33"/>\r
+    </Button>\r
+    <Button id="IDC_BUTTON_DELETE" parent="IDL_SWEEP_QUICK_MENU_ITEM_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="#F8F6EF" disabledBitmapPath="" disabledColor="#D05252" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#D05252" normalColorOpacity="100" normalTextColor="#F8F6EF" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="#C24747" pressedColorOpacity="100" pressedTextColor="" text="Delete" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="16" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_SWEEP_QUICK_MENU_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_ARTIST_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="155" x="539" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_SWEEP_QUICK_MENU_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="295" x="959" y="33"/>\r
+    </Button>\r
+    <Button id="IDC_ADD_TO_BUTTON" parent="IDL_SWEEP_QUICK_MENU_ITEM_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Add to" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="16" marginRight="16" marginTop="0" mode="Portrait" rightRelation="IDC_BUTTON_DELETE" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_CONTENTS_ARTIST_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="155" x="368" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="26" marginRight="16" marginTop="0" mode="Landscape" rightRelation="IDC_BUTTON_DELETE" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="295" x="648" y="33"/>\r
+    </Button>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL.xml b/res/screen-size-normal/IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..9ac410e
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <Panel id="IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL">\r
+        <property backgroundColor="#F8F6EF" backgroundColorOpacity="100" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="140" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="140" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Button id="IDC_PLAY_ALL_BUTTON" parent="IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL">\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="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Play All" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="11" marginLeft="197" marginRight="197" marginTop="0" mode="Portrait" rightRelation="IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="326" x="197" y="33"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="11" marginLeft="197" marginRight="197" marginTop="0" mode="Landscape" rightRelation="IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="886" x="197" y="33"/>\r
+    </Button>\r
+</ScenePanel>\r
index 7dc0f76..db05592 100644 (file)
@@ -438,7 +438,7 @@ AlbumContentListForm::CreateItem(const int itemIndex, int itemWidth)
        {
                pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
        }
-       pItem->SetBackgroundColor(COLOR_WHITE);
+//     pItem->SetBackgroundColor(COLOR_WHITE);
 
        pContentInfoStruct = __pPresentationModel->GetContentInfoN(itemIndex);
        if (pContentInfoStruct == null)
@@ -546,6 +546,7 @@ AlbumContentListForm::CreateAlbumInfoPanel(const ContentInformation& contentInfo
                __pContentInfoPanel->Construct(RECT_PAENL);
                __pContentInfoPanel->SetBackgroundColor(COLOR_PANEL_BACKGROUND_GRAY_BLUE);
        }
+
        Label* pHeaderThumbnailLabel = new (std::nothrow) Label();
        pHeaderThumbnailLabel->Construct(RECT_HEADER_THUMBNAIL, L"");
        pHeaderThumbnailLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
index 250b0b8..bbd5479 100644 (file)
@@ -113,7 +113,6 @@ AlbumContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -125,7 +124,6 @@ AlbumContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -171,7 +169,6 @@ AlbumContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_FOOTER_BUTTON_CANCEL:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        Form* pForm = dynamic_cast<Form*>(GetParent());
                        AppAssert(pForm);
                        CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
@@ -181,7 +178,7 @@ AlbumContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        default:
                break;
-       }//End of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -246,7 +243,7 @@ AlbumContentPickerPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        CommonUtil::CreateContentPikerTableViewItem(*pItem, pContentInfoStruct->TitleName, CommonUtil::GetFormatDate(pContentInfoStruct->Duration));
 
index 2cd11c2..6875f96 100644 (file)
@@ -120,7 +120,6 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -131,7 +130,6 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -169,14 +167,13 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 
        case IDA_FOOTER_BUTTON_CANCEL:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        pSceneManager->GoBackward(BackwardSceneTransition());
                }
                break;
 
        default:
                break;
-       }//End of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
@@ -260,7 +257,7 @@ AlbumListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        int W_Label = W_CLIENT_AREA - (W_TABLE_VIEW_MARK + W_CREATE_TABLE_VIEW_ITEM_COUNT_LABEL_ITEM);
 
@@ -334,7 +331,7 @@ AlbumListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView
 
        default:
                break;
-       }//end of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
index f089a0d..0a96272 100644 (file)
@@ -20,7 +20,6 @@
  */
 
 #include "MpAlbumListPanel.h"
-#include "MpNowPlayContentPanel.h"
 #include "MpPlaylistPickerPopup.h"
 #include "MpThumbnailInfo.h"
 
@@ -29,22 +28,17 @@ using namespace Tizen::Base::Collection;
 using namespace Tizen::Content;
 using namespace Tizen::Graphics;
 using namespace Tizen::Social;
+using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int W_SONG_TIME = 200;
-static const int Y_GAP_LABEL = 10;
-
 AlbumListPanel::AlbumListPanel(void)
        : ThumbnailBase::ThumbnailBase()
        , __itemIndex(-1)
-       , __pNowPlayContentPanel(null)
        , __pPlayListPickerPopup(null)
        , __pContextItem(null)
-       , __pContentTableView(null)
-       , __pNoContentImageLabel(null)
-       , __pNoContentTextLabel(null)
        , __pThumbnail(null)
+       , __pMoreContextMenu(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -56,19 +50,6 @@ AlbumListPanel::~AlbumListPanel(void)
        AppLogDebug("EXIT");
 }
 
-bool
-AlbumListPanel::Initialize(void)
-{
-       AppLogDebug("ENTER");
-       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE));
-       if (IsFailed(r))
-       {
-               return false;
-       }
-       AppLogDebug("EXIT");
-       return true;
-}
-
 result
 AlbumListPanel::OnInitializing(void)
 {
@@ -76,38 +57,21 @@ AlbumListPanel::OnInitializing(void)
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
 
-       int width = pForm->GetClientAreaBounds().width;
-       int height = pForm->GetClientAreaBounds().height;
-
-       SetBounds(INIT_VALUE, INIT_VALUE, width, height);
-
-       __pContentTableView = CommonUtil::CreateTableView(width, height);
+       __pPresentationModel = AlbumListPresentationModel::GetInstance();
        __pContentTableView->AddFastScrollListener(*this);
-       __pContentTableView->SetItemProvider(this);
-       __pContentTableView->AddTableViewItemEventListener(*this);
+       __pContextItem = CreateTableViewContextItem();
 
-       __pNoContentImageLabel = new (std::nothrow) Label();
-       __pNoContentImageLabel->Construct(Rectangle((pForm->GetWidth() - W_NO_CONTENT) / 2, Y_GAP_NO_CONTENT, W_NO_CONTENT, H_NO_CONTENT), L"");
-       __pNoContentImageLabel->SetBackgroundBitmap(*(ResourceManager::GetBitmapN(NO_CONTENT_BITMAP)));
-
-       __pNoContentTextLabel = new (std::nothrow) Label();
-       __pNoContentTextLabel->Construct(Rectangle(0,
-                                                               __pNoContentImageLabel->GetHeight() + __pNoContentImageLabel->GetY(),
-                                                               pForm->GetWidth(),
-                                                               H_TEXT_NO_CONTENT),
-                                                               ResourceManager::GetString(L"IDS_COM_BODY_NO_ITEMS"));
-       __pNoContentTextLabel->SetTextConfig(FONT_SIZE_NO_CONTENT, LABEL_TEXT_STYLE_BOLD);
-
-       __pContextItem = new (std::nothrow) TableViewContextItem();
-       __pContextItem->Construct(Dimension(width, ITEM_HEIGHT));
-       CommonUtil::CreateTableViewContextItem(*__pContextItem, *this);
-
-       AddControl(*__pNoContentImageLabel);
-       AddControl(*__pNoContentTextLabel);
-       AddControl(*__pContentTableView);
+       if (__pContextItem == null)
+       {
+               delete __pContextItem;
+               __pContextItem = null;
 
-       __pPresentationModel = AlbumListPresentationModel::GetInstance();
+               AppLogDebug("CommonUtil::CreateContentDeletePopup failed");
+               return E_FAILURE;
+       }
 
+       SetFooterStyle(STYLE_MORE_ADD);
+       SetLayoutFitToForm();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -138,41 +102,86 @@ AlbumListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId
 
        switch (actionId)
        {
-       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
+       case IDA_FLICK_BUTTON_ADD_TO_PALYLIST:
                {
-                       if (__pPresentationModel->GetAllAlbumCount() == 0)
-                       {
-                               MessageBox messageBox;
-                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_BODY_NO_ITEMS"), MSGBOX_STYLE_NONE, 500);
+                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
+                       __pPlayListPickerPopup->Initialize(this, __pPresentationModel->GetContentPathListN(__itemIndex));
+                       __pPlayListPickerPopup->SetShowState(true);
+                       __pPlayListPickerPopup->Show();
+               }
+               break;
 
-                               int modalResult = 0;
-                               messageBox.ShowAndWait(modalResult);
-                               break;
+       case IDA_FLICK_BUTTON_PLAY_ALL:
+               {
+                       ArrayList* pData = new (std::nothrow) ArrayList();
+                       pData->Construct();
+
+                       pData->Add(*(new (std::nothrow) String(MUSIC)));
+                       pData->Add(*(new (std::nothrow) Integer(0)));
+                       pData->Add(*(__pPresentationModel->GetContentPathListN(__itemIndex)));
+
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pData);
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_MORE:
+               {
+                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
+                       if (__pMoreContextMenu != null)
+                       {
+                               delete __pMoreContextMenu;
+                               __pMoreContextMenu = null;
                        }
 
+                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
+                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"), IDA_MORE_CONTEXT_MENU_EDIT);
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"), IDA_MORE_CONTEXT_MENU_SEARCH);
+                       __pMoreContextMenu->AddItem(L"Folder view", IDA_MORE_CONTEXT_MENU_FOLDER_VIEW);//NEED STRING
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_MORE_CONTEXT_MENU_SETTINGS);
+
+                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
+                       __pMoreContextMenu->AddActionEventListener(*this);
+                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
+                       __pMoreContextMenu->SetShowState(true);
+                       __pMoreContextMenu->Show();
+               }
+               break;
+
+       case IDA_MORE_CONTEXT_MENU_EDIT:
+               {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST_EDITOR));
                }
                break;
 
-       case IDA_FOOTER_BUTTON_SEARCH:
+       case IDA_MORE_CONTEXT_MENU_SEARCH:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
                }
                break;
 
-       case IDA_FLICK_BUTTON_ADD_TO_PALYLIST:
+       case IDA_MORE_CONTEXT_MENU_FOLDER_VIEW:
                {
-                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-                       __pPlayListPickerPopup->Initialize(this, __pPresentationModel->GetContentPathListN(__itemIndex));
-                       //__pPlayListPickerPopup->SetCollectedContent(__pPresentationModel->GetContentPathListN(__itemIndex));
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST));
+               }
+               break;
+
+       case IDA_MORE_CONTEXT_MENU_SETTINGS:
+               {
+                       // NEED
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_BACK:
+               {
+                       Tizen::App::Application::GetInstance()->Terminate();
                }
                break;
 
        default:
                break;
-       }//End of Switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -203,39 +212,10 @@ AlbumListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScen
                                                                        Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-       pForm->SetFormBackEventListener(this);
-
-       SceneManager* pSceneManager = SceneManager::GetInstance();
-       AppAssert(pSceneManager);
-
-       Footer* pFooter = CommonUtil::CreateContentListFooter(*pForm);
-       pFooter->AddActionEventListener(*this);
-       pFooter->SetBackButton();
-
-       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
-       {
-               if (__pNowPlayContentPanel == null)
-               {
-                       __pNowPlayContentPanel = new (std::nothrow) NowPlayContentPanel();
-                       __pNowPlayContentPanel->Initialize();
-                       AddControl(*__pNowPlayContentPanel);
-               }
-               CommonUtil::ShowNowPlayPanel(*__pContentTableView, __pNowPlayContentPanel->GetPlayStatus(), pForm->GetClientAreaBounds());
-       }
-
-       if (__pPresentationModel != null && __pContentTableView != null)
-       {
-               __pPresentationModel->UpdateAlbumList();
-
-               __pContentTableView->UpdateTableView();
-
-               int totalAlbumCount = __pPresentationModel->GetAllAlbumCount();
-               CommonUtil::SetButtonEnabled(*pForm, totalAlbumCount, IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST);
-
-               CommonUtil::ShowNoContentImage(totalAlbumCount, *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
-       }
+       GetHeader()->SetItemSelected(2);
+       GetHeader()->Invalidate(true);
+       UpdateContentList();
+       ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
 
        if (pArgs != null)
        {
@@ -284,13 +264,14 @@ AlbumListPanel::CreateItem(const int itemIndex, int itemWidth)
                return null;
        }
 
+       RelativeLayout layout;
+       layout.Construct();
+
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CreateTableViewItem(*pItem, *pContentInfoStruct, __pPresentationModel->GetContentCount(itemIndex));
-
        pItem->SetContextItem(__pContextItem);
 
        delete pContentInfoStruct;
@@ -300,22 +281,6 @@ AlbumListPanel::CreateItem(const int itemIndex, int itemWidth)
        return pItem;
 }
 
-bool
-AlbumListPanel::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return true;
-}
-
-int
-AlbumListPanel::GetDefaultItemHeight(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return ITEM_HEIGHT;
-}
-
 void
 AlbumListPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
@@ -348,15 +313,6 @@ AlbumListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls
 }
 
 void
-AlbumListPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndexFrom,
-                                               int itemIndexTo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void
 AlbumListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index)
 {
        AppLogDebug("ENTER");
@@ -399,7 +355,7 @@ AlbumListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Bas
                        __pContentTableView->ScrollToItem(iCount);
                        break;
                }
-       }//end of for
+       }
        AppLogDebug("EXIT");
 }
 
@@ -411,48 +367,65 @@ AlbumListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       Label* pAlbumThumbnailBGLabel = new (std::nothrow) Label();
-       pAlbumThumbnailBGLabel->Construct(Rectangle(X_GAP_THUMBNAIL - 1, Y_GAP_THUMBNAIL - 1, W_THUMBNAIL + 1, W_THUMBNAIL + 1), L"");
-
-       Label* pSongThumbnailLabel = new (std::nothrow) Label();
-       pSongThumbnailLabel->Construct(Rectangle(X_GAP_THUMBNAIL, Y_GAP_THUMBNAIL, W_THUMBNAIL, H_THUMBNAIL), L"");
-       pSongThumbnailLabel->SetBackgroundBitmap(*GetDefaultThumbnail());
-       pSongThumbnailLabel->SetName(L"pSongThumbnailLabel");
-
-       int X_Gap = W_THUMBNAIL + (X_GAP_THUMBNAIL * 2);
-       int W_Label = W_CLIENT_AREA - X_Gap;
-
-       Label* pAlbumTitleLabel = new (std::nothrow) Label();
-       pAlbumTitleLabel->Construct(Rectangle(X_Gap,Y_GAP_LABEL, W_Label - W_SONG_TIME, (ITEM_HEIGHT - (Y_GAP_LABEL * 2)) / 2), L"");
-       pAlbumTitleLabel->SetTextColor(COLOR_MAIN_TEXT);
-       pAlbumTitleLabel->SetTextConfig(MAIN_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pAlbumTitleLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pAlbumTitleLabel->SetText(contentInfoStruct.AlbumName);
-
-       Label* pAlbumCountLabel = new (std::nothrow) Label();
-       pAlbumCountLabel->Construct(Rectangle(pAlbumTitleLabel->GetWidth() + X_Gap, pAlbumTitleLabel->GetY(), W_SONG_TIME, pAlbumTitleLabel->GetHeight()) , L"");
-       pAlbumCountLabel->SetTextColor(COLOR_SUB_TEXT);
-       pAlbumCountLabel->SetTextConfig(SUB_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pAlbumCountLabel->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
-       pAlbumCountLabel->SetText(CommonUtil::SetSongsString(itemTotalCount));
-
-       Label* pAlbumArtistLabel = new (std::nothrow) Label();
-       pAlbumArtistLabel->Construct(Rectangle(X_Gap, pAlbumCountLabel->GetHeight() + Y_GAP_LABEL, W_Label, pAlbumTitleLabel->GetHeight()), L"");
-       pAlbumArtistLabel->SetTextColor(COLOR_SUB_TEXT);
-       pAlbumArtistLabel->SetTextConfig(SUB_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pAlbumArtistLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pAlbumArtistLabel->SetText(contentInfoStruct.ArtistName);
-
-       parent.AddControl(*pAlbumThumbnailBGLabel);
-       parent.AddControl(*pSongThumbnailLabel);
-       parent.AddControl(*pAlbumTitleLabel);
-       parent.AddControl(*pAlbumCountLabel);
-       parent.AddControl(*pAlbumArtistLabel);
+       Panel* pTableViewItem =  new (std::nothrow) Panel();
+       if (IsFailed(pTableViewItem->Construct(IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_CONTENTS_LIBARY_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return E_FAILURE;
+       }
+
+       Label* pTitleName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME));
+       pTitleName->SetText(contentInfoStruct.TitleName);
+
+       Label* pArtistName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_ARTIST_NAME));
+       pArtistName->SetText(contentInfoStruct.ArtistName);
+
+       Label* pContentCount = static_cast<Label*>(pTableViewItem->GetControl(IDC_PLAY_CONTENT_COUNT));
+       pContentCount->SetText(CommonUtil::SetSongsString(itemTotalCount));
+
+       parent.AddControl(*pTableViewItem);
+       CommonUtil::SetLayoutFitToContainer(parent, *pTableViewItem);
 
        AppLogDebug("EXIT");
        return r;
 }
 
+Tizen::Ui::Controls::TableViewContextItem*
+AlbumListPanel::CreateTableViewContextItem(void)
+{
+       AppLogDebug("ENTER");
+       TableViewContextItem* pContextItem = new (std::nothrow) TableViewContextItem();
+
+       if (IsFailed(pContextItem->Construct(Dimension(GetWidth(), ITEM_HEIGHT))))
+       {
+               AppLogDebug("Construct(Dimension(GetWidth(), ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
+       if (IsFailed(pSweepQuickMenu->Construct(IDL_SWEEP_QUICK_ALBUM_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       Button* pShareButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_PLAY_ALL_BUTTON));
+       pShareButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
+       pShareButton->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
+       pShareButton->AddActionEventListener(*this);
+
+       Button* pAddToPlaylistButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_ADD_TO_BUTTON));
+       pAddToPlaylistButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_BUTTON2_ADD_TO_PLAYLIST"));
+       pAddToPlaylistButton->SetActionId(IDA_FLICK_BUTTON_ADD_TO_PALYLIST);
+       pAddToPlaylistButton->AddActionEventListener(*this);
+
+       pContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
+       pContextItem->AddControl(*pSweepQuickMenu);
+
+       AppLogDebug("EXIT");
+       return pContextItem;
+}
+
 Tizen::Base::Collection::ArrayList*
 AlbumListPanel::GetContentListN(int itemIndex)
 {
@@ -498,9 +471,31 @@ AlbumListPanel::UpdateContentList(void)
                __pPresentationModel->UpdateAlbumList();
                __pContentTableView->UpdateTableView();
        }
+
+       if (__pMoreContextMenu != null && __pMoreContextMenu->GetShowState() == true)
+       {
+               __pMoreContextMenu->SetShowState(false);
+               __pMoreContextMenu->Invalidate(true);
+       }
        AppLogDebug("EXIT");
 }
 
+bool
+AlbumListPanel::IsEmptyContentList(void)
+{
+       AppLogDebug("ENTER");
+       int countAllAlbum = INIT_VALUE;
+       countAllAlbum = __pPresentationModel->GetAllAlbumCount();
+
+       if (countAllAlbum > INIT_VALUE)
+       {
+               AppLogDebug("EXIT");
+               return false;
+       }
+       AppLogDebug("EXIT");
+       return true;
+}
+
 void
 AlbumListPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
@@ -539,7 +534,16 @@ void
 AlbumListPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-       Label* pThumbnailLabel = static_cast<Label*>(pItem->GetControl(L"pSongThumbnailLabel"));
+       Panel* pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL));
+       if (pItemPanel == null)
+       {
+               AppLogDebug("pItemPanel is null");
+               delete __pThumbnail;
+               __pThumbnail = null;
+               return;
+       }
+
+       Label* pThumbnailLabel = static_cast<Label*>(pItemPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
        if (__pThumbnail == null || pThumbnailLabel == null)
        {
                AppLogDebug("__pThumbnail or pThumbnailLabel is null");
index efc9b19..453731b 100644 (file)
@@ -60,18 +60,12 @@ AlbumPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSc
        __pPresentationModel->UpdateAlbumList();
        if (__pPresentationModel != null)
        {
-               CommonUtil::ShowNoContentImage(__pPresentationModel->GetAllAlbumCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
+               // Empty statement
        }
 
        if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
        {
-               if (__pNowPlayContentPanel == null)
-               {
-                       __pNowPlayContentPanel = new (std::nothrow) NowPlayContentPanel();
-                       __pNowPlayContentPanel->Initialize();
-                       AddControl(*__pNowPlayContentPanel);
-               }
-               CommonUtil::ShowNowPlayPanel(*__pContentTableView, __pNowPlayContentPanel->GetPlayStatus(), pForm->GetClientAreaBounds());
+               // Empty statement
        }
 
        if (pArgs != null)
index b2bf5c4..78864b5 100644 (file)
@@ -57,7 +57,6 @@ AllContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -69,7 +68,6 @@ AllContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -129,7 +127,7 @@ AllContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        default:
                break;
-       }//end of switch
+       }
        AppLogDebug("EXIT");
 }
 
index 4ea63cb..3275f1e 100644 (file)
@@ -31,23 +31,18 @@ using namespace Tizen::Base::Collection;
 using namespace Tizen::Content;
 using namespace Tizen::Graphics;
 using namespace Tizen::Social;
+using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int W_SONG_TIME = 160;
-static const int Y_GAP_LABEL = 10;
-
 AllListEditorPanel::AllListEditorPanel(void)
-       : ThumbnailBase::ThumbnailBase()
+       : ContentEditPanel::ContentEditPanel()
+       , ThumbnailBase::ThumbnailBase()
        , __pPlayListPickerPopup(null)
        , __pSharePopup(null)
        , __checkedItemCount(0)
-       , __pContentTableView(null)
-       , __pSelectAllCheckedButton(null)
-       , __pCheckedCountLabel(null)
        , __pThumbnail(null)
-       , __pNoContentImageLabel(null)
-       , __pNoContentTextLabel(null)
+       , __editType(0)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -59,61 +54,12 @@ AllListEditorPanel::~AllListEditorPanel(void)
        AppLogDebug("EXIT");
 }
 
-bool
-AllListEditorPanel::Initialize(void)
-{
-       AppLogDebug("ENTER");
-       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE));
-       if (IsFailed(r))
-       {
-               return false;
-       }
-       AppLogDebug("EXIT");
-       return true;
-}
-
 result
 AllListEditorPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
        __pPresentationModel = AllListPresentationModel::GetInstance();
-
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       int width = pForm->GetClientAreaBounds().width;
-       int height = pForm->GetClientAreaBounds().height;
-
-       SetBounds(0, 0, width, height);
-
-       __pContentTableView = CommonUtil::CreateEditorTableView(width, height);
-       __pContentTableView->SetItemProvider(this);
-       __pContentTableView->AddTableViewItemEventListener(*this);
-
-       __pSelectAllCheckedButton = CommonUtil::CreateSelectAllCheckedButton(width);
-       __pSelectAllCheckedButton->AddActionEventListener(*this);
-
-       __pNoContentImageLabel = new (std::nothrow) Label();
-       __pNoContentImageLabel->Construct(Rectangle((pForm->GetWidth() - W_NO_CONTENT) / 2, Y_GAP_NO_CONTENT, W_NO_CONTENT, H_NO_CONTENT), L"");
-       __pNoContentImageLabel->SetBackgroundBitmap(*(ResourceManager::GetBitmapN(NO_CONTENT_BITMAP)));
-
-       __pNoContentTextLabel = new (std::nothrow) Label();
-       __pNoContentTextLabel->Construct(Rectangle(0,
-                                                               __pNoContentImageLabel->GetHeight() + __pNoContentImageLabel->GetY(),
-                                                               pForm->GetWidth(),
-                                                               H_TEXT_NO_CONTENT),
-                                                               ResourceManager::GetString(L"IDS_MUSIC_HEADER_NO_SONGS"));
-       __pNoContentTextLabel->SetTextConfig(FONT_SIZE_NO_CONTENT, LABEL_TEXT_STYLE_BOLD);
-
-       __pCheckedCountLabel = CommonUtil::CreateCheckedCountLabel(width, height);
-       __pCheckedCountLabel->SetShowState(false);
-
-       AddControl(*__pContentTableView);
-       AddControl(*__pSelectAllCheckedButton);
-       AddControl(*__pNoContentImageLabel);
-       AddControl(*__pNoContentTextLabel);
-       AddControl(*__pCheckedCountLabel);
-
+       SetLayoutFitToForm();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -141,37 +87,34 @@ void
 AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 {
        AppLogDebug("ENTER");
+       Form* pForm = dynamic_cast<Form*>(GetParent());
+       Footer* pFooter = pForm->GetFooter();
        if (__pPresentationModel == null)
        {
                return;
        }
 
-       SceneManager* pSceneManager = SceneManager::GetInstance();
-       AppAssert(pSceneManager);
-
        int totalCount = __pPresentationModel->GetTotalCount();
 
        switch (actionId)
        {
-       case IDA_CHECK_BUTTON:
+       case IDA_HEADER_ALL_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
+                       if (totalCount == __checkedItemCount)
+                       {
+                               __checkedItemCount = INIT_VALUE;
+                               CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
+                               SetCheckedCountBalloonPopup(__checkedItemCount);
+                               SetUnCheckedIconAllCheckButton();
+                               CommonUtil::SetFooterItemEnabled(*pFooter, false);
+                               break;
+                       }
+
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       Form* pForm = dynamic_cast<Form*>(GetParent());
-                       AppAssert(pForm);
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
-               }
-               break;
-
-       case IDA_UNCHECK_BUTTON:
-               {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
-                       __checkedItemCount = INIT_VALUE;
-                       CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                       Form* pForm = dynamic_cast<Form*>(GetParent());
-                       AppAssert(pForm);
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
+                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedIconAllCheckButton();
+                       CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
 
@@ -191,64 +134,61 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
                                        __pContentTableView->RefreshItem(index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
                                }
                        }
-                       __checkedItemCount = INIT_VALUE;
-                       Form* pForm = dynamic_cast<Form*>(GetParent());
-                       AppAssert(pForm);
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
-                       CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
 
                        if (__pPresentationModel->GetTotalCount() != 0)
                        {
-                               __pSelectAllCheckedButton->SetEnabled(true);
+//                             __pSelectAllCheckedButton->SetEnabled(true);
                        }
                        else
                        {
-                               __pSelectAllCheckedButton->SetEnabled(false);
-                               __pSelectAllCheckedButton->SetShowState(false);
-                               //__pSelectAllCheckedButton->SetEnabled(false);
-                               CommonUtil::ShowNoContentImage(INIT_VALUE, *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
+                               SetNoContentSongs(true);
                        }
+                       __checkedItemCount = INIT_VALUE;
+                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetUnCheckedIconAllCheckButton();
+
+                       CommonUtil::SetFooterItemEnabled(*pFooter, false);
                }
                break;
 
-       case IDA_FOOTER_BUTTON_SHARE:
+       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_SHARE");
+                       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)
                                {
-                                       ContentInformation* pContentInfoStruct = __pPresentationModel->GetContentInfoN(iCount);
-                                       if (pContentInfoStruct == null)
-                                       {
-                                               pDataList->RemoveAll(true);
-                                               delete pDataList;
-                                               pDataList = null;
-                                               return;
-                                       }
-                                       pDataList->Add(*(new (std::nothrow) String(pContentInfoStruct->ContentFilePath)));
-
-                                       delete pContentInfoStruct;
-                                       pContentInfoStruct = null;
+                                       pDataList->Add(__pPresentationModel->GetCheckedContent(iCount));
+                                       __pContentTableView->SetItemChecked(iCount, false);
                                }
                        }
 
-                       if (__pSharePopup == null)
-                       {
-                               __pSharePopup = new (std::nothrow) SharePopup();
-                               __pSharePopup->Initialize();
-                       }
-                       __pSharePopup->SetArguments(pDataList);
-                       __pSharePopup->SetShowState(true);
-                       __pSharePopup->Show();
+                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
+                       __pPlayListPickerPopup->Initialize(this, pDataList);
+                       __pPlayListPickerPopup->SetShowState(true);
+                       __pPlayListPickerPopup->Show();
+
+                       __checkedItemCount = INIT_VALUE;
+                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetUnCheckedIconAllCheckButton();
+
+                       CommonUtil::SetFooterItemEnabled(*pFooter, false);
+                       __pContentTableView->Invalidate(true);
                }
                break;
 
-       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
+       case IDA_FOOTER_BUTTON_SHARE:
                {
                        if (__checkedItemCount <= INIT_VALUE)
                        {
@@ -256,57 +196,51 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
                        }
 
                        Tizen::Base::Collection::ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       pDataList->Construct();
+                       int totalCount = __pPresentationModel->GetTotalCount();
 
-                       ContentManager contentManager;
-                       contentManager.Construct();
+                       pDataList->Construct();
 
-                       int totalCount = __pPresentationModel->GetTotalCount();
                        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 String(pContentInfoStruct->ContentFilePath)));
-//
-//                                     delete pContentInfoStruct->pThumbnail;
-//                                     pContentInfoStruct->pThumbnail = null;
-//
-//                                     delete pContentInfoStruct;
-//                                     pContentInfoStruct = null;
+                                       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)));
 
-                                       pDataList->Add(__pPresentationModel->GetCheckedContent(iCount));
+                                       __pContentTableView->SetItemChecked(iCount, false);
+
+                                       delete pContentInfoStruct;
+                                       pContentInfoStruct = null;
                                }
                        }
+                       __checkedItemCount = INIT_VALUE;
+                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetUnCheckedIconAllCheckButton();
 
-                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-                       __pPlayListPickerPopup->Initialize(this, pDataList);
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
-                       //__pPlayListPickerPopup->SetCollectedContent(pDataList);
-               }
-               break;
+                       CommonUtil::SetFooterItemEnabled(*pFooter, false);
+                       __pContentTableView->Invalidate(true);
 
-       case IDA_FOOTER_BUTTON_CANCEL:
-               {
-                       pSceneManager->GoBackward(BackwardSceneTransition());
+                       if (__pSharePopup == null)
+                       {
+                               __pSharePopup = new (std::nothrow) SharePopup();
+                               __pSharePopup->Initialize();
+                       }
+                       __pSharePopup->SetShowState(true);
+                       __pSharePopup->Show();
+                       __pSharePopup->SetArguments(pDataList);
                }
                break;
 
        default:
                break;
-       }//End of switch
-
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-       CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
+       }
        AppLogDebug("EXIT");
 }
 
@@ -317,13 +251,43 @@ AllListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
 {
        AppLogDebug("ENTER");
        Form* pForm = dynamic_cast<Form*>(GetParent());
+       Footer* pFooter = null;
        AppAssert(pForm);
 
-       Footer* pFooter = CommonUtil::CreateDeleteFooter(*pForm);
+       pForm->SetFormBackEventListener(this);
+       if (pArgs != null && (previousSceneId.Equals(IDSCN_ALL_LIST, true)))
+       {
+               __editType = static_cast<Integer*>(pArgs->GetAt(0))->ToInt();
+       }
+       else
+       {
+               // Empty statement
+       }
+       SetEditHeaderStyle();
+
+       if (__editType == IDA_MORE_CONTEXT_MENU_EDIT)
+       {
+               pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_ADDTO_DELETE_ADD);
+       }
+       else
+       {
+               pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_SHARE_ADD);
+       }
        pFooter->AddActionEventListener(*this);
+       pFooter->SetShowState(true);
+       CommonUtil::SetFooterItemEnabled(*pFooter, false);
+
        UpdateContentList();
-       CommonUtil::ShowNoContentImage(__pPresentationModel->GetTotalCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
-       CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount);
+       SetCheckedCountBalloonPopup(INIT_VALUE);
+       if (__pPresentationModel->GetTotalCount() != INIT_VALUE)
+       {
+               SetNoContentSongs(false);
+       }
+       else
+       {
+               SetNoContentSongs(true);
+               SetDisableIconAllCheckButton();
+       }
 
        if (pArgs != null)
        {
@@ -342,17 +306,13 @@ AllListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& current
        AppAssert(pForm);
 
        Footer* pFooter = pForm->GetFooter();
-       pFooter->SetItemEnabled(0, true);
-       pFooter->SetItemEnabled(1, true);
-       pFooter->SetItemEnabled(2, true);
 
        pFooter->RemoveAllButtons();
        pFooter->RemoveAllItems();
        pFooter->RemoveActionEventListener(*this);
 
        __checkedItemCount = INIT_VALUE;
-       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
-       CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
+       SetCheckedCountBalloonPopup(__checkedItemCount);
 
        int totalCount = __pPresentationModel->GetTotalCount();
        for (int iCount = 0; iCount < totalCount; iCount++)
@@ -370,7 +330,6 @@ AllListEditorPanel::GetItemCount(void)
        int musicItem = INIT_VALUE;
        if (__pPresentationModel == null)
        {
-               //AppLogDebug("__pPresentationModel Null");
                return musicItem;
        }
 
@@ -388,10 +347,12 @@ AllListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        {
                return null;
        }
+       RelativeLayout layout;
+       layout.Construct();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CreateTableViewItem(*pItem, *pContentInfoStruct);
@@ -403,26 +364,6 @@ AllListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        return pItem;
 }
 
-bool
-AllListEditorPanel::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
-{
-       AppLogDebug("ENTER");
-
-       delete pItem;
-       pItem = null;
-
-       AppLogDebug("EXIT");
-       return true;
-}
-
-int
-AllListEditorPanel::GetDefaultItemHeight(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return ITEM_HEIGHT;
-}
-
 void
 AllListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
@@ -430,6 +371,11 @@ AllListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView&
                                                        Tizen::Ui::Controls::TableViewItemStatus status)
 {
        AppLogDebug("ENTER");
+       Form* pForm = dynamic_cast<Form*>(GetParent());
+       AppAssert(pForm);
+
+       Footer* pFooter = pForm->GetFooter();
+
        switch (status)
        {
        case TABLE_VIEW_ITEM_STATUS_CHECKED:
@@ -448,101 +394,152 @@ AllListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView&
 
        default:
                break;
-       }//end of switch
+       }
 
-       CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
+       if (__checkedItemCount > INIT_VALUE)
+       {
+               CommonUtil::SetFooterItemEnabled(*pFooter, true);
+       }
+       else
+       {
+               CommonUtil::SetFooterItemEnabled(*pFooter, false);
+       }
 
        if (__checkedItemCount == __pPresentationModel->GetTotalCount())
        {
-               __pSelectAllCheckedButton->SetSelected(true);
+               SetCheckedIconAllCheckButton();
        }
+       else
+       {
+               SetUnCheckedIconAllCheckButton();
+       }
+
+       SetCheckedCountBalloonPopup(__checkedItemCount);
        Invalidate(true);
+       AppLogDebug("EXIT");
+}
+
+result
+AllListEditorPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
+                                                       const ContentInformation& contentInfoStruct)
+{
+       AppLogDebug("ENTER");
+       Panel* pTableViewItem =  new (std::nothrow) Panel();
+       if (IsFailed(pTableViewItem->Construct(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return E_FAILURE;
+       }
+
+       Label* pTitleName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME));
+       pTitleName->SetText(contentInfoStruct.TitleName);
+
+       Label* pArtistName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_ARTIST_NAME));
+       pArtistName->SetText(contentInfoStruct.ArtistName);
+
+       parent.AddControl(*pTableViewItem);
+//     CommonUtil::SetLayoutFitToContainer(parent, *pTableViewItem);
 
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
-       CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount);
        AppLogDebug("EXIT");
+       return E_SUCCESS;
 }
 
 void
-AllListEditorPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                                       int itemIndex,
-                                                                       Tizen::Ui::Controls::TableViewContextItem* pContextItem,
-                                                                       bool activated)
+AllListEditorPanel::OnUpdateContentList(void)
 {
        AppLogDebug("ENTER");
+       UpdateContentList();
        AppLogDebug("EXIT");
 }
 
 void
-AllListEditorPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndexFrom,
-                                                       int itemIndexTo)
+AllListEditorPanel::UpdateContentList(void)
 {
        AppLogDebug("ENTER");
+       if (__pPresentationModel != null && __pContentTableView != null)
+       {
+               __pPresentationModel->UpdateContentList();
+               __pContentTableView->UpdateTableView();
+       }
        AppLogDebug("EXIT");
 }
 
-result
-AllListEditorPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
-                                                       const ContentInformation& contentInfoStruct)
+void
+AllListEditorPanel::SetEditHeaderStyle(void)
 {
        AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-
-       Label* pSongThumbnailLabel = new (std::nothrow) Label();
-       pSongThumbnailLabel->Construct(Rectangle(0, Y_GAP_THUMBNAIL, W_THUMBNAIL, H_THUMBNAIL), L"");
-       pSongThumbnailLabel->SetBackgroundBitmap(*GetDefaultThumbnail());
-       pSongThumbnailLabel->SetName(L"pSongThumbnailLabel");
-
-       int X_Gap = W_THUMBNAIL;
-       int W_Label = W_CLIENT_AREA - X_Gap - W_TABLE_VIEW_MARK;
-
-       Label* pSongTitleLabel = new (std::nothrow) Label();
-       pSongTitleLabel->Construct(Rectangle(X_Gap, Y_GAP_THUMBNAIL, W_Label - W_SONG_TIME, (ITEM_HEIGHT - (Y_GAP_LABEL * 2)) / 2), contentInfoStruct.TitleName);
-       pSongTitleLabel->SetTextColor(COLOR_MAIN_TEXT);
-       pSongTitleLabel->SetTextConfig(MAIN_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pSongTitleLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-
-       Label* pSongTimeLabel = new (std::nothrow) Label();
-       pSongTimeLabel->Construct(Rectangle(pSongTitleLabel->GetWidth() + X_Gap, pSongTitleLabel->GetY(), W_SONG_TIME, pSongTitleLabel->GetHeight()), CommonUtil::GetFormatDate(contentInfoStruct.Duration));
-       pSongTimeLabel->SetTextColor(COLOR_SUB_TEXT);
-       pSongTimeLabel->SetTextConfig(SUB_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pSongTimeLabel->SetTextHorizontalAlignment(ALIGNMENT_RIGHT);
-
-       Label* pSongArtistLabel = new (std::nothrow) Label();
-       pSongArtistLabel->Construct(Rectangle(X_Gap, pSongTimeLabel->GetHeight() + Y_GAP_LABEL, W_Label, pSongTitleLabel->GetHeight()), contentInfoStruct.ArtistName);
-       pSongArtistLabel->SetTextColor(COLOR_SUB_TEXT);
-       pSongArtistLabel->SetTextConfig(SUB_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pSongArtistLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-
-       parent.AddControl(*pSongThumbnailLabel);
-       parent.AddControl(*pSongTitleLabel);
-       parent.AddControl(*pSongTimeLabel);
-       parent.AddControl(*pSongArtistLabel);
+       RemoveParentHeaderActionEventListener();
+       Header* pHeader = GetParentHeader();
+       if(__editType == IDA_MORE_CONTEXT_MENU_EDIT)
+       {
+               String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
+               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       }
+       else
+       {
+               String titleText(L"Share via");//NEED STRING
+               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       }
 
+       pHeader->AddActionEventListener(*this);
+       pHeader->Invalidate(true);
        AppLogDebug("EXIT");
-       return r;
 }
 
 void
-AllListEditorPanel::OnUpdateContentList(void)
+AllListEditorPanel::SetTabHeaderStyle(void)
 {
        AppLogDebug("ENTER");
-       UpdateContentList();
+       Header* pHeader = GetParentHeader();
+       pHeader->RemoveActionEventListener(*this);
+       CommonUtil::SetTabHeaderStyle(*pHeader);
+       AddParentHeaderActionEventListener();
+       pHeader->Invalidate(true);
        AppLogDebug("EXIT");
 }
-
 void
-AllListEditorPanel::UpdateContentList(void)
+AllListEditorPanel::SetDisableIconAllCheckButton(void)
 {
        AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
+       Header* pHeader = GetParentHeader();
+       pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
+       pHeader->Invalidate(true);
+       AppLogDebug("EXIT");
+}
+void
+AllListEditorPanel::SetCheckedIconAllCheckButton(void)
+{
+       AppLogDebug("ENTER");
+       Header* pHeader = GetParentHeader();
+       if(__editType == IDA_MORE_CONTEXT_MENU_EDIT)
        {
-               __pPresentationModel->UpdateContentList();
-               __pContentTableView->UpdateTableView();
+               String titleText(L"EDIT");
+               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, true);
+       }
+       else
+       {
+               String titleText(L"Share via");//NEED STRING
+               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, true);
+       }
+       pHeader->Invalidate(true);
+       AppLogDebug("EXIT");
+}
+void
+AllListEditorPanel::SetUnCheckedIconAllCheckButton(void)
+{
+       AppLogDebug("ENTER");
+       Header* pHeader = GetParentHeader();
+       if(__editType == IDA_MORE_CONTEXT_MENU_EDIT)
+       {
+               String titleText(L"EDIT");
+               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
        }
+       else
+       {
+               String titleText(L"Share via");//NEED STRING
+               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       }
+       pHeader->Invalidate(true);
        AppLogDebug("EXIT");
 }
 
@@ -581,10 +578,31 @@ AllListEditorPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Colle
 }
 
 void
+AllListEditorPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       AppLogDebug("ENTER");
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       SetTabHeaderStyle();
+       pSceneManager->GoBackward(BackwardSceneTransition());
+       AppLogDebug("EXIT");
+}
+
+void
 AllListEditorPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-       Label* pThumbnailLabel = static_cast<Label*>(pItem->GetControl(L"pSongThumbnailLabel"));
+       Panel* pItemPanel =  static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL));
+       if (pItemPanel == null)
+       {
+               AppLogDebug("pItemPanel is null");
+               delete __pThumbnail;
+               __pThumbnail = null;
+               return;
+       }
+
+       Label* pThumbnailLabel = static_cast<Label*>(pItemPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
        if (__pThumbnail == null || pThumbnailLabel == null)
        {
                AppLogDebug("__pThumbnail or pThumbnailLabel is null");
old mode 100755 (executable)
new mode 100644 (file)
index 85b2b23..91804a7
@@ -23,7 +23,7 @@
 #include <FSclAddressbook.h>
 #include "MpAllListPanel.h"
 #include "MpAllListPresentationModel.h"
-#include "MpNowPlayContentPanel.h"
+#include "MpMiniPlayer.h"
 #include "MpPlaylistPickerPopup.h"
 #include "MpSetAsPopup.h"
 #include "MpSharePopup.h"
@@ -35,32 +35,21 @@ using namespace Tizen::Base::Collection;
 using namespace Tizen::Content;
 using namespace Tizen::Graphics;
 using namespace Tizen::Social;
+using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int W_SONG_TIME = 160;
-static const int Y_GAP_LABEL = 10;
-static const int Y_GAP_TABLE_VIEW_CONTENT_ITEM = 25;
-static const int X_GAP_TABLE_VIEW_CONTENT_ITEM = 10;
-static const int H_DELETE_POPUP = 100;
-static const int Y_DELETE_POPUP = 10;
-static const int DELETE_WIDTH_POPUP = 600;
-static const int DELETE_HEIGHT_POPUP = 500;
-
 AllListPanel::AllListPanel(void)
-       : ThumbnailBase::ThumbnailBase()
-       , __pContentTableView(null)
+       : ContentLibaryPanel::ContentLibaryPanel()
+       , ThumbnailBase::ThumbnailBase()
        , __pContextItem(null)
        , __pShareContextMenu(null)
        , __pSetContextMenu(null)
+       , __pMoreContextMenu(null)
        , __pDeletePopup(null)
-       , __pNoContentImageLabel(null)
-       , __pNoContentTextLabel(null)
        , __pThumbnail(null)
-       , __pNowPlayContentPanel(null)
        , __pPlayListPickerPopup(null)
        , __itemIndex(-1)
-       , __scrolledDistance(0)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -72,90 +61,28 @@ AllListPanel::~AllListPanel(void)
        AppLogDebug("EXIT");
 }
 
-bool
-AllListPanel::Initialize(void)
-{
-       AppLogDebug("ENTER");
-       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE));
-       if (IsFailed(r))
-       {
-               return false;
-       }
-       AppLogDebug("EXIT");
-       return true;
-}
-
 result
 AllListPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       int width = pForm->GetClientAreaBounds().width;
-       int height = pForm->GetClientAreaBounds().height;
-       SetBounds(INIT_VALUE, INIT_VALUE, width, height);
-
-       __pContentTableView = CommonUtil::CreateTableView(width, height);
+       __pPresentationModel = AllListPresentationModel::GetInstance();
        __pContentTableView->AddFastScrollListener(*this);
-       __pContentTableView->SetItemProvider(this);
-       __pContentTableView->AddTableViewItemEventListener(*this);
-       __pContentTableView->AddScrollEventListener(*this);
-
-       __pNoContentImageLabel = new (std::nothrow) Label();
-       __pNoContentImageLabel->Construct(Rectangle((pForm->GetWidth() - W_NO_CONTENT) / 2, Y_GAP_NO_CONTENT, W_NO_CONTENT, H_NO_CONTENT), L"");
-       __pNoContentImageLabel->SetBackgroundBitmap(*(ResourceManager::GetBitmapN(NO_CONTENT_BITMAP)));
-
-       __pNoContentTextLabel = new (std::nothrow) Label();
-       __pNoContentTextLabel->Construct(Rectangle(0,
-                                                               __pNoContentImageLabel->GetHeight() + __pNoContentImageLabel->GetY(),
-                                                               pForm->GetWidth(),
-                                                               H_TEXT_NO_CONTENT),
-                                                               ResourceManager::GetString(L"IDS_MUSIC_HEADER_NO_SONGS"));
-       __pNoContentTextLabel->SetTextConfig(FONT_SIZE_NO_CONTENT, LABEL_TEXT_STYLE_BOLD);
-
-       __pContextItem = new (std::nothrow) TableViewContextItem();
-       __pContextItem->Construct(Dimension(width, ITEM_HEIGHT));
-       CreateTableViewContextItem(*__pContextItem);
-
-       AddControl(*__pContentTableView);
-       AddControl(*__pNoContentImageLabel);
-       AddControl(*__pNoContentTextLabel);
-
-       __pDeletePopup = new (std::nothrow) Popup();
-       __pDeletePopup->Construct(true, Dimension(DELETE_WIDTH_POPUP, DELETE_HEIGHT_POPUP));
-
-       Label* pDeleteTitleLabel = new (std::nothrow) Label();
-       pDeleteTitleLabel->Construct(Rectangle(0,
-                                                       0,
-                                                       __pDeletePopup->GetClientAreaBounds().width,
-                                                       __pDeletePopup->GetClientAreaBounds().height - H_DELETE_POPUP),
-                                                       ResourceManager::GetString(L"IDS_MUSIC_POP_DELETE_Q"));
-
-       Button* pPopupDeleteButton = new (std::nothrow) Button();
-       pPopupDeleteButton->Construct(Rectangle(0,
-                                                       pDeleteTitleLabel->GetHeight() - Y_DELETE_POPUP,
-                                                       __pDeletePopup->GetClientAreaBounds().width / 2,
-                                                       H_DELETE_POPUP),
-                                                       ResourceManager::GetString(L"IDS_MUSIC_OPT_DELETE"));
-       pPopupDeleteButton->SetActionId(IDA_DELETE_POPUP_DELETE);
-       pPopupDeleteButton->AddActionEventListener(*this);
-
-       Button* pPopupCancelButton = new (std::nothrow) Button();
-       pPopupCancelButton->Construct(Rectangle(pPopupDeleteButton->GetX() + pPopupDeleteButton->GetWidth(),
-                                                       pPopupDeleteButton->GetY(),
-                                                       pPopupDeleteButton->GetWidth(),
-                                                       pPopupDeleteButton->GetHeight()),
-                                               ResourceManager::GetString(L"IDS_COM_BODY_EDIT_CANCEL"));
-       pPopupCancelButton->SetActionId(IDA_DELETE_POPUP_CANCEL);
-       pPopupCancelButton->AddActionEventListener(*this);
-
-       __pDeletePopup->AddControl(*pDeleteTitleLabel);
-       __pDeletePopup->AddControl(*pPopupDeleteButton);
-       __pDeletePopup->AddControl(*pPopupCancelButton);
 
-       __pPresentationModel = AllListPresentationModel::GetInstance();
+       __pContextItem = CreateTableViewContextItem();
+       __pDeletePopup = CommonUtil::CreateContentDeletePopup(*this, IDA_DELETE_POPUP_DELETE, IDA_DELETE_POPUP_CANCEL);
+       if (__pDeletePopup == null || __pContextItem == null)
+       {
+               delete __pDeletePopup;
+               __pDeletePopup = null;
+
+               delete __pContextItem;
+               __pContextItem = null;
+               AppLogDebug("CommonUtil::CreateContentDeletePopup failed");
+               return E_FAILURE;
+       }
 
+       SetFooterStyle(STYLE_MORE_ADD);
+       SetLayoutFitToForm();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -269,7 +196,7 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
                        }
 
-                       if (source.GetName() == SHARE_BUTTON_NAME)
+                       if (source.GetName() == IDC_SHARE_BUTTON)
                        {
                                if (__pShareContextMenu != null)
                                {
@@ -278,13 +205,15 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                }
                                __pShareContextMenu = new (std::nothrow) ContextMenu();
                                __pShareContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, direction);
+                               //__pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"), IDA_SHARE_CONTEXT_MENU_MESSAGE); NEED
                                __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"), IDA_SHARE_CONTEXT_MENU_EMAIL);
+                               //__pShareContextMenu->AddItem(L"Bluetooth", IDA_SHARE_CONTEXT_MENU_BLUETOOTH);//NEED STRING NEED
                                __pShareContextMenu->AddActionEventListener(*this);
                                __pShareContextMenu->SetAnchorPosition(itemPoint);
                                __pShareContextMenu->SetShowState(true);
                                __pShareContextMenu->Show();
                        }
-                       else if (source.GetName() == SET_BUTTON_NAME)
+                       else if (source.GetName() == IDC_SET_AS_BUTTON)
                        {
                                if (__pSetContextMenu != null)
                                {
@@ -293,8 +222,9 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                }
                                __pSetContextMenu = new (std::nothrow) ContextMenu();
                                __pSetContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, direction);
-                               __pSetContextMenu->AddItem(ResourceManager::GetString(L"IDS_MUSIC_OPT_CALL_RINGTONE"), IDA_SET_CONTEXT_MENU_CALL);
-                               __pSetContextMenu->AddItem(ResourceManager::GetString(L"IDS_MUSIC_OPT_SETAS_CALLER_RINGTONE"), IDA_SET_CONTEXT_MENU_CALLER);
+                               __pSetContextMenu->AddItem(L"Phone ringtone", IDA_SET_CONTEXT_MENU_CALL);//NEED STRING
+                               __pSetContextMenu->AddItem(L"Caller ringtone", IDA_SET_CONTEXT_MENU_CALLER);
+                               //__pSetContextMenu->AddItem(ResourceManager::GetString(L"IDS_MUSIC_OPT_SETAS_ALARM_TONE"), IDA_SET_CONTEXT_MENU_ALARM); NEED
                                __pSetContextMenu->AddActionEventListener(*this);
                                __pSetContextMenu->SetAnchorPosition(itemPoint);
                                __pSetContextMenu->SetShowState(true);
@@ -307,24 +237,12 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                // fall through         
        case IDA_DELETE_POPUP_CANCEL:
                {
-                       Form* pForm = dynamic_cast<Form*>(GetParent());
-                       AppAssert(pForm);
-
-                       Footer* pFooter = pForm->GetFooter();
-
                        __pDeletePopup->SetShowState(false);
                        __pDeletePopup->Show();
 
                        if (actionId == IDA_DELETE_POPUP_DELETE)
                        {
                                __pPresentationModel->RemoveContent(__itemIndex);
-
-                               if (__pPresentationModel->GetTotalCount() <= INIT_VALUE)
-                               {
-                                       CommonUtil::ShowNoContentImage(INIT_VALUE, *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
-                                       pFooter->SetItemEnabled(INDEX_EDITCONTENTLIST_FOOTER_EDIT, false);
-                                       pFooter->Invalidate(true);
-                               }
                                __pContentTableView->RefreshItem(__itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
                        }
                }
@@ -332,7 +250,6 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        case IDA_SHARE_CONTEXT_MENU_EMAIL:
                // fall through         
-       /* blocked this code (TDIS-1672 */
        case IDA_SHARE_CONTEXT_MENU_MESSAGE:
                {
                        String providerID = ((actionId == IDA_SHARE_CONTEXT_MENU_EMAIL) ? PROVIDER_ID_EMAIL : PROVIDER_ID_MESSAGE);
@@ -361,7 +278,6 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        pAppControl = null;
                }
                break;
-       /* blocked this code (TDIS-1672 */
 
        case IDA_SET_CONTEXT_MENU_CALL:
                {
@@ -414,7 +330,6 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                        __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
                        __pPlayListPickerPopup->Initialize(this, pData);
-                       //__pPlayListPickerPopup->SetCollectedContent(pData);
                        __pPlayListPickerPopup->SetShowState(true);
                        __pPlayListPickerPopup->Show();
 
@@ -433,7 +348,9 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_FOOTER_BUTTON_EDIT:
+       case IDA_MORE_CONTEXT_MENU_EDIT:
+               // fall through
+       case IDA_MORE_CONTEXT_MENU_SHARE_VIA:
                {
                        if (__pPresentationModel->GetTotalCount() == 0)
                        {
@@ -444,20 +361,58 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                messageBox.ShowAndWait(modalResult);
                                break;
                        }
-
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST_EDITOR));
+                       ArrayList* pData = new (std::nothrow) ArrayList();
+                       pData->Construct();
+                       pData->Add(*(new (std::nothrow) Integer(actionId)));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST_EDITOR),pData);
                }
                break;
 
-       case IDA_FOOTER_BUTTON_SEARCH:
+       case IDA_MORE_CONTEXT_MENU_SEARCH:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
                }
                break;
 
+       case IDA_FOOTER_BUTTON_MORE:
+               {
+                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
+                       if (__pMoreContextMenu != null)
+                       {
+                               delete __pMoreContextMenu;
+                               __pMoreContextMenu = null;
+                       }
+
+                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
+                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"), IDA_MORE_CONTEXT_MENU_SEARCH);
+                       __pMoreContextMenu->AddItem(L"Share via", IDA_MORE_CONTEXT_MENU_SHARE_VIA);//NEED STRING
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"), IDA_MORE_CONTEXT_MENU_EDIT);
+                       __pMoreContextMenu->AddItem(L"Folder view", IDA_MORE_CONTEXT_MENU_FOLDER_VIEW);//NEED STRING
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_MORE_CONTEXT_MENU_SETTINGS);
+                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
+                       __pMoreContextMenu->AddActionEventListener(*this);
+                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
+                       __pMoreContextMenu->SetShowState(true);
+                       __pMoreContextMenu->Show();
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_BACK:
+               {
+                       Tizen::App::Application::GetInstance()->Terminate();
+               }
+               break;
+
+       case IDA_MORE_CONTEXT_MENU_FOLDER_VIEW:
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST));
+               }
+               break;
+
        default:
                break;
-       }//end of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -483,49 +438,10 @@ AllListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneI
                                                                Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       pForm->SetFormBackEventListener(this);
-
-       Footer* pFooter = CommonUtil::CreateEditContentListFooter(*pForm);
-       pFooter->AddActionEventListener(*this);
-       pFooter->SetBackButton();
-
-       int width = pForm->GetClientAreaBounds().width;
-       int height = pForm->GetClientAreaBounds().height;
-
-       SetBounds(0, 0, width, height);
-       __pContentTableView->SetBounds(0, 0, width, height);
-
-       SceneManager* pSceneManager = SceneManager::GetInstance();
-       AppAssert(pSceneManager);
-       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
-       {
-               if (__pNowPlayContentPanel == null)
-               {
-                       __pNowPlayContentPanel = new (std::nothrow) NowPlayContentPanel();
-                       __pNowPlayContentPanel->Initialize();
-                       AddControl(*__pNowPlayContentPanel);
-               }
-               CommonUtil::ShowNowPlayPanel(*__pContentTableView, __pNowPlayContentPanel->GetPlayStatus(), pForm->GetClientAreaBounds());
-       }
-
+       GetHeader()->SetItemSelected(0);
+       GetHeader()->Invalidate(true);
        UpdateContentList();
-
-       if (__pPresentationModel != null)
-       {
-               int totalCount = __pPresentationModel->GetTotalCount();
-               CommonUtil::SetButtonEnabled(*pForm, totalCount);
-
-               CommonUtil::ShowNoContentImage(__pPresentationModel->GetTotalCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
-       }
-
-       if (pArgs != null)
-       {
-               pArgs->RemoveAll(true);
-               delete pArgs;
-       }
+       ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
        AppLogDebug("EXIT");
 }
 
@@ -534,15 +450,8 @@ AllListPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneI
                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       Footer* pFooter = pForm->GetFooter();
-       pFooter->RemoveAllButtons();
-       pFooter->RemoveAllItems();
-       pFooter->RemoveActionEventListener(*this);
-
        CancelAllThumbnailRequest();
+       ContentLibaryPanel::OnSceneDeactivated(currentSceneId, nextSceneId);
        AppLogDebug("EXIT");
 }
 
@@ -552,7 +461,6 @@ AllListPanel::GetItemCount(void)
        AppLogDebug("ENTER");
        if (__pPresentationModel == null)
        {
-               //AppLogDebug("__pPresentationModel Null");
                return INIT_VALUE;
        }
        AppLogDebug("EXIT");
@@ -569,14 +477,16 @@ AllListPanel::CreateItem(const int itemIndex, int itemWidth)
                return null;
        }
 
+       RelativeLayout layout;
+       layout.Construct();
+
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CreateTableViewItem(*pItem, *pContentInfoStruct);
-       pItem->SetContextItem(__pContextItem);
 
+       pItem->SetContextItem(__pContextItem);
        delete pContentInfoStruct;
        pContentInfoStruct = null;
 
@@ -584,25 +494,25 @@ AllListPanel::CreateItem(const int itemIndex, int itemWidth)
        return pItem;
 }
 
-bool
-AllListPanel::DeleteItem(const int itemIndex, TableViewItem* pItem)
-{
-       AppLogDebug("ENTER");
-
-       delete pItem;
-       pItem = null;
-
-       AppLogDebug("EXIT");
-       return true;
-}
-
-int
-AllListPanel::GetDefaultItemHeight(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return ITEM_HEIGHT;
-}
+//bool
+//AllListPanel::DeleteItem(const int itemIndex, TableViewItem* pItem)
+//{
+//     AppLogDebug("ENTER");
+//
+//     delete pItem;
+//     pItem = null;
+//
+//     AppLogDebug("EXIT");
+//     return true;
+//}
+
+//int
+//AllListPanel::GetDefaultItemHeight(void)
+//{
+//     AppLogDebug("ENTER");
+//     AppLogDebug("EXIT");
+//     return ITEM_HEIGHT;
+//}
 
 void
 AllListPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
@@ -635,14 +545,14 @@ AllListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::
        AppLogDebug("EXIT");
 }
 
-void
-AllListPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndexFrom,
-                                               int itemIndexTo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
+//void
+//AllListPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
+//                                             int itemIndexFrom,
+//                                             int itemIndexTo)
+//{
+//     AppLogDebug("ENTER");
+//     AppLogDebug("EXIT");
+//}
 
 void
 AllListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index)
@@ -687,66 +597,53 @@ AllListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base:
                        __pContentTableView->ScrollToItem(iCount);
                        break;
                }
-       }//end of for
+       }
        AppLogDebug("EXIT");
 }
 
-result
-AllListPanel::CreateTableViewContextItem(Tizen::Ui::Controls::TableViewContextItem& parent)
+Tizen::Ui::Controls::TableViewContextItem*
+AllListPanel::CreateTableViewContextItem(void)
 {
        AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-
-       AppResource* pAppResource = Application::GetInstance()->GetAppResource();
-       AppAssert(pAppResource);
-
-       String buttonName = null;
+       TableViewContextItem* pContextItem = new (std::nothrow) TableViewContextItem();
+       if (IsFailed(pContextItem->Construct(Dimension(GetWidth(), ITEM_HEIGHT))))
+       {
+               AppLogDebug("Construct(Dimension(GetWidth(), ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
 
-       int ButtonWidth = (parent.GetWidth() - X_GAP_TABLE_VIEW_CONTENT_ITEM ) / 4;
-       int ButtonHeight = parent.GetHeight() - (Y_GAP_TABLE_VIEW_CONTENT_ITEM * 2);
+       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
+       if (IsFailed(pSweepQuickMenu->Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
 
-       Button* pShareButton = new (std::nothrow) Button();
-       pShareButton->Construct(Rectangle(X_GAP_TABLE_VIEW_CONTENT_ITEM, Y_GAP_TABLE_VIEW_CONTENT_ITEM, ButtonWidth, ButtonHeight));
+       Button* pShareButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_SHARE_BUTTON));
        pShareButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_BUTTON_SHARE"));
-       pShareButton->SetName(SHARE_BUTTON_NAME);
-       pShareButton->SetTextSize(FONT_SIZE);
        pShareButton->SetActionId(IDA_FLICK_BUTTON_SHARE);
        pShareButton->AddActionEventListener(*this);
 
-       Button* pSetButton = new (std::nothrow) Button();
-       pSetButton->Construct(Rectangle(pShareButton->GetBounds().x + ButtonWidth, Y_GAP_TABLE_VIEW_CONTENT_ITEM, ButtonWidth, ButtonHeight));
-       pSetButton->SetText(ResourceManager::GetString(L"IDS_COM_SK_SET"));
-       pSetButton->SetName(SET_BUTTON_NAME);
-       pSetButton->SetTextSize(FONT_SIZE);
+       Button* pSetButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_SET_AS_BUTTON));
+       pSetButton->SetText(ResourceManager::GetString(L"IDS_COM_SK_SET_AS"));
        pSetButton->SetActionId(IDA_FLICK_BUTTON_SET);
        pSetButton->AddActionEventListener(*this);
 
-       Button* pAddToPlaylistButton = new (std::nothrow) Button();
-       pAddToPlaylistButton->Construct(Rectangle(pSetButton->GetBounds().x + ButtonWidth, Y_GAP_TABLE_VIEW_CONTENT_ITEM, ButtonWidth, ButtonHeight));
-       pAddToPlaylistButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_BUTTON2_ADD_TO_PLAYLIST"));
-       pAddToPlaylistButton->SetTextSize(FONT_SIZE);
+       Button* pAddToPlaylistButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_ADD_TO_BUTTON));
+       pAddToPlaylistButton->SetText(L"Add to"); //NEED STRING
        pAddToPlaylistButton->SetActionId(IDA_FLICK_BUTTON_ADD_TO_PALYLIST);
        pAddToPlaylistButton->AddActionEventListener(*this);
 
-       Button* pDeleteButton = new (std::nothrow) Button();
-       pDeleteButton->Construct(Rectangle(pAddToPlaylistButton->GetBounds().x + ButtonWidth, Y_GAP_TABLE_VIEW_CONTENT_ITEM, ButtonWidth, ButtonHeight));
+       Button* pDeleteButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_BUTTON_DELETE));
        pDeleteButton->SetText(ResourceManager::GetString("IDS_MUSIC_SK3_DELETE"));
-       pDeleteButton->SetTextSize(FONT_SIZE);
        pDeleteButton->SetActionId(IDA_FLICK_BUTTON_DELETE);
        pDeleteButton->AddActionEventListener(*this);
 
-       parent.SetIndividualSelectionEnabled(pShareButton, true);
-       parent.SetIndividualSelectionEnabled(pSetButton, true);
-       parent.SetIndividualSelectionEnabled(pAddToPlaylistButton, true);
-       parent.SetIndividualSelectionEnabled(pDeleteButton, true);
-
-       parent.AddControl(*pShareButton);
-       parent.AddControl(*pSetButton);
-       parent.AddControl(*pAddToPlaylistButton);
-       parent.AddControl(*pDeleteButton);
+       pContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
+       pContextItem->AddControl(*pSweepQuickMenu);
 
        AppLogDebug("EXIT");
-       return r;
+       return pContextItem;
 }
 
 Tizen::Base::Collection::ArrayList*
@@ -782,78 +679,50 @@ AllListPanel::UpdateContentList(void)
                        __pSetContextMenu->SetShowState(false);
                        __pSetContextMenu->Invalidate(true);
                }
+               if (__pMoreContextMenu != null && __pMoreContextMenu->GetShowState() == true)
+               {
+                       __pMoreContextMenu->SetShowState(false);
+                       __pMoreContextMenu->Invalidate(true);
+               }
        }
        AppLogDebug("EXIT");
 }
 
-result
-AllListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
-                                               const ContentInformation& contentInfoStruct)
+bool
+AllListPanel::IsEmptyContentList(void)
 {
        AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       Label* pSongThumbnailBGLabel = new (std::nothrow) Label();
-       pSongThumbnailBGLabel->Construct(Rectangle(X_GAP_THUMBNAIL - 1, Y_GAP_THUMBNAIL - 1, W_THUMBNAIL + 1, W_THUMBNAIL + 1), L"");
-
-       Label* pSongThumbnailLabel = new (std::nothrow) Label();
-       pSongThumbnailLabel->Construct(Rectangle(X_GAP_THUMBNAIL, Y_GAP_THUMBNAIL, W_THUMBNAIL, H_THUMBNAIL), L"");
-       pSongThumbnailLabel->SetBackgroundBitmap(*GetDefaultThumbnail());
-       pSongThumbnailLabel->SetName(L"pSongThumbnailLabel");
-
-       int X_Gap = W_THUMBNAIL + (X_GAP_THUMBNAIL * 2);
-       int W_Label = W_CLIENT_AREA - X_Gap;
-
-       Label* pSongTitleLabel = new (std::nothrow) Label();
-       pSongTitleLabel->Construct(Rectangle(X_Gap,Y_GAP_LABEL, W_Label - W_SONG_TIME, (ITEM_HEIGHT - (Y_GAP_LABEL * 2)) / 2), L"");
-       pSongTitleLabel->SetTextColor(COLOR_MAIN_TEXT);
-       pSongTitleLabel->SetTextConfig(MAIN_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pSongTitleLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pSongTitleLabel->SetText(contentInfoStruct.TitleName);
-
-       Label* pSongTimeLabel = new (std::nothrow) Label();
-       pSongTimeLabel->Construct(Rectangle(pSongTitleLabel->GetWidth() + X_Gap, pSongTitleLabel->GetY(), W_SONG_TIME, pSongTitleLabel->GetHeight()) , L"");
-       pSongTimeLabel->SetTextColor(COLOR_SUB_TEXT);
-       pSongTimeLabel->SetTextConfig(SUB_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pSongTimeLabel->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
-       pSongTimeLabel->SetText(CommonUtil::GetFormatDate(contentInfoStruct.Duration));
-
-       Label* pSongArtistLabel = new (std::nothrow) Label();
-       pSongArtistLabel->Construct(Rectangle(X_Gap, pSongTimeLabel->GetHeight() + Y_GAP_LABEL, W_Label, pSongTitleLabel->GetHeight()), L"");
-       pSongArtistLabel->SetTextColor(COLOR_SUB_TEXT);
-       pSongArtistLabel->SetTextConfig(SUB_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pSongArtistLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pSongArtistLabel->SetText(contentInfoStruct.ArtistName);
-
-       parent.AddControl(*pSongThumbnailBGLabel);
-       parent.AddControl(*pSongThumbnailLabel);
-       parent.AddControl(*pSongTitleLabel);
-       parent.AddControl(*pSongTimeLabel);
-       parent.AddControl(*pSongArtistLabel);
-
+       if (__pPresentationModel == null || __pPresentationModel->GetTotalCount() == INIT_VALUE)
+       {
+               AppLogDebug("EXIT");
+               return true;
+       }
        AppLogDebug("EXIT");
-       return r;
+       return false;
 }
 
-void
-AllListPanel::OnScrollEndReached (Tizen::Ui::Control& source, Tizen::Ui::Controls::ScrollEndEvent type)
+result
+AllListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
+                                               const ContentInformation& contentInfoStruct)
 {
        AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
+       Panel* pTableViewItem =  new (std::nothrow) Panel();
+       if (IsFailed(pTableViewItem->Construct(IDL_CONTENTS_LIBARY_ITEM_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_CONTENTS_LIBARY_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return E_FAILURE;
+       }
 
-void
-AllListPanel::OnScrollPositionChanged (Tizen::Ui::Control& source, int scrollPos)
-{
-       AppLogDebug("ENTER");
-       __scrolledDistance = scrollPos;
-       AppLogDebug("EXIT");
-}
+       Label* pTitleName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME));
+       pTitleName->SetText(contentInfoStruct.TitleName);
+       Label* pArtistName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_ARTIST_NAME));
+       pArtistName->SetText(contentInfoStruct.ArtistName);
+
+       parent.AddControl(*pTableViewItem);
+       CommonUtil::SetLayoutFitToContainer(parent, *pTableViewItem);
 
-void
-AllListPanel::OnScrollStopped (Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
        AppLogDebug("EXIT");
+       return E_SUCCESS;
 }
 
 void
@@ -894,7 +763,16 @@ void
 AllListPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-       Label* pThumbnailLabel = static_cast<Label*>(pItem->GetControl(L"pSongThumbnailLabel"));
+       Panel* pItemPanel =  static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_LIBARY_ITEM_PANEL));
+       if (pItemPanel == null)
+       {
+               AppLogDebug("pItemPanel is null");
+               delete __pThumbnail;
+               __pThumbnail = null;
+               return;
+       }
+
+       Label* pThumbnailLabel = static_cast<Label*>(pItemPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
        if (__pThumbnail == null || pThumbnailLabel == null)
        {
                AppLogDebug("__pThumbnail or pThumbnailLabel is null");
index 7450b0b..a0164c9 100644 (file)
@@ -149,7 +149,7 @@ ArtistAlbumListEditorForm::OnActionPerformed(const Tizen::Ui::Control& source, i
                                if (__pContentTableView->IsItemChecked(iCount) == true)
                                {
                                        pDataList->AddItems(*(__pPresentationModel->GetContentPathListN(iCount, SEARCH_MODE_ARTIST_ALBUM)));
-                                       __pContentTableView->SetItemChecked(iCount,false);
+                                       __pContentTableView->SetItemChecked(iCount, false);
                                }
                        }
                        __checkedItemCount = INIT_VALUE;
@@ -174,7 +174,7 @@ ArtistAlbumListEditorForm::OnActionPerformed(const Tizen::Ui::Control& source, i
 
        default:
                break;
-       }//end of switch
+       }
 
        AppLogDebug("EXIT");
 }
@@ -258,7 +258,7 @@ ArtistAlbumListEditorForm::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateEditListTableViewItem(*pItem, *(GetDefaultThumbnail()), pContentInfoStruct->AlbumName, __pPresentationModel->GetArtistAlbumContentCount(itemIndex));
index 436570e..a3a668c 100644 (file)
@@ -65,7 +65,6 @@ ArtistAlbumListForm::Initialize(void)
        result r = Form::Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
        if (IsFailed(r))
        {
-               //AppLogDebug("Unable to construct ContentForm");
                return false;
        }
 
@@ -160,7 +159,7 @@ ArtistAlbumListForm::OnActionPerformed(const Tizen::Ui::Control& source, int act
 
        default:
                break;
-       }//end of switch
+       }
 
        AppLogDebug("EXIT");
 }
@@ -285,7 +284,7 @@ ArtistAlbumListForm::CreateItem(const int itemIndex, int itemWidth)
        AppLogDebug("ENTER");
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        if (itemIndex == INIT_VALUE)
        {
@@ -355,7 +354,6 @@ ArtistAlbumListForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView&
        {
                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ARTIST_CONTENT_LIST), GetContentListN(itemIndex));
        }
-
        AppLogDebug("EXIT");
 }
 
@@ -366,12 +364,10 @@ ArtistAlbumListForm::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Con
                                                                                bool activated)
 {
        AppLogDebug("ENTER");
-
        if (activated == true)
        {
                __itemIndex = itemIndex;
        }
-
        AppLogDebug("EXIT");
 }
 
index c76b73c..7e69933 100644 (file)
@@ -60,7 +60,6 @@ ArtistAllSongListForm::Initialize(void)
        result r = Form::Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
        if (IsFailed(r))
        {
-               //AppLogDebug("Unable to construct ContentForm");
                return false;
        }
 
@@ -105,7 +104,6 @@ void
 ArtistAllSongListForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 {
        AppLogDebug("ENTER");
-
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
@@ -138,8 +136,7 @@ ArtistAllSongListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        default:
                break;
-       }//end of switch
-
+       }
        AppLogDebug("EXIT");
 }
 
@@ -147,12 +144,10 @@ void
 ArtistAllSongListForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
        AppLogDebug("ENTER");
-
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
        pSceneManager->GoBackward(BackwardSceneTransition());
-
        AppLogDebug("EXIT");
 }
 
@@ -162,7 +157,6 @@ ArtistAllSongListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
                                                Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-
        Footer* pFooter = CommonUtil::CreateAddtoPlaylistFooter(*this);
        pFooter->AddActionEventListener(*this);
        pFooter->SetBackButton();
@@ -172,7 +166,6 @@ ArtistAllSongListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        Header* pHeader = GetHeader();
        pHeader->SetStyle(HEADER_STYLE_TITLE);
        pHeader->SetTitleText(ResourceManager::GetString("IDS_MUSIC_BODY_ALL_SONGS"));
-
        AppLogDebug("EXIT");
 }
 
@@ -181,7 +174,6 @@ ArtistAllSongListForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
                                                const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
-
        Header* pHeader = GetHeader();
        pHeader->RemoveAllButtons();
        pHeader->RemoveAllItems();
@@ -199,7 +191,6 @@ int
 ArtistAllSongListForm::GetItemCount(void)
 {
        AppLogDebug("ENTER");
-
        if (__pPresentationModel == null)
        {
                return INIT_VALUE;
@@ -213,7 +204,6 @@ Tizen::Ui::Controls::TableViewItem*
 ArtistAllSongListForm::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-
        ContentInformation* pContentInfoStruct = __pPresentationModel->GetArtistContentInfoN(itemIndex);
        if (pContentInfoStruct == null)
        {
@@ -222,7 +212,7 @@ ArtistAllSongListForm::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CreateTableViewItem(*pItem, *pContentInfoStruct);
@@ -257,7 +247,6 @@ ArtistAllSongListForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
                                                                Tizen::Ui::Controls::TableViewItemStatus status)
 {
        AppLogDebug("ENTER");
-
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
@@ -296,7 +285,6 @@ ArtistAllSongListForm::CreateTableViewItem(Tizen::Ui::Container& parent,
                                                                           const ContentInformation& contentInfoStruct)
 {
        AppLogDebug("ENTER");
-
        result r = E_SUCCESS;
 
        Label* pSongThumbnailBGLabel = new (std::nothrow) Label();
index 7547e66..0920843 100644 (file)
@@ -228,7 +228,7 @@ ArtistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
                        {
                                if (__pContentTableView->IsItemChecked(iCount) == true)
                                {
-                                       __pContentTableView->SetItemChecked(iCount,false);
+                                       __pContentTableView->SetItemChecked(iCount, false);
                                        ContentInformation* pContentInfoStruct = __pPresentationModel->GetArtistAlbumContentInfoN(iCount);
                                        contentManager.DeleteContent(pContentInfoStruct->contentId);
 
@@ -390,7 +390,7 @@ ArtistContentListForm::CreateItem(const int itemIndex, int itemWidth)
        {
                pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
        }
-       pItem->SetBackgroundColor(COLOR_WHITE);
+//     pItem->SetBackgroundColor(COLOR_WHITE);
        pContentInfoStruct = __pPresentationModel->GetArtistAlbumContentInfoN(itemIndex);
        if (pContentInfoStruct == null)
        {
@@ -404,6 +404,7 @@ ArtistContentListForm::CreateItem(const int itemIndex, int itemWidth)
        delete pContentInfoStruct;
        pContentInfoStruct = null;
 
+       AppLogDebug("EXIT");
        return pItem;
 }
 
@@ -465,7 +466,7 @@ ArtistContentListForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
                        ArrayList* tempArg;
                        AppAssert(pSceneManager);
                        tempArg = MakePlayerSceneParam(itemIndex);
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER),tempArg);
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), tempArg);
 
                        if (tempArg != null)
                        {
index 68a41da..cf275bd 100644 (file)
@@ -112,7 +112,6 @@ ArtistContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, in
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -124,7 +123,6 @@ ArtistContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, in
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -174,14 +172,13 @@ ArtistContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, in
                        Form* pForm = dynamic_cast<Form*>(GetParent());
                        AppAssert(pForm);
                        CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        pSceneManager->GoBackward(BackwardSceneTransition());
                }
                break;
 
        default:
                break;
-       }//End of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -251,7 +248,7 @@ ArtistContentPickerPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        CommonUtil::CreateContentPikerTableViewItem(*pItem, pContentInfoStruct->TitleName, CommonUtil::GetFormatDate(pContentInfoStruct->Duration));
 
@@ -310,7 +307,7 @@ ArtistContentPickerPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::Table
 
        default:
                break;
-       }//end of switch
+       }
 
        CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
 
index e9ed5c0..2284268 100644 (file)
@@ -54,7 +54,7 @@ bool
 ArtistListEditorPanel::Initialize(void)
 {
        AppLogDebug("ENTER");
-       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE)); // Should be set proper area at OnInitializing().
+       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE));
        if (IsFailed(r))
        {
                return false;
@@ -115,7 +115,6 @@ ArtistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -126,7 +125,6 @@ ArtistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -164,14 +162,13 @@ ArtistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_FOOTER_BUTTON_CANCEL:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        pSceneManager->GoBackward(BackwardSceneTransition());
                }
                break;
 
        default:
                break;
-       }//End of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
@@ -254,7 +251,7 @@ ArtistListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateEditListTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->ArtistName, __pPresentationModel->GetArtistContentCount(itemIndex));
@@ -307,7 +304,7 @@ ArtistListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
 
        default:
                break;
-       }//end of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
index cbaa0ad..b46747b 100644 (file)
@@ -20,7 +20,6 @@
  */
 
 #include "MpArtistListPanel.h"
-#include "MpNowPlayContentPanel.h"
 #include "MpPlaylistPickerPopup.h"
 #include "MpThumbnailInfo.h"
 
@@ -29,19 +28,17 @@ using namespace Tizen::Base::Collection;
 using namespace Tizen::Content;
 using namespace Tizen::Graphics;
 using namespace Tizen::Social;
+using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
 ArtistListPanel::ArtistListPanel(void)
        : ThumbnailBase::ThumbnailBase()
        , __itemIndex(-1)
-       , __pNowPlayContentPanel(null)
        , __pPlayListPickerPopup(null)
        , __pContextItem(null)
-       , __pContentTableView(null)
-       , __pNoContentImageLabel(null)
-       , __pNoContentTextLabel(null)
        , __pThumbnail(null)
+       , __pMoreContextMenu(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -53,19 +50,6 @@ ArtistListPanel::~ArtistListPanel(void)
        AppLogDebug("EXIT");
 }
 
-bool
-ArtistListPanel::Initialize(void)
-{
-       AppLogDebug("ENTER");
-       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE)); // Should be set proper area at OnInitializing().
-       if (IsFailed(r))
-       {
-               return false;
-       }
-       AppLogDebug("EXIT");
-       return true;
-}
-
 result
 ArtistListPanel::OnInitializing(void)
 {
@@ -73,39 +57,21 @@ ArtistListPanel::OnInitializing(void)
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
 
-       int width = pForm->GetClientAreaBounds().width;
-       int height = pForm->GetClientAreaBounds().height;
-
-       SetBounds(INIT_VALUE, INIT_VALUE, width, height);
-
-       //TableView Init
-       __pContentTableView = CommonUtil::CreateTableView(width, height);
+       __pPresentationModel = ArtistListPresentationModel::GetInstance();
        __pContentTableView->AddFastScrollListener(*this);
-       __pContentTableView->SetItemProvider(this);
-       __pContentTableView->AddTableViewItemEventListener(*this);
-
-       __pNoContentImageLabel = new (std::nothrow) Label();
-       __pNoContentImageLabel->Construct(Rectangle((pForm->GetWidth() - W_NO_CONTENT) / 2, Y_GAP_NO_CONTENT, W_NO_CONTENT, H_NO_CONTENT), L"");
-       __pNoContentImageLabel->SetBackgroundBitmap(*(ResourceManager::GetBitmapN(NO_CONTENT_BITMAP)));
+       __pContextItem = CreateTableViewContextItem();
 
-       __pNoContentTextLabel = new (std::nothrow) Label();
-       __pNoContentTextLabel->Construct(Rectangle(0,
-                                                                                       __pNoContentImageLabel->GetHeight() + __pNoContentImageLabel->GetY(),
-                                                                                       pForm->GetWidth(),
-                                                                                       H_TEXT_NO_CONTENT),
-                                                                                       ResourceManager::GetString(L"IDS_COM_BODY_NO_ITEMS"));
-       __pNoContentTextLabel->SetTextConfig(FONT_SIZE_NO_CONTENT, LABEL_TEXT_STYLE_BOLD);
-
-       __pContextItem = new (std::nothrow) TableViewContextItem();
-       __pContextItem->Construct(Dimension(width, ITEM_HEIGHT));
-       CommonUtil::CreateTableViewContextItem(*__pContextItem, *this);
-
-       AddControl(*__pNoContentImageLabel);
-       AddControl(*__pNoContentTextLabel);
-       AddControl(*__pContentTableView);
+       if (__pContextItem == null)
+       {
+               delete __pContextItem;
+               __pContextItem = null;
 
-       __pPresentationModel = ArtistListPresentationModel::GetInstance();
+               AppLogDebug("CommonUtil::CreateContentDeletePopup failed");
+               return E_FAILURE;
+       }
 
+       SetFooterStyle(STYLE_MORE_ADD);
+       SetLayoutFitToForm();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -130,40 +96,83 @@ ArtistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
 
        switch (actionId)
        {
-       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
+       case IDA_FLICK_BUTTON_PLAY_ALL:
                {
-                       if (__pPresentationModel->GetArtistListCount() == 0)
-                       {
-                               MessageBox messageBox;
-                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_BODY_NO_ITEMS"), MSGBOX_STYLE_NONE, 500);
+                       ArrayList* pData = new (std::nothrow) ArrayList();
+                       pData->Construct();
 
-                               int modalResult = 0;
-                               messageBox.ShowAndWait(modalResult);
-                               break;
+                       pData->Add(*(new (std::nothrow) String(MUSIC)));
+                       pData->Add(*(new (std::nothrow) Integer(0)));
+                       pData->Add(*(__pPresentationModel->GetContentPathListN(__itemIndex)));
+
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pData);
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_SEARCH:
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_MORE:
+               {
+                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
+                       if (__pMoreContextMenu != null)
+                       {
+                               delete __pMoreContextMenu;
+                               __pMoreContextMenu = null;
                        }
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ARTIST_LIST_EDITOR));
+
+                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
+                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"), IDA_MORE_CONTEXT_MENU_EDIT);
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"), IDA_MORE_CONTEXT_MENU_SEARCH);
+                       __pMoreContextMenu->AddItem(L"Folder view", IDA_MORE_CONTEXT_MENU_FOLDER_VIEW);//NEED STRING
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_MORE_CONTEXT_MENU_SETTINGS);
+
+                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
+                       __pMoreContextMenu->AddActionEventListener(*this);
+                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
+                       __pMoreContextMenu->SetShowState(true);
+                       __pMoreContextMenu->Show();
                }
                break;
 
-       case IDA_FLICK_BUTTON_ADD_TO_PALYLIST:
+       case IDA_MORE_CONTEXT_MENU_EDIT:
                {
-                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-                       __pPlayListPickerPopup->Initialize(this, __pPresentationModel->GetContentPathListN(__itemIndex));
-                       //__pPlayListPickerPopup->SetCollectedContent(__pPresentationModel->GetContentPathListN(__itemIndex));
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ARTIST_LIST_EDITOR));
                }
                break;
 
-       case IDA_FOOTER_BUTTON_SEARCH:
+       case IDA_MORE_CONTEXT_MENU_SEARCH:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
                }
                break;
 
+       case IDA_MORE_CONTEXT_MENU_FOLDER_VIEW:
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST));
+               }
+               break;
+
+       case IDA_MORE_CONTEXT_MENU_SETTINGS:
+               {
+                       // NEED
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_BACK:
+               {
+                       Tizen::App::Application::GetInstance()->Terminate();
+               }
+               break;
+
        default:
                break;
-       }//end of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -194,36 +203,15 @@ ArtistListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSce
                                                                Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       pForm->SetFormBackEventListener(this);
-
-       Footer* pFooter = CommonUtil::CreateContentListFooter(*pForm);
-       pFooter->AddActionEventListener(*this);
-       pFooter->SetBackButton();
-
-       SceneManager* pSceneManager = SceneManager::GetInstance();
-       AppAssert(pSceneManager);
-
-       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
-       {
-               if (__pNowPlayContentPanel == null)
-               {
-                       __pNowPlayContentPanel = new (std::nothrow) NowPlayContentPanel();
-                       __pNowPlayContentPanel->Initialize();
-                       AddControl(*__pNowPlayContentPanel);
-               }
-               CommonUtil::ShowNowPlayPanel(*__pContentTableView, __pNowPlayContentPanel->GetPlayStatus(), pForm->GetClientAreaBounds());
-       }
-
+       GetHeader()->SetItemSelected(3);
+       GetHeader()->Invalidate(true);
        UpdateContentList();
-       if (__pPresentationModel != null)
-       {
-               int totalArtistCount = __pPresentationModel->GetArtistListCount();
-               CommonUtil::SetButtonEnabled(*pForm, totalArtistCount, IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST);
+       ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
 
-               CommonUtil::ShowNoContentImage(totalArtistCount, *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
+       if (pArgs != null)
+       {
+               pArgs->RemoveAll(true);
+               delete pArgs;
        }
        AppLogDebug("EXIT");
 }
@@ -266,12 +254,14 @@ ArtistListPanel::CreateItem(const int itemIndex, int itemWidth)
                return null;
        }
 
+       RelativeLayout layout;
+       layout.Construct();
+
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
-       CommonUtil::CreateTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->ArtistName, __pPresentationModel->GetArtistContentCount(itemIndex));
+       CreateTableViewItem(*pItem, *pContentInfoStruct, __pPresentationModel->GetArtistContentCount(itemIndex));
        pItem->SetContextItem(__pContextItem);
 
        delete pContentInfoStruct;
@@ -281,22 +271,6 @@ ArtistListPanel::CreateItem(const int itemIndex, int itemWidth)
        return pItem;
 }
 
-int
-ArtistListPanel::GetDefaultItemHeight(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return ITEM_HEIGHT;
-}
-
-bool
-ArtistListPanel::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return true;
-}
-
 void
 ArtistListPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
@@ -342,15 +316,6 @@ ArtistListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Control
 }
 
 void
-ArtistListPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndexFrom,
-                                               int itemIndexTo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void
 ArtistListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index)
 {
        AppLogDebug("ENTER");
@@ -393,7 +358,7 @@ ArtistListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Ba
                        __pContentTableView->ScrollToItem(iCount);
                        break;
                }
-       }//end of for
+       }
        AppLogDebug("EXIT");
 }
 
@@ -405,6 +370,70 @@ ArtistListPanel::OnUpdateContentList(void)
        AppLogDebug("EXIT");
 }
 
+result
+ArtistListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
+                                                                       const ContentInformation& contentInfoStruct,
+                                                                       const int itemTotalCount)
+{
+       AppLogDebug("ENTER");
+       result r = E_SUCCESS;
+
+       Panel* pTableViewItem =  new (std::nothrow) Panel();
+       if (IsFailed(pTableViewItem->Construct(IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_CONTENTS_LIBARY_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return E_FAILURE;
+       }
+
+       Label* pTitleName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME));
+       pTitleName->SetText(contentInfoStruct.TitleName);
+
+       Label* pContentCount = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENT_TOTAL_COUNT));
+       pContentCount->SetText(CommonUtil::SetSongsString(itemTotalCount));
+
+       parent.AddControl(*pTableViewItem);
+       CommonUtil::SetLayoutFitToContainer(parent, *pTableViewItem);
+
+       AppLogDebug("EXIT");
+       return r;
+}
+
+Tizen::Ui::Controls::TableViewContextItem*
+ArtistListPanel::CreateTableViewContextItem(void)
+{
+       AppLogDebug("ENTER");
+       TableViewContextItem* pContextItem = new (std::nothrow) TableViewContextItem();
+
+       if (IsFailed(pContextItem->Construct(Dimension(GetWidth(), ITEM_HEIGHT))))
+       {
+               AppLogDebug("Construct(Dimension(GetWidth(), ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
+       if (IsFailed(pSweepQuickMenu->Construct(IDL_SWEEP_QUICK_ALBUM_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       Button* pShareButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_PLAY_ALL_BUTTON));
+       pShareButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
+       pShareButton->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
+       pShareButton->AddActionEventListener(*this);
+
+       Button* pAddToPlaylistButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_ADD_TO_BUTTON));
+       pAddToPlaylistButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_BUTTON2_ADD_TO_PLAYLIST"));
+       pAddToPlaylistButton->SetActionId(IDA_FLICK_BUTTON_ADD_TO_PALYLIST);
+       pAddToPlaylistButton->AddActionEventListener(*this);
+
+       pContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
+       pContextItem->AddControl(*pSweepQuickMenu);
+
+       AppLogDebug("EXIT");
+       return pContextItem;
+}
+
 void
 ArtistListPanel::UpdateContentList(void)
 {
@@ -414,9 +443,31 @@ ArtistListPanel::UpdateContentList(void)
                __pPresentationModel->UpdateArtistList();
                __pContentTableView->UpdateTableView();
        }
+
+       if (__pMoreContextMenu != null && __pMoreContextMenu->GetShowState() == true)
+       {
+               __pMoreContextMenu->SetShowState(false);
+               __pMoreContextMenu->Invalidate(true);
+       }
        AppLogDebug("EXIT");
 }
 
+bool
+ArtistListPanel::IsEmptyContentList(void)
+{
+       AppLogDebug("ENTER");
+       int countArtist = INIT_VALUE;
+       countArtist = __pPresentationModel->GetArtistListCount();
+
+       if (countArtist > INIT_VALUE)
+       {
+               AppLogDebug("EXIT");
+               return false;
+       }
+       AppLogDebug("EXIT");
+       return true;
+}
+
 void
 ArtistListPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
@@ -455,7 +506,16 @@ void
 ArtistListPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-       Label* pThumbnailLabel = static_cast<Label*>(pItem->GetControl(L"pSongThumbnailLabel"));
+       Panel* pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL));
+       if (pItemPanel == null)
+       {
+               AppLogDebug("pItemPanel is null");
+               delete __pThumbnail;
+               __pThumbnail = null;
+               return;
+       }
+
+       Label* pThumbnailLabel = static_cast<Label*>(pItemPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
        if (__pThumbnail == null || pThumbnailLabel == null)
        {
                AppLogDebug("__pThumbnail or pThumbnailLabel is null");
index 998bec3..5db19a8 100644 (file)
@@ -441,7 +441,7 @@ ArtistListPresentationModel::GetAllContentPathListN(void)
                if (pResult != null)
                {
                        String StrTemp = pResult->GetContentInfo()->GetContentPath();
-                       pTempPath->Add(*(new String(StrTemp)));
+                       pTempPath->Add(*(new (std::nothrow) String(StrTemp)));
                }
        }
        AppLogDebug("EXIT");
index 1341a2e..2c792df 100644 (file)
@@ -60,18 +60,12 @@ ArtistPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousS
        __pPresentationModel->UpdateArtistList();
        if (__pPresentationModel != null)
        {
-               CommonUtil::ShowNoContentImage(__pPresentationModel->GetArtistListCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
+               // Empty statement
        }
 
        if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
        {
-               if (__pNowPlayContentPanel == null)
-               {
-                       __pNowPlayContentPanel = new (std::nothrow) NowPlayContentPanel();
-                       __pNowPlayContentPanel->Initialize();
-                       AddControl(*__pNowPlayContentPanel);
-               }
-               CommonUtil::ShowNowPlayPanel(*__pContentTableView, __pNowPlayContentPanel->GetPlayStatus(), pForm->GetClientAreaBounds());
+               // Empty statement
        }
 
        if (pArgs != null)
@@ -119,7 +113,7 @@ ArtistPickerPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& t
 
                ArrayList* pData = new (std::nothrow) ArrayList();
                pData->Construct();
-               pData->Add(*(new (std::nothrow)String(pContentInfoStruct->ArtistName)));
+               pData->Add(*(new (std::nothrow) String(pContentInfoStruct->ArtistName)));
 
                delete pContentInfoStruct;
                pContentInfoStruct = null;
index 158ba7b..62db932 100644 (file)
@@ -72,7 +72,6 @@ CommonUtil::GetContentAlbumArtN(Tizen::Base::String& path)
        Tizen::Content::AudioMetadata* pAudioMeta = Tizen::Content::ContentManagerUtil::GetAudioMetaN(path);
        if (pAudioMeta == null)
        {
-               //AppLogDebug("GetContentAlbumArt 1 : %ls", path.GetPointer());
                AppLogDebug("EXIT");
                return null;
        }
@@ -233,13 +232,15 @@ CommonUtil::GetFormatDate(long dateValue)
        String fTime;
        if (dateValue < 0)
        {
-               fTime.Format(20, L"%02d:%02d:%02d", 0, 0, 0);
+//             fTime.Format(20, L"%02d:%02d:%02d", 0, 0, 0);
+               fTime.Format(20, L"%02d:%02d", 0, 0);
        }
        else
        {
                DateTime dateTime;
                dateTime.AddSeconds(dateValue / 1000);
-               fTime.Format(20, L"%02d:%02d:%02d", dateTime.GetHour(), dateTime.GetMinute(), dateTime.GetSecond());
+//             fTime.Format(20, L"%02d:%02d:%02d", dateTime.GetHour(), dateTime.GetMinute(), dateTime.GetSecond());
+               fTime.Format(20, L"%02d:%02d",dateTime.GetMinute(), dateTime.GetSecond());
        }
        AppLogDebug("EXIT");
        return fTime;
@@ -505,7 +506,7 @@ CommonUtil::ShowCheckedCountLabel(Tizen::Ui::Controls::Label& checkCountLabel, i
        checkCountLabel.SetShowState(true);
        checkCountLabel.Invalidate(true);
 
-       tableView.SetBounds(Rectangle(INIT_VALUE, H_SELECT_ALL_BUTTON, width, height - H_SELECT_ALL_BUTTON - checkCountLabel.GetBounds().height));
+//     tableView.SetBounds(Rectangle(INIT_VALUE, H_SELECT_ALL_BUTTON, width, height - H_SELECT_ALL_BUTTON - checkCountLabel.GetBounds().height));
        tableView.Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -537,6 +538,306 @@ CommonUtil::SetAllCheckState(bool state,
        AppLogDebug("EXIT");
 }
 
+result
+CommonUtil::SetFastScrollIndex(Tizen::Ui::Controls::TableView& tableview)
+{
+       AppLogDebug("ENTER");
+       String retCountry = null;
+       Tizen::System::SettingInfo::GetValue("http://tizen.org/setting/locale.country", retCountry);
+
+       String indexText = null;
+       if (retCountry.CompareTo("eng_GB") == 0)
+       {
+               indexText.Append(L"ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+       }
+       else if(retCountry.CompareTo("kor_KR") == 0)
+       {
+//             indexText.Append(L"ㄱㄲㄴㄷㄸㄹㅁㅂㅃㅅㅆㅇㅈㅉㅊㅋㅌㅍㅎ");
+               indexText.Append(L"ABCDEFGHIJKLMNOPQRSTUVWXYZ#0");
+       }
+
+       indexText.Append(L"#");
+       indexText.Append(L"0");
+
+       tableview.SetFastScrollIndex(indexText, false);
+
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
+
+void
+CommonUtil::SetLayoutFitToForm(const Tizen::Ui::Controls::Form& form, Tizen::Ui::Control& childControl)
+{
+       AppLogDebug("ENTER");
+       RelativeLayout* pLayout = dynamic_cast<RelativeLayout*>(form.GetPortraitLayoutN());
+       pLayout->SetHorizontalFitPolicy(childControl, FIT_POLICY_PARENT);
+       pLayout->SetVerticalFitPolicy(childControl, FIT_POLICY_PARENT);
+       delete pLayout;
+
+       pLayout = dynamic_cast<RelativeLayout*>(form.GetLandscapeLayoutN());
+       pLayout->SetHorizontalFitPolicy(childControl, FIT_POLICY_PARENT);
+       pLayout->SetVerticalFitPolicy(childControl, FIT_POLICY_PARENT);
+       delete pLayout;
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetLayoutFitToContainer(const Tizen::Ui::Container& container, Tizen::Ui::Control& childControl)
+{
+       AppLogDebug("ENTER");
+       RelativeLayout* pLayout = dynamic_cast<RelativeLayout*>(container.GetPortraitLayoutN());
+       if (pLayout != null)
+       {
+               pLayout->SetHorizontalFitPolicy(childControl, FIT_POLICY_PARENT);
+               pLayout->SetVerticalFitPolicy(childControl, FIT_POLICY_PARENT);
+               pLayout->Update();
+               delete pLayout;
+       }
+       pLayout = dynamic_cast<RelativeLayout*>(container.GetLandscapeLayoutN());
+       if (pLayout != null)
+       {
+               pLayout->SetHorizontalFitPolicy(childControl, FIT_POLICY_PARENT);
+               pLayout->SetVerticalFitPolicy(childControl, FIT_POLICY_PARENT);
+               pLayout->Update();
+               delete pLayout;
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetHorizontalLayoutFitToContainer(const Tizen::Ui::Container& container, Tizen::Ui::Control& childControl)
+{
+       AppLogDebug("ENTER");
+       RelativeLayout* pLayout = dynamic_cast<RelativeLayout*>(container.GetPortraitLayoutN());
+       pLayout->SetHorizontalFitPolicy(childControl, FIT_POLICY_PARENT);
+       delete pLayout;
+
+       pLayout = dynamic_cast<RelativeLayout*>(container.GetLandscapeLayoutN());
+       pLayout->SetHorizontalFitPolicy(childControl, FIT_POLICY_PARENT);
+       delete pLayout;
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetFooterItemEnabled(Tizen::Ui::Controls::Footer& pFooter, bool enable)
+{
+       AppLogDebug("ENTER");
+       for (int iCount = 0; iCount < pFooter.GetItemCount(); iCount++)
+       {
+               pFooter.SetItemEnabled(iCount, enable);
+       }
+       pFooter.Invalidate(true);
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetTabHeaderStyle(Tizen::Ui::Controls::Header& pHeader)
+{
+       AppLogDebug("ENTER");
+       pHeader.RemoveAllButtons();
+       pHeader.RemoveAllItems();
+
+       pHeader.SetStyle(HEADER_STYLE_TAB);
+       pHeader.SetTitleTextColor(COLOR_HEADER_TITLE_TEXT);
+
+       int headItemChecked = 0;
+       for (int iCount = 0; iCount < HEAD_ITEM_COUNT; iCount++)
+       {
+               if (CommonUtil::GetValue(CheckedName[iCount]) == true)
+               {
+                       HeaderItem pTabHeaderItem;
+                       pTabHeaderItem.Construct(IDA_HEADER_BUTTON_SONG + iCount);
+                       pTabHeaderItem.SetText(ResourceManager::GetString(TabNameId[iCount]));
+
+                       CommonUtil::SetBackgroundBitmapHeaderItem(pTabHeaderItem, null, null, null, null);
+                       pHeader.AddItem(pTabHeaderItem);
+                       headItemChecked++;
+               }
+       }
+
+       if (headItemChecked == INIT_VALUE)
+       {
+               for (int iCount = 0; iCount < 2; iCount++)
+               {
+                       HeaderItem pTabHeaderItem;
+                       pTabHeaderItem.Construct(IDA_HEADER_BUTTON_SONG + iCount);
+                       pTabHeaderItem.SetText(ResourceManager::GetString(TabNameId[iCount]));
+
+                       CommonUtil::SetBackgroundBitmapHeaderItem(pTabHeaderItem, null, null, null, null);
+                       pHeader.AddItem(pTabHeaderItem);
+                       headItemChecked++;
+               }
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetEditHeaderStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText, int actionId, bool isChecked)
+{
+       AppLogDebug("ENTER");
+       pHeader.RemoveAllButtons();
+       pHeader.RemoveAllItems();
+
+       pHeader.SetStyle(HEADER_STYLE_TITLE);
+       pHeader.SetTitleText(titleText);
+
+       ButtonItem buttonItem;
+       buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, actionId);
+
+       Bitmap* checkedIcon = null;
+       if (isChecked == true)
+       {
+               checkedIcon =  ResourceManager::GetBitmapN(L"00_check_checking.png");
+       }
+
+       CommonUtil::SetIconButtonItem(buttonItem, checkedIcon, checkedIcon, null);
+       CommonUtil::SetBackgroundBitmapButtonItem(buttonItem, ResourceManager::GetBitmapN(L"00_check_bg.png"),
+                       ResourceManager::GetBitmapN(L"00_check_bg_press.png"), ResourceManager::GetBitmapN(L"00_check_bg_dim.png"));
+       pHeader.SetButton(BUTTON_POSITION_RIGHT, buttonItem);
+       delete checkedIcon;
+
+       pHeader.SetTitleTextColor(COLOR_HEADER_TITLE_TEXT);
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetIconButtonItem(Tizen::Ui::Controls::ButtonItem& buttonItem, Tizen::Graphics::Bitmap* normalButtonIcon,
+                                                                       Tizen::Graphics::Bitmap* pressedButtonIcon, Tizen::Graphics::Bitmap* disableButtonIcon)
+{
+       AppLogDebug("ENTER");
+       buttonItem.SetIcon(BUTTON_ITEM_STATUS_NORMAL, normalButtonIcon);
+       buttonItem.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pressedButtonIcon);
+       buttonItem.SetIcon(BUTTON_ITEM_STATUS_DISABLED, disableButtonIcon);
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetBackgroundBitmapButtonItem(Tizen::Ui::Controls::ButtonItem& buttonItem, Tizen::Graphics::Bitmap* normalButtonIcon,
+                               Tizen::Graphics::Bitmap* pressedButtonIcon, Tizen::Graphics::Bitmap* disableButtonIcon)
+{
+       AppLogDebug("ENTER");
+       buttonItem.SetBackgroundBitmap(BUTTON_ITEM_STATUS_NORMAL, normalButtonIcon);
+       buttonItem.SetBackgroundBitmap(BUTTON_ITEM_STATUS_PRESSED, pressedButtonIcon);
+       buttonItem.SetBackgroundBitmap(BUTTON_ITEM_STATUS_DISABLED, disableButtonIcon);
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetBackgroundBitmapHeaderItem(Tizen::Ui::Controls::HeaderItem& headerItem, Tizen::Graphics::Bitmap* normal,
+                               Tizen::Graphics::Bitmap* pressed, Tizen::Graphics::Bitmap* selected, Tizen::Graphics::Bitmap* disable)
+{
+       AppLogDebug("ENTER");
+       headerItem.SetBackgroundBitmap(HEADER_ITEM_STATUS_NORMAL, normal);
+       headerItem.SetBackgroundBitmap(HEADER_ITEM_STATUS_PRESSED, pressed);
+       headerItem.SetBackgroundBitmap(HEADER_ITEM_STATUS_SELECTED, selected);
+       headerItem.SetBackgroundBitmap(HEADER_ITEM_STATUS_DISABLED, disable);
+       AppLogDebug("EXIT");
+}
+
+Tizen::Ui::Controls::Popup*
+CommonUtil::CreateContentDeletePopup(Tizen::Ui::IActionEventListener& listener, int deleteActionId, int cancelActionId)
+{
+       AppLogDebug("ENTER");
+       Popup* pDeletePopup = new (std::nothrow) Popup();
+       if (IsFailed(pDeletePopup->Construct(IDL_CONTENTS_DELETE_POPUP)))
+       {
+               delete pDeletePopup;
+               AppLogDebug("Construct(IDL_CONTENTS_DELETE_POPUP))) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       Button* pDeleteButton = static_cast<Button*>(pDeletePopup->GetControl(IDC_DELETE_BUTTON));
+       pDeleteButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_DELETE"));
+       pDeleteButton->SetActionId(deleteActionId);
+       pDeleteButton->AddActionEventListener(listener);
+
+       Button* CancelButton = static_cast<Button*>(pDeletePopup->GetControl(IDC_CANCEL_BUTTON));
+       CancelButton->SetText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT_CANCEL"));
+       CancelButton->SetActionId(cancelActionId);
+       CancelButton->AddActionEventListener(listener);
+
+       Label* pDeleteQustionLabel = static_cast<Label*>(pDeletePopup->GetControl(IDC_LABEL_DELETE_Q));
+       pDeleteQustionLabel->SetText(ResourceManager::GetString(L"IDS_MUSIC_POP_DELETE_Q"));
+
+       AppLogDebug("EXIT");
+       return pDeletePopup;
+}
+
+void
+CommonUtil::SetSimpleTitleStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText)
+{
+       AppLogDebug("ENTER");
+       pHeader.RemoveAllButtons();
+       pHeader.RemoveAllItems();
+
+       pHeader.SetStyle(HEADER_STYLE_TITLE);
+       pHeader.SetTitleText(titleText);
+       pHeader.SetTitleTextColor(COLOR_HEADER_TITLE_TEXT);
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetTitleWithSearchIconStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText,
+                                                                                                                                       const Tizen::Base::String& descriptionText, int actionId)
+{
+       AppLogDebug("ENTER");
+       pHeader.RemoveAllButtons();
+       pHeader.RemoveAllItems();
+
+       pHeader.SetStyle(HEADER_STYLE_TITLE);
+       pHeader.SetTitleText(titleText);
+
+       ButtonItem buttonItem;
+       buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, actionId);
+
+       Bitmap* iconSearch = ResourceManager::GetBitmapN(L"T02_icon_search.png");
+       CommonUtil::SetIconButtonItem(buttonItem, iconSearch, iconSearch, null);
+       pHeader.SetButton(BUTTON_POSITION_RIGHT, buttonItem);
+       delete iconSearch;
+
+       pHeader.SetTitleTextColor(COLOR_HEADER_TITLE_TEXT);
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetTitleDescriptionWithIconStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText,
+                                                                                       Tizen::Base::String& descriptionText, int actionId, Tizen::Graphics::Bitmap* icon)
+{
+       AppLogDebug("ENTER");
+       pHeader.RemoveAllButtons();
+       pHeader.RemoveAllItems();
+
+       pHeader.SetStyle(HEADER_STYLE_TITLE);
+       pHeader.SetTitleText(titleText);
+       pHeader.SetDescriptionText(descriptionText);
+
+       ButtonItem buttonItem;
+       buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, actionId);
+
+       CommonUtil::SetIconButtonItem(buttonItem, icon, icon, null);
+       pHeader.SetButton(BUTTON_POSITION_RIGHT, buttonItem);
+
+       pHeader.SetTitleTextColor(COLOR_HEADER_TITLE_TEXT);
+       pHeader.SetDescriptionTextColor(COLOR_HEADER_DESCRIPTION_TEXT);
+       AppLogDebug("EXIT");
+}
+
+void
+CommonUtil::SetTitleDescriptionStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText, const Tizen::Base::String& descriptionText)
+{
+       AppLogDebug("ENTER");
+       pHeader.RemoveAllButtons();
+       pHeader.RemoveAllItems();
+
+       pHeader.SetStyle(HEADER_STYLE_TITLE);
+       pHeader.SetTitleText(titleText);
+       pHeader.SetDescriptionText(descriptionText);
+
+       pHeader.SetTitleTextColor(COLOR_HEADER_TITLE_TEXT);
+       pHeader.SetDescriptionTextColor(COLOR_HEADER_DESCRIPTION_TEXT);
+       AppLogDebug("EXIT");
+}
+
 Tizen::Ui::Controls::Footer*
 CommonUtil::CreateContentListFooter(const Tizen::Ui::Controls::Form& form)
 {
@@ -544,7 +845,6 @@ CommonUtil::CreateContentListFooter(const Tizen::Ui::Controls::Form& form)
        Footer* pFooter = form.GetFooter();
        if (pFooter == null)
        {
-               //AppLogDebug("Footer null");
                AppLogDebug("EXIT");
                return null;
        }
@@ -595,7 +895,6 @@ CommonUtil::CreatePlaylistEditFooter(const Tizen::Ui::Controls::Form& form)
        Footer* pFooter = form.GetFooter();
        if (pFooter == null)
        {
-               //AppLogDebug("form.GetFooter() null");
                AppLogDebug("EXIT");
                return null;
        }
@@ -625,7 +924,6 @@ CommonUtil::CreateDefaultPlaylistContentListFooter(const Tizen::Ui::Controls::Fo
        Footer* pFooter = form.GetFooter();
        if (pFooter == null)
        {
-               //AppLogDebug("Footer null");
                AppLogDebug("EXIT");
                return null;
        }
@@ -659,7 +957,6 @@ CommonUtil::CreateUserPlaylistContentListFooter(const Tizen::Ui::Controls::Form&
        Footer* pFooter = form.GetFooter();
        if (pFooter == null)
        {
-               //AppLogDebug("Footer null");
                AppLogDebug("EXIT");
                return null;
        }
@@ -694,7 +991,6 @@ CommonUtil::CreateAddtoPlaylistPickerFooter(const Tizen::Ui::Controls::Form& for
        Footer* pFooter = form.GetFooter();
        if (pFooter == null)
        {
-               //AppLogDebug("Footer null");
                AppLogDebug("EXIT");
                return null;
        }
@@ -740,7 +1036,6 @@ CommonUtil::CreateAddtoPlaylistFooter(const Tizen::Ui::Controls::Form& form)
        Footer* pFooter = form.GetFooter();
        if (pFooter == null)
        {
-               //AppLogDebug("Footer null");
                AppLogDebug("EXIT");
                return null;
        }
@@ -862,6 +1157,131 @@ CommonUtil::CreateCancelFooter(const Tizen::Ui::Controls::Form& form)
        return pFooter;
 }
 
+Tizen::Ui::Controls::Footer*
+CommonUtil::CreateBackButtonStyleFooter(const Tizen::Ui::Controls::Form& form, FooterButtonStyle style)
+{
+       AppLogDebug("ENTER");
+       Footer* pFooter = form.GetFooter();
+       if (pFooter == null)
+       {
+               AppLogDebug("EXIT");
+               return null;
+       }
+       pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON_TEXT);
+
+       switch (style)
+       {
+       case STYLE_MORE_ADD:
+               {
+                       Bitmap* bitmapMore = ResourceManager::GetBitmapN(L"00_icon_more_ef.png");
+                       Bitmap* bitmapMorePress = ResourceManager::GetBitmapN(L"00_icon_more.png");
+
+                       ButtonItem buttonItemMore;
+                       buttonItemMore.Construct(BUTTON_ITEM_STYLE_ICON, IDA_FOOTER_BUTTON_MORE);
+                       buttonItemMore.SetIcon(BUTTON_ITEM_STATUS_NORMAL, bitmapMore);
+                       buttonItemMore.SetIcon(BUTTON_ITEM_STATUS_PRESSED, bitmapMorePress);
+                       pFooter->SetButton(BUTTON_POSITION_LEFT,buttonItemMore);
+
+                       delete bitmapMore;
+                       delete bitmapMorePress;
+               }
+               break;
+
+       case STYLE_ADDTO_DELETE_ADD:
+               {
+                       FooterItem footerItemAddto;
+                       footerItemAddto.Construct(IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST);
+                       footerItemAddto.SetText(L"Add to");//NEED STRING
+
+                       FooterItem footerItemDelete;
+                       footerItemDelete.Construct(IDA_FOOTER_BUTTON_DELETE);
+                       footerItemDelete.SetText(ResourceManager::GetString(L"IDS_MUSIC_SK3_DELETE"));
+
+                       pFooter->AddItem(footerItemAddto);
+                       pFooter->AddItem(footerItemDelete);
+               }
+               break;
+
+       case STYLE_SHARE_ADD:
+               {
+                       FooterItem footerItemShare;
+                       footerItemShare.Construct(IDA_FOOTER_BUTTON_SHARE);
+                       footerItemShare.SetText(ResourceManager::GetString(L"IDS_MUSIC_BUTTON_SHARE"));
+
+                       pFooter->AddItem(footerItemShare);
+               }
+               break;
+
+       case STYLE_DELETE_ADD:
+               {
+                       FooterItem footerItemDelete;
+                       footerItemDelete.Construct(IDA_FOOTER_BUTTON_DELETE);
+                       footerItemDelete.SetText(ResourceManager::GetString(L"IDS_MUSIC_SK3_DELETE"));
+
+                       pFooter->AddItem(footerItemDelete);
+               }
+               break;
+
+       default:
+               break;
+       }
+       pFooter->SetBackButton();
+       AppLogDebug("EXIT");
+       return pFooter;
+}
+
+void
+CommonUtil::SetBackButtonStyleFooter(Tizen::Ui::Controls::Footer& footer, FooterButtonStyle style)
+{
+       AppLogDebug("ENTER");
+       footer.RemoveAllButtons();
+       footer.RemoveAllItems();
+       footer.SetStyle(FOOTER_STYLE_BUTTON_ICON_TEXT);
+       switch(style)
+       {
+       case STYLE_MORE_ADD:
+               {
+                       Bitmap* bitmapMore = ResourceManager::GetBitmapN(L"00_icon_more_ef.png");
+                       Bitmap* bitmapMorePress = ResourceManager::GetBitmapN(L"00_icon_more.png");
+                       ButtonItem buttonItemMore;
+                       buttonItemMore.Construct(BUTTON_ITEM_STYLE_ICON, IDA_FOOTER_BUTTON_MORE);
+                       buttonItemMore.SetIcon(BUTTON_ITEM_STATUS_NORMAL, bitmapMore);
+                       buttonItemMore.SetIcon(BUTTON_ITEM_STATUS_PRESSED, bitmapMorePress);
+                       footer.SetButton(BUTTON_POSITION_LEFT,buttonItemMore);
+                       delete bitmapMore;
+                       delete bitmapMorePress;
+               }
+               break;
+
+       case STYLE_ADDTO_DELETE_ADD:
+               {
+                       FooterItem footerItemAddto;
+                       footerItemAddto.Construct(IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST);
+                       footerItemAddto.SetText(L"Add to");//NEED STRING
+                       FooterItem footerItemDelete;
+                       footerItemDelete.Construct(IDA_FOOTER_BUTTON_DELETE);
+                       footerItemDelete.SetText(ResourceManager::GetString(L"IDS_MUSIC_SK3_DELETE"));
+                       footer.AddItem(footerItemAddto);
+                       footer.AddItem(footerItemDelete);
+               }
+               break;
+
+       case STYLE_SHARE_ADD:
+               {
+                       FooterItem footerItemShare;
+                       footerItemShare.Construct(IDA_FOOTER_BUTTON_SHARE);
+                       footerItemShare.SetText(ResourceManager::GetString(L"IDS_MUSIC_BUTTON_SHARE"));
+                       footer.AddItem(footerItemShare);
+               }
+               break;
+
+       default:
+               break;
+       }
+       footer.SetBackButton();
+       AppLogDebug("EXIT");
+}
+
 ContentInformation*
 CommonUtil::GetContentInformationN(const Tizen::Content::AudioContentInfo& audioContentInfo)
 {
@@ -959,7 +1379,6 @@ result
 CommonUtil::CreateTableViewContextItem(Tizen::Ui::Controls::TableViewContextItem& parent, Tizen::Ui::IActionEventListener& listener)
 {
        AppLogDebug("ENTER");
-
        Button* pAddToPlaylistButton = new (std::nothrow) Button();
        pAddToPlaylistButton->Construct(Rectangle(X_GAP_CONTEXT_ITME, Y_GAP_CONTEXT_ITEM, parent.GetWidth() - (X_GAP_CONTEXT_ITME * 2), parent.GetHeight() - (Y_GAP_CONTEXT_ITEM * 2)));
        pAddToPlaylistButton->SetText(ResourceManager::GetString("IDS_MUSIC_BODY_ADD_TO_PLAYLIST"));
@@ -1181,7 +1600,7 @@ CommonUtil::GetColorizedBitmapN(const Tizen::Graphics::Bitmap& bitmap, const Tiz
        {
                return null;
        }
-       std::unique_ptr<Bitmap> pRet(new (std::nothrow) Bitmap());
+       std::unique_ptr<Bitmap>pRet(new (std::nothrow) Bitmap());
        if (pRet == null)
        {
                return null;
index 19ff570..d8e8d17 100644 (file)
@@ -565,7 +565,7 @@ ComposerContentListForm::CreateItem(const int itemIndex, int itemWidth)
                pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
                pItem->SetContextItem(__pContextItem);
        }
-       pItem->SetBackgroundColor(COLOR_WHITE);
+//     pItem->SetBackgroundColor(COLOR_WHITE);
 
        pContentInfoStruct = __pPresentationModel->GetContentInfoN(itemIndex);
        if (pContentInfoStruct == null)
index 07f5996..c52d620 100644 (file)
@@ -112,7 +112,6 @@ ComposerContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source,
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -124,7 +123,6 @@ ComposerContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source,
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -174,14 +172,13 @@ ComposerContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source,
                        Form* pForm = dynamic_cast<Form*>(GetParent());
                        AppAssert(pForm);
                        CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        pSceneManager->GoBackward(BackwardSceneTransition());
                }
                break;
 
        default:
                break;
-       }//End of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -246,7 +243,7 @@ ComposerContentPickerPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        CommonUtil::CreateContentPikerTableViewItem(*pItem, pContentInfoStruct->TitleName, CommonUtil::GetFormatDate(pContentInfoStruct->Duration));
 
@@ -308,7 +305,7 @@ ComposerContentPickerPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::Tab
 
        default:
                break;
-       }//end of switch
+       }
 
        CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
 
index 56cb9d6..22bd345 100644 (file)
@@ -54,7 +54,7 @@ bool
 ComposerListEditorPanel::Initialize(void)
 {
        AppLogDebug("ENTER");
-       result r = Panel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE)); // Should be set proper area at OnInitializing().
+       result r = Panel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE));
        if (IsFailed(r))
        {
                return false;
@@ -116,7 +116,6 @@ ComposerListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -127,7 +126,6 @@ ComposerListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -165,14 +163,13 @@ ComposerListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_FOOTER_BUTTON_CANCEL:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        pSceneManager->GoBackward(BackwardSceneTransition());
                }
                break;
 
        default:
                break;
-       }//End of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
@@ -258,7 +255,7 @@ ComposerListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateEditListTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->ComposerName, __pPresentationModel->GetContentCount(itemIndex));
@@ -311,7 +308,7 @@ ComposerListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableV
 
        default:
                break;
-       }//end of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
index db40952..5ad242b 100644 (file)
@@ -57,7 +57,7 @@ bool
 ComposerListPanel::Initialize(void)
 {
        AppLogDebug("ENTER");
-       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE)); // Should be set proper area at OnInitializing().
+       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE));
        if (IsFailed(r))
        {
                return false;
@@ -80,7 +80,6 @@ ComposerListPanel::OnInitializing(void)
 
        SetBounds(INIT_VALUE, INIT_VALUE, width, height);
 
-       //TableView Init
        __pContentTableView = CommonUtil::CreateTableView(width, height);
        __pContentTableView->AddFastScrollListener(*this);
        __pContentTableView->SetItemProvider(this);
@@ -163,7 +162,7 @@ ComposerListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
 
        default:
                break;
-       }//end of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -268,7 +267,7 @@ ComposerListPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->ComposerName, __pPresentationModel->GetContentCount(itemIndex));
@@ -408,7 +407,7 @@ ComposerListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::
                        __pContentTableView->ScrollToItem(iCount);
                        break;
                }
-       }//end of for
+       }
        AppLogDebug("EXIT");
 }
 
index 4007547..d072a8e 100644 (file)
@@ -163,7 +163,6 @@ ContentDetailForm::OnInitializing(void)
        else
        {
                AppLogDebug("is null");
-
                Tizen::Content::AudioMetadata* pAudioMeta = Tizen::Content::ContentManagerUtil::GetAudioMetaN(*(tempPath));
                if (pAudioMeta == null)
                {
@@ -335,7 +334,7 @@ ContentDetailForm::CreateItem(const int itemIndex, int itemWidth)
        TableViewItem* pTableItem = new (std::nothrow) TableViewItem();
 
        pTableItem->Construct(Dimension(itemWidth, DETAIL_ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pTableItem->SetBackgroundColor(COLOR_ITEM);
+//     pTableItem->SetBackgroundColor(COLOR_ITEM);
 
        if (itemIndex == CONTENT_INFO)
        {
diff --git a/src/MpContentEditPanel.cpp b/src/MpContentEditPanel.cpp
new file mode 100644 (file)
index 0000000..ec37702
--- /dev/null
@@ -0,0 +1,219 @@
+//\r
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Flora License, Version 1.0 (the License);\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//     http://floralicense.org/license/\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an AS IS BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+/**\r
+ * @file               MpContentEditPanel.cpp\r
+ * @brief              This is the implementation file for ContentEditPanel class.\r
+ */\r
+\r
+#include "FUi.h"\r
+#include "MpContentEditPanel.h"\r
+#include "MpContentForm.h"\r
+#include "MpCommonUtil.h"\r
+#include "MpTypes.h"\r
+\r
+using namespace Tizen::Base;\r
+using namespace Tizen::Graphics;\r
+using namespace Tizen::Ui;\r
+using namespace Tizen::Ui::Controls;\r
+\r
+static const int H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP = 48;\r
+static const int H_HIDE_CHECKED_COUNT_BALLOON_TOOL_TIP = 0;\r
+\r
+ContentEditPanel::ContentEditPanel(void)\r
+       : ContentPanel::ContentPanel()\r
+       , __pItemCheckedCountBallooPopup(null)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+ContentEditPanel::~ContentEditPanel(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+bool\r
+ContentEditPanel::Initialize(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       result r = Panel::Construct(IDL_CONTENTS_LIBARY_EDITOR_PANEL);\r
+       if (IsFailed(r))\r
+       {\r
+               AppLogDebug("Construct(IDL_CONTENT_EDIT_PANEL) failed(%s)", GetErrorMessage(r));\r
+               return false;\r
+       }\r
+       AppLogDebug("EXIT");\r
+       return Construct();\r
+}\r
+\r
+result\r
+ContentEditPanel::Construct(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       __pContentTableView = static_cast<TableView*>(GetControl(IDC_CONTENTS_EDIT_TABLEVIEW));\r
+       __pContentTableView->SetItemProvider(this);\r
+       __pContentTableView->AddTableViewItemEventListener(*this);\r
+\r
+       __pItemCheckedCountBallooPopup = static_cast<Label*>(GetControl(IDC_ITEM_SELECTED_COUNT_LABEL));\r
+       __pNoContentLabel = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_LABEL));\r
+\r
+//     SetShowStateNoContent(false);\r
+\r
+       AppLogDebug("EXIT");\r
+       return E_SUCCESS;\r
+}\r
+\r
+Tizen::Ui::Controls::Header*\r
+ContentEditPanel::GetParentHeader(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       AppAssert(pForm);\r
+       AppLogDebug("EXIT");\r
+       return pForm->GetHeader();\r
+}\r
+\r
+result\r
+ContentEditPanel::RemoveParentHeaderActionEventListener(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       AppAssert(pForm);\r
+\r
+       ContentForm* pContentForm = dynamic_cast<ContentForm*>(const_cast<Form*>(pForm));\r
+       if (pContentForm == null)\r
+       {\r
+               AppLogDebug("dynamic_cast<ContentForm*>(const_cast<Form*>(pForm)) is null");\r
+               return E_FAILURE;\r
+       }\r
+\r
+       Header* pHeader = pContentForm->GetHeader();\r
+       pHeader->RemoveActionEventListener(*pContentForm);\r
+\r
+       AppLogDebug("EXIT");\r
+       return E_SUCCESS;\r
+\r
+}\r
+\r
+result\r
+ContentEditPanel::AddParentHeaderActionEventListener(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       AppAssert(pForm);\r
+\r
+       ContentForm* pContentForm = dynamic_cast<ContentForm*>(const_cast<Form*>(pForm));\r
+       if (pContentForm == null)\r
+       {\r
+               AppLogDebug("dynamic_cast<ContentForm*>(const_cast<Form*>(pForm)) is null");\r
+               return E_FAILURE;\r
+       }\r
+\r
+       Header* pHeader = pContentForm->GetHeader();\r
+       pHeader->AddActionEventListener(*pContentForm);\r
+\r
+       AppLogDebug("EXIT");\r
+       return E_SUCCESS;\r
+}\r
+\r
+result\r
+ContentEditPanel::SetShowStateBalloonPopup(bool isShow)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (isShow == true)\r
+       {\r
+               __pItemCheckedCountBallooPopup->SetSize(__pItemCheckedCountBallooPopup->GetWidth(), H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP);\r
+\r
+               __pItemCheckedCountBallooPopup->SetShowState(true);\r
+       }\r
+       else\r
+       {\r
+               __pItemCheckedCountBallooPopup->SetSize(__pItemCheckedCountBallooPopup->GetWidth(), H_HIDE_CHECKED_COUNT_BALLOON_TOOL_TIP);\r
+               __pItemCheckedCountBallooPopup->SetShowState(false);\r
+       }\r
+\r
+       __pItemCheckedCountBallooPopup->Invalidate(true);\r
+       AppLogDebug("EXIT");\r
+       return E_SUCCESS;\r
+}\r
+\r
+void\r
+ContentEditPanel::ReSizingItemCheckedBalloonPopup(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pItemCheckedCountBallooPopup->IsEnabled() == true)\r
+       {\r
+               __pItemCheckedCountBallooPopup->SetSize(__pItemCheckedCountBallooPopup->GetWidth(), H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP);\r
+       }\r
+       else\r
+       {\r
+               __pItemCheckedCountBallooPopup->SetSize(__pItemCheckedCountBallooPopup->GetWidth(), H_HIDE_CHECKED_COUNT_BALLOON_TOOL_TIP);\r
+       }\r
+\r
+       __pItemCheckedCountBallooPopup->Invalidate(true);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentEditPanel::SetCheckedCountBalloonPopup(int itemCount)\r
+{\r
+       AppLogDebug("ENTER");\r
+       String StrSelectStr = null;\r
+\r
+       if (itemCount > INIT_VALUE)\r
+       {\r
+               String ResSelect = ResourceManager::GetString("IDS_COM_BODY_SELECTED");\r
+               ResSelect.Append(L"(%d)");\r
+\r
+               StrSelectStr.Format(STRING_LENGTH, ResSelect.GetPointer(), itemCount);\r
+       }\r
+       else\r
+       {\r
+               StrSelectStr.Format(STRING_LENGTH, L"Select <Noun>s");//NEED STRING\r
+       }\r
+       __pItemCheckedCountBallooPopup->SetText(StrSelectStr);\r
+       __pItemCheckedCountBallooPopup->SetTextHorizontalAlignment(ALIGNMENT_LEFT);\r
+       if (__pItemCheckedCountBallooPopup->GetShowState() == false)\r
+       {\r
+               SetShowStateBalloonPopup(true);\r
+               AppLogDebug("EXIT");\r
+               return;\r
+       }\r
+\r
+       __pItemCheckedCountBallooPopup->Invalidate(true);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentEditPanel::SetNoContentSongs(bool isNoContents)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (isNoContents == true)\r
+       {\r
+               SetShowStateBalloonPopup(false);\r
+               SetShowStateContentTableview(false);\r
+\r
+               SetShowStateNoContent(true);\r
+               AppLogDebug("EXIT");\r
+               return;\r
+       }\r
+\r
+       SetShowStateNoContent(false);\r
+       SetShowStateContentTableview(true);\r
+       AppLogDebug("EXIT");\r
+}
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index fcdd3ab..f3779c4
@@ -20,6 +20,7 @@
  */
 
 #include "MpContentForm.h"
+#include "MpContentPanel.h"
 #include "MpSettingPresentationModel.h"
 
 using namespace Tizen::App;
@@ -30,70 +31,6 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-#define IMAGE_NORMAL_LOAD(n) (n * 2)
-#define IMAGE_PRESSEED_LOAD(n) ((n * 2) + 1)
-
-static const Tizen::Base::String ALL_TAB_ICON_NORMAL = L"T02_controlbar_icon_all.png";
-static const Tizen::Base::String ALL_TAB_ICON_PRESS = L"T02_controlbar_icon_all_press.png";
-static const Tizen::Base::String PLAYLIST_TAB_ICON_NORMAL = L"T02_controlbar_icon_playlists.png";
-static const Tizen::Base::String PLAYLIST_TAB_ICON_PRESS = L"T02_controlbar_icon_playlists_press.png";
-static const Tizen::Base::String ALBUM_TAB_ICON_NORMAL = L"T02_controlbar_icon_music_albums.png";
-static const Tizen::Base::String ALBUM_TAB_ICON_PRESS = L"T02_controlbar_icon_music_albums_press.png";
-static const Tizen::Base::String ARTIST_TAB_ICON_NORMAL = L"T02_controlbar_icon_artist.png";
-static const Tizen::Base::String ARTIST_TAB_ICON_PRESS = L"T02_controlbar_icon_artist_press.png";
-static const Tizen::Base::String GENRE_TAB_ICON_NORMAL = L"T02_controlbar_icon_genres.png";
-static const Tizen::Base::String GENRE_TAB_ICON_PRESS = L"T02_controlbar_icon_genres_press.png";
-static const Tizen::Base::String COMPOSER_TAB_ICON_NORMAL = L"T02_controlbar_icon_composer.png";
-static const Tizen::Base::String COMPOSER_TAB_ICON_PRESS = L"T02_controlbar_icon_composer_press.png";
-static const Tizen::Base::String YEAR_TAB_ICON_NORMAL = L"T02_controlbar_icon_years.png";
-static const Tizen::Base::String YEAR_TAB_ICON_PRESS = L"T02_controlbar_icon_years_press.png";
-static const Tizen::Base::String FOLDER_TAB_ICON_NORMAL = L"T02_controlbar_icon_folders.png";
-static const Tizen::Base::String FOLDER_TAB_ICON_PRESS = L"T02_controlbar_icon_folders_press.png";
-
-static const String CheckedName[HEAD_ITEM_COUNT] =
-{
-       L"SONGS_TAB",
-       L"PLAYERLISTS_TAB",
-       L"ALBUMS_TAB",
-       L"ARTISTS_TAB",
-       L"GENRES_TAB",
-       L"COMPOSERS_TAB",
-       L"YEARS_TAB",
-       L"FOLDERS_TAB"
-};
-
-static const String TabNameId[HEAD_ITEM_COUNT] =
-{
-       L"IDS_MUSIC_ITAB4_ALL",
-       L"IDS_MUSIC_TAB4_PLAYLISTS",
-       L"IDS_MUSIC_TAB4_ALBUMS",
-       L"IDS_MUSIC_TAB4_ARTISTS",
-       L"IDS_MUSIC_TAB4_GENRES",
-       L"IDS_MUSIC_BODY_COMPOSERS",
-       L"IDS_MUSIC_TAB4_YEARS",
-       L"IDS_MUSIC_TAB4_FOLDERS",
-};
-
-static const String tabButtonImage[ICON_TOTAL_CONUT] =
-{
-       ALL_TAB_ICON_NORMAL,
-       ALL_TAB_ICON_PRESS,
-       PLAYLIST_TAB_ICON_NORMAL,
-       PLAYLIST_TAB_ICON_PRESS,
-       ALBUM_TAB_ICON_NORMAL,
-       ALBUM_TAB_ICON_PRESS,
-       ARTIST_TAB_ICON_NORMAL,
-       ARTIST_TAB_ICON_PRESS,
-       GENRE_TAB_ICON_NORMAL,
-       GENRE_TAB_ICON_PRESS,
-       COMPOSER_TAB_ICON_NORMAL,
-       COMPOSER_TAB_ICON_PRESS,
-       YEAR_TAB_ICON_NORMAL,
-       YEAR_TAB_ICON_PRESS,
-       FOLDER_TAB_ICON_NORMAL,
-       FOLDER_TAB_ICON_PRESS
-};
-
 ContentForm::ContentForm(void)
 {
        AppLogDebug("ENTER");
@@ -120,87 +57,15 @@ ContentForm::Initialize(void)
 }
 
 result
-ContentForm::InitializeHeaderItem(Tizen::Ui::Controls::Header& pHeader)
-{
-       AppLogDebug("ENTER");
-
-       int headItemChecked = 0;
-       for (int iCount = 0; iCount < HEAD_ITEM_COUNT; iCount++)
-       {
-               if (CommonUtil::GetValue(CheckedName[iCount]) == true)
-               {
-                       Bitmap* pNormal = ResourceManager::GetBitmapN(tabButtonImage[IMAGE_NORMAL_LOAD(iCount)]);
-                       Bitmap* pColorizedNormalBitmap = null;
-                       Bitmap* pColorizedPressedBitmap = null;
-
-                       HeaderItem pTabHeaderItem;
-                       pTabHeaderItem.Construct(IDA_HEADER_BUTTON_SONG + iCount);
-                       pTabHeaderItem.SetText(ResourceManager::GetString(TabNameId[iCount]));
-
-                       pColorizedNormalBitmap = CommonUtil::GetColorizedBitmapN(*pNormal, Color(pHeader.GetItemTextColor(HEADER_ITEM_STATUS_NORMAL)));
-                       pColorizedPressedBitmap = CommonUtil::GetColorizedBitmapN(*pNormal, Color(pHeader.GetItemTextColor(HEADER_ITEM_STATUS_SELECTED)));
-                       pTabHeaderItem.SetIcon(HEADER_ITEM_STATUS_NORMAL, pColorizedNormalBitmap);
-                       pTabHeaderItem.SetIcon(HEADER_ITEM_STATUS_PRESSED, pColorizedPressedBitmap);
-                       pTabHeaderItem.SetIcon(HEADER_ITEM_STATUS_SELECTED, pColorizedPressedBitmap);
-                       pHeader.AddItem(pTabHeaderItem);
-
-                       delete pColorizedNormalBitmap;
-                       pColorizedNormalBitmap = null;
-
-                       delete pColorizedPressedBitmap;
-                       pColorizedPressedBitmap = null;
-
-                       delete pNormal;
-                       pNormal = null;
-
-                       headItemChecked++;
-               }
-       }
-
-       if (headItemChecked == INIT_VALUE)
-       {
-               for (int iCount = 0; iCount < 2; iCount++)
-               {
-                       Bitmap* pNormal = ResourceManager::GetBitmapN(tabButtonImage[IMAGE_NORMAL_LOAD(iCount)]);
-                       Bitmap* pColorizedNormalBitmap = null;
-                       Bitmap* pColorizedPressedBitmap = null;
-
-                       HeaderItem pTabHeaderItem;
-                       pTabHeaderItem.Construct(IDA_HEADER_BUTTON_SONG + iCount);
-                       pTabHeaderItem.SetText(ResourceManager::GetString(TabNameId[iCount]));
-
-                       pColorizedNormalBitmap = CommonUtil::GetColorizedBitmapN(*pNormal, Color(pHeader.GetItemTextColor(HEADER_ITEM_STATUS_NORMAL)));
-                       pColorizedPressedBitmap = CommonUtil::GetColorizedBitmapN(*pNormal, Color(pHeader.GetItemTextColor(HEADER_ITEM_STATUS_SELECTED)));
-                       pTabHeaderItem.SetIcon(HEADER_ITEM_STATUS_NORMAL, pColorizedNormalBitmap);
-                       pTabHeaderItem.SetIcon(HEADER_ITEM_STATUS_PRESSED, pColorizedPressedBitmap);
-                       pTabHeaderItem.SetIcon(HEADER_ITEM_STATUS_SELECTED, pColorizedPressedBitmap);
-                       pHeader.AddItem(pTabHeaderItem);
-
-                       delete pColorizedNormalBitmap;
-                       pColorizedNormalBitmap = null;
-
-                       delete pColorizedPressedBitmap;
-                       pColorizedPressedBitmap = null;
-
-                       delete pNormal;
-                       pNormal = null;
-
-                       headItemChecked++;
-               }
-       }
-
-       AppLogDebug("EXIT");
-       return E_SUCCESS;
-}
-
-result
 ContentForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
        Header* pHeader = GetHeader();
+       CommonUtil::SetTabHeaderStyle(*pHeader);
        pHeader->AddActionEventListener(*this);
+       AddOrientationEventListener(*this);
        AppLogDebug("EXIT");
-       return InitializeHeaderItem(*pHeader);
+       return E_SUCCESS;
 }
 
 result
@@ -224,6 +89,7 @@ ContentForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        {
        case IDA_HEADER_BUTTON_SONG:
                {
+//                     pHeader->AddActionEventListener(*this);
                        String sceneId = ((addToPlaylistState == true) ? IDSCN_ALL_CONTENT_PICKER : IDSCN_ALL_LIST);
                        pSceneManager->GoForward(ForwardSceneTransition(sceneId));
                }
@@ -279,7 +145,7 @@ ContentForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        default:
                break;
-       }//end of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -287,12 +153,24 @@ void
 ContentForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-
        Header* pHeader = GetHeader();
-       pHeader->RemoveAllItems();
-
-       InitializeHeaderItem(*pHeader);
-       pHeader->Invalidate(true);
+       CommonUtil::SetTabHeaderStyle(*pHeader);
+       pHeader->Draw(true);
+       pHeader->Show();
+       AppLogDebug("EXIT");
+}
 
+void
+ContentForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+{
+       AppLogDebug("ENTER");
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+       Scene* pCurrentScenelScene = pSceneManager->GetCurrentScene();
+       ContentPanel* pContentPanel = dynamic_cast<ContentPanel*>(pCurrentScenelScene->GetPanel());
+       if (pContentPanel != null)
+       {
+               pContentPanel->OnOrientationPanelChanged(orientationStatus);
+       }
        AppLogDebug("EXIT");
 }
\ No newline at end of file
diff --git a/src/MpContentListPanel.cpp b/src/MpContentListPanel.cpp
new file mode 100644 (file)
index 0000000..a07d649
--- /dev/null
@@ -0,0 +1,223 @@
+//\r
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Flora License, Version 1.0 (the License);\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//     http://floralicense.org/license/\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an AS IS BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+/**\r
+ * @file               MpContentLibaryPanel.cpp\r
+ * @brief              This is the implementation file for ContentLibaryPanel class.\r
+ */\r
+\r
+#include "FUi.h"\r
+#include "MpCommonUtil.h"\r
+#include "MpContentLibaryPanel.h"\r
+#include "MpMiniPlayer.h"\r
+#include "MpSceneRegister.h"\r
+#include "MpTypes.h"\r
+\r
+using namespace Tizen::Graphics;\r
+using namespace Tizen::Ui;\r
+using namespace Tizen::Ui::Controls;\r
+using namespace Tizen::Ui::Scenes;\r
+\r
+static const int H_SHOW_MINI_PLAYER_STATUS_PORTRAIT_REGISTER_BAR = 236;\r
+static const int H_SHOW_MINI_PLAYER_STATUS_LANDSCAPE_REGISTER_BAR = 122;\r
+static const int H_HIDE_MINI_PLAYER_REGISTER_BAR = 0;\r
+\r
+ContentLibaryPanel::ContentLibaryPanel(void)\r
+       : ContentPanel::ContentPanel()\r
+       , __pMiniPlayerRegisterBar(null)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+ContentLibaryPanel::~ContentLibaryPanel(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+bool\r
+ContentLibaryPanel::Initialize(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       result r = Panel::Construct(IDL_CONTENTS_LIBARY_PANEL);\r
+       if (IsFailed(r))\r
+       {\r
+               AppLogDebug("Construct(IDL_CONTENT_LIST_PANEL) failed(%s)", GetErrorMessage(r));\r
+               return false;\r
+       }\r
+       AppLogDebug("EXIT");\r
+       return Construct();\r
+}\r
+\r
+result\r
+ContentLibaryPanel::Construct(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       __pContentTableView = static_cast<TableView*>(GetControl(IDC_CONTENTS_TABLEVIEW));\r
+       __pContentTableView->SetItemProvider(this);\r
+       __pContentTableView->AddTableViewItemEventListener(*this);\r
+\r
+       __pMiniPlayerRegisterBar = static_cast<Panel*>(GetControl(IDC_MINI_PLAYER_REGISTER_BAR));\r
+       __pNoContentLabel = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_LABEL));\r
+\r
+       AppLogDebug("EXIT");\r
+       return E_SUCCESS;\r
+}\r
+\r
+bool\r
+ContentLibaryPanel::IsEmptyContentList(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+       return false;\r
+}\r
+\r
+result\r
+ContentLibaryPanel::ReSizingMiniPlayerRegisterBar(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (IsExistMiniPlayer() == true)\r
+       {\r
+               const Form* pForm = dynamic_cast<Form*>(GetParent());\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
+       }\r
+       else\r
+       {\r
+               __pMiniPlayerRegisterBar->SetSize(__pMiniPlayerRegisterBar->GetWidth(), H_HIDE_MINI_PLAYER_REGISTER_BAR);\r
+       }\r
+       __pMiniPlayerRegisterBar->Invalidate(true);\r
+\r
+       AppLogDebug("EXIT");\r
+       return E_SUCCESS;\r
+}\r
+\r
+bool\r
+ContentLibaryPanel::IsExistMiniPlayer(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pMiniPlayerRegisterBar->GetControlCount() != INIT_VALUE)\r
+       {\r
+               AppLogDebug("EXIT");\r
+               return true;\r
+       }\r
+       AppLogDebug("EXIT");\r
+       return false;\r
+}\r
+\r
+void\r
+ContentLibaryPanel::UpdateContentLibaryScreenState(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       ReSizingMiniPlayerRegisterBar();\r
+       if (IsEmptyContentList() == true)\r
+       {\r
+               SetShowStateContentTableview(false);\r
+               SetShowStateNoContent(true);\r
+               AppLogDebug("EXIT");\r
+               return;\r
+       }\r
+\r
+       SetShowStateNoContent(false);\r
+       SetShowStateContentTableview(true);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+result\r
+ContentLibaryPanel::AddMiniPlayer(Tizen::Ui::Control& control)\r
+{\r
+       AppLogDebug("ENTER");\r
+       RemoveMiniPlayer();\r
+       AppLogDebug("EXIT");\r
+       return __pMiniPlayerRegisterBar->AddControl(control);\r
+}\r
+\r
+void\r
+ContentLibaryPanel::RemoveMiniPlayer(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       __pMiniPlayerRegisterBar->RemoveAllControls();\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentLibaryPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,\r
+                                       const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)\r
+{\r
+       AppLogDebug("ENTER");\r
+       ContentPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);\r
+       TryRegisterMiniPlayer();\r
+       if (IsExistMiniPlayer() == true)\r
+       {\r
+               MiniPlayer* pMiniPlayer = static_cast<MiniPlayer*>(__pMiniPlayerRegisterBar->GetControl(IDL_MINI_PLYAER_PANEL));\r
+               pMiniPlayer->MiniPlayerActivate();\r
+               SetShowStateFooter(false);\r
+       }\r
+       UpdateContentLibaryScreenState();\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentLibaryPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (IsExistMiniPlayer() == true)\r
+       {\r
+               MiniPlayer* pMiniPlayer = static_cast<MiniPlayer*>(__pMiniPlayerRegisterBar->GetControl(IDL_MINI_PLYAER_PANEL));\r
+               pMiniPlayer->MiniPlayerDeactivate();\r
+       }\r
+       ContentPanel::OnSceneDeactivated(currentSceneId, nextSceneId);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentLibaryPanel::OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orientationStatus)\r
+{\r
+       AppLogDebug("ENTER");\r
+       ReSizingMiniPlayerRegisterBar();\r
+       __pContentTableView->Invalidate(true);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentLibaryPanel::TryRegisterMiniPlayer(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       SceneManager* pSceneManager = SceneManager::GetInstance();\r
+       AppAssert(pSceneManager);\r
+\r
+       if (!pSceneManager->IsSceneAlive(IDSCN_PLAYER) || IsExistMiniPlayer() == true)\r
+       {\r
+               return;\r
+       }\r
+\r
+       MiniPlayer* pMiniPlayer =  new (std::nothrow) MiniPlayer();\r
+       if (IsFailed(pMiniPlayer->Construct()))\r
+       {\r
+               AppLogDebug("MiniPlayer.Construct() failed");\r
+               delete pMiniPlayer;\r
+               SetShowStateFooter(true);\r
+               return;\r
+       }\r
+\r
+       pMiniPlayer->SetBackActionEventListner(*this, IDA_FOOTER_BUTTON_BACK);\r
+       pMiniPlayer->SetMoreContextMenuActionEventListner(this, IDA_FOOTER_BUTTON_MORE);\r
+       AddMiniPlayer(*pMiniPlayer);\r
+       SetShowStateFooter(false);\r
+       AppLogDebug("EXIT");\r
+}
\ No newline at end of file
diff --git a/src/MpContentPanel.cpp b/src/MpContentPanel.cpp
new file mode 100644 (file)
index 0000000..48c9a63
--- /dev/null
@@ -0,0 +1,274 @@
+//\r
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Flora License, Version 1.0 (the License);\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//     http://floralicense.org/license/\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an AS IS BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+/**\r
+ * @file               MpContentPanel.cpp\r
+ * @brief              This is the implementation file for ContentPanel class.\r
+ */\r
+\r
+#include "FUi.h"\r
+#include "MpContentPanel.h"\r
+#include "MpCommonUtil.h"\r
+\r
+using namespace Tizen::Graphics;\r
+using namespace Tizen::Ui;\r
+using namespace Tizen::Ui::Controls;\r
+\r
+ContentPanel::ContentPanel(void)\r
+       : __pContentTableView(null)\r
+       , __pNoContentLabel(null)\r
+       , __footerButtonStyle(STYLE_MAX)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+ContentPanel::~ContentPanel(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+result\r
+ContentPanel::SetShowStateNoContent(bool isShow)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pNoContentLabel != null && __pNoContentLabel->GetShowState() != isShow)\r
+       {\r
+               __pNoContentLabel->SetShowState(isShow);\r
+               __pNoContentLabel->Invalidate(true);\r
+               return E_SUCCESS;\r
+       }\r
+\r
+       AppLogDebug("EXIT");\r
+       return E_FAILURE;\r
+}\r
+\r
+result\r
+ContentPanel::SetShowStateContentTableview(bool isShow)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if ( __pContentTableView != null && __pContentTableView->GetShowState() != isShow)\r
+       {\r
+               __pContentTableView->SetShowState(isShow);\r
+               __pContentTableView->Invalidate(true);\r
+               return E_SUCCESS;\r
+       }\r
+\r
+       AppLogDebug("EXIT");\r
+       return E_FAILURE;\r
+}\r
+\r
+Tizen::Ui::Controls::Header*\r
+ContentPanel::GetHeader(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       AppLogDebug("EXIT");\r
+       return pForm->GetHeader();\r
+}\r
+\r
+Tizen::Ui::Controls::Footer*\r
+ContentPanel::GetFooter(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       AppLogDebug("EXIT");\r
+       return pForm->GetFooter();\r
+}\r
+\r
+void\r
+ContentPanel::SetShowStateFooter(bool isShow)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Footer* pFooter = GetFooter();\r
+       pFooter->SetShowState(isShow);\r
+       pFooter->Invalidate(true);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::SetBackEventListner(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       if (pForm == null)\r
+       {\r
+               AppLogDebug("dynamic_cast<Form*>(GetParent()) is null");\r
+               return;\r
+       }\r
+       const_cast<Form*>(pForm)->SetFormBackEventListener(this);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::RemoveBackEventListner(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       if (pForm == null)\r
+       {\r
+               AppLogDebug("dynamic_cast<Form*>(GetParent()) is null");\r
+               return;\r
+       }\r
+       const_cast<Form*>(pForm)->SetFormBackEventListener(static_cast<IFormBackEventListener*>(null));\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::SetLayoutFitToForm(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       AppAssert(pForm);\r
+\r
+       CommonUtil::SetLayoutFitToContainer(*pForm, *this);\r
+       Invalidate(true);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::SetFooter(FooterButtonStyle footerButtonStyle)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Footer* pFooter = GetFooter();\r
+       {\r
+               CommonUtil::SetBackButtonStyleFooter(*pFooter, footerButtonStyle);\r
+               __footerButtonStyle = footerButtonStyle;\r
+       }\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::SetFooterStyle(FooterButtonStyle footerButtonStyle)\r
+{\r
+       AppLogDebug("ENTER");\r
+       __footerButtonStyle = footerButtonStyle;\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+FooterButtonStyle\r
+ContentPanel::GetCurrentFooterStyle(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+       return __footerButtonStyle;\r
+}\r
+\r
+int\r
+ContentPanel::GetItemCount(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+       return INIT_VALUE;\r
+}\r
+\r
+Tizen::Ui::Controls::TableViewItem*\r
+ContentPanel::CreateItem(const int itemIndex, int itemWidth)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+       return null;\r
+}\r
+\r
+bool\r
+ContentPanel::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+       return true;\r
+}\r
+\r
+void\r
+ContentPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+int\r
+ContentPanel::GetDefaultItemHeight(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+       return ITEM_HEIGHT;\r
+}\r
+\r
+void\r
+ContentPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,\r
+                                                       int itemIndex,\r
+                                                       Tizen::Ui::Controls::TableViewItem* pItem,\r
+                                                       Tizen::Ui::Controls::TableViewItemStatus status)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView,\r
+                                                                       int itemIndex,\r
+                                                                       Tizen::Ui::Controls::TableViewContextItem* pContextItem,\r
+                                                                       bool activated)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,\r
+                                               int itemIndexFrom,\r
+                                               int itemIndexTo)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orientationStatus)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,\r
+                                                               const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Footer* pFooter = GetFooter();\r
+       pFooter->AddActionEventListener(*this);\r
+       SetBackEventListner();\r
+       SetFooter(__footerButtonStyle);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Footer* pFooter = GetFooter();\r
+       pFooter->RemoveActionEventListener(*this);\r
+       RemoveBackEventListner();\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Tizen::App::Application::GetInstance()->Terminate();\r
+       AppLogDebug("EXIT");\r
+}
\ No newline at end of file
index b478433..efce86f 100644 (file)
@@ -572,7 +572,7 @@ FolderContentListForm::CreateItem(const int itemIndex, int itemWidth)
                pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
                pItem->SetContextItem(__pContextItem);
        }
-       pItem->SetBackgroundColor(COLOR_WHITE);
+//     pItem->SetBackgroundColor(COLOR_WHITE);
 
        pContentInfoStruct = __pPresentationModel->GetContentInfoN(itemIndex);
        if (pContentInfoStruct == null)
index 4715736..c0fba6f 100644 (file)
@@ -112,7 +112,6 @@ FolderContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, in
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -124,7 +123,6 @@ FolderContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, in
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -171,7 +169,6 @@ FolderContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, in
 
        case IDA_FOOTER_BUTTON_CANCEL:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        Form* pForm = dynamic_cast<Form*>(GetParent());
                        AppAssert(pForm);
                        CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
@@ -181,7 +178,7 @@ FolderContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, in
 
        default:
                break;
-       }//End of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -242,7 +239,7 @@ FolderContentPickerPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        CommonUtil::CreateContentPikerTableViewItem(*pItem, pContentInfoStruct->TitleName, CommonUtil::GetFormatDate(pContentInfoStruct->Duration));
 
@@ -301,7 +298,7 @@ FolderContentPickerPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::Table
 
        default:
                break;
-       }//end of switch
+       }
 
        CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
 
index b5632d3..f9c3910 100644 (file)
@@ -136,7 +136,6 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -179,7 +178,6 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_FOOTER_BUTTON_CANCEL:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        pSceneManager->GoBackward(BackwardSceneTransition());
                        Form* pForm = dynamic_cast<Form*>(GetParent());
                        AppAssert(pForm);
@@ -190,7 +188,7 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        default:
                break;
-       }//end of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -262,7 +260,7 @@ FolderListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        AppLogDebug("ENTER");
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        String* pContentPath = __pPresentationModel->GetFolderPath(itemIndex);
        Bitmap* pFolderBitmap = null;
@@ -416,7 +414,7 @@ FolderListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
 
        default:
                break;
-       }//end of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
index ad9c64e..6dcd9f9 100644 (file)
@@ -34,30 +34,18 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int W_FAST_SCROLL = 50;
-
 static const Tizen::Base::String MEDIA_PATH = Environment::GetMediaPath();
 static const Tizen::Base::String EXTERNAL_STORAGE_PATH = Environment::GetExternalStoragePath();
 static const Tizen::Base::String MEDIA_SOUND_PATH = Environment::GetMediaPath() + L"Sounds";
 static const Tizen::Base::String SEPARATOR_SLASH = L"/";
 static const int DEPTH = 3;
 
-static const Tizen::Graphics::Rectangle RECT_FOLDER_ITEM_THUMBNAIL (16, 32, 64, 64);
-static const Tizen::Graphics::Rectangle RECT_FOLDER_ITEM_NAME (96, 8, 400, 56);
-static const Tizen::Graphics::Rectangle RECT_FOLDER_ITEM_COUNT (496, 8, 208, 56);
-static const Tizen::Graphics::Rectangle RECT_FOLDER_ITEM_PATH_NAME (96, 64, 608, 56);
-
 FolderListPanel::FolderListPanel(void)
        : __itemIndex(-1)
-       , __pNowPlayContentPanel(null)
        , __pPlayListPickerPopup(null)
        , __pContextItem(null)
-       , __pContentTableView(null)
-       , __pNoContentImageLabel(null)
-       , __pNoContentTextLabel(null)
-       , __pRenameEditArea(null)
-       , __pRenamePanel(null)
        , __scrolledDistance(0)
+       , __pMoreContextMenu(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -69,95 +57,20 @@ FolderListPanel::~FolderListPanel(void)
        AppLogDebug("EXIT");
 }
 
-bool
-FolderListPanel::Initialize(void)
-{
-       AppLogDebug("ENTER");
-
-       result r = Construct(Rectangle(0, 0, 0, 0));
-       if (IsFailed(r))
-       {
-               return false;
-       }
-
-       AppLogDebug("EXIT");
-
-       return true;
-}
-
 result
 FolderListPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       int width = pForm->GetClientAreaBounds().width;
-       int height = pForm->GetClientAreaBounds().height;
-
-       SetBounds(INIT_VALUE, INIT_VALUE, width, height);
-
-       __pContentTableView = CommonUtil::CreateTableView(width, height);
        __pContentTableView->AddFastScrollListener(*this);
-       __pContentTableView->SetItemProvider(this);
-       __pContentTableView->AddTableViewItemEventListener(*this);
-       __pContentTableView->AddScrollEventListener(*this);
-
-       __pNoContentImageLabel = new (std::nothrow) Label();
-       __pNoContentImageLabel->Construct(Rectangle((pForm->GetWidth() - W_NO_CONTENT) / 2, Y_GAP_NO_CONTENT, W_NO_CONTENT, H_NO_CONTENT), L"");
-       __pNoContentImageLabel->SetBackgroundBitmap(*(ResourceManager::GetBitmapN(NO_CONTENT_BITMAP)));
-
-       __pNoContentTextLabel = new (std::nothrow) Label();
-       __pNoContentTextLabel->Construct(Rectangle(0,
-                                                               __pNoContentImageLabel->GetHeight() + __pNoContentImageLabel->GetY(),
-                                                               pForm->GetWidth(),
-                                                               H_TEXT_NO_CONTENT),
-                                                               ResourceManager::GetString(L"IDS_COM_BODY_NO_ITEMS"));
-       __pNoContentTextLabel->SetTextConfig(FONT_SIZE_NO_CONTENT, LABEL_TEXT_STYLE_BOLD);
-
-       __pContextItem = new (std::nothrow) TableViewContextItem();
-       __pContextItem->Construct(Dimension(width, ITEM_HEIGHT));
-       CommonUtil::CreateTableViewContextItem(*__pContextItem, *this);
-
-       AddControl(*__pNoContentImageLabel);
-       AddControl(*__pNoContentTextLabel);
-       AddControl(*__pContentTableView);
-
-       __pRenamePanel = new (std::nothrow) Panel();
-       __pRenamePanel->Construct(Rectangle(0, 0, width - W_FAST_SCROLL, ITEM_HEIGHT - 1));
-
-       Label* pLabel = new (std::nothrow) Label();
-       pLabel->Construct(Rectangle(0, 0, __pRenamePanel->GetWidth(), ITEM_HEIGHT), L"");
-       pLabel->SetBackgroundColor(Color::GetColor(COLOR_ID_WHITE));
-
-       __pRenameEditArea = new (std::nothrow) EditArea();
-       __pRenameEditArea->Construct(Rectangle(10, pLabel->GetY() + 10, 540, pLabel->GetHeight() - 20), INPUT_STYLE_OVERLAY, 100);
-       __pRenameEditArea->SetName(RENAME_EDIT_AREA);
-       __pRenameEditArea->SetTextSize(28);
-       __pRenameEditArea->SetTextAlignment(ALIGNMENT_LEFT);
-       __pRenameEditArea->SetOverlayKeypadCommandButtonVisible(false);
-       __pRenameEditArea->SetKeypadActionEnabled(true);
-       __pRenameEditArea->SetKeypadAction(KEYPAD_ACTION_DONE);
-       __pRenameEditArea->AddKeypadEventListener(*this);
-
-       Button* pCancelButton = new (std::nothrow) Button();
-       pCancelButton->Construct(Rectangle(pLabel->GetWidth() - 110, pLabel->GetY(), 100, pLabel->GetHeight()));
-       pCancelButton->SetText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT_CANCEL"));
-       pCancelButton->SetTextSize(22);
-       pCancelButton->SetActionId(IDA_RENAME_CANCEL_BUTTON);
-       pCancelButton->AddActionEventListener(*this);
-
-       __pRenamePanel->AddControl(*pLabel);
-       __pRenamePanel->AddControl(*__pRenameEditArea);
-       __pRenamePanel->AddControl(*pCancelButton);
-       AddControl(*__pRenamePanel);
-
-       __pRenamePanel->SetShowState(false);
+       __pContentTableView->SetItemDividerColor(Color(COLOR_ID_WHITE));
+       __pContextItem = CreatePlayallAddtoContextItem();
 
        __pPresentationModel = FolderListPresentationModel::GetInstance();
 
+       SetLayoutFitToForm();
+       CommonUtil::SetSimpleTitleStyle(*GetHeader(), L"Folder View");
+       SetFooterStyle(STYLE_MORE_ADD);
        AppLogDebug("EXIT");
-
        return E_SUCCESS;
 }
 
@@ -165,7 +78,6 @@ result
 FolderListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-
        delete __pContextItem;
        __pContextItem = null;
 
@@ -177,93 +89,93 @@ void
 FolderListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 {
        AppLogDebug("ENTER");
-
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
        switch (actionId)
        {
-       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
+       case IDA_FLICK_BUTTON_PLAY_ALL:
                {
-                       if (__pPresentationModel->GetAllFolderCount() == 0)
-                       {
-                               MessageBox messageBox;
-                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_BODY_NO_ITEMS"), MSGBOX_STYLE_NONE, 500);
+                       ArrayList* pData = new (std::nothrow) ArrayList();
+                       pData->Construct();
 
-                               int modalResult = 0;
-                               messageBox.ShowAndWait(modalResult);
-                               break;
-                       }
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST_EDITOR));
+                       pData->Add(*(new (std::nothrow) String(MUSIC)));
+                       pData->Add(*(new (std::nothrow) Integer(0)));
+                       pData->Add(*(__pPresentationModel->GetContentPathListN(__itemIndex)));
+
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pData);
                }
                break;
 
-       case IDA_FOOTER_BUTTON_SEARCH:
+       case IDA_FLICK_BUTTON_ADD_TO_PALYLIST:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
+                       __pPlayListPickerPopup->Initialize(this, __pPresentationModel->GetContentPathListN(__itemIndex));
+                       __pPlayListPickerPopup->SetShowState(true);
+                       __pPlayListPickerPopup->Show();
                }
                break;
 
-       case IDA_FLICK_BUTTON_PLAY_ALL:
+       case IDA_FOOTER_BUTTON_MORE:
                {
-                       ArrayList* pData = new (std::nothrow) ArrayList();
-                       pData->Construct();
+                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
+                       if (__pMoreContextMenu != null)
+                       {
+                               delete __pMoreContextMenu;
+                               __pMoreContextMenu = null;
+                       }
 
-                       pData->Add(*(new (std::nothrow) String(MUSIC)));
-                       pData->Add(*(new (std::nothrow) Integer(0)));
-                       pData->Add(*(__pPresentationModel->GetContentPathListN(__itemIndex)));
+                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
+                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
 
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pData);
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"), IDA_MORE_CONTEXT_MENU_EDIT);
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"), IDA_MORE_CONTEXT_MENU_SEARCH);
+                       __pMoreContextMenu->AddItem(L"Go to Library", IDA_MORE_CONTEXT_MENU_GO_TO_LIBRARY);//NEED STRING
+
+                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
+                       __pMoreContextMenu->AddActionEventListener(*this);
+                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
+                       __pMoreContextMenu->SetShowState(true);
+                       __pMoreContextMenu->Show();
                }
                break;
 
-       case IDA_FLICK_BUTTON_DELETE:
+       case IDA_MORE_CONTEXT_MENU_EDIT:
                {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST_EDITOR));
                }
                break;
 
-       case IDA_RENAME_CANCEL_BUTTON:
+       case IDA_MORE_CONTEXT_MENU_SEARCH:
                {
-                       HideKeypadAndRenamePanel();
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
                }
                break;
 
-       case IDA_FLICK_BUTTON_ADD_TO_PALYLIST:
+       case IDA_MORE_CONTEXT_MENU_GO_TO_LIBRARY:
                {
-                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-                       __pPlayListPickerPopup->Initialize(this, __pPresentationModel->GetContentPathListN(__itemIndex));
-                       //__pPlayListPickerPopup->SetCollectedContent(__pPresentationModel->GetContentPathListN(__itemIndex));
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
+                       CommonUtil::SetTabHeaderStyle(*GetHeader());
+                       GetHeader()->Invalidate(true);
+                       SceneManager::GetInstance()->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_BACK:
+               {
+                       Tizen::App::Application::GetInstance()->Terminate();
                }
                break;
 
        default:
                break;
        }
-
        AppLogDebug("EXIT");
 }
 
 void
 FolderListPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
-       AppLogDebug("ENTER");
-       if (CommonUtil::GetAddtoPlaylistState() == true)
-       {
-               SceneManager* pSceneManager = SceneManager::GetInstance();
-               AppAssert(pSceneManager);
-               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYLIST_LIST,
-                                                               SCENE_TRANSITION_ANIMATION_TYPE_NONE,
-                                                               SCENE_HISTORY_OPTION_NO_HISTORY,
-                                                               SCENE_DESTROY_OPTION_DESTROY));
-               CommonUtil::SetAddtoPlaylistState(false);
-       }
-       else
-       {
-               Tizen::App::Application::GetInstance()->Terminate();
-       }
-       AppLogDebug("EXIT");
+       Tizen::App::Application::GetInstance()->Terminate();
 }
 
 void
@@ -272,43 +184,14 @@ FolderListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSce
                                        Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-       pForm->SetFormBackEventListener(this);
-
-       Footer* pFooter = CommonUtil::CreateContentListFooter(*pForm);
-       pFooter->AddActionEventListener(*this);
-       pFooter->SetBackButton();
-
-       SceneManager* pSceneManager = SceneManager::GetInstance();
-       AppAssert(pSceneManager);
-
-       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
-       {
-               if (__pNowPlayContentPanel == null)
-               {
-                       __pNowPlayContentPanel = new (std::nothrow) NowPlayContentPanel();
-                       __pNowPlayContentPanel->Initialize();
-                       AddControl(*__pNowPlayContentPanel);
-               }
-               CommonUtil::ShowNowPlayPanel(*__pContentTableView, __pNowPlayContentPanel->GetPlayStatus(), pForm->GetClientAreaBounds());
-       }
-
        UpdateContentList();
-       if (__pPresentationModel != null)
-       {
-               int totalFolderCount = __pPresentationModel->GetAllFolderCount();
-               CommonUtil::SetButtonEnabled(*pForm, totalFolderCount, IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST);
+       ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
 
-               CommonUtil::ShowNoContentImage(totalFolderCount, *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
-       }
        if (pArgs != null)
        {
                pArgs->RemoveAll(true);
                delete pArgs;
        }
-
        AppLogDebug("EXIT");
 }
 
@@ -317,17 +200,7 @@ FolderListPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSce
                                                                const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
-
-       HideKeypadAndRenamePanel();
-
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       Footer* pFooter = pForm->GetFooter();
-       pFooter->RemoveAllButtons();
-       pFooter->RemoveAllItems();
-       pFooter->RemoveActionEventListener(*this);
-
+       ContentLibaryPanel::OnSceneDeactivated(currentSceneId, nextSceneId);
        AppLogDebug("EXIT");
 }
 
@@ -335,14 +208,12 @@ int
 FolderListPanel::GetItemCount(void)
 {
        AppLogDebug("ENTER");
-
        if (__pPresentationModel == null)
        {
                return INIT_VALUE;
        }
 
        AppLogDebug("EXIT");
-
        return __pPresentationModel->GetAllFolderCount();
 }
 
@@ -350,11 +221,6 @@ Tizen::Ui::Controls::TableViewItem*
 FolderListPanel::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-
-       TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
-
        String* pContentPath = __pPresentationModel->GetFolderPath(itemIndex);
        Bitmap* pFolderBitmap = null;
        String fullContentPath = null;
@@ -404,6 +270,7 @@ FolderListPanel::CreateItem(const int itemIndex, int itemWidth)
                        depthCount++;
                }
        }
+
        if (depthCount > DEPTH)
        {
                folderNamePosition = 0;
@@ -417,71 +284,37 @@ FolderListPanel::CreateItem(const int itemIndex, int itemWidth)
                fullContentPath.Insert(L".", 0);
        }
 
-       Label* pFolderThumbnailBG = new (std::nothrow) Label();
-       pFolderThumbnailBG->Construct(RECT_FOLDER_ITEM_THUMBNAIL, L"");
-       pFolderThumbnailBG->SetBackgroundColor(Color::GetColor(COLOR_ID_BLACK));
+       Panel* pTableViewItem = new (std::nothrow) Panel();
+       if (IsFailed(pTableViewItem->Construct(IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
 
-       Label* pFolderThumbnail = new (std::nothrow) Label();
-       pFolderThumbnail->Construct(RECT_FOLDER_ITEM_THUMBNAIL, L"");
-       pFolderThumbnail->SetBackgroundBitmap(*pFolderBitmap);
+       Label* pStorageIcon = static_cast<Label*>(pTableViewItem->GetControl(IDC_STORAGE_TYPE_ICON));
+       pStorageIcon->SetBackgroundBitmap(*pFolderBitmap);
+       delete pFolderBitmap;
 
-       Label* pFolderName = new (std::nothrow) Label();
-       pFolderName->Construct(RECT_FOLDER_ITEM_NAME,L"");
-       pFolderName->SetTextConfig(FONT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pFolderName->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       Label* pFolderPath = static_cast<Label*>(pTableViewItem->GetControl(IDC_FOLDER_PATH));
+       pFolderPath->SetText(fullContentPath);
+       Label* pFolderName = static_cast<Label*>(pTableViewItem->GetControl(IDC_FOLDER_NAME));
        pFolderName->SetText(strFolderName);
+       Label* pFolderItemCount = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_ITEM_COUNT));
+       pFolderItemCount->SetText(CommonUtil::SetSongsString(__pPresentationModel->GetContentCount(itemIndex)));
 
-       Label* pFolderCount = new (std::nothrow) Label();
-       pFolderCount->Construct(RECT_FOLDER_ITEM_COUNT, L"");
-       pFolderCount->SetTextConfig(FONT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pFolderCount->SetTextHorizontalAlignment(ALIGNMENT_RIGHT);
-       pFolderCount->SetText(CommonUtil::SetSongsString(__pPresentationModel->GetContentCount(itemIndex)));
-
-       Label* pFolderPathName = new (std::nothrow) Label();
-       pFolderPathName->Construct(RECT_FOLDER_ITEM_PATH_NAME, L"");
-       pFolderPathName->SetTextConfig(FONT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pFolderPathName->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pFolderPathName->SetText(fullContentPath);
-
-       pItem->AddControl(*pFolderThumbnailBG);
-       pItem->AddControl(*pFolderThumbnail);
-       pItem->AddControl(*pFolderName);
-       pItem->AddControl(*pFolderCount);
-       pItem->AddControl(*pFolderPathName);
-
-       delete pFolderBitmap;
-       pFolderBitmap = null;
+       RelativeLayout layout;
+       layout.Construct();
+       TableViewItem* pItem = new (std::nothrow) TableViewItem();
+       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
+       pItem->AddControl(*pTableViewItem);
        pItem->SetContextItem(__pContextItem);
+       pItem->SetIndividualSelectionEnabled(pTableViewItem, true);
 
        AppLogDebug("EXIT");
-
        return pItem;
 }
 
-bool
-FolderListPanel::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return true;
-}
-
-void
-FolderListPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-int
-FolderListPanel::GetDefaultItemHeight(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return ITEM_HEIGHT;
-}
-
 void
 FolderListPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
@@ -489,7 +322,6 @@ FolderListPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tab
                                                        Tizen::Ui::Controls::TableViewItemStatus status)
 {
        AppLogDebug("ENTER");
-
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
@@ -502,9 +334,6 @@ FolderListPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tab
                pData->Add(*(new (std::nothrow) Integer(itemIndex)));
                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_CONTENT_LIST), pData);
        }
-
-       HideKeypadAndRenamePanel();
-
        AppLogDebug("EXIT");
 }
 
@@ -515,32 +344,17 @@ FolderListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Control
                                                                        bool activated)
 {
        AppLogDebug("ENTER");
-
        if (activated == true)
        {
                __itemIndex = itemIndex;
        }
-
-       HideKeypadAndRenamePanel();
-
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndexFrom,
-                                               int itemIndexTo)
-{
-       AppLogDebug("ENTER");
        AppLogDebug("EXIT");
 }
 
-
 void
 FolderListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index)
 {
        AppLogDebug("ENTER");
-
        int totalCount = __pPresentationModel->GetAllFolderCount();
        for (int iCount = 0; iCount < totalCount; iCount++)
        {
@@ -580,8 +394,7 @@ FolderListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Ba
                        __pContentTableView->ScrollToItem(iCount);
                        break;
                }
-       }//end of for
-
+       }
        AppLogDebug("EXIT");
 }
 
@@ -589,12 +402,10 @@ void
 FolderListPanel::OnScrollEndReached (Tizen::Ui::Control& source, Tizen::Ui::Controls::ScrollEndEvent type)
 {
        AppLogDebug("ENTER");
-
        if (type == SCROLL_END_EVENT_END_TOP)
        {
                __scrolledDistance = 0;
        }
-
        AppLogDebug("EXIT");
 }
 
@@ -602,271 +413,92 @@ void
 FolderListPanel::OnScrollPositionChanged (Tizen::Ui::Control& source, int scrollPos)
 {
        AppLogDebug("ENTER");
-
-       if (__pRenamePanel != null && __pRenamePanel->GetShowState() == true)
-       {
-               __pRenamePanel->SetShowState(false);
-               __pRenamePanel->Invalidate(true);
-       }
        __scrolledDistance = scrollPos;
-
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::OnScrollStopped (Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-/*void
-FolderListPanel::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
-
-       TableViewContextItem* pParent = static_cast<TableViewContextItem*>(source.GetParent());
-       if (pParent == null)
-       {
-               return;
-       }
-
-       if (__pRenameEditArea != null && __pPresentationModel != null)
-       {
-               int textPosition = 0;
-               String strResult = null;
-               String* pContentPath = __pPresentationModel->GetFolderPath(__itemIndex);
-
-               pContentPath->LastIndexOf(SEPARATOR_SLASH, pContentPath->GetLength() - 1, textPosition);
-               pContentPath->SubString(textPosition + 1, strResult);
-
-               __pRenameEditArea->SetText(strResult);
-       }
-
-       const Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       Point itemPoint;
-       itemPoint.x = 0;
-
-       if (__pNowPlayContentPanel == null)
-       {
-               itemPoint.y = pParent->GetY() - __scrolledDistance;
-       }
-       else
-       {
-               itemPoint.y = pParent->GetY() - (__scrolledDistance + H_NOW_PLAY_BAR);
-       }
-
-       __pRenamePanel->SetShowState(true);
-       __pRenamePanel->SetPosition(itemPoint);
-
-       if (__pRenameEditArea != null && __pRenameEditArea->GetShowState() == true)
-       {
-               __pRenameEditArea->ShowKeypad();
-       }
-
-       Invalidate(true);
-
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
        AppLogDebug("EXIT");
 }
 
 void
-FolderListPanel::OnTouchDoublePressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
+FolderListPanel::OnUpdateContentList(void)
 {
        AppLogDebug("ENTER");
+       UpdateContentList();
        AppLogDebug("EXIT");
 }
 
 void
-FolderListPanel::OnTouchCanceled(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}*/
-
-void
-FolderListPanel::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction)
+FolderListPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-
-       if (__pPresentationModel == null)
-       {
-               return;
-       }
-
-       switch (keypadAction)
+       AppLogDebug("OnUserEventReceivedN %d", requestId);
+       if (requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP)
        {
-       case KEYPAD_ACTION_DONE:
+               if (__pPlayListPickerPopup != null)
                {
-                       int textPosition = 0;
-                       String strResult = null;
-                       String* pContentPath = __pPresentationModel->GetFolderPath(__itemIndex);
-
-                       pContentPath->LastIndexOf(SEPARATOR_SLASH, pContentPath->GetLength() -1, textPosition);
-                       pContentPath->SubString(textPosition + 1, strResult);
-
-                       if (strResult.CompareTo(__pRenameEditArea->GetText()) != 0)
-                       {
-                               String modifyDirectoryName = null;
-
-                               pContentPath->SubString(0, textPosition + 1, modifyDirectoryName);
-                               modifyDirectoryName.Append(__pRenameEditArea->GetText());
-
-                               result r = Directory::Rename(*pContentPath, modifyDirectoryName);
-                               if (IsFailed(r))
-                               {
-                                       HideKeypadAndRenamePanel();
-                                       break;
-                               }
-
-                               if (__pPresentationModel != null && __pContentTableView != null)
-                               {
-                                       __pPresentationModel->UpdateFolderPathList();
-                                       __pContentTableView->UpdateTableView();
-                               }
-                       }
+                       delete __pPlayListPickerPopup;
+                       __pPlayListPickerPopup = null;
                }
-               break;
-
-       default:
-               break;
-       }//end of switch
-
-       HideKeypadAndRenamePanel();
-
+       }
        AppLogDebug("EXIT");
 }
 
 void
-FolderListPanel::OnKeypadClosed(Tizen::Ui::Control& source)
+FolderListPanel::UpdateContentList(void)
 {
        AppLogDebug("ENTER");
-
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       if (pForm->GetFooter()->GetShowState() == false)
+       if (__pPresentationModel != null && __pContentTableView != null)
        {
-               pForm->GetFooter()->SetShowState(true);
+               __pPresentationModel->UpdateFolderPathList();
+               __pContentTableView->UpdateTableView();
        }
 
-       Invalidate(true);
-
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::OnKeypadOpened(Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
-
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       if (pForm->GetFooter()->GetShowState())
+       if (__pMoreContextMenu != null && __pMoreContextMenu->GetShowState() == true)
        {
-               pForm->GetFooter()->SetShowState(false);
+               __pMoreContextMenu->SetShowState(false);
+               __pMoreContextMenu->Invalidate(true);
        }
-       Invalidate(true);
-
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::OnKeypadWillOpen(Tizen::Ui::Control &source)
-{
-       AppLogDebug("ENTER");
        AppLogDebug("EXIT");
 }
 
-void
-FolderListPanel::HideKeypadAndRenamePanel(void)
+bool
+FolderListPanel::IsEmptyContentList(void)
 {
        AppLogDebug("ENTER");
-
-       if (__pRenameEditArea != null && __pRenameEditArea->IsKeypadEnabled())
+       if (__pPresentationModel == null || __pPresentationModel->GetAllFolderCount() == INIT_VALUE)
        {
-               __pRenameEditArea->HideKeypad();
+               AppLogDebug("EXIT");
+               return true;
        }
-
-       if (__pRenamePanel != null && __pRenamePanel->GetShowState())
-       {
-               __pRenamePanel->SetShowState(false);
-               __pRenamePanel->Invalidate(true);
-       }
-
-       Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
        AppLogDebug("EXIT");
+       return false;
 }
 
-void
-FolderListPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
+Tizen::Ui::Controls::TableViewContextItem*
+FolderListPanel::CreatePlayallAddtoContextItem(void)
 {
        AppLogDebug("ENTER");
-       AppLogDebug("OnUserEventReceivedN %d", requestId);
-       if (requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP)
+       TableViewContextItem* pTableViewContextItem = new (std::nothrow) TableViewContextItem();
+       if (IsFailed(pTableViewContextItem->Construct(Dimension(GetWidth(), ITEM_HEIGHT))))
        {
-               if (__pPlayListPickerPopup != null)
-               {
-                       delete __pPlayListPickerPopup;
-                       __pPlayListPickerPopup = null;
-               }
+               AppLogDebug("Construct(Dimension(GetWidth(), ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
        }
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListPanel::UpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
+       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
+       if (IsFailed(pSweepQuickMenu->Construct(IDL_CONTEXT_ITEM_PLAYALL_ADDTO)))
        {
-               __pPresentationModel->UpdateFolderPathList();
-               __pContentTableView->UpdateTableView();
+               AppLogDebug("Construct(IDL_CONTEXT_ITEM_PLAYALL_ADDTO) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
        }
-       AppLogDebug("EXIT");
+       Button* pPlayAllButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_PLAY_ALL));
+       pPlayAllButton->SetText(L"Play all"); ////NEED STRING
+       pPlayAllButton->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
+       pPlayAllButton->AddActionEventListener(*this);
+       Button* pAddtoPlayListButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_ADD_TO_PLAYLIST));
+       pAddtoPlayListButton->SetText(L"Add to Playlist"); //NEED STRING
+       pAddtoPlayListButton->SetActionId(IDA_FLICK_BUTTON_ADD_TO_PALYLIST);
+       pAddtoPlayListButton->AddActionEventListener(*this);
+       pTableViewContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
+       pTableViewContextItem->AddControl(*pSweepQuickMenu);
+       CommonUtil::SetLayoutFitToContainer(*pTableViewContextItem, *pSweepQuickMenu);
+       AppLogDebug("EXIT");
+       return pTableViewContextItem;
 }
\ No newline at end of file
index 502e9d7..e397fd9 100644 (file)
@@ -147,7 +147,7 @@ FolderListPresentationModel::GetFolderInfoN(int folderIndex)
                return null;
        }
 
-       IList* pSearchList = contentDirectory.GetContentDirectoryItemListN(*(static_cast<String*>(__pFolderPathList->GetAt(folderIndex))),SEARCH_PAGE_NO,SEARCH_COUNT_PER_PAGE,STRING_SORT_TITLE,SORT_ORDER_ASCENDING);
+       IList* pSearchList = contentDirectory.GetContentDirectoryItemListN(*(static_cast<String*>(__pFolderPathList->GetAt(folderIndex))), SEARCH_PAGE_NO, SEARCH_COUNT_PER_PAGE, STRING_SORT_TITLE, SORT_ORDER_ASCENDING);
        if (pSearchList == null)
        {
                return null;
@@ -299,7 +299,7 @@ FolderListPresentationModel::RefreshContentList(int folderIndex)
                                                                                                                                SEARCH_COUNT_PER_PAGE,
                                                                                                                                STRING_SORT_TITLE,
                                                                                                                                SORT_ORDER_ASCENDING);
-       //__pContentList null check
+
        if (__pContentList->GetCount() == INIT_VALUE)
        {
                __pContentList->RemoveAll(true);
index 9b9fc2b..01fc78d 100644 (file)
@@ -60,18 +60,12 @@ FolderPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousS
        __pPresentationModel->UpdateFolderPathList();
        if (__pPresentationModel != null)
        {
-               CommonUtil::ShowNoContentImage(__pPresentationModel->GetAllFolderCount(), *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
+               // Empty statement
        }
 
        if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
        {
-               if (__pNowPlayContentPanel == null)
-               {
-                       __pNowPlayContentPanel = new (std::nothrow) NowPlayContentPanel();
-                       __pNowPlayContentPanel->Initialize();
-                       AddControl(*__pNowPlayContentPanel);
-               }
-               CommonUtil::ShowNowPlayPanel(*__pContentTableView, __pNowPlayContentPanel->GetPlayStatus(), pForm->GetClientAreaBounds());
+               // Empty statement
        }
 
        if (pArgs != null)
old mode 100755 (executable)
new mode 100644 (file)
index 7807a93..f065342
@@ -36,6 +36,7 @@ const wchar_t* IDC_YEAR_CONTENT_LIST_FORM = L"YearContentListForm";
 const wchar_t* IDC_FOLDER_CONTENT_LIST_FORM = L"FolderContentListForm";
 const wchar_t* IDC_PLAYLIST_CONTENT_LIST_FORM = L"PlayListContentListForm";
 const wchar_t* IDC_PLAYLIST_CREATOR_FORM = L"PlaylistCreatorForm";
+const wchar_t* IDC_PLAYLIST_RENAME_FORM = L"PlaylistReNameForm";
 const wchar_t* IDC_USER_PLAYLIST_CONTENT_LIST_FORM = L"UserPlaylistContentListForm";
 const wchar_t* IDC_CONTENT_DETAIL_FORM = L"ContentDetailForm";
 const wchar_t* IDC_ARTIST_ALBUM_LIST_FORM = L"ArtistAlbumListForm";
@@ -68,7 +69,6 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                PlayerForm* pForm = new (std::nothrow) PlayerForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create PlayerForm.");
                        AppLogDebug("EXIT");
                        return null;
                }
@@ -81,7 +81,6 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                SettingForm* pForm = new (std::nothrow) SettingForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create SettingForm.");
                        AppLogDebug("EXIT");
                        return null;
                }
@@ -94,7 +93,6 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                ContentForm* pForm = new (std::nothrow) ContentForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create ContentForm.");
                        AppLogDebug("EXIT");
                        return null;
                }
@@ -106,7 +104,6 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                SearchForm* pForm = new (std::nothrow) SearchForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create ContentForm.");
                        AppLogDebug("EXIT");
                        return null;
                }
@@ -119,6 +116,7 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                AlbumContentListForm* pForm = new (std::nothrow) AlbumContentListForm();
                if (pForm == null)
                {
+                       AppLogDebug("EXIT");
                        return null;
                }
                pForm->Initialize();
@@ -130,6 +128,7 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                ArtistContentListForm* pForm = new (std::nothrow) ArtistContentListForm();
                if (pForm == null)
                {
+                       AppLogDebug("EXIT");
                        return null;
                }
                pForm->Initialize();
@@ -141,6 +140,7 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                GenreContentListForm* pForm = new (std::nothrow) GenreContentListForm();
                if (pForm == null)
                {
+                       AppLogDebug("EXIT");
                        return null;
                }
                pForm->Initialize();
@@ -152,6 +152,7 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                ComposerContentListForm* pForm = new (std::nothrow) ComposerContentListForm();
                if (pForm == null)
                {
+                       AppLogDebug("EXIT");
                        return null;
                }
                pForm->Initialize();
@@ -163,6 +164,7 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                YearContentListForm* pForm = new (std::nothrow) YearContentListForm();
                if (pForm == null)
                {
+                       AppLogDebug("EXIT");
                        return null;
                }
                pForm->Initialize();
@@ -174,6 +176,7 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                FolderContentListForm* pForm = new (std::nothrow) FolderContentListForm();
                if (pForm == null)
                {
+                       AppLogDebug("EXIT");
                        return null;
                }
                pForm->Initialize();
@@ -185,6 +188,7 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                PlaylistContentListForm* pForm = new (std::nothrow) PlaylistContentListForm();
                if (pForm == null)
                {
+                       AppLogDebug("EXIT");
                        return null;
                }
                pForm->Initialize();
@@ -196,7 +200,18 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                PlaylistCreatorForm* pForm = new (std::nothrow) PlaylistCreatorForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create ContentForm.");
+                       AppLogDebug("EXIT");
+                       return null;
+               }
+               pForm->Initialize();
+               pSceneManager->AddSceneEventListener(sceneId, *pForm);
+               pNewForm = pForm;
+       }
+       else if (formId == IDC_PLAYLIST_RENAME_FORM)
+       {
+               PlaylistReNameForm* pForm = new (std::nothrow) PlaylistReNameForm();
+               if (pForm == null)
+               {
                        AppLogDebug("EXIT");
                        return null;
                }
@@ -209,7 +224,6 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                ContentDetailForm* pForm = new (std::nothrow) ContentDetailForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create PlayerForm.");
                        AppLogDebug("EXIT");
                        return null;
                }
@@ -222,7 +236,6 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                ArtistAlbumListForm* pForm = new (std::nothrow) ArtistAlbumListForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create PlayerForm.");
                        AppLogDebug("EXIT");
                        return null;
                }
@@ -235,7 +248,6 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                ArtistAlbumListForm* pForm = new (std::nothrow) ArtistAlbumListForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create PlayerForm.");
                        AppLogDebug("EXIT");
                        return null;
                }
@@ -248,7 +260,6 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                ArtistAlbumListEditorForm* pForm = new (std::nothrow) ArtistAlbumListEditorForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create PlayerForm.");
                        AppLogDebug("EXIT");
                        return null;
                }
@@ -261,7 +272,6 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                ArtistAllSongListForm* pForm = new (std::nothrow) ArtistAllSongListForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create PlayerForm.");
                        AppLogDebug("EXIT");
                        return null;
                }
@@ -274,7 +284,6 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                UserPlaylistContentListForm* pForm = new (std::nothrow) UserPlaylistContentListForm();
                if (pForm == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create ContentForm.");
                        AppLogDebug("EXIT");
                        return null;
                }
index 3657670..a1df383 100644 (file)
@@ -562,7 +562,7 @@ GenreContentListForm::CreateItem(const int itemIndex, int itemWidth)
                pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
                pItem->SetContextItem(__pContextItem);
        }
-       pItem->SetBackgroundColor(COLOR_WHITE);
+//     pItem->SetBackgroundColor(COLOR_WHITE);
 
        pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
        if (pContentInfo == null)
@@ -640,7 +640,7 @@ GenreContentListForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView
                        ArrayList* tempArg;
                        AppAssert(pSceneManager);
                        tempArg = MakePlayerSceneParam(itemIndex);
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER),tempArg);
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), tempArg);
 
                        if (tempArg != null)
                        {
index 301600d..60605f1 100644 (file)
@@ -114,7 +114,6 @@ GenreContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -126,7 +125,6 @@ GenreContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -173,7 +171,6 @@ GenreContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_FOOTER_BUTTON_CANCEL:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        Form* pForm = dynamic_cast<Form*>(GetParent());
                        AppAssert(pForm);
                        CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
@@ -183,7 +180,7 @@ GenreContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        default:
                break;
-       }//End of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -248,7 +245,7 @@ GenreContentPickerPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        CommonUtil::CreateContentPikerTableViewItem(*pItem, pContentInfoStruct->TitleName, CommonUtil::GetFormatDate(pContentInfoStruct->Duration));
 
@@ -307,7 +304,7 @@ GenreContentPickerPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableV
 
        default:
                break;
-       }//end of switch
+       }
 
        CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
 
index 9b40046..e1e5761 100644 (file)
@@ -116,7 +116,6 @@ GenresListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -127,7 +126,6 @@ GenresListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -165,14 +163,13 @@ GenresListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_FOOTER_BUTTON_CANCEL:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        pSceneManager->GoBackward(BackwardSceneTransition());
                }
                break;
 
        default:
                break;
-       }//End of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
@@ -255,7 +252,7 @@ GenresListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateEditListTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->GenreName, __pPresentationModel->GetContentCount(itemIndex));
@@ -308,7 +305,7 @@ GenresListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
 
        default:
                break;
-       }//end of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
index 586d08c..31df8c0 100644 (file)
@@ -57,7 +57,7 @@ bool
 GenreListPanel::Initialize(void)
 {
        AppLogDebug("ENTER");
-       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE)); // Should be set proper area at OnInitializing().
+       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE));
        if (IsFailed(r))
        {
                return false;
@@ -162,7 +162,7 @@ GenreListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId
 
        default:
                break;
-       }//end of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -273,7 +273,7 @@ GenreListPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->GenreName, __pPresentationModel->GetContentCount(itemIndex));
@@ -415,7 +415,7 @@ GenreListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Bas
                        __pContentTableView->ScrollToItem(iCount);
                        break;
                }
-       }//end of for
+       }
        AppLogDebug("EXIT");
 }
 
index 91512fb..5a1ab8c 100644 (file)
@@ -139,7 +139,7 @@ GenreListPresentationModel::GetGenreInfoN(int genreIndex)
                                                                                *(static_cast<String*>(__pGnereList->GetAt(genreIndex))), STRING_SORT_GENRE, STRING_SORT_TITLE);
        if (pContentSearchResultList == null)
        {
-               AppLogDebug("EXIT");
+               AppLogDebug("CommonUtil::ContentSearchResultListN() failed");
                return null;
        }
 
diff --git a/src/MpMiniPlayer.cpp b/src/MpMiniPlayer.cpp
new file mode 100644 (file)
index 0000000..a120023
--- /dev/null
@@ -0,0 +1,518 @@
+//\r
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Flora License, Version 1.0 (the License);\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//     http://floralicense.org/license/\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an AS IS BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+/**\r
+ * @file               MpMiniPlayer.cpp\r
+ * @brief              This is the implementation file for MiniPlayer class.\r
+ */\r
+\r
+#include "MpMiniPlayer.h"\r
+#include "MpResourceManager.h"\r
+\r
+using namespace Tizen::Base;\r
+using namespace Tizen::Graphics;\r
+using namespace Tizen::Media;\r
+using namespace Tizen::Ui::Controls;\r
+using namespace Tizen::Ui::Scenes;\r
+\r
+static const int IDA_PLAY_CONTROL_TOGGLE_BUTTON = 1000;\r
+static const int PROGRESS_MAX_VALUE = 100;\r
+\r
+static const wchar_t* IDB_PLAY_BUTTON_ICON_NORMAL = L"T02_mini_control_circle_icon_play.png";\r
+static const wchar_t* IDB_PLAY_BUTTON_ICON_PRESSED = L"T02_mini_control_circle_icon_play_press.png";\r
+static const wchar_t* IDB_PLAY_BUTTON_ICON_DISABLED = L"T02_mini_control_circle_icon_play_dim.png";\r
+static const wchar_t* IDB_PAUSE_BUTTON_ICON_NORMAL = L"T02_mini_control_circle_icon_pause.png";\r
+static const wchar_t* IDB_PAUSE_BUTTON_ICON_PRESSED = L"T02_mini_control_circle_icon_pause_press.png";\r
+static const wchar_t* IDB_PAUSE_BUTTON_ICON_DISABLED = L"T02_mini_control_circle_icon_pause_dim.png";\r
+static const wchar_t* IDB_MINIPLAYER_BACKGROUND = L"T02_mini_player_bg.png";\r
+\r
+MiniPlayer::MiniPlayer(void)\r
+       : __pMinPlayerPlayToggleButton(null)\r
+       , __pMinPlayerNextButton(null)\r
+       , __pMinPlayerPrevButton(null)\r
+       , __pThumbnailLabel(null)\r
+       , __pTitleLabel(null)\r
+       , __pArtistLabel(null)\r
+       , __pProgressBar(null)\r
+       , __pPresentationModel(null)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+MiniPlayer::~MiniPlayer(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pPresentationModel != null)\r
+       {\r
+               __pPresentationModel->RemoveMusicPlayerEventListener(*this);\r
+       }\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+result\r
+MiniPlayer::Construct(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (IsFailed(Panel::Construct(IDL_MINI_PLYAER_PANEL)))\r
+       {\r
+               AppLogDebug("EXIT");\r
+               return E_FAILURE;\r
+       }\r
+\r
+       __pPresentationModel = PlayerPresentationModel::GetInstance();\r
+       if (__pPresentationModel == null)\r
+       {\r
+               AppLogDebug("PlayerPresentationModel::GetInstance() failed");\r
+               return E_FAILURE;\r
+       }\r
+\r
+       __pThumbnailLabel = static_cast<Label*>(GetControl(IDC_CONTENTS_THUMBNAIL));\r
+       __pThumbnailLabel->SetBackgroundBitmap(*__pPresentationModel->GetPlayContentThumbnail());\r
+       __pThumbnailLabel->AddTouchEventListener(*this);\r
+\r
+//     String miniPlayerTitleText;\r
+//     miniPlayerTitleText.Format(STRING_LENGTH, L"%ls - %ls", __pPresentationModel->GetPlayContentTitle()->GetPointer(), __pPresentationModel->GetPlayContentArtist()->GetPointer());\r
+//\r
+//     __pTitleLabel = static_cast<Label*>(GetControl(IDC_MINI_PLYAER_TITLE_LABEL));\r
+//     __pTitleLabel->SetText(miniPlayerTitleText);\r
+\r
+       __pTitleLabel = static_cast<Label*>(GetControl(IDC_CONTENTS_TITLE_NAME));\r
+       __pTitleLabel->SetText(*__pPresentationModel->GetPlayContentTitle());\r
+\r
+       String miniPlayerAtritsName;\r
+       miniPlayerAtritsName.Append(L" - ");\r
+       miniPlayerAtritsName.Append(*__pPresentationModel->GetPlayContentArtist());\r
+\r
+       __pArtistLabel = static_cast<Label*>(GetControl(IDC_CONTENTS_ARTIST_NAME));\r
+       __pArtistLabel->SetText(miniPlayerAtritsName);\r
+\r
+       __pMinPlayerPlayToggleButton = static_cast<Button*>(GetControl(IDC_PALY_TOGGLE_CONTROL_BUTTON));\r
+       __pMinPlayerPlayToggleButton->SetActionId(IDA_PLAY_CONTROL_TOGGLE_BUTTON);\r
+       __pMinPlayerPlayToggleButton->AddActionEventListener(*this);\r
+\r
+       switch (__pPresentationModel->GetPlayerState())\r
+       {\r
+       case PLAYER_STATE_PLAYING:\r
+               {\r
+                       SetPauseButtonImage();\r
+               }\r
+               break;\r
+\r
+       case PLAYER_STATE_PAUSED:\r
+               {\r
+                       SetPlayButtonImage();\r
+               }\r
+               break;\r
+\r
+       default:\r
+               break;\r
+       }\r
+\r
+       __pMinPlayerPrevButton = static_cast<Button*>(GetControl(IDC_PREVIOUS_CONTROL_BUTTON));\r
+       __pMinPlayerPrevButton->AddTouchEventListener(*this);\r
+\r
+       __pMinPlayerNextButton = static_cast<Button*>(GetControl(IDC_NEXT_CONTROL_BUTTON));\r
+       __pMinPlayerNextButton->AddTouchEventListener(*this);\r
+\r
+       __pProgressBar = static_cast<Progress*>(GetControl(IDC_PROGRESS_BAR));\r
+       __pProgressBar->SetRange(INIT_VALUE, PROGRESS_MAX_VALUE);\r
+       __pProgressBar->SetEnabled(false);\r
+       __pProgressBar->SetValue(__pPresentationModel->GetPlayPosition());\r
+\r
+       Invalidate(true);\r
+       AppLogDebug("EXIT");\r
+       return E_SUCCESS;\r
+}\r
+\r
+bool\r
+MiniPlayer::GetPlayStatus(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       bool StatusDisplay = false;\r
+       if (__pPresentationModel->GetPlayerState() == PLAYER_STATE_PAUSED\r
+                || __pPresentationModel->GetPlayerState() == PLAYER_STATE_PLAYING\r
+                || __pPresentationModel->GetPlayerState() == PLAYER_STATE_OPENING)\r
+       {\r
+               StatusDisplay = true;\r
+       }\r
+       AppLogDebug("EXIT");\r
+       return StatusDisplay;\r
+}\r
+\r
+void\r
+MiniPlayer::SetPlayButtonImage(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Point point(INIT_VALUE, INIT_VALUE);\r
+       Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_PLAY_BUTTON_ICON_NORMAL);\r
+       __pMinPlayerPlayToggleButton->SetNormalBitmap(point, *pBitmap);\r
+       delete pBitmap;\r
+\r
+       pBitmap = ResourceManager::GetBitmapN(IDB_PLAY_BUTTON_ICON_PRESSED);\r
+       __pMinPlayerPlayToggleButton->SetPressedBitmap(point, *pBitmap);\r
+       delete pBitmap;\r
+\r
+       pBitmap = ResourceManager::GetBitmapN(IDB_PLAY_BUTTON_ICON_DISABLED);\r
+       __pMinPlayerPlayToggleButton->SetDisabledBitmap(point, *pBitmap);\r
+       delete pBitmap;\r
+\r
+       __pMinPlayerPlayToggleButton->Invalidate(true);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::SetPauseButtonImage(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Point point(INIT_VALUE, INIT_VALUE);\r
+       Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_PAUSE_BUTTON_ICON_NORMAL);\r
+       __pMinPlayerPlayToggleButton->SetNormalBitmap(point, *pBitmap);\r
+       delete pBitmap;\r
+\r
+       pBitmap = ResourceManager::GetBitmapN(IDB_PAUSE_BUTTON_ICON_PRESSED);\r
+       __pMinPlayerPlayToggleButton->SetPressedBitmap(point, *pBitmap);\r
+       delete pBitmap;\r
+\r
+       pBitmap = ResourceManager::GetBitmapN(IDB_PAUSE_BUTTON_ICON_DISABLED);\r
+       __pMinPlayerPlayToggleButton->SetDisabledBitmap(point, *pBitmap);\r
+       delete pBitmap;\r
+\r
+       __pMinPlayerPlayToggleButton->Invalidate(true);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+//void\r
+//MiniPlayer::DrawContentsTitleName(Tizen::Graphics::Canvas& canvas)\r
+//{\r
+//     AppLogDebug("ENTER");\r
+//     EnrichedText* pEnrichedText = new (std::nothrow) EnrichedText();\r
+//     result r = pEnrichedText->Construct(Dimension(498, 38));\r
+//     if (IsFailed(r))\r
+//     {\r
+//             AppLogDebug("Construct(Dimension(498, 38) failed(%s)", GetErrorMessage(r));\r
+//             return;\r
+//     }\r
+//\r
+//     pEnrichedText->SetHorizontalAlignment(TEXT_ALIGNMENT_LEFT);\r
+//     pEnrichedText->SetVerticalAlignment(TEXT_ALIGNMENT_MIDDLE);\r
+//     pEnrichedText->SetTextWrapStyle(TEXT_WRAP_CHARACTER_WRAP);\r
+//     pEnrichedText->SetTextAbbreviationEnabled(true);\r
+//\r
+//     TextElement* pTextElement1 = new TextElement();\r
+//     r = pTextElement1->Construct(__titleName);\r
+//     if (IsFailed(r))\r
+//     {\r
+//             AppLogDebug("Construct(__titleName) failed(%s)", GetErrorMessage(r));\r
+//             return;\r
+//     }\r
+//\r
+//      pTextElement1->SetTextColor(Color::GetColor(COLOR_ID_BLACK));\r
+//      Font font;\r
+//      font.Construct(FONT_STYLE_BOLD, 30);\r
+//      pTextElement1->SetFont(font);\r
+//\r
+//     TextElement* pTextElement2 = new TextElement();\r
+//     r = pTextElement2->Construct(__artistName);\r
+//     if (IsFailed(r))\r
+//     {\r
+//             AppLogDebug("Construct(__titleName) failed(%s)", GetErrorMessage(r));\r
+//             return;\r
+//     }\r
+//\r
+//     pTextElement2->SetTextColor(Color32<128, 128, 128>::Value);\r
+//     Font fontArtist;\r
+//     font.Construct(FONT_STYLE_BOLD, 26);\r
+//     pTextElement2->SetFont(fontArtist);\r
+//\r
+//     pEnrichedText->Add(*pTextElement1);\r
+//     pEnrichedText->Add(*pTextElement2);\r
+//\r
+//     canvas.DrawText(Point(110, 55), *pEnrichedText);\r
+//     pEnrichedText->RemoveAll(true);\r
+//     delete pEnrichedText;\r
+//     AppLogDebug("EXIT");\r
+//}\r
+\r
+void\r
+MiniPlayer::DrawBackground(Tizen::Graphics::Canvas& canvas)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Bitmap* backgroupBitmap = ResourceManager::GetBitmapN(IDB_MINIPLAYER_BACKGROUND);\r
+       canvas.Clear();\r
+       canvas.DrawBitmap(GetBounds(), *backgroupBitmap);\r
+       delete backgroupBitmap;\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::SetMoreContextMenuActionEventListner(Tizen::Ui::IActionEventListener* listener, int actionId)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Button* pMoreContextMenuButton = static_cast<Button*>(GetControl(IDC_MORE_CONTEXT_MENU_BUTTON));\r
+       pMoreContextMenuButton->SetActionId(actionId);\r
+       pMoreContextMenuButton->AddActionEventListener(*listener);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::RemoveMoreContextMenuActionEventListner(Tizen::Ui::IActionEventListener& listener)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Button* pMoreContextMenuButton = static_cast<Button*>(GetControl(IDC_MORE_CONTEXT_MENU_BUTTON));\r
+       pMoreContextMenuButton->RemoveActionEventListener(listener);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::SetBackActionEventListner(Tizen::Ui::IActionEventListener& listener, int actionId)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Button* pBackButton = static_cast<Button*>(GetControl(IDC_BACK_BUTTON));\r
+       pBackButton->SetActionId(actionId);\r
+       pBackButton->AddActionEventListener(listener);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::RemoveBackActionEventListner(Tizen::Ui::IActionEventListener& listener, int actionId)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Button* pBackButton = static_cast<Button*>(GetControl(IDC_BACK_BUTTON));\r
+       pBackButton->RemoveActionEventListener(listener);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+result\r
+MiniPlayer::OnDraw(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       Canvas* pCanvas =  GetCanvasN();\r
+       if (pCanvas != null)\r
+       {\r
+               DrawBackground(*pCanvas);\r
+//             DrawContentsTitleName(*pCanvas);\r
+               delete pCanvas;\r
+       }\r
+\r
+       AppLogDebug("EXIT");\r
+       return Panel::OnDraw();\r
+}\r
+\r
+void\r
+MiniPlayer::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)\r
+{\r
+       AppLogDebug("ENTER");\r
+       switch (actionId)\r
+       {\r
+       case IDA_PLAY_CONTROL_TOGGLE_BUTTON:\r
+               {\r
+                       switch (__pPresentationModel->GetPlayerState())\r
+                       {\r
+                       case PLAYER_STATE_PLAYING:\r
+                               {\r
+                                       __pPresentationModel->Pause();\r
+                               }\r
+                               break;\r
+\r
+                       default:\r
+                               {\r
+                                       __pPresentationModel->Play(__pPresentationModel->GetCurrentContentIndex(), __pProgressBar->GetValue(), true);\r
+                               }\r
+                               break;\r
+                       }\r
+               }\r
+               break;\r
+\r
+       default:\r
+               {\r
+                       AppLogDebug("Unknown actionId(%d)", actionId);\r
+               }\r
+               break;\r
+       }\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::OnPlayStateChanged(Tizen::Media::PlayerState playerState)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (playerState == PLAYER_STATE_PLAYING)\r
+       {\r
+               SetPauseButtonImage();\r
+               AppLogDebug("EXIT");\r
+               return;\r
+       }\r
+\r
+       SetPlayButtonImage();\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::OnPlayContentChanged(int currentContentIndex)\r
+{\r
+       AppLogDebug("ENTER");\r
+       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(currentContentIndex);\r
+       if (pContentInfo == null)\r
+       {\r
+               AppLogDebug("__pPresentationModel->GetContentInfoN(currentContentIndex) failed");\r
+               return;\r
+       }\r
+\r
+       String miniPlayerAtritsName;\r
+       miniPlayerAtritsName.Append(L" - ");\r
+       miniPlayerAtritsName.Append(pContentInfo->ArtistName);\r
+\r
+       __pTitleLabel->SetText(pContentInfo->TitleName);\r
+       __pArtistLabel->SetText(miniPlayerAtritsName);\r
+\r
+       Bitmap* pAlbumArt = __pPresentationModel->GetContentAlbumArtN(currentContentIndex);\r
+       __pThumbnailLabel->SetBackgroundBitmap(*pAlbumArt);\r
+       delete pAlbumArt;\r
+\r
+       __pProgressBar->SetRange(INIT_VALUE, PROGRESS_MAX_VALUE);\r
+\r
+       delete pContentInfo;\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::OnPlayTimeChanged(const Tizen::Base::String& currentDuration, int currentPosition)\r
+{\r
+       AppLogDebug("ENTER");\r
+       __pProgressBar->SetValue(currentPosition);\r
+       __pProgressBar->Invalidate(true);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::OnPlayVolumeBarStateChanged(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::OnPlayPresentationModelDestroying(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       __pPresentationModel = null;\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pPresentationModel == null)\r
+       {\r
+               AppLogDebug("__pPresentationModel is null");\r
+               return;\r
+       }\r
+\r
+       if (__pThumbnailLabel->GetHashCode() == source.GetHashCode() )\r
+       {\r
+               SceneManager* pSceneManager = SceneManager::GetInstance();\r
+               AppAssert(pSceneManager);\r
+#if 0\r
+               if (pSceneManager->GetCurrentSceneId().Equals(IDSCN_MUSIC_SETTING, true))\r
+               {\r
+                       IListT<SceneId>* sceneList = pSceneManager->GetSceneHistoryN();\r
+\r
+                       IEnumeratorT<SceneId>* pEnum = sceneList->GetEnumeratorN();\r
+                       SceneId sceneID;\r
+                       while (pEnum->MoveNext() == E_SUCCESS)\r
+                       {\r
+                               pEnum->GetCurrent(sceneID);\r
+\r
+                               if (sceneID.Equals(SceneId(IDSCN_PLAYER)) == false)\r
+                               {\r
+                                       pSceneManager->AddToSceneHistory(sceneID);\r
+                               }\r
+                       }\r
+                       delete pEnum;\r
+                       delete sceneList;\r
+\r
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY));\r
+               }\r
+               else\r
+#endif\r
+               {\r
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER));\r
+               }\r
+       }\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pMinPlayerPrevButton->GetHashCode() == source.GetHashCode() )\r
+       {\r
+               // Empty statement\r
+               AppLogDebug("__pMinPlayerPrevButton");\r
+       }\r
+       else if (__pMinPlayerNextButton->GetHashCode() == source.GetHashCode() )\r
+       {\r
+               // Empty statement\r
+               AppLogDebug("__pMinPlayerNextButton");\r
+       }\r
+       else\r
+       {\r
+               // Empty statement\r
+       }\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pMinPlayerPrevButton->GetHashCode() == source.GetHashCode() )\r
+       {\r
+               // Empty statement\r
+               AppLogDebug("__pMinPlayerPrevButton");\r
+       }\r
+       else if (__pMinPlayerNextButton->GetHashCode() == source.GetHashCode() )\r
+       {\r
+               // Empty statement\r
+               AppLogDebug("__pMinPlayerNextButton");\r
+       }\r
+       else\r
+       {\r
+               // Empty statement\r
+       }\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::MiniPlayerActivate(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       __pProgressBar->SetValue(__pPresentationModel->GetPlayPosition());\r
+       __pProgressBar->Draw(true);\r
+       __pPresentationModel->AddMusicPlayerEventListener(*this);\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+MiniPlayer::MiniPlayerDeactivate(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       __pPresentationModel->RemoveMusicPlayerEventListener(*this);\r
+       AppLogDebug("EXIT");\r
+}
\ No newline at end of file
index d3b3116..6772aa2 100644 (file)
@@ -23,6 +23,7 @@
 #include "MpBasePanel.h"
 #include "MpCommonUtil.h"
 #include "MpMusicPlayerApp.h"
+#include "MpMusicPlayerForm.h"
 #include "MpResourceManager.h"
 #include "MpSceneRegister.h"
 #include "MpThumbnailProvider.h"
@@ -100,7 +101,7 @@ MusicPlayerApp::OnAppInitialized(void)
        __pMainFrame = new (std::nothrow) MainFrame();
        if (__pMainFrame == null)
        {
-               //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create MainFrame.");
+               AppLogDebug("EXIT");
                return false;
        }
 
@@ -162,7 +163,6 @@ void
 MusicPlayerApp::OnForeground(void)
 {
        AppLogDebug("ENTER");
-
        static bool bFirst = true;
        if (bFirst)
        {
@@ -177,18 +177,18 @@ MusicPlayerApp::OnForeground(void)
        AppAssert(pSceneManager);
 
        BasePanel* pBasePanel = dynamic_cast<BasePanel*>(pScene->GetPanel());
-       BaseForm* pBaseForm = dynamic_cast<BaseForm*>(pScene->GetForm());
+       PlayerForm* pBaseForm = dynamic_cast<PlayerForm*>(pScene->GetForm());
        if (pBasePanel)
        {
                pBasePanel->OnUpdateContentList();
        }
-       else
-       {
-               if (pBaseForm)
-               {
-                       pBaseForm->OnUpdateContentList();
-               }
-       }
+//     else
+//     {
+//             if (pBaseForm)
+//             {
+//                     pBaseForm->OnUpdateContentList();
+//             }
+//     }
 
        if (pScene->GetSceneId() == IDSCN_PLAYER)
        {
@@ -249,13 +249,11 @@ void
 MusicPlayerApp::OnSettingChanged(Tizen::Base::String& key)
 {
        AppLogDebug("ENTER");
-
        if (key.Equals(PARAM_LANGUAGE, true) || key.Equals(PARAM_COUNTRY, true))
        {
                UiApp* pApp = UiApp::GetInstance();
                pApp->Terminate();
        }
-
        AppLogDebug("EXIT");
 }
 
@@ -291,7 +289,6 @@ void
 MusicPlayerApp::ParsingArgument(const Tizen::Base::String* pUriData, const Tizen::Base::Collection::IMap* pArgs)
 {
        AppLogDebug("ENTER");
-
        const String* pContentPath = null;
        String sourceStr;
 
index 18d6a1c..4727975 100644 (file)
@@ -36,6 +36,7 @@
 #include "MpSettingPresentationModel.h"
 #include "MpSharePopup.h"
 #include "MpSoundPathPopup.h"
+#include "MpThumbnailInfo.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
@@ -49,155 +50,28 @@ using namespace Tizen::Ui::Animations;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int X_ALBUMART_LABEL = 116;
-static const int Y_ALBUMART_LABEL = 186 + 108 + 50;
-static const int W_ALBUMART_LABEL = 488;
-static const int H_ALBUMART_LABEL = 488;
-
-static const int Y_HORIZONTAL_ALBUMART_LABEL = 108;
-
 static const int H_CONTROLLER_PANEL = 288;
-static const int H_CONTROLLER_SEPERATOR_PANEL = 1;
 
 static const int W_HORIZONTAL_PLAYER = 720;
-
 static const int H_HORIZONTAL_CONTROLLER_PANEL = 300;
 
-static const int X_CONTROLLER_LEFT_BUTTON_SEPERATOR_LABEL = 135;
-static const int X_CONTROLLER_RIGHT_BUTTON_SEPERATOR_LABEL = 583;
-static const int Y_CONTROLLER_BUTTON_SEPERATOR_LABEL = 196;
-static const int W_CONTROLLER_BUTTON_SEPERATOR_LABEL = 1;
-static const int H_CONTROLLER_BUTTON_SEPERATOR_LABEL = 70;
-
-static const int W_HORIZONTAL_HEADER_TITLE_LABEL = 590;
-static const int H_HORIZONTAL_HEADER_TITLE_LABEL = 50;
-static const int W_HORIZONTAL_HEADER_SUB_TITLE_LABEL = 590;
-static const int H_HORIZONTAL_HEADER_SUB_TITLE_LABEL = 34;
-
-static const int HORIZONTAL_HEADER_TITLE_FONT_SIZE = 45;
-static const int HORIZONTAL_HEADER_SUB_TITLE_FONT_SIZE = 32;
-
-static const int X_HORIZONTAL_HEADER_OPTION_BUTOTN = 600;
-static const int Y_HORIZONTAL_HEADER_OPTION_BUTOTN = 3;
-static const int W_HORIZONTAL_HEADER_OPTION_BUTOTN = 120;
-static const int H_HORIZONTAL_HEADER_OPTION_BUTOTN = 78;
-
 static const int H_VOLUME_PANEL = 112;
 
-static const int X_HORIZONTAL_LISTVIEW = 16;
-static const int Y_HORIZONTAL_LISTVIEW_TITLE = 10;
-static const int Y_HORIZONTAL_LISTVIEW_SUB_TITLE = 70;
-static const int W_HORIZONTAL_LISTVIEW_REMAIN = 32;
-static const int H_HORIZONTAL_LISTVIEW_TITLE = 60;
-static const int H_HORIZONTAL_LISTVIEW_SUB_TITLE = 48;
-
-static const int X_SHUFFLE_BUTTON = 84;
-static const int Y_SHUFFLE_BUTTON = 15;
-static const int W_SHUFFLE_BUTTON = 76;
-static const int H_SHUFFLE_BUTTON = 76;
-
-static const int X_REPEAT_BUTTON = 324;
-static const int Y_REPEAT_BUTTON = 15;
-static const int W_REPEAT_BUTTON = 76;
-static const int H_REPEAT_BUTTON = 76;
-
-static const int X_ADD_TO_PLAYLIST_BUTTON = 564;
-static const int Y_ADD_TO_PLAYLIST_BUTTON = 15;
-static const int W_ADD_TO_PLAYLIST_BUTTON = 76;
-static const int H_ADD_TO_PLAYLIST_BUTTON = 76;
-
-static const int X_VOLUME_BUTTON = 20;
-static const int Y_VOLUME_BUTTON = 195;
-static const int W_VOLUME_BUTTON = 104;
-static const int H_VOLUME_BUTTON = 72;
-
-static const int X_REWIND_BUTTON = 155;
-static const int Y_REWIND_BUTTON = 191;
-static const int W_REWIND_BUTTON = 122;
-static const int H_REWIND_BUTTON = 80;
-
-static const int X_PLAYPAUSE_BUTTON = 299;
-static const int Y_PLAYPAUSE_BUTTON = 191;
-static const int W_PLAYPAUSE_BUTTON = 122;
-static const int H_PLAYPAUSE_BUTTON = 80;
-
-static const int X_FORWARD_BUTTON = 443;
-static const int Y_FORWARD_BUTTON = 191;
-static const int W_FORWARD_BUTTON = 122;
-static const int H_FORWARD_BUTTON = 80;
-
-static const int X_BACK_BUTTON = 596;
-static const int Y_BACK_BUTTON = 195;
-static const int W_BACK_BUTTON = 104;
-static const int H_BACK_BUTTON = 72;
-
 //static const int X_PLAYSTATE_SLIDER = 82;
 //static const int Y_PLAYSTATE_SLIDER = 105;
 //static const int W_PLAYSTATE_SLIDER = 558;
 //static const int H_PLAYSTATE_SLIDER = 70;
 
-static const int X_PLAYSTATE_SLIDER = 100;
-static const int Y_PLAYSTATE_SLIDER = 105;
-static const int W_PLAYSTATE_SLIDER = 520;
-static const int H_PLAYSTATE_SLIDER = 70;
-
-static const int X_PLAYSTATE_CURRENT_TIME_LABEL = -10;
-static const int Y_PLAYSTATE_CURRENT_TIME_LABEL = 105;
-static const int W_PLAYSTATE_CURRENT_TIME_LABEL = 142;
-static const int H_PLAYSTATE_CURRENT_TIME_LABEL = 70;
-
-static const int X_PLAYSTATE_TOTAL_TIME_LABEL = 588;
-static const int Y_PLAYSTATE_TOTAL_TIME_LABEL = 105;
-static const int W_PLAYSTATE_TOTAL_TIME_LABEL = 142;
-static const int H_PLAYSTATE_TOTAL_TIME_LABEL = 70;
-
-static const int POINT_X_HEADER_RIGHT_BUTTON_BITMAP = 27;
-static const int POINT_Y_HEADER_RIGHT_BUTTON_BITMAP = 11;
-
-static const int POINT_X_CONTROLLER_BUTTON_BITMAP = 24;
-static const int POINT_Y_CONTROLLER_BUTTON_BITMAP = 8;
-
-static const int POINT_X_PLAY_BUTTON_BITMAP = 21;
-static const int POINT_Y_PLAY_BUTTON_BITMAP = 0;
-
-static const int POINT_X_OPTION_BUTTON_BITMAP = 0;
-static const int POINT_Y_OPTION_BUTTON_BITMAP = 0;
-
-static const int POINT_X_CONTEXT_MENU_BITMAP = 660;
-static const int POINT_Y_CONTEXT_MENU_BITMAP = 132;
-
-static const int POINT_X_HORIZONTAL_CONTEXT_MENU_BITMAP = 1230;
-static const int POINT_Y_HORIZONTAL_CONTEXT_MENU_BITMAP = 132;
-
-static const Tizen::Graphics::Color COLOR_PLAYER_FORM (62, 62, 62);
-static const Tizen::Graphics::Color COLOR_PLAYER_PANEL_SEPERATOR (255, 255, 255, 77);
-static const Tizen::Graphics::Color COLOR_PLAYER_BOTTOM_PANEL (0, 0, 0, 51);
-static const Tizen::Graphics::Color COLOR_PLAYER_HEADER (0, 0, 0, 51);
-
-static const Tizen::Graphics::Color COLOR_PLAYER_TIME (255, 255, 255);
-
-static const Tizen::Graphics::Color COLOR_HORIZONTAL_BG_ITEM (249, 249, 249);
-
-static const Tizen::Graphics::Color COLOR_HORIZONTAL_HEADER_BG (0, 0, 0, 100);
-static const Tizen::Graphics::Color COLOR_HORIZONTAL_HEADER_TEXT (255, 255, 255);
-
-static const Tizen::Graphics::Color MAIN_TEXT_COLOR (0, 0, 0);
-static const Tizen::Graphics::Color SUB_TEXT_COLOR (124, 124, 124);
-
 static const int TRANSPARENT_COLOR = 0x00000000;
 
-static const int RECT_HORIZONTAL_ITEM_TITLE_FONT = 36;
-static const int RECT_HORIZONTAL_ITEM_ARTIST_FONT = 32;
-
 static const int MAX_PLAY_STATE_SLIDER_COUNT = 100;
 static const int MIN_PLAY_STATE_SLIDER_COUNT = 0;
 
-static const int TIME_TEXT_SIZE = 25;
-
 static const int MIN_VOLUME_SLIDER_COUNT = 0;
 static const int MAX_VOLUME_SLIDER_COUNT = 15;
 
-static const int IDA_HEADER_OPTION_BUTTON = 101;
+static const int IDA_BUTTON_CONTENTS_LIST_VIEW = 100;
+static const int IDA_BUTTON_CONTENTS_ALBUM_VIEW = 101;
 static const int IDA_BUTTON_VOLUME = 102;
 static const int IDA_BUTTON_REWIND = 103;
 static const int IDA_BUTTON_PLAY = 104;
@@ -206,16 +80,24 @@ static const int IDA_BUTTON_FORWARD = 106;
 static const int IDA_BUTTON_BACK = 107;
 static const int IDA_BUTTON_REPEAT = 108;
 static const int IDA_BUTTON_SHUFFLE = 109;
-static const int IDA_BUTTON_ADD_TO_PLAYLIST = 110;
+static const int IDA_BUTTON_MORE_CONTEXT_MENU = 111;
 
 static const int IDA_CONTEXT_SHARE = 112;
 static const int IDA_CONTEXT_SET = 113;
 static const int IDA_CONTEXT_SOUND_PATH = 114;
 static const int IDA_CONTEXT_DETAILS = 115;
 static const int IDA_CONTEXT_SETTINGS = 116;
+static const int IDA_CONTEXT_ADDTO = 117;
 
 static const Tizen::Base::String INVALID_VALUE_OF_CONTENT_ID = L"00000000-0000-0000-0000-000000000000";
 
+static const wchar_t* IDB_PLAY_BUTTON_ICON_NORMAL = L"T02_control_circle_icon_play.png";
+static const wchar_t* IDB_PLAY_BUTTON_ICON_PRESSED = L"T02_control_circle_icon_play_press.png";
+static const wchar_t* IDB_PLAY_BUTTON_ICON_DISABLED = L"T02_control_circle_icon_play_dim.png";
+static const wchar_t* IDB_PAUSE_BUTTON_ICON_NORMAL = L"T02_control_circle_icon_pause.png";
+static const wchar_t* IDB_PAUSE_BUTTON_ICON_PRESSED = L"T02_control_circle_icon_pause_press.png";
+static const wchar_t* IDB_PAUSE_BUTTON_ICON_DISABLED = L"T02_control_circle_icon_pause_dim.png";
+
 FloatRectangle rectanglePreviousElement;
 FloatRectangle rectangleCurrentElement;
 FloatRectangle rectangleNextElement;
@@ -230,29 +112,28 @@ enum RepeatType
 PlayerForm::PlayerForm(void)
        : __pPlayerPresentationModel(null)
        , __pAlbumArtElements(null)
-       , __pHorizontalHeaderPanel(null)
        , __pVolumePanel(null)
        , __pControllerPanel(null)
-       , __pControllerSeperatorPanel(null)
-       , __pHorizontalHeaderTitleLabel(null)
-       , __pHorizontalHeaderSubTitleLabel(null)
+       , __pPanelRegisterBar(null)
+       , __pContentsAlbumViewPanel(null)
+       , __pContentsListViewPanel(null)
        , __pCurrentTimeLabel(null)
        , __pTotalTimeLabel(null)
-       , __pControllerLeftButtonSeperatorLabel(null)
-       , __pControllerRightButtonSeperatorLabel(null)
+       , __pTitleName(null)
+       , __pArtistName(null)
        , __pRewindButton(null)
        , __pForwardButton(null)
        , __pVolumeButton(null)
        , __pPlayPauseButton(null)
        , __pBackButton(null)
-       , __pHorizontalHeaderRightButton(null)
        , __pRepeatButton(null)
        , __pShuffleButton(null)
-       , __pAddToPlaylistButton(null)
+       , __pContentsViewToggleButton(null)
+       , __pMoreContextButton(null)
        , __pPlayStateSlider(null)
        , __pVolumeSlider(null)
-       , __pHorizontalListView(null)
        , __pContextMenuIconText(null)
+       , __pThumbnail(null)
        , __pPlayListPickerPopup(null)
        , __pSoundPathPopup(null)
        , __pSharePopup(null)
@@ -265,6 +146,7 @@ PlayerForm::PlayerForm(void)
        , __pContentPlayTimer(null)
        , __pPreviousSceneId(null)
        , __pPath(null)
+       , __pMoreContextMenu(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -276,73 +158,132 @@ PlayerForm::~PlayerForm(void)
        AppLogDebug("EXIT");
 }
 
-void
+result
 PlayerForm::Initialize(void)
 {
        AppLogDebug("ENTER");
-       Form::Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER);
+       if (IsFailed(Form::Construct(IDL_MUSIC_PLAYER_FORM)))
+       {
+               AppLogDebug("Form::Construct(IDL_MUSIC_PLAYER_FORM) failed(%s)", GetErrorMessage(GetLastResult()));
+               return E_FAILURE;
+       }
        AppLogDebug("EXIT");
+       return E_SUCCESS;
 }
 
 result
 PlayerForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       SetBackgroundColor(COLOR_PLAYER_FORM);
 
+       __pControllerPanel = static_cast<Panel*>(GetControl(IDC_PLAYER_CONTROL_BAR));
+       __pTitleName = static_cast<Label*>(GetControl(IDC_CONTENTS_TITLE_NAME));
+       __pArtistName = static_cast<Label*>(GetControl(IDC_CONTENTS_ARTIST_NAME));
+
+       __pContentsViewToggleButton = static_cast<Button*>(GetControl(IDC_CONTENTS_VIEW_TOGGLE_BUTTON));
+       __pContentsViewToggleButton->SetActionId(IDA_BUTTON_CONTENTS_LIST_VIEW);
+       __pContentsViewToggleButton->AddActionEventListener(*this);
+
+       __pVolumeButton = static_cast<Button*>(__pControllerPanel->GetControl(L"IDC_OPTION_VOLUMN"));
+       __pVolumeButton->SetActionId(IDA_BUTTON_VOLUME);
+       __pVolumeButton->AddActionEventListener(*this);
+       __pShuffleButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_OPTION_SHUFFLE));
+       __pShuffleButton->SetActionId(IDA_BUTTON_SHUFFLE);
+       __pShuffleButton->AddActionEventListener(*this);
+       __pRepeatButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_OPTION_REPEAT));
+       __pRepeatButton->SetActionId(IDA_BUTTON_REPEAT);
+       __pRepeatButton->AddActionEventListener(*this);
+
+       Button* pButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_OPTION_PLAY_LIST_ADD));
+       pButton->SetShowState(false);
+
+       __pRewindButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_PREVIOUS_CONTROL_BUTTON));
+       __pRewindButton->SetActionId(IDA_BUTTON_REWIND);
+       __pRewindButton->AddTouchEventListener(*this);
+       __pPlayPauseButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_PALY_TOGGLE_CONTROL_BUTTON));
+       __pPlayPauseButton->SetActionId(IDA_BUTTON_PLAY);
+       __pPlayPauseButton->AddActionEventListener(*this);
+       __pForwardButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_NEXT_CONTROL_BUTTON));
+       __pForwardButton->SetActionId(IDA_BUTTON_FORWARD);
+       __pForwardButton->AddTouchEventListener(*this);
+       __pBackButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_BACK_BUTTON));
+       __pBackButton->SetActionId(IDA_BUTTON_BACK);
+       __pBackButton->AddActionEventListener(*this);
+       __pCurrentTimeLabel = static_cast<Label*>(__pControllerPanel->GetControl(IDC_CURRENT_PLAYING_TIME));
+       __pTotalTimeLabel = static_cast<Label*>(__pControllerPanel->GetControl(IDC_CONTENT_TOTAL_TIME));
+       __pPlayStateSlider = static_cast<Slider*>(__pControllerPanel->GetControl(IDC_SLIDER_BAR));
+       __pPlayStateSlider->AddSliderEventListener(*this);
+       __pPlayStateSlider->SetThumbTextColor(SLIDER_THUMB_STATUS_NORMAL, Color(255, 255, 255, 0));
+       __pPlayStateSlider->SetThumbTextColor(SLIDER_THUMB_STATUS_PRESSED, Color(255, 255, 255, 0));
+
+       __pMoreContextButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_MORE_CONTEXT_MENU_BUTTON));
+       __pMoreContextButton->SetActionId(IDA_BUTTON_MORE_CONTEXT_MENU);
+       __pMoreContextButton->AddActionEventListener(*this);
+
+       __pAnimationFinishedTimer = new (std::nothrow) Tizen::Base::Runtime::Timer();
+       __pAnimationFinishedTimer->Construct(*this);
+       __pContentPlayTimer = new (std::nothrow) Tizen::Base::Runtime::Timer();
+       __pContentPlayTimer->Construct(*this);
        __pPlayerPresentationModel = PlayerPresentationModel::GetInstance();
        __pPlayerPresentationModel->AddMusicPlayerEventListener(*this);
 
-       ButtonItem buttonRightItem;
-       Header* pHeader = GetHeader();
+       __pContentsListViewPanel = new (std::nothrow) Panel();
 
-       buttonRightItem.Construct(BUTTON_ITEM_STYLE_ICON, IDA_HEADER_OPTION_BUTTON);
-       buttonRightItem.SetIcon(BUTTON_ITEM_STATUS_NORMAL, ResourceManager::GetBitmapN(L"T02_title_icon_option.png"));
-       pHeader->SetStyle(HEADER_STYLE_TITLE);
-       pHeader->SetColor(COLOR_PLAYER_HEADER);
-       pHeader->SetButton(BUTTON_POSITION_RIGHT, buttonRightItem);
-       pHeader->SetButtonColor(BUTTON_ITEM_STATUS_NORMAL, COLOR_PLAYER_HEADER);
-       pHeader->AddActionEventListener(*this);
+       if (IsFailed(__pContentsListViewPanel->Construct(IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               delete __pContentsListViewPanel;
+               return E_FAILURE;
+       }
 
-       Rectangle clientBounds = GetClientAreaBounds();
+       __pPanelRegisterBar = static_cast<Panel*>(GetControl(IDC_PANEL_REGISTER_BAR));
+       __pPanelRegisterBar->AddControl(*__pContentsListViewPanel);
+       __pContentsListViewPanel->SetShowState(false);
+       __pContentsListViewPanel->SetEnabled(false);
+       CommonUtil::SetLayoutFitToContainer(*__pPanelRegisterBar, *__pContentsListViewPanel);
+       TableView* pContentsTableView = static_cast<TableView*>(__pContentsListViewPanel->GetControl(IDC_CONTENTS_TABLEVIEW));
+       pContentsTableView->AddTableViewItemEventListener(*this);
+       pContentsTableView->SetItemProvider(this);
+       __pContentsAlbumViewPanel = new (std::nothrow) Panel();
+       if (IsFailed(__pContentsAlbumViewPanel->Construct(IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL)))
+       {
+               AppLogDebug("Construct(IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               delete __pContentsAlbumViewPanel;
+               return E_FAILURE;
+       }
+       __pPanelRegisterBar->AddControl(*__pContentsAlbumViewPanel);
+       CommonUtil::SetLayoutFitToContainer(*__pPanelRegisterBar, *__pContentsAlbumViewPanel);
 
-       AddTouchEventListener(*this);
+       Label* pAlbumThumbnailLabel = static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
+       __pContentsAlbumViewPanel->SetControlAlwaysOnTop(*pAlbumThumbnailLabel, true);
+       pAlbumThumbnailLabel->AddTouchEventListener(*this);
 
+       FloatDimension floatDimension = pAlbumThumbnailLabel->GetSizeF();
        __pAlbumArtElements = new (std::nothrow) VisualElement();
        __pAlbumArtElements->Construct();
        __pAlbumArtElements->SetName(L"VisualElement");
-       __pAlbumArtElements->SetBounds(FloatRectangle(0.0f, 0.0f, 0.0f, 0.0f));
+       __pAlbumArtElements->SetBounds(FloatRectangle(0.0f, 0.0f, floatDimension.width, floatDimension.height));
        __pAlbumArtElements->SetClipChildrenEnabled(false);
        __pAlbumArtElements->SetShowState(true);
-       this->GetVisualElement()->AttachChild(*__pAlbumArtElements);
+       pAlbumThumbnailLabel->GetVisualElement()->AttachChild(*__pAlbumArtElements);
 
        __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT] = new (std::nothrow) VisualElement();
        __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->Construct();
-       __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->SetName(L"Rect1");
-       __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->SetBounds(FloatRectangle(X_ALBUMART_LABEL
-                                                                                                                                               , Y_ALBUMART_LABEL
-                                                                                                                                               , W_ALBUMART_LABEL
-                                                                                                                                               , H_ALBUMART_LABEL));
+       __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->SetBounds(FloatRectangle(0.0f, 0.0f, floatDimension.width, floatDimension.height));
        __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->SetShowState(true);
        __pAlbumArtElements->AttachChild(*__pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]);
 
        __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS] = new (std::nothrow) VisualElement();
        __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->Construct();
-       __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->SetName(L"Rect2");
-       __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->SetBounds(FloatRectangle(-604.0
-                                                                                                                                               , Y_ALBUMART_LABEL
-                                                                                                                                               , W_ALBUMART_LABEL
-                                                                                                                                               , H_ALBUMART_LABEL));
+       __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->SetBounds(FloatRectangle(-604.0, 0.0f, floatDimension.width, floatDimension.height));
        __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->SetShowState(true);
        __pAlbumArtElements->AttachChild(*__pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]);
 
        __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT] = new (std::nothrow) VisualElement();
        __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->Construct();
        __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->SetName(L"Rect3");
-       __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->SetBounds(FloatRectangle(836.0
-                                                                                                                                               , Y_ALBUMART_LABEL
-                                                                                                                                               , W_ALBUMART_LABEL
-                                                                                                                                               , H_ALBUMART_LABEL));
+       __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->SetBounds(FloatRectangle(836.0, 0.0f, floatDimension.width, floatDimension.height));
+
        __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->SetShowState(true);
        __pAlbumArtElements->AttachChild(*__pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]);
 
@@ -350,425 +291,32 @@ PlayerForm::OnInitializing(void)
        rectangleCurrentElement = __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->GetBounds();
        rectangleNextElement = __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->GetBounds();
 
-       __pControllerPanel = new (std::nothrow) Panel();
-       __pControllerPanel->Construct(Rectangle(0
-                                                                               , clientBounds.height - H_CONTROLLER_PANEL
-                                                                               , clientBounds.width
-                                                                               , H_CONTROLLER_PANEL));
-       __pControllerPanel->SetBackgroundColor(COLOR_PLAYER_BOTTOM_PANEL);
-       AddControl(*__pControllerPanel);
-
-       __pControllerSeperatorPanel = new (std::nothrow) Panel();
-       __pControllerSeperatorPanel->Construct(Rectangle(0
-                                                                                               , 0
-                                                                                               , clientBounds.width
-                                                                                               , H_CONTROLLER_SEPERATOR_PANEL));
-       __pControllerSeperatorPanel->SetBackgroundColor(COLOR_PLAYER_PANEL_SEPERATOR);
-       __pControllerPanel->AddControl(*__pControllerSeperatorPanel);
-
-       __pControllerLeftButtonSeperatorLabel = new (std::nothrow) Label();
-       __pControllerLeftButtonSeperatorLabel->Construct(Rectangle(X_CONTROLLER_LEFT_BUTTON_SEPERATOR_LABEL
-                                                                                                                       , Y_CONTROLLER_BUTTON_SEPERATOR_LABEL
-                                                                                                                       , W_CONTROLLER_BUTTON_SEPERATOR_LABEL
-                                                                                                                       , H_CONTROLLER_BUTTON_SEPERATOR_LABEL), IDS_BLANK);
-       __pControllerPanel->AddControl(*__pControllerLeftButtonSeperatorLabel);
-
-       __pControllerRightButtonSeperatorLabel = new (std::nothrow) Label();
-       __pControllerRightButtonSeperatorLabel->Construct(Rectangle(X_CONTROLLER_RIGHT_BUTTON_SEPERATOR_LABEL
-                                                                                                                       , Y_CONTROLLER_BUTTON_SEPERATOR_LABEL
-                                                                                                                       , W_CONTROLLER_BUTTON_SEPERATOR_LABEL
-                                                                                                                       , H_CONTROLLER_BUTTON_SEPERATOR_LABEL), IDS_BLANK);
-       __pControllerPanel->AddControl(*__pControllerRightButtonSeperatorLabel);
-
-       __pRepeatButton = new (std::nothrow) Button();
-       __pRepeatButton->Construct(Rectangle(X_REPEAT_BUTTON
-                                                                               , Y_REPEAT_BUTTON
-                                                                               , W_REPEAT_BUTTON
-                                                                               , H_REPEAT_BUTTON));
-       __pRepeatButton->SetActionId(IDA_BUTTON_REPEAT);
-       __pControllerPanel->AddControl(*__pRepeatButton);
-       __pRepeatButton->AddActionEventListener(*this);
-
-       __pShuffleButton = new (std::nothrow) Button();
-       __pShuffleButton->Construct(Rectangle(X_SHUFFLE_BUTTON
-                                                                               , Y_SHUFFLE_BUTTON
-                                                                               , W_SHUFFLE_BUTTON
-                                                                               , H_SHUFFLE_BUTTON));
-       __pShuffleButton->SetActionId(IDA_BUTTON_SHUFFLE);
-       __pControllerPanel->AddControl(*__pShuffleButton);
-       __pShuffleButton->AddActionEventListener(*this);
-
-       __pAddToPlaylistButton = new (std::nothrow) Button();
-       __pAddToPlaylistButton->Construct(Rectangle(X_ADD_TO_PLAYLIST_BUTTON
-                                                                                       , Y_ADD_TO_PLAYLIST_BUTTON
-                                                                                       , W_ADD_TO_PLAYLIST_BUTTON
-                                                                                       , H_ADD_TO_PLAYLIST_BUTTON));
-       __pAddToPlaylistButton->SetActionId(IDA_BUTTON_ADD_TO_PLAYLIST);
-       __pControllerPanel->AddControl(*__pAddToPlaylistButton);
-       __pAddToPlaylistButton->AddActionEventListener(*this);
-
-       __pPlayStateSlider = new (std::nothrow) Slider();
-       __pPlayStateSlider->Construct(Rectangle(X_PLAYSTATE_SLIDER
-                                                                                       , Y_PLAYSTATE_SLIDER
-                                                                                       , W_PLAYSTATE_SLIDER
-                                                                                       , H_PLAYSTATE_SLIDER)
-                                                                                       , SLIDER_STYLE_NONE
-                                                                                       , MIN_PLAY_STATE_SLIDER_COUNT
-                                                                                       , MAX_PLAY_STATE_SLIDER_COUNT);
-       __pPlayStateSlider->SetColor(TRANSPARENT_COLOR);
-       __pPlayStateSlider->SetThumbBitmap(SLIDER_THUMB_STATUS_NORMAL, *ResourceManager::GetBitmapN(L"T02_player_progress_handle.png"));
-       __pPlayStateSlider->SetThumbBitmap(SLIDER_THUMB_STATUS_PRESSED, *ResourceManager::GetBitmapN(L"T02_player_progress_handle_press.png"));
-       __pPlayStateSlider->SetThumbTextColor(SLIDER_THUMB_STATUS_NORMAL, Color(255, 255, 255, 0));
-       __pPlayStateSlider->SetThumbTextColor(SLIDER_THUMB_STATUS_PRESSED, Color(255, 255, 255, 0));
-       __pControllerPanel->AddControl(*__pPlayStateSlider);
-       __pPlayStateSlider->SetEnabled(true);
-       __pPlayStateSlider->SetValue(MIN_PLAY_STATE_SLIDER_COUNT);
-       __pPlayStateSlider->AddSliderEventListener(*this);
-
-       __pVolumeButton = new (std::nothrow) Button();
-       __pVolumeButton->Construct(Rectangle(X_VOLUME_BUTTON
-                                                                       , Y_VOLUME_BUTTON
-                                                                       , W_VOLUME_BUTTON
-                                                                       , H_VOLUME_BUTTON));
-       __pVolumeButton->SetActionId(IDA_BUTTON_VOLUME);
-       __pControllerPanel->AddControl(*__pVolumeButton);
-       __pVolumeButton->AddActionEventListener(*this);
-
-       __pRewindButton = new (std::nothrow) Button();
-       __pRewindButton->Construct(Rectangle(X_REWIND_BUTTON
-                                                                       , Y_REWIND_BUTTON
-                                                                       , W_REWIND_BUTTON
-                                                                       , H_REWIND_BUTTON));
-       __pRewindButton->SetActionId(IDA_BUTTON_REWIND);
-       __pControllerPanel->AddControl(*__pRewindButton);
-       __pRewindButton->AddTouchEventListener(*this);
-
-       __pPlayPauseButton = new (std::nothrow) Button();
-       __pPlayPauseButton->Construct(Rectangle(X_PLAYPAUSE_BUTTON
-                                                                               , Y_PLAYPAUSE_BUTTON
-                                                                               , W_PLAYPAUSE_BUTTON
-                                                                               , H_PLAYPAUSE_BUTTON));
-       __pPlayPauseButton->SetActionId(IDA_BUTTON_PLAY);
-       __pControllerPanel->AddControl(*__pPlayPauseButton);
-       __pPlayPauseButton->AddActionEventListener(*this);
-
-       __pForwardButton = new (std::nothrow) Button();
-       __pForwardButton->Construct(Rectangle(X_FORWARD_BUTTON
-                                                                               , Y_FORWARD_BUTTON
-                                                                               , W_FORWARD_BUTTON
-                                                                               , H_FORWARD_BUTTON));
-       __pForwardButton->SetActionId(IDA_BUTTON_FORWARD);
-       __pControllerPanel->AddControl(*__pForwardButton);
-       __pForwardButton->AddTouchEventListener(*this);
-
-       __pBackButton = new (std::nothrow) Button();
-       __pBackButton->Construct(Rectangle(X_BACK_BUTTON
-                                                                       , Y_BACK_BUTTON
-                                                                       , W_BACK_BUTTON
-                                                                       , H_BACK_BUTTON));
-       __pBackButton->SetActionId(IDA_BUTTON_BACK);
-       __pControllerPanel->AddControl(*__pBackButton);
-       __pBackButton->AddActionEventListener(*this);
-
-       __pCurrentTimeLabel = new (std::nothrow) Label();
-       __pCurrentTimeLabel->Construct(Rectangle(X_PLAYSTATE_CURRENT_TIME_LABEL
-                                                                               , Y_PLAYSTATE_CURRENT_TIME_LABEL
-                                                                               , W_PLAYSTATE_CURRENT_TIME_LABEL
-                                                                               , H_PLAYSTATE_CURRENT_TIME_LABEL), L"");
-       __pCurrentTimeLabel->SetTextConfig(TIME_TEXT_SIZE,LABEL_TEXT_STYLE_NORMAL);
-       __pCurrentTimeLabel->SetTextColor(COLOR_PLAYER_TIME);
-       __pControllerPanel->AddControl(*__pCurrentTimeLabel);
-
-       __pTotalTimeLabel = new (std::nothrow) Label();
-       __pTotalTimeLabel->Construct(Rectangle(X_PLAYSTATE_TOTAL_TIME_LABEL
-                                                                               , Y_PLAYSTATE_TOTAL_TIME_LABEL
-                                                                               , W_PLAYSTATE_TOTAL_TIME_LABEL
-                                                                               , H_PLAYSTATE_TOTAL_TIME_LABEL), L"");
-       __pTotalTimeLabel->SetTextConfig(TIME_TEXT_SIZE,LABEL_TEXT_STYLE_NORMAL);
-       __pTotalTimeLabel->SetTextColor(COLOR_PLAYER_TIME);
-       __pControllerPanel->AddControl(*__pTotalTimeLabel);
-       __pTotalTimeLabel->SetText(INITIAL_TIME);
-       Bitmap* pLineBitmap = ResourceManager::GetBitmapN(L"T02_player_line.png");
-       __pControllerLeftButtonSeperatorLabel->SetBackgroundBitmap(*pLineBitmap);
-       __pControllerRightButtonSeperatorLabel->SetBackgroundBitmap(*pLineBitmap);
-
-       Bitmap* pBlankNormalBackgroundBitmap = ResourceManager::GetBitmapN(L"blank_normal_background.png");
-       Bitmap* pBlankPressedBackgroundBitmap = ResourceManager::GetBitmapN(L"blank_pressed_background.png");
-
-       Bitmap* pOptionShuffleOnPressBitmap = ResourceManager::GetBitmapN(L"T02_option_shuffle_on_press.png");
-       Bitmap* pOptionAddToPlaylistPressBitmap = ResourceManager::GetBitmapN(L"T02_option_add_playlist_press.png");
-
-       __pRepeatButton->SetNormalBackgroundBitmap(*pBlankNormalBackgroundBitmap);
-       __pRepeatButton->SetPressedBackgroundBitmap(*pBlankPressedBackgroundBitmap);
-       __pRepeatButton->SetColor(BUTTON_STATUS_NORMAL, TRANSPARENT_COLOR);
-       __pRepeatButton->SetColor(BUTTON_STATUS_DISABLED, TRANSPARENT_COLOR);
-
-       __pShuffleButton->SetNormalBackgroundBitmap(*pBlankNormalBackgroundBitmap);
-       __pShuffleButton->SetPressedBackgroundBitmap(*pBlankPressedBackgroundBitmap);
-       __pShuffleButton->SetPressedBitmap(Point(POINT_X_OPTION_BUTTON_BITMAP, POINT_Y_OPTION_BUTTON_BITMAP), *pOptionShuffleOnPressBitmap);
-       __pShuffleButton->SetColor(BUTTON_STATUS_NORMAL, Color(62, 62, 62, 255));
-       __pShuffleButton->SetColor(BUTTON_STATUS_DISABLED, TRANSPARENT_COLOR);
-
-       __pAddToPlaylistButton->SetNormalBackgroundBitmap(*pBlankNormalBackgroundBitmap);
-       __pAddToPlaylistButton->SetPressedBackgroundBitmap(*pBlankPressedBackgroundBitmap);
-       __pAddToPlaylistButton->SetPressedBitmap(Point(POINT_X_OPTION_BUTTON_BITMAP, POINT_Y_OPTION_BUTTON_BITMAP), *pOptionAddToPlaylistPressBitmap);
-       __pAddToPlaylistButton->SetColor(BUTTON_STATUS_NORMAL, Color(62, 62, 62, 255));
-       __pAddToPlaylistButton->SetColor(BUTTON_STATUS_DISABLED, TRANSPARENT_COLOR);
-
-       Bitmap* pPlayPressBGBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_press.png");
-       Bitmap* pPlayFocusBGBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_focus.png");
-
-       __pRewindButton->SetNormalBackgroundBitmap(*pBlankNormalBackgroundBitmap);
-       __pRewindButton->SetPressedBackgroundBitmap(*pBlankPressedBackgroundBitmap);
-       __pRewindButton->SetColor(BUTTON_STATUS_NORMAL, Color(62, 62, 62, 255));
-       __pRewindButton->SetColor(BUTTON_STATUS_DISABLED, TRANSPARENT_COLOR);
-
-       __pForwardButton->SetNormalBackgroundBitmap(*pBlankNormalBackgroundBitmap);
-       __pForwardButton->SetPressedBackgroundBitmap(*pBlankPressedBackgroundBitmap);
-       __pForwardButton->SetColor(BUTTON_STATUS_NORMAL, Color(62, 62, 62, 255));
-       __pForwardButton->SetColor(BUTTON_STATUS_DISABLED, TRANSPARENT_COLOR);
-
-       __pPlayPauseButton->SetNormalBackgroundBitmap(*pBlankNormalBackgroundBitmap);
-       __pPlayPauseButton->SetPressedBackgroundBitmap(*pBlankPressedBackgroundBitmap);
-       __pPlayPauseButton->SetColor(BUTTON_STATUS_NORMAL, Color(62, 62, 62, 255));
-       __pPlayPauseButton->SetColor(BUTTON_STATUS_DISABLED, TRANSPARENT_COLOR);
-
-       Bitmap* pControllerPressBGBitmap = ResourceManager::GetBitmapN(L"T02_controller_btn_press.png");
-       Bitmap* pControllerFocusBGBitmap = ResourceManager::GetBitmapN(L"T02_controller_btn_focus.png");
-
-       __pVolumeButton->SetNormalBackgroundBitmap(*pBlankNormalBackgroundBitmap);
-       __pVolumeButton->SetPressedBackgroundBitmap(*pBlankPressedBackgroundBitmap);
-       __pVolumeButton->SetColor(BUTTON_STATUS_NORMAL, Color(62, 62, 62, 255));
-       __pVolumeButton->SetColor(BUTTON_STATUS_DISABLED, TRANSPARENT_COLOR);
-
-       __pBackButton->SetNormalBackgroundBitmap(*pBlankNormalBackgroundBitmap);
-       __pBackButton->SetPressedBackgroundBitmap(*pBlankPressedBackgroundBitmap);
-       __pBackButton->SetColor(BUTTON_STATUS_NORMAL, Color(62, 62, 62, 255));
-
-       SetControlButtonImage();
-       SetPlayPauseButtonImage(PLAYER_STATE_CLOSED);
-
-       SetOrientation(ORIENTATION_AUTOMATIC_FOUR_DIRECTION);
        AddOrientationEventListener(*this);
        AddKeyEventListener(*this);
 
        SettingPresentationModel::GetInstance()->AddSettingEventListener(*this);
 
-       __pAnimationFinishedTimer = new (std::nothrow) Tizen::Base::Runtime::Timer();
-       __pAnimationFinishedTimer->Construct(*this);
-
-       __pContentPlayTimer = new (std::nothrow) Tizen::Base::Runtime::Timer();
-       __pContentPlayTimer->Construct(*this);
-
-       __pContextMenuIconText = new (std::nothrow) ContextMenu();
-       if ((GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT) || (GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT_REVERSE))
-       {
-               __pContextMenuIconText->Construct(Point(0, 0), CONTEXT_MENU_STYLE_ICON, CONTEXT_MENU_ANCHOR_DIRECTION_AUTO);
-               __pContextMenuIconText->SetAnchorPosition(Point(POINT_X_CONTEXT_MENU_BITMAP, POINT_Y_CONTEXT_MENU_BITMAP));
-       }
-       else if ((GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE) || (GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
-       {
-               __pContextMenuIconText->Construct(Point(0, 0), CONTEXT_MENU_STYLE_ICON, CONTEXT_MENU_ANCHOR_DIRECTION_DOWNWARD);
-               __pContextMenuIconText->SetAnchorPosition(Point(POINT_X_HORIZONTAL_CONTEXT_MENU_BITMAP, POINT_Y_HORIZONTAL_CONTEXT_MENU_BITMAP));
-       }
-
-       __pContextMenuIconText->AddItem(*(ResourceManager::GetBitmapN(L"T02_function_icon_share.png"))
-                                                                       , ResourceManager::GetBitmapN(L"T02_function_icon_share.png"), IDA_CONTEXT_SHARE);
-       __pContextMenuIconText->AddItem(*(ResourceManager::GetBitmapN(L"T02_function_icon_set.png"))
-                                                                       , ResourceManager::GetBitmapN(L"T02_function_icon_set.png"), IDA_CONTEXT_SET);
-       __pContextMenuIconText->AddItem(*(ResourceManager::GetBitmapN(L"T02_function_icon_sound_path.png"))
-                                                                       , ResourceManager::GetBitmapN(L"T02_function_icon_sound_path.png"), IDA_CONTEXT_SOUND_PATH);
-       __pContextMenuIconText->AddItem(*(ResourceManager::GetBitmapN(L"T02_function_icon_details.png"))
-                                                                       , ResourceManager::GetBitmapN(L"T02_function_icon_details.png"), IDA_CONTEXT_DETAILS);
-       __pContextMenuIconText->AddItem(*(ResourceManager::GetBitmapN(L"T02_function_icon_settings.png"))
-                                                                       , ResourceManager::GetBitmapN(L"T02_function_icon_settings.png"), IDA_CONTEXT_SETTINGS);
-       __pContextMenuIconText->AddActionEventListener(*this);
-
-       delete pLineBitmap;
-       pLineBitmap = null;
-
-       delete pBlankNormalBackgroundBitmap;
-       pBlankNormalBackgroundBitmap = null;
-       delete pBlankPressedBackgroundBitmap;
-       pBlankPressedBackgroundBitmap = null;
-
-       delete pOptionShuffleOnPressBitmap;
-       pOptionShuffleOnPressBitmap = null;
-
-       delete pOptionAddToPlaylistPressBitmap;
-       pOptionAddToPlaylistPressBitmap = null;
-
-       delete pPlayPressBGBitmap;
-       pPlayPressBGBitmap = null;
-       delete pPlayFocusBGBitmap;
-       pPlayFocusBGBitmap = null;
-
-       delete pControllerPressBGBitmap;
-       pControllerPressBGBitmap = null;
-       delete pControllerFocusBGBitmap;
-       pControllerFocusBGBitmap = null;
+       UpdateSplitBarState();
+       TogglePlayPauseImage(PLAYER_STATE_CLOSED);
 
        AppLogDebug("EXIT");
-       return E_SUCCESS;
+       return ThumbnailBase::Construct();
 }
 
 void
 PlayerForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
 {
        AppLogDebug("ENTER");
-       if (orientationStatus == ORIENTATION_STATUS_LANDSCAPE
-               || orientationStatus == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
-       {
-               Header* pHeader = GetHeader();
-               Rectangle bounds = GetBounds();
-               pHeader->SetShowState(false);
-               __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->SetBounds(FloatRectangle((bounds.width - W_HORIZONTAL_PLAYER) - (((W_HORIZONTAL_PLAYER - W_ALBUMART_LABEL) / 2) + W_ALBUMART_LABEL)
-                                                                                                                                                       , Y_HORIZONTAL_ALBUMART_LABEL
-                                                                                                                                                       , W_ALBUMART_LABEL
-                                                                                                                                                       , H_ALBUMART_LABEL));
-               __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->SetBounds(FloatRectangle(bounds.width + ((W_HORIZONTAL_PLAYER - W_ALBUMART_LABEL) / 2)
-                                                                                                                                                       , Y_HORIZONTAL_ALBUMART_LABEL
-                                                                                                                                                       , W_ALBUMART_LABEL
-                                                                                                                                                       , H_ALBUMART_LABEL));
-               __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->SetBounds(FloatRectangle((bounds.width - W_HORIZONTAL_PLAYER) + ((W_HORIZONTAL_PLAYER - W_ALBUMART_LABEL) / 2)
-                                                                                                                                                       , Y_HORIZONTAL_ALBUMART_LABEL
-                                                                                                                                                       , W_ALBUMART_LABEL
-                                                                                                                                                       , H_ALBUMART_LABEL));
-
-               rectanglePreviousElement = __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->GetBounds();
-               rectangleCurrentElement = __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->GetBounds();
-               rectangleNextElement = __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->GetBounds();
-
-               __pControllerPanel->SetBounds(Rectangle(bounds.width - W_HORIZONTAL_PLAYER
-                                                                       , GetClientAreaBounds().height - H_HORIZONTAL_CONTROLLER_PANEL
-                                                                       , W_HORIZONTAL_PLAYER
-                                                                       , H_HORIZONTAL_CONTROLLER_PANEL));
-               __pControllerSeperatorPanel->SetBounds(Rectangle(0
-                                                                                                               , 0
-                                                                                                               , W_HORIZONTAL_PLAYER
-                                                                                                               , H_CONTROLLER_SEPERATOR_PANEL));
-
-               if (__pHorizontalHeaderPanel == null)
-               {
-                       __pHorizontalHeaderPanel = new (std::nothrow) Panel();
-                       __pHorizontalHeaderPanel->Construct(Rectangle(bounds.width - W_HORIZONTAL_PLAYER
-                                                                                               , 0
-                                                                                               , W_HORIZONTAL_PLAYER
-                                                                                               , pHeader->GetHeight()));
-                       __pHorizontalHeaderPanel->SetBackgroundColor(COLOR_HORIZONTAL_HEADER_BG);
-                       AddControl(*__pHorizontalHeaderPanel);
-
-                       __pHorizontalHeaderTitleLabel = new (std::nothrow) Label();
-
-                       __pHorizontalHeaderTitleLabel->Construct(Rectangle(0
-                                                                                                       , 0
-                                                                                                       , W_HORIZONTAL_HEADER_TITLE_LABEL
-                                                                                                       , H_HORIZONTAL_HEADER_TITLE_LABEL) , IDS_BLANK);
-                       __pHorizontalHeaderTitleLabel->SetTextConfig(HORIZONTAL_HEADER_TITLE_FONT_SIZE, LABEL_TEXT_STYLE_BOLD);
-                       __pHorizontalHeaderTitleLabel->SetTextColor(COLOR_HORIZONTAL_HEADER_TEXT);
-                       __pHorizontalHeaderPanel->AddControl(*__pHorizontalHeaderTitleLabel);
-
-                       __pHorizontalHeaderSubTitleLabel = new (std::nothrow) Label();
-                       __pHorizontalHeaderSubTitleLabel->Construct(Rectangle(0
-                                                                                                               , H_HORIZONTAL_HEADER_TITLE_LABEL
-                                                                                                               , W_HORIZONTAL_HEADER_SUB_TITLE_LABEL
-                                                                                                               , H_HORIZONTAL_HEADER_SUB_TITLE_LABEL) , IDS_BLANK);
-                       __pHorizontalHeaderSubTitleLabel->SetTextConfig(HORIZONTAL_HEADER_SUB_TITLE_FONT_SIZE, LABEL_TEXT_STYLE_BOLD);
-                       __pHorizontalHeaderSubTitleLabel->SetTextColor(COLOR_HORIZONTAL_HEADER_TEXT);
-                       __pHorizontalHeaderPanel->AddControl(*__pHorizontalHeaderSubTitleLabel);
-
-                       __pHorizontalHeaderRightButton = new (std::nothrow) Button();
-                       __pHorizontalHeaderRightButton->Construct(Rectangle(X_HORIZONTAL_HEADER_OPTION_BUTOTN
-                                                                                                       , Y_HORIZONTAL_HEADER_OPTION_BUTOTN
-                                                                                                       , W_HORIZONTAL_HEADER_OPTION_BUTOTN
-                                                                                                       , H_HORIZONTAL_HEADER_OPTION_BUTOTN));
-                       __pHorizontalHeaderRightButton->SetActionId(IDA_HEADER_OPTION_BUTTON);
-                       __pHorizontalHeaderRightButton->SetNormalBitmap(Point(POINT_X_HEADER_RIGHT_BUTTON_BITMAP, POINT_Y_HEADER_RIGHT_BUTTON_BITMAP), *(ResourceManager::GetBitmapN(L"T02_title_icon_option.png")));
-                       __pHorizontalHeaderRightButton->SetPressedBitmap(Point(POINT_X_HEADER_RIGHT_BUTTON_BITMAP, POINT_Y_HEADER_RIGHT_BUTTON_BITMAP), *(ResourceManager::GetBitmapN(L"T02_title_icon_option.png")));
-                       __pHorizontalHeaderRightButton->AddActionEventListener(*this);
-                       __pHorizontalHeaderRightButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_HORIZONTAL_HEADER_BG);
-                       __pHorizontalHeaderRightButton->SetColor(BUTTON_STATUS_PRESSED, COLOR_HORIZONTAL_HEADER_BG);
-                       __pHorizontalHeaderPanel->AddControl(*__pHorizontalHeaderRightButton);
-
-                       __pHorizontalListView = new (std::nothrow) TableView();
-                       __pHorizontalListView->Construct(Rectangle(0
-                                                                                       , 0
-                                                                                       , bounds.width - W_HORIZONTAL_PLAYER
-                                                                                       , GetClientAreaBounds().height), true, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
-                       __pHorizontalListView->SetBackgroundColor(COLOR_HORIZONTAL_BG_ITEM);
-                       __pHorizontalListView->AddTableViewItemEventListener(*this);
-                       __pHorizontalListView->SetItemProvider(this);
-                       AddControl(*__pHorizontalListView);
-
-                       if (pHeader->GetTitleText().IsEmpty() != true)
-                       {
-                               __pHorizontalHeaderTitleLabel->SetText(pHeader->GetTitleText());
-                               __pHorizontalHeaderSubTitleLabel->SetText(pHeader->GetDescriptionText());
-                       }
-               }
-
-               __pHorizontalListView->UpdateTableView();
-               __pHorizontalHeaderPanel->SetShowState(true);
-               __pHorizontalListView->SetShowState(true);
-
-               if (__pVolumePanel != null)
-               {
-                       __pVolumePanel->SetBounds(Rectangle(bounds.width - W_HORIZONTAL_PLAYER
-                                                                                       , GetClientAreaBounds().height - H_HORIZONTAL_CONTROLLER_PANEL - H_VOLUME_PANEL
-                                                                                       , W_HORIZONTAL_PLAYER
-                                                                                       , H_VOLUME_PANEL));
-               }
-               Invalidate(true);
-       }
-       else if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
-                       || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
-       {
-               GetHeader()->SetShowState(true);
-               Rectangle clientBounds = GetClientAreaBounds();
-               if (__pHorizontalHeaderPanel != null)
-               {
-                       __pHorizontalHeaderPanel->SetShowState(false);
-                       __pHorizontalListView->SetShowState(false);
-               }
+       Label* pAlbumThumbnailLabel = static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
+       FloatDimension floatDimension = pAlbumThumbnailLabel->GetSizeF();
+       __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->SetBounds(FloatRectangle(0.0f, 0.0f, floatDimension.width, floatDimension.height));
+       __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->SetBounds(FloatRectangle(-604.0, 0.0f, floatDimension.width, floatDimension.height));
+       __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->SetBounds(FloatRectangle(836.0, 0.0f, floatDimension.width, floatDimension.height));
+       rectanglePreviousElement = __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->GetBounds();
+       rectangleCurrentElement = __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->GetBounds();
+       rectangleNextElement = __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->GetBounds();
 
-               __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->SetBounds(FloatRectangle(-604.0
-                                                                                                                                                               , Y_ALBUMART_LABEL
-                                                                                                                                                               , W_ALBUMART_LABEL
-                                                                                                                                                               , H_ALBUMART_LABEL));
-               __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->SetBounds(FloatRectangle(836.0
-                                                                                                                                                               , Y_ALBUMART_LABEL
-                                                                                                                                                               , W_ALBUMART_LABEL
-                                                                                                                                                               , H_ALBUMART_LABEL));
-               __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->SetBounds(FloatRectangle(X_ALBUMART_LABEL
-                                                                                                                                                               , Y_ALBUMART_LABEL
-                                                                                                                                                               , W_ALBUMART_LABEL
-                                                                                                                                                               , H_ALBUMART_LABEL));
-
-               rectanglePreviousElement = __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->GetBounds();
-               rectangleCurrentElement = __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->GetBounds();
-               rectangleNextElement = __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->GetBounds();
-
-               __pControllerPanel->SetBounds(Rectangle(0
-                                                                       , clientBounds.height - H_CONTROLLER_PANEL
-                                                                       , clientBounds.width
-                                                                       , H_CONTROLLER_PANEL));
-               __pControllerSeperatorPanel->SetBounds(Rectangle(0
-                                                                                                               , 0
-                                                                                                               , clientBounds.width
-                                                                                                               , H_CONTROLLER_SEPERATOR_PANEL));
-               if (__pVolumePanel != null)
-               {
-                       __pVolumePanel->SetBounds(Rectangle(0
-                                                                       , clientBounds.height - H_CONTROLLER_PANEL - H_VOLUME_PANEL
-                                                                       , clientBounds.width
-                                                                       , H_VOLUME_PANEL));
-               }
-               Invalidate(true);
-       }
-       else
-       {
-               // Empty statement
-       }
+       UpdateSplitBarState();
        AppLogDebug("EXIT");
 }
 
@@ -776,11 +324,6 @@ result
 PlayerForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       /* Comment out this code temporarily in 2.0. This will be supported in 2.1.
-       ReleaseKeyCapture(KEY_SIDE_UP);
-       ReleaseKeyCapture(KEY_SIDE_DOWN);
-       */
-
        if (__pAlbumArtElements)
        {
                __pAlbumArtElements->Destroy();
@@ -791,6 +334,13 @@ PlayerForm::OnTerminating(void)
                delete __pContextMenuIconText;
                __pContextMenuIconText = null;
        }
+
+       if (__pMoreContextMenu != null)
+       {
+               delete __pMoreContextMenu;
+               __pMoreContextMenu = null;
+       }
+
        RemoveOrientationEventListener(*this);
        RemoveKeyEventListener(*this);
 
@@ -841,44 +391,54 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        switch (actionId)
        {
-       case IDA_HEADER_OPTION_BUTTON:
+       case IDA_BUTTON_CONTENTS_ALBUM_VIEW:
                {
-                       AppLogDebug("%d", GetOrientationStatus());
-                       if ((GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT) || (GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT_REVERSE))
-                       {
-                               __pContextMenuIconText->SetAnchorPosition(Point(POINT_X_CONTEXT_MENU_BITMAP, POINT_Y_CONTEXT_MENU_BITMAP));
-                       }
-                       else if ((GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE) || (GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
+                       CancelAllThumbnailRequest();
+                       __pContentsListViewPanel->SetShowState(false);
+                       __pContentsViewToggleButton->SetActionId(IDA_BUTTON_CONTENTS_LIST_VIEW);
+                       __pContentsAlbumViewPanel->SetShowState(true);
+                       __pPanelRegisterBar->Invalidate(true);
+               }
+               break;
+
+       case IDA_BUTTON_CONTENTS_LIST_VIEW:
+               {
+                       __pContentsAlbumViewPanel->SetShowState(false);
+                       __pContentsViewToggleButton->SetActionId(IDA_BUTTON_CONTENTS_ALBUM_VIEW);
+
+                       if (__pContentsListViewPanel->IsEnabled() == false)
                        {
-                               __pContextMenuIconText->SetAnchorPosition(Point(POINT_X_HORIZONTAL_CONTEXT_MENU_BITMAP, POINT_Y_HORIZONTAL_CONTEXT_MENU_BITMAP));
+                               __pContentsListViewPanel->SetEnabled(true);
+                               TableView* pContentsTableView = static_cast<TableView*>(__pContentsListViewPanel->GetControl(IDC_CONTENTS_TABLEVIEW));
+                               pContentsTableView->UpdateTableView();
                        }
-                       __pContextMenuIconText->SetShowState(true);
-                       __pContextMenuIconText->Show();
+                       __pContentsListViewPanel->SetShowState(true);
+                       __pPanelRegisterBar->Invalidate(true);
                }
                break;
 
        case IDA_BUTTON_VOLUME:
                {
-                       if (__pVolumePanel == null)
-                       {
-                               InitializeVolumeBar();
-                       }
-                       else
-                       {
-                               if (__pVolumePanel->GetShowState() == true)
-                               {
-                                       __pVolumePanel->SetShowState(false);
-                               }
-                               else
-                               {
-                                       int MediaSoundVolume = 0;
-                                       SettingInfo::GetValue(MEDIA_VOLUME, MediaSoundVolume);
-                                       __pPlayerPresentationModel->SetVolume(MediaSoundVolume);
-                                       __pVolumeSlider->SetValue(__pPlayerPresentationModel->GetVolume());
-                                       __pVolumeSlider->Invalidate(true);
-                                       __pVolumePanel->SetShowState(true);
-                               }
-                       }
+//                     if (__pVolumePanel == null)
+//                     {
+//                             InitializeVolumeBar();
+//                     }
+//                     else
+//                     {
+//                             if (__pVolumePanel->GetShowState() == true)
+//                             {
+//                                     __pVolumePanel->SetShowState(false);
+//                             }
+//                             else
+//                             {
+//                                     int MediaSoundVolume = 0;
+//                                     SettingInfo::GetValue(MEDIA_VOLUME, MediaSoundVolume);
+//                                     __pPlayerPresentationModel->SetVolume(MediaSoundVolume);
+//                                     __pVolumeSlider->SetValue(__pPlayerPresentationModel->GetVolume());
+//                                     __pVolumeSlider->Invalidate(true);
+//                                     __pVolumePanel->SetShowState(true);
+//                             }
+//                     }
                }
                break;
 
@@ -903,7 +463,7 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                        if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
                        {
-                               SetAddToPlaylistButtonImage(false);
+                               SetMoreContentMenuStatus(false);
                        }
                }
                break;
@@ -969,27 +529,29 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_BUTTON_ADD_TO_PLAYLIST:
+       case IDA_BUTTON_MORE_CONTEXT_MENU:
                {
-                       currentContentIndex = __pPlayerPresentationModel->GetCurrentContentIndex();
-                       contentPath = __pPlayerPresentationModel->GetContentPath(currentContentIndex);
-
-                       Tizen::Base::Collection::ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       pDataList->Construct();
-                       pDataList->Add(*(new (std::nothrow) String(*contentPath)));
-                       if (__pPlayListPickerPopup != null)
+                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
+                       if (__pMoreContextMenu != null)
                        {
-                               AppLogDebug("1");
-                               delete __pPlayListPickerPopup;
-                               __pPlayListPickerPopup = null;
-                               AppLogDebug("2");
+                               delete __pMoreContextMenu;
+                               __pMoreContextMenu = null;
                        }
 
-                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-                       __pPlayListPickerPopup->Initialize(this, pDataList);
-                       //__pPlayListPickerPopup->SetCollectedContent(pDataList);
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
+                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
+                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+
+                       __pMoreContextMenu->AddItem(L"Share via", IDA_CONTEXT_SHARE);//NEED STRING
+                       __pMoreContextMenu->AddItem(L"Add to Playlist", IDA_CONTEXT_ADDTO);//NEED STRING
+                       __pMoreContextMenu->AddItem(L"Set as", IDA_CONTEXT_SET);//NEED STRING
+                       __pMoreContextMenu->AddItem(L"Details", IDA_CONTEXT_DETAILS);//NEED STRING
+                       __pMoreContextMenu->AddItem(L"Settings", IDA_CONTEXT_SETTINGS);//NEED STRING
+
+                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
+                       __pMoreContextMenu->AddActionEventListener(*this);
+                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
+                       __pMoreContextMenu->SetShowState(true);
+                       __pMoreContextMenu->Show();
                }
                break;
 
@@ -1014,6 +576,29 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
+       case IDA_CONTEXT_ADDTO:
+               {
+                       currentContentIndex = __pPlayerPresentationModel->GetCurrentContentIndex();
+                       contentPath = __pPlayerPresentationModel->GetContentPath(currentContentIndex);
+
+                       Tizen::Base::Collection::ArrayList* pDataList = new (std::nothrow) ArrayList();
+                       pDataList->Construct();
+                       pDataList->Add(*(new (std::nothrow) String(*contentPath)));
+                       if (__pPlayListPickerPopup != null)
+                       {
+                               AppLogDebug("1");
+                               delete __pPlayListPickerPopup;
+                               __pPlayListPickerPopup = null;
+                               AppLogDebug("2");
+                       }
+
+                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
+                       __pPlayListPickerPopup->Initialize(this, pDataList);
+                       __pPlayListPickerPopup->SetShowState(true);
+                       __pPlayListPickerPopup->Show();
+               }
+               break;
+
        case IDA_CONTEXT_SET:
                {
                        currentContentIndex = __pPlayerPresentationModel->GetCurrentContentIndex();
@@ -1384,7 +969,7 @@ PlayerForm::OnAnimationTransactionStarted(int transactionId)
 {
        AppLogDebug("ENTER");
        __pContentPlayTimer->Cancel();
-       AppLogDebug("OnAnimationTransactionStarted");
+       AppLogDebug("EXIT");
 }
 
 void
@@ -1459,7 +1044,7 @@ PlayerForm::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
                }
                if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
                {
-                       SetAddToPlaylistButtonImage(false);
+                       SetMoreContentMenuStatus(false);
                }
        }
        AppLogDebug("EXIT");
@@ -1487,38 +1072,17 @@ PlayerForm::CreateItem(int index, int itemWidth)
                return null;
        }
 
-       Rectangle ListViewTitleRect(X_HORIZONTAL_LISTVIEW
-                                                       , Y_HORIZONTAL_LISTVIEW_TITLE
-                                                       , itemWidth - W_HORIZONTAL_LISTVIEW_REMAIN
-                                                       , H_HORIZONTAL_LISTVIEW_TITLE);
-       Rectangle ListViewArtistRect(X_HORIZONTAL_LISTVIEW
-                                                       , Y_HORIZONTAL_LISTVIEW_SUB_TITLE
-                                                       , itemWidth - W_HORIZONTAL_LISTVIEW_REMAIN
-                                                       , H_HORIZONTAL_LISTVIEW_SUB_TITLE);
+       RelativeLayout layout;
+       layout.Construct();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_HORIZONTAL_BG_ITEM);
-
-       Label* pTitleLabel = new (std::nothrow) Label();
-       pTitleLabel->Construct(ListViewTitleRect, pContentInfoStruct->TitleName);
-       pTitleLabel->SetTextColor(MAIN_TEXT_COLOR);
-       pTitleLabel->SetTextConfig(RECT_HORIZONTAL_ITEM_TITLE_FONT, LABEL_TEXT_STYLE_NORMAL);
-       pTitleLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pTitleLabel->SetShowState(true);
-
-       Label* pArtistLabel = new (std::nothrow) Label();
-       pArtistLabel->Construct(ListViewArtistRect, pContentInfoStruct->ArtistName);
-       pArtistLabel->SetTextColor(SUB_TEXT_COLOR);
-       pArtistLabel->SetTextConfig(RECT_HORIZONTAL_ITEM_ARTIST_FONT, LABEL_TEXT_STYLE_NORMAL);
-       pArtistLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pArtistLabel->SetShowState(true);
-
-       pItem->AddControl(*pTitleLabel);
-       pItem->AddControl(*pArtistLabel);
+       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+
+       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(index)));
+
+       CreateTableViewItem(*pItem, *pContentInfoStruct);
 
        delete pContentInfoStruct;
-       pContentInfoStruct = null;
 
        AppLogDebug("EXIT");
        return pItem;
@@ -1534,13 +1098,6 @@ PlayerForm::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem*
        return true;
 }
 
-void
-PlayerForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
 int
 PlayerForm::GetDefaultItemHeight(void)
 {
@@ -1562,7 +1119,7 @@ PlayerForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableVie
 
                if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
                {
-                       SetAddToPlaylistButtonImage(false);
+//                     SetMoreContentMenuStatus(false);
                }
        }
        AppLogDebug("EXIT");
@@ -1595,6 +1152,7 @@ PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                        Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
 
        MusicPlayerApp* pMusicPlayerApp = static_cast<MusicPlayerApp*>(MusicPlayerApp::GetInstance());
        TryReturnVoid(pMusicPlayerApp != null, "Unable to cast UiApp to MusicPlayerApp");
@@ -1624,33 +1182,15 @@ PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                OnPlayStateChanged(__pPlayerPresentationModel->GetPlayerState());
        }
 
-       OrientationStatus orientationStatus = GetOrientationStatus();
-       if (orientationStatus == ORIENTATION_STATUS_LANDSCAPE)
-       {
-               if (__pHorizontalHeaderPanel != null)
-               {
-                       __pHorizontalListView->UpdateTableView();
-                       __pHorizontalHeaderPanel->SetShowState(true);
-                       __pHorizontalListView->SetShowState(true);
-                       __pHorizontalHeaderPanel->SetShowState(true);
-               }
-       }
-       else if (orientationStatus == ORIENTATION_STATUS_PORTRAIT)
-       {
-               if (__pHorizontalHeaderPanel != null)
-               {
-                       __pHorizontalListView->SetShowState(false);
-                       __pHorizontalHeaderPanel->SetShowState(false);
-               }
-       }
-       else
+       if (__pContentsListViewPanel->GetShowState() == true)
        {
-               // Empty statement
+               TableView* pContentsTableView = static_cast<TableView*>(__pContentsListViewPanel->GetControl(IDC_CONTENTS_TABLEVIEW));
+               pContentsTableView->UpdateTableView();
        }
 
        if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
        {
-               SetAddToPlaylistButtonImage(false);
+               SetMoreContentMenuStatus(false);
        }
        Invalidate(true);
        AppLogDebug("EXIT");
@@ -1661,6 +1201,7 @@ PlayerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
                                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
+       CancelAllThumbnailRequest();
        AppLogDebug("EXIT");
 }
 
@@ -1679,33 +1220,16 @@ PlayerForm::OnChangedContentList(Tizen::Base::Collection::IList* pArgs)
                int playIndex = (static_cast<Integer*>(pArgs->GetAt(1)))->ToInt();
                __pPlayerPresentationModel->Play(playIndex, MIN_PLAY_STATE_SLIDER_COUNT);
        }
-       OrientationStatus orientationStatus = GetOrientationStatus();
-       if (orientationStatus == ORIENTATION_STATUS_LANDSCAPE)
-       {
-               if (__pHorizontalHeaderPanel != null)
-               {
-                       __pHorizontalListView->UpdateTableView();
-                       __pHorizontalHeaderPanel->SetShowState(true);
-                       __pHorizontalListView->SetShowState(true);
-                       __pHorizontalHeaderPanel->SetShowState(true);
-               }
-       }
-       else if (orientationStatus == ORIENTATION_STATUS_PORTRAIT)
-       {
-               if (__pHorizontalHeaderPanel != null)
-               {
-                       __pHorizontalListView->SetShowState(false);
-                       __pHorizontalHeaderPanel->SetShowState(false);
-               }
-       }
-       else
+
+       if (__pContentsListViewPanel->GetShowState() == true)
        {
-               // Empty statement
+               TableView* pContentsTableView = static_cast<TableView*>(__pContentsListViewPanel->GetControl(IDC_CONTENTS_TABLEVIEW));
+               pContentsTableView->UpdateTableView();
        }
 
        if (__pPlayerPresentationModel->IsFileExist(__pPlayerPresentationModel->GetCurrentContentIndex()) != true)
        {
-               SetAddToPlaylistButtonImage(false);
+               SetMoreContentMenuStatus(false);
        }
        Invalidate(true);
        AppLogDebug("EXIT");
@@ -1736,14 +1260,14 @@ PlayerForm::OnPlayStateChanged(PlayerState playerState)
        {
                ShowMessageBox(L"file play failed");
                __pPlayStateSlider->SetEnabled(false);
-               SetAddToPlaylistButtonImage(false);
+               SetMoreContentMenuStatus(false);
        }
        /*else
        {
                __pPlayStateSlider->SetEnabled(true);
-               SetAddToPlaylistButtonImage(true);
+               SetMoreContentMenuStatus(true);
        }*/
-       SetPlayPauseButtonImage(playerState);
+       TogglePlayPauseImage(playerState);
        AppLogDebug("EXIT");
 }
 
@@ -1858,20 +1382,16 @@ PlayerForm::SetContentInfo(int currentContentIndex)
        ContentInformation* pContentInfoStruct = __pPlayerPresentationModel->GetContentInfoN(currentContentIndex);
        TryReturnVoid(pContentInfoStruct != null, "The currentContentIndex is invalid");
 
-       Header* pHeader = GetHeader();
-       pHeader->SetTitleText(pContentInfoStruct->TitleName);
-       pHeader->SetDescriptionText(pContentInfoStruct->ArtistName);
+       __pTitleName->SetText(pContentInfoStruct->TitleName);
+       __pArtistName->SetText(pContentInfoStruct->ArtistName);
 
-       if (__pHorizontalHeaderPanel != null)
-       {
-               __pHorizontalHeaderTitleLabel->SetText(pContentInfoStruct->TitleName);
-               __pHorizontalHeaderSubTitleLabel->SetText(pContentInfoStruct->ArtistName);
-       }
+//     if (__pHorizontalHeaderPanel != null)
+//     {
+//             __pHorizontalHeaderTitleLabel->SetText(pContentInfoStruct->TitleName);
+//             __pHorizontalHeaderSubTitleLabel->SetText(pContentInfoStruct->ArtistName);
+//     }
 
-       if (__pPlayStateSlider != null)
-       {
-               __pPlayStateSlider->SetRange(MIN_PLAY_STATE_SLIDER_COUNT, MAX_PLAY_STATE_SLIDER_COUNT);
-       }
+       __pPlayStateSlider->SetRange(MIN_PLAY_STATE_SLIDER_COUNT, MAX_PLAY_STATE_SLIDER_COUNT);
 
        String totalTime = CommonUtil::GetFormatDate(pContentInfoStruct->Duration);
        AppLogDebug("%ls", totalTime.GetPointer());
@@ -1886,7 +1406,7 @@ PlayerForm::SetContentInfo(int currentContentIndex)
 
        if (pContentInfoStruct->contentId.ToString().Equals(INVALID_VALUE_OF_CONTENT_ID, true))
        {
-               SetAddToPlaylistButtonImage(false);
+               SetMoreContentMenuStatus(false);
        }
        else
        {
@@ -1896,19 +1416,15 @@ PlayerForm::SetContentInfo(int currentContentIndex)
                        {
                                __pPlayStateSlider->SetEnabled(true);
                        }
-                       SetAddToPlaylistButtonImage(true);
+                       SetMoreContentMenuStatus(true);
                }
        }
 
-       Invalidate(true);
-
-       if (pContentInfoStruct != null)
-       {
-               delete pContentInfoStruct;
-               pContentInfoStruct = null;
-       }
+       delete pContentInfoStruct;
+       pContentInfoStruct = null;
 
        UpdateAnimationAlbumArt(ALBUM_ART_IMAGE_CURRENT);
+       Invalidate(true);
        AppLogDebug("EXIT");
 }
 
@@ -1948,17 +1464,15 @@ PlayerForm::UpdateAnimationAlbumArt(AlbumArtImage position)
                break;
        }
 
-       Canvas* pCanvas = null;
+       FloatDimension floatDimension = static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->GetSizeF();
 
        if (pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT] != null)
        {
-               pCanvas = __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->GetCanvasN();
+               Canvas* pCanvas = __pAlbumArtElement[ALBUM_ART_IMAGE_CURRENT]->GetCanvasN();
                if (pCanvas)
                {
-                       pCanvas->DrawBitmap(Rectangle(0
-                                                                                       , 0
-                                                                                       , W_ALBUMART_LABEL
-                                                                                       , H_ALBUMART_LABEL), *pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT]);
+                       Point point(INIT_VALUE, INIT_VALUE);
+                       pCanvas->DrawBitmap(point, *pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT]);
                        delete pCanvas;
                }
                delete pAlbumArtBitmap[ALBUM_ART_IMAGE_CURRENT];
@@ -1966,13 +1480,11 @@ PlayerForm::UpdateAnimationAlbumArt(AlbumArtImage position)
 
        if (pAlbumArtBitmap[ALBUM_ART_IMAGE_PREVIOUS] != null)
        {
-               pCanvas = __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->GetCanvasN();
+               Canvas* pCanvas = __pAlbumArtElement[ALBUM_ART_IMAGE_PREVIOUS]->GetCanvasN();
                if (pCanvas)
                {
-                       pCanvas->DrawBitmap(Rectangle(0
-                                                                                       , 0
-                                                                                       , W_ALBUMART_LABEL
-                                                                                       , H_ALBUMART_LABEL), *pAlbumArtBitmap[ALBUM_ART_IMAGE_PREVIOUS]);
+                       Point point(INIT_VALUE, INIT_VALUE);
+                       pCanvas->DrawBitmap(point, *pAlbumArtBitmap[ALBUM_ART_IMAGE_PREVIOUS]);
                        delete pCanvas;
                }
                delete pAlbumArtBitmap[ALBUM_ART_IMAGE_PREVIOUS];
@@ -1980,13 +1492,11 @@ PlayerForm::UpdateAnimationAlbumArt(AlbumArtImage position)
 
        if (pAlbumArtBitmap[ALBUM_ART_IMAGE_NEXT] != null)
        {
-               pCanvas = __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->GetCanvasN();
+               Canvas* pCanvas = __pAlbumArtElement[ALBUM_ART_IMAGE_NEXT]->GetCanvasN();
                if (pCanvas)
                {
-                       pCanvas->DrawBitmap(Rectangle(0
-                                                                                       , 0
-                                                                                       , W_ALBUMART_LABEL
-                                                                                       , H_ALBUMART_LABEL), *pAlbumArtBitmap[ALBUM_ART_IMAGE_NEXT]);
+                       Point point(INIT_VALUE, INIT_VALUE);
+                       pCanvas->DrawBitmap(point, *pAlbumArtBitmap[ALBUM_ART_IMAGE_NEXT]);
                        delete pCanvas;
                }
                delete pAlbumArtBitmap[ALBUM_ART_IMAGE_NEXT];
@@ -2028,8 +1538,8 @@ PlayerForm::SetRepeatButtonImage(int repeatValue)// 0 - 2 (OFF, ONE, ALL)
        default:
                break;
        }
-       __pRepeatButton->SetNormalBitmap(Point(POINT_X_OPTION_BUTTON_BITMAP, POINT_Y_OPTION_BUTTON_BITMAP), *pOptionRepeatBitmap);
-       __pRepeatButton->SetPressedBitmap(Point(POINT_X_OPTION_BUTTON_BITMAP, POINT_Y_OPTION_BUTTON_BITMAP), *pOptionRepeatPressBitmap);
+       __pRepeatButton->SetNormalBitmap(Point(INIT_VALUE, INIT_VALUE), *pOptionRepeatBitmap);
+       __pRepeatButton->SetPressedBitmap(Point(INIT_VALUE, INIT_VALUE), *pOptionRepeatPressBitmap);
        __pPlayerPresentationModel->SetRepeatMode(repeatValue);
 
        delete pOptionRepeatBitmap;
@@ -2054,7 +1564,7 @@ PlayerForm::SetShuffleButtonImage(bool shuffleEnable)
                pOptionShuffleBitmap = ResourceManager::GetBitmapN(L"T02_option_shuffle_on.png");
        }
 
-       __pShuffleButton->SetNormalBitmap(Point(POINT_X_OPTION_BUTTON_BITMAP, POINT_Y_OPTION_BUTTON_BITMAP), *pOptionShuffleBitmap);
+       __pShuffleButton->SetNormalBitmap(Point(INIT_VALUE, INIT_VALUE), *pOptionShuffleBitmap);
        __pPlayerPresentationModel->SetShuffleEnable(shuffleEnable);
        UpdateAnimationAlbumArt(ALBUM_ART_IMAGE_CURRENT);
 
@@ -2064,116 +1574,128 @@ PlayerForm::SetShuffleButtonImage(bool shuffleEnable)
 }
 
 void
-PlayerForm::SetAddToPlaylistButtonImage(bool buttonEnable)
+PlayerForm::SetMoreContentMenuStatus(bool buttonEnable)
 {
-       AppLogDebug("ENTER");
-       Bitmap* pOptionAddToPlaylistOnBitmap = ResourceManager::GetBitmapN(L"T02_option_add_playlist.png");
-       Bitmap* pColorizedBitmap = null;
-
-       AppLogDebug("1");
-       if (buttonEnable != true)
-       {
-               AppLogDebug("2");
-               __pAddToPlaylistButton->SetEnabled(false);
-               pColorizedBitmap = CommonUtil::GetColorizedBitmapN(*pOptionAddToPlaylistOnBitmap, Color(0x00696969));
-               __pAddToPlaylistButton->SetNormalBitmap(Point(POINT_X_OPTION_BUTTON_BITMAP, POINT_Y_OPTION_BUTTON_BITMAP), *pColorizedBitmap);
-
-               delete pColorizedBitmap;
-               pColorizedBitmap = null;
-       }
-       else
-       {
-               AppLogDebug("3");
-               __pAddToPlaylistButton->SetEnabled(true);
-               __pAddToPlaylistButton->SetNormalBitmap(Point(POINT_X_OPTION_BUTTON_BITMAP, POINT_Y_OPTION_BUTTON_BITMAP), *pOptionAddToPlaylistOnBitmap);
-       }
-
-       __pAddToPlaylistButton->Invalidate(true);
-       delete pOptionAddToPlaylistOnBitmap;
-       pOptionAddToPlaylistOnBitmap = null;
-       AppLogDebug("EXIT");
+       __pMoreContextButton->SetEnabled(buttonEnable);
+       __pMoreContextButton->Invalidate(true);
 }
 
-void
-PlayerForm::SetControlButtonImage(void)
-{
-       AppLogDebug("ENTER");
-       Bitmap* pVolumeNormalBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_volume.png");
-       Bitmap* pVolumePressBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_volume_press.png");
+//void
+//PlayerForm::SetControlButtonImage(void)
+//{
+//     AppLogDebug("ENTER");
+//     Bitmap* pVolumeNormalBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_volume.png");
+//     Bitmap* pVolumePressBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_volume_press.png");
 
-       Bitmap* pRewindNormalBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_previous.png");
-       Bitmap* pRewindPressBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_previous_press.png");
+//     Bitmap* pRewindNormalBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_previous.png");
+//     Bitmap* pRewindPressBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_previous_press.png");
 
-       Bitmap* pForwardNormalBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_next.png");
-       Bitmap* pForwardPressBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_next_press.png");
+//     Bitmap* pForwardNormalBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_next.png");
+//     Bitmap* pForwardPressBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_next_press.png");
 
-       Bitmap* pBackNormalBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_back.png");
-       Bitmap* pBackPressBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_back_press.png");
+//     Bitmap* pBackNormalBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_back.png");
+//     Bitmap* pBackPressBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_back_press.png");
 
-       __pVolumeButton->SetNormalBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pVolumeNormalBitmap);
-       __pVolumeButton->SetPressedBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pVolumePressBitmap);
+//     __pVolumeButton->SetNormalBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pVolumeNormalBitmap);
+//     __pVolumeButton->SetPressedBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pVolumePressBitmap);
 
-       __pRewindButton->SetNormalBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pRewindNormalBitmap);
-       __pRewindButton->SetPressedBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pRewindPressBitmap);
+//     __pRewindButton->SetNormalBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pRewindNormalBitmap);
+//     __pRewindButton->SetPressedBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pRewindPressBitmap);
 
-       __pForwardButton->SetNormalBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pForwardNormalBitmap);
-       __pForwardButton->SetPressedBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pForwardPressBitmap);
+//     __pForwardButton->SetNormalBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pForwardNormalBitmap);
+//     __pForwardButton->SetPressedBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pForwardPressBitmap);
 
-       __pBackButton->SetNormalBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pBackNormalBitmap);
-       __pBackButton->SetPressedBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pBackPressBitmap);
+//     __pBackButton->SetNormalBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pBackNormalBitmap);
+//     __pBackButton->SetPressedBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pBackPressBitmap);
 
-       delete pVolumeNormalBitmap;
-       pVolumeNormalBitmap = null;
-       delete pVolumePressBitmap;
-       pVolumePressBitmap = null;
+//     delete pVolumeNormalBitmap;
+//     pVolumeNormalBitmap = null;
+//     delete pVolumePressBitmap;
+//     pVolumePressBitmap = null;
 
-       delete pRewindNormalBitmap;
-       pRewindNormalBitmap = null;
-       delete pRewindPressBitmap;
-       pRewindPressBitmap = null;
+//     delete pRewindNormalBitmap;
+//     pRewindNormalBitmap = null;
+//     delete pRewindPressBitmap;
+//     pRewindPressBitmap = null;
 
-       delete pForwardNormalBitmap;
-       pForwardNormalBitmap = null;
-       delete pForwardPressBitmap;
-       pForwardPressBitmap = null;
+//     delete pForwardNormalBitmap;
+//     pForwardNormalBitmap = null;
+//     delete pForwardPressBitmap;
+//     pForwardPressBitmap = null;
 
-       delete pBackNormalBitmap;
-       pBackNormalBitmap = null;
-       delete pBackPressBitmap;
-       pBackPressBitmap = null;
-       AppLogDebug("EXIT");
-}
+//     delete pBackNormalBitmap;
+//     pBackNormalBitmap = null;
+//     delete pBackPressBitmap;
+//     pBackPressBitmap = null;
+//     AppLogDebug("EXIT");
+//}
 
 void
-PlayerForm::SetPlayPauseButtonImage(PlayerState playerState)
+PlayerForm::TogglePlayPauseImage(PlayerState playerState)
 {
        AppLogDebug("ENTER");
-       Bitmap* pPlayPauseNormalBitmap;
-       Bitmap* pPlayPausePressBitmap;
-
        if (playerState == PLAYER_STATE_PLAYING)
        {
-               pPlayPauseNormalBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_pause.png");
-               pPlayPausePressBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_pause_press.png");
+               RelativeLayout* layout = dynamic_cast<RelativeLayout*>(__pContentsAlbumViewPanel->GetLayoutN());
+               layout->ResetCenterAligned(*static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_ALBUM_THUMBANIL_BACKGROUND)), CENTER_ALIGN_HORIZONTAL);
+               delete layout;
 
-               __pPlayPauseButton->SetActionId(IDA_BUTTON_PAUSE);
+               Label* pAlbumTurnTable = static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_ALBUM_TURN_TABLE));
+               pAlbumTurnTable->SetShowState(true);
+               SetPauseButtonImage();
        }
        else
        {
-               pPlayPauseNormalBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_play.png");
-               pPlayPausePressBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_play_press.png");
-
-               __pPlayPauseButton->SetActionId(IDA_BUTTON_PLAY);
+               RelativeLayout* layout = dynamic_cast<RelativeLayout*>(__pContentsAlbumViewPanel->GetLayoutN());
+               layout->SetCenterAligned(*static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_ALBUM_THUMBANIL_BACKGROUND)), CENTER_ALIGN_HORIZONTAL);
+               delete layout;
+               Label* pAlbumTurnTable = static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_ALBUM_TURN_TABLE));
+               pAlbumTurnTable->SetShowState(false);
+               SetPlayButtonImage();
        }
-       __pPlayPauseButton->SetNormalBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pPlayPauseNormalBitmap);
-       __pPlayPauseButton->SetPressedBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pPlayPausePressBitmap);
+       if (__pContentsAlbumViewPanel->GetShowState() == true)
+       {
+               __pContentsAlbumViewPanel->Invalidate(true);
+       }
+       AppLogDebug("EXIT");
+}
+void
+PlayerForm::SetPlayButtonImage(void)
+{
+       AppLogDebug("ENTER");
+       Point point(INIT_VALUE, INIT_VALUE);
+       Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_PLAY_BUTTON_ICON_NORMAL);
+       __pPlayPauseButton->SetNormalBitmap(point, *pBitmap);
+       delete pBitmap;
+       pBitmap = ResourceManager::GetBitmapN(IDB_PLAY_BUTTON_ICON_PRESSED);
+       __pPlayPauseButton->SetPressedBitmap(point, *pBitmap);
+       delete pBitmap;
+
+       pBitmap = ResourceManager::GetBitmapN(IDB_PLAY_BUTTON_ICON_DISABLED);
+       __pPlayPauseButton->SetDisabledBitmap(point, *pBitmap);
+       delete pBitmap;
+       __pPlayPauseButton->SetActionId(IDA_BUTTON_PLAY);
+       __pPlayPauseButton->Invalidate(true);
+       AppLogDebug("EXIT");
+}
 
-       Invalidate(true);
-       delete pPlayPauseNormalBitmap;
-       pPlayPauseNormalBitmap = null;
-       delete pPlayPausePressBitmap;
-       pPlayPausePressBitmap = null;
-       AppLogDebug("EXIT");
+void
+PlayerForm::SetPauseButtonImage(void)
+{
+       AppLogDebug("ENTER");
+       Point point(INIT_VALUE, INIT_VALUE);
+       Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_PAUSE_BUTTON_ICON_NORMAL);
+       __pPlayPauseButton->SetNormalBitmap(point, *pBitmap);
+       delete pBitmap;
+       pBitmap = ResourceManager::GetBitmapN(IDB_PAUSE_BUTTON_ICON_PRESSED);
+       __pPlayPauseButton->SetPressedBitmap(point, *pBitmap);
+       delete pBitmap;
+       pBitmap = ResourceManager::GetBitmapN(IDB_PAUSE_BUTTON_ICON_DISABLED);
+       __pPlayPauseButton->SetDisabledBitmap(point, *pBitmap);
+       delete pBitmap;
+       __pPlayPauseButton->SetActionId(IDA_BUTTON_PAUSE);
+       __pPlayPauseButton->Invalidate(true);
+       AppLogDebug("EXIT");
 }
 
 result
@@ -2222,7 +1744,7 @@ PlayerForm::InitializeVolumeBar(void)
                                                                , GROUP_STYLE_NONE);
        }
        __pVolumeSlider->SetColor(TRANSPARENT_COLOR);
-       __pVolumePanel->SetBackgroundColor(COLOR_PLAYER_BOTTOM_PANEL);
+//     __pVolumePanel->SetBackgroundColor(COLOR_PLAYER_BOTTOM_PANEL);
        AddControl(*__pVolumePanel);
        __pVolumePanel->AddControl(*__pVolumeSlider);
 
@@ -2244,6 +1766,88 @@ PlayerForm::InitializeVolumeBar(void)
        delete pVolumeRightIconBitmap;
        pVolumeRightIconBitmap = null;
 
+       return E_SUCCESS;
+}
+
+result
+PlayerForm::CreateTableViewItem(Tizen::Ui::Container& parent,
+                                               const ContentInformation& contentInfoStruct)
+{
+       AppLogDebug("ENTER");
+       Panel* pTableViewItem = new (std::nothrow) Panel();
+       if (IsFailed(pTableViewItem->Construct(IDL_CONTENTS_LIBARY_ITEM_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_CONTENTS_LIBARY_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return E_FAILURE;
+       }
+       Label* pTitleName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME));
+       pTitleName->SetText(contentInfoStruct.TitleName);
+       Label* pArtistName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_ARTIST_NAME));
+       pArtistName->SetText(contentInfoStruct.ArtistName);
+       parent.AddControl(*pTableViewItem);
+       CommonUtil::SetLayoutFitToContainer(parent, *pTableViewItem);
        AppLogDebug("EXIT");
        return E_SUCCESS;
+}
+
+void
+PlayerForm::UpdateSplitBarState(void)
+{
+       AppLogDebug("ENTER");
+       Label* pSplitBar = static_cast<Label*>(GetControl(IDC_SPLIT_BAR));
+       if ((GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT) || (GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT_REVERSE))
+       {
+               pSplitBar->SetSize(GetClientAreaBounds().width, 0);
+       }
+       else
+       {
+               pSplitBar->SetSize(13,  GetClientAreaBounds().height);
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+PlayerForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
+{
+       AppLogDebug("ENTER");
+       int itemIndex = 0;
+       void* pParam = null;
+       __pThumbnail = pThumbnailInfo->GetBitmapN();
+       pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam)
+       {
+               itemIndex = *(static_cast<int*>(pParam));
+       }
+       TableView* pContentsTableView = static_cast<TableView*>(__pContentsListViewPanel->GetControl(IDC_CONTENTS_TABLEVIEW));
+       pContentsTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       delete pThumbnailInfo;
+       delete static_cast<int*>(pParam);
+       AppLogDebug("EXIT");
+}
+
+void
+PlayerForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+{
+       AppLogDebug("ENTER");
+       Panel* pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_LIBARY_ITEM_PANEL));
+       if (pItemPanel == null)
+       {
+               AppLogDebug("pItemPanel is null");
+               delete __pThumbnail;
+               __pThumbnail = null;
+               return;
+       }
+       Label* pThumbnailLabel = static_cast<Label*>(pItemPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
+       if (__pThumbnail == null || pThumbnailLabel == null)
+       {
+               AppLogDebug("__pThumbnail or pThumbnailLabel is null");
+               delete __pThumbnail;
+               __pThumbnail = null;
+               return;
+       }
+       pThumbnailLabel->SetBackgroundBitmap(*__pThumbnail);
+       delete __pThumbnail;
+       __pThumbnail = null;
+       pThumbnailLabel->Invalidate(true);
+       AppLogDebug("EXIT");
 }
\ No newline at end of file
index 9b82561..8cbb906 100644 (file)
@@ -1229,7 +1229,7 @@ PlayerPresentationModel::SetContentList(IList* pArgs)
                __pPlayContentList->RemoveAll(true);
        }
 
-       temp = static_cast<String*>(pArgs->GetAt(0));                                                                   //      seperator for AppControl or AllListForm
+       temp = static_cast<String*>(pArgs->GetAt(0));
        if (temp->Equals(MUSIC, true))
        {
                ArrayList* pContentList = static_cast<ArrayList*>(pArgs->GetAt(2));
@@ -1503,7 +1503,6 @@ PlayerPresentationModel::UpdateContentDB(void)
                if (pTempList != null)
                {
                        playCount = static_cast<Integer*>(pTempList->GetAt(0))->ToInt();
-                       //AppLogDebug("playCount : %d", playCount);
                }
                playlistDB->Update(contentIdString, playCount + 1, playTimeString);
        }
@@ -1517,7 +1516,6 @@ PlayerPresentationModel::UpdateContentDB(void)
                delete pTempList;
                pTempList = null;
        }
-
        AppLogDebug("EXIT");
 }
 
index fa1b217..2a97dcd 100644 (file)
@@ -38,8 +38,7 @@ static const Tizen::Graphics::Rectangle RECT_MUSIC_TOUCH (140, 0, 590, 120);
 static const Tizen::Graphics::Rectangle RECT_MUSIC_TITLE (140, 5, 550, 38);
 static const Tizen::Graphics::Rectangle RECT_SLIDER (120, 0, 600,120);
 
-static const Tizen::Graphics::Color COLOR_NOW_PLAY_TITLE (90, 99, 104);//Artist Color 90, 99,104
-static const Tizen::Graphics::Color COLOR_NOW_PLAY_PANEL (182, 200, 210);
+static const Tizen::Graphics::Color COLOR_NOW_PLAY_TITLE (90, 99, 104);
 
 static const Tizen::Base::String PLAYING_ICON_PLAY = L"T02_now_playing_icon_play.png";
 static const Tizen::Base::String PLAYING_ICON_PAUSE = L"T02_now_playing_icon_pause.png";
@@ -80,7 +79,7 @@ NowPlayContentPanel::Initialize(void)
                return E_INVALID_STATE;
        }
 
-       SetBackgroundColor(COLOR_NOW_PLAY_PANEL);
+//     SetBackgroundColor(COLOR_NOW_PLAY_PANEL);
 
        __pThumbnailLabel = new (std::nothrow) Label();
        __pThumbnailLabel->Construct(RECT_MUSIC_THUMBNAIL, L"");
@@ -146,7 +145,7 @@ NowPlayContentPanel::Initialize(void)
 
        default:
                break;
-       }//end of switch
+       }
 
        __pTitleLabel->SetText(titleBar);
 
@@ -188,7 +187,7 @@ NowPlayContentPanel::GetPlayStatus(void)
                        StatusDisplay = false;
                }
                break;
-       }//end of switch
+       }
 
        Invalidate(true);
        AppLogDebug("EXIT");
@@ -239,7 +238,6 @@ NowPlayContentPanel::OnPlayContentChanged(int currentContentIndex)
 
        delete pAlbumArt;
        pAlbumArt = null;
-
        AppLogDebug("EXIT");
 }
 
@@ -305,7 +303,7 @@ NowPlayContentPanel::OnTouchPressed(const Tizen::Ui::Control& source, const Tize
                                __pPresentationModel->Play(__pPresentationModel->GetCurrentContentIndex(), __pPlayStateSlider->GetValue(), true);
                        }
                        break;
-               }//end of switch
+               }
                Invalidate(true);
        }
        else if (source.GetName().Equals(PLAY_FORM_TEXT, true))
old mode 100755 (executable)
new mode 100644 (file)
index 1a3b886..f4027b5
@@ -265,7 +265,6 @@ PanelFactory::CreatePanelN(const Tizen::Base::String& panelId, const Tizen::Ui::
                ArtistPickerPanel* pPanel = new (std::nothrow) ArtistPickerPanel();
                if (pPanel == null)
                {
-                       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to create AllContentPicker.");
                        AppLogDebug("EXIT");
                        return null;
                }
index e9ec951..1861eac 100644 (file)
@@ -423,7 +423,7 @@ PlaylistContentListForm::CreateItem(const int itemIndex, int itemWidth)
        {
                pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
        }
-       pItem->SetBackgroundColor(COLOR_WHITE);
+//     pItem->SetBackgroundColor(COLOR_WHITE);
 
        pContentInfoStruct = __pPresentationModel->GetContentInfoN(itemIndex);
        if (pContentInfoStruct == null)
@@ -631,7 +631,7 @@ PlaylistContentListForm::ToggleViewMode(bool editMode)
                pFooter->SetBackButton();
                SetFormBackEventListener(this);
 
-               if ( currentContentCount > INIT_VALUE)
+               if (currentContentCount > INIT_VALUE)
                {
                        SetTitleText(*__pStrContentName);
                }
index d849e8f..15b0284 100644 (file)
@@ -35,9 +35,6 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int IDC_BUTTON_SAVE = 101;
-static const int IDC_BUTTON_CANCEL = 102;
-
 PlaylistCreatorForm::PlaylistCreatorForm(void)
        : __pPlaylistEditorPresentationModel(null)
        , __pPlaylistEditField(null)
@@ -58,7 +55,7 @@ void
 PlaylistCreatorForm::Initialize(void)
 {
        AppLogDebug("ENTER");
-       Form::Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER);
+       Form::Construct(IDL_PLAYLIST_CREATOR_FORM);
        AppLogDebug("EXIT");
 }
 
@@ -66,27 +63,10 @@ result
 PlaylistCreatorForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       ButtonItem buttonRightItem;
-       buttonRightItem.Construct(BUTTON_ITEM_STYLE_ICON, IDC_BUTTON_CANCEL);
-       buttonRightItem.SetText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT_CANCEL"));
-
-       ButtonItem buttonLeftItem;
-       buttonLeftItem.Construct(BUTTON_ITEM_STYLE_ICON, IDC_BUTTON_SAVE);
-       buttonLeftItem.SetText(ResourceManager::GetString(L"IDS_COM_OPT_SAVE"));
-
-       Header* pHeader = GetHeader();
-       pHeader->AddActionEventListener(*this);
-       pHeader->SetStyle(HEADER_STYLE_TITLE);
-       pHeader->SetButton(BUTTON_POSITION_RIGHT, buttonRightItem);
-       pHeader->SetButton(BUTTON_POSITION_LEFT, buttonLeftItem);
-       pHeader->SetTitleText(ResourceManager::GetString("IDS_MUSIC_BODY_CREATE_PLAYLIST"));
-
-       __pPlaylistEditField = new (std::nothrow) EditField();
-       __pPlaylistEditField->Construct(Rectangle(6, 1, 708, 112), EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY, EDIT_FIELD_TITLE_STYLE_NONE, true, 100, GROUP_STYLE_NONE);
+       __pPlaylistEditField = static_cast<EditField*>(GetControl(IDC_EDITFIELD));
        __pPlaylistEditField->SetOverlayKeypadCommandButtonVisible(false);
        __pPlaylistEditField->AddTextEventListener(*this);
        __pPlaylistEditField->AddKeypadEventListener(*this);
-       AddControl(*__pPlaylistEditField);
 
        __pPlaylistEditField->SetFocus();
        __pPlaylistEditField->ShowKeypad();
@@ -152,6 +132,10 @@ PlaylistCreatorForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previou
        int totalPlaylistCount = __pPlaylistEditorPresentationModel->GetAllPlayListCount();
        __previousSceneId = previousSceneId;
        AppLogDebug("%d", totalPlaylistCount);
+
+       SetFormBackEventListener(this);
+       GetFooter()->AddActionEventListener(*this);
+
        if (totalPlaylistCount != 0)
        {
                int lastNum = 0;
@@ -259,7 +243,7 @@ PlaylistCreatorForm::OnActionPerformed(const Tizen::Ui::Control& source, int act
 
        switch (actionId)
        {
-       case IDC_BUTTON_SAVE:
+       case IDA_FOOTER_BUTTON_SAVE:
                {
                        if (__pPlaylistEditField->GetText().GetLength() == 0)
                        {
@@ -313,12 +297,25 @@ PlaylistCreatorForm::OnActionPerformed(const Tizen::Ui::Control& source, int act
                                }
                                else
                                {
-                                       CommonUtil::SetAddtoPlaylistState(true);
-                                       CommonUtil::SetAddtoPlaylistName(editFieldName);
-                                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_CONTENT_PICKER,
-                                                                                                                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE,
-                                                                                                                                       SCENE_HISTORY_OPTION_NO_HISTORY,
-                                                                                                                                       SCENE_DESTROY_OPTION_DESTROY));
+//                                     CommonUtil::SetAddtoPlaylistState(true);
+//                                     CommonUtil::SetAddtoPlaylistName(editFieldName);
+//                                     pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_CONTENT_PICKER,
+//                                                                                                                                     SCENE_TRANSITION_ANIMATION_TYPE_NONE,
+//                                                                                                                                     SCENE_HISTORY_OPTION_NO_HISTORY,
+//                                                                                                                                     SCENE_DESTROY_OPTION_DESTROY));
+                                       //임시 Add track 추후 구현 NEED
+                                       __pPlaylistEditField->HideKeypad();
+                                       pSceneManager->GoBackward(BackwardSceneTransition());
+                                       if (r == E_SUCCESS)
+                                       {
+                                               MessageBox messageBox;
+                                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_POP_SUCCESS"),
+                                                                                               MSGBOX_STYLE_OK,
+                                                                                               3000);
+                                               int modalResult = 0;
+                                               messageBox.ShowAndWait(modalResult);
+                                       }
+                                       //임시 Add track 추후 구현 NEED
                                }
                        }
                        else
@@ -333,13 +330,6 @@ PlaylistCreatorForm::OnActionPerformed(const Tizen::Ui::Control& source, int act
                }
                break;
 
-       case IDC_BUTTON_CANCEL:
-               {
-                       __pPlaylistEditField->HideKeypad();
-                       pSceneManager->GoBackward(BackwardSceneTransition());
-               }
-               break;
-
        default:
                break;
        }
@@ -358,4 +348,13 @@ PlaylistCreatorForm::OnTextValueChangeCanceled(const Tizen::Ui::Control& source)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
+}
+
+void
+PlaylistCreatorForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       AppLogDebug("ENTER");
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       pSceneManager->GoBackward(BackwardSceneTransition());
+       AppLogDebug("EXIT");
 }
\ No newline at end of file
index a59d468..1792916 100644 (file)
@@ -52,7 +52,6 @@ CATCH:
        //AppLogException("PlaylistEditorPresentationModel::GetInstance(void) Error");
        delete pPlaylistEditorPresentationModel;
 
-       AppLogDebug("EXIT - CATCH");
        return null;
 }
 
index 00e5b55..117d5a9 100644 (file)
@@ -38,17 +38,12 @@ static const int IDA_RENAME_EDIT_BUTTON = 101;
 
 PlaylistListEditorPanel::PlaylistListEditorPanel(void)
        : ThumbnailBase::ThumbnailBase()
-       , __isEditMode(false)
        , __selectedItemIndex(-1)
        , __checkedItemCount(0)
-       , __pContentTableView(null)
        , __pSelectAllCheckedButton(null)
        , __pCheckedCountLabel(null)
        , __pThumbnail(null)
-       , __pPlayListPickerPopup(null)
-       , __pSharePopup(null)
        , __pPlaylistName(null)
-       , __pItemPressedBackgroundColor(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -60,53 +55,12 @@ PlaylistListEditorPanel::~PlaylistListEditorPanel(void)
        AppLogDebug("EXIT");
 }
 
-bool
-PlaylistListEditorPanel::Initialize(void)
-{
-       AppLogDebug("ENTER");
-       result r = BasePanel::Construct(Rectangle(0, 0, W_INITIAL_PANEL, H_INITIAL_PANEL));
-       if (IsFailed(r))
-       {
-               AppLogDebug("EXIT");
-               return false;
-       }
-       AppLogDebug("EXIT");
-       return true;
-}
-
 result
 PlaylistListEditorPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       int width = pForm->GetClientAreaBounds().width;
-       int height = pForm->GetClientAreaBounds().height;
-
-       SetBounds(Rectangle(0, 0, width, height));
-
-       __pContentTableView = CommonUtil::CreateEditorTableView(width, height);
-       __pContentTableView->SetItemProvider(this);
-       __pContentTableView->AddTableViewItemEventListener(*this);
-
-       __pSelectAllCheckedButton = CommonUtil::CreateSelectAllCheckedButton(width);
-       __pSelectAllCheckedButton->AddActionEventListener(*this);
-       __pSelectAllCheckedButton->SetShowState(false);
-
-       __pCheckedCountLabel = CommonUtil::CreateCheckedCountLabel(width, height);
-       __pCheckedCountLabel->SetShowState(false);
-
-       AddControl(*__pSelectAllCheckedButton);
-       AddControl(*__pContentTableView);
-       AddControl(*__pCheckedCountLabel);
-
        __pPresentationModel = PlaylistEditorPresentationModel::GetInstance();
-
-       if (__pPresentationModel->GetAllPlayListCount() != 0)
-       {
-               __pSelectAllCheckedButton->SetShowState(true);
-       }
+       SetLayoutFitToForm();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -115,13 +69,6 @@ result
 PlaylistListEditorPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-
-       delete __pPlayListPickerPopup;
-       __pPlayListPickerPopup = null;
-
-       delete __pSharePopup;
-       __pSharePopup = null;
-
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -142,86 +89,33 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        switch (actionId)
        {
-       case IDA_CHECK_BUTTON:
+       case IDA_HEADER_ALL_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
-                       if (__isEditMode == false)
-                       {
-                               __checkedItemCount = totalCount;
-                               CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                               CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
-
-                               if (__checkedItemCount != 0)
-                               {
-                                       pFooter->SetItemEnabled(0, true);
-                               }
-                               else
-                               {
-                                       pFooter->SetItemEnabled(0, false);
-                               }
-                               pFooter->Invalidate(true);
-                       }
-                       else
-                       {
-                               if (__pSelectAllCheckedButton->IsSelected() == false)
-                               {
-                                       __pSelectAllCheckedButton->SetSelected(true);
-                               }
-                               else
-                               {
-                                       __pSelectAllCheckedButton->SetSelected(false);
-                               }
-                               __pEditingArea->HideKeypad();
-                               __isEditMode = false;
-                               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-                               ShowFooter();
-                       }
-               }
-               break;
-
-       case IDA_UNCHECK_BUTTON:
-               {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
-                       if (__isEditMode == false)
+                       if (totalCount == __checkedItemCount)
                        {
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
-                               if (__checkedItemCount != 0)
-                               {
-                                       pFooter->SetItemEnabled(0, true);
-                               }
-                               else
-                               {
-                                       pFooter->SetItemEnabled(0, false);
-                               }
-                               pFooter->Invalidate(true);
-                       }
-                       else
-                       {
-                               if (__pSelectAllCheckedButton->IsSelected() == false)
-                               {
-                                       __pSelectAllCheckedButton->SetSelected(true);
-                               }
-                               else
-                               {
-                                       __pSelectAllCheckedButton->SetSelected(false);
-                               }
-                               __pEditingArea->HideKeypad();
-                               __isEditMode = false;
-                               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-                               ShowFooter();
+                               SetCheckedCountBalloonPopup(__checkedItemCount);
+                               SetUnCheckedIconAllCheckButton();
+                               CommonUtil::SetFooterItemEnabled(*pFooter, false);
+                               break;
                        }
+
+                       __checkedItemCount = totalCount;
+                       CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
+                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedIconAllCheckButton();
+                       CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
 
        case IDA_FOOTER_BUTTON_DELETE:
                {
-               if (__checkedItemCount <= INIT_VALUE)
-               {
-                       AppLogDebug("EXIT");
-                       return;
-               }
+                       if (__checkedItemCount <= INIT_VALUE)
+                       {
+                               AppLogDebug("EXIT");
+                               return;
+                       }
 
                        ContentManager contentManager;
                        contentManager.Construct();
@@ -229,16 +123,13 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                        int totalCount = __pPresentationModel->GetAllPlayListCount();
                        ArrayList* pTempList = new (std::nothrow) ArrayList();
                        pTempList->Construct();
-                       for (int iCount = 0; iCount < totalCount; iCount++)
+                       for (int index = totalCount - 1; index >= 0; index--)
                        {
-                               AppLogDebug("%d", iCount);
-                               if (__pContentTableView->IsItemChecked(iCount) == true)
+                               if (__pContentTableView->IsItemChecked(index) == true)
                                {
-                                       AppLogDebug("true %d", iCount);
-                                       pTempList->Add(*(new (std::nothrow) String(*__pPresentationModel->GetPlayListNameN(iCount))));
+                                       pTempList->Add(*(new (std::nothrow) String(*__pPresentationModel->GetPlayListNameN(index))));
+                                       __pContentTableView->RefreshItem(index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
                                }
-
-                               __pContentTableView->SetItemChecked(iCount, false);
                        }
 
                        if (pTempList != null)
@@ -248,79 +139,37 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                                        __pPresentationModel->RemovePlayList(*static_cast<String*>(pTempList->GetAt(i)));
                                }
                        }
-                       __pContentTableView->UpdateTableView();
-                       __pContentTableView->Invalidate(true);
-
-                       __checkedItemCount = INIT_VALUE;
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
-                       CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
 
-                       if (__pPresentationModel->GetAllPlayListCount() != 0)
+                       if (__pPresentationModel->GetAllPlayListCount() != INIT_VALUE)
                        {
-                               __pSelectAllCheckedButton->SetEnabled(true);
+                               //__pSelectAllCheckedButton->SetEnabled(true);
                        }
                        else
                        {
-                               __pSelectAllCheckedButton->SetEnabled(false);
+                               SetNoContentSongs(true);
                        }
-                       pFooter->SetItemEnabled(0, false);
-                       pFooter->Invalidate(true);
-               }
-               break;
+                       __checkedItemCount = INIT_VALUE;
+                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetUnCheckedIconAllCheckButton();
 
-       case IDA_FOOTER_BUTTON_CANCEL:
-               {
-                       pSceneManager->GoBackward(BackwardSceneTransition());
+                       CommonUtil::SetFooterItemEnabled(*pFooter, false);
                }
                break;
 
        case IDA_RENAME_EDIT_BUTTON:
                {
-                       if (__isEditMode == false)
-                       {
-                               Integer::Parse(source.GetName(), __selectedItemIndex);
-                               AppLogDebug("__selectedItemIndex : %d", __selectedItemIndex);
-                               __isEditMode = true;
-                               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-                               __pEditingArea->SetFocus();
-                               /* hojun.cheong */
-                               /*__pEditingArea->ShowKeypad();*/
-                               /* hojun.cheong */
-//                             pFooter->SetItemEnabled(0, false);
-//                             pFooter->Invalidate(true);
-                       }
-                       else
-                       {
-                               __pEditingArea->HideKeypad();
-                               AppLogDebug("__selectedItemIndex : %d", __selectedItemIndex);
-                               __isEditMode = false;
-                               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-                               ShowFooter();
-                       }
-//                     HideFooter();
-                       pFooter->SetItemEnabled(0, false);
-                       pFooter->Invalidate(true);
-               }
-               break;
-
-       case IDA_RENAME_CANCEL_BUTTON:
-               {
-                       if (__isEditMode == true)
-                       {
-//                             __pEditingArea->HideKeypad();
-                               AppLogDebug("__selectedItemIndex : %d", __selectedItemIndex);
-                               __isEditMode = false;
-                               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-                               /* hojun.cheong */
-                               /*ShowFooter();*/
-                               /* hojun.cheong */
-                       }
+                       Integer::Parse(source.GetName(), __selectedItemIndex);
+                       AppLogDebug("%d", __selectedItemIndex);
+                       ArrayList* pData = new (std::nothrow) ArrayList();
+                       pData->Construct();
+                       pData->Add(*(new (std::nothrow) Integer(__selectedItemIndex)));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYLIST_RENAME),pData);
                }
                break;
 
        default:
                break;
-       }//End of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -330,38 +179,27 @@ PlaylistListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& pre
                                                                                Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-
        Form* pForm = dynamic_cast<Form*>(GetParent());
+       Footer* pFooter = null;
        AppAssert(pForm);
 
-       Footer* pFooter = CommonUtil::CreatePlaylistEditFooter(*pForm);
+       SetEditHeaderStyle();
+       pForm->SetFormBackEventListener(this);
+
+       pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_DELETE_ADD);
        pFooter->AddActionEventListener(*this);
+       pFooter->SetShowState(true);
+       CommonUtil::SetFooterItemEnabled(*pFooter, false);
+
+       UpdateContentList();
+       SetCheckedCountBalloonPopup(INIT_VALUE);
 
+       SetNoContentSongs(false);
        if (pArgs != null)
        {
                pArgs->RemoveAll(true);
                delete pArgs;
        }
-
-       if (__checkedItemCount == 0)
-       {
-               pFooter->SetItemEnabled(0, false);
-               pFooter->Invalidate(true);
-       }
-
-//     if (__pPresentationModel->GetAllPlayListCount() == 0)
-//     {
-//             pFooter->SetItemEnabled(0, false);
-//             pFooter->Invalidate(true);
-//     }
-//     else
-//     {
-//             pFooter->SetItemEnabled(0, true);
-//             pFooter->Invalidate(true);
-//     }
-
-       UpdateContentList();
-
        AppLogDebug("EXIT");
 }
 
@@ -370,24 +208,6 @@ PlaylistListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& cu
                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
-
-       if (__isEditMode == true)
-       {
-               __pEditingArea->HideKeypad();
-
-               __isEditMode = false;
-               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-               ShowFooter();
-//             int totalCount = __pPresentationModel->GetAllPlayListCount();
-//             for (int index = 0; index < totalCount; index++)
-//             {
-//                     if (index != __selectedItemIndex)
-//                     {
-//                             __pContentTableView->SetItemEnabled(index, true);
-//                     }
-//             }
-       }
-
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
 
@@ -399,161 +219,21 @@ PlaylistListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& cu
        pFooter->RemoveActionEventListener(*this);
 
        __checkedItemCount = INIT_VALUE;
-       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
-       CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
+       SetCheckedCountBalloonPopup(__checkedItemCount);
 
        int totalCount = __pPresentationModel->GetAllPlayListCount();
        for (int iCount = 0; iCount < totalCount; iCount++)
        {
                __pContentTableView->SetItemChecked(iCount, false);
        }
-
        CancelAllThumbnailRequest();
        AppLogDebug("EXIT");
 }
 
-void
-PlaylistListEditorPanel::OnKeypadActionPerformed(Tizen::Ui::Control& source,
-                                                               Tizen::Ui::KeypadAction keypadAction)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("%d", keypadAction);
-       result r = E_SUCCESS;
-       if (keypadAction == KEYPAD_ACTION_DONE)
-       {
-               if (__pPlaylistName->GetLength() == 0)
-               {
-                       MessageBox messageBox;
-                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 3000);
-                       int modalResult = 0;
-                       messageBox.ShowAndWait(modalResult);
-               }
-               else
-               {
-                       String* inputString = __pPlaylistName;
-                       inputString->Trim();
-                       if (inputString->GetLength() != 0)
-                       {
-                               r = __pPresentationModel->SetPlayListName(*(static_cast<String*>(__pPresentationModel->GetAllPlayListNameN()->GetAt(__selectedItemIndex))), *__pPlaylistName);
-                               if (r != E_SUCCESS)
-                               {
-                                       MessageBox messageBox;
-                                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 3000);
-                                       int modalResult = 0;
-                                       messageBox.ShowAndWait(modalResult);
-                               }
-                       }
-                       else
-                       {
-                               MessageBox messageBox;
-                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 500);
-
-                               int modalResult = 0;
-                               messageBox.ShowAndWait(modalResult);
-                       }
-               }
-               __pEditingArea->HideKeypad();
-               __isEditMode = false;
-               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-               ShowFooter();
-       }
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListEditorPanel::OnKeypadClosed(Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
-       ShowFooter();
-//     int totalCount = __pPresentationModel->GetAllPlayListCount();
-//     for (int index = 0; index < totalCount; index++)
-//     {
-//             if (index != __selectedItemIndex)
-//             {
-//                     __pContentTableView->SetItemEnabled(index, true);
-//             }
-//     }
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListEditorPanel::OnKeypadOpened(Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
-//     HideFooter();
-//     SetBoundList();
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListEditorPanel::OnKeypadWillOpen(Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
-       HideFooter();
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListEditorPanel::OnTextValueChanged(const Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER : %ls", source.GetName().GetPointer());
-       result r = E_SUCCESS;
-       EditArea* pEditArea = const_cast<EditArea*>(static_cast<const EditArea*>(&source));
-       __pPlaylistName = new (std::nothrow) String(pEditArea->GetText());
-
-       if (__pPlaylistName->GetLength() == 0)
-       {
-               MessageBox messageBox;
-               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 3000);
-               int modalResult = 0;
-               messageBox.ShowAndWait(modalResult);
-       }
-       else
-       {
-               String* inputString = __pPlaylistName;
-               inputString->Trim();
-               if (inputString->GetLength() != 0)
-               {
-                       r = __pPresentationModel->SetPlayListName(*(static_cast<String*>(__pPresentationModel->GetAllPlayListNameN()->GetAt(__selectedItemIndex))), *__pPlaylistName);
-                       if (r != E_SUCCESS)
-                       {
-                               MessageBox messageBox;
-                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 3000);
-                               int modalResult = 0;
-                               messageBox.ShowAndWait(modalResult);
-                       }
-               }
-               else
-               {
-                       MessageBox messageBox;
-                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 500);
-
-                       int modalResult = 0;
-                       messageBox.ShowAndWait(modalResult);
-               }
-       }
-       __isEditMode = false;
-       __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-       ShowFooter();
-
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListEditorPanel::OnTextValueChangeCanceled(const Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
-       __isEditMode = false;
-       __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-       ShowFooter();
-       AppLogDebug("EXIT");
-}
-
 int
 PlaylistListEditorPanel::GetItemCount(void)
 {
        AppLogDebug("ENTER");
-
        if (__pPresentationModel == null)
        {
                AppLogDebug("EXIT");
@@ -569,47 +249,46 @@ PlaylistListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
        AppLogDebug("%d", itemIndex);
+       RelativeLayout layout;
+       layout.Construct();
+
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        Tizen::Base::String* playlistName = __pPresentationModel->GetPlayListNameN(itemIndex);
-       Label* pThumbnailLabel = new (std::nothrow) Label();
-       pThumbnailLabel->Construct(Rectangle(16, 8, 112, 112), L"");
 
        int playlistItemCount = __pPresentationModel->GetPlayListItemCount(*playlistName);
        ContentId contentId = __pPresentationModel->GetPlayListItemContentId(*playlistName);
+
+       Panel* pTableViewItem = new (std::nothrow) Panel();
+       if (IsFailed(pTableViewItem->Construct(IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL)))
+       {
+               AppLogDebug("Construct(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
        if (playlistItemCount > 0 && !IsFailed(GetLastResult()))
        {
                RequestThumbnail(contentId, (new (std::nothrow) int(itemIndex)));
-               pThumbnailLabel->SetBackgroundBitmap(*GetDefaultThumbnail());
-               pThumbnailLabel->SetName(L"pThumbnailLabel");
        }
        else
        {
+               Label* pThumbnailLabel = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_THUMBNAIL));
                Bitmap* thumbnail = (ResourceManager::GetBitmapN(L"34_player_list_thum_noitems.png"));
-
                thumbnail->Scale(Dimension(W_THUMBNAIL, H_THUMBNAIL));
-
                pThumbnailLabel->SetBackgroundBitmap(*thumbnail);
+
                delete thumbnail;
                thumbnail = null;
        }
 
-       Label* pThumbnailBGLabel = new (std::nothrow) Label();
-       pThumbnailBGLabel->Construct(Rectangle(15, 7, 113, 113), L"");
+       Label* pTitleName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME));
+       pTitleName->SetText(*playlistName);
 
-       Label* pTitleLabel = new (std::nothrow) Label();
-       pTitleLabel->Construct(Rectangle(144, 29, 356, 70), L"");
-       pTitleLabel->SetName(L"TitleLabel");
-       pTitleLabel->SetTextColor(COLOR_MAIN_TEXT);
-       pTitleLabel->SetTextConfig(MAIN_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pTitleLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pTitleLabel->SetText(*playlistName);
+       Button* pEditButton = static_cast<Button*>(pTableViewItem->GetControl(IDC_BUTTON_EDIT));
 
-       Button* pEditButton = new (std::nothrow) Button();
-       pEditButton->Construct(Rectangle(500, 32, 64, 64));
-       String str = null;
+       String str = L"";
        str.Append(itemIndex);
        pEditButton->SetName(str);
 
@@ -626,196 +305,52 @@ PlaylistListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        pEditButton->SetActionId(IDA_RENAME_EDIT_BUTTON);
        pEditButton->AddActionEventListener(*this);
 
-       pItem->AddControl(*pThumbnailLabel);
-       pItem->AddControl(*pThumbnailBGLabel);
-       pItem->AddControl(*pTitleLabel);
-       pItem->AddControl(*pEditButton);
-       pItem->SetIndividualSelectionEnabled(pEditButton, true);
-       str = null;
-
        delete pNormalBitmap;
        pNormalBitmap = null;
+
        delete pPressedBitmap;
        pPressedBitmap = null;
+
        delete pBackgroundNormalBitmap;
        pBackgroundNormalBitmap = null;
+
        delete pBackgroundPressBitmap;
        pBackgroundPressBitmap = null;
 
+       pItem->SetIndividualSelectionEnabled(pEditButton, true);
+       pItem->AddControl(*pTableViewItem);
+       CommonUtil::SetLayoutFitToContainer(*pItem, *pTableViewItem);
        AppLogDebug("EXIT");
        return pItem;
 }
 
-bool
-PlaylistListEditorPanel::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("%d", itemIndex);
-       if (__isEditMode == true)
-       {
-               if (itemIndex == __selectedItemIndex)
-               {
-//                     __pEditingArea->HideKeypad();
-                       ShowFooter();
-//                     SetBoundList();
-                       __isEditMode = false;
-               }
-       }
-
-       delete pItem;
-       pItem = null;
-
-       AppLogDebug("EXIT");
-       return true;
-}
-
 void
 PlaylistListEditorPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-       if (__pThumbnail != null)
+       Panel* pItemPanel =  static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL));
+       if (pItemPanel == null)
        {
-               Label* pThumbnailLabel = static_cast<Label*>(pItem->GetControl(L"pThumbnailLabel"));
-               if (pThumbnailLabel == null)
-               {
-                       AppLogDebug("pThumbnailLabel is null");
-                       return;
-               }
-               pThumbnailLabel->SetBackgroundBitmap(*__pThumbnail);
+               AppLogDebug("pItemPanel is null");
                delete __pThumbnail;
                __pThumbnail = null;
-               pThumbnailLabel->Invalidate(true);
                return;
        }
-       if (__isEditMode == true)
-       {
-               pItem->RemoveAllControls();
-
-               Tizen::Ui::Controls::EditArea* pEditArea = new (std::nothrow) EditArea();
-
-               /*pEditArea->Construct(Rectangle(0, 0, 500, 128), INPUT_STYLE_OVERLAY, 100);*/
-               pEditArea->Construct(Rectangle(0, 0, 600, 128), INPUT_STYLE_FULLSCREEN, 100);
-               pEditArea->SetName(RENAME_EDIT_AREA);
-               pEditArea->SetOverlayKeypadCommandButtonVisible(false);
-               pEditArea->SetKeypadActionEnabled(true);
-               pEditArea->SetKeypadAction(KEYPAD_ACTION_DONE);
-               pEditArea->AddTextEventListener(*this);
-               pEditArea->AddKeypadEventListener(*this);
-               pEditArea->AddActionEventListener(*this);
-               __pEditingArea = pEditArea;
-
-               /*Tizen::Ui::Controls::Button* pCancelButton = new (std::nothrow) Button();
-               pCancelButton->Construct(Rectangle(500, 0, 100, 128));
-               pCancelButton->SetText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT_CANCEL"));
-               pCancelButton->SetTextSize(22);
-
-               pCancelButton->SetName(RENAME_CALCEL_BUTTON);
-               pCancelButton->SetActionId(IDA_RENAME_CANCEL_BUTTON);
-               pCancelButton->AddActionEventListener(*this);*/
-
-               pItem->AddControl(*pEditArea);
-               /*pItem->AddControl(*pCancelButton);*/
-
-               pItem->SetIndividualSelectionEnabled(pEditArea, true);
-               /*pItem->SetIndividualSelectionEnabled(pCancelButton, true);*/
-
-               pEditArea->SetText(*(static_cast<String*>(__pPresentationModel->GetAllPlayListNameN()->GetAt(itemIndex))));
-//             pEditArea->SetText(*(static_cast<String*>(__pPresentationModel->GetPlayListNameN(itemIndex))));
-               __pPlaylistName = new (std::nothrow) String(pEditArea->GetText());
-//             pEditArea->SetFocus();
-//             pEditArea->ShowKeypad();
-
-//             __pSelectAllCheckedButton->SetEnabled(false);
-               __pItemPressedBackgroundColor = pItem->GetBackgroundColor(TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
-               pItem->SetBackgroundColor(Color(0, 0, 0, 0), TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
-       }
-       else if (__isEditMode == false)
-       {
-               pItem->RemoveAllControls();
-               Tizen::Base::String* playlistName = __pPresentationModel->GetPlayListNameN(itemIndex);
-               Label* pThumbnailLabel = new (std::nothrow) Label();
-               pThumbnailLabel->Construct(Rectangle(16, 8, 112, 112), L"");
-               int playlistItemCount = __pPresentationModel->GetPlayListItemCount(*playlistName);
-               ContentId contentId = __pPresentationModel->GetPlayListItemContentId(*playlistName);
-               if (playlistItemCount > 0 && !IsFailed(GetLastResult()))
-               {
-                       RequestThumbnail(contentId, (new (std::nothrow) int(itemIndex)));
-                       pThumbnailLabel->SetBackgroundBitmap(*GetDefaultThumbnail());
-                       pThumbnailLabel->SetName(L"pThumbnailLabel");
-               }
-               else
-               {
-                       Bitmap* thumbnail = (ResourceManager::GetBitmapN(L"34_player_list_thum_noitems.png"));
-                       thumbnail->Scale(Dimension(W_THUMBNAIL, H_THUMBNAIL));
-
-                       pThumbnailLabel->SetBackgroundBitmap(*thumbnail);
-                       delete thumbnail;
-                       thumbnail = null;
-               }
-               Label* pThumbnailBGLabel = new (std::nothrow) Label();
-               pThumbnailBGLabel->Construct(Rectangle(15, 7, 113, 113), L"");
-               Label* pTitleLabel = new (std::nothrow) Label();
-               pTitleLabel->Construct(Rectangle(144, 29, 356, 70), L"");
-               pTitleLabel->SetName(L"TitleLabel");
-               pTitleLabel->SetTextColor(COLOR_MAIN_TEXT);
-               pTitleLabel->SetTextConfig(MAIN_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-               pTitleLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-               pTitleLabel->SetText(*playlistName);
-               Button* pEditButton = new (std::nothrow) Button();
-               pEditButton->Construct(Rectangle(500, 32, 64, 64));
-               String str = null;
-               str.Append(itemIndex);
-               pEditButton->SetName(str);
-
-               Bitmap* pNormalBitmap = ResourceManager::GetBitmapN(L"00_button_rename_normal.png");
-               Bitmap* pPressedBitmap = ResourceManager::GetBitmapN(L"00_button_rename_press.png");
-               Bitmap* pBackgroundNormalBitmap = ResourceManager::GetBitmapN(L"00_btn_circle_bg_normal.png");
-               Bitmap* pBackgroundPressBitmap = ResourceManager::GetBitmapN(L"00_btn_circle_bg_press.png");
-
-               pEditButton->SetNormalBitmap(Point(0, 0), *pNormalBitmap);
-               pEditButton->SetNormalBackgroundBitmap(*pBackgroundNormalBitmap);
-               pEditButton->SetPressedBitmap(Point(0, 0), *pPressedBitmap);
-               pEditButton->SetPressedBackgroundBitmap(*pBackgroundPressBitmap);
-
-               pEditButton->SetActionId(IDA_RENAME_EDIT_BUTTON);
-               pEditButton->AddActionEventListener(*this);
-               pItem->AddControl(*pThumbnailLabel);
-               pItem->AddControl(*pThumbnailBGLabel);
-               pItem->AddControl(*pTitleLabel);
-               pItem->AddControl(*pEditButton);
-               AppLogDebug("1");
-               pItem->SetIndividualSelectionEnabled(pEditButton, true);
-               AppLogDebug("2");
-               str = null;
-
-               pItem->SetBackgroundColor(__pItemPressedBackgroundColor, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
-
-               delete pNormalBitmap;
-               pNormalBitmap = null;
-               delete pPressedBitmap;
-               pPressedBitmap = null;
-               delete pBackgroundNormalBitmap;
-               pBackgroundNormalBitmap = null;
-               delete pBackgroundPressBitmap;
-               pBackgroundPressBitmap = null;
-
-//             __pSelectAllCheckedButton->SetEnabled(true);
-//             __pSelectAllCheckedButton->Invalidate(true);
-       }
 
-       if (__checkedItemCount == __pPresentationModel->GetAllPlayListCount())
+       Label* pThumbnailLabel = static_cast<Label*>(pItemPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
+       if (__pThumbnail == null || pThumbnailLabel == null)
        {
-               __pSelectAllCheckedButton->SetSelected(true);
+               AppLogDebug("__pThumbnail or pThumbnailLabel is null");
+               delete __pThumbnail;
+               __pThumbnail = null;
+               return;
        }
-       AppLogDebug("EXIT");
-}
+       pThumbnailLabel->SetBackgroundBitmap(*__pThumbnail);
+       delete __pThumbnail;
+       __pThumbnail = null;
+       pThumbnailLabel->Invalidate(true);
 
-int
-PlaylistListEditorPanel::GetDefaultItemHeight(void)
-{
-       AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-       return ITEM_HEIGHT;
 }
 
 void
@@ -827,32 +362,7 @@ PlaylistListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableV
        AppLogDebug("ENTER");
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
-       if (__isEditMode == true)
-       {
-               if (tableView.IsItemChecked(itemIndex) == true)
-               {
-                       tableView.SetItemChecked(itemIndex, false);
-               }
-               else
-               {
-                       tableView.SetItemChecked(itemIndex, true);
-               }
-               __pEditingArea->HideKeypad();
-//             for (int index = 0; index < totalCount; index++)
-//             {
-//                     if (index != __selectedItemIndex)
-//                     {
-//                             __pContentTableView->SetItemEnabled(index, true);
-//                     }
-//             }
-               __isEditMode = false;
-               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-               ShowFooter();
-//             __pEditingArea->SetFocus();
-//             __pEditingArea->ShowKeypad();
-               return;
-       }
-
+       Footer* pFooter = pForm->GetFooter();
        __selectedItemIndex = itemIndex;
 
        switch (status)
@@ -866,7 +376,7 @@ PlaylistListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableV
 
        case TABLE_VIEW_ITEM_STATUS_UNCHECKED:
                {
-                       if (__checkedItemCount >0)
+                       if (__checkedItemCount > INIT_VALUE)
                        {
                                __checkedItemCount--;
                        }
@@ -876,134 +386,95 @@ PlaylistListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableV
 
        default:
                break;
-       }//end of switch
+       }
 
-       if (__checkedItemCount == 0)
+       if (__checkedItemCount > INIT_VALUE)
        {
-               Footer* pFooter = pForm->GetFooter();
-               pFooter->SetItemEnabled(0, false);
-               pFooter->Invalidate(true);
+               CommonUtil::SetFooterItemEnabled(*pFooter, true);
        }
        else
        {
-               Footer* pFooter = pForm->GetFooter();
-               pFooter->SetItemEnabled(0, true);
-               pFooter->Invalidate(true);
+               CommonUtil::SetFooterItemEnabled(*pFooter, false);
        }
-       CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
 
        if (__checkedItemCount == __pPresentationModel->GetAllPlayListCount())
        {
-               __pSelectAllCheckedButton->SetSelected(true);
+               SetCheckedIconAllCheckButton();
        }
-
-       Invalidate(true);
-       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListEditorPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                                       int itemIndex,
-                                                                       Tizen::Ui::Controls::TableViewContextItem* pContextItem,
-                                                                       bool activated)
-{
-       AppLogDebug("ENTER");
-       if (activated == false)
+       else
        {
-               return;
+               SetUnCheckedIconAllCheckButton();
        }
+
+       SetCheckedCountBalloonPopup(__checkedItemCount);
+       Invalidate(true);
        AppLogDebug("EXIT");
 }
 
 void
-PlaylistListEditorPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndexFrom,
-                                                       int itemIndexTo)
+PlaylistListEditorPanel::OnUpdateContentList(void)
 {
        AppLogDebug("ENTER");
+       UpdateContentList();
        AppLogDebug("EXIT");
 }
 
 void
-PlaylistListEditorPanel::ShowFooter(void)
+PlaylistListEditorPanel::UpdateContentList(void)
 {
        AppLogDebug( "ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-       Footer* pFooter = pForm->GetFooter();
-       if (pFooter->GetShowState() == true)
-       {
-               if (__checkedItemCount != 0)
-               {
-                       pFooter->SetItemEnabled(0, true);
-               }
-               pFooter->Invalidate(true);
-               return;
-       }
-       pFooter->SetShowState(true);
-       if (__checkedItemCount != 0)
+       if (__pPresentationModel != null && __pContentTableView != null)
        {
-               pFooter->SetItemEnabled(0, true);
+//             __pPresentationModel->RefreshContent();
+               __pContentTableView->UpdateTableView();
        }
-       pFooter->Invalidate(true);
-       pForm->SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
-
-//     SetBoundList();
-       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
        AppLogDebug( "EXIT");
 }
 
 void
-PlaylistListEditorPanel::HideFooter(void)
+PlaylistListEditorPanel::SetEditHeaderStyle(void)
 {
-       AppLogDebug( "ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-       Footer* pFooter = pForm->GetFooter();
-       if (pFooter->GetShowState() == false)
-       {
-               return;
-       }
-       pFooter->SetShowState(false);
-       pFooter->SetItemEnabled(0, false);
-       pFooter->Invalidate(true);
-       pForm->SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
-
-       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, 0, *__pContentTableView, *pForm);
-       AppLogDebug( "EXIT");
+       AppLogDebug("ENTER");
+       RemoveParentHeaderActionEventListener();
+       Header* pHeader = GetParentHeader();
+       String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
+       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       pHeader->AddActionEventListener(*this);
+       pHeader->Invalidate(true);
+       AppLogDebug("EXIT");
 }
 
 void
-PlaylistListEditorPanel::SetBoundList(void)
+PlaylistListEditorPanel::SetTabHeaderStyle(void)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       Rectangle clientBounds = pForm->GetClientAreaBounds();
-       __pContentTableView->SetBounds(0, H_SELECT_ALL_BUTTON, clientBounds.width, clientBounds.height - H_SELECT_ALL_BUTTON);
-       __pContentTableView->Invalidate(true);
+       Header* pHeader = GetParentHeader();
+       pHeader->RemoveActionEventListener(*this);
+       CommonUtil::SetTabHeaderStyle(*pHeader);
+       AddParentHeaderActionEventListener();
+       pHeader->Invalidate(true);
        AppLogDebug("EXIT");
 }
 
 void
-PlaylistListEditorPanel::OnUpdateContentList(void)
+PlaylistListEditorPanel::SetCheckedIconAllCheckButton(void)
 {
        AppLogDebug("ENTER");
-       UpdateContentList();
+       Header* pHeader = GetParentHeader();
+       String titleText(L"EDIT");
+       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, true);
+       pHeader->Invalidate(true);
        AppLogDebug("EXIT");
 }
 
 void
-PlaylistListEditorPanel::UpdateContentList(void)
+PlaylistListEditorPanel::SetUnCheckedIconAllCheckButton(void)
 {
        AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
-       {
-//             __pPresentationModel->RefreshContent();
-               __pContentTableView->UpdateTableView();
-       }
+       Header* pHeader = GetParentHeader();
+       String titleText(L"EDIT");
+       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       pHeader->Invalidate(true);
        AppLogDebug("EXIT");
 }
 
@@ -1023,4 +494,16 @@ PlaylistListEditorPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
        delete pThumbnailInfo;
        delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
+}
+
+void
+PlaylistListEditorPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       AppLogDebug("ENTER");
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       SetTabHeaderStyle();
+       pSceneManager->GoBackward(BackwardSceneTransition());
+       AppLogDebug("EXIT");
 }
\ No newline at end of file
index d631db6..7139f50 100644 (file)
@@ -20,6 +20,7 @@
  */
 
 #include "MpCommonUtil.h"
+#include "MpMiniPlayer.h"
 #include "MpNowPlayContentPanel.h"
 #include "MpPlaylistListPanel.h"
 #include "MpPlaylistListPresentationModel.h"
@@ -37,29 +38,21 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const Tizen::Graphics::Rectangle RECT_ITEM (144, 29, 400, 70);
+static const int NUM_NOT_DISPLAY_CONTENT_COUNT = -1;
 
-static const int W_SONG_TIME = 200;
-static const int H_DELETE_POPUP = 100;
-static const int Y_DELETE_POPUP =  10;
-static const int DELETE_WIDTH_POPUP = 600;
-static const int DELETE_HEIGHT_POPUP = 500;
-
-static const int Y_GAP_TABLE_VIEW_CONTENT_ITEM = 25;
-static const int X_GAP_TABLE_VIEW_CONTENT_ITEM = 14;
+static const int DEFAULT_PLAY_LIST = 0;
+static const int USER_CREATED_PLAY_LIST = 1;
 
 PlaylistListPanel::PlaylistListPanel(void)
        : ThumbnailBase::ThumbnailBase()
        , __pPlaylistListPresentationModel(null)
        , __pThumbnail(null)
-       , __pContentTableView(null)
        , __pContextItem_default(null)
        , __pContextItem_user(null)
        , __pDeletePopup(null)
-       , __pNowPlayContentPanel(null)
-       , __isEditMode(false)
        , __selectedItemIndex(-1)
        , __pPlaylistName(null)
+       , __pMoreContextMenu(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -71,82 +64,31 @@ PlaylistListPanel::~PlaylistListPanel(void)
        AppLogDebug("EXIT");
 }
 
-bool
-PlaylistListPanel::Initialize(void)
-{
-       AppLogDebug("ENTER");
-       result r = BasePanel::Construct(Rectangle(0, 0, W_INITIAL_PANEL, H_INITIAL_PANEL));
-       if (IsFailed(r))
-       {
-               AppLogDebug("EXIT");
-               return false;
-       }
-       AppLogDebug("EXIT");
-       return true;
-}
-
 result
 PlaylistListPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
+       __pContextItem_default = CreateTableViewContextItem(DEFAULT_PLAY_LIST);
+       __pContextItem_user = CreateTableViewContextItem(USER_CREATED_PLAY_LIST);
+       __pDeletePopup = CommonUtil::CreateContentDeletePopup(*this, IDA_DELETE_POPUP_DELETE, IDA_DELETE_POPUP_CANCEL);
 
-       const Form* pForm = dynamic_cast<Form*> (GetParent());
-       AppAssert(pForm);
+       if (__pDeletePopup == null || __pContextItem_default == null || __pContextItem_user == null)
+       {
+               delete __pDeletePopup;
+               __pDeletePopup = null;
 
-       Rectangle clientBounds = pForm->GetClientAreaBounds();
-       SetBounds(Rectangle(0, 0, clientBounds.width, clientBounds.height));
-
-       __pContentTableView = new (std::nothrow) TableView();
-       __pContentTableView->Construct(Rectangle(0, 0, clientBounds.width, clientBounds.height),
-                                                                       true,
-                                                                       TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
-       __pContentTableView->SetItemProvider(this);
-       __pContentTableView->AddTableViewItemEventListener(*this);
-
-       __pContextItem_default = new (std::nothrow) TableViewContextItem();
-       __pContextItem_default->Construct(Dimension(clientBounds.width, ITEM_HEIGHT));
-       __pContextItem_default->SetName(L"contextItem_default");
-
-       __pContextItem_user = new (std::nothrow) TableViewContextItem();
-       __pContextItem_user->Construct(Dimension(clientBounds.width, ITEM_HEIGHT));
-       __pContextItem_user->SetName(L"contextItem_user");
-
-       __pDeletePopup = new (std::nothrow) Popup();
-       __pDeletePopup->Construct(true, Dimension(DELETE_WIDTH_POPUP, DELETE_HEIGHT_POPUP));
-
-       Label* pDeleteTitleLabel = new (std::nothrow) Label();
-       pDeleteTitleLabel->Construct(Rectangle(0,
-                                                                                       0,
-                                                                                       __pDeletePopup->GetClientAreaBounds().width,
-                                                                                       __pDeletePopup->GetClientAreaBounds().height - H_DELETE_POPUP),
-                                                                       ResourceManager::GetString(L"IDS_MUSIC_POP_DELETE_Q"));
-
-       Button* pPopupDeleteButton = new (std::nothrow) Button();
-       pPopupDeleteButton->Construct(Rectangle(0,
-                                                                                       pDeleteTitleLabel->GetHeight() - Y_DELETE_POPUP,
-                                                                                       __pDeletePopup->GetClientAreaBounds().width / 2,
-                                                                                       H_DELETE_POPUP),
-                                                                       ResourceManager::GetString(L"IDS_MUSIC_OPT_DELETE"));
-       pPopupDeleteButton->SetActionId(IDA_DELETE_POPUP_DELETE);
-       pPopupDeleteButton->AddActionEventListener(*this);
-
-       Button* pPopupCancelButton = new (std::nothrow) Button();
-       pPopupCancelButton->Construct(Rectangle(pPopupDeleteButton->GetX() + pPopupDeleteButton->GetWidth(),
-                                                                                       pPopupDeleteButton->GetY(),
-                                                                                       pPopupDeleteButton->GetWidth(),
-                                                                                       pPopupDeleteButton->GetHeight()),
-                                                                       ResourceManager::GetString(L"IDS_COM_BODY_EDIT_CANCEL"));
-       pPopupCancelButton->SetActionId(IDA_DELETE_POPUP_CANCEL);
-       pPopupCancelButton->AddActionEventListener(*this);
-
-       __pDeletePopup->AddControl(*pDeleteTitleLabel);
-       __pDeletePopup->AddControl(*pPopupDeleteButton);
-       __pDeletePopup->AddControl(*pPopupCancelButton);
-
-       AddControl(*__pContentTableView);
+               delete __pContextItem_default;
+               __pContextItem_default = null;
 
-       __pPlaylistListPresentationModel = PlaylistListPresentationModel::GetInstance();
+               delete __pContextItem_user;
+               __pContextItem_user = null;
 
+               AppLogDebug("CommonUtil::CreateContentDeletePopup failed");
+               return E_FAILURE;
+       }
+       __pPlaylistListPresentationModel = PlaylistListPresentationModel::GetInstance();
+       SetFooterStyle(STYLE_MORE_ADD);
+       SetLayoutFitToForm();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -156,6 +98,12 @@ PlaylistListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
 
+       if (__pDeletePopup != null)
+       {
+               delete __pDeletePopup;
+               __pDeletePopup = null;
+       }
+
        delete __pContextItem_default;
        __pContextItem_default = null;
 
@@ -171,15 +119,9 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
 {
        AppLogDebug("ENTER");
        AppLogDebug("OnActionPerformed : %d", actionId);
-
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
-//     Form* pForm = dynamic_cast<Form*>(GetParent());
-//     AppAssert(pForm);
-//
-//     Footer* pFooter = pForm->GetFooter();
-
        switch (actionId)
        {
        case IDA_DELETE_POPUP_DELETE:
@@ -200,7 +142,7 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                }
                break;
 
-       case IDA_FOOTER_BUTTON_EDIT:
+       case IDA_MORE_CONTEXT_MENU_EDIT:
                {
                        if (__pPlaylistListPresentationModel->GetAllPlayListCount() == 0)
                        {
@@ -219,18 +161,30 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                }
                break;
 
-       case IDA_FOOTER_BUTTON_CREATE_PLAYLIST:
+       case IDA_MORE_CONTEXT_MENU_CREATE_PLAYLIST:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYLIST_CREATOR));
                }
                break;
 
-       case IDA_FOOTER_BUTTON_SEARCH:
+       case IDA_MORE_CONTEXT_MENU_SEARCH:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
                }
                break;
 
+       case IDA_MORE_CONTEXT_MENU_FOLDER_VIEW:
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST));
+               }
+               break;
+
+       case IDA_MORE_CONTEXT_MENU_SETTINGS:
+               {
+                       //NEED
+               }
+               break;
+
        case IDA_FLICK_BUTTON_PLAY_ALL:
                {
                        if (__selectedItemIndex >= USER_CONTENT)
@@ -257,20 +211,6 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                }
                break;
 
-       case IDA_FLICK_BUTTON_RENAME:
-               {
-                       AppLogDebug("OnActionPerformed : %d", __selectedItemIndex);
-                       __isEditMode = true;
-                       __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-                       __pEditingArea->SetFocus();
-                       /* hojun.cheong */
-                       /*__pEditingArea->ShowKeypad();*/
-                       /* hojun.cheong */
-
-//                     HideFooter();
-               }
-               break;
-
        case IDA_FLICK_BUTTON_DELETE:
                {
                        if (__pDeletePopup != null)
@@ -281,161 +221,46 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                }
                break;
 
-       case IDA_RENAME_CANCEL_BUTTON:
+       case IDA_FOOTER_BUTTON_MORE:
                {
-//                     __pEditingArea->HideKeypad();
-
-                       __isEditMode = false;
-                       __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-                       /* hojun.cheong */
-                       /*ShowFooter();*/
-                       /* hojun.cheong */
-               }
-               break;
-
-       default:
-               break;
-       }//end of switch
+                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
 
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListPanel::OnKeypadActionPerformed(Tizen::Ui::Control& source,
-                                                       Tizen::Ui::KeypadAction keypadAction)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       if (keypadAction == KEYPAD_ACTION_DONE)
-       {
-               if (__pPlaylistName->GetLength() == 0)
-               {
-                       MessageBox messageBox;
-                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 3000);
-                       int modalResult = 0;
-                       messageBox.ShowAndWait(modalResult);
-               }
-               else
-               {
-                       String* inputString = __pPlaylistName;
-                       inputString->Trim();
-                       if (inputString->GetLength() != 0)
+                       if (__pMoreContextMenu != null)
                        {
-                               r = __pPlaylistListPresentationModel->SetPlayListName(*__pPlaylistListPresentationModel->GetPlayListNameN(__selectedItemIndex - USER_CONTENT), *__pPlaylistName);
-                               if (r != E_SUCCESS)
-                               {
-                                       MessageBox messageBox;
-                                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 3000);
-                                       int modalResult = 0;
-                                       messageBox.ShowAndWait(modalResult);
-                               }
+                               delete __pMoreContextMenu;
+                               __pMoreContextMenu = null;
                        }
-                       else
-                       {
-                               MessageBox messageBox;
-                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 500);
 
-                               int modalResult = 0;
-                               messageBox.ShowAndWait(modalResult);
-                       }
+                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
+                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_MUSIC_OPT_CREATE_PLAYLIST"), IDA_MORE_CONTEXT_MENU_CREATE_PLAYLIST);
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"), IDA_MORE_CONTEXT_MENU_EDIT);
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"), IDA_MORE_CONTEXT_MENU_SEARCH);
+                       __pMoreContextMenu->AddItem(L"Folder view", IDA_MORE_CONTEXT_MENU_FOLDER_VIEW);//NEED STRING
+                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_MORE_CONTEXT_MENU_SETTINGS);
+
+                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
+                       __pMoreContextMenu->AddActionEventListener(*this);
+                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
+                       __pMoreContextMenu->SetShowState(true);
+                       __pMoreContextMenu->Show();
                }
-//             __pPlaylistListPresentationModel->SetPlayListName(*__pPlaylistListPresentationModel->GetPlayListNameN(__selectedItemIndex - USER_CONTENT), *__pPlaylistName);
-               __pEditingArea->HideKeypad();
-
-               __isEditMode = false;
-               __pPlaylistListPresentationModel->UpdatePlaylistList();
-               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-               ShowFooter();
-       }
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListPanel::OnKeypadClosed(Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
-       ShowFooter();
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListPanel::OnKeypadOpened(Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
-//     HideFooter();
-//     SetBoundList();
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListPanel::OnKeypadWillOpen(Tizen::Ui::Control &source)
-{
-       AppLogDebug("ENTER");
-       HideFooter();
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListPanel::OnTextValueChanged(const Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       EditArea* pEditArea = const_cast<EditArea*>(static_cast<const EditArea*>(&source));
-       __pPlaylistName = new (std::nothrow) String(pEditArea->GetText());
-
-       if (__pPlaylistName->GetLength() == 0)
-       {
-               __isEditMode = false;
-               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               break;
 
-               MessageBox messageBox;
-               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 3000);
-               int modalResult = 0;
-               messageBox.ShowAndWait(modalResult);
-       }
-       else
-       {
-               String* inputString = __pPlaylistName;
-               inputString->Trim();
-               if (inputString->GetLength() != 0)
+       case IDA_FOOTER_BUTTON_BACK:
                {
-                       r = __pPlaylistListPresentationModel->SetPlayListName(*__pPlaylistListPresentationModel->GetPlayListNameN(__selectedItemIndex - USER_CONTENT), *__pPlaylistName);
-                       if (r != E_SUCCESS)
-                       {
-                               MessageBox messageBox;
-                               r = messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 3000);
-                               int modalResult = 0;
-                               r = messageBox.ShowAndWait(modalResult);
-                       }
+                       Tizen::App::Application::GetInstance()->Terminate();
                }
-               else
-               {
-                       MessageBox messageBox;
-                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 500);
+               break;
 
-                       int modalResult = 0;
-                       messageBox.ShowAndWait(modalResult);
-               }
-               __isEditMode = false;
-               __pPlaylistListPresentationModel->UpdatePlaylistList();
-               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       default:
+               break;
        }
 
        AppLogDebug("EXIT");
 }
 
 void
-PlaylistListPanel::OnTextValueChangeCanceled(const Tizen::Ui::Control& source)
-{
-       AppLogDebug("ENTER");
-
-       __isEditMode = false;
-       __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-
-       AppLogDebug("EXIT");
-}
-
-void
 PlaylistListPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
        AppLogDebug("ENTER");
@@ -453,30 +278,32 @@ PlaylistListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousS
        AppAssert(pForm);
 
        pForm->SetFormBackEventListener(this);
-       pForm->GetHeader()->SetItemSelected(1);
-
-       Footer* pFooter = CommonUtil::CreateDefaultPlaylistContentListFooter(*pForm);
-       pFooter->SetBackButton();
-       pFooter->AddActionEventListener(*this);
+       GetHeader()->SetItemSelected(1);
+       GetHeader()->Invalidate(true);
 
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
-       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
+       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER) && IsExistMiniPlayer() == false)
        {
-               if (__pNowPlayContentPanel == null)
+               MiniPlayer* pMiniPlayer = new (std::nothrow) MiniPlayer();
+               if (IsFailed(pMiniPlayer->Construct()))
+               {
+                       AppLogDebug("MiniPlayer.Construct() failed");
+                       SetShowStateFooter(true);
+                       delete pMiniPlayer;
+               }
+               else
                {
-                       __pNowPlayContentPanel = new (std::nothrow) NowPlayContentPanel();
-                       __pNowPlayContentPanel->Initialize();
-                       AddControl(*__pNowPlayContentPanel);
+                       pMiniPlayer->SetBackActionEventListner(*this, IDA_FOOTER_BUTTON_BACK);
+                       pMiniPlayer->SetMoreContextMenuActionEventListner(this, IDA_FOOTER_BUTTON_MORE);
+                       AddMiniPlayer(*pMiniPlayer);
+                       SetShowStateFooter(false);
                }
-               CommonUtil::ShowNowPlayPanel(*__pContentTableView, __pNowPlayContentPanel->GetPlayStatus(), pForm->GetClientAreaBounds());
        }
        UpdateContentList();
-       if (__pPlaylistListPresentationModel->GetAllPlayListCount() == 0)
-       {
-               pFooter->SetItemEnabled(0, false);
-       }
+
+       ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
        AppLogDebug("EXIT");
 }
 
@@ -485,24 +312,8 @@ PlaylistListPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentS
                                                const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
-       if (__isEditMode == true)
-       {
-               __pEditingArea->HideKeypad();
-
-               __isEditMode = false;
-               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-               ShowFooter();
-       }
-
-       Footer* pFooter = pForm->GetFooter();
-
-       pFooter->RemoveAllButtons();
-       pFooter->RemoveAllItems();
-       pFooter->RemoveActionEventListener(*this);
        CancelAllThumbnailRequest();
+       ContentLibaryPanel::OnSceneDeactivated(currentSceneId, nextSceneId);
        AppLogDebug("EXIT");
 }
 
@@ -526,10 +337,7 @@ PlaylistListPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pTableItem = new (std::nothrow) TableViewItem();
        pTableItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pTableItem->SetBackgroundColor(COLOR_ITEM);
-
-       int ButtonWidth = (pTableItem->GetWidth() - X_GAP_TABLE_VIEW_CONTENT_ITEM ) / 3;
-       int ButtonHeight = pTableItem->GetHeight() - (Y_GAP_TABLE_VIEW_CONTENT_ITEM * 2);
+//     pTableItem->SetBackgroundColor(COLOR_ITEM);
 
        if (itemIndex < USER_CONTENT)
        {
@@ -559,23 +367,9 @@ PlaylistListPanel::CreateItem(const int itemIndex, int itemWidth)
                }
 
                String bitmapResName[] = {"34_mostplayed.png", "34_recentlyplayed.png", "34_recentlyadded.png"};
-               CreateTableViewItem(*pTableItem, pDefaultPlaylistTitle, *(ResourceManager::GetBitmapN(bitmapResName[itemIndex])), -1);
-
-               Button* pPlayAllButton = new (std::nothrow) Button();
-               pPlayAllButton->Construct(Rectangle(X_GAP_TABLE_VIEW_CONTENT_ITEM,
-                                                                                       Y_GAP_TABLE_VIEW_CONTENT_ITEM,
-                                                                                       ButtonWidth * 3,
-                                                                                       ButtonHeight));
-               pPlayAllButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
-               pPlayAllButton->SetTextSize(32);
-               pPlayAllButton->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
-               pPlayAllButton->AddActionEventListener(*this);
-
-               __pContextItem_default->SetIndividualSelectionEnabled(pPlayAllButton, true);
-               __pContextItem_default->AddControl(*pPlayAllButton);
-               pTableItem->SetContextItem(__pContextItem_default);
+               CreateTableViewItem(*pTableItem, pDefaultPlaylistTitle, *(ResourceManager::GetBitmapN(bitmapResName[itemIndex])), NUM_NOT_DISPLAY_CONTENT_COUNT);
 
-               AppLogDebug("__pContextItem_default->GetHeight() : %d, __pContextItem_default->GetWidth() : %d", __pContextItem_default->GetHeight(), __pContextItem_default->GetWidth());
+               pTableItem->SetContextItem(__pContextItem_default);
        }
        else
        {
@@ -600,43 +394,6 @@ PlaylistListPanel::CreateItem(const int itemIndex, int itemWidth)
                        thumbnail = null;
                }
 
-               Button* pPlayAllButton = new (std::nothrow) Button();
-               pPlayAllButton->Construct(Rectangle(X_GAP_TABLE_VIEW_CONTENT_ITEM,
-                                                                                       Y_GAP_TABLE_VIEW_CONTENT_ITEM,
-                                                                                       ButtonWidth,
-                                                                                       ButtonHeight));
-               pPlayAllButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
-               pPlayAllButton->SetTextSize(FONT_SIZE);
-               pPlayAllButton->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
-               pPlayAllButton->AddActionEventListener(*this);
-
-               Button* pRenameButton = new (std::nothrow) Button();
-               pRenameButton->Construct(Rectangle(pPlayAllButton->GetBounds().x + ButtonWidth,
-                                                                                       Y_GAP_TABLE_VIEW_CONTENT_ITEM,
-                                                                                       ButtonWidth,
-                                                                                       ButtonHeight));
-               pRenameButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_RENAME"));
-               pRenameButton->SetTextSize(FONT_SIZE);
-               pRenameButton->SetActionId(IDA_FLICK_BUTTON_RENAME);
-               pRenameButton->AddActionEventListener(*this);
-
-               Button* pDeleteButton = new (std::nothrow) Button();
-               pDeleteButton->Construct(Rectangle(pRenameButton->GetBounds().x + ButtonWidth,
-                                                                                       Y_GAP_TABLE_VIEW_CONTENT_ITEM,
-                                                                                       ButtonWidth,
-                                                                                       ButtonHeight));
-               pDeleteButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_DELETE"));
-               pDeleteButton->SetTextSize(FONT_SIZE);
-               pDeleteButton->SetActionId(IDA_FLICK_BUTTON_DELETE);
-               pDeleteButton->AddActionEventListener(*this);
-
-               __pContextItem_user->AddControl(*pPlayAllButton);
-               __pContextItem_user->AddControl(*pRenameButton);
-               __pContextItem_user->AddControl(*pDeleteButton);
-
-               __pContextItem_user->SetIndividualSelectionEnabled(pPlayAllButton, true);
-               __pContextItem_user->SetIndividualSelectionEnabled(pRenameButton, true);
-               __pContextItem_user->SetIndividualSelectionEnabled(pDeleteButton, true);
                pTableItem->SetContextItem(__pContextItem_user);
        }
 
@@ -650,17 +407,6 @@ PlaylistListPanel::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableVie
        AppLogDebug("ENTER");
        AppLogDebug("%d", itemIndex);
 
-       if (__isEditMode == true)
-       {
-               if (itemIndex == __selectedItemIndex)
-               {
-//                     __pEditingArea->HideKeypad();
-                       ShowFooter();
-//                     SetBoundList();
-                       __isEditMode = false;
-               }
-       }
-
        delete pItem;
        pItem = null;
 
@@ -672,144 +418,30 @@ void
 PlaylistListPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-       if (__pThumbnail != null)
+       Panel* pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL));
+       if (pItemPanel == null)
        {
-               Label* pThumbnailLabel = static_cast<Label*>(pItem->GetControl(L"pSongThumbnailLabel"));
-               if (pThumbnailLabel == null)
-               {
-                       AppLogDebug("pThumbnailLabel is null");
-                       return;
-               }
-               pThumbnailLabel->SetBackgroundBitmap(*__pThumbnail);
+               AppLogDebug("pItemPanel is null");
                delete __pThumbnail;
                __pThumbnail = null;
-               pThumbnailLabel->Invalidate(true);
                return;
        }
-       if (__isEditMode == true)
-       {
-               pItem->RemoveAllControls();
-
-               Tizen::Ui::Controls::EditArea* pEditArea = new (std::nothrow) EditArea();
-
-               /*pEditArea->Construct(Rectangle(0, 0, 592, 128), INPUT_STYLE_OVERLAY, 100);*/
-               pEditArea->Construct(Rectangle(0, 0, pItem->GetWidth(), 128), INPUT_STYLE_FULLSCREEN, 100);
-               pEditArea->SetName(RENAME_EDIT_AREA);
-               pEditArea->SetOverlayKeypadCommandButtonVisible(false);
-               pEditArea->SetKeypadActionEnabled(true);
-               pEditArea->SetKeypadAction(KEYPAD_ACTION_DONE);
-               pEditArea->AddTextEventListener(*this);
-               pEditArea->AddKeypadEventListener(*this);
-               pEditArea->AddActionEventListener(*this);
-               __pEditingArea = pEditArea;
-
-               /*Tizen::Ui::Controls::Button* pCancelButton = new (std::nothrow) Button();
-               pCancelButton->Construct(Rectangle(592, 0, 128, 128));
-               pCancelButton->SetText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT_CANCEL"));
-               pCancelButton->SetTextSize(22);
-
-               pCancelButton->SetName(RENAME_CALCEL_BUTTON);
-               pCancelButton->SetActionId(IDA_RENAME_CANCEL_BUTTON);
-               pCancelButton->AddActionEventListener(*this);*/
-
-               pItem->AddControl(*pEditArea);
-               /*pItem->AddControl(*pCancelButton);*/
 
-               pItem->SetIndividualSelectionEnabled(pEditArea, true);
-               /*pItem->SetIndividualSelectionEnabled(pCancelButton, true);*/
-
-               pItem->SetContextItem(null);
-
-               pEditArea->SetText(*__pPlaylistListPresentationModel->GetPlayListNameN(itemIndex - USER_CONTENT));
-               __pPlaylistName = new (std::nothrow) String(pEditArea->GetText());
-       }
-       else if (__isEditMode == false)
+       Label* pThumbnailLabel = static_cast<Label*>(pItemPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
+       if (__pThumbnail == null || pThumbnailLabel == null)
        {
-               pItem->RemoveAllControls();
-
-               Tizen::Base::String* playlistName = __pPlaylistListPresentationModel->GetPlayListNameN(itemIndex - USER_CONTENT);
-
-               int playlistItemCount = __pPlaylistListPresentationModel->GetPlayListItemCount(*playlistName);
-               ContentId contentId = __pPlaylistListPresentationModel->GetPlayListItemContentId(*playlistName);
-               if (playlistItemCount > 0 && !IsFailed(GetLastResult()))
-               {
-                       RequestThumbnail(contentId, (new (std::nothrow) int(itemIndex)));
-                       CreateTableViewItem(*pItem, *playlistName, *GetDefaultThumbnail(), playlistItemCount);
-               }
-               else
-               {
-                       Bitmap* thumbnail = (ResourceManager::GetBitmapN(L"34_player_list_thum_noitems.png"));
-
-                       thumbnail->Scale(Dimension(W_THUMBNAIL, H_THUMBNAIL));
-
-                       CreateTableViewItem(*pItem, *playlistName, *thumbnail, playlistItemCount);
-
-                       delete thumbnail;
-                       thumbnail = null;
-               }
-
-               int ButtonWidth = (pItem->GetWidth() - X_GAP_TABLE_VIEW_CONTENT_ITEM ) / 3;
-               int ButtonHeight = pItem->GetHeight() - (Y_GAP_TABLE_VIEW_CONTENT_ITEM * 2);
-
-               Button* pPlayAllButton = new (std::nothrow) Button();
-               pPlayAllButton->Construct(Rectangle(X_GAP_TABLE_VIEW_CONTENT_ITEM,
-                                                                                       Y_GAP_TABLE_VIEW_CONTENT_ITEM,
-                                                                                       ButtonWidth,
-                                                                                       ButtonHeight));
-               pPlayAllButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
-               pPlayAllButton->SetTextSize(FONT_SIZE);
-               pPlayAllButton->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
-               pPlayAllButton->AddActionEventListener(*this);
-
-               Button* pRenameButton = new (std::nothrow) Button();
-               pRenameButton->Construct(Rectangle(pPlayAllButton->GetBounds().x + ButtonWidth,
-                                                                                       Y_GAP_TABLE_VIEW_CONTENT_ITEM,
-                                                                                       ButtonWidth,
-                                                                                       ButtonHeight));
-               pRenameButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_RENAME"));
-               pRenameButton->SetTextSize(FONT_SIZE);
-               pRenameButton->SetActionId(IDA_FLICK_BUTTON_RENAME);
-               pRenameButton->AddActionEventListener(*this);
-
-               Button* pDeleteButton = new (std::nothrow) Button();
-               pDeleteButton->Construct(Rectangle(pRenameButton->GetBounds().x + ButtonWidth,
-                                                                                       Y_GAP_TABLE_VIEW_CONTENT_ITEM,
-                                                                                       ButtonWidth,
-                                                                                       ButtonHeight));
-               pDeleteButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_DELETE"));
-               pDeleteButton->SetTextSize(FONT_SIZE);
-               pDeleteButton->SetActionId(IDA_FLICK_BUTTON_DELETE);
-               pDeleteButton->AddActionEventListener(*this);
-
-               __pContextItem_user->AddControl(*pPlayAllButton);
-               __pContextItem_user->AddControl(*pRenameButton);
-               __pContextItem_user->AddControl(*pDeleteButton);
-
-               if (__pContextItem_user->IsIndividualSelectionEnabled(pPlayAllButton) != true)
-               {
-                       __pContextItem_user->SetIndividualSelectionEnabled(pPlayAllButton, true);
-               }
-               if (__pContextItem_user->IsIndividualSelectionEnabled(pRenameButton) != true)
-               {
-                       __pContextItem_user->SetIndividualSelectionEnabled(pRenameButton, true);
-               }
-               if (__pContextItem_user->IsIndividualSelectionEnabled(pDeleteButton) != true)
-               {
-                       __pContextItem_user->SetIndividualSelectionEnabled(pDeleteButton, true);
-               }
-               pItem->SetContextItem(__pContextItem_user);
+               AppLogDebug("__pThumbnail or pThumbnailLabel is null");
+               delete __pThumbnail;
+               __pThumbnail = null;
+               return;
        }
+       pThumbnailLabel->SetBackgroundBitmap(*__pThumbnail);
+       delete __pThumbnail;
+       __pThumbnail = null;
+       pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
 }
 
-int
-PlaylistListPanel::GetDefaultItemHeight(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return ITEM_HEIGHT;
-}
-
 void
 PlaylistListPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
@@ -817,15 +449,6 @@ PlaylistListPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& t
                                                        Tizen::Ui::Controls::TableViewItemStatus status)
 {
        AppLogDebug("ENTER");
-       if (__isEditMode == true)
-       {
-               __pEditingArea->HideKeypad();
-               __isEditMode = false;
-               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-               ShowFooter();
-               return;
-       }
-
        if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
        {
                SceneManager* pSceneManager = SceneManager::GetInstance();
@@ -878,15 +501,12 @@ PlaylistListPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& t
                        {
                                pData->Add(*(new (std::nothrow) String(L"")));
                        }
-//                     pData->Add(*(new (std::nothrow) String(*__pPlaylistListPresentationModel->GetPlayListNameN(itemIndex - USER_CONTENT))));
-
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_USER_PLAYLIST_CONTENT_LIST), pData);
                }
 
                delete pData;
                pData = null;
        }
-
        AppLogDebug("EXIT");
 }
 
@@ -902,26 +522,72 @@ PlaylistListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Contr
                AppLogDebug("EXIT");
                return;
        }
-       if (__isEditMode == true)
-       {
-               __pEditingArea->HideKeypad();
-
-               __isEditMode = false;
-               __pContentTableView->RefreshItem(__selectedItemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-               ShowFooter();
-       }
        __selectedItemIndex = itemIndex;
        AppLogDebug("EXIT");
-       //AppLogDebug("OnTableViewContextItemActivationStateChanged");
 }
 
-void
-PlaylistListPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndexFrom,
-                                                       int itemIndexTo)
+Tizen::Ui::Controls::TableViewContextItem*
+PlaylistListPanel::CreateTableViewContextItem(int playListType)
 {
        AppLogDebug("ENTER");
+       TableViewContextItem* pContextItem = new (std::nothrow) TableViewContextItem();
+       if (IsFailed(pContextItem->Construct(Dimension(GetWidth(), ITEM_HEIGHT))))
+       {
+               AppLogDebug("Construct(Dimension(GetWidth(), ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       switch (playListType)
+       {
+       case DEFAULT_PLAY_LIST:
+               {
+                       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
+                       if (IsFailed(pSweepQuickMenu->Construct(IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL)))
+                       {
+                               AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                               return null;
+                       }
+
+                       Button* pButtonPlayAll = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_PLAY_ALL_BUTTON));
+                       pButtonPlayAll->SetText(ResourceManager::GetString("IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
+                       pButtonPlayAll->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
+                       pButtonPlayAll->AddActionEventListener(*this);
+
+                       pContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
+                       pContextItem->AddControl(*pSweepQuickMenu);
+               }
+               break;
+
+       case USER_CREATED_PLAY_LIST:
+               {
+                       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
+                       if (IsFailed(pSweepQuickMenu->Construct(IDL_SWEEP_QUICK_ITEM2_PANEL)))
+                       {
+                               AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                               return null;
+                       }
+
+                       Button* pButtonPlayAll = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_PLAY_ALL_BUTTON));
+                       pButtonPlayAll->SetText(ResourceManager::GetString("IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
+                       pButtonPlayAll->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
+                       pButtonPlayAll->AddActionEventListener(*this);
+
+                       Button* pButtonDelete = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_BUTTON_DELETE));
+                       pButtonDelete->SetText(ResourceManager::GetString("IDS_MUSIC_SK3_DELETE"));
+                       pButtonDelete->SetActionId(IDA_FLICK_BUTTON_DELETE);
+                       pButtonDelete->AddActionEventListener(*this);
+
+                       pContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
+                       pContextItem->AddControl(*pSweepQuickMenu);
+               }
+               break;
+
+       default:
+               break;
+       }
+
        AppLogDebug("EXIT");
+       return pContextItem;
 }
 
 result
@@ -931,95 +597,34 @@ PlaylistListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
                                                                int totalCount)
 {
        AppLogDebug("ENTER");
-
        result r = E_SUCCESS;
 
-       Label* pSongThumbnailBGLabel = new (std::nothrow) Label();
-       pSongThumbnailBGLabel->Construct(Rectangle(X_GAP_THUMBNAIL - 1, Y_GAP_THUMBNAIL - 1, W_THUMBNAIL + 1, W_THUMBNAIL + 1), L"");
-       parent.AddControl(*pSongThumbnailBGLabel);
-
-       Label* pSongThumbnailLabel = new (std::nothrow) Label();
-       pSongThumbnailLabel->Construct(Rectangle(X_GAP_THUMBNAIL, Y_GAP_THUMBNAIL, W_THUMBNAIL, H_THUMBNAIL), L"");
-       pSongThumbnailLabel->SetBackgroundBitmap(bitmap);
-       pSongThumbnailLabel->SetName(L"pSongThumbnailLabel");
-       parent.AddControl(*pSongThumbnailLabel);
-
-       Label* pPlaylistTitleLabel = new (std::nothrow) Label();
-       pPlaylistTitleLabel->Construct(RECT_ITEM, L"");
-       pPlaylistTitleLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pPlaylistTitleLabel->SetTextConfig(FONT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pPlaylistTitleLabel->SetText(labelName);
-       parent.AddControl(*pPlaylistTitleLabel);
-
-       if (totalCount != -1)
+       Panel* pPanelTableViewItem = new (std::nothrow) Panel();
+       if (IsFailed(pPanelTableViewItem->Construct(IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL)))
        {
-               int X_Gap   = W_THUMBNAIL + (X_GAP_THUMBNAIL * 2);
-               Label* pPlaylistItemCountLabel = new (std::nothrow) Label();
-               pPlaylistItemCountLabel->Construct(Rectangle(pPlaylistTitleLabel->GetWidth() + X_Gap, pPlaylistTitleLabel->GetY(), W_SONG_TIME, pPlaylistTitleLabel->GetHeight()), L"");
-               pPlaylistItemCountLabel->SetTextColor(COLOR_SUB_TEXT);
-               pPlaylistItemCountLabel->SetTextConfig(SUB_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-               pPlaylistItemCountLabel->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
-               pPlaylistItemCountLabel->SetText(CommonUtil::SetSongsString(totalCount));
-               parent.AddControl(*pPlaylistItemCountLabel);
+               AppLogDebug("Construct(IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return E_FAILURE;
        }
 
-       AppLogDebug("EXIT");
-       return r;
-}
+       Label* pLabelThumbnail = static_cast<Label*>(pPanelTableViewItem->GetControl(IDC_CONTENTS_THUMBNAIL));
+       pLabelThumbnail->SetBackgroundBitmap(bitmap);
 
-void
-PlaylistListPanel::ShowFooter(void)
-{
-       AppLogDebug( "ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-       Footer* pFooter = pForm->GetFooter();
-       if (pFooter->GetShowState() == true)
-       {
-               return;
-       }
-       pFooter->SetShowState(true);
-       pForm->SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
+       Label* pLabelTitleName = static_cast<Label*>(pPanelTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME));
+       pLabelTitleName->SetText(labelName);
 
-//     SetBoundList();
-       AppLogDebug( "EXIT");
-}
+       Label* pLabelPlaylistItemCount = static_cast<Label*>(pPanelTableViewItem->GetControl(IDC_CONTENT_TOTAL_COUNT));
+       pLabelPlaylistItemCount->SetText(CommonUtil::SetSongsString(totalCount));
 
-void
-PlaylistListPanel::HideFooter(void)
-{
-       AppLogDebug( "ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-       Footer* pFooter = pForm->GetFooter();
-       if (pFooter->GetShowState() == false)
+       if (totalCount <= NUM_NOT_DISPLAY_CONTENT_COUNT)
        {
-               return;
+               pLabelPlaylistItemCount->SetShowState(false);
        }
-       pFooter->SetShowState(false);
-       pForm->SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
-       AppLogDebug( "EXIT");
-}
 
-void
-PlaylistListPanel::SetBoundList(void)
-{
-       AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
+       parent.AddControl(*pPanelTableViewItem);
+       CommonUtil::SetLayoutFitToContainer(parent, *pPanelTableViewItem);
 
-       Rectangle clientBounds = pForm->GetClientAreaBounds();
-       if (__pNowPlayContentPanel != null &&__pNowPlayContentPanel->GetPlayStatus() == true)
-       {
-               __pContentTableView->SetBounds(Rectangle(0, H_NOW_PLAY_BAR, clientBounds.width, clientBounds.height - H_NOW_PLAY_BAR));
-               __pContentTableView->Invalidate(true);
-       }
-       else
-       {
-               __pContentTableView->SetBounds(0, 0, clientBounds.width, clientBounds.height);
-               __pContentTableView->Invalidate(true);
-       }
        AppLogDebug("EXIT");
+       return r;
 }
 
 void
@@ -1058,4 +663,17 @@ PlaylistListPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
        delete pThumbnailInfo;
        delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
+}
+
+bool
+PlaylistListPanel::IsEmptyContentList(void)
+{
+       AppLogDebug("ENTER");
+//     if (__pPresentationModel == null || __pPresentationModel->GetTotalCount() == INIT_VALUE)
+//     {
+//             AppLogDebug("EXIT");
+//             return true;
+//     }
+       AppLogDebug("EXIT");
+       return false;
 }
\ No newline at end of file
index b99bcdc..a897894 100644 (file)
@@ -46,6 +46,7 @@ PlaylistListPresentationModel::GetInstance(void)
                result r = pPlaylistListPresentationModel->Construct();
                TryCatch(r == E_SUCCESS, , null, "PlayerPresentationModel instance is not constructed.");
        }
+       AppLogDebug("EXIT");
        return pPlaylistListPresentationModel;
 
 CATCH:
@@ -485,7 +486,7 @@ PlaylistListPresentationModel::GetContentCount(void)
        AppLogDebug("ENTER");
        if (__pContentList == null)
        {
-               return 0;
+               return INIT_VALUE;
        }
        AppLogDebug("EXIT");
        return __pContentList->GetCount();
index b3a4e1a..346d4ec 100644 (file)
@@ -40,11 +40,13 @@ using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
 static const Tizen::Graphics::Rectangle RECT_LABEL (0, 0, 560, 128);
+static const int HEIGHT_POPUP_ITEM = 110;
 
 PlayListPickerPopup::PlayListPickerPopup(void)
        : __pPlaylistListPresentationModel(null)
        , __pPlaylistTableView(null)
        , __pCancelButton(null)
+       , __pCreateButton(null)
        , __pPlaylistContentList(null)
        , __pControl(null)
 {
@@ -66,29 +68,27 @@ PlayListPickerPopup::Initialize(Tizen::Ui::Control* pControl, Tizen::Base::Colle
 
        __pPlaylistListPresentationModel = PlaylistListPresentationModel::GetInstance();
        __pPlaylistListPresentationModel->UpdatePlaylistList();
-       //Popup_Init
-       Construct(true, Dimension(POPUP_WIDTH, POPUP_HEIGHT));
+
+       Construct(IDL_CREATE_PLAYLIST_POPUP);
        SetTitleText(ResourceManager::GetString(L"IDS_MUSIC_BODY_ADD_TO_PLAYLIST"));
+
        AddTouchEventListener(*this);
        AddKeyEventListener(*this);
 
-       __pPlaylistTableView  = new (std::nothrow) TableView();
-       __pPlaylistTableView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height - H_CANCEL_BUTTON),
-                                                       true,
-                                                       TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
+       __pPlaylistTableView = static_cast<TableView*>(GetControl(IDC_TABLEVIEW));
        __pPlaylistTableView->AddTableViewItemEventListener(*this);
        __pPlaylistTableView->SetItemProvider(this);
 
-       __pCancelButton = new (std::nothrow) Button();
-       __pCancelButton->Construct(Rectangle(0, __pPlaylistTableView->GetHeight() - Y_GAP_CANCEL_BUTTON, GetClientAreaBounds().width, H_CANCEL_BUTTON), ResourceManager::GetString(L"IDS_COM_BODY_EDIT_CANCEL"));
+       __pCreateButton = static_cast<Button*>(GetControl(IDC_CREATE_BUTTON));
+       __pCreateButton->SetActionId(IDA_BUTTON_CREATE);
+       __pCreateButton->AddActionEventListener(*this);
+
+       __pCancelButton = static_cast<Button*>(GetControl(IDC_CANCEL_BUTTON));
        __pCancelButton->SetActionId(IDA_BUTTON_CANCEL);
        __pCancelButton->AddActionEventListener(*this);
 
        __pControl = pControl;
        __pPlaylistContentList = pDataList;
-       AddControl(*__pPlaylistTableView);
-       AddControl(*__pCancelButton);
-
        AppLogDebug("EXIT");
        return r;
 }
@@ -97,12 +97,29 @@ void
 PlayListPickerPopup::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 {
        AppLogDebug("ENTER");
-       if(actionId == IDA_BUTTON_CANCEL)
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+       if (actionId == IDA_BUTTON_CANCEL)
        {
                SetShowState(false);
                Invalidate(true);
                __pControl->SendUserEvent(ID_DESTORY_PLAY_LIST_PICKER_POPUP, null);
        }
+
+       if (actionId == IDA_BUTTON_CREATE)
+       {
+               SetShowState(false);
+               Invalidate(true);
+               if (__pPlaylistContentList != null)
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYLIST_CREATOR), __pPlaylistContentList);
+               }
+               else
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYLIST_CREATOR));
+               }
+               __pControl->SendUserEvent(ID_DESTORY_PLAY_LIST_PICKER_POPUP, null);
+       }
        AppLogDebug("EXIT");
 }
 
@@ -204,7 +221,6 @@ void
 PlayListPickerPopup::OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
 {
        AppLogDebug("ENTER");
-       //AppLogDebug("OnKeyLongPressed Control : %ls, KeyCode : %d",source.GetName().GetPointer(), keyCode);
        if (Tizen::Ui::KEY_SIDE_UP == keyCode || Tizen::Ui::KEY_SIDE_DOWN == keyCode)
        {
                ConsumeInputEvent();
@@ -217,7 +233,7 @@ PlayListPickerPopup::GetItemCount(void)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-       return __pPlaylistListPresentationModel->GetAllPlayListCount() + 1;
+       return __pPlaylistListPresentationModel->GetAllPlayListCount();
 }
 
 Tizen::Ui::Controls::TableViewItem*
@@ -227,23 +243,12 @@ PlayListPickerPopup::CreateItem(const int itemIndex, int itemWidth)
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        if (pItem == null)
        {
-               //AppLogDebug("Unable to create TableViewItem.");
                return null;
        }
-       pItem->Construct(Dimension(itemWidth, 128), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(Color(255, 255, 255));
+       pItem->Construct(Dimension(itemWidth, HEIGHT_POPUP_ITEM), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+//     pItem->SetBackgroundColor(Color(255, 255, 255));
 
-       if (itemIndex == 0)
-       {
-               //AppLogDebug("CreateItem : %d", itemIndex);
-               String labelName = ResourceManager::GetString(L"IDS_MUSIC_BODY_CREATE_PLAYLIST");
-               CreateTableViewItem(*pItem, labelName);
-       }
-       else
-       {
-               //AppLogDebug("CreateItem : %d", itemIndex);
-               CreateTableViewItem(*pItem, *(__pPlaylistListPresentationModel->GetPlayListNameN(itemIndex - 1)));
-       }
+       CreateTableViewItem(*pItem, *(__pPlaylistListPresentationModel->GetPlayListNameN(itemIndex)));
 
        AppLogDebug("EXIT");
        return pItem;
@@ -269,7 +274,7 @@ PlayListPickerPopup::GetDefaultItemHeight(void)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-       return ITEM_HEIGHT;
+       return HEIGHT_POPUP_ITEM;
 }
 
 void
@@ -282,21 +287,7 @@ PlayListPickerPopup::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView&
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
-       if (itemIndex == 0 && status == TABLE_VIEW_ITEM_STATUS_SELECTED)
-       {
-               SetShowState(false);
-               Invalidate(true);
-               if (__pPlaylistContentList != null)
-               {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYLIST_CREATOR), __pPlaylistContentList);
-               }
-               else
-               {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYLIST_CREATOR));
-               }
-               __pControl->SendUserEvent(ID_DESTORY_PLAY_LIST_PICKER_POPUP, null);
-       }
-       else if (itemIndex != 0 && status == TABLE_VIEW_ITEM_STATUS_SELECTED)
+       if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
        {
                SetShowState(false);
                Invalidate(true);
@@ -308,7 +299,7 @@ PlayListPickerPopup::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView&
                                ContentId contentId = CommonUtil::GetContentId(*(static_cast<String*>(__pPlaylistContentList->GetAt(index))));
                                if (!IsFailed(GetLastResult()))
                                {
-                                       __pPlaylistListPresentationModel->AddContent(contentId, (itemIndex - 1));
+                                       __pPlaylistListPresentationModel->AddContent(contentId, itemIndex);
                                }
                        }
                }
@@ -351,18 +342,15 @@ PlayListPickerPopup::CreateTableViewItem(Tizen::Ui::Container& parent, Tizen::Ba
 {
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
-
        Label* pStrLabel = new (std::nothrow) Label();
        if (pStrLabel == null)
        {
-               //AppLogDebug("[E_INIT_FAILED] Unable to create label.");
                return E_INIT_FAILED;
        }
 
        r = pStrLabel->Construct(RECT_LABEL, L"");
        if (r != E_SUCCESS)
        {
-               //AppLogDebug("[%s] Unable to construct label.", GetErrorMessage(r));
                return E_INIT_FAILED;
        }
 
diff --git a/src/MpPlaylistReNameForm.cpp b/src/MpPlaylistReNameForm.cpp
new file mode 100644 (file)
index 0000000..4bad5db
--- /dev/null
@@ -0,0 +1,208 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               MpPlaylistReNameForm.cpp
+ * @brief              This is the implementation file for PlaylistReNameForm class.
+ */
+
+#include "MpCommonUtil.h"
+#include "MpPlaylistReNameForm.h"
+#include "MpPlaylistEditorPresentationModel.h"
+#include "MpResourceManager.h"
+#include "MpSceneRegister.h"
+#include "MpTypes.h"
+
+using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Content;
+using namespace Tizen::Graphics;
+using namespace Tizen::Media;
+using namespace Tizen::Ui;
+using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
+
+PlaylistReNameForm::PlaylistReNameForm(void)
+       : __pPlaylistEditorPresentationModel(null)
+       , __pPlaylistEditField(null)
+       , __playlistName(null)
+       , __selectedPlaylistIndex(0)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+PlaylistReNameForm::~PlaylistReNameForm(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::Initialize(void)
+{
+       AppLogDebug("ENTER");
+       Form::Construct(IDL_PLAYLIST_RENAME_FORM);
+       AppLogDebug("EXIT");
+}
+
+result
+PlaylistReNameForm::OnInitializing(void)
+{
+       AppLogDebug("ENTER");
+       __pPlaylistEditField = static_cast<EditField*>(GetControl(IDC_EDITFIELD));
+       __pPlaylistEditField->SetOverlayKeypadCommandButtonVisible(false);
+       __pPlaylistEditField->AddTextEventListener(*this);
+       __pPlaylistEditField->AddKeypadEventListener(*this);
+
+       __pPlaylistEditField->SetFocus();
+       __pPlaylistEditField->ShowKeypad();
+       __pPlaylistEditorPresentationModel = PlaylistEditorPresentationModel::GetInstance();
+
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
+
+result
+PlaylistReNameForm::OnTerminating(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
+
+void
+PlaylistReNameForm::OnKeypadActionPerformed(Tizen::Ui::Control& source,
+                                                       Tizen::Ui::KeypadAction keypadAction)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::OnKeypadClosed(Tizen::Ui::Control& source)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::OnKeypadOpened(Tizen::Ui::Control& source)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::OnKeypadWillOpen(Tizen::Ui::Control &source)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
+                                               const Tizen::Ui::Scenes::SceneId& currentSceneId,
+                                               Tizen::Base::Collection::IList* pArgs)
+{
+       AppLogDebug("ENTER");
+       Tizen::Base::Collection::IList* pPlaylistList;
+       SetFormBackEventListener(this);
+       GetFooter()->AddActionEventListener(*this);
+
+       if (pArgs != null)
+       {
+               __selectedPlaylistIndex = static_cast<Integer*>(pArgs->GetAt(0))->ToInt();
+
+               delete pArgs;
+               pArgs = null;
+       }
+       pPlaylistList = __pPlaylistEditorPresentationModel->GetAllPlayListNameN();
+
+       __playlistName = *static_cast<String*>(pPlaylistList->GetAt(__selectedPlaylistIndex));
+       __pPlaylistEditField->SetText(__playlistName);
+
+       pPlaylistList->RemoveAll(true);
+       delete pPlaylistList;
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
+                                                               const Tizen::Ui::Scenes::SceneId& nextSceneId)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
+{
+       AppLogDebug("ENTER");
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       switch (actionId)
+       {
+       case IDA_FOOTER_BUTTON_SAVE:
+               {
+                       __pPlaylistEditorPresentationModel->SetPlayListName(*(static_cast<String*>(__pPlaylistEditorPresentationModel->GetAllPlayListNameN()->GetAt(__selectedPlaylistIndex))), __playlistName);
+                       pSceneManager->GoBackward(BackwardSceneTransition());
+               }
+               break;
+
+       default:
+               break;
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::OnTextValueChanged(const Tizen::Ui::Control& source)
+{
+       AppLogDebug("ENTER");
+       Footer* pFooter = GetFooter();
+
+       EditArea* pEditArea = const_cast<EditArea*>(static_cast<const EditArea*>(&source));
+       __playlistName = pEditArea->GetText();
+       AppLogDebug("%ls", __playlistName.GetPointer());
+
+       if (__playlistName.GetLength() == INIT_VALUE)
+       {
+               CommonUtil::SetFooterItemEnabled(*pFooter, false);
+       }
+       else
+       {
+               CommonUtil::SetFooterItemEnabled(*pFooter, true);
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::OnTextValueChangeCanceled(const Tizen::Ui::Control& source)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistReNameForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       AppLogDebug("ENTER");
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       pSceneManager->GoBackward(BackwardSceneTransition());
+       AppLogDebug("EXIT");
+}
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 0fa62d2..d8aeeba
@@ -37,7 +37,6 @@ ResourceManager::GetBitmapN(const Tizen::Base::String& resourceName)
        if (pAppResource == null)
        {
                AppLogDebug("EXIT");
-               //AppLogDebug("[%s] Unable to get app resource.");
                return null;
        }
        AppLogDebug("EXIT");
@@ -52,7 +51,6 @@ ResourceManager::GetString(const Tizen::Base::String& id)
        if (pAppResource == null)
        {
                AppLogDebug("EXIT");
-               //AppLogDebug("[%s] Unable to get app resource.");
                return null;
        }
 
index edbbb0d..79185df 100644 (file)
@@ -32,7 +32,7 @@ const wchar_t* IDSCN_ALL_CONTENT_PICKER = L"AllContentPicker";
 const wchar_t* IDSCN_PLAYLIST_LIST = L"PlaylistList";
 const wchar_t* IDSCN_PLAYLIST_LIST_EDITOR = L"PlaylistListEditor";
 const wchar_t* IDSCN_PLAYLIST_CREATOR = L"PlaylistCreator";
-const wchar_t* IDSCN_PLAYLIST_NAME_EDITOR = L"PlaylistNameEditor";
+const wchar_t* IDSCN_PLAYLIST_RENAME = L"PlaylistNameEditor";
 const wchar_t* IDSCN_PLAYLIST_CONTENT_LIST = L"PlaylistContentList";
 const wchar_t* IDSCN_PLAYLIST_CONTENT_LIST_EDITOR = L"PlaylistContentListEditor";
 const wchar_t* IDSCN_USER_PLAYLIST_CONTENT_LIST = L"UserPlaylistContentList";
@@ -165,6 +165,7 @@ SceneRegister::RegisterAllScenes(void)
        r = pSceneManager->RegisterScene(IDSCN_ARTIST_ALL_SONG_LIST, IDC_ARTIST_ALL_SONG_LIST_FORM, PANEL_BLANK);
 
        r = pSceneManager->RegisterScene(IDSCN_PLAYLIST_CREATOR, IDC_PLAYLIST_CREATOR_FORM, PANEL_BLANK);
+       r = pSceneManager->RegisterScene(IDSCN_PLAYLIST_RENAME, IDC_PLAYLIST_RENAME_FORM, PANEL_BLANK);
        r = pSceneManager->RegisterScene(IDSCN_USER_PLAYLIST_CONTENT_LIST, IDC_USER_PLAYLIST_CONTENT_LIST_FORM, PANEL_BLANK);
 
        r = pSceneManager->RegisterScene(IDSCN_CONTENT_DETAIL, IDC_CONTENT_DETAIL_FORM, PANEL_BLANK);
index 4b6c75b..d6e0277 100644 (file)
@@ -237,10 +237,9 @@ Tizen::Ui::Controls::TableViewItem*
 SearchForm::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, H_GROUP_NAME), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        if (__pPresentationModel->GetArtistIndex() == itemIndex)
        {
@@ -268,7 +267,7 @@ SearchForm::CreateItem(const int itemIndex, int itemWidth)
        }
        pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        if (itemIndex < __pPresentationModel->GetAlbumIndex())
        {
@@ -318,7 +317,6 @@ bool
 SearchForm::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-
        delete pItem;
        pItem = null;
 
@@ -348,7 +346,6 @@ SearchForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableVie
                                                Tizen::Ui::Controls::TableViewItemStatus status)
 {
        AppLogDebug("ENTER");
-
        if (status != TABLE_VIEW_ITEM_STATUS_SELECTED)
        {
                return;
@@ -494,7 +491,6 @@ SearchForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
                                                                const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
-
        if (__pSearchBar != null)
        {
                __pSearchBar->HideKeypad();
index 1d2abae..c176fb9 100644 (file)
@@ -67,7 +67,6 @@ SetAsPopup::Initialize(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       //Popup_Init_Start
        Construct(true, Dimension(POPUP_WIDTH, SET_AT_POPUP_HEIGHT));
        TryCatch(r == E_SUCCESS, r = E_OUT_OF_MEMORY, "Unable to construct popup.\n");
        SetTitleText(ResourceManager::GetString("IDS_COM_SK_SET_AS"));
@@ -219,8 +218,6 @@ void
 SetAsPopup::OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
 {
        AppLogDebug("ENTER");
-       //AppLogDebug("OnKeyLongPressed Control : %ls, KeyCode : %d",source.GetName().GetPointer(), keyCode);
-
        if (Tizen::Ui::KEY_SIDE_UP == keyCode || Tizen::Ui::KEY_SIDE_DOWN == keyCode)
        {
                ConsumeInputEvent();
@@ -243,11 +240,10 @@ SetAsPopup::CreateItem(const int itemIndex, int itemWidth)
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        if (pItem == null)
        {
-               //AppLogDebug("Unable to create TableViewItem.");
                return null;
        }
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        if (itemIndex < SET_AS_END)
        {
@@ -381,14 +377,12 @@ SetAsPopup::CreateTableViewItem(Tizen::Ui::Container& parent,
        Label* pStrLabel = new (std::nothrow) Label();
        if (pStrLabel == null)
        {
-               //AppLogDebug("[E_INIT_FAILED] Unable to create label.");
                return E_INIT_FAILED;
        }
 
        r = pStrLabel->Construct(Rectangle(0, 0, POPUP_ITEM_WIDTH, ITEM_HEIGHT), L"");
        if (r != E_SUCCESS)
        {
-               //AppLogDebug("[%s] Unable to construct label.", GetErrorMessage(r));
                return E_INIT_FAILED;
        }
 
index b25023c..0027d1b 100644 (file)
@@ -32,13 +32,11 @@ using namespace Tizen::Graphics;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 
-static const int SHART_ITEM_EMAIL = 0;
-/* blocked this code (TDIS-1672 */
-/*static const int SHART_ITEM_MESSAGE = 1;*/
-/*static const int SHARE_TOTAL_COUNT = 2;*/
-static const int SHARE_TOTAL_COUNT = 1;
-/* blocked this code (TDIS-1672 */
-static const int SHARE_POPUP_HEIGHT = 350;
+//static const int INDEX_SHART_ITEM_MESSAGE = 0;
+static const int INDEX_SHART_ITEM_EMAIL = 0;//NEED
+//static const int INDEX_SHARE_TOTAL_BLUETOOTH = 2;
+static const int SHARE_TOTAL_COUNT = 1;//NEED 3
+static const int HEIGHT_POPUP_ITEM = 110;
 
 const wchar_t* EMPTY_SPACE = L"";
 
@@ -69,30 +67,20 @@ SharePopup::Initialize(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       Construct(true, Dimension(POPUP_WIDTH, SHARE_POPUP_HEIGHT));
-       SetTitleText(ResourceManager::GetString("IDS_MUSIC_SK_SHARE"));
+       Construct(IDL_SHARE_VIA_POPUP);
+       SetTitleText(L"Share via");//NEED STRING
+
        AddKeyEventListener(*this);
        AddTouchEventListener(*this);
 
-       __pShareItemTableView  = new (std::nothrow) TableView();
-       __pShareItemTableView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height - H_CANCEL_BUTTON),
-                                                       true,
-                                                       TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
+       __pShareItemTableView = static_cast<TableView*>(GetControl(IDC_TABLEVIEW));
        __pShareItemTableView->AddTableViewItemEventListener(*this);
        __pShareItemTableView->SetItemProvider(this);
 
-       __pCancelButton = new (std::nothrow) Button();
-       __pCancelButton->Construct(Rectangle(0,
-                                               __pShareItemTableView->GetHeight() - Y_GAP_CANCEL_BUTTON,
-                                               GetClientAreaBounds().width,
-                                               H_CANCEL_BUTTON),
-                                       ResourceManager::GetString("IDS_COM_BODY_EDIT_CANCEL"));
+       __pCancelButton = static_cast<Button*>(GetControl(IDC_CANCEL_BUTTON));
        __pCancelButton->SetActionId(IDA_BUTTON_CANCEL);
        __pCancelButton->AddActionEventListener(*this);
 
-       AddControl(*__pShareItemTableView);
-       AddControl(*__pCancelButton);
-
        AppLogDebug("EXIT");
        return r;
 }
@@ -223,19 +211,16 @@ SharePopup::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
-
-       /* blocked this code (TDIS-1672 */
-       /*String shareItemName[] = {"IDS_COM_BODY_EMAIL", "IDS_COM_BODY_MESSAGING"};*/
-       String shareItemName[] = {"IDS_COM_BODY_EMAIL"};
-       /* blocked this code (TDIS-1672 */
+       pItem->Construct(Dimension(itemWidth, HEIGHT_POPUP_ITEM), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
+       //String shareItemName[] = {L"Message", L"Email", L"Bluetooth"};//NEED STRING Bluetooth
+       String shareItemName[] = {L"Email"};//NEED
        Label* pShareItemLabel = new (std::nothrow) Label();
-       pShareItemLabel->Construct(Rectangle(0, 0, POPUP_ITEM_WIDTH, ITEM_HEIGHT), L"");
+       pShareItemLabel->Construct(Rectangle(0, 0, POPUP_ITEM_WIDTH, HEIGHT_POPUP_ITEM), L"");
        pShareItemLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pShareItemLabel->SetTextConfig(SUB_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pShareItemLabel->SetText(ResourceManager::GetString(shareItemName[itemIndex]));
+       pShareItemLabel->SetText(shareItemName[itemIndex]);
 
        pItem->AddControl(*pShareItemLabel);
 
@@ -263,7 +248,7 @@ SharePopup::GetDefaultItemHeight(void)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-       return ITEM_HEIGHT;
+       return HEIGHT_POPUP_ITEM;
 }
 
 void
@@ -277,26 +262,30 @@ SharePopup::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableVie
        {
                switch (itemIndex)
                {
-               case SHART_ITEM_EMAIL:
+//             case INDEX_SHART_ITEM_MESSAGE: NEED
+//                     {
+//                             LaunchAppControl(OPERATION_ID_COMPOSE, PROVIDER_ID_MESSAGE);
+//                     }
+//                     break;
+
+               case INDEX_SHART_ITEM_EMAIL:
                        {
                                LaunchAppControl(OPERATION_ID_COMPOSE, PROVIDER_ID_EMAIL);
                        }
                        break;
 
-               /* blocked this code (TDIS-1672 */
-               /*case SHART_ITEM_MESSAGE:
-                       {
-                               LaunchAppControl(OPERATION_ID_COMPOSE, PROVIDER_ID_MESSAGE);
-                       }
-                       break;*/
-               /* blocked this code (TDIS-1672 */
+//             case INDEX_SHARE_TOTAL_BLUETOOTH: NEED
+//                     {
+//                             //LaunchAppControl(OPERATION_ID_COMPOSE, PROVIDER_ID_EMAIL);
+//                     }
+                       break;
 
                default:
                        break;
-               }//end of switch
+               }
                SetShowState(false);
                Invalidate(true);
-       }//end of if
+       }
        AppLogDebug("EXIT");
 }
 
@@ -346,19 +335,6 @@ SharePopup::SetArguments(Tizen::Base::Collection::IList* pIList)
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS), new (std::nothrow) String(combineText));
 
                __pDataList = pDataList;
-               // debuging code
-/*             if (__pDataList)
-               {
-                       IMapEnumerator* pMapEnum = __pDataList->GetMapEnumeratorN();
-                       while (!IsFailed(pMapEnum->MoveNext()))
-                       {
-                               String* pKey = static_cast<String*>(pMapEnum->GetKey());
-                               String* pVal = static_cast<String*>(pMapEnum->GetValue());
-
-                               AppLogDebug("Key:(%ls), value:(%ls)", pKey->GetPointer(), pVal->GetPointer());
-                       }
-               }*/
-//             pAppControlResponseListener = pListener;
                AppLogDebug("EXIT");
        }
 }
index 1528936..520b86c 100644 (file)
@@ -73,7 +73,6 @@ ThumbnailProvider::~ThumbnailProvider(void)
        }
 
        DestroyDefaultThumbnailBitmap();
-
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -126,8 +125,8 @@ CATCH:
                delete __pCmdQueue;
                __pCmdQueue = null;
        }
-       AppLogDebug("EXIT with exception(%s)", GetErrorMessage(GetLastResult()));
 
+       AppLogDebug("EXIT with exception(%s)", GetErrorMessage(GetLastResult()));
        return E_FAILURE;
 }
 
@@ -270,7 +269,6 @@ ThumbnailProvider::OnStart(void)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
-
        return true;
 }
 
@@ -343,7 +341,6 @@ ThumbnailProvider::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        __pMutexCmd->Release();
 
        delete pArgs;
-
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -383,7 +380,6 @@ ThumbnailProvider::GetThumbnailInfoN(const ContentId& contentId, void* pParam) c
                {
                        delete pContentInfo;
                        AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
-
                        return null;
                }
 
@@ -396,8 +392,8 @@ ThumbnailProvider::GetThumbnailInfoN(const ContentId& contentId, void* pParam) c
                pNewThumbnailInfo = new (std::nothrow) ThumbnailInfo();
                pNewThumbnailInfo->Construct(contentId, *pBitmap, pParam);
        }
-       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
        return pNewThumbnailInfo;
 }
 
@@ -422,8 +418,8 @@ ThumbnailProvider::GetThumbnailByDecodeN(const String& filePath, const ContentTy
 
                pBitmap->Scale(Dimension(W_THUMBNAIL, H_THUMBNAIL));
        }
-       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
        return pBitmap;
 }
 
@@ -468,7 +464,6 @@ ThumbnailProvider::GetFileNameFromFullPath(const String& fullPath, bool withExt)
        if (withExt == true)
        {
                AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
-
                return token;
        }
        else
@@ -478,7 +473,6 @@ ThumbnailProvider::GetFileNameFromFullPath(const String& fullPath, bool withExt)
                String subToken;
                subSt.GetNextToken(subToken);
                AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
-
                return subToken;
        }
 }
index 6aac518..275bdb6 100644 (file)
@@ -28,4 +28,94 @@ const Tizen::Base::String IDS_ALBUM_CONTENT_COUNT = L"AlbumContentCount";
 
 const unsigned int COLOR_PANEL_BACKGROUND_GRAY_BLUE = Color32<182, 200, 214>::Value;
 const unsigned int COLOR_WHITE = Color32<255, 255, 255>::Value;
+
+//XML LIST
+const wchar_t* IDL_CONTENT_EDITOR_PANEL = L"IDL_CONTENT_EDITOR_PANEL";
+const wchar_t* IDC_CONTENT_EDITOR_TABLEVIEW = L"IDC_CONTENT_EDITOR_TABLEVIEW";
+const wchar_t* IDC_NO_CONTENT_IMAGE_LABEL = L"IDC_NO_CONTENT_IMAGE_LABEL";
+const wchar_t* IDC_NO_CONTENT_TEXT_LABEL = L"IDC_NO_CONTENT_TEXT_LABEL";
+const wchar_t* IDC_CHECKED_ITEM_COUNT_TEXT_LABEL = L"IDC_CHECKED_ITEM_COUNT_TEXT_LABEL";
+
+//_XML IDL_
 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_LIBARY_PANEL = L"IDL_CONTENTS_LIBARY_PANEL";
+const wchar_t* IDL_CONTENTS_DELETE_POPUP = L"IDL_CONTENTS_DELETE_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";
+const wchar_t* IDL_CONTENTS_LIBARY_ITEM_PANEL = L"IDL_CONTENTS_LIBARY_ITEM_PANEL";
+const wchar_t* IDL_CONTENTS_LIBARY_EDITOR_PANEL = L"IDL_CONTENTS_LIBARY_EDITOR_PANEL";
+const wchar_t* IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL = L"IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL";
+const wchar_t* IDL_MUSIC_PLAYER_FORM = L"IDL_MUSIC_PLAYER_FORM";
+const wchar_t* IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL = L"IDC_MUSIC_PLAYER_CONTENTS_ALBUM_VIEW_PANEL";
+const wchar_t* IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL = L"IDL_MUSIC_PLAYER_CONTENTS_LIST_VIEW_PANEL";
+const wchar_t* IDL_PLAYLIST_CREATOR_FORM = L"IDL_PLAYLIST_CREATOR_FORM";
+const wchar_t* IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL = L"IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL";
+const wchar_t* IDL_SWEEP_QUICK_ITEM2_PANEL = L"IDL_SWEEP_QUICK_ITEM2_PANEL";
+const wchar_t* IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL = L"IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL";
+const wchar_t* IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL = L"IDL_CONTENT_LIBARY_FOLDER_ITEM_PANEL";
+const wchar_t* IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL = L"IDL_CONTENTS_PLAYLIST_EDITOR_ITEM_PANEL";
+const wchar_t* IDL_CONTEXT_ITEM_PLAYALL_ADDTO = L"IDL_CONTEXT_ITEM_PLAYALL_ADDTO";
+const wchar_t* IDL_PLAYLIST_RENAME_FORM = L"IDL_PLAYLIST_RENAME_FORM";
+const wchar_t* IDL_SWEEP_QUICK_ALBUM_PANEL = L"IDL_SWEEP_QUICK_ALBUM_PANEL";
+const wchar_t* IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL = L"IDL_CONTENTS_LIBARY_ALBUM_ITEM_PANEL";
+//_XML_UDL_
+
+//_XML_IDC_
+const wchar_t* IDC_PALY_TOGGLE_CONTROL_BUTTON = L"IDC_PALY_TOGGLE_CONTROL_BUTTON";
+const wchar_t* IDC_PREVIOUS_CONTROL_BUTTON = L"IDC_PREVIOUS_CONTROL_BUTTON";
+const wchar_t* IDC_NEXT_CONTROL_BUTTON = L"IDC_NEXT_CONTROL_BUTTON";
+const wchar_t* IDC_NOW_PLAYING_STATE = L"IDC_NOW_PLAYING_STATE";
+const wchar_t* IDC_PROGRESS_BAR = L"IDC_PROGRESS_BAR";
+const wchar_t* IDC_BACK_BUTTON = L"IDC_BACK_BUTTON";
+const wchar_t* IDC_MORE_CONTEXT_MENU_BUTTON = L"IDC_MORE_CONTEXT_MENU_BUTTON";
+const wchar_t* IDC_CONTENTS_THUMBNAIL = L"IDC_CONTENTS_THUMBNAIL";
+const wchar_t* IDC_CONTENTS_ARTIST_NAME = L"IDC_CONTENTS_ARTIST_NAME";
+const wchar_t* IDC_CONTENTS_TITLE_NAME = L"IDC_CONTENTS_TITLE_NAME";
+const wchar_t* IDC_MINI_PLAYER_REGISTER_BAR = L"IDC_MINI_PLAYER_REGISTER_BAR";
+const wchar_t* IDC_NO_CONTENTS_LABEL = L"IDC_NO_CONTENTS_LABEL";
+const wchar_t* IDC_CONTENTS_TABLEVIEW = L"IDC_CONTENTS_TABLEVIEW";
+const wchar_t* IDC_DELETE_BUTTON = L"IDC_DELETE_BUTTON";
+const wchar_t* IDC_CANCEL_BUTTON = L"IDC_CANCEL_BUTTON";
+const wchar_t* IDC_LABEL_DELETE_Q = L"IDC_LABEL_DELETE_Q";
+const wchar_t* IDC_SHARE_BUTTON = L"IDC_SHARE_BUTTON";
+const wchar_t* IDC_SET_AS_BUTTON = L"IDC_SET_AS_BUTTON";
+const wchar_t* IDC_ADD_TO_BUTTON = L"IDC_ADD_TO_BUTTON";
+const wchar_t* IDC_BUTTON_DELETE = L"IDC_BUTTON_DELETE";
+const wchar_t* IDC_PLAY_CONTENT_DURATION = L"IDC_PLAY_CONTENT_DURATION";
+const wchar_t* IDC_CONTENTS_EDIT_TABLEVIEW = L"IDC_CONTENTS_EDIT_TABLEVIEW";
+const wchar_t* IDC_ITEM_SELECTED_COUNT_LABEL = L"IDC_ITEM_SELECTED_COUNT_LABEL";
+const wchar_t* IDC_PANEL_REGISTER_BAR = L"IDC_PANEL_REGISTER_BAR";
+const wchar_t* IDC_PLAYER_CONTROL_BAR = L"IDC_PLAYER_CONTROL_BAR";
+const wchar_t* IDC_OPTION_VOLUMN = L"IDC_OPTION_VOLUMN";
+const wchar_t* IDC_OPTION_SHUFFLE = L"IDC_OPTION_SHUFFLE";
+const wchar_t* IDC_OPTION_PLAY_LIST_ADD = L"IDC_OPTION_PLAY_LIST_ADD";
+const wchar_t* IDC_OPTION_REPEAT = L"IDC_OPTION_REPEAT";
+const wchar_t* IDC_CURRENT_PLAYING_TIME = L"IDC_CURRENT_PLAYING_TIME";
+const wchar_t* IDC_CONTENT_TOTAL_TIME = L"IDC_CONTENT_TOTAL_TIME";
+const wchar_t* IDC_ALBUM_THUMBANIL_BACKGROUND = L"IDC_ALBUM_THUMBANIL_BACKGROUND";
+const wchar_t* IDC_ALBUM_TURN_TABLE = L"IDC_ALBUM_TURN_TABLE";
+const wchar_t* IDC_CONTENTS_VIEW_TOGGLE_BUTTON = L"IDC_CONTENTS_VIEW_TOGGLE_BUTTON";
+const wchar_t* IDC_SLIDER_BAR = L"IDC_SLIDER_BAR";
+const wchar_t* IDC_CREATE_BUTTON = L"IDC_CREATE_BUTTON";
+const wchar_t* IDC_TABLEVIEW = L"IDC_TABLEVIEW";
+const wchar_t* IDC_SPLIT_BAR = L"IDC_SPLIT_BAR";
+const wchar_t* IDC_EDITFIELD = L"IDC_EDITFIELD";
+const wchar_t* IDC_CONTENT_TOTAL_COUNT = L"IDC_CONTENT_TOTAL_COUNT";
+const wchar_t* IDC_PLAY_ALL_BUTTON = L"IDC_PLAY_ALL_BUTTON";
+const wchar_t* IDC_STORAGE_TYPE_ICON = L"IDC_STORAGE_TYPE_ICON";
+const wchar_t* IDC_FOLDER_PATH = L"IDC_FOLDER_PATH";
+const wchar_t* IDC_FOLDER_NAME = L"IDC_FOLDER_NAME";
+const wchar_t* IDC_CONTENTS_ITEM_COUNT = L"IDC_CONTENTS_ITEM_COUNT";
+const wchar_t* IDC_BUTTON_EDIT = L"IDC_BUTTON_EDIT";
+const wchar_t* IDC_PLAY_ALL = L"IDC_PLAY_ALL";
+const wchar_t* IDC_ADD_TO_PLAYLIST = L"IDC_ADD_TO_PLAYLIST";
+const wchar_t* IDC_PLAY_CONTENT_COUNT = L"IDC_PLAY_CONTENT_COUNT";
+//__XML_IDC_
+
+//HEADER
+const unsigned int COLOR_HEADER_TITLE_TEXT = Color32<59, 115, 182>::Value;
+const unsigned int COLOR_HEADER_DESCRIPTION_TEXT = Color32<155, 154, 150>::Value;
+
+const wchar_t* IDB_MUSIC_LINE_CONTENT_FORM = L"T02_music_line.png";
\ No newline at end of file
index eee040e..7eba087 100644 (file)
@@ -87,8 +87,6 @@ UserPlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source,
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
-       //AppLogDebug("actionId : %d", actionId);
-
        switch (actionId)
        {
        case IDA_CHECK_BUTTON:
@@ -436,7 +434,7 @@ UserPlaylistContentListForm::CreateItem(const int itemIndex, int itemWidth)
        {
                pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
        }
-       pItem->SetBackgroundColor(COLOR_WHITE);
+//     pItem->SetBackgroundColor(COLOR_WHITE);
 
        RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CreateTableViewItem(*pItem, *pContentInfoStruct);
index 8364a27..ba4846a 100644 (file)
@@ -567,7 +567,7 @@ YearContentListForm::CreateItem(const int itemIndex, int itemWidth)
                pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
                pItem->SetContextItem(__pContextItem);
        }
-       pItem->SetBackgroundColor(COLOR_WHITE);
+//     pItem->SetBackgroundColor(COLOR_WHITE);
 
        pContentInfoStruct = __pPresentationModel->GetContentInfoN(itemIndex);
        if (pContentInfoStruct == null)
index b7d42d5..f9a15a6 100644 (file)
@@ -112,7 +112,6 @@ YearContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -124,7 +123,6 @@ YearContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -172,7 +170,6 @@ YearContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_FOOTER_BUTTON_CANCEL:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        Form* pForm = dynamic_cast<Form*>(GetParent());
                        AppAssert(pForm);
                        CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
@@ -182,7 +179,7 @@ YearContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        default:
                break;
-       }//End of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -248,7 +245,7 @@ YearContentPickerPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        CommonUtil::CreateContentPikerTableViewItem(*pItem, pContentInfoStruct->TitleName, CommonUtil::GetFormatDate(pContentInfoStruct->Duration));
 
@@ -270,6 +267,8 @@ YearContentPickerPanel::DeleteItem(const int itemIndex, Tizen::Ui::Controls::Tab
 void
 YearContentPickerPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 int
@@ -305,7 +304,7 @@ YearContentPickerPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVi
 
        default:
                break;
-       }//end of switch
+       }
 
        CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
 
index 1ea4a3d..505e0ca 100644 (file)
@@ -117,7 +117,6 @@ YearsListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
        {
        case IDA_CHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_CHECK_BUTTON");
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -128,7 +127,6 @@ YearsListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 
        case IDA_UNCHECK_BUTTON:
                {
-                       //AppLogDebug("IDA_UNCHECK_BUTTON");
                        __checkedItemCount = INIT_VALUE;
                        CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                        Form* pForm = dynamic_cast<Form*>(GetParent());
@@ -167,14 +165,13 @@ YearsListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 
        case IDA_FOOTER_BUTTON_CANCEL:
                {
-                       //AppLogDebug("IDA_FOOTER_BUTTON_CANCEL");
                        pSceneManager->GoBackward(BackwardSceneTransition());
                }
                break;
 
        default:
                break;
-       }//End of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
@@ -257,7 +254,7 @@ YearsListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        String strYear = Integer::ToString(pContentInfoStruct->ReleaseYear);
        if (strYear.Equals(L"0", true))
@@ -315,7 +312,7 @@ YearsListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView
 
        default:
                break;
-       }//end of switch
+       }
 
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
index 7e2e8cd..30cc91a 100644 (file)
@@ -57,7 +57,7 @@ bool
 YearsListPanel::Initialize(void)
 {
        AppLogDebug("ENTER");
-       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE)); // Should be set proper area at OnInitializing().
+       result r = BasePanel::Construct(Rectangle(INIT_VALUE, INIT_VALUE, INIT_VALUE, INIT_VALUE));
        if (IsFailed(r))
        {
                return false;
@@ -162,7 +162,7 @@ YearsListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId
 
        default:
                break;
-       }//end of switch
+       }
        AppLogDebug("EXIT");
 }
 
@@ -271,7 +271,7 @@ YearsListPanel::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-       pItem->SetBackgroundColor(COLOR_ITEM);
+//     pItem->SetBackgroundColor(COLOR_ITEM);
 
        String strYear = Integer::ToString(pContentInfoStruct->ReleaseYear);
        if (strYear.Equals(L"0", true))
@@ -423,7 +423,7 @@ YearsListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Bas
                        __pContentTableView->ScrollToItem(iCount);
                        break;
                }
-       }//end of for
+       }
        AppLogDebug("EXIT");
 }