[MusicPlayer] Additional work 2.1 UI & GUI (Apply Settings UI & GUI, Apply ArtistCont...
authorMyunkyu <mk70.kang@partner.samsung.com>
Wed, 27 Mar 2013 08:12:12 +0000 (17:12 +0900)
committerMyunkyu <mk70.kang@partner.samsung.com>
Wed, 27 Mar 2013 08:12:12 +0000 (17:12 +0900)
Change-Id: Ie5cc23208f279ae75b9efcbb8b64515515d8e030

62 files changed:
inc/MpAlbumContentListForm.h
inc/MpAllContentPickerPanel.h [changed mode: 0755->0644]
inc/MpAllListEditorPanel.h
inc/MpAllListPresentationModel.h [changed mode: 0755->0644]
inc/MpArtistContentListForm.h
inc/MpCommonUtil.h
inc/MpComposerContentListForm.h
inc/MpContentListForm.h
inc/MpFolderContentListForm.h
inc/MpGenreContentListForm.h
inc/MpMiniPlayer.h
inc/MpPlaylistContentListForm.h
inc/MpSettingForm.h [changed mode: 0755->0644]
inc/MpSettingPresentationModel.h [changed mode: 0755->0644]
inc/MpTableviewItemTag.h [new file with mode: 0644]
inc/MpTypes.h
inc/MpUserPlaylistContentListForm.h
inc/MpYearContentListForm.h
res/screen-density-xhigh/00_button_expand_closed.png [new file with mode: 0644]
res/screen-density-xhigh/00_button_expand_opened.png [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_FORM.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENT_LIST_FORM.xml
res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_GROUPEDTABLEVIEW_ITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_SETTING_FORM.xml [new file with mode: 0644]
res/screen-size-normal/IDL_SETTING_OFF_SET_ITEM_PANEL.xml [new file with mode: 0644]
res/screen-size-normal/IDL_SETTING_PLAYLIST_SET_ITEM_PANEL.xml [new file with mode: 0644]
src/MpAlbumContentListForm.cpp
src/MpAlbumListEditorPanel.cpp
src/MpAllContentPickerPanel.cpp
src/MpAllListEditorPanel.cpp
src/MpAllListPanel.cpp
src/MpAllListPresentationModel.cpp
src/MpArtistContentListForm.cpp
src/MpArtistListEditorPanel.cpp
src/MpArtistListPanel.cpp
src/MpCommonUtil.cpp
src/MpComposerContentListForm.cpp
src/MpContentForm.cpp
src/MpContentListForm.cpp
src/MpContentListPanel.cpp
src/MpFolderContentListForm.cpp
src/MpFolderListEditorPanel.cpp
src/MpFormFactory.cpp
src/MpGenreContentListForm.cpp
src/MpMiniPlayer.cpp
src/MpMusicPlayerApp.cpp
src/MpMusicPlayerForm.cpp
src/MpPlaylistContentListForm.cpp
src/MpPlaylistCreatorForm.cpp
src/MpPlaylistListEditorPanel.cpp
src/MpSetAsPopup.cpp
src/MpSettingForm.cpp
src/MpSettingPresentationModel.cpp
src/MpSharePopup.cpp
src/MpTableviewItemTag.cpp [new file with mode: 0644]
src/MpTypes.cpp
src/MpUserPlaylistContentListForm.cpp
src/MpYearContentListForm.cpp

index 0937903..f3a4d54 100644 (file)
@@ -29,6 +29,8 @@ class AlbumListPresentationModel;
 
 class AlbumContentListForm
        : public ContentListForm
+       , public Tizen::Ui::Controls::ITableViewItemProvider
+       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public ThumbnailBase
        , public Tizen::App::IAppControlResponseListener
 {
@@ -36,6 +38,8 @@ public:
        AlbumContentListForm(void);
        ~AlbumContentListForm(void);
 
+       virtual result Initialize(void);
+
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
 
@@ -46,30 +50,53 @@ public:
        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 int GetItemCount(void);
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndex,
+       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 OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
                                const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
                                const Tizen::Base::Collection::IMap* pExtraData);
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
+protected:
+       virtual bool IsEmptyContentList(void);
+       virtual result SetHeader(void);
+       virtual result SetFooter(void);
+       virtual void SetItemCheckedAll(bool isChecked);
+       virtual int GetCheckedItemCount(void);
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
+       virtual void UpdateExtraInformaionArea(void);
+       virtual void UpdateTableView(void);
+
 private:
-       virtual result CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo);
+       result Construct(void);
+       result CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo);
        Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
-       virtual bool IsEmptyContentList(void);
-       virtual ContentInformation* GetContentInformation(int index);
-       virtual result SetContentListHeader(void);
-       virtual result SetContentListFooter(void);
-       virtual void RefreshAdditionalInformationRegisterBar(void);
+       void RemoveCheckedTableviewItem(bool itemRemove);
+       void SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewItemStatus status);
 
 private:
+       Tizen::Ui::Controls::TableView* __pContentListTableView;
        Tizen::Graphics::Bitmap* __pThumbnail;
        AlbumListPresentationModel* __pPresentationModel;
+
+       int __checkedItemCount;
+       int __currentAlbumIndex;
+       int __activatedStateContextItem;
 };
 
 #endif // _MP_ALBUM_CONTENT_LIST_FORM_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 0c5a44c..53a0454
@@ -41,8 +41,7 @@ public:
                                                                const Tizen::Ui::Scenes::SceneId& nextSceneId);
 
 private:
-       Tizen::Ui::Controls::Label* __pNoContentImageLabel;
-       Tizen::Ui::Controls::Label* __pNoContentTextLabel;
+       void SetAddHeaderStyle(void);
 };
 
 #endif // _MP_ALL_CONTENT_PICKER_PANEL_H_
\ No newline at end of file
index d0cbe89..9f79cd4 100644 (file)
@@ -50,6 +50,10 @@ public:
        result OnInitializing(void);
        result OnTerminating(void);
 
+       void SetTabHeaderStyle(void);
+       void UpdateContentList(void);
+       void SetDisableIconAllCheckButton(void);
+
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                        const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -73,11 +77,7 @@ public:
 
 private:
        result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
-       void UpdateContentList(void);
-
        void SetEditHeaderStyle(void);
-       void SetTabHeaderStyle(void);
-       void SetDisableIconAllCheckButton(void);
 
 private:
        PlayListPickerPopup* __pPlayListPickerPopup;
old mode 100755 (executable)
new mode 100644 (file)
index a886b27..e584f5e
@@ -27,6 +27,7 @@
 #include "MpTypes.h"
 
 class AllListPresentationModel
+       : public Tizen::Base::Runtime::ITimerEventListener
 {
 public:
        static AllListPresentationModel* GetInstance(void);
@@ -39,6 +40,9 @@ public:
        result RemoveContent(int index);
        void AddContent(Tizen::Base::String path, int playlistIndex);
        result UpdateContentList(void);
+       result StartAutoOffTimer(int autoOffValue);
+
+       virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
 
 private:
        AllListPresentationModel(void);
@@ -51,6 +55,7 @@ private:
 private:
        Tizen::Base::Collection::IList* __pContentList;
        static AllListPresentationModel* pAllListPresentationModelInstance;
+       Tizen::Base::Runtime::Timer* __pAutoOffTimer;
 };
 
 #endif // _MP_ALL_LIST_PRESENTATION_MODEL_H_
\ No newline at end of file
index ffeb71b..89719ac 100644 (file)
 #define _MP_ARTIST_CONTENT_LIST_FORM_H_
 
 #include "MpContentListForm.h"
+#include "MpTableviewItemTag.h"
+#include "MpThumbnailBase.h"
 
 class ArtistListPresentationModel;
+class PlayListPickerPopup;
+class SharePopup;
 
 class ArtistContentListForm
        : public ContentListForm
+       , public ThumbnailBase
+       , public Tizen::Ui::Controls::IGroupedTableViewItemProvider
+       , public Tizen::Ui::Controls::IGroupedTableViewItemEventListener
        , public Tizen::App::IAppControlResponseListener
 {
 public:
        ArtistContentListForm(void);
        ~ArtistContentListForm(void);
 
+       result Initialize(void);
+
 private:
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
@@ -43,23 +52,79 @@ private:
        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 int GetItemCount(void);
-       virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndex,
-                                                       Tizen::Ui::Controls::TableViewItem* pItem,
-                                                       Tizen::Ui::Controls::TableViewItemStatus status);
+
        virtual void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
                                const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
                                const Tizen::Base::Collection::IMap* pExtraData);
 
+       virtual void OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex,
+                                                                                       Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
+       virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex,
+                                                                                       Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
+       virtual void OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex,
+                                                                                       int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated);
+       virtual int GetGroupCount(void);
+       virtual int GetItemCount(int groupIndex);
+       virtual Tizen::Ui::Controls::TableViewGroupItem* CreateGroupItem(int groupIndex, int itemWidth);
+       virtual bool DeleteGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem);
+       virtual void UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem);
+       virtual Tizen::Ui::Controls::TableViewItem* CreateItem(int groupIndex, int itemIndex, int itemWidth);
+       virtual bool DeleteItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
+       virtual void UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
+       virtual int GetDefaultItemHeight(void);
+       virtual int GetDefaultGroupItemHeight(void);
+
+       virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
+
+protected:
+       virtual int GetCheckedItemCount(void);
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
+
+       virtual bool IsEmptyContentList(void);
+
+       virtual result SetHeader(void);
+       virtual result SetFooter(void);
+       virtual void SetItemCheckedAll(bool isChecked);
+
+       virtual void UpdateTableView(void);
+
 private:
-//     result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfo);
-       Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
-       void ToggleViewMode(bool editMode);
+       result Construct(void);
+       result CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo);
+       result CreateTableViewGroupItem(Tizen::Ui::Controls::TableViewGroupItem& parent, const ContentInformation& contentInfo);
+
+       ContentInformation* GetContentInformationActivatedStateContextItem(void);
+
+       result InitCheckedItemMultiHashMap(void);
+       void RemoveCheckedItemMultiHashMap(void);
+
+       result AddCheckedItem(int groupIndex, int itemIndex);
+       result RemoveCheckedItem(int groupIndex, int itemIndex);
+       result SetItemChecked(int groupIndex, int itemIndex, bool check);
+       void SetItemCheckedAt(int groupIndex, bool check);
+       void SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewItemStatus status, int groupIndex, int itemIndex);
+
+       int GetCheckedItemCountAt(int groupIndex);
+       int GetTotalItemCount(void);
+       int GetOffsetContentIndex(const int groupIndex);
+
+       Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int albumIndex, int startIndex);
+       result RemoveConentCheckedAll(void);
+
+       result EventHandlerContextMenuItemCaller(void);
+       result EventHandlerContextMenuItemCall(ContentInformation& contentInfo);
+       result EventHandlerContextMenuItemMessageEmail(ContentInformation& contentInfo, Tizen::Base::String providerId);
 
 private:
+       Tizen::Ui::Controls::GroupedTableView* __pContentGroupedTableView;
+       Tizen::Ui::Controls::TableViewContextItem* __pTableViewContextItem;
+       Tizen::Base::Collection::MultiHashMapT<int, int>* __pCheckedItemCountMultiHashMap;
+       Tizen::Graphics::Bitmap* __pThumbnail;
+
+       TableviewItemTag __activatedStateContextItem;
        ArtistListPresentationModel* __pPresentationModel;
+
+       int __currentContentIndex;
 };
 
 #endif // _MP_ARTIST_CONTENT_LIST_FORM_H_
\ No newline at end of file
index bf8eaa7..51b46e6 100644 (file)
@@ -69,24 +69,16 @@ public:
        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);
 
        //<-- fixed
        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 SetEditHeaderStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText);
        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 SetTitleDescriptionStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText, const Tizen::Base::String& descriptionText);
        static void SetTitleDescriptionWithIconStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText,
                                                                                                Tizen::Base::String& descriptionText, int actionId, Tizen::Graphics::Bitmap* icon);
-       //--> fixed
-
-       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);
-
        //<--fixed
        static void SetButtonItemUnCheckedIcon(Tizen::Ui::Controls::Header& header);
        static void SetButtonItemCheckedIcon(Tizen::Ui::Controls::Header& header);
@@ -102,6 +94,7 @@ public:
        static result SetShowStateVariableHeightSizeControl(Tizen::Ui::Control& control, int controlHeight = 0, bool isShow = false);
        static result SetShowStateControl(Tizen::Ui::Control& control, bool isShow);
        static Tizen::Base::String SetHighDepthToEllipsisPath(const Tizen::Base::String& fullFilePath);
+       static void SetNoContentImage(Tizen::Ui::Controls::Label& source, Tizen::Base::String& resourceName, Tizen::Base::String& text);
        //-->fixed
 
 
@@ -114,7 +107,8 @@ public:
        static Tizen::Ui::Controls::Popup* CreateContentDeletePopup(Tizen::Ui::IActionEventListener& listener, int deleteActionId, int cancelActionId);
        static Tizen::Ui::Controls::Panel* CreateFlickMenuN(Tizen::Ui::IActionEventListener& listener, FlickMenuStyle menuStyle);
        static Tizen::Ui::Controls::TableViewContextItem* CreateTableViewContextItemN(Tizen::Ui::IActionEventListener& listener, int itemWidth, FlickMenuStyle menuStyle);
-       static void SetTextItemSelectedBalloonPopup(Tizen::Ui::Controls::Label& itemSelectedBalloonPopup, int itemCount);
+       static void SetTextItemSelectedBalloonPopup(Tizen::Ui::Controls::Label& itemSelectedBalloonPopup, int itemCount); //removable
+       static Tizen::Base::String GetStringItemSelectd(int itemCount);
 //     static result SetShowStateItemSelectedBalloonPopup(Tizen::Ui::Controls::Label& itemSelectedBalloonPopup, bool isShow);
 
 
index 5325622..d81a6c3 100644 (file)
@@ -24,6 +24,8 @@ class ComposerListPresentationModel;
 
 class ComposerContentListForm
        : public ContentListForm
+       , public Tizen::Ui::Controls::ITableViewItemProvider
+       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public ThumbnailBase
        , public Tizen::App::IAppControlResponseListener
 {
@@ -41,13 +43,21 @@ public:
 
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
-       virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
        virtual int GetItemCount(void);
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                               int itemIndex,
-                                               Tizen::Ui::Controls::TableViewItem* pItem,
-                                               Tizen::Ui::Controls::TableViewItemStatus status);
+       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 OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
                                const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
                                const Tizen::Base::Collection::IMap* pExtraData);
index a7012ab..89f83e8 100644 (file)
@@ -36,8 +36,6 @@ class SharePopup;
 
 class ContentListForm
        : public Tizen::Ui::Controls::Form
-       , public Tizen::Ui::Controls::ITableViewItemProvider
-       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public Tizen::Ui::Controls::IScrollEventListener
        , public Tizen::Ui::Controls::IFormBackEventListener
        , public Tizen::Ui::IActionEventListener
@@ -48,7 +46,7 @@ public:
        ContentListForm(void);
        virtual ~ContentListForm(void);
 
-       result Initialize(void);
+       virtual result Initialize(void);
 
        virtual result OnInitializing(void) = 0;
        virtual result OnTerminating(void);
@@ -57,20 +55,6 @@ public:
                                                                        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 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 OnScrollEndReached (Tizen::Ui::Control &source, Tizen::Ui::Controls::ScrollEndEvent type);
        virtual void OnScrollPositionChanged (Tizen::Ui::Control &source, int scrollPos);
@@ -81,80 +65,70 @@ public:
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
 
 protected:
-       result SetAdditionalInforamtion(Tizen::Ui::Control& control);
-       Tizen::Ui::Control* GetRegisteredAdditionalInforamtionControl(void);
-       Tizen::Ui::Controls::TableViewContextItem* CreateTableViewContextItem(FlickMenuStyle menuStyle);
+       result LanucherPicker(PickerType pickerType, PickerArgumentType argumentType = PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL);
+       result Construct(void);
        result CreateContextMenuN(const Tizen::Ui::Control& source);
-       result SetContextMenuItem(unsigned int contextMenuItemStyle, Tizen::Graphics::Point anchorPosition = Tizen::Graphics::Point(-1, -1));
-       void SetCommonPopup(Tizen::Ui::Controls::Popup* commonUtilPopup);
-       result ToggleContentListScreenMode(ContentListScreenMode screenMode);
-       void ToggleItemCheckedAll(bool isChecked);
 
-       void UpdateContentListScreenState(void);
+       Tizen::Ui::Control* GetExtraInformaionAreaControl(void);
+       ScreenState GetScreenState(void);
+       bool IsExistExtraInformaionArea(void);
+       result RemoveContentAt(const Tizen::Content::ContentId& contentId);
 
-       result SetCheckedTableviewItemToPlayList(void);
-       result SetCheckedTableviewItemToShareVia(void);
-       void RefreshAdditionalInformationRegisterBar(void);
-       result SetActivatedContextItemToPlaylist(void);
-       void RemoveCheckedTableviewItem(bool itemRemove);
-       void RemoveAdditionalInforamtion(void);
+       result SetScreenState(ScreenState screenState);
+       result SetContextMenuItem(unsigned int contextMenuItemStyle, Tizen::Graphics::Point anchorPosition = Tizen::Graphics::Point(-1, -1));
+       result SetExtraInformaionArea(Tizen::Ui::Control& control);
+       result ToggleScreenState(ScreenState screenState);
+       result TryRemoveContextMenu(int actionId);
+       result TryRemoveCommonPopup(int actionId);
 
-       ContentListScreenMode GetContentListScreenMode(void);
-       int GetActivatedContextItem(void);
-       result RemoveContentAt(const Tizen::Content::ContentId& contentId);
+       void SetTextBallonTooltip(Tizen::Base::String tooltipText);
+       void SetCommonPopup(Tizen::Ui::Controls::Popup* commonUtilPopup);
+       void SetContentList(Tizen::Ui::Container* pTableview);
+       void UpdateScreenState(void);
+
+       virtual result SetHeader(void) = 0;
+       virtual result SetFooter(void) = 0;
+       virtual void SetItemCheckedAll(bool isChecked) = 0;
+       virtual bool IsEmptyContentList(void) = 0;
+       virtual int GetCheckedItemCount(void) = 0;
+       virtual void UpdateTableView(void) = 0;
 
-       virtual result CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo) = 0;
-       virtual ContentInformation* GetContentInformation(int index) = 0;
-       virtual result SetContentListHeader(void) = 0;
-       virtual result SetContentListFooter(void) = 0;
+       virtual void UpdateExtraInformaionArea(void);
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
 
 private:
-       result Construct(void);
        result SetShowStateNoContent(bool isShow);
-       result SetShowStateContentTableview(bool isShow);
-       result SetShowStateItemSelectedBalloonPopup(bool isShow);
-       result SetShowStateAdditionalInformationRegisterBar(bool isShow);
+       result SetShowStateContentList(bool isShow);
+       result SetShowStateBalloonTooltip(bool isShow);
+       result SetShowStatExtraInformaionArea(bool isShow);
        result SetShowStateCommonPopup(bool isShow);
-       result SetTextItemSelectedBalloonPopup(int itemCount);
 
-       result CreatePlayListPickerPopup(Tizen::Base::Collection::IList* pDataList);
-       result CreateSharePopup(void);
+       result ShowPlayListPicker(Tizen::Base::Collection::IList* pIList);
+       result ShowSharePicker(Tizen::Base::Collection::IList* pIList);
 
-       result SetContentListScreenMode(ContentListScreenMode screenMode);
-       void RemovCommonPopup(void);
+       void RemovePlayListPicker(void);
+       void RemoveSharePicker(void);
        void RemoveContextMenu(void);
-       void DestroyPlayListPickerPopup(void);
-       void DestroySharePopup(void);
-       void TableviewSelectedItemStateChanged(Tizen::Ui::Controls::TableView& tableView, Tizen::Ui::Controls::TableViewItemStatus status);
-       bool IsExistAdditionalInforamtion(void);
-
-       virtual bool IsEmptyContentList(void) = 0;
-       virtual Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex) = 0;
+       void RemovCommonPopup(void);
+       void RemoveExtraInformaionArea(void);
 
 protected:
-       Tizen::Ui::Controls::TableView* __pContentTableView;
-       Tizen::Ui::Controls::TableViewContextItem* __pContextItem;
-
        Tizen::Base::String __headerTitle;
        Tizen::Base::String __prevSceneId;
 
-       int __currentContentIndex;
-
 private:
+       Tizen::Ui::Container* __pContentList;
        Tizen::Ui::Controls::ContextMenu* __pContextMenu;
        Tizen::Ui::Controls::Popup* __pCommonUtilPopupHandler;
-       Tizen::Ui::Controls::Label* __pNoContentLabel;
-       Tizen::Ui::Controls::Panel* __pAdditionalInformationRegisterBar;
-       Tizen::Ui::Controls::Label* __pItemSelectedBalloonPopup;
+       Tizen::Ui::Controls::Label* __pNoContent;
+       Tizen::Ui::Controls::Panel* __pExtraInformaionArea;
+       Tizen::Ui::Controls::Label* __pBallonTooltip;
        
-       PlayListPickerPopup* __pPlayListPickerPopup;
-       SharePopup* __pSharePopup;
-
-       ContentListScreenMode __contentListScreenMode;
-       int __itemIndex;
-       int __checkedItemCount;
-       int __additionlInformationRegisterBarHeight;
-       bool __allSelectToggle;
+       PlayListPickerPopup* __pPlayListPicker;
+       SharePopup* __pSharePicker;
+
+       ScreenState __screenState;
+       int __heightExtraInformaionArea;
 };
 
 #endif // _MP_CONTENT_LIST_FORM_H_
\ No newline at end of file
index c64cbca..63ccb84 100644 (file)
@@ -29,6 +29,8 @@ class FolderListPresentationModel;
 
 class FolderContentListForm
        : public ContentListForm
+       , public Tizen::Ui::Controls::ITableViewItemProvider
+       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public ThumbnailBase
        , public Tizen::App::IAppControlResponseListener
 {
@@ -36,6 +38,8 @@ public:
        FolderContentListForm(void);
        ~FolderContentListForm(void);
 
+       virtual result Initialize(void);
+
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
        virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
@@ -44,13 +48,21 @@ public:
        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 UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
+
        virtual int GetItemCount(void);
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndex,
+       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 OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
                                const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
@@ -59,17 +71,34 @@ public:
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
+protected:
+       virtual int GetCheckedItemCount(void);
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
+
+       virtual bool IsEmptyContentList(void);
+
+       virtual result SetHeader(void);
+       virtual result SetFooter(void);
+       virtual void SetItemCheckedAll(bool isChecked);
+
+       virtual void UpdateTableView(void);
+
 private:
+       result Construct(void);
        result CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo);
        Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
-       virtual bool IsEmptyContentList(void);
-       virtual ContentInformation* GetContentInformation(int index);
-       virtual result SetContentListHeader(void);
-       virtual result SetContentListFooter(void);
+       void RemoveCheckedTableviewItem(bool itemRemove);
+       void SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewItemStatus status);
 
 private:
+       Tizen::Ui::Controls::TableView* __pContentListTableView;
+       Tizen::Ui::Controls::TableViewContextItem* __pTableViewContextItem;
        Tizen::Graphics::Bitmap* __pThumbnail;
        FolderListPresentationModel* __pPresentationModel;
+
+       int __checkedItemCount;
+       int __currentFolderIndex;
+       int __activatedStateContextItem;
 };
 
 #endif // _MP_FOLDER_CONTENT_LIST_FORM_H_
\ No newline at end of file
index 15bd59a..51f4011 100644 (file)
@@ -29,6 +29,8 @@ class GenreListPresentationModel;
 
 class GenreContentListForm
        : public ContentListForm
+       , public Tizen::Ui::Controls::ITableViewItemProvider
+       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public ThumbnailBase
        , public Tizen::App::IAppControlResponseListener
 {
@@ -44,13 +46,21 @@ public:
        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 UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
+
        virtual int GetItemCount(void);
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndex,
+       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 OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
                                const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
index 2e51497..f88ad1c 100644 (file)
@@ -92,4 +92,4 @@ private:
 //     Tizen::Base::String __artistName;\r
 };\r
 \r
-#endif // _MP_MINI_PLAYER_H_\r
+#endif // _MP_MINI_PLAYER_H_
\ No newline at end of file
index 5908b14..2dccd6b 100644 (file)
@@ -30,6 +30,8 @@ class PlaylistListPresentationModel;
 
 class PlaylistContentListForm
        : public ContentListForm
+       , public Tizen::Ui::Controls::ITableViewItemProvider
+       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public ThumbnailBase
        , public Tizen::App::IAppControlResponseListener
 {
@@ -37,6 +39,8 @@ public:
        PlaylistContentListForm(void);
        ~PlaylistContentListForm(void);
 
+       virtual result Initialize(void);
+
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
@@ -49,12 +53,19 @@ public:
                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId);
 
        virtual int GetItemCount(void);
-       virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndex,
+       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 OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
                                const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
@@ -63,20 +74,34 @@ public:
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
 
 protected:
-       virtual result CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo);
-       virtual ContentInformation* GetContentInformation(int index);
-       virtual result SetContentListHeader(void);
-       virtual result SetContentListFooter(void);
+       virtual int GetCheckedItemCount(void);
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
 
-private:
        virtual bool IsEmptyContentList(void);
-       virtual Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
+
+       virtual result SetHeader(void);
+       virtual result SetFooter(void);
+       virtual void SetItemCheckedAll(bool isChecked);
+
+       virtual void UpdateTableView(void);
+
+private:
+       result Construct(void);
+       result CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo);
+       Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
        Tizen::Base::Collection::ArrayList* GetSearchResultContentList(int itemIndex);
        Tizen::Base::Collection::ArrayList* GetAudioContentInfoContentList(int itemIndex);
+       void RemoveCheckedTableviewItem(bool itemRemove);
+       void SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewItemStatus status);
 
 private:
+       Tizen::Ui::Controls::TableView* __pContentListTableView;
        Tizen::Graphics::Bitmap* __pThumbnail;
        PlaylistListPresentationModel* __pPresentationModel;
+
+       int __checkedItemCount;
+       int __currentContentType;
+       int __activatedStateContextItem;
 };
 
 #endif // _MP_PLAYLIST_CONTENT_LIST_FORM_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 6ec5fdf..139ee49
@@ -23,7 +23,7 @@
 #define _MP_SETTING_FORM_H_
 
 class SettingPresentationModel;
-class NowPlayContentPanel;
+class AllListPresentationModel;
 
 class SettingForm
        : public Tizen::Ui::Controls::Form
@@ -63,8 +63,11 @@ public:
        virtual void OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated);
 
 private:
+       Tizen::Base::String GetAutoOffString(void);
+
+private:
        SettingPresentationModel* __pSettingPresentationModel;
-       NowPlayContentPanel* __pNowPlayContentPanel;
+       AllListPresentationModel* __pPresentationModel;
        Tizen::Ui::Controls::GroupedTableView* __pSettingTableView;
 };
 
old mode 100755 (executable)
new mode 100644 (file)
index 4dadccb..7b90f2e
 #include <FIo.h>
 #include <FSystem.h>
 
-class IMusicSettingEventListener;
-
 class SettingPresentationModel
 {
 public:
        static SettingPresentationModel* GetInstance(void);
        void DestroySettingPresentationModel(void);
 
-       void AddSettingEventListener(const IMusicSettingEventListener& listener);
-       void RemoveSettingEventListener(const IMusicSettingEventListener& listener);
-
        void InitializeSettingValue(void);
        void SetTabEnable(int tabId, bool enabled);
        bool IsTabEnable(int tabId);
 
-       void SetAutoOffTime(int autoOffTime);
+       int SetAutoOffTime(int autoOffTime);
        int GetAutoOffTime(void);
 
 private:
@@ -52,22 +47,12 @@ private:
 
        result Construct(void);
 
-       void CallOnAutoOffTimeChanged(int autoOffTime);
-
 private:
-       Tizen::Base::Collection::LinkedListT <IMusicSettingEventListener*> __settingEventListener;
-
        static SettingPresentationModel* pSettingPresentationModel;
-
-       bool __isAlbumsTab;
-       bool __isArtistTab;
-       bool __isGenresTab;
-       bool __isComposersTab;
-       bool __isYearsTab;
-       bool __isFoldersTab;
-       bool __isSongsTab;
-       bool __isPlayerListsTab;
        int __autoOffTime;
+       bool __isMostPlayed;
+       bool __isRecentlyPlayed;
+       bool __isRecentlyAdd;
 };
 
 #endif // _MP_SETTING_PRESENTATION_MODEL_H_
\ No newline at end of file
diff --git a/inc/MpTableviewItemTag.h b/inc/MpTableviewItemTag.h
new file mode 100644 (file)
index 0000000..452e8e9
--- /dev/null
@@ -0,0 +1,42 @@
+//\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               MpTableviewItemTag.cpp\r
+ * @brief              This is the implementation file for TableviewItemTag class.\r
+ */\r
+\r
+#ifndef _MP_TABLE_VIEW_ITEM_TAG_H_\r
+#define _MP_TABLE_VIEW_ITEM_TAG_H_\r
+\r
+#include <FBaseObject.h>\r
+\r
+class TableviewItemTag\r
+       : public Tizen::Base::Object\r
+{\r
+public:\r
+       explicit TableviewItemTag(int groupIndex, int itemIndex = -1);\r
+       virtual ~TableviewItemTag(void);\r
+\r
+private:\r
+       TableviewItemTag(void);\r
+\r
+public:\r
+       int __groupIndex;\r
+       int __itemIndex;\r
+};\r
+\r
+#endif // _MP_TABLE_VIEW_ITEM_TAG_H_
\ No newline at end of file
index 4aaf09b..a0dab8b 100644 (file)
@@ -75,23 +75,44 @@ enum ContextMenuItemStyle
        CONTEXT_MENU_ITEM_STYLE_GO_TO_LIBARY = 0x00000080,
        CONTEXT_MENU_ITEM_STYLE_BLUETOOTH = 0x00000100,
        CONTEXT_MENU_ITEM_STYLE_SEARCH = 0x00000200,
-       CONTEXT_MENU_ITEM_STYLE_CREATE_PLAYLIST= 0x00000200,
+       CONTEXT_MENU_ITEM_STYLE_CREATE_PLAYLIST= 0x00000400,
        CONTEXT_MENU_ITEM_STYLE_SHARE_VIA = 0x00001000,
-       CONTEXT_MENU_ITEM_STYLE_EDIT = 0x00002000
+       CONTEXT_MENU_ITEM_STYLE_EDIT = 0x00002000,
+       CONTEXT_MENU_ITEM_STYLE_ADD = 0x00004000
 };
 //__CONTEXT_MENU_ITEM_STYLE-->
 
 //<--__CONTENT_LIST_SCREEN_MODE
-enum ContentListScreenMode
+enum ScreenState
 {
-       CONTENT_LIST_SCREEN_MODE_BASE = 0,
-       CONTENT_LIST_SCREEN_MODE_NORMAL = CONTENT_LIST_SCREEN_MODE_BASE,
-       CONTENT_LIST_SCREEN_MODE_EDITOR,
-       CONTENT_LIST_SCREEN_MODE_SHARE_VIA,
-       CONTENT_LIST_SCREEN_MODE_MAX
+       SCREEN_STATE_BASE = 0,
+       SCREEN_STATE_NORMAL = SCREEN_STATE_BASE,
+       SCREEN_STATE_EDITOR,
+       SCREEN_STATE_SHARE_VIA,
+       SCREEN_STATE_MAX
 };
 //__CONTENT_LIST_SCREEN_MODE-->
 
+//__PICKER_ARGUMENT_TYPE-->
+enum PickerArgumentType
+{
+       PICKER_ARGUMENT_TYPE_BASE= 0,
+       PICKER_ARGUMENT_TYPE_ACTIVATED_STATE_CONTEXT_ITEM = PICKER_ARGUMENT_TYPE_BASE,
+       PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL,
+       PICKER_ARGUMENT_TYPE_MAX,
+};
+//__PICKER_ARGUMENT_TYPE-->
+
+//__PICKER_ARGUMENT_TYPE-->
+enum PickerType
+{
+       PICKER_TYPE_BASE = 0,
+       PICKER_TYPE_PLAY_LIST_PICKER = PICKER_TYPE_BASE,
+       PICKER_TYPE_SHARE_PICKER,
+       PICKER_TYPE_MAX
+};
+//__PICKER_ARGUMENT_TYPE-->
+
 //<--__CONTEXT_MENU_ITEM_ACTION_ID
 enum IDAContextMenuitemActionId
 {
@@ -109,6 +130,7 @@ enum IDAContextMenuitemActionId
        IDA_CONTEXT_MENU_ITEM_SHARE_VIA,
        IDA_CONTEXT_MENU_ITEM_EDIT,
        IDA_CONTEXT_MENU_ITEM_GO_TO_LIBARY,
+       IDA_CONTEXT_MENU_ITEM_STYLE_ADD,
        IDA_CONTEXT_MENU_ITEM_MAX
 };
 //__CONTEXT_MENU_ITEM_ACTION_ID-->
@@ -133,10 +155,11 @@ enum IDAHeaderButtonId
        IDA_HEADER_BUTTON_COMPOSERS,
        IDA_HEADER_BUTTON_YEARS,
        IDA_HEADER_BUTTON_FOLDER,
-       IDA_HEADER_BUTTION_SEARCH_ICON,
-       IDA_HEADER_BUTTION_CHECK_BOX_CHECKED_ICON,
-       IDA_HEADER_BUTTION_CHECK_BOX_UNCHECKED_ICON,
-       IDA_HEADER_BUTTION_THUMBNAIL_ICON
+       IDA_HEADER_BUTTON_SEARCH_ICON,
+       IDA_HEADER_BUTTON_SELECTE_ALL,
+       IDA_HEADER_BUTTON_CHECK_BOX_CHECKED_ICON,
+       IDA_HEADER_BUTTON_CHECK_BOX_UNCHECKED_ICON,
+       IDA_HEADER_BUTTON_THUMBNAIL_ICON
 };
 
 enum IDAFooterButtonId
@@ -153,6 +176,7 @@ enum IDAFooterButtonId
        IDA_FOOTER_BUTTON_CREATE_PLAYLIST,
        IDA_FOOTER_BUTTON_MORE,
        IDA_FOOTER_BUTTON_SAVE,
+       IDA_FOOTER_BUTTON_ADD,
 };
 
 enum IDAFlickButton
@@ -212,12 +236,12 @@ enum FooterButtonStyle
        STYLE_SHARE_ADD,
        STYLE_DELETE_ADD,
        STYLE_MORE_EDIT_ADD,
+       STYLE_ADD_ADD,
        STYLE_MAX,
 };
 
 static const int ADD_TO_PLAYLIST_BUTTON_ID = 0;
 
-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;
@@ -265,7 +289,7 @@ 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 = 3;//4; //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;
@@ -273,6 +297,7 @@ 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 = 140;
+static const int GROUP_ITEM_HEIGHT = 144;
 static const int STRING_LENGTH = 90;
 static const int H_NOW_PLAY_BAR = 120;
 static const int W_NOW_PLAY_BAR = 720;
@@ -365,6 +390,9 @@ extern const wchar_t* FOLDERS_TAB;                                                                                  // 0 - 1 (UNCHECKED, CHECKED)
 extern const wchar_t* SONGS_TAB;                                                                                       // 0 - 1 (UNCHECKED, CHECKED)
 extern const wchar_t* PLAYERLISTS_TAB;                                                                         // 0 - 1 (UNCHECKED, CHECKED)
 extern const wchar_t* AUTO_OFF_LEVEL;                                                                          // 0 - 5 (OFF, 15 MIN, 30 MIN, 1 HOUR, 1 HOUR 30 MIN, 2 HOURS)
+extern const wchar_t* MOST_PLAYED;
+extern const wchar_t* RECENTLY_PLAYED;
+extern const wchar_t* RECENTLY_ADD;
 
 extern const wchar_t* TIZEN_APPCONTORL_PROVIDER_AUDIO_TEST;                                    // Provider Id (for Test)
 extern const wchar_t* TIZEN_APPCONTORL_PROVIDER_AUDIO;                                         // Provider Id
@@ -414,6 +442,14 @@ extern const wchar_t* IDL_CONTENT_LIST_FORM;
 extern const wchar_t* IDL_ALBUM_INFO_PANEL;
 extern const wchar_t* IDL_ALBUM_CONTENT_ITEM_PANEL;
 extern const wchar_t* IDL_ALBUM_CONTENT_EDIT_ITEM_PANEL;
+extern const wchar_t* IDL_SETTING_FORM;
+extern const wchar_t* IDL_SETTING_OFF_SET_ITEM_PANEL;
+extern const wchar_t* IDL_SETTING_PLAYLIST_SET_ITEM_PANEL;
+extern const wchar_t* IDL_GROUPEDTABLEVIEW_ITEM_PANEL;
+extern const wchar_t* IDL_CONTENT_LIST_ARTIST_FORM;
+extern const wchar_t* IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL;
+extern const wchar_t* IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL;
+extern const wchar_t* IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL;
 //_XML IDL_
 
 //_XML IDC_
@@ -481,21 +517,42 @@ extern const wchar_t* IDC_FORWARDING_DATA_LABEL;
 extern const wchar_t* IDC_DATE_DATA_LABEL;
 extern const wchar_t* IDC_LOCATION_DATA_LABEL;
 extern const wchar_t* IDC_TITLE_LABEL;
+extern const wchar_t* IDC_BALLOON_TOOLTIP_LABEL;
+extern const wchar_t* IDC_NO_CONTENT_LABEL;
+extern const wchar_t* IDC_CONTENT_GROUPED_TABLEVIEW;
+extern const wchar_t* IDC_LABEL_MAIN_TEXT;
+extern const wchar_t* IDC_LABEL_SUB_TEXT;
+extern const wchar_t* IDC_LABEL_EX;
 //_XML IDC_
 
+//<--__XML_IDC_ORDERING PREFIX : IDC_CONTROLTYPE_ EX) IDC_BUTTON_TOGGLE_PLAY
+extern const wchar_t* IDC_LABEL_BALLOON_TOOLTIP;
+extern const wchar_t* IDC_LABEL_NO_CONTENT;
+extern const wchar_t* IDC_LABEL_CONTENT_THUMBNAIL;
+extern const wchar_t* IDC_LABEL_CONTENT_TITLE_NAME;
+extern const wchar_t* IDC_GROUPEDTABLEVIEW_CONTENT_LIST;
+extern const wchar_t* IDC_TABLEVIEW_CONTENT_LIST;
+extern const wchar_t* IDC_LABEL_CONTENT_ADDITIONAL_INFO;
+//__XML_IDC_ORDERING-->
+
 //IMAGE
 extern const wchar_t* IDB_STORAGE_SDCARD;
 extern const wchar_t* IDB_STORAGE_PHONE;
 extern const wchar_t* IDB_STORAGE_EXTERNAL;
 extern const wchar_t* IDB_NO_CONTENTS;
 extern const wchar_t* IDB_MUSIC_LINE_CONTENT_FORM; //REMOVE
-//IMAGE
 
-//HEADER
+//COLOR
 extern const unsigned int COLOR_HEADER_TITLE_TEXT;
 extern const unsigned int COLOR_HEADER_DESCRIPTION_TEXT;
 extern const unsigned int COLOR_ITEM_SUB_TEXT;
 
+//SIZE
+extern const int H_TABLEVIEW_IITEM;
+extern const int H_TABLEVIEW_GROUP_ITEM;
+extern const int H_BALLOON_TOOL_TIP;
+
+//VALUE
 extern const int MAX_PLAY_STATE_SLIDER_COUNT;
 extern const int MIN_PLAY_STATE_SLIDER_COUNT;
 
@@ -509,7 +566,7 @@ static const Tizen::Base::String CheckedName[HEAD_ITEM_COUNT] =
        L"SONGS_TAB",
        L"PLAYERLISTS_TAB",
        L"ALBUMS_TAB",
-//     L"ARTISTS_TAB",
+       L"ARTISTS_TAB",
 //     L"GENRES_TAB",
 //     L"COMPOSERS_TAB",
 //     L"YEARS_TAB",
@@ -521,7 +578,7 @@ 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_ARTISTS",
 //     L"IDS_MUSIC_TAB4_GENRES",
 //     L"IDS_MUSIC_BODY_COMPOSERS",
 //     L"IDS_MUSIC_TAB4_YEARS",
@@ -546,4 +603,4 @@ static const Tizen::Base::String RETURN_TYPE = L"returnType:contactId";
 
 static const Tizen::Base::String CONTENT_FORM_REQUSEST_ID = L"ContentFormRequestId";
 
-#endif // _MP_TYPES_H_
+#endif // _MP_TYPES_H_
\ No newline at end of file
index fc52ca6..19aecf9 100644 (file)
@@ -30,12 +30,16 @@ class PlaylistListPresentationModel;
 
 class UserPlaylistContentListForm
        : public ContentListForm
+       , public Tizen::Ui::Controls::ITableViewItemProvider
+       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public ThumbnailBase
 {
 public:
        UserPlaylistContentListForm(void);
        virtual ~UserPlaylistContentListForm(void);
 
+       virtual result Initialize(void);
+
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
@@ -48,31 +52,49 @@ public:
                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId);
 
        virtual int GetItemCount(void);
-       virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
-       virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndex,
+       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 OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 protected:
-       virtual result CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo);
-       virtual ContentInformation* GetContentInformation(int index);
-       virtual result SetContentListHeader(void);
-       virtual result SetContentListFooter(void);
-
-private:
-       result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
+       virtual int GetCheckedItemCount(void);
+       virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
 
        virtual bool IsEmptyContentList(void);
-       virtual Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
+
+       virtual result SetHeader(void);
+       virtual result SetFooter(void);
+       virtual void SetItemCheckedAll(bool isChecked);
+
+       virtual void UpdateTableView(void);
 
 private:
+       result Construct(void);
+       result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfo);
+       Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
+       void RemoveCheckedTableviewItem(bool itemRemove);
+       void SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewItemStatus status);
+
+private:
+       Tizen::Ui::Controls::TableView* __pContentListTableView;
        Tizen::Graphics::Bitmap* __pThumbnail;
        PlaylistListPresentationModel* __pPresentationModel;
+
+       int __checkedItemCount;
+       int __activatedStateContextItem;
 };
 
 #endif // _MP_USER_PLAYLIST_CONTENT_LIST_FORM_H_
\ No newline at end of file
index 166c165..afa6aa2 100644 (file)
@@ -29,6 +29,8 @@ class YearListPresentationModel;
 
 class YearContentListForm
        : public ContentListForm
+       , public Tizen::Ui::Controls::ITableViewItemProvider
+       , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public ThumbnailBase
        , public Tizen::App::IAppControlResponseListener
 {
@@ -44,12 +46,21 @@ public:
        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 int GetItemCount(void);
-       virtual void UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
        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 OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
                                const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
diff --git a/res/screen-density-xhigh/00_button_expand_closed.png b/res/screen-density-xhigh/00_button_expand_closed.png
new file mode 100644 (file)
index 0000000..129e06d
Binary files /dev/null and b/res/screen-density-xhigh/00_button_expand_closed.png differ
diff --git a/res/screen-density-xhigh/00_button_expand_opened.png b/res/screen-density-xhigh/00_button_expand_opened.png
new file mode 100644 (file)
index 0000000..4db0f6a
Binary files /dev/null and b/res/screen-density-xhigh/00_button_expand_opened.png differ
diff --git a/res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL.xml b/res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..3038634
--- /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_LIST_ARTIST_EDITOR_GROUPITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="144" 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
+    <Label id="IDC_LABEL_THUMBNAIL_INNER_STROKE" parent="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_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="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="105" marginRight="0" marginTop="28" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="105" y="28"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="105" marginRight="0" marginTop="28" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="105" y="28"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_CONTENT_TITLE_NAME" parent="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="38" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="16" marginRight="24" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="467" x="229" y="102"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="38" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="16" marginRight="24" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1027" x="229" y="102"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_CONTENT_THUMBNAIL" parent="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_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="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="2" marginRight="0" marginTop="2" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_LABEL_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="107" y="30"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="2" marginRight="0" marginTop="2" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_LABEL_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="107" y="30"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_CONTENT_TITLE_LINE" parent="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#808080" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="4" marginRight="24" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="587" x="109" y="140"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="4" marginRight="24" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ARTIST_EDITOR_GROUPITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1147" x="109" y="140"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_FORM.xml b/res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_FORM.xml
new file mode 100644 (file)
index 0000000..d2c458c
--- /dev/null
@@ -0,0 +1,36 @@
+<?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_CONTENT_LIST_ARTIST_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
+    </Footer>\r
+    <Header>\r
+        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor="#3B73B6"/>\r
+        <itemSet/>\r
+    </Header>\r
+    <Label id="IDC_LABEL_BALLOON_TOOLTIP" parent="IDL_CONTENT_LIST_ARTIST_FORM">\r
+        <property backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="" textColor="#FFFFFF" textSize="32" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_ARTIST_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ARTIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ARTIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="963"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_ARTIST_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ARTIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ARTIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="436"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_NO_CONTENT" parent="IDL_CONTENT_LIST_ARTIST_FORM">\r
+        <property backgroundBitmapPath="T02_nocomposers.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="No Songs" textColor="" textSize="32" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_BOTTOM"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="220" y="365"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="500" y="102"/>\r
+    </Label>\r
+    <GroupedTableView id="IDC_GROUPEDTABLEVIEW_CONTENT_LIST" parent="IDL_CONTENT_LIST_ARTIST_FORM">\r
+        <property backgroundColor="" backgroundColorOpacity="0" collapseByPinchEnabled="false" fastScrollIndex="" groupedLookEnabled="false" itemDivider="false" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
+        <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="963" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ARTIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ARTIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_ARTIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>\r
+        <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="436" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ARTIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ARTIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_ARTIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>\r
+    </GroupedTableView>\r
+</Scene>\r
diff --git a/res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL.xml b/res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..18577b1
--- /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_LIST_ARTIST_GROUPITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="144" 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
+    <Label id="IDC_LABEL_THUMBNAIL_INNER_STROKE" parent="IDL_CONTENT_LIST_ARTIST_GROUPITEM_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="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="28" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="20" y="28"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="28" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="20" y="28"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_CONTENT_TITLE_NAME" parent="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" 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="24" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="552" x="144" y="102"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" 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="24" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1112" x="144" y="102"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_CONTENT_THUMBNAIL" parent="IDL_CONTENT_LIST_ARTIST_GROUPITEM_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="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="2" marginRight="0" marginTop="2" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="22" y="30"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="2" marginRight="0" marginTop="2" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="22" y="30"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_CONTENT_TITLE_LINE" parent="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#808080" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="4" marginRight="24" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="672" x="24" y="140"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="4" marginRight="24" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1232" x="24" y="140"/>\r
+    </Label>\r
+</ScenePanel>\r
index 9eb33e0..e7a7fb5 100644 (file)
@@ -3,7 +3,7 @@
        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.201302250944" Dversion="20120315">\r
+<Scene Bversion="2.0.0.201303041025" Dversion="20120315">\r
     <LogicalCoordinate>720</LogicalCoordinate>\r
     <Form id="IDL_CONTENT_LIST_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
         <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Title Text" titleTextColor="#3B73B6"/>\r
         <itemSet/>\r
     </Header>\r
-    <Panel id="IDC_CONTENT_ADDITIONAL_REGISTER_BAR" parent="IDL_CONTENT_LIST_FORM">\r
+    <Label id="IDC_LABEL_BALLOON_TOOLTIP" parent="IDL_CONTENT_LIST_FORM">\r
+        <property backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="%d items are selected." textColor="#FFFFFF" textSize="32" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="1011"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="484"/>\r
+    </Label>\r
+    <Panel id="IDC_LABEL_CONTENT_ADDITIONAL_INFO" parent="IDL_CONTENT_LIST_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENT_LIST_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>\r
     </Panel>\r
-    <Label id="IDC_ITEM_SELECTED_COUNT_LABEL" parent="IDL_CONTENT_LIST_FORM">\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_CONTENT_LIST_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="963"/>\r
-        <layout bottomRelation="IDL_CONTENT_LIST_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="436"/>\r
-    </Label>\r
-    <TableView id="IDC_CONTENT_LIST_TABLEVIEW" parent="IDL_CONTENT_LIST_FORM">\r
-        <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" itemDivider="false" 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="913" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENT_ADDITIONAL_REGISTER_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="50"/>\r
-        <layout bottomRelation="IDC_ITEM_SELECTED_COUNT_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="384" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENT_ADDITIONAL_REGISTER_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="52"/>\r
+    <TableView id="IDC_TABLEVIEW_CONTENT_LIST" parent="IDL_CONTENT_LIST_FORM">\r
+        <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
+        <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="1011" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL_CONTENT_ADDITIONAL_INFO" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>\r
+        <layout bottomRelation="IDC_LABEL_BALLOON_TOOLTIP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="484" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_LIST_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_LIST_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL_CONTENT_ADDITIONAL_INFO" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>\r
     </TableView>\r
-    <Label id="IDC_NO_CONTENTS_LABEL" parent="IDL_CONTENT_LIST_FORM">\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
+    <Label id="IDC_LABEL_NO_CONTENT" parent="IDL_CONTENT_LIST_FORM">\r
+        <property backgroundBitmapPath="T02_nocomposers.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="No Songs" textColor="" textSize="32" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_BOTTOM"/>\r
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="220" y="365"/>\r
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="500" y="102"/>\r
     </Label>\r
diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..bb84e37
--- /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_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="114" 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_LABEL_CONTENT_ADDITIONAL_INFO" parent="IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="16" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="180" x="514" y="36"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="44" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="180" x="1074" y="48"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_CONTENT_TITLE_NAME" parent="IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="#000000" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="105" marginRight="0" marginTop="22" mode="Portrait" rightRelation="IDC_CONTENT_ADDITIONAL_INFO" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="409" x="105" y="30"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="105" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_CONTENT_ADDITIONAL_INFO" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="969" x="105" y="43"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..089652a
--- /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_CONTENT_NOTHUMBNAIL_ITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="114" 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_LABEL_CONTENT_ADDITIONAL_INFO" parent="IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="" textColor="#808080" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="16" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="180" x="514" y="36"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="44" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="180" x="1074" y="48"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_CONTENT_TITLE_NAME" parent="IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="#000000" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="22" mode="Portrait" rightRelation="IDC_CONTENT_ADDITIONAL_INFO" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="494" x="20" y="30"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1054" x="20" y="43"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_GROUPEDTABLEVIEW_ITEM_PANEL.xml b/res/screen-size-normal/IDL_GROUPEDTABLEVIEW_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..404b13b
--- /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_GROUPEDTABLEVIEW_ITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="112" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="112" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Label id="IDC_LABEL_LEFT_MARIN" parent="IDL_GROUPEDTABLEVIEW_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="50" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="20" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_GROUPEDTABLEVIEW_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="20" x="0" y="0"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_BOTTON_MARIN" parent="IDL_GROUPEDTABLEVIEW_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" 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_BOTTOM" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="700" x="20" y="108"/>\r
+        <layout bottomRelation="IDL_GROUPEDTABLEVIEW_ITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_GROUPEDTABLEVIEW_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1260" x="20" y="108"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_CHECK_BUTTON_MARIN" parent="IDL_GROUPEDTABLEVIEW_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="30" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="None" rightRelationType="" topRelation="IDL_GROUPEDTABLEVIEW_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="70" x="20" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="70" x="20" y="0"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_MAIN_TEXT" parent="IDL_GROUPEDTABLEVIEW_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="30" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="true" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_CHECK_BUTTON_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="650" x="90" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_CHECK_BUTTON_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_GROUPEDTABLEVIEW_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1190" x="90" y="0"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_SETTING_FORM.xml b/res/screen-size-normal/IDL_SETTING_FORM.xml
new file mode 100644 (file)
index 0000000..035b1e9
--- /dev/null
@@ -0,0 +1,26 @@
+<?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_SETTING_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
+    </Footer>\r
+    <Header>\r
+        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Music settings" titleTextColor="#3B73B6"/>\r
+        <itemSet/>\r
+    </Header>\r
+    <GroupedTableView id="IDC_GROUPEDTABLEVIEW_CONTENT_LIST" parent="IDL_SETTING_FORM">\r
+        <property backgroundColor="" backgroundColorOpacity="0" collapseByPinchEnabled="false" fastScrollIndex="" groupedLookEnabled="false" itemDivider="false" itemDividerColor="#000000" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
+        <layout bottomRelation="IDL_SETTING_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="1011" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>\r
+        <layout bottomRelation="IDL_SETTING_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="484" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_SETTING_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>\r
+    </GroupedTableView>\r
+</Scene>\r
diff --git a/res/screen-size-normal/IDL_SETTING_OFF_SET_ITEM_PANEL.xml b/res/screen-size-normal/IDL_SETTING_OFF_SET_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..925447c
--- /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_SETTING_OFF_SET_ITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="112" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="112" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Label id="IDC_LABEL_EX" parent="IDL_SETTING_OFF_SET_ITEM_PANEL">\r
+        <property backgroundBitmapPath="00_button_expand_closed.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="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="20" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="628" y="20"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="76" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="20" marginTop="0" mode="Landscape" rightRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="76" x="1184" y="18"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_LEFT_MARIN" parent="IDL_SETTING_OFF_SET_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="50" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="20" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="20" x="0" y="0"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_MAIN_TEXT" parent="IDL_SETTING_OFF_SET_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Music auto off" 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_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="16" marginTop="6" mode="Portrait" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="592" x="20" y="6"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="26" marginTop="6" mode="Landscape" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1138" x="20" y="6"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_SUB_TEXT" parent="IDL_SETTING_OFF_SET_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Sub text" textColor="#FF8040" 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_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="16" marginTop="0" mode="Portrait" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_LABEL_MAIN_TEXT" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="592" x="20" y="60"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="6" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_LABEL_MAIN_TEXT" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1138" x="20" y="60"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_BOTTON_MARIN" parent="IDL_SETTING_OFF_SET_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#808080" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="Label1" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="700" x="20" y="108"/>\r
+        <layout bottomRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_SETTING_OFF_SET_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1260" x="20" y="108"/>\r
+    </Label>\r
+</ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_SETTING_PLAYLIST_SET_ITEM_PANEL.xml b/res/screen-size-normal/IDL_SETTING_PLAYLIST_SET_ITEM_PANEL.xml
new file mode 100644 (file)
index 0000000..8421aaf
--- /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_SETTING_PLAYLIST_SET_ITEM_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="112" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
+        <layout height="112" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
+    </Panel>\r
+    <Label id="IDC_LABEL_EX" parent="IDL_SETTING_PLAYLIST_SET_ITEM_PANEL">\r
+        <property backgroundBitmapPath="00_button_expand_closed.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="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="20" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="628" y="20"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_SETTING_PLAYLIST_SET_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="1182" y="20"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_LEFT_MARIN" parent="IDL_SETTING_PLAYLIST_SET_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="50" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="20" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_PLAYLIST_SET_ITEM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="20" x="0" y="0"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_BOTTON_MARIN" parent="IDL_SETTING_PLAYLIST_SET_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="#808080" 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_BOTTOM" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="700" x="20" y="108"/>\r
+        <layout bottomRelation="IDL_SETTING_PLAYLIST_SET_ITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_SETTING_PLAYLIST_SET_ITEM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1260" x="20" y="108"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_MAIN_TEXT" parent="IDL_SETTING_PLAYLIST_SET_ITEM_PANEL">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Playlist" textColor="" textSize="44" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="true" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="16" marginTop="0" mode="Portrait" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="592" x="20" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_LEFT_MARIN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="20" marginTop="0" mode="Landscape" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1142" x="20" y="0"/>\r
+    </Label>\r
+</ScenePanel>\r
index 1e691e0..cfae838 100644 (file)
@@ -43,8 +43,12 @@ static const int COUNT_MESSAGE_BOX_TIMEOUT = 3000;
 AlbumContentListForm::AlbumContentListForm(void)
        : ContentListForm::ContentListForm()
        , ThumbnailBase::ThumbnailBase()
+       , __pContentListTableView(null)
        , __pThumbnail(null)
        , __pPresentationModel(null)
+       , __checkedItemCount(0)
+       , __currentAlbumIndex(-1)
+       , __activatedStateContextItem(-1)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -57,10 +61,37 @@ AlbumContentListForm::~AlbumContentListForm(void)
 }
 
 result
+AlbumContentListForm::Initialize(void)
+{
+       AppLogDebug("ENTER");
+       if (IsFailed(Form::Construct(IDL_CONTENT_LIST_FORM)))
+       {
+               AppLogDebug("Construct(IDL_CONTENT_LIST_FORM) failed(%s)", GetErrorMessage(GetLastResult()));
+               return false;
+       }
+
+       AppLogDebug("EXIT");
+       return Construct();
+}
+
+result
+AlbumContentListForm::Construct(void)
+{
+       AppLogDebug("ENTER");
+       __pContentListTableView = static_cast<TableView*>(GetControl(IDC_TABLEVIEW_CONTENT_LIST));
+       __pContentListTableView->AddTableViewItemEventListener(*this);
+       __pContentListTableView->SetItemProvider(this);
+
+       SetContentList(__pContentListTableView);
+       AppLogDebug("EXIT");
+       return ContentListForm::Construct();
+}
+
+result
 AlbumContentListForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       SetContentListFooter();
+       SetFooter();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -69,9 +100,6 @@ result
 AlbumContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       delete __pContextItem;
-       __pContextItem = null;
-
        AppLogDebug("EXIT");
        return ContentListForm::OnTerminating();
 }
@@ -81,11 +109,33 @@ AlbumContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 {
        AppLogDebug("ENTER");
        SceneManager* pSceneManager = SceneManager::GetInstance();
-
        AppAssert(pSceneManager);
 
        switch (actionId)
        {
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
+               {       
+                       bool isChecked = true;
+                       if (__checkedItemCount == __pContentListTableView->GetItemCount())
+                       {
+                               isChecked = false;
+                       }
+                       SetItemCheckedAll(isChecked);
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_SHARE:
+               {
+                       LanucherPicker(PICKER_TYPE_SHARE_PICKER);
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
+               {
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER);
+               }
+               break;
+
        case IDA_FOOTER_BUTTON_MORE:
                {
                        CreateContextMenuN(source);
@@ -95,13 +145,13 @@ AlbumContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 
        case IDA_CONTEXT_MENU_ITEM_SHARE_VIA:
                {
-                       ToggleContentListScreenMode(CONTENT_LIST_SCREEN_MODE_SHARE_VIA);
+                       ToggleScreenState(SCREEN_STATE_SHARE_VIA);
                }
                break;
 
        case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
-                       ToggleContentListScreenMode(CONTENT_LIST_SCREEN_MODE_EDITOR);
+                       ToggleScreenState(SCREEN_STATE_EDITOR);
                }
                break;
 
@@ -114,9 +164,8 @@ AlbumContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
        case IDA_FOOTER_BUTTON_DELETE:
                {
                        RemoveCheckedTableviewItem(true);
-                       __pPresentationModel->RefreshContentList(__currentContentIndex);
-                       UpdateContentListScreenState();
-                       __pContentTableView->UpdateTableView();
+                       UpdateScreenState();
+                       UpdateTableView();
                }
                break;
 
@@ -124,7 +173,7 @@ AlbumContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                break;
        }
 
-       ContentListForm::OnActionPerformed(source, actionId);
+       TryRemoveContextMenu(actionId);
        AppLogDebug("EXIT");
 }
 
@@ -138,51 +187,46 @@ AlbumContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previo
        {
                __prevSceneId.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_SCENE_NAME)));
 //             String* pStrContentName = static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME));
-               __currentContentIndex = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
+               __currentAlbumIndex = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
 
                __pPresentationModel = AlbumListPresentationModel::GetInstance();
                __pPresentationModel->UpdateAlbumList();
-               __pPresentationModel->InitializeContentList(__currentContentIndex);
+               __pPresentationModel->InitializeContentList(__currentAlbumIndex);
 
-               __headerTitle.Format(255, __pPresentationModel->GetAlbumName(__currentContentIndex)->GetPointer());
+               __headerTitle.Format(255, __pPresentationModel->GetAlbumName(__currentAlbumIndex)->GetPointer());
 
-               ContentInformation* pContentInfoStruct = null;
-               pContentInfoStruct = __pPresentationModel->GetAlbumInfoN(__currentContentIndex);
-               if (pContentInfoStruct != null)
+               ContentInformation* pContentInfo = __pPresentationModel->GetAlbumInfoN(__currentAlbumIndex);
+               if (pContentInfo != null)
                {
                        Panel* pContentInfoPanel = new (std::nothrow) Panel();
                        pContentInfoPanel->Construct(IDL_ALBUM_INFO_PANEL);
 
-                       Label* pHeaderThumbnailLabel = static_cast<Label*>(pContentInfoPanel->GetControl(IDC_CONTENT_THUMBNAIL));
-                       pHeaderThumbnailLabel->SetBackgroundBitmap(*GetDefaultThumbnail());
-
-                       Label* pAlbumName = static_cast<Label*>(pContentInfoPanel->GetControl(IDC_CONTENTS_TITLE_NAME));
-                       pAlbumName->SetText(pContentInfoStruct->AlbumName);
-
-                       Label* pArtistName = static_cast<Label*>(pContentInfoPanel->GetControl(IDC_CONTENTS_ARTIST_NAME));
-                       pArtistName->SetText(pContentInfoStruct->ArtistName);
+                       static_cast<Label*>(pContentInfoPanel->GetControl(IDC_CONTENT_THUMBNAIL))->SetBackgroundBitmap(*GetDefaultThumbnail());
+                       static_cast<Label*>(pContentInfoPanel->GetControl(IDC_CONTENTS_TITLE_NAME))->SetText(pContentInfo->AlbumName);
+                       static_cast<Label*>(pContentInfoPanel->GetControl(IDC_CONTENTS_ARTIST_NAME))->SetText(pContentInfo->ArtistName);
 
                        String albumCount = null;
-                       albumCount.Format(255, L"%d songs", __pPresentationModel->GetContentCount(__currentContentIndex));
-                       Label* pAlbumCount = static_cast<Label*>(pContentInfoPanel->GetControl(IDC_PLAY_CONTENT_COUNT));
-                       pAlbumCount->SetText(albumCount);
+                       albumCount.Format(255, L"%d songs", __pPresentationModel->GetContentCount(__currentAlbumIndex));
+                        static_cast<Label*>(pContentInfoPanel->GetControl(IDC_PLAY_CONTENT_COUNT))->SetText(albumCount);
 
-                       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) String(IDC_CONTENT_THUMBNAIL)));
-                       SetAdditionalInforamtion(*pContentInfoPanel);
+                       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) String(IDC_CONTENT_THUMBNAIL)));
+                       SetExtraInformaionArea(*pContentInfoPanel);
 
-                       delete pContentInfoStruct;
-                       pContentInfoStruct = null;
+                       delete pContentInfo;
+                       pContentInfo = null;
                }
+
                pArgs->RemoveAll(true);
                delete pArgs;
+
+               SetHeader();
+               UpdateScreenState();
+               UpdateTableView();
        }
        else
        {
-               // Empty statement
+               UpdateScreenState();
        }
-       SetContentListHeader();
-       ContentListForm::OnSceneActivatedN(previousSceneId, currentSceneId, null);
-       __pContentTableView->UpdateTableView();
        AppLogDebug("EXIT");
 }
 
@@ -200,9 +244,49 @@ AlbumContentListForm::GetItemCount(void)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-       return __pPresentationModel->GetContentCount(__currentContentIndex);
+       return __pPresentationModel->GetContentCount(__currentAlbumIndex);
+}
+
+void
+AlbumContentListForm::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex,
+                                                                               Tizen::Ui::Controls::TableViewContextItem* pContextItem,
+                                                                               bool activated)
+{
+       AppLogDebug("ENTER");
+       if (itemIndex >= 0)
+       {
+               AppLogDebug("INDEX %d", itemIndex);
+               __activatedStateContextItem = itemIndex;
+       }
+       AppLogDebug("EXIT");
+}
+
+int
+AlbumContentListForm::GetDefaultItemHeight(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return ITEM_HEIGHT;
+}
+
+bool
+AlbumContentListForm::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return true;
 }
 
+void
+AlbumContentListForm::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
+                                                       int itemIndexFrom,
+                                                       int itemIndexTo)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+
 Tizen::Ui::Controls::TableViewItem*
 AlbumContentListForm::CreateItem(const int itemIndex, int itemWidth)
 {
@@ -212,7 +296,7 @@ AlbumContentListForm::CreateItem(const int itemIndex, int itemWidth)
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
        TableViewAnnexStyle tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_MARK;
        }
@@ -237,13 +321,37 @@ AlbumContentListForm::CreateItem(const int itemIndex, int itemWidth)
 }
 
 void
+AlbumContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+void
 AlbumContentListForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
                                                        int itemIndex,
                                                        Tizen::Ui::Controls::TableViewItem* pItem,
                                                        Tizen::Ui::Controls::TableViewItemStatus status)
 {
        AppLogDebug("ENTER");
-       ContentListForm::OnTableViewItemStateChanged(tableView, itemIndex, pItem, status);
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
+       {
+               SetItemCheckedStateChanged(status);
+               AppLogDebug("EXIT");
+               return;
+       }
+
+       if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
+       {
+               SceneManager* pSceneManager = SceneManager::GetInstance();
+               AppAssert(pSceneManager);
+
+               ArrayList* pSceneArg = MakePlayerSceneParam(itemIndex);
+               if (pSceneArg != null)
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pSceneArg);
+               }
+       }
        AppLogDebug("EXIT");
 }
 
@@ -254,7 +362,7 @@ AlbumContentListForm::MakePlayerSceneParam(int startIndex)
        ArrayList* pTempList = new (std::nothrow) ArrayList();
        ArrayList* pSelectedMusicContent = null;
 
-       pSelectedMusicContent = __pPresentationModel->GetContentPathListN(__currentContentIndex);
+       pSelectedMusicContent = __pPresentationModel->GetContentPathListN(__currentAlbumIndex);
        if (pTempList == null || pSelectedMusicContent == null)
        {
                AppLogDebug("EXIT");
@@ -274,7 +382,7 @@ bool
 AlbumContentListForm::IsEmptyContentList(void)
 {
        AppLogDebug("ENTER");
-       if (__pPresentationModel->GetContentCount(__currentContentIndex) != INIT_VALUE)
+       if (__pPresentationModel->GetContentCount(__currentAlbumIndex) != INIT_VALUE)
        {
                return false;
        }
@@ -282,16 +390,8 @@ AlbumContentListForm::IsEmptyContentList(void)
        return true;
 }
 
-ContentInformation*
-AlbumContentListForm::GetContentInformation(int index)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return __pPresentationModel->GetContentInfoN(index);
-}
-
 result
-AlbumContentListForm::SetContentListHeader(void)
+AlbumContentListForm::SetHeader(void)
 {
        AppLogDebug("ENTER");
        CommonUtil::SetSimpleTitleStyle(*GetHeader(), __headerTitle);
@@ -300,7 +400,7 @@ AlbumContentListForm::SetContentListHeader(void)
 }
 
 result
-AlbumContentListForm::SetContentListFooter(void)
+AlbumContentListForm::SetFooter(void)
 {
        AppLogDebug("ENTER");
        CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_MORE_ADD);
@@ -314,7 +414,7 @@ AlbumContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& pa
        AppLogDebug("ENTER");
        Panel* pTableViewItem =  new (std::nothrow) Panel();
 
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                if (IsFailed(pTableViewItem->Construct(IDL_ALBUM_CONTENT_EDIT_ITEM_PANEL)))
                {
@@ -355,6 +455,7 @@ AlbumContentListForm::OnAppControlCompleteResponseReceived(const AppId& appId,
                AppLogDebug("EXIT");
                return;
        }
+
        AppLogDebug("%ls, %ls", appId.GetPointer(), operationId.GetPointer());
        if (appId.Equals(String(PROVIDER_ID_CONTACT)))
        {
@@ -369,7 +470,7 @@ AlbumContentListForm::OnAppControlCompleteResponseReceived(const AppId& appId,
                        AddressbookManager* pAddressbookManager = AddressbookManager::GetInstance();
                        Addressbook* pAddressbook = pAddressbookManager->GetAddressbookN(DEFAULT_ADDRESSBOOK_ID);
 
-                       ContentInformation* pCcontentInfo = __pPresentationModel->GetContentInfoN(GetActivatedContextItem());
+                       ContentInformation* pCcontentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
                        if (pCcontentInfo == null)
                        {
                                delete pAddressbook;
@@ -408,7 +509,7 @@ void
 AlbumContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       Panel* pItemPanel = static_cast<Panel*>(GetRegisteredAdditionalInforamtionControl());
+       Panel* pItemPanel = static_cast<Panel*>(GetExtraInformaionAreaControl());
 
        if (pItemPanel == null)
        {
@@ -451,10 +552,10 @@ AlbumContentListForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Col
 }
 
 void
-AlbumContentListForm::RefreshAdditionalInformationRegisterBar(void)
+AlbumContentListForm::UpdateExtraInformaionArea(void)
 {
        AppLogDebug("ENTER");
-       Panel* pItemPanel = static_cast<Panel*>(GetRegisteredAdditionalInforamtionControl());
+       Panel* pItemPanel = static_cast<Panel*>(GetExtraInformaionAreaControl());
 
        if (pItemPanel == null)
        {
@@ -463,10 +564,151 @@ AlbumContentListForm::RefreshAdditionalInformationRegisterBar(void)
        }
 
        String albumCount = null;
-       albumCount.Format(255, L"%d songs", __pPresentationModel->GetContentCount(__currentContentIndex));
+       albumCount.Format(255, L"%d songs", __pPresentationModel->GetContentCount(__currentAlbumIndex));
        Label* pAlbumCount = static_cast<Label*>(pItemPanel->GetControl(IDC_PLAY_CONTENT_COUNT));
        pAlbumCount->SetText(albumCount);
 
        pAlbumCount->Invalidate(true);
        AppLogDebug("EXIT");
 }
+
+void
+AlbumContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
+{
+       AppLogDebug("ENTER");
+       if (itemRemove)
+       {
+               int totalCount = __pContentListTableView->GetItemCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentListTableView->IsItemChecked(iCount) == true)
+                       {
+                               __pContentListTableView->SetItemChecked(iCount, false);
+                               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(iCount);
+                               RemoveContentAt(pContentInfo->contentId);
+                               delete pContentInfo;
+                       }
+               }
+               __pPresentationModel->RefreshContentList(__currentAlbumIndex);
+       }
+       __checkedItemCount = INIT_VALUE;
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+       AppLogDebug("EXIT");
+}
+
+void
+AlbumContentListForm::UpdateTableView(void)
+{
+       AppLogDebug("ENTER");
+       __pContentListTableView->UpdateTableView();
+       AppLogDebug("EXIT");
+}
+
+void
+AlbumContentListForm::SetItemCheckedAll(bool isChecked)
+{
+       AppLogDebug("ENTER");
+       if (isChecked == true)
+       {
+               __checkedItemCount =  __pContentListTableView->GetItemCount();
+       }
+       else
+       {
+               __checkedItemCount = INIT_VALUE;
+       }
+       CommonUtil::SetItemCheckedAll(isChecked, *__pContentListTableView);
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       AppLogDebug("EXIT");
+}
+
+void
+AlbumContentListForm::SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewItemStatus status)
+{
+       AppLogDebug("ENTER");
+       if (status == TABLE_VIEW_ITEM_STATUS_UNCHECKED)
+       {
+               __checkedItemCount--;
+               if (__checkedItemCount == INIT_VALUE)
+               {
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+               }
+       }
+       else if (status == TABLE_VIEW_ITEM_STATUS_CHECKED)
+       {
+               if (__checkedItemCount == INIT_VALUE)
+               {
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), true);
+               }
+
+               __checkedItemCount++;
+       }
+
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       AppLogDebug("EXIT");
+}
+
+int
+AlbumContentListForm::GetCheckedItemCount(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __checkedItemCount;
+}
+
+Tizen::Base::Collection::IList*
+AlbumContentListForm::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)
+{
+       AppLogDebug("ENTER");
+       Tizen::Base::Collection::ArrayList* pContentFilePathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       if (IsFailed(pContentFilePathList->Construct()))
+       {
+               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(GetLastResult()));
+               delete pContentFilePathList;
+               return null;
+       }
+
+       if (argumentType == PICKER_ARGUMENT_TYPE_ACTIVATED_STATE_CONTEXT_ITEM)
+       {
+               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
+               if (pContentInfo == null)
+               {
+                       delete pContentFilePathList;
+                       AppLogDebug("GetContentInfoN(%d) is null", __activatedStateContextItem);
+                       return null;
+               }
+
+               pContentFilePathList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
+               delete pContentInfo;
+       }
+       else if (argumentType == PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL)
+       {
+               int totalCount = __pContentListTableView->GetItemCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentListTableView->IsItemChecked(iCount) == true)
+                       {
+                               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(iCount);
+                               if (pContentInfo == null)
+                               {
+                                       AppLogDebug("GetContentInfoN(%d) is null", iCount);
+                                       delete pContentFilePathList;
+                                       return null;
+                               }
+
+                               if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER)
+                               {
+                                       pContentFilePathList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
+                               }
+                               else if (pickerType == PICKER_TYPE_SHARE_PICKER)
+                               {
+                                       pContentFilePathList->Add(*(new (std::nothrow) String(L"attachment:" + pContentInfo->ContentFilePath)));
+                               }
+                               delete pContentInfo;
+                       }
+               }
+       }
+       AppLogDebug("EXIT");
+       return pContentFilePathList;
+}
\ No newline at end of file
index ff8a488..cf3a1df 100644 (file)
@@ -86,7 +86,7 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 
        switch (actionId)
        {
-       case IDA_HEADER_ALL_CHECK_BUTTON:
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
                {
                        if (totalCount == __checkedItemCount)
                        {
@@ -367,7 +367,7 @@ AlbumListEditorPanel::SetEditHeaderStyle(void)
        RemoveParentHeaderActionEventListener();
        Header* pHeader = GetParentHeader();
        String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        pHeader->AddActionEventListener(*this);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
index b4d691f..12a1247 100644 (file)
@@ -30,9 +30,10 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
+static const int INDEX_ALL_SONG_TAB = 0;
+static const int INDEX_PLAY_LIST_TAB = 1;
+
 AllContentPickerPanel::AllContentPickerPanel(void)
-       : __pNoContentImageLabel(null)
-       , __pNoContentTextLabel(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -51,33 +52,33 @@ AllContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
+       Form* pForm = dynamic_cast<Form*>(GetParent());
+       AppAssert(pForm);
+
+       Footer* pFooter = pForm->GetFooter();
        int totalCount = __pPresentationModel->GetTotalCount();
 
        switch (actionId)
        {
-       case IDA_CHECK_BUTTON:
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
                {
+                       if (totalCount == __checkedItemCount)
+                       {
+                               __checkedItemCount = INIT_VALUE;
+                               CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
+                               SetCheckedCountBalloonPopup(__checkedItemCount);
+                               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);
-                       CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
+                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
 
-       case 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);
-                       CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
-               }
-               break;
-
-       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
+       case IDA_FOOTER_BUTTON_ADD:
                {
                        if (__checkedItemCount <= INIT_VALUE)
                        {
@@ -93,38 +94,14 @@ AllContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                                        __pContentTableView->SetItemChecked(iCount, false);
                                }
                        }
-                       Form* pForm = dynamic_cast<Form*>(GetParent());
-                       AppAssert(pForm);
-                       CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
-
                        __checkedItemCount = INIT_VALUE;
-                       //CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *pForm);
-                       //CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
                        CommonUtil::SetAddtoPlaylistState(false);
-
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYLIST_LIST,
-                                                                                                               SCENE_TRANSITION_ANIMATION_TYPE_NONE,
-                                                                                                               SCENE_HISTORY_OPTION_NO_HISTORY,
-                                                                                                               SCENE_DESTROY_OPTION_DESTROY));
-
+                       SetTabHeaderStyle();
+                       pSceneManager->GoBackward(BackwardSceneTransition());
                        Invalidate(true);
                }
                break;
 
-       case IDA_FOOTER_BUTTON_CANCEL:
-               {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYLIST_LIST,
-                                                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE,
-                                                                       SCENE_HISTORY_OPTION_NO_HISTORY,
-                                                                       SCENE_DESTROY_OPTION_DESTROY));
-                       CommonUtil::SetAddtoPlaylistState(false);
-                       Form* pForm = dynamic_cast<Form*>(GetParent());
-                       AppAssert(pForm);
-
-                       CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount, actionId);
-               }
-               break;
-
        default:
                break;
        }
@@ -139,57 +116,29 @@ AllContentPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        AppLogDebug("ENTER");
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
+       pForm->GetHeader()->SetItemSelected(INDEX_ALL_SONG_TAB);
 
-       pForm->GetHeader()->SetItemSelected(0);
+       pForm->SetFormBackEventListener(this);
 
-       Footer* pFooter = CommonUtil::CreateAddtoPlaylistPickerFooter(*pForm);
+       Footer* pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_ADD_ADD);
        pFooter->AddActionEventListener(*this);
-       __pPresentationModel->UpdateContentList();
-       CommonUtil::SetButtonEnabled(*pForm, __checkedItemCount);
+       pFooter->SetShowState(true);
+       CommonUtil::SetFooterItemEnabled(*pFooter, false);
 
-       if (__pNoContentImageLabel == null && __pNoContentTextLabel == null)
-       {
-               __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(IDB_NO_CONTENTS)));
-
-               __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);
-
-               AddControl(*__pNoContentImageLabel);
-               AddControl(*__pNoContentTextLabel);
-       }
+       SetAddHeaderStyle();
+       UpdateContentList();
+       SetCheckedCountBalloonPopup(INIT_VALUE);
 
-       if (__pPresentationModel->GetTotalCount() == 0)
+       if (__pPresentationModel->GetTotalCount() != INIT_VALUE)
        {
-               pFooter->SetItemEnabled(ADD_TO_PLAYLIST_BUTTON_ID, false);
-
-               if ( __pNoContentImageLabel != null && __pNoContentTextLabel != null)
-               {
-                       __pNoContentImageLabel->SetShowState(true);
-                       __pNoContentTextLabel->SetShowState(true);
-               }
-               __pContentTableView->SetShowState(false);
-               //__pSelectAllCheckedButton->SetShowState(false);
+               SetNoContentSongs(false);
        }
        else
        {
-               if ( __pNoContentImageLabel != null && __pNoContentTextLabel != null)
-               {
-                       __pNoContentImageLabel->SetShowState(false);
-                       __pNoContentTextLabel->SetShowState(false);
-               }
-               __pContentTableView->SetShowState(true);
-               //__pSelectAllCheckedButton->SetShowState(true);
+               SetNoContentSongs(true);
+               SetDisableIconAllCheckButton();
        }
 
-       Invalidate(true);
-
        if (pArgs != null)
        {
                pArgs->RemoveAll(true);
@@ -205,10 +154,25 @@ AllContentPickerPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
        AppLogDebug("ENTER");
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
+       pForm->GetHeader()->SetItemSelected(INDEX_PLAY_LIST_TAB);
 
        Footer* pFooter = pForm->GetFooter();
        pFooter->RemoveAllButtons();
        pFooter->RemoveAllItems();
        pFooter->RemoveActionEventListener(*this);
        AppLogDebug("EXIT");
+}
+
+void
+AllContentPickerPanel::SetAddHeaderStyle(void)
+{
+       AppLogDebug("ENTER");
+       RemoveParentHeaderActionEventListener();
+       Header* pHeader = GetParentHeader();
+       String titleText(ResourceManager::GetString(L"IDS_MUSIC_TAB4_ALL"));
+       CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
+
+       pHeader->AddActionEventListener(*this);
+       pHeader->Invalidate(true);
+       AppLogDebug("EXIT");
 }
\ No newline at end of file
index 62826c7..7ec3fd9 100644 (file)
@@ -88,6 +88,7 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
 {
        AppLogDebug("ENTER");
        Form* pForm = dynamic_cast<Form*>(GetParent());
+       AppAssert(pForm);
        Footer* pFooter = pForm->GetFooter();
        if (__pPresentationModel == null)
        {
@@ -98,7 +99,7 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
 
        switch (actionId)
        {
-       case IDA_HEADER_ALL_CHECK_BUTTON:
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
                {
                        if (totalCount == __checkedItemCount)
                        {
@@ -445,12 +446,12 @@ AllListEditorPanel::SetEditHeaderStyle(void)
        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);
+               CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        }
        else
        {
                String titleText(L"Share via");//NEED STRING
-               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+               CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        }
 
        pHeader->AddActionEventListener(*this);
@@ -564,9 +565,17 @@ AllListEditorPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        AppLogDebug("ENTER");
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
-
-       SetTabHeaderStyle();
-       pSceneManager->GoBackward(BackwardSceneTransition());
+       if (CommonUtil::GetAddtoPlaylistState())
+       {
+               CommonUtil::SetAddtoPlaylistState(false);
+               SetTabHeaderStyle();
+               pSceneManager->GoBackward(BackwardSceneTransition());
+       }
+       else
+       {
+               SetTabHeaderStyle();
+               pSceneManager->GoBackward(BackwardSceneTransition());
+       }
        AppLogDebug("EXIT");
 }
 
index f8e3154..d5d5c9b 100644 (file)
@@ -798,4 +798,4 @@ AllListPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pIte
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file
index 01a83b4..29a20b3 100644 (file)
 
 #include "MpAllListPresentationModel.h"
 
+using namespace Tizen::App;
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
+using namespace Tizen::Base::Runtime;
 using namespace Tizen::Content;
 using namespace Tizen::Graphics;
 using namespace Tizen::Social;
@@ -32,6 +34,7 @@ AllListPresentationModel* AllListPresentationModel::pAllListPresentationModelIns
 
 AllListPresentationModel::AllListPresentationModel(void)
        : __pContentList(null)
+       , __pAutoOffTimer(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -40,6 +43,12 @@ AllListPresentationModel::AllListPresentationModel(void)
 AllListPresentationModel::~AllListPresentationModel(void)
 {
        AppLogDebug("ENTER");
+       if (__pAutoOffTimer != null)
+       {
+               __pAutoOffTimer->Cancel();
+               delete __pAutoOffTimer;
+               __pAutoOffTimer = null;
+       }
        AppLogDebug("EXIT");
 }
 
@@ -48,8 +57,22 @@ AllListPresentationModel::Construct(void)
 {
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
+
+       __pAutoOffTimer = new (std::nothrow) Timer();
+       r = __pAutoOffTimer->Construct(*this);
+       TryCatch(r == E_SUCCESS, r = E_OUT_OF_MEMORY, "Unable to construct __pAutoOffTimer.\n");
+
        AppLogDebug("EXIT");
        return r;
+
+CATCH:
+       if (__pAutoOffTimer != null)
+       {
+               __pAutoOffTimer->Cancel();
+               delete __pAutoOffTimer;
+               __pAutoOffTimer = null;
+       }
+       return r;
 }
 
 AllListPresentationModel*
@@ -227,4 +250,44 @@ AllListPresentationModel::UpdateContentList(void)
 
 CATCH:
        return r;
+}
+
+void
+AllListPresentationModel::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
+{
+       AppLogDebug("ENTER");
+       if (__pAutoOffTimer == &timer)
+       {
+               Application::GetInstance()->Terminate();
+       }
+       AppLogDebug("EXIT");
+}
+
+result
+AllListPresentationModel::StartAutoOffTimer(int autoOffValue)
+{
+       AppLogDebug("ENTER");
+       result r = E_SUCCESS;
+       if (__pAutoOffTimer != null)
+       {
+               if (autoOffValue == 0)
+               {
+                       r = __pAutoOffTimer->Cancel();
+                       AppLogDebug("%s", GetErrorMessage(r));
+               }
+               else
+               {
+                       __pAutoOffTimer->Cancel();
+                       r = __pAutoOffTimer->Start(autoOffValue);
+                       AppLogDebug("%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS, r = E_OUT_OF_MEMORY, "Unable to Start __pAutoOffTimer.\n");
+               }
+               AppLogDebug("EXIT");
+               return r;
+       }
+       AppLogDebug("EXIT");
+       return r;
+
+CATCH:
+       return r;
 }
\ No newline at end of file
index c8926d4..65d7711 100644 (file)
@@ -22,6 +22,7 @@
 #include <FSocial.h>
 #include "MpArtistContentListForm.h"
 #include "MpArtistListPresentationModel.h"
+#include "MpMusicPlayerApp.h"
 #include "MpPlaylistPickerPopup.h"
 #include "MpSharePopup.h"
 #include "MpThumbnailInfo.h"
@@ -38,18 +39,19 @@ using namespace Tizen::Io;
 using namespace Tizen::System;
 using namespace Tizen::Social;
 
-static const Tizen::Graphics::Rectangle RECT_CONTENT_NAME (16, 16, 500, 88);
-static const Tizen::Graphics::Rectangle RECT_CONTENT_PLAY_TIME (516, 16, 188, 88);
-
-static const int X_OFFSET_EDIT_STYLE_TABLE_VIEW = 96;
 static const int COUNT_MESSAGE_BOX_TIMEOUT = 3000;
 
-#if 0
 #define ALL_SONG_INDEX_COUNT_PLUS(n) (n + 1)
 #define ALL_SONG_INDEX_COUNT_MINUS(n) (n - 1)
 
 ArtistContentListForm::ArtistContentListForm(void)
        : ContentListForm::ContentListForm()
+       , ThumbnailBase::ThumbnailBase()
+       , __pContentGroupedTableView(null)
+       , __pTableViewContextItem(null)
+       , __pCheckedItemCountMultiHashMap(null)
+       , __pThumbnail(null)
+       , __activatedStateContextItem(0)
        , __pPresentationModel(null)
 {
        AppLogDebug("ENTER");
@@ -63,25 +65,64 @@ ArtistContentListForm::~ArtistContentListForm(void)
 }
 
 result
+ArtistContentListForm::Initialize(void)
+{
+       AppLogDebug("ENTER");
+       if (IsFailed(Form::Construct(IDL_CONTENT_LIST_ARTIST_FORM)))
+       {
+               AppLogDebug("Form::Construct(IDL_CONTENT_LIST_ARTIST_FORM) failed(%s)", GetErrorMessage(GetLastResult()));
+               return GetLastResult();
+       }
+
+       AppLogDebug("EXIT");
+       return Construct();
+}
+
+result
+ArtistContentListForm::Construct(void)
+{
+       AppLogDebug("ENTER");
+       __pContentGroupedTableView = static_cast<GroupedTableView*>(GetControl(IDC_GROUPEDTABLEVIEW_CONTENT_LIST));
+       __pContentGroupedTableView->AddGroupedTableViewItemEventListener(*this);
+       __pContentGroupedTableView->SetItemProvider(this);
+
+       SetContentList(__pContentGroupedTableView);
+
+       result r = InitCheckedItemMultiHashMap();
+       if (IsFailed(r))
+       {
+               AppLogDebug("InitCheckedItemMultiHashMap failed(%s)", GetErrorMessage(r));
+               return r;
+       }
+
+       AppLogDebug("EXIT");
+       return ContentListForm::Construct();
+}
+
+result
 ArtistContentListForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       CreateTableview();
-       CreateSelectAllCheckedButton();
-       CreateCheckedCountLabel();
-       CreateNoContentImage(L"IDS_MUSIC_HEADER_NO_SONGS");
+       SetFooter();
+       __pPresentationModel = ArtistListPresentationModel::GetInstance();
+       __pTableViewContextItem = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_01);
        AppLogDebug("EXIT");
-       return E_SUCCESS;
+       return ThumbnailBase::Construct();
 }
 
 result
 ArtistContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       __checkedItemCount = 0;
-       DestroyPlayListPickerPopup();
+       RemoveCheckedItemMultiHashMap();
+
+       delete __pTableViewContextItem;
+       __pTableViewContextItem = null;
+
+       __pContentGroupedTableView = null;
+       __pPresentationModel = null;
        AppLogDebug("EXIT");
-       return E_SUCCESS;
+       return ContentListForm::OnTerminating();
 }
 
 void
@@ -92,44 +133,19 @@ ArtistContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        AppLogDebug("ENTER");
        if (pArgs != null)
        {
-               __pStrSceneId = static_cast<String*>(pArgs->GetAt(DATA_ITEM_SCENE_NAME));
-               __pStrContentName = static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME));
-               __currentContentIndex = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
-               __pPresentationModel = ArtistListPresentationModel::GetInstance();
+               __prevSceneId.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_SCENE_NAME)));
+               __headerTitle.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME)));
                __pPresentationModel->UpdateArtistList();
-               __pPresentationModel->InitializeContentList(__currentContentIndex);
-       }
-       else
-       {
-               // Empty statement
-       }
-
-       ContentInformation* pContentInfoStruct = null;
-       pContentInfoStruct = __pPresentationModel->GetArtistAlbumContentInfoN(0);
-       if (pContentInfoStruct == null)
-       {
-               return;
-       }
+               __pPresentationModel->InitializeArtistAlbumList(__headerTitle);
+               __pPresentationModel->InitializeContentList(INIT_VALUE);
 
-       InitializeHeader(*pContentInfoStruct);
+               SetHeader();
+               UpdateScreenState();
+               UpdateTableView();
 
-       if (__checkEdit == true)
-       {
-               Footer* pFooter = CommonUtil::CreateDeleteFooter(*this);
-               pFooter->AddActionEventListener(*this);
-       }
-       else
-       {
-               Footer* pFooter = CommonUtil::CreateEditFooter(*this);
-               pFooter->AddActionEventListener(*this);
-               pFooter->SetBackButton();
-               SetFormBackEventListener(this);
+               pArgs->RemoveAll(true);
+               delete pArgs;
        }
-
-       __pContentTableView->UpdateTableView();
-
-       delete pContentInfoStruct;
-       pContentInfoStruct = null;
        AppLogDebug("EXIT");
 }
 
@@ -138,10 +154,7 @@ ArtistContentListForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
-       Footer* pFooter = GetFooter();
-       pFooter->RemoveAllButtons();
-       pFooter->RemoveAllItems();
-       pFooter->RemoveActionEventListener(*this);
+       CancelAllThumbnailRequest();
        AppLogDebug("EXIT");
 }
 
@@ -150,358 +163,548 @@ ArtistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
 {
        AppLogDebug("ENTER");
        SceneManager* pSceneManager = SceneManager::GetInstance();
-
        AppAssert(pSceneManager);
 
        switch (actionId)
        {
-       case IDA_FOOTER_BUTTON_EDIT:
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
                {
-                       ToggleViewMode(true);
+                       bool isChecked = true;
+                       if (GetCheckedItemCount() == GetTotalItemCount())
+                       {
+                               isChecked = false;
+                       }
+                       SetItemCheckedAll(isChecked);
                }
                break;
 
-       case IDA_FOOTER_BUTTON_CANCEL:
+       case IDA_FOOTER_BUTTON_SHARE:
                {
-                       __checkedItemCount = INIT_VALUE;
-                       __pSelectAllCheckedButton->SetSelected(false);
-                       CommonUtil::SetAllCheckState(false, *__pContentTableView, __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex()));
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *this);
-                       ToggleViewMode(false);
+                       LanucherPicker(PICKER_TYPE_SHARE_PICKER);
                }
                break;
 
-       case IDA_FOOTER_BUTTON_SEARCH:
+       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER);
                }
                break;
 
-       case IDA_CHECK_BUTTON:
+       case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       __checkedItemCount = __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex());
-                       if (__checkedItemCount > INIT_VALUE)
-                       {
-                               Footer* pFooter = GetFooter();
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+               }
+               break;
 
-                               pFooter->SetItemEnabled(INDEX_FOOTER_DELETE, true);
-                               pFooter->SetItemEnabled(INDEX_FOOTER_SHARE, true);
-                               pFooter->SetItemEnabled(INDEX_FOOTER_ADDTOPLATLIST, true);
+       case IDA_CONTEXT_MENU_ITEM_EDIT:
+               {
+                       ToggleScreenState(SCREEN_STATE_EDITOR);
+               }
+               break;
 
-                               pFooter->Invalidate(true);
-                       }
-                       CommonUtil::SetAllCheckState(true, *__pContentTableView, __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex()));
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *this);
+       case IDA_CONTEXT_MENU_ITEM_SHARE_VIA:
+               {
+                       ToggleScreenState(SCREEN_STATE_SHARE_VIA);
                }
                break;
 
-       case IDA_UNCHECK_BUTTON:
+       case IDA_FOOTER_BUTTON_MORE:
                {
-                       Footer* pFooter = GetFooter();
+                       CreateContextMenuN(source);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, Point(X_MORE_POPUP, Y_MORE_POPUP));
+               }
+               break;
 
-                       pFooter->SetItemEnabled(INDEX_FOOTER_DELETE, false);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_SHARE, false);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_ADDTOPLATLIST, false);
+       case IDA_FLICK_MENU_ITEM_ADDTO:
+               {
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER, PICKER_ARGUMENT_TYPE_ACTIVATED_STATE_CONTEXT_ITEM);
+               }
+               break;
 
-                       pFooter->Invalidate(true);
+       case IDA_FLICK_MENU_ITEM_SHARE:
+               {
+                       CreateContextMenuN(source);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_EMAIL);
+               }
+               break;
 
-                       __checkedItemCount = INIT_VALUE;
-                       CommonUtil::SetAllCheckState(false, *__pContentTableView, __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex()));
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *this);
+       case IDA_FLICK_MENU_ITEM_SET_AS:
+               {
+                       CreateContextMenuN(source);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_CALL | CONTEXT_MENU_ITEM_STYLE_CALLER);
                }
                break;
 
-       case IDA_FOOTER_BUTTON_DELETE:
+       case IDA_FLICK_MENU_ITEM_DELETE:
                {
-                       ContentManager contentManager;
-                       Footer* pFooter = GetFooter();
-                       int totalCount = __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex());
-                       int iCount = 0;
+                       SetCommonPopup(CommonUtil::CreateContentDeletePopup(*this, IDA_COMMON_POPUP_DELETE, IDA_COMMON_POPUP_CANCEL));
+               }
+               break;
 
-                       if (__checkedItemCount <= INIT_VALUE)
+       case IDA_COMMON_POPUP_DELETE:
+               {
+                       ContentInformation* pContentInfo = GetContentInformationActivatedStateContextItem();
+                       if (pContentInfo != null)
                        {
-                               return;
-                       }
+                               RemoveContentAt(pContentInfo->contentId);
+                               __pPresentationModel->InitializeArtistAlbumList(__headerTitle);
 
-                       pFooter->SetItemEnabled(INDEX_FOOTER_DELETE, false);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_SHARE, false);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_ADDTOPLATLIST, false);
-                       pFooter->Invalidate(true);
-
-                       contentManager.Construct();
-                       for (iCount = 0; iCount < totalCount; iCount++)
-                       {
-                               if (__pContentTableView->IsItemChecked(iCount) == true)
-                               {
-                                       __pContentTableView->SetItemChecked(iCount, false);
-                                       ContentInformation* pContentInfoStruct = __pPresentationModel->GetArtistAlbumContentInfoN(iCount);
-                                       contentManager.DeleteContent(pContentInfoStruct->contentId);
-
-                                       delete pContentInfoStruct;
-                                       pContentInfoStruct = null;
-                               }
+                               SetItemCheckedAll(false);
+                               __pContentGroupedTableView->RefreshItem(__activatedStateContextItem.__groupIndex, __activatedStateContextItem.__itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);;
                        }
-                       __pPresentationModel->RefreshContentList(__currentContentIndex);
-                       __pContentTableView->UpdateTableView();
-                       __pContentTableView->Invalidate(true);
-                       __checkedItemCount = INIT_VALUE;
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *this);
-                       if (__pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex()) > 0)
-                       {
-                               CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
-                       }
-                       else
+               }
+               break;
+
+       case IDA_CONTEXT_MENU_ITEM_EMAIL:
+               {
+                       ContentInformation* pContentInfo = GetContentInformationActivatedStateContextItem();
+                       if (pContentInfo != null)
                        {
-                               __pSelectAllCheckedButton->SetEnabled(false);
-                               __pSelectAllCheckedButton->SetShowState(false);
-                               CommonUtil::ShowNoContentImage(INIT_VALUE, *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
+                               EventHandlerContextMenuItemMessageEmail(*pContentInfo, PROVIDER_ID_EMAIL);
+                               delete pContentInfo;
                        }
                }
                break;
 
-       case IDA_FOOTER_BUTTON_SHARE:
+       case IDA_CONTEXT_MENU_ITEM_MESSAGE:
                {
-                       Tizen::Base::Collection::ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       Footer* pFooter = GetFooter();
-                       int totalCount = __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex());
-
-                       pDataList->Construct();
-
-                       for (int iCount = 0; iCount < totalCount; iCount++)
+                       ContentInformation* pContentInfo = GetContentInformationActivatedStateContextItem();
+                       if (pContentInfo != null)
                        {
-                               if (__pContentTableView->IsItemChecked(iCount) == true)
-                               {
-                                       ContentInformation* pContentInfoStruct = __pPresentationModel->GetArtistAlbumContentInfoN(iCount);
-                                       if (pContentInfoStruct == null)
-                                       {
-                                               pDataList->RemoveAll(true);
-                                               delete pDataList;
-                                               pDataList = null;
-                                               return;
-                                       }
-                                       pDataList->Add(*(new (std::nothrow) String(L"attachment:" + pContentInfoStruct->ContentFilePath)));
-
-                                       __pContentTableView->SetItemChecked(iCount, false);
-
-                                       delete pContentInfoStruct;
-                                       pContentInfoStruct = null;
-                               }
+                               EventHandlerContextMenuItemMessageEmail(*pContentInfo, PROVIDER_ID_MESSAGE);
+                               delete pContentInfo;
                        }
-                       pFooter->SetItemEnabled(INDEX_FOOTER_DELETE, false);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_SHARE, false);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_ADDTOPLATLIST, false);
 
-                       __checkedItemCount = INIT_VALUE;
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *this);
-                       CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
+                       SetItemCheckedAll(false);
+               }
+               break;
 
-                       Invalidate(true);
-                       if (__pSharePopup == null)
+       case IDA_CONTEXT_MENU_ITEM_CALL:
+               {
+                       ContentInformation* pContentInfo =  GetContentInformationActivatedStateContextItem();
+                       if (pContentInfo != null)
                        {
-                               __pSharePopup = new (std::nothrow) SharePopup();
-                               __pSharePopup->Initialize();
+                               EventHandlerContextMenuItemCall(*pContentInfo);
+                               delete pContentInfo;
                        }
-                       __pSharePopup->SetShowState(true);
-                       __pSharePopup->Show();
-                       __pSharePopup->SetArguments(pDataList);
                }
                break;
 
-       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
+       case IDA_CONTEXT_MENU_ITEM_CALLER:
                {
-                       ContentManager contentManager;
-                       Footer* pFooter = GetFooter();
-                       Tizen::Base::Collection::ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       int totalCount = 0;
+                       EventHandlerContextMenuItemCaller();
+               }
+               break;
 
-                       if (__checkedItemCount <= 0)
-                       {
-                               return;
-                       }
+       case IDA_FOOTER_BUTTON_DELETE:
+               {
+                       RemoveConentCheckedAll();
+                       __pPresentationModel->InitializeArtistAlbumList(__headerTitle);
 
-                       pDataList->Construct();
-                       contentManager.Construct();
-                       totalCount = __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex());
+                       SetItemCheckedAll(false);
+                       UpdateScreenState();
+                       UpdateTableView();
+               }
+               break;
 
-                       for (int iCount = 0; iCount < totalCount; iCount++)
-                       {
-                               if (__pContentTableView->IsItemChecked(iCount) == true)
-                               {
-                                       ContentInformation* pContentInfoStruct = __pPresentationModel->GetArtistAlbumContentInfoN(iCount);
-                                       if (pContentInfoStruct == null)
-                                       {
-                                               pDataList->RemoveAll(true);
-                                               delete pDataList;
-                                               pDataList = null;
-                                               return;
-                                       }
-
-                                       pDataList->Add(*(new (std::nothrow) String(pContentInfoStruct->ContentFilePath)));
-
-                                       __pContentTableView->SetItemChecked(iCount, false);
-
-                                       delete pContentInfoStruct;
-                                       pContentInfoStruct = null;
-                               }
-                       }
+       default:
+               break;
+       }
 
-                       if (IsFailed(CreatePlayListPickerPopup(pDataList)))
-                       {
-                               AppLogDebug("CreatePlayListPickerPopup failed(%s)", GetLastResult());
-                               return;
-                       }
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
-                       //__pPlayListPickerPopup->SetCollectedContent(pDataList);
+       TryRemoveCommonPopup(actionId);
+       TryRemoveContextMenu(actionId);
+       AppLogDebug("EXIT");
+}
 
-                       pFooter->SetItemEnabled(INDEX_FOOTER_DELETE, false);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_SHARE, false);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_ADDTOPLATLIST, false);
+void
+ArtistContentListForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex,
+                                                                                       Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
+{
+       AppLogDebug("ENTER");
+       if (status == TABLE_VIEW_ITEM_STATUS_SELECTED && GetScreenState() != SCREEN_STATE_NORMAL)
+       {
+               bool ischeck = true;
+               if (tableView.GetItemCountAt(groupIndex) == GetCheckedItemCountAt(groupIndex))
+               {
+                       ischeck = false;
+               }
 
-                       __checkedItemCount = INIT_VALUE;
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *this);
-                       CommonUtil::ShowSelectAllCheckButton(*__pSelectAllCheckedButton);
+               SetItemCheckedAt(groupIndex, ischeck);
+               SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+               tableView.Invalidate(true);
 
-                       Invalidate(true);
+               CommonUtil::SetFooterItemEnabled(*GetFooter(), ischeck);
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+ArtistContentListForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex,
+                                                                                       Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
+{
+       AppLogDebug("ENTER");
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
+       {
+               SetItemCheckedStateChanged(status, groupIndex, itemIndex);
+               AppLogDebug("EXIT");
+               return;
+       }
+
+       if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
+       {
+               SceneManager* pSceneManager = SceneManager::GetInstance();
+               AppAssert(pSceneManager);
+
+               ArrayList* pSceneArg = MakePlayerSceneParam(groupIndex, itemIndex);
+               if (pSceneArg != null)
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pSceneArg);
                }
-               break;
+       }
+       AppLogDebug("EXIT");
+}
 
-       default:
-               break;
+void
+ArtistContentListForm::OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex,
+                                                                                       int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated)
+{
+       AppLogDebug("ENTER");
+       if (activated == true)
+       {
+               __activatedStateContextItem.__groupIndex = groupIndex;
+               __activatedStateContextItem.__itemIndex = itemIndex;
        }
        AppLogDebug("EXIT");
 }
 
 int
-ArtistContentListForm::GetItemCount(void)
+ArtistContentListForm::GetGroupCount(void)
 {
        AppLogDebug("ENTER");
+       if (__pPresentationModel == null)
+       {
+               return INIT_VALUE;
+       }
+
        AppLogDebug("EXIT");
-       return __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex());
+       return __pPresentationModel->GetArtistAlbumListCount();
 }
 
-Tizen::Ui::Controls::TableViewItem*
-ArtistContentListForm::CreateItem(const int itemIndex, int itemWidth)
+int
+ArtistContentListForm::GetItemCount(int groupIndex)
+{
+       AppLogDebug("ENTER");
+       if (__pPresentationModel == null)
+       {
+               return INIT_VALUE;
+       }
+       AppLogDebug("EXIT");
+       return __pPresentationModel->GetArtistAlbumContentCount(groupIndex);
+}
+
+Tizen::Ui::Controls::TableViewGroupItem*
+ArtistContentListForm::CreateGroupItem(int groupIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-       ContentInformation* pContentInfoStruct = null;
+       RelativeLayout layout;
+       layout.Construct();
 
-       TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       if (__checkEdit)
+       TableViewGroupItem* pGroupItem = new (std::nothrow) TableViewGroupItem();
+       if (IsFailed(pGroupItem->Construct(layout, Dimension(itemWidth, H_TABLEVIEW_GROUP_ITEM))))
        {
-               pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
+               AppLogDebug("TableViewGroupItem.Construct() failed(%s)", GetErrorMessage(GetLastResult()));
+               delete pGroupItem;
+               return null;
        }
-       else
+
+       ContentInformation* pContentInfo = __pPresentationModel->GetArtistAlbumInfoN(groupIndex);
+       if (pContentInfo != null)
        {
-               pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+               CreateTableViewGroupItem(*pGroupItem, *pContentInfo);
+               RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) TableviewItemTag(groupIndex, -1)));
+               delete pContentInfo;
        }
-//     pItem->SetBackgroundColor(COLOR_WHITE);
-       pContentInfoStruct = __pPresentationModel->GetArtistAlbumContentInfoN(itemIndex);
-       if (pContentInfoStruct == null)
+
+       AppLogDebug("EXIT");
+       return pGroupItem;
+}
+
+bool
+ArtistContentListForm::DeleteGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return true;
+}
+
+void
+ArtistContentListForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem)
+{
+       AppLogDebug("ENTER");
+       Panel* pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL));
+       if (pItemPanel == null)
+       {
+               AppLogDebug("pItemPanel is null");
+               delete __pThumbnail;
+               __pThumbnail = null;
+               return;
+       }
+
+       Label* pThumbnailLabel = static_cast<Label*>(pItemPanel->GetControl(IDC_LABEL_CONTENT_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");
+}
+
+Tizen::Ui::Controls::TableViewItem*
+ArtistContentListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
+{
+       AppLogDebug("ENTER");
+       RelativeLayout layout;
+       layout.Construct();
+
+       TableViewItem* pItem = new (std::nothrow) TableViewItem();
+       TableViewAnnexStyle tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_NORMAL;
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
+       {
+               tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_MARK;
+       }
+
+       if (IsFailed(pItem->Construct(layout, Dimension(itemWidth, H_TABLEVIEW_IITEM), tableViewAnnexStyle)))
+       {
+               AppLogDebug("Construct(Dimension(itemWidth, ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
                delete pItem;
-               pItem = null;
                return null;
        }
 
-       CreateTableViewItem(*pItem, *pContentInfoStruct);
+       if (__pPresentationModel->GetCurrentArtistAlbumIndex() != groupIndex)
+       {
+               __pPresentationModel->InitializeContentList(groupIndex);
+       }
 
-       delete pContentInfoStruct;
-       pContentInfoStruct = null;
+//     ContentInformation* pContentInfo = __pPresentationModel->GetArtistContentInfoN(callCount);
+       ContentInformation* pContentInfo = __pPresentationModel->GetArtistAlbumContentInfoN(itemIndex);
+       if (pContentInfo != null)
+       {
+               CreateTableViewItem(*pItem, *pContentInfo);
+               delete pContentInfo;
+       }
 
        AppLogDebug("EXIT");
        return pItem;
 }
 
+bool
+ArtistContentListForm::DeleteItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return true;
+}
+
 void
-ArtistContentListForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndex,
-                                                       Tizen::Ui::Controls::TableViewItem* pItem,
-                                                       Tizen::Ui::Controls::TableViewItemStatus status)
+ArtistContentListForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-       switch (status)
+       AppLogDebug("EXIT");
+}
+
+int
+ArtistContentListForm::GetDefaultItemHeight(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return H_TABLEVIEW_IITEM;
+}
+
+int
+ArtistContentListForm::GetDefaultGroupItemHeight(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return H_TABLEVIEW_GROUP_ITEM;
+}
+
+void
+ArtistContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
+{
+       AppLogDebug("ENTER");
+       TableviewItemTag* pTableviewItemTag;
+       void* pParam = null;
+       __pThumbnail = pThumbnailInfo->GetBitmapN();
+       pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam)
        {
-       case TABLE_VIEW_ITEM_STATUS_CHECKED:
-               {
-                       Footer* pFooter = GetFooter();
-                       __checkedItemCount++;
-                       tableView.SetItemChecked(itemIndex, true);
+               pTableviewItemTag = static_cast<TableviewItemTag*>(pParam);
+       }
 
-                       pFooter->SetItemEnabled(INDEX_FOOTER_DELETE, true);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_SHARE, true);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_ADDTOPLATLIST, true);
+       if (pTableviewItemTag != null)
+       {
+               __pContentGroupedTableView->RefreshItem(pTableviewItemTag->__groupIndex, pTableviewItemTag->__itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete static_cast<TableviewItemTag*>(pParam);
+       }
 
-                       pFooter->Invalidate(true);
-                       if (__checkedItemCount == __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex()))
-                       {
-                               __pSelectAllCheckedButton->SetSelected(true);
-                       }
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *this);
-               }
-               break;
+       delete pThumbnailInfo;
+       AppLogDebug("EXIT");
+}
 
-       case TABLE_VIEW_ITEM_STATUS_UNCHECKED:
-               {
-                       Footer* pFooter = GetFooter();
+bool
+ArtistContentListForm::IsEmptyContentList(void)
+{
+       AppLogDebug("ENTER");
+       if (__pPresentationModel != null && __pPresentationModel->GetArtistContentListCount() != INIT_VALUE)
+       {
+               AppLogDebug("EXIT");
+               return false;
+       }
+       AppLogDebug("EXIT");
+       return true;
+}
 
-                       __checkedItemCount--;
-                       tableView.SetItemChecked(itemIndex, false);
+result
+ArtistContentListForm::SetHeader(void)
+{
+       AppLogDebug("ENTER");
+       CommonUtil::SetSimpleTitleStyle(*GetHeader(), __headerTitle);
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
 
-                       if (__checkedItemCount == INIT_VALUE)
-                       {
-                               pFooter->SetItemEnabled(INDEX_FOOTER_DELETE, false);
-                               pFooter->SetItemEnabled(INDEX_FOOTER_SHARE, false);
-                               pFooter->SetItemEnabled(INDEX_FOOTER_ADDTOPLATLIST, false);
+result
+ArtistContentListForm::SetFooter(void)
+{
+       AppLogDebug("ENTER");
+       CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_MORE_ADD);
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
 
-                               pFooter->Invalidate(true);
-                       }
+result
+ArtistContentListForm::CreateTableViewGroupItem(Tizen::Ui::Controls::TableViewGroupItem& parent, const ContentInformation& contentInfo)
+{
+       AppLogDebug("ENTER");
+       Panel* pItem =  new (std::nothrow) Panel();
+       result r = pItem->Construct(IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL);
+       if (IsFailed(r))
+       {
+               AppLogDebug("pItem->Construct() failed(%s)", GetErrorMessage(r));
+               delete pItem;
+               return r;
+       }
 
-                       if (__checkedItemCount != __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex()))
-                       {
-                               __pSelectAllCheckedButton->SetSelected(false);
-                       }
-                       CommonUtil::ShowCheckedCountLabel(*__pCheckedCountLabel, __checkedItemCount, *__pContentTableView, *this);
-               }
-               break;
+       (static_cast<Label*>(pItem->GetControl(IDC_LABEL_CONTENT_THUMBNAIL)))->SetBackgroundBitmap(*GetDefaultThumbnail());
+       (static_cast<Label*>(pItem->GetControl(IDC_LABEL_CONTENT_TITLE_NAME)))->SetText(contentInfo.AlbumName);
 
-       case TABLE_VIEW_ITEM_STATUS_SELECTED:
-               {
-                       SceneManager* pSceneManager = SceneManager::GetInstance();
-                       ArrayList* tempArg;
-                       AppAssert(pSceneManager);
-                       tempArg = MakePlayerSceneParam(itemIndex);
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), tempArg);
+       parent.AddControl(*pItem);
+       parent.SetIndividualSelectionEnabled(pItem, true);
 
-                       if (tempArg != null)
-                       {
-                               tempArg->RemoveAll();
-                               delete tempArg;
-                               tempArg = null;
-                       }
+       CommonUtil::SetLayoutFitToContainer(parent, *pItem);
+
+       AppLogDebug("EXIT");
+       return r;
+}
+
+result
+ArtistContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo)
+{
+       AppLogDebug("ENTER");
+       Panel* pItem =  new (std::nothrow) Panel();
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
+       {
+               if (IsFailed(pItem->Construct(IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL)))
+               {
+                       AppLogDebug("Construct(IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                       delete pItem;
+                       return E_FAILURE;
                }
-               break;
+       }
+       else
+       {
+               if (IsFailed(pItem->Construct(IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL)))
+               {
+                       AppLogDebug("Construct(IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                       delete pItem;
+                       return E_FAILURE;
+               }
+               parent.SetContextItem(__pTableViewContextItem);
+       }
 
-       default:
-               break;
+       (static_cast<Label*>(pItem->GetControl(IDC_LABEL_CONTENT_TITLE_NAME)))->SetText(contentInfo.TitleName);
+       (static_cast<Label*>(pItem->GetControl(IDC_LABEL_CONTENT_ADDITIONAL_INFO)))->SetText(CommonUtil::GetFormatDate(contentInfo.Duration));
+
+       parent.AddControl(*pItem);
+       parent.SetIndividualSelectionEnabled(pItem, true);
+
+       CommonUtil::SetLayoutFitToContainer(parent, *pItem);
+
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
+
+result
+ArtistContentListForm::InitCheckedItemMultiHashMap(void)
+{
+       AppLogDebug("ENTER");
+       __pCheckedItemCountMultiHashMap =  new (std::nothrow) MultiHashMapT<int, int>();
+       result r = __pCheckedItemCountMultiHashMap->Construct();
+       if (IsFailed(r))
+       {
+               delete __pCheckedItemCountMultiHashMap;
+               __pCheckedItemCountMultiHashMap = null;
+               return r;
        }
        AppLogDebug("EXIT");
+       return r;
 }
 
-Tizen::Base::Collection::ArrayList*
-ArtistContentListForm::MakePlayerSceneParam(int startIndex)
+void
+ArtistContentListForm::RemoveCheckedItemMultiHashMap(void)
 {
        AppLogDebug("ENTER");
-       ArrayList* pTempList = new (std::nothrow) ArrayList();
-       ArrayList* pSelectedMusicContent = null;
+       if (__pCheckedItemCountMultiHashMap != null)
+       {
+               __pCheckedItemCountMultiHashMap->RemoveAll();
+               delete __pCheckedItemCountMultiHashMap;
+               __pCheckedItemCountMultiHashMap = null;
+       }
+       AppLogDebug("EXIT");
+}
 
-       pSelectedMusicContent = __pPresentationModel->GetContentPathListN(__currentContentIndex, SEARCH_MODE_ARTIST_ALBUM);
-       if (pTempList == null || pSelectedMusicContent == null)
+Tizen::Base::Collection::ArrayList*
+ArtistContentListForm::MakePlayerSceneParam(int albumIndex, int startIndex)
+{
+       AppLogDebug("ENTER");
+#if 0
+       ArrayList* pSelectedMusicContent = __pPresentationModel->GetContentPathListN(albumIndex, SEARCH_MODE_ARTIST_ALBUM);
+#else
+       ArrayList* pSelectedMusicContent = __pPresentationModel->GetAllContentPathListN();
+       startIndex = startIndex + GetOffsetContentIndex(albumIndex);
+#endif
+       if (pSelectedMusicContent == null)
        {
                AppLogDebug("EXIT");
                return null;
        }
-       pTempList->Construct();
+
+       ArrayList* pTempList = new (std::nothrow) ArrayList();
+       if (IsFailed(pTempList->Construct()))
+       {
+               AppLogDebug("Construct failed(%s)", GetErrorMessage(GetLastResult()));
+               delete pTempList;
+
+               pSelectedMusicContent->RemoveAll();
+               delete pSelectedMusicContent;
+               return null;
+       }
 
        pTempList->Add(*(new (std::nothrow) String(MUSIC)));
        pTempList->Add(*(new (std::nothrow) Integer(startIndex)));
@@ -511,161 +714,432 @@ ArtistContentListForm::MakePlayerSceneParam(int startIndex)
        return pTempList;
 }
 
-result
-ArtistContentListForm::CreateTableViewItem(Tizen::Ui::Container& parent,
-                                                                               const ContentInformation& contentInfo)
+void
+ArtistContentListForm::OnAppControlCompleteResponseReceived(const AppId& appId,
+               const String& operationId, AppCtrlResult appControlResult,
+               const IMap* pExtraData)
 {
        AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       Rectangle rectContentName = RECT_CONTENT_NAME;
-       Rectangle rectContentPlayTime = RECT_CONTENT_PLAY_TIME;
-       Label* pLabelContentName = new (std::nothrow) Label();
-       Label* pLabelContentPlayTime = new (std::nothrow) Label();
+       if (pExtraData == null)
+       {
+               AppLogDebug("EXIT");
+               return;
+       }
 
-       if (__checkEdit)
+       AppLogDebug("%ls, %ls", appId.GetPointer(), operationId.GetPointer());
+       if (appId.Equals(String(PROVIDER_ID_CONTACT)))
        {
-               rectContentName.width = rectContentName.width - X_OFFSET_EDIT_STYLE_TABLE_VIEW;
-               rectContentPlayTime.x = rectContentPlayTime.x - X_OFFSET_EDIT_STYLE_TABLE_VIEW;
+               if (appControlResult == APP_CTRL_RESULT_SUCCEEDED)
+               {
+                       const String* pResultString = static_cast<const String*>(pExtraData->GetValue(String(APPCONTROL_KEY_SOCIAL_ITEM_ID)));
+
+                       AppLogDebug("%ls", pResultString->GetPointer());
+                       int contactId;
+                       Integer::Parse(*pResultString, contactId);
+
+                       AddressbookManager* pAddressbookManager = AddressbookManager::GetInstance();
+                       Addressbook* pAddressbook = pAddressbookManager->GetAddressbookN(DEFAULT_ADDRESSBOOK_ID);
+
+                       ContentInformation* pCcontentInfo = GetContentInformationActivatedStateContextItem();
+                       if (pCcontentInfo == null)
+                       {
+                               delete pAddressbook;
+                               pAddressbook = null;
+                               return;
+                       }
+
+                       Contact* pContact = pAddressbook->GetContactN(contactId);
+                       pContact->SetValue(CONTACT_PROPERTY_ID_RINGTONE, pCcontentInfo->ContentFilePath);
+                       result r = pAddressbook->UpdateContact(*pContact);
+
+                       if (r == E_SUCCESS)
+                       {
+                               MessageBox messageBox;
+                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_POP_SUCCESS"),
+                                               MSGBOX_STYLE_OK,
+                                               COUNT_MESSAGE_BOX_TIMEOUT);
+                               int modalResult = 0;
+                               messageBox.ShowAndWait(modalResult);
+                       }
+
+                       delete pCcontentInfo;
+                       pCcontentInfo = null;
+
+                       delete pContact;
+                       pContact = null;
+
+                       delete pAddressbook;
+                       pAddressbook = null;
+               }
        }
+       AppLogDebug("EXIT");
+}
 
-       pLabelContentName->Construct(rectContentName, L"");
-       pLabelContentName->SetTextConfig(FONT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pLabelContentName->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pLabelContentName->SetText(contentInfo.TitleName);
+result
+ArtistContentListForm::AddCheckedItem(int groupIndex, int itemIndex)
+{
+       AppLogDebug("ENTER");
+       bool isFind = false;
+       __pCheckedItemCountMultiHashMap->Contains(groupIndex, itemIndex, isFind);
+       if (isFind == true)
+       {
+               AppLogDebug("This item Already Set (groupIndex:%d, itemIndex:%d)", groupIndex, itemIndex);
+               return E_ALREADY_SET;
+       }
+       AppLogDebug("EXIT");
+       return __pCheckedItemCountMultiHashMap->Add(groupIndex, itemIndex);
+}
 
-       pLabelContentPlayTime->Construct(rectContentPlayTime, L"");
-       pLabelContentPlayTime->SetTextConfig(FONT_SIZE, LABEL_TEXT_STYLE_NORMAL);
-       pLabelContentPlayTime->SetTextHorizontalAlignment(ALIGNMENT_RIGHT);
-       pLabelContentPlayTime->SetText(CommonUtil::GetFormatDate(contentInfo.Duration));
+result
+ArtistContentListForm::RemoveCheckedItem(int groupIndex, int itemIndex)
+{
+       AppLogDebug("ENTER");
+       bool isFind = false;
+       __pCheckedItemCountMultiHashMap->Contains(groupIndex, itemIndex, isFind);
+       if (isFind == false)
+       {
+               AppLogDebug("This item not found(groupIndex:%d, itemIndex:%d)", groupIndex, itemIndex);
+               return E_DATA_NOT_FOUND;
+       }
+       AppLogDebug("EXIT");
+       return __pCheckedItemCountMultiHashMap->Remove(groupIndex, itemIndex);
+}
 
-       parent.AddControl(*pLabelContentName);
-       parent.AddControl(*pLabelContentPlayTime);
+result
+ArtistContentListForm::SetItemChecked(int groupIndex, int itemIndex, bool check)
+{
+       AppLogDebug("ENTER");
+       result r = E_FAILURE;
+       if (check == true)
+       {
+               r = AddCheckedItem(groupIndex, itemIndex);
+       }
+       else
+       {
+               r = RemoveCheckedItem(groupIndex, itemIndex);
+       }
        AppLogDebug("EXIT");
        return r;
 }
 
+int
+ArtistContentListForm::GetCheckedItemCountAt(int groupIndex)
+{
+       AppLogDebug("ENTER");
+       int itemCount = 0;
+       __pCheckedItemCountMultiHashMap->GetCount(groupIndex, itemCount);
+       AppLogDebug("EXIT");
+       return itemCount;
+}
+
+int
+ArtistContentListForm::GetTotalItemCount(void)
+{
+       AppLogDebug("ENTER");
+       int totalItemCount = 0;
+       int groupCount = __pContentGroupedTableView->GetGroupCount();
+       for (int iCount = 0; iCount < groupCount; iCount++)
+       {
+               totalItemCount = totalItemCount + __pContentGroupedTableView->GetItemCountAt(iCount);
+       }
+       AppLogDebug("EXIT");
+       return totalItemCount;
+}
+
+int
+ArtistContentListForm::GetCheckedItemCount(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __pCheckedItemCountMultiHashMap->GetCount();
+}
+
 void
-ArtistContentListForm::ToggleViewMode(bool editMode)
+ArtistContentListForm::SetItemCheckedAt(int groupIndex, bool check)
 {
        AppLogDebug("ENTER");
-       Footer* pFooter = GetFooter();
+       int groupItemCount = 0;
+       if (check == true)
+       {
+               groupItemCount = __pContentGroupedTableView->GetItemCountAt(groupIndex);
+       }
+       else
+       {
+               __pCheckedItemCountMultiHashMap->GetCount(groupIndex, groupItemCount);
+       }
 
-       if (editMode == false)
+       for (int iCount= 0; iCount < groupItemCount; iCount++)
        {
-               int currentAlbumContentCount = 0;
-               currentAlbumContentCount = __pPresentationModel->GetArtistAlbumContentCount(__pPresentationModel->GetCurrentArtistAlbumIndex());
+               __pContentGroupedTableView->SetItemChecked(groupIndex, iCount, check);
+               SetItemChecked(groupIndex, iCount, check);
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+ArtistContentListForm::SetItemCheckedAll(bool isChecked)
+{
+       AppLogDebug("ENTER");
+       int groupCount = __pContentGroupedTableView->GetGroupCount();
+       for (int iCount= 0; iCount < groupCount; iCount++)
+       {
+               SetItemCheckedAt(iCount, isChecked);
+       }
+
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       __pContentGroupedTableView->Invalidate(true);
+       AppLogDebug("EXIT");
+}
+
+void
+ArtistContentListForm::UpdateTableView(void)
+{
+       AppLogDebug("ENTER");
+       __pContentGroupedTableView->UpdateTableView();
+       AppLogDebug("EXIT");
+}
+
+ContentInformation*
+ArtistContentListForm::GetContentInformationActivatedStateContextItem(void)
+{
+       AppLogDebug("ENTER");
+       if (__pPresentationModel->GetCurrentArtistAlbumIndex() != __activatedStateContextItem.__groupIndex)
+       {
+               __pPresentationModel->InitializeContentList(__activatedStateContextItem.__groupIndex);
+       }
+
+       AppLogDebug("EXIT");
+       return __pPresentationModel->GetArtistAlbumContentInfoN(__activatedStateContextItem.__itemIndex);
+}
+
+result
+ArtistContentListForm::EventHandlerContextMenuItemCaller(void)
+{
+       AppLogDebug("ENTER");
+       AppControl* pAppControl = AppManager::FindAppControlN(PROVIDER_ID_CONTACT, OPERATION_ID_SOCIAL_PICK);
+       if (pAppControl == null)
+       {
+               AppLogDebug("AppManager::FindAppControlN is null");
+               return E_FAILURE;
+       }
+
+       HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
+       result r = pDataList->Construct();
+       if (IsFailed(r))
+       {
+               AppLogDebug("pDataList->Construct() failed(%s)", GetErrorMessage(r));
+               return r;
+       }
+
+       pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_SELECTION_MODE), new (std::nothrow) String(APPCONTROL_OPTION_SINGLE));
+       pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_SOCIAL_RESULT_TYPE), new (std::nothrow) String(APPCONTROL_OPTION_ITEM_ID));
+
+       pAppControl->Start(null, null, pDataList, this);
+
+       Frame* pFrame = MusicPlayerApp::GetInstance()->GetFrameAt(0);
+       AppAssert(pFrame);
+       pFrame->SetEnabled(false);
+
+       delete pAppControl;
+       pAppControl = null;
+
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
+
+result
+ArtistContentListForm::EventHandlerContextMenuItemCall(ContentInformation& contentInfo)
+{
+       AppLogDebug("ENTER");
+       result r = SettingInfo::SetValue(CALL_RINGTONE_KEY, contentInfo.ContentFilePath);
+       if (IsFailed(r))
+       {
+               AppLogDebug("SettingInfo::SetValue failed(%s)", GetErrorMessage(r));
+               return r;
+       }
+
+       MessageBox messageBox;
+       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_POP_SUCCESS"),
+                                               MSGBOX_STYLE_OK,
+                                               COUNT_MESSAGE_BOX_TIMEOUT);
+       int modalResult = 0;
+       messageBox.ShowAndWait(modalResult);
+
+       AppLogDebug("EXIT");
+       return r;
+}
+
+result
+ArtistContentListForm::EventHandlerContextMenuItemMessageEmail(ContentInformation& contentInfo, Tizen::Base::String providerId)
+{
+       AppLogDebug("ENTER");
+       if (!providerId.Equals(PROVIDER_ID_EMAIL, false) || !providerId.Equals(PROVIDER_ID_MESSAGE, false))
+       {
+               AppLogDebug("worng providerId(%s)", providerId.GetPointer());
+               return E_FAILURE;
+       }
+
+       AppControl* pAppControl = AppManager::FindAppControlN(providerId, OPERATION_ID_COMPOSE);
+       if (pAppControl == null)
+       {
+               AppLogDebug("AppManager::FindAppControlN is null");
+               return E_FAILURE;
+       }
+
+       HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
+       pDataList->Construct();
+       pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), new (std::nothrow) String(contentInfo.ContentFilePath));
 
-               pFooter->RemoveAllButtons();
-               pFooter->RemoveAllItems();
-               pFooter->RemoveActionEventListener(*this);
-               pFooter = CommonUtil::CreateEditFooter(*this);
-               pFooter->AddActionEventListener(*this);
-               pFooter->SetBackButton();
-               SetFormBackEventListener(this);
+       pAppControl->Start(null, null, pDataList, this);
 
-               if ( currentAlbumContentCount > INIT_VALUE)
+       Frame* pFrame = MusicPlayerApp::GetInstance()->GetFrameAt(0);
+       AppAssert(pFrame);
+       pFrame->SetEnabled(false);
+
+       delete pAppControl;
+       pAppControl = null;
+
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
+
+result
+ArtistContentListForm::RemoveConentCheckedAll(void)
+{
+       AppLogDebug("ENTER");
+       IMapEnumeratorT< int, int >* pMapEnum = __pCheckedItemCountMultiHashMap->GetMapEnumeratorN();
+       while (pMapEnum->MoveNext() == E_SUCCESS)
+       {
+               int key = 0;
+               int value = 0;
+               pMapEnum->GetKey(key);
+               pMapEnum->GetValue(value);
+
+               if (__pPresentationModel->GetCurrentArtistAlbumIndex() != key)
                {
-                       SetTitleText(__strHeaderName);
+                       __pPresentationModel->InitializeContentList(key);
                }
-               else
+
+               ContentInformation* pContentInfo = __pPresentationModel->GetArtistAlbumContentInfoN(value);
+               if (pContentInfo != null)
                {
-                       SetTitleText("No songs");
-                       CommonUtil::ShowNoContentImage(INIT_VALUE, *__pContentTableView, *__pNoContentImageLabel, *__pNoContentTextLabel);
-                       pFooter->SetItemEnabled(INDEX_FOOTER_EDIT, false);
+                       RemoveContentAt(pContentInfo->contentId);
+                       delete pContentInfo;
                }
+       }
+       delete pMapEnum;
 
-               __pSelectAllCheckedButton->SetEnabled(false);
-               __pSelectAllCheckedButton->SetShowState(false);
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
 
-               __checkEdit = false;
-               __pContentTableView->SetBounds(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height));
-               __pContentTableView->Invalidate(true);
-               __pContentTableView->UpdateTableView();
+Tizen::Base::Collection::IList*
+ArtistContentListForm::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)
+{
+       AppLogDebug("ENTER");
+       ArrayList* pContentFilePathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       if (IsFailed(pContentFilePathList->Construct()))
+       {
+               AppLogDebug("pContentFilePathList->Construct() failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
        }
-       else
+
+       if (argumentType == PICKER_ARGUMENT_TYPE_ACTIVATED_STATE_CONTEXT_ITEM)
        {
-               SetTitleText(ResourceManager::GetString("IDS_COM_BODY_EDIT"));
+               ContentInformation* pContentInfo = GetContentInformationActivatedStateContextItem();
+               if (pContentInfo != null)
+               {
+                       pContentFilePathList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
+                       delete pContentInfo;
+               }
+               AppLogDebug("EXIT");
+               return pContentFilePathList;
+       }
 
-               pFooter->RemoveAllButtons();
-               pFooter->RemoveAllItems();
-               pFooter->RemoveActionEventListener(*this);
+       int key = 0;
+       int value = 0;
+
+       IMapEnumeratorT<int, int>* pMapEnum = __pCheckedItemCountMultiHashMap->GetMapEnumeratorN();
+       while (pMapEnum->MoveNext() == E_SUCCESS)
+       {
+               pMapEnum->GetKey(key);
+               pMapEnum->GetValue(value);
 
-               pFooter = CommonUtil::CreateDeleteFooter(*this);
-               pFooter->AddActionEventListener(*this);
+#if 1
+               if (__pPresentationModel->GetCurrentArtistAlbumIndex() != key)
+               {
+                       __pPresentationModel->InitializeContentList(key);
+               }
 
-               __pSelectAllCheckedButton->SetEnabled(true);
-               __pSelectAllCheckedButton->SetShowState(true);
+               ContentInformation* pContentInfo = __pPresentationModel->GetArtistAlbumContentInfoN(value);
+#else
+               int offset = GetOffsetContentIndex(iCount);
+               ContentInformation* pContentInfo = __pPresentationModel->GetArtistContentInfoN(offset + value);
+#endif
+               if (pContentInfo == null)
+               {
+                       AppLogDebug("__pPresentationModel->GetArtistAlbumContentInfoN(%d) is null", value);
+                       delete pContentFilePathList;
+                       return null;
+               }
 
-               __checkEdit = true;
-               __pContentTableView->SetBounds(Rectangle(0, __pSelectAllCheckedButton->GetHeight(), GetClientAreaBounds().width, (GetClientAreaBounds().height - __pSelectAllCheckedButton->GetHeight())));
-               __pContentTableView->Invalidate(true);
-               __pContentTableView->UpdateTableView();
+               if (pickerType == PICKER_TYPE_SHARE_PICKER)
+               {
+                       pContentFilePathList->Add(*(new (std::nothrow) String(L"attachment:" + pContentInfo->ContentFilePath)));
+               }
+               else if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER)
+               {
+                       pContentFilePathList->Add(new (std::nothrow) String(pContentInfo->ContentFilePath));
+               }
+               delete pContentInfo;
        }
-       Invalidate(true);
+       delete pMapEnum;
+
        AppLogDebug("EXIT");
+       return pContentFilePathList;
 }
 
 void
-ArtistContentListForm::OnAppControlCompleteResponseReceived(const AppId& appId,
-               const String& operationId, AppCtrlResult appControlResult,
-               const IMap* pExtraData)
+ArtistContentListForm::SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewItemStatus status, int groupIndex, int itemIndex)
 {
        AppLogDebug("ENTER");
-       if (pExtraData == null)
+       if (status == TABLE_VIEW_ITEM_STATUS_CHECKED)
        {
-               AppLogDebug("EXIT");
-               return;
+               SetItemChecked(groupIndex, itemIndex, true);
+               if (GetCheckedItemCount() == 1)
+               {
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), true);
+               }
        }
-       AppLogDebug("%ls, %ls", appId.GetPointer(), operationId.GetPointer());
-       if (appId.Equals(String(TIZEN_APPCONTROL_PROVIDER_CONTACT)))
+       else if (status == TABLE_VIEW_ITEM_STATUS_UNCHECKED)
        {
-               if (appControlResult == APP_CTRL_RESULT_SUCCEEDED)
+               SetItemChecked(groupIndex, itemIndex, false);
+               if (GetCheckedItemCount() == 0)
                {
-                       const String* pContactId = static_cast<const String*>(pExtraData->GetValue(String(APPCONTROL_KEY_RETURNTYPE)));
-                       if (pContactId->Equals(APPCONTROL_VALUE_CONTACTID, true))
-                       {
-                               const String* pResultString = static_cast<const String*>(pExtraData->GetValue(String(APPCONTROL_KEY_VALUE)));
-
-                               AppLogDebug("%ls", pResultString->GetPointer());
-                               int contactId;
-                               Integer::Parse(*pResultString, contactId);
-
-                               AddressbookManager* pAddressbookManager = AddressbookManager::GetInstance();
-                               Addressbook* pAddressbook = pAddressbookManager->GetAddressbookN(DEFAULT_ADDRESSBOOK_ID);
-
-                               ContentInformation* pCcontentInfo = __pPresentationModel->GetArtistAlbumContentInfoN(__itemIndex);
-                               if (pCcontentInfo == null)
-                               {
-                                       delete pAddressbook;
-                                       pAddressbook = null;
-                                       return;
-                               }
-
-                               Contact* pContact = pAddressbook->GetContactN(contactId);
-                               pContact->SetValue(CONTACT_PROPERTY_ID_RINGTONE, pCcontentInfo->ContentFilePath);
-                               result r = pAddressbook->UpdateContact(*pContact);
-
-                               if (r == E_SUCCESS)
-                               {
-                                       MessageBox messageBox;
-                                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_POP_SUCCESS"),
-                                                       MSGBOX_STYLE_OK,
-                                                       COUNT_MESSAGE_BOX_TIMEOUT);
-                                       int modalResult = 0;
-                                       messageBox.ShowAndWait(modalResult);
-                               }
-
-                               delete pCcontentInfo;
-                               pCcontentInfo = null;
-
-                               delete pContact;
-                               pContact = null;
-
-                               delete pAddressbook;
-                               pAddressbook = null;
-                       }
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
                }
        }
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
        AppLogDebug("EXIT");
 }
-#endif
\ No newline at end of file
+
+int
+ArtistContentListForm::GetOffsetContentIndex(const int groupIndex)
+{
+       AppLogDebug("ENTER");
+       if (__pContentGroupedTableView == null)
+       {
+               AppLogDebug("__pContentGroupedTableView is null");
+               return INIT_VALUE;
+       }
+
+       int contentIndex = INIT_VALUE;
+       for (int iCount = 0; iCount < groupIndex; iCount++)
+       {
+               contentIndex = contentIndex + __pContentGroupedTableView->GetItemCountAt(iCount);
+       }
+
+       AppLogDebug("EXIT");
+       return contentIndex;
+}
\ No newline at end of file
index d8db084..5f8fa2d 100644 (file)
@@ -81,7 +81,7 @@ ArtistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        switch (actionId)
        {
-       case IDA_HEADER_ALL_CHECK_BUTTON:
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
                {
                        if (totalCount == __checkedItemCount)
                        {
@@ -371,7 +371,7 @@ ArtistListEditorPanel::SetEditHeaderStyle(void)
        RemoveParentHeaderActionEventListener();
        Header* pHeader = GetParentHeader();
        String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        pHeader->AddActionEventListener(*this);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
@@ -405,7 +405,7 @@ ArtistListEditorPanel::SetCheckedIconAllCheckButton(void)
        AppLogDebug("ENTER");
        Header* pHeader = GetParentHeader();
        String titleText(L"EDIT");
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, true);
+       CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -416,7 +416,7 @@ ArtistListEditorPanel::SetUnCheckedIconAllCheckButton(void)
        AppLogDebug("ENTER");
        Header* pHeader = GetParentHeader();
        String titleText(L"EDIT");
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
 }
index 812afc0..de90097 100644 (file)
@@ -260,13 +260,11 @@ ArtistListPanel::CreateItem(const int itemIndex, int itemWidth)
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CreateTableViewItem(*pItem, *pContentInfoStruct, __pPresentationModel->GetArtistContentCount(itemIndex));
        pItem->SetContextItem(__pContextItem);
-
        delete pContentInfoStruct;
-       pContentInfoStruct = null;
 
+       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        AppLogDebug("EXIT");
        return pItem;
 }
index c52a466..ee4a550 100644 (file)
@@ -29,9 +29,9 @@ using namespace Tizen::Base::Utility;
 using namespace Tizen::Content;
 using namespace Tizen::Graphics;
 using namespace Tizen::Io;
-using namespace Tizen::Ui::Scenes;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
 
 static const int H_CREATE_TABLE_VIEW_ITEM = 70;
 static const int Y_CREATE_TABLE_VIEW_ITEM = 29;
@@ -49,6 +49,9 @@ const wchar_t* YEARS_TAB = L"YEARS_TAB";        // 0 - 1 (UNCHECKED, CHECKED)
 const wchar_t* FOLDERS_TAB = L"FOLDERS_TAB";      // 0 - 1 (UNCHECKED, CHECKED)
 const wchar_t* PLAYERLISTS_TAB = L"PLAYERLISTS_TAB";  // 0 - 1 (UNCHECKED, CHECKED)
 const wchar_t* AUTO_OFF_LEVEL = L"AUTO_OFF_LEVEL";   // 0 - 5 (OFF, 15 MIN, 30 MIN, 1 HOUR, 1 HOUR 30 MIN, 2 HOURS)
+const wchar_t* MOST_PLAYED = L"MOST_PLAYED";           // 0 - 1 (UNCHECKED, CHECKED)
+const wchar_t* RECENTLY_PLAYED = L"RECENTLY_PLAYED";   // 0 - 1 (UNCHECKED, CHECKED)
+const wchar_t* RECENTLY_ADD = L"RECENTLY_ADD";         // 0 - 1 (UNCHECKED, CHECKED)
 const wchar_t* REPEAT_MODE = L"REPEAT_MODE";      // 0 - 2 (OFF, ONE, ALL)
 const wchar_t* SHUFFLE_MODE = L"SHUFFLE_MODE";     // 0 - 1 (OFF, ON)
 const wchar_t* VOLUME_LEVEL = L"VOLUME_LEVEL";     // 0 - 15
@@ -345,14 +348,9 @@ CommonUtil::GetValue(const Tizen::Base::String& entryName)
        if (r == E_KEY_NOT_FOUND)
        {
                AppLogDebug("registry initialize.");
-               r = pAppRegistry->Add(SONGS_TAB, 1);
-               r = pAppRegistry->Add(ALBUMS_TAB, 1);
-               r = pAppRegistry->Add(ARTISTS_TAB, 1);
-               r = pAppRegistry->Add(GENRES_TAB, 1);
-               r = pAppRegistry->Add(COMPOSERS_TAB, 1);
-               r = pAppRegistry->Add(YEARS_TAB, 1);
-               r = pAppRegistry->Add(FOLDERS_TAB, 1);
-               r = pAppRegistry->Add(PLAYERLISTS_TAB, 1);
+               r = pAppRegistry->Add(MOST_PLAYED, 1);
+               r = pAppRegistry->Add(RECENTLY_PLAYED, 1);
+               r = pAppRegistry->Add(RECENTLY_ADD, 1);
                r = pAppRegistry->Add(AUTO_OFF_LEVEL, 0);
                r = pAppRegistry->Add(REPEAT_MODE, 2);
                r = pAppRegistry->Add(SHUFFLE_MODE, 0);
@@ -381,14 +379,9 @@ CommonUtil::SetValue(const Tizen::Base::String& entryName, const int value)
        if (r == E_KEY_NOT_FOUND)
        {
                AppLogDebug("registry initialize.");
-               r = pAppRegistry->Add(SONGS_TAB, 1);
-               r = pAppRegistry->Add(ALBUMS_TAB, 1);
-               r = pAppRegistry->Add(ARTISTS_TAB, 1);
-               r = pAppRegistry->Add(GENRES_TAB, 1);
-               r = pAppRegistry->Add(COMPOSERS_TAB, 1);
-               r = pAppRegistry->Add(YEARS_TAB, 1);
-               r = pAppRegistry->Add(FOLDERS_TAB, 1);
-               r = pAppRegistry->Add(PLAYERLISTS_TAB, 1);
+               r = pAppRegistry->Add(MOST_PLAYED, 1);
+               r = pAppRegistry->Add(RECENTLY_PLAYED, 1);
+               r = pAppRegistry->Add(RECENTLY_ADD, 1);
                r = pAppRegistry->Add(AUTO_OFF_LEVEL, 0);
                r = pAppRegistry->Add(REPEAT_MODE, 2);
                r = pAppRegistry->Add(SHUFFLE_MODE, 0);
@@ -608,20 +601,6 @@ CommonUtil::SetLayoutFitToContainer(const Tizen::Ui::Container& container, Tizen
 }
 
 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");
@@ -643,37 +622,19 @@ CommonUtil::SetTabHeaderStyle(Tizen::Ui::Controls::Header& pHeader)
        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]));
+               HeaderItem pTabHeaderItem;
+               pTabHeaderItem.Construct(IDA_HEADER_BUTTON_SONG + iCount);
+               pTabHeaderItem.SetText(ResourceManager::GetString(TabNameId[iCount]));
 
-                       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]));
-
-                       pHeader.AddItem(pTabHeaderItem);
-                       headItemChecked++;
-               }
+               pHeader.AddItem(pTabHeaderItem);
        }
        AppLogDebug("EXIT");
 }
 
 void
-CommonUtil::SetEditHeaderStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText, int actionId, bool isChecked)
+CommonUtil::SetEditHeaderStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen::Base::String& titleText)
 {
        AppLogDebug("ENTER");
        pHeader.RemoveAllButtons();
@@ -683,36 +644,23 @@ CommonUtil::SetEditHeaderStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen
        pHeader.SetTitleText(titleText);
 
        ButtonItem buttonItem;
-       buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, actionId);
+       buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, IDA_HEADER_BUTTON_SELECTE_ALL);
 
-       CommonUtil::SetIconButtonItem(buttonItem, ResourceManager::GetBitmapN(L"00_icon_select_all_web.png"),
-                                                                                         ResourceManager::GetBitmapN(L"00_icon_select_all_press_web.png"),
-                                                                                         ResourceManager::GetBitmapN(L"00_icon_select_all_dim_web.png"));
+       Bitmap* normal = ResourceManager::GetBitmapN(L"00_icon_select_all_web.png");
+       buttonItem.SetIcon(BUTTON_ITEM_STATUS_NORMAL, normal);
+
+       Bitmap* pressed = ResourceManager::GetBitmapN(L"00_icon_select_all_press_web.png");
+       buttonItem.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pressed);
+
+       Bitmap* disable = ResourceManager::GetBitmapN(L"00_icon_select_all_dim_web.png");
+       buttonItem.SetIcon(BUTTON_ITEM_STATUS_DISABLED, disable);
 
        pHeader.SetButton(BUTTON_POSITION_RIGHT, buttonItem);
        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);
+       delete normal;
+       delete pressed;
+       delete disable;
        AppLogDebug("EXIT");
 }
 
@@ -722,7 +670,7 @@ CommonUtil::SetButtonItemUnCheckedIcon(Tizen::Ui::Controls::Header& header)
        AppLogDebug("ENTER");
        header.RemoveAllButtons();
        ButtonItem buttonItem;
-       buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, IDA_HEADER_BUTTION_CHECK_BOX_CHECKED_ICON);
+       buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, IDA_HEADER_BUTTON_CHECK_BOX_CHECKED_ICON);
 
        Bitmap* pBgNormal = ResourceManager::GetBitmapN(L"00_check_bg.png");
        buttonItem.SetBackgroundBitmap(BUTTON_ITEM_STATUS_NORMAL, pBgNormal);
@@ -761,7 +709,7 @@ CommonUtil::SetButtonItemCheckedIcon(Tizen::Ui::Controls::Header& header)
        AppLogDebug("ENTER");
        header.RemoveAllButtons();
        ButtonItem buttonItem;
-       buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, IDA_HEADER_BUTTION_CHECK_BOX_UNCHECKED_ICON);
+       buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, IDA_HEADER_BUTTON_CHECK_BOX_UNCHECKED_ICON);
 
        Bitmap* pBgNormal = ResourceManager::GetBitmapN(L"00_check_bg.png");
        buttonItem.SetBackgroundBitmap(BUTTON_ITEM_STATUS_NORMAL, pBgNormal);
@@ -787,40 +735,6 @@ CommonUtil::SetButtonItemCheckedIcon(Tizen::Ui::Controls::Header& header)
        AppLogDebug("EXIT");
 }
 
-//void
-//CommonUtil::SetButtonItemIcon(Tizen::Ui::Controls::ButtonItem& buttonItem, Tizen::Graphics::Bitmap* pIconNormal
-//                                                                                                                                                                                             , Tizen::Graphics::Bitmap* pIconPressed, Tizen::Graphics::Bitmap* pIconDisabled)
-//{
-//     AppLogDebug("ENTER");
-//     buttonItem.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pIconNormal);
-//     buttonItem.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pIconPressed);
-//     buttonItem.SetIcon(BUTTON_ITEM_STATUS_DISABLED, pIconDisabled);
-//     AppLogDebug("EXIT");
-//}
-
-//void
-//CommonUtil::SetButtonItemBackgroundBitmap(Tizen::Ui::Controls::ButtonItem& buttonItem, Tizen::Graphics::Bitmap* pIconNormal
-//                                                                                                                     , Tizen::Graphics::Bitmap* pIconPressed, Tizen::Graphics::Bitmap* pIconDisabled)
-//{
-//     AppLogDebug("ENTER");
-//     buttonItem.SetBackgroundBitmap(BUTTON_ITEM_STATUS_NORMAL, pIconNormal);
-//     buttonItem.SetBackgroundBitmap(BUTTON_ITEM_STATUS_PRESSED, pIconPressed);
-//     buttonItem.SetBackgroundBitmap(BUTTON_ITEM_STATUS_DISABLED, pIconDisabled);
-//     AppLogDebug("EXIT");
-//}
-
-//void
-//CommonUtil::SetButtonItemBackgroundBitmap(Tizen::Ui::Controls::HeaderItem& headerItem, Tizen::Graphics::Bitmap* pIconNormal
-//                                                                                                                     , Tizen::Graphics::Bitmap* pIconPressed, Tizen::Graphics::Bitmap* pIconDisabled, Tizen::Graphics::Bitmap* pIconSelected)
-//{
-//     AppLogDebug("ENTER");
-//     headerItem.SetBackgroundBitmap(HEADER_ITEM_STATUS_NORMAL, pIconNormal);
-//     headerItem.SetBackgroundBitmap(HEADER_ITEM_STATUS_PRESSED, pIconPressed);
-//     headerItem.SetBackgroundBitmap(HEADER_ITEM_STATUS_SELECTED, pIconDisabled);
-//     headerItem.SetBackgroundBitmap(HEADER_ITEM_STATUS_DISABLED, pIconSelected);
-//     AppLogDebug("EXIT");
-//}
-
 Tizen::Ui::Controls::Popup*
 CommonUtil::CreateContentDeletePopup(Tizen::Ui::IActionEventListener& listener, int deleteActionId, int cancelActionId)
 {
@@ -959,6 +873,27 @@ CommonUtil::SetTextItemSelectedBalloonPopup(Tizen::Ui::Controls::Label& itemSele
        AppLogDebug("EXIT");
 }
 
+Tizen::Base::String
+CommonUtil::GetStringItemSelectd(int itemCount)
+{
+       AppLogDebug("ENTER");
+       String StrSelectStr = null;
+
+       if (itemCount > INIT_VALUE)
+       {
+               String ResSelect = ResourceManager::GetString("IDS_COM_BODY_SELECTED");
+               ResSelect.Append(L"(%d)");
+
+               StrSelectStr.Format(STRING_LENGTH, ResSelect.GetPointer(), itemCount);
+       }
+       else
+       {
+               StrSelectStr.Format(STRING_LENGTH,L"Select <Noun>s");//NEED STRING
+       }
+       AppLogDebug("EXIT");
+       return StrSelectStr;
+}
+
 result
 CommonUtil::SetShowStateVariableHeightSizeControl(Tizen::Ui::Control& control, int controlHeight, bool isShow)
 {
@@ -985,7 +920,6 @@ Tizen::Ui::Controls::ContextMenu*
 CommonUtil::CreateContextMenuN(const Tizen::Ui::Control& source, Tizen::Ui::IActionEventListener& listener)
 {
        AppLogDebug("ENTER");
-
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
@@ -1097,6 +1031,12 @@ CommonUtil::AddContextMenuItem(Tizen::Ui::Controls::ContextMenu& contextMenu, un
 //             IDA_CONTEXT_MENU_ITEM_GO_TO_LIBARY
                contextMenu.AddItem(L"Go to Library", IDA_CONTEXT_MENU_ITEM_GO_TO_LIBARY);//NEED STRING
        }
+
+       if (CONTEXT_MENU_ITEM_STYLE_ADD & contextMenuItemStyle)
+       {
+//             IDA_CONTEXT_MENU_ITEM_STYLE_ADD
+               contextMenu.AddItem(L"Add", IDA_CONTEXT_MENU_ITEM_STYLE_ADD);//NEED STRING
+       }
        AppLogDebug("EXIT");
 }
 
@@ -1609,6 +1549,16 @@ CommonUtil::CreateBackButtonStyleFooter(const Tizen::Ui::Controls::Form& form, F
                }
                break;
 
+       case STYLE_ADD_ADD:
+               {
+                       FooterItem footerItemAdd;
+                       footerItemAdd.Construct(IDA_FOOTER_BUTTON_ADD);
+                       footerItemAdd.SetText(ResourceManager::GetString(L"IDS_MUSIC_SK_ADD_LITE"));
+
+                       pFooter->AddItem(footerItemAdd);
+               }
+               break;
+
        default:
                break;
        }
@@ -2042,6 +1992,18 @@ CommonUtil::GetColorizedBitmapN(const Tizen::Graphics::Bitmap& bitmap, const Tiz
        return pRet.release();
 }
 
+void
+CommonUtil::SetNoContentImage(Tizen::Ui::Controls::Label& source, Tizen::Base::String& resourceName, Tizen::Base::String& text)
+{
+       AppLogDebug("ENTER");
+       Bitmap* pNoContentImage = ResourceManager::GetBitmapN(resourceName);
+       source.SetBackgroundBitmap(*pNoContentImage);
+       delete pNoContentImage;
+       source.SetText(text);
+       source.Invalidate(false);
+       AppLogDebug("EXIT");
+}
+
 Tizen::Base::String
 CommonUtil::SetHighDepthToEllipsisPath(const Tizen::Base::String& fullFilePath)
 {
@@ -2070,4 +2032,4 @@ CommonUtil::SetHighDepthToEllipsisPath(const Tizen::Base::String& fullFilePath)
 
        AppLogDebug("EXIT");
        return folderPath;
-}
+}
\ No newline at end of file
index e79935d..00528de 100644 (file)
@@ -88,7 +88,7 @@ ComposerContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
        __checkedItemCount = 0;
-       DestroyPlayListPickerPopup();
+       RemovePlayListPicker();
 
        delete __pContextItem;
        __pContextItem = null;
index f56f12e..db5c53b 100644 (file)
@@ -174,4 +174,4 @@ ContentForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::O
                pContentPanel->OnOrientationPanelChanged(orientationStatus);
        }
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file
index 10094cd..ba82072 100644 (file)
@@ -40,23 +40,18 @@ using namespace Tizen::Ui::Scenes;
 static const int H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP = 48;
 
 ContentListForm::ContentListForm(void)
-       : __pContentTableView(null)
-       , __pContextItem(null)
-       , __headerTitle(L"")
+       : __headerTitle(L"")
        , __prevSceneId(L"")
-       , __currentContentIndex(-1)
+       , __pContentList(null)
        , __pContextMenu(null)
        , __pCommonUtilPopupHandler(null)
-       , __pNoContentLabel(null)
-       , __pAdditionalInformationRegisterBar(null)
-       , __pItemSelectedBalloonPopup(null)
-       , __pPlayListPickerPopup(null)
-       , __pSharePopup(null)
-       , __contentListScreenMode(CONTENT_LIST_SCREEN_MODE_NORMAL)
-       , __itemIndex(-1)
-       , __checkedItemCount(0)
-       , __additionlInformationRegisterBarHeight(0)
-       , __allSelectToggle(0)
+       , __pNoContent(null)
+       , __pExtraInformaionArea(null)
+       , __pBallonTooltip(null)
+       , __pPlayListPicker(null)
+       , __pSharePicker(null)
+       , __screenState(SCREEN_STATE_NORMAL)
+       , __heightExtraInformaionArea(0)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -72,14 +67,15 @@ result
 ContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       DestroyPlayListPickerPopup();
-       DestroySharePopup();
+       RemovePlayListPicker();
+       RemoveSharePicker();
        RemovCommonPopup();
        RemoveContextMenu();
 
-       __pNoContentLabel = null;
-       __pAdditionalInformationRegisterBar = null;
-       __pItemSelectedBalloonPopup = null;
+       __pContentList = null;
+       __pNoContent = null;
+       __pExtraInformaionArea = null;
+       __pBallonTooltip = null;
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -102,16 +98,17 @@ result
 ContentListForm::Construct(void)
 {
        AppLogDebug("ENTER");
-       __pContentTableView = static_cast<TableView*>(GetControl(IDC_CONTENT_LIST_TABLEVIEW));
-       __pContentTableView->AddTableViewItemEventListener(*this);
-       __pContentTableView->SetItemProvider(this);
+       __pNoContent = static_cast<Label*>(GetControl(IDC_LABEL_NO_CONTENT));
+       __pBallonTooltip = static_cast<Label*>(GetControl(IDC_LABEL_BALLOON_TOOLTIP));
 
-       __pNoContentLabel = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_LABEL));
-       __pItemSelectedBalloonPopup = static_cast<Label*>(GetControl(IDC_ITEM_SELECTED_COUNT_LABEL));
-       __pAdditionalInformationRegisterBar = static_cast<Panel*>(GetControl(IDC_CONTENT_ADDITIONAL_REGISTER_BAR));
-       __pAdditionalInformationRegisterBar->SetSize(INIT_VALUE, INIT_VALUE);
+       __pExtraInformaionArea = static_cast<Panel*>(GetControl(IDC_LABEL_CONTENT_ADDITIONAL_INFO));
+       if (__pExtraInformaionArea != null)
+       {
+               __pExtraInformaionArea->SetSize(INIT_VALUE, INIT_VALUE);
+       }
 
        AddOrientationEventListener(*this);
+       GetHeader()->AddActionEventListener(*this);
        GetFooter()->AddActionEventListener(*this);
        SetFormBackEventListener(this);
        AppLogDebug("EXIT");
@@ -128,239 +125,195 @@ ContentListForm::SetCommonPopup(Tizen::Ui::Controls::Popup* commonUtilPopup)
        AppLogDebug("EXIT");
 }
 
-result
-ContentListForm::SetShowStateCommonPopup(bool isShow)
+void
+ContentListForm::SetContentList(Tizen::Ui::Container* pTableview)
 {
        AppLogDebug("ENTER");
+       __pContentList = pTableview;
        AppLogDebug("EXIT");
-       return  CommonUtil::SetShowStateControl(*__pCommonUtilPopupHandler, isShow);
 }
 
-void
-ContentListForm::RemovCommonPopup(void)
+result
+ContentListForm::ShowSharePicker(Tizen::Base::Collection::IList* pIList)
 {
        AppLogDebug("ENTER");
-       if (__pCommonUtilPopupHandler != null)
+       RemoveSharePicker();
+
+       __pSharePicker = new (std::nothrow) SharePopup();
+       if (IsFailed(__pSharePicker->Initialize(this)))
        {
-               delete __pCommonUtilPopupHandler;
-               __pCommonUtilPopupHandler = null;
+               AppLogDebug("__pSharePicker->Initialize failed(%s)", GetErrorMessage(E_FAILURE));
+               RemoveSharePicker();
+               return E_FAILURE;
        }
+
+       __pSharePicker->SetArguments(pIList);
+       __pSharePicker->SetShowState(true);
+       __pSharePicker->Show();
+
        AppLogDebug("EXIT");
+       return E_SUCCESS;
 }
 
 result
-ContentListForm::CreateSharePopup(void)
+ContentListForm::LanucherPicker(PickerType pickerType, PickerArgumentType argumentType)
 {
        AppLogDebug("ENTER");
-       DestroySharePopup();
+       IList* pArgumentList = GetPickerArgumentListN(pickerType, argumentType);
+       if (pArgumentList == null)
+       {
+               AppLogDebug("GetPickerArgumentListN is null");
+               return E_FAILURE;
+       }
+
+       result r = E_FAILURE;
+       if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER)
+       {
+               r = ShowPlayListPicker(pArgumentList);
+       }
+       else if (pickerType == PICKER_TYPE_SHARE_PICKER)
+       {
+               r = ShowSharePicker(pArgumentList);
+       }
 
-       __pSharePopup = new (std::nothrow) SharePopup();
-       result r = __pSharePopup->Initialize(this);
        if (IsFailed(r))
        {
-               AppLogDebug("__pSharePopup->Initialize() failed(%s)", GetErrorMessage(r));
-               DestroySharePopup();
-               return r;
+               AppLogDebug("ShowPlayListPicker failed(%s)", GetErrorMessage(r));
+               delete pArgumentList;
        }
 
        AppLogDebug("EXIT");
-       return E_SUCCESS;
+       return r;
 }
 
-void
-ContentListForm::DestroySharePopup(void)
+Tizen::Base::Collection::IList*
+ContentListForm::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)
 {
        AppLogDebug("ENTER");
-       if (__pSharePopup != null)
-       {
-               delete __pSharePopup;
-               __pSharePopup = null;
-       }
        AppLogDebug("EXIT");
+       return null;
 }
 
 result
-ContentListForm::CreatePlayListPickerPopup(Tizen::Base::Collection::IList* pDataList)
+ContentListForm::ShowPlayListPicker(Tizen::Base::Collection::IList* pIList)
 {
        AppLogDebug("ENTER");
-       DestroyPlayListPickerPopup();
-       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-       AppLogDebug("EXIT");
-       return __pPlayListPickerPopup->Initialize(this, pDataList);
-}
+       RemovePlayListPicker();
 
-void
-ContentListForm::DestroyPlayListPickerPopup(void)
-{
-       AppLogDebug("ENTER");
-       if (__pPlayListPickerPopup != null )
+       __pPlayListPicker = new (std::nothrow) PlayListPickerPopup();
+       if (IsFailed(__pPlayListPicker->Initialize(this, pIList)))
        {
-               delete __pPlayListPickerPopup;
-               __pPlayListPickerPopup = null;
+               AppLogDebug("__pSharePicker->Initialize failed(%s)", GetErrorMessage(E_FAILURE));
+               RemovePlayListPicker();
+               return E_FAILURE;
        }
-       AppLogDebug("EXIT");
-}
 
-void
-ContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
+       __pPlayListPicker->SetShowState(true);
+       __pPlayListPicker->Show();
 
-int
-ContentListForm::GetDefaultItemHeight(void)
-{
-       AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-       return ITEM_HEIGHT;
+       return E_SUCCESS;
 }
 
-bool
-ContentListForm::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+result
+ContentListForm::SetShowStateCommonPopup(bool isShow)
 {
        AppLogDebug("ENTER");
+       if (__pCommonUtilPopupHandler == null)
+       {
+               AppLogDebug("__pCommonUtilPopupHandler is null");
+               return E_FAILURE;
+       }
+
        AppLogDebug("EXIT");
-       return true;
+       return CommonUtil::SetShowStateControl(*__pCommonUtilPopupHandler, isShow);
 }
 
 void
-ContentListForm::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
-                                                       int itemIndexFrom,
-                                                       int itemIndexTo)
+ContentListForm::RemovCommonPopup(void)
 {
        AppLogDebug("ENTER");
+       if (__pCommonUtilPopupHandler != null)
+       {
+               delete __pCommonUtilPopupHandler;
+               __pCommonUtilPopupHandler = null;
+       }
        AppLogDebug("EXIT");
 }
 
-void
-ContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
+result
+ContentListForm::TryRemoveCommonPopup(int actionId)
 {
        AppLogDebug("ENTER");
-       GetHeader()->AddActionEventListener(*this);
-       UpdateContentListScreenState();
+       result r = E_FAILURE;
+       if (CommonUtil::IsVaildCommonPopupActionId(actionId) == true)
+       {
+               SetShowStateCommonPopup(false);
+               RemovCommonPopup();
+               r = E_SUCCESS;
+       }
        AppLogDebug("EXIT");
+       return r;
 }
 
 void
-ContentListForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
+ContentListForm::RemoveSharePicker(void)
 {
        AppLogDebug("ENTER");
-       GetHeader()->RemoveActionEventListener(*this);
+       if (__pSharePicker != null)
+       {
+               delete __pSharePicker;
+               __pSharePicker = null;
+       }
        AppLogDebug("EXIT");
 }
 
 void
-ContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
+ContentListForm::RemovePlayListPicker(void)
 {
        AppLogDebug("ENTER");
-       switch (actionId)
+       if (__pPlayListPicker != null )
        {
-       case IDA_HEADER_ALL_CHECK_BUTTON:
-               {
-                       __allSelectToggle = __allSelectToggle ? false : true;
-                       ToggleItemCheckedAll(__allSelectToggle);
-               }
-               break;
-
-       case IDA_FOOTER_BUTTON_SHARE:
-               {
-                       SetCheckedTableviewItemToShareVia();
-               }
-               break;
-
-       case IDA_CONTEXT_MENU_ITEM_SHARE_VIA:
-               {
-                       ToggleContentListScreenMode(CONTENT_LIST_SCREEN_MODE_SHARE_VIA);
-               }
-               break;
-
-       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
-               {
-                       SetCheckedTableviewItemToPlayList();
-               }
-               break;
-
-       default:
-               break;
-       }
-
-       if (CommonUtil::IsVaildContextMenuItemActionId(actionId) == true)
-       {
-               RemoveContextMenu();
-       }
-
-       if (CommonUtil::IsVaildCommonPopupActionId(actionId) == true)
-       {
-               SetShowStateCommonPopup(false);
-               RemovCommonPopup();
+               delete __pPlayListPicker;
+               __pPlayListPicker = null;
        }
        AppLogDebug("EXIT");
 }
 
-int
-ContentListForm::GetItemCount(void)
+void
+ContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
+       UpdateScreenState();
        AppLogDebug("EXIT");
-       return INIT_VALUE;
 }
 
-Tizen::Ui::Controls::TableViewItem*
-ContentListForm::CreateItem(const int itemIndex, int itemWidth)
+void
+ContentListForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-       return null;
 }
 
 void
-ContentListForm::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex,
-                                                                               Tizen::Ui::Controls::TableViewContextItem* pContextItem,
-                                                                               bool activated)
+ContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 {
        AppLogDebug("ENTER");
-       if (itemIndex >= 0)
-       {
-               AppLogDebug("INDEX %d", itemIndex);
-               __itemIndex = itemIndex;
-       }
        AppLogDebug("EXIT");
 }
 
-void
-ContentListForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex,
-                                               Tizen::Ui::Controls::TableViewItem* pItem,
-                                               Tizen::Ui::Controls::TableViewItemStatus status)
+result
+ContentListForm::TryRemoveContextMenu(int actionId)
 {
        AppLogDebug("ENTER");
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
-       {
-               TableviewSelectedItemStateChanged(tableView, status);
-               AppLogDebug("EXIT");
-               return;
-       }
-
-       if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
+       result r = E_FAILURE;
+       if (CommonUtil::IsVaildContextMenuItemActionId(actionId) == true)
        {
-               SceneManager* pSceneManager = SceneManager::GetInstance();
-               AppAssert(pSceneManager);
-
-               ArrayList* pSceneArg = MakePlayerSceneParam(itemIndex);
-               if (pSceneArg != null)
-               {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pSceneArg);
-               }
+               RemoveContextMenu();
+               r = E_SUCCESS;
        }
        AppLogDebug("EXIT");
-}
-
-Tizen::Ui::Controls::TableViewContextItem*
-ContentListForm::CreateTableViewContextItem(FlickMenuStyle menuStyle)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), menuStyle);
+       return r;
 }
 
 void
@@ -389,9 +342,9 @@ void
 ContentListForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
        AppLogDebug("ENTER");
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
-               ToggleContentListScreenMode(CONTENT_LIST_SCREEN_MODE_NORMAL);
+               ToggleScreenState(SCREEN_STATE_NORMAL);
                AppLogDebug("EXIT");
                return;
        }
@@ -406,29 +359,23 @@ void
 ContentListForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-       AppLogDebug("OnUserEventReceivedN %d", requestId);
-       if ((requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP) || (requestId == ID_DESTORY_SHARE_POPUP))
+       if ((requestId != ID_DESTORY_PLAY_LIST_PICKER_POPUP) && (requestId != ID_DESTORY_SHARE_POPUP))
        {
-               if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
-               {
-                       if (pArgs == null)
-                       {
-                               AppLogDebug("EXIT_1");
-                               return;
-                       }
-                       Boolean* pIsInitialize = static_cast<Boolean*>(pArgs->GetAt(0));
-                       if (pIsInitialize->Equals(true))
-                       {
-                               ToggleItemCheckedAll(false);
-                               __allSelectToggle = false;
-                       }
-               }
-               DestroyPlayListPickerPopup();
-               DestroySharePopup();
+               AppLogDebug("EXIT");
+               return;
        }
 
-       if (pArgs != null)
+       if (GetScreenState() != SCREEN_STATE_NORMAL && pArgs != null)
        {
+               Boolean* pIsInitialize = static_cast<Boolean*>(pArgs->GetAt(0));
+               if (pIsInitialize->Equals(true))
+               {
+                       SetItemCheckedAll(false);
+               }
+
+               RemovePlayListPicker();
+               RemoveSharePicker();
+
                pArgs->RemoveAll(true);
                delete pArgs;
        }
@@ -439,7 +386,7 @@ void
 ContentListForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
 {
        AppLogDebug("ENTER");
-       UpdateContentListScreenState();
+       UpdateScreenState();
        AppLogDebug("EXIT");
 }
 
@@ -448,11 +395,11 @@ ContentListForm::SetShowStateNoContent(bool isShow)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-       return CommonUtil::SetShowStateControl(*__pNoContentLabel, isShow);
+       return CommonUtil::SetShowStateControl(*__pNoContent, isShow);
 }
 
 result
-ContentListForm::SetShowStateItemSelectedBalloonPopup(bool isShow)
+ContentListForm::SetShowStateBalloonTooltip(bool isShow)
 {
        AppLogDebug("ENTER");
        int balloonTooltipHeight = INIT_VALUE;
@@ -460,41 +407,68 @@ ContentListForm::SetShowStateItemSelectedBalloonPopup(bool isShow)
        {
                balloonTooltipHeight = H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP;
        }
-       return CommonUtil::SetShowStateVariableHeightSizeControl(*__pItemSelectedBalloonPopup, balloonTooltipHeight, isShow);
+
+       AppLogDebug("EXIT");
+       return CommonUtil::SetShowStateVariableHeightSizeControl(*__pBallonTooltip, balloonTooltipHeight, isShow);
+}
+
+void
+ContentListForm::SetTextBallonTooltip(Tizen::Base::String tooltipText)
+{
+       AppLogDebug("ENTER");
+       __pBallonTooltip->SetText(tooltipText);
+       __pBallonTooltip->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       __pBallonTooltip->Invalidate(true);
+       AppLogDebug("EXIT");
 }
 
 result
-ContentListForm::SetShowStateAdditionalInformationRegisterBar(bool isShow)
+ContentListForm::SetShowStatExtraInformaionArea(bool isShow)
 {
        AppLogDebug("ENTER");
-       int additionalInformationHeight = INIT_VALUE;
+       if (__pExtraInformaionArea == null)
+       {
+               AppLogDebug("__pExtraInformaionArea is null");
+               return E_FAILURE;
+       }
+
+       int renewHeight = INIT_VALUE;
        if (isShow == true)
        {
-               additionalInformationHeight = __additionlInformationRegisterBarHeight;
+               renewHeight = __heightExtraInformaionArea;
        }
-       return CommonUtil::SetShowStateVariableHeightSizeControl(*__pAdditionalInformationRegisterBar, additionalInformationHeight, isShow);
+
+       AppLogDebug("EXIT");
+       return CommonUtil::SetShowStateVariableHeightSizeControl(*__pExtraInformaionArea, renewHeight, isShow);
 }
 
 result
-ContentListForm::SetShowStateContentTableview(bool isShow)
+ContentListForm::SetShowStateContentList(bool isShow)
 {
        AppLogDebug("ENTER");
+       if (__pContentList == null)
+       {
+               AppLogDebug("__pContentList is null");
+               return E_FAILURE;
+       }
+
        AppLogDebug("EXIT");
-       return CommonUtil::SetShowStateControl(*__pContentTableView, isShow);
+       return CommonUtil::SetShowStateControl(*__pContentList, isShow);
 }
 
 result
-ContentListForm::SetAdditionalInforamtion(Tizen::Ui::Control& control)
+ContentListForm::SetExtraInformaionArea(Tizen::Ui::Control& control)
 {
        AppLogDebug("ENTER");
-       if  (IsExistAdditionalInforamtion() == false)
+       RemoveExtraInformaionArea();
+       if (IsExistExtraInformaionArea() == false)
        {
                Dimension dimension = control.GetSize();
-               __additionlInformationRegisterBarHeight = dimension.height;
-               __pAdditionalInformationRegisterBar->AddControl(control);
-               CommonUtil::SetLayoutFitToContainer(*__pAdditionalInformationRegisterBar, control);
-               __pAdditionalInformationRegisterBar->SetSize(dimension);
-               __pAdditionalInformationRegisterBar->Invalidate(true);
+               __heightExtraInformaionArea = dimension.height;
+               __pExtraInformaionArea->AddControl(control);
+               CommonUtil::SetLayoutFitToContainer(*__pExtraInformaionArea, control);
+               __pExtraInformaionArea->SetSize(dimension);
+               __pExtraInformaionArea->Invalidate(true);
                return E_SUCCESS;
        }
        AppLogDebug("EXIT");
@@ -502,24 +476,24 @@ ContentListForm::SetAdditionalInforamtion(Tizen::Ui::Control& control)
 }
 
 Tizen::Ui::Control*
-ContentListForm::GetRegisteredAdditionalInforamtionControl(void)
+ContentListForm::GetExtraInformaionAreaControl(void)
 {
        AppLogDebug("ENTER");
-       if  (IsExistAdditionalInforamtion() == false)
+       if (IsExistExtraInformaionArea() == false)
        {
                AppLogDebug("AdditionalInforamtion is not Registered");
                return null;
        }
 
        AppLogDebug("EXIT");
-       return __pAdditionalInformationRegisterBar->GetControl(INIT_VALUE);
+       return __pExtraInformaionArea->GetControl(INIT_VALUE);
 }
 
 bool
-ContentListForm::IsExistAdditionalInforamtion(void)
+ContentListForm::IsExistExtraInformaionArea(void)
 {
        AppLogDebug("ENTER");
-       if (__pAdditionalInformationRegisterBar!= null && __pAdditionalInformationRegisterBar->GetControlCount() != INIT_VALUE)
+       if (__pExtraInformaionArea!= null && __pExtraInformaionArea->GetControlCount() != INIT_VALUE)
        {
                AppLogDebug("EXIT");
                return true;
@@ -529,47 +503,88 @@ ContentListForm::IsExistAdditionalInforamtion(void)
 }
 
 void
-ContentListForm::RemoveAdditionalInforamtion(void)
+ContentListForm::RemoveExtraInformaionArea(void)
 {
        AppLogDebug("ENTER");
-       if (__pAdditionalInformationRegisterBar != null)
+       if (__pExtraInformaionArea != null)
        {
-               __additionlInformationRegisterBarHeight = INIT_VALUE;
-               __pAdditionalInformationRegisterBar->RemoveAllControls();
+               __heightExtraInformaionArea = INIT_VALUE;
+               __pExtraInformaionArea->RemoveAllControls();
        }
        AppLogDebug("EXIT");
 }
 
 void
-ContentListForm::UpdateContentListScreenState(void)
+ContentListForm::UpdateScreenState(void)
 {
        AppLogDebug("ENTER");
        if (IsEmptyContentList() == true)
        {
-               SetShowStateContentTableview(false);
+               SetShowStateContentList(false);
+               SetShowStateBalloonTooltip(false);
+               SetShowStatExtraInformaionArea(false);
                SetShowStateNoContent(true);
-               SetShowStateItemSelectedBalloonPopup(false);
-               SetShowStateAdditionalInformationRegisterBar(false);
+
                GetHeader()->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
                GetHeader()->Invalidate(true);
                AppLogDebug("EXIT");
                return;
        }
 
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
-               SetShowStateItemSelectedBalloonPopup(true);
-               SetShowStateAdditionalInformationRegisterBar(false);
+               SetShowStateBalloonTooltip(true);
+               SetShowStatExtraInformaionArea(false);
        }
        else
        {
-               SetShowStateItemSelectedBalloonPopup(false);
-               SetShowStateAdditionalInformationRegisterBar(true);
+               SetShowStateBalloonTooltip(false);
+               SetShowStatExtraInformaionArea(true);
        }
 
        SetShowStateNoContent(false);
-       SetShowStateContentTableview(true);
+       SetShowStateContentList(true);
+       AppLogDebug("EXIT");
+}
+
+result
+ContentListForm::ToggleScreenState(ScreenState screenState)
+{
+       AppLogDebug("ENTER");
+       if (IsFailed(SetScreenState(screenState)))
+       {
+               AppLogDebug("SetScreenState() failed(%s)", GetErrorMessage(E_FAILURE));
+               return E_FAILURE;
+       }
+
+       if (screenState == SCREEN_STATE_NORMAL)
+       {
+               SetHeader();
+               SetFooter();
+               SetItemCheckedAll(false);
+       }
+       else
+       {
+               if (screenState == SCREEN_STATE_EDITOR)
+               {
+                       CommonUtil::SetEditHeaderStyle(*GetHeader(), ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
+                       CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_ADDTO_DELETE_ADD);
+               }
+               else if (screenState == SCREEN_STATE_SHARE_VIA)
+               {
+                       CommonUtil::SetEditHeaderStyle(*GetHeader(), L"Share via"); //NEED STRING
+                       CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_SHARE_ADD);
+               }
+
+               GetHeader()->Invalidate(true);
+               SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+               CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+       }
+
+       UpdateScreenState();
+       UpdateTableView();
        AppLogDebug("EXIT");
+       return E_SUCCESS;
 }
 
 result
@@ -619,78 +634,26 @@ ContentListForm::RemoveContextMenu(void)
        AppLogDebug("EXIT");
 }
 
-ContentListScreenMode
-ContentListForm::GetContentListScreenMode(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return __contentListScreenMode;
-}
-
-result
-ContentListForm::SetTextItemSelectedBalloonPopup(int itemCount)
+ScreenState
+ContentListForm::GetScreenState(void)
 {
        AppLogDebug("ENTER");
-       CommonUtil::SetTextItemSelectedBalloonPopup(*__pItemSelectedBalloonPopup, itemCount);
        AppLogDebug("EXIT");
-       return CommonUtil::SetShowStateVariableHeightSizeControl(*__pItemSelectedBalloonPopup, 48, true);
+       return __screenState;
 }
 
 result
-ContentListForm::ToggleContentListScreenMode(ContentListScreenMode screenMode)
+ContentListForm::SetScreenState(ScreenState screenState)
 {
        AppLogDebug("ENTER");
-       if (IsFailed(SetContentListScreenMode(screenMode)))
-       {
-               AppLogDebug("SetContentListScreenMode() failed(%s)", GetErrorMessage(E_FAILURE));
-               return E_FAILURE;
-       }
-
-       if (screenMode == CONTENT_LIST_SCREEN_MODE_NORMAL)
+       result r = E_FAILURE;
+       if (__screenState != screenState && screenState != SCREEN_STATE_MAX)
        {
-               SetContentListHeader();
-               SetContentListFooter();
-               __checkedItemCount = INIT_VALUE;
-       }
-       else
-       {
-               if (screenMode == CONTENT_LIST_SCREEN_MODE_EDITOR)
-               {
-                       CommonUtil::SetEditHeaderStyle(*GetHeader(), L"EDIT", IDA_HEADER_ALL_CHECK_BUTTON, false);
-                       CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_ADDTO_DELETE_ADD);
-               }
-               else if (screenMode == CONTENT_LIST_SCREEN_MODE_SHARE_VIA)
-               {
-                       CommonUtil::SetEditHeaderStyle(*GetHeader(), L"Share via", IDA_HEADER_ALL_CHECK_BUTTON, false);
-                       CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_SHARE_ADD);
-               }
-
-               __checkedItemCount = INIT_VALUE;
-               CommonUtil::SetItemCheckedAll(false, *__pContentTableView);
-               CommonUtil::SetTextItemSelectedBalloonPopup(*__pItemSelectedBalloonPopup, __checkedItemCount);
-               CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+               __screenState = screenState;
+               r = E_SUCCESS;
        }
-
-       UpdateContentListScreenState();
-       GetHeader()->Invalidate(true);
-       __pContentTableView->UpdateTableView();
-
        AppLogDebug("EXIT");
-       return E_SUCCESS;
-}
-
-result
-ContentListForm::SetContentListScreenMode(ContentListScreenMode screenMode)
-{
-       AppLogDebug("ENTER");
-       if (screenMode == CONTENT_LIST_SCREEN_MODE_MAX)
-       {
-               AppLogDebug("Wrong input ScreenMode(CONTENT_LIST_SCREEN_MODE_MAX)");
-               return E_FAILURE;
-       }
-       __contentListScreenMode = screenMode;
-       AppLogDebug("EXIT");
-       return E_SUCCESS;
+       return r;
 }
 
 result
@@ -709,225 +672,9 @@ ContentListForm::RemoveContentAt(const Tizen::Content::ContentId& contentId)
        return E_SUCCESS;
 }
 
-int
-ContentListForm::GetActivatedContextItem(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return __itemIndex;
-}
-
 void
-ContentListForm::ToggleItemCheckedAll(bool isChecked)
+ContentListForm::UpdateExtraInformaionArea(void)
 {
        AppLogDebug("ENTER");
-       if (isChecked == true)
-       {
-               __checkedItemCount =  __pContentTableView->GetItemCount();
-       }
-       else
-       {
-               __checkedItemCount = INIT_VALUE;
-       }
-       CommonUtil::SetItemCheckedAll(isChecked, *__pContentTableView);
-       CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
-       CommonUtil::SetTextItemSelectedBalloonPopup(*__pItemSelectedBalloonPopup, __checkedItemCount);
        AppLogDebug("EXIT");
-}
-
-void
-ContentListForm::TableviewSelectedItemStateChanged(Tizen::Ui::Controls::TableView& tableView, Tizen::Ui::Controls::TableViewItemStatus status)
-{
-       AppLogDebug("ENTER");
-       if (status == TABLE_VIEW_ITEM_STATUS_UNCHECKED)
-       {
-               __allSelectToggle = false;
-               __checkedItemCount--;
-               if (__checkedItemCount == INIT_VALUE)
-               {
-                       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
-               }
-       }
-       else if (status == TABLE_VIEW_ITEM_STATUS_CHECKED)
-       {
-               if (__checkedItemCount == INIT_VALUE)
-               {
-                       CommonUtil::SetFooterItemEnabled(*GetFooter(), true);
-               }
-
-               __checkedItemCount++;
-               if (tableView.GetItemCount() == __checkedItemCount)
-               {
-                       __allSelectToggle = true;
-               }
-       }
-
-       CommonUtil::SetTextItemSelectedBalloonPopup(*__pItemSelectedBalloonPopup, __checkedItemCount);
-       AppLogDebug("EXIT");
-}
-
-void
-ContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
-{
-       AppLogDebug("ENTER");
-       if (itemRemove)
-       {
-               int totalCount = __pContentTableView->GetItemCount();
-               for (int iCount = 0; iCount < totalCount; iCount++)
-               {
-                       if (__pContentTableView->IsItemChecked(iCount) == true)
-                       {
-                               __pContentTableView->SetItemChecked(iCount, false);
-                               ContentInformation* pContentInfo = GetContentInformation(iCount);
-                               RemoveContentAt(pContentInfo->contentId);
-                               delete pContentInfo;
-                       }
-               }
-       }
-       __checkedItemCount = INIT_VALUE;
-       __allSelectToggle = false;
-       CommonUtil::SetTextItemSelectedBalloonPopup(*__pItemSelectedBalloonPopup, __checkedItemCount);
-       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
-       AppLogDebug("EXIT");
-}
-
-result
-ContentListForm::SetCheckedTableviewItemToPlayList(void)
-{
-       AppLogDebug("ENTER");
-       Tizen::Base::Collection::ArrayList* pContentList = new (std::nothrow) ArrayList();
-       if (IsFailed(pContentList->Construct()))
-       {
-               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(GetLastResult()));
-               delete pContentList;
-               return E_FAILURE;
-       }
-
-       int totalCount = __pContentTableView->GetItemCount();
-       for (int iCount = 0; iCount < totalCount; iCount++)
-       {
-               if (__pContentTableView->IsItemChecked(iCount) == true)
-               {
-                       ContentInformation* pContentInfo = GetContentInformation(iCount);
-                       if (pContentInfo == null)
-                       {
-                               AppLogDebug("GetContentInformation(%d) is null", iCount);
-                               pContentList->RemoveAll();
-                               delete pContentList;
-                               return E_FAILURE;
-                       }
-
-                       pContentList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
-                       delete pContentInfo;
-               }
-       }
-
-       if (IsFailed(CreatePlayListPickerPopup(pContentList)))
-       {
-               AppLogDebug("CreatePlayListPickerPopup failed(%s)", GetLastResult());
-               pContentList->RemoveAll();
-               delete pContentList;
-               DestroyPlayListPickerPopup();
-               return E_FAILURE;
-       }
-
-       __pPlayListPickerPopup->SetShowState(true);
-       __pPlayListPickerPopup->Show();
-
-       AppLogDebug("EXIT");
-       return E_SUCCESS;
-}
-
-void
-ContentListForm::RefreshAdditionalInformationRegisterBar(void)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-result
-ContentListForm::SetCheckedTableviewItemToShareVia(void)
-{
-       AppLogDebug("ENTER");
-       Tizen::Base::Collection::ArrayList* pContentList = new (std::nothrow) ArrayList();
-       if (IsFailed(pContentList->Construct()))
-       {
-               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(GetLastResult()));
-               delete pContentList;
-               return E_FAILURE;
-       }
-
-       int totalCount = __pContentTableView->GetItemCount();
-       for (int iCount = 0; iCount < totalCount; iCount++)
-       {
-               if (__pContentTableView->IsItemChecked(iCount) == true)
-               {
-                       ContentInformation* pContentInfo = GetContentInformation(iCount);
-                       if (pContentInfo == null)
-                       {
-                               AppLogDebug("GetContentInformation(%d) is null", iCount);
-                               pContentList->RemoveAll();
-                               delete pContentList;
-                               return E_FAILURE;
-                       }
-
-                       pContentList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
-                       delete pContentInfo;
-               }
-       }
-
-       if (IsFailed(CreateSharePopup()))
-       {
-               AppLogDebug("CreatePlayListPickerPopup failed(%s)", GetLastResult());
-               pContentList->RemoveAll();
-               delete pContentList;
-               DestroySharePopup();
-               return E_FAILURE;
-       }
-
-       __pSharePopup->SetArguments(pContentList);
-       __pSharePopup->SetShowState(true);
-       __pSharePopup->Show();
-
-       AppLogDebug("EXIT");
-       return E_SUCCESS;
-}
-
-result
-ContentListForm::SetActivatedContextItemToPlaylist(void)
-{
-       AppLogDebug("ENTER");
-       Tizen::Base::Collection::ArrayList* pContentList = new (std::nothrow) ArrayList();
-       if (IsFailed(pContentList->Construct()))
-       {
-               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(GetLastResult()));
-               delete pContentList;
-               return E_FAILURE;
-       }
-
-       ContentInformation* pContentInfo = GetContentInformation(GetActivatedContextItem());
-       if (pContentInfo == null)
-       {
-               delete pContentList;
-               AppLogDebug("GetContentInformation(%d) is null", GetActivatedContextItem());
-               return E_FAILURE;
-       }
-
-       pContentList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
-
-       if (IsFailed(CreatePlayListPickerPopup(pContentList)))
-       {
-               AppLogDebug("CreatePlayListPickerPopup failed(%s)", GetLastResult());
-               pContentList->RemoveAll();
-               delete pContentList;
-               delete __pPlayListPickerPopup;
-               __pPlayListPickerPopup = null;
-               return E_FAILURE;
-       }
-
-       __pPlayListPickerPopup->SetShowState(true);
-       __pPlayListPickerPopup->Show();
-
-       AppLogDebug("EXIT");
-       return E_SUCCESS;
 }
\ No newline at end of file
index a07d649..d3898c9 100644 (file)
@@ -32,7 +32,7 @@ using namespace Tizen::Ui::Controls;
 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_SHOW_MINI_PLAYER_STATUS_LANDSCAPE_REGISTER_BAR = 144;\r
 static const int H_HIDE_MINI_PLAYER_REGISTER_BAR = 0;\r
 \r
 ContentLibaryPanel::ContentLibaryPanel(void)\r
index 562202e..2be7738 100644 (file)
@@ -44,8 +44,12 @@ static const int COUNT_MESSAGE_BOX_TIMEOUT = 3000;
 FolderContentListForm::FolderContentListForm(void)
        : ContentListForm::ContentListForm()
        , ThumbnailBase::ThumbnailBase()
+       , __pTableViewContextItem(null)
        , __pThumbnail(null)
        , __pPresentationModel(null)
+       , __checkedItemCount(0)
+       , __currentFolderIndex(0)
+       , __activatedStateContextItem(0)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -58,11 +62,38 @@ FolderContentListForm::~FolderContentListForm(void)
 }
 
 result
+FolderContentListForm::Initialize(void)
+{
+       AppLogDebug("ENTER");
+       if (IsFailed(Form::Construct(IDL_CONTENT_LIST_FORM)))
+       {
+               AppLogDebug("Construct(IDL_CONTENT_LIST_FORM) failed(%s)", GetErrorMessage(GetLastResult()));
+               return false;
+       }
+
+       AppLogDebug("EXIT");
+       return Construct();
+}
+
+result
+FolderContentListForm::Construct(void)
+{
+       AppLogDebug("ENTER");
+       __pContentListTableView = static_cast<TableView*>(GetControl(IDC_TABLEVIEW_CONTENT_LIST));
+       __pContentListTableView->AddTableViewItemEventListener(*this);
+       __pContentListTableView->SetItemProvider(this);
+
+       SetContentList(__pContentListTableView);
+       AppLogDebug("EXIT");
+       return ContentListForm::Construct();
+}
+
+result
 FolderContentListForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       SetContentListFooter();
-       __pContextItem = CreateTableViewContextItem(FLICK_MENU_STYLE_TYPE_01);
+       SetFooter();
+       __pTableViewContextItem = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_01);
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -71,8 +102,9 @@ result
 FolderContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       delete __pContextItem;
-       __pContextItem = null;
+       __pPresentationModel = null;
+       delete __pTableViewContextItem;
+       __pTableViewContextItem = null;
        AppLogDebug("EXIT");
        return ContentListForm::OnTerminating();
 }
@@ -86,12 +118,12 @@ FolderContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        if (pArgs != null)
        {
                __prevSceneId.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_SCENE_NAME)));
-               __currentContentIndex = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
+               __currentFolderIndex = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
                String* pStrContentPath = static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME));
 
                __pPresentationModel = FolderListPresentationModel::GetInstance();
                __pPresentationModel->UpdateFolderPathList();
-               __pPresentationModel->InitializeContentList(__currentContentIndex);
+               __pPresentationModel->InitializeContentList(__currentFolderIndex);
 
                int position = INIT_VALUE;
                pStrContentPath->LastIndexOf(IDS_SEPARATOR_SLASH, pStrContentPath->GetLength() - 1, position);
@@ -108,20 +140,16 @@ FolderContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
                        pAdditionalInfo->SetTextConfig(32, LABEL_TEXT_STYLE_BOLD);
                        pAdditionalInfo->SetTextColor(COLOR_ITEM_SUB_TEXT);
 
-                       SetAdditionalInforamtion(*pAdditionalInfo);
+                       SetExtraInformaionArea(*pAdditionalInfo);
                }
-               SetContentListHeader();
+
+               SetHeader();
+               UpdateScreenState();
+               UpdateTableView();
 
                pArgs->RemoveAll(true);
                delete pArgs;
        }
-       else
-       {
-               // Empty statement
-       }
-
-       ContentListForm::OnSceneActivatedN(previousSceneId, currentSceneId, null);
-       __pContentTableView->UpdateTableView();
        AppLogDebug("EXIT");
 }
 
@@ -157,15 +185,10 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
-                       ToggleContentListScreenMode(CONTENT_LIST_SCREEN_MODE_EDITOR);
+                       ToggleScreenState(SCREEN_STATE_EDITOR);
                }
                break;
 
-       case IDA_CONTEXT_MENU_ITEM_SHARE_VIA:
-               {
-                       ToggleContentListScreenMode(CONTENT_LIST_SCREEN_MODE_SHARE_VIA);
-               }
-               break;
        case IDA_FOOTER_BUTTON_MORE:
                {
                        CreateContextMenuN(source);
@@ -173,9 +196,20 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
                }
                break;
 
-       case IDA_FLICK_MENU_ITEM_ADDTO:
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
                {
-                       SetActivatedContextItemToPlaylist();
+                       bool isChecked = true;
+                       if (__checkedItemCount == __pContentListTableView->GetItemCount())
+                       {
+                               isChecked = false;
+                       }
+                       SetItemCheckedAll(isChecked);
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
+               {
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER);
                }
                break;
 
@@ -205,12 +239,18 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
                }
                break;
 
+       case IDA_FLICK_MENU_ITEM_ADDTO:
+               {
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER, PICKER_ARGUMENT_TYPE_ACTIVATED_STATE_CONTEXT_ITEM);
+               }
+               break;
+
        case IDA_COMMON_POPUP_DELETE:
                {
-                       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(GetActivatedContextItem());
+                       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
                        RemoveContentAt(pContentInfo->contentId);
-                       __pPresentationModel->RefreshContentList(__currentContentIndex);
-                       __pContentTableView->RefreshItem(GetActivatedContextItem(), TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
+                       __pPresentationModel->RefreshContentList(__currentFolderIndex);
+                       __pContentListTableView->RefreshItem(__activatedStateContextItem, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE);
                }
                break;
 
@@ -226,7 +266,7 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
                                return;
                        }
 
-                       ContentInformation* pContentInfo = GetContentInformation(GetActivatedContextItem());
+                       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
                        if (pContentInfo == null)
                        {
                                AppLogDebug("PresentationModel->GetContentInfoN is null");
@@ -250,7 +290,7 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_CONTEXT_MENU_ITEM_CALL:
                {
-                       ContentInformation* pContentInfo =  GetContentInformation(GetActivatedContextItem());
+                       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
                        if (pContentInfo == null)
                        {
                                AppLogDebug("PresentationModel->GetContentInfoN is null");
@@ -292,24 +332,19 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
        case IDA_FOOTER_BUTTON_DELETE:
                {
                        RemoveCheckedTableviewItem(true);
-                       __pPresentationModel->RefreshContentList(__currentContentIndex);
+                       __pPresentationModel->RefreshContentList(__currentFolderIndex);
 
-                       UpdateContentListScreenState();
-                       __pContentTableView->UpdateTableView();
+                       UpdateScreenState();
+                       UpdateTableView();
                }
                break;
 
-//     case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
-//             {
-//                     SetCheckedTableviewItemToPlayList();
-//             }
-//             break;
-
        default:
                break;
        }
 
-       ContentListForm::OnActionPerformed(source, actionId);
+       TryRemoveContextMenu(actionId);
+       TryRemoveCommonPopup(actionId);
        AppLogDebug("EXIT");
 }
 
@@ -318,7 +353,7 @@ FolderContentListForm::GetItemCount(void)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-       return __pPresentationModel->GetContentCount(__currentContentIndex);
+       return __pPresentationModel->GetContentCount(__currentFolderIndex);
 }
 
 Tizen::Ui::Controls::TableViewItem*
@@ -330,7 +365,7 @@ FolderContentListForm::CreateItem(const int itemIndex, int itemWidth)
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
        TableViewAnnexStyle tableViewAnnexStyle  = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_MARK;
        }
@@ -362,7 +397,63 @@ FolderContentListForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
                                                        Tizen::Ui::Controls::TableViewItemStatus status)
 {
        AppLogDebug("ENTER");
-       ContentListForm::OnTableViewItemStateChanged(tableView, itemIndex, pItem, status);
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
+       {
+               SetItemCheckedStateChanged(status);
+               AppLogDebug("EXIT");
+               return;
+       }
+
+       if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
+       {
+               SceneManager* pSceneManager = SceneManager::GetInstance();
+               AppAssert(pSceneManager);
+
+               ArrayList* pSceneArg = MakePlayerSceneParam(itemIndex);
+               if (pSceneArg != null)
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pSceneArg);
+               }
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+FolderContentListForm::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex,
+                                                                               Tizen::Ui::Controls::TableViewContextItem* pContextItem,
+                                                                               bool activated)
+{
+       AppLogDebug("ENTER");
+       if (itemIndex >= 0)
+       {
+               AppLogDebug("INDEX %d", itemIndex);
+               __activatedStateContextItem = itemIndex;
+       }
+       AppLogDebug("EXIT");
+}
+
+int
+FolderContentListForm::GetDefaultItemHeight(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return ITEM_HEIGHT;
+}
+
+bool
+FolderContentListForm::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return true;
+}
+
+void
+FolderContentListForm::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
+                                                       int itemIndexFrom,
+                                                       int itemIndexTo)
+{
+       AppLogDebug("ENTER");
        AppLogDebug("EXIT");
 }
 
@@ -373,7 +464,7 @@ FolderContentListForm::MakePlayerSceneParam(int startIndex)
        ArrayList* pTempList = new (std::nothrow) ArrayList();
        ArrayList* pSelectedMusicContent = null;
 
-       pSelectedMusicContent = __pPresentationModel->GetContentPathListN(__currentContentIndex);
+       pSelectedMusicContent = __pPresentationModel->GetContentPathListN(__currentFolderIndex);
        if (pTempList == null || pSelectedMusicContent == null)
        {
                return null;
@@ -392,7 +483,7 @@ FolderContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& p
 {
        AppLogDebug("ENTER");
        Panel* pTableViewItem =  new (std::nothrow) Panel();
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                if (IsFailed(pTableViewItem->Construct(IDL_CONTENT_LIST_FOLDER_EDITOR_ITEM_PANEL)))
                {
@@ -407,7 +498,7 @@ FolderContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& p
                        AppLogDebug("Construct(IDL_CONTENTS_LIBARY_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
                        return E_FAILURE;
                }
-               parent.SetContextItem(__pContextItem);
+               parent.SetContextItem(__pTableViewContextItem);
        }
 
        String filePath = contentInfo.ContentFilePath;
@@ -456,7 +547,7 @@ bool
 FolderContentListForm::IsEmptyContentList(void)
 {
        AppLogDebug("ENTER");
-       if (__pPresentationModel->GetContentCount(__currentContentIndex) != INIT_VALUE)
+       if (__pPresentationModel->GetContentCount(__currentFolderIndex) != INIT_VALUE)
        {
                return false;
        }
@@ -464,16 +555,8 @@ FolderContentListForm::IsEmptyContentList(void)
        return true;
 }
 
-ContentInformation*
-FolderContentListForm::GetContentInformation(int index)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return __pPresentationModel->GetContentInfoN(index);
-}
-
 result
-FolderContentListForm::SetContentListHeader(void)
+FolderContentListForm::SetHeader(void)
 {
        AppLogDebug("ENTER");
        CommonUtil::SetSimpleTitleStyle(*GetHeader(), __headerTitle);
@@ -482,7 +565,7 @@ FolderContentListForm::SetContentListHeader(void)
 }
 
 result
-FolderContentListForm::SetContentListFooter(void)
+FolderContentListForm::SetFooter(void)
 {
        AppLogDebug("ENTER");
        CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_MORE_ADD);
@@ -515,7 +598,7 @@ FolderContentListForm::OnAppControlCompleteResponseReceived(const AppId& appId,
                        AddressbookManager* pAddressbookManager = AddressbookManager::GetInstance();
                        Addressbook* pAddressbook = pAddressbookManager->GetAddressbookN(DEFAULT_ADDRESSBOOK_ID);
 
-                       ContentInformation* pCcontentInfo = __pPresentationModel->GetContentInfoN(GetActivatedContextItem());
+                       ContentInformation* pCcontentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
                        if (pCcontentInfo == null)
                        {
                                delete pAddressbook;
@@ -562,7 +645,7 @@ FolderContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
        {
                itemIndex = *(static_cast<int*>(pParam));
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       __pContentListTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
        delete pThumbnailInfo;
        delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
@@ -581,7 +664,7 @@ FolderContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewI
 {
        AppLogDebug("ENTER");
        Panel* pItemPanel = null;
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENT_LIST_FOLDER_EDITOR_ITEM_PANEL));
        }
@@ -612,3 +695,144 @@ FolderContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewI
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
 }
+
+int
+FolderContentListForm::GetCheckedItemCount(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __checkedItemCount;
+}
+
+void
+FolderContentListForm::UpdateTableView(void)
+{
+       AppLogDebug("ENTER");
+       __pContentListTableView->UpdateTableView();
+       AppLogDebug("EXIT");
+}
+
+void
+FolderContentListForm::SetItemCheckedAll(bool isChecked)
+{
+       AppLogDebug("ENTER");
+       if (isChecked == true)
+       {
+               __checkedItemCount = __pContentListTableView->GetItemCount();
+       }
+       else
+       {
+               __checkedItemCount = INIT_VALUE;
+       }
+       CommonUtil::SetItemCheckedAll(isChecked, *__pContentListTableView);
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       AppLogDebug("EXIT");
+}
+
+void
+FolderContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
+{
+       AppLogDebug("ENTER");
+       if (itemRemove)
+       {
+               int totalCount = __pContentListTableView->GetItemCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentListTableView->IsItemChecked(iCount) == true)
+                       {
+                               __pContentListTableView->SetItemChecked(iCount, false);
+                               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(iCount);
+                               RemoveContentAt(pContentInfo->contentId);
+                               delete pContentInfo;
+                       }
+               }
+       }
+
+       __checkedItemCount = INIT_VALUE;
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+       AppLogDebug("EXIT");
+}
+
+void
+FolderContentListForm::SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewItemStatus status)
+{
+       AppLogDebug("ENTER");
+       if (status == TABLE_VIEW_ITEM_STATUS_UNCHECKED)
+       {
+               __checkedItemCount--;
+               if (__checkedItemCount == INIT_VALUE)
+               {
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+               }
+       }
+       else if (status == TABLE_VIEW_ITEM_STATUS_CHECKED)
+       {
+               if (__checkedItemCount == INIT_VALUE)
+               {
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), true);
+               }
+
+               __checkedItemCount++;
+       }
+
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       AppLogDebug("EXIT");
+}
+
+Tizen::Base::Collection::IList*
+FolderContentListForm::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)
+{
+       AppLogDebug("ENTER");
+       Tizen::Base::Collection::ArrayList* pContentFilePathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       if (IsFailed(pContentFilePathList->Construct()))
+       {
+               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(GetLastResult()));
+               delete pContentFilePathList;
+               return null;
+       }
+
+       if (argumentType == PICKER_ARGUMENT_TYPE_ACTIVATED_STATE_CONTEXT_ITEM)
+       {
+               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
+               if (pContentInfo == null)
+               {
+                       delete pContentFilePathList;
+                       AppLogDebug("GetContentInfoN(%d) is null", __activatedStateContextItem);
+                       return null;
+               }
+
+               pContentFilePathList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
+               delete pContentInfo;
+       }
+       else if (argumentType == PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL)
+       {
+               int totalCount = __pContentListTableView->GetItemCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentListTableView->IsItemChecked(iCount) == true)
+                       {
+                               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(iCount);
+                               if (pContentInfo == null)
+                               {
+                                       AppLogDebug("GetContentInfoN(%d) is null", iCount);
+                                       delete pContentFilePathList;
+                                       return null;
+                               }
+
+                               if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER)
+                               {
+                                       pContentFilePathList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
+                               }
+                               else if (pickerType == PICKER_TYPE_SHARE_PICKER)
+                               {
+                                       pContentFilePathList->Add(*(new (std::nothrow) String(L"attachment:" + pContentInfo->ContentFilePath)));
+                               }
+                               delete pContentInfo;
+                       }
+               }
+       }
+       AppLogDebug("EXIT");
+       return pContentFilePathList;
+}
\ No newline at end of file
index 9954eaa..c23e5ae 100644 (file)
@@ -86,7 +86,7 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        switch (actionId)
        {
-       case IDA_HEADER_ALL_CHECK_BUTTON:
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
                {
                        if (totalCount == __checkedItemCount)
                        {
@@ -475,7 +475,7 @@ FolderListEditorPanel::SetEditHeaderStyle(void)
        RemoveParentHeaderActionEventListener();
        Header* pHeader = GetParentHeader();
        String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        pHeader->AddActionEventListener(*this);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
index aa49b98..8686385 100644 (file)
@@ -123,18 +123,18 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                pSceneManager->AddSceneEventListener(sceneId, *pForm);
                pNewForm = pForm;
        }
-//     else if (formId == IDC_ARTIST_CONTENT_LIST_FORM)
-//     {
-//             ArtistContentListForm* pForm = new (std::nothrow) ArtistContentListForm();
-//             if (pForm == null)
-//             {
-//                     AppLogDebug("EXIT");
-//                     return null;
-//             }
-//             pForm->Initialize();
-//             pSceneManager->AddSceneEventListener(sceneId, *pForm);
-//             pNewForm = pForm;
-//     }
+       else if (formId == IDC_ARTIST_CONTENT_LIST_FORM)
+       {
+               ArtistContentListForm* pForm = new (std::nothrow) ArtistContentListForm();
+               if (pForm == null)
+               {
+                       AppLogDebug("EXIT");
+                       return null;
+               }
+               pForm->Initialize();
+               pSceneManager->AddSceneEventListener(sceneId, *pForm);
+               pNewForm = pForm;
+       }
 //     else if (formId == IDC_GENRE_CONTENT_LIST_FORM)
 //     {
 //             GenreContentListForm* pForm = new (std::nothrow) GenreContentListForm();
index 796ebe0..ada7e34 100644 (file)
@@ -88,7 +88,7 @@ GenreContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
        __checkedItemCount = 0;
-       DestroyPlayListPickerPopup();
+       RemovePlayListPicker();
 
        delete __pContextItem;
        __pContextItem = null;
index fe2a1eb..1dafb56 100644 (file)
@@ -80,51 +80,18 @@ MiniPlayer::Construct(void)
                AppLogDebug("PlayerPresentationModel::GetInstance() failed");\r
                return E_FAILURE;\r
        }\r
-       __pPresentationModel->AddMusicPlayerEventListener(*this);\r
 \r
        __pThumbnailLabel = static_cast<Label*>(GetControl(IDC_CONTENTS_THUMBNAIL));\r
-       __pThumbnailLabel->SetBackgroundBitmap(*__pPresentationModel->GetPlayContentThumbnail());\r
        __pThumbnailLabel->AddTouchEventListener(*this);\r
 \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
@@ -134,7 +101,6 @@ MiniPlayer::Construct(void)
        __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
        Bitmap* pBackNormalBitmap = ResourceManager::GetBitmapN(L"00_icon_Back_02_web.png");\r
        Bitmap* pBackPressBitmap = ResourceManager::GetBitmapN(L"00_icon_Back_02_press_web.png");\r
@@ -481,8 +447,8 @@ MiniPlayer::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphi
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER));\r
                }\r
        }\r
-       else if(__pMinPlayerPrevButton->GetHashCode() == source.GetHashCode() ||\r
-                       __pMinPlayerNextButton->GetHashCode() == source.GetHashCode())\r
+       else if (__pMinPlayerPrevButton->GetHashCode() == source.GetHashCode()\r
+                       || __pMinPlayerNextButton->GetHashCode() == source.GetHashCode())\r
        {\r
                __isLongPressed = false;\r
        }\r
@@ -522,7 +488,7 @@ MiniPlayer::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graph
        }\r
        else\r
        {\r
-               if (__pMinPlayerPrevButton->GetHashCode() == source.GetHashCode() )\r
+               if (__pMinPlayerPrevButton->GetHashCode() == source.GetHashCode())\r
                {\r
                        if (__pPresentationModel->GetContentListCount() > 1)\r
                        {\r
@@ -550,7 +516,7 @@ MiniPlayer::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graph
                                }\r
                        }\r
                }\r
-               else if (__pMinPlayerNextButton->GetHashCode() == source.GetHashCode() )\r
+               else if (__pMinPlayerNextButton->GetHashCode() == source.GetHashCode())\r
                {\r
                        if (__pPresentationModel->GetContentListCount() > 1)\r
                        {\r
@@ -590,8 +556,41 @@ void
 MiniPlayer::MiniPlayerActivate(void)\r
 {\r
        AppLogDebug("ENTER");\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
+       __pThumbnailLabel->SetBackgroundBitmap(*__pPresentationModel->GetPlayContentThumbnail());\r
+       __pThumbnailLabel->Draw();\r
+\r
+       __pTitleLabel->SetText(*__pPresentationModel->GetPlayContentTitle());\r
+       __pTitleLabel->Draw();\r
+\r
+       String miniPlayerAtritsName;\r
+       miniPlayerAtritsName.Append(L" - ");\r
+       miniPlayerAtritsName.Append(*__pPresentationModel->GetPlayContentArtist());\r
+       __pArtistLabel->SetText(miniPlayerAtritsName);\r
+       __pArtistLabel->Draw();\r
+\r
+       __pMinPlayerPlayToggleButton->Draw();\r
        __pProgressBar->SetValue(__pPresentationModel->GetPlayPosition());\r
        __pProgressBar->Draw(true);\r
+\r
+       __pPresentationModel->AddMusicPlayerEventListener(*this);\r
        AppLogDebug("EXIT");\r
 }\r
 \r
@@ -599,5 +598,6 @@ void
 MiniPlayer::MiniPlayerDeactivate(void)\r
 {\r
        AppLogDebug("ENTER");\r
+       __pPresentationModel->RemoveMusicPlayerEventListener(*this);\r
        AppLogDebug("EXIT");\r
-}\r
+}
\ No newline at end of file
index 05e6e70..b251d92 100644 (file)
@@ -202,6 +202,7 @@ MusicPlayerApp::OnForeground(void)
        {
                __pMainFrame->GoToInitialScene(pSceneManager->GetCurrentSceneId(), __pDataList);
        }
+
        if (__pDataList != null)
        {
                __pDataList->RemoveAll(true);
@@ -212,7 +213,7 @@ MusicPlayerApp::OnForeground(void)
        Frame* pFrame = GetFrameAt(0);
        AppAssert(pFrame);
        pFrame->SetEnabled(true);
-
+       pFrame->Invalidate(true);
        AppLogDebug("EXIT");
 }
 
@@ -295,7 +296,7 @@ void
 MusicPlayerApp::ParsingArgument(const Tizen::Base::String* pUriData, const Tizen::Base::Collection::IMap* pArgs)
 {
        AppLogDebug("ENTER");
-       const String* pContentPath = null;
+//     const String* pContentPath = null;
        String sourceStr;
 
        if (pUriData != null)
@@ -371,4 +372,4 @@ MusicPlayerApp::GetOperationId(void)
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
        return __operationId;
-}
+}
\ No newline at end of file
index 02b075d..0212245 100644 (file)
@@ -319,13 +319,9 @@ PlayerForm::OnInitializing(void)
        AddOrientationEventListener(*this);
        AddKeyEventListener(*this);
 
-       SettingPresentationModel::GetInstance()->AddSettingEventListener(*this);
-
        UpdateSplitBarState();
        TogglePlayPauseImage(PLAYER_STATE_CLOSED);
 
-       __pPlayerPresentationModel->AddMusicPlayerEventListener(*this);
-
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -420,7 +416,6 @@ PlayerForm::OnTerminating(void)
                __pPlayerPresentationModel->RemoveMusicPlayerEventListener(*this);
                __pPlayerPresentationModel->DestroyPlayerPresentationModel();
        }
-       SettingPresentationModel::GetInstance()->RemoveSettingEventListener(*this);
        SettingPresentationModel::GetInstance()->DestroySettingPresentationModel();
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -1208,6 +1203,7 @@ PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
        SetKeyCapture(KEY_SIDE_DOWN);
        */
 
+       __pPlayerPresentationModel->AddMusicPlayerEventListener(*this);
        if (previousSceneId != IDSCN_MUSIC_SETTING
                && previousSceneId != IDSCN_PLAYLIST_CREATOR
                && previousSceneId != IDSCN_CONTENT_DETAIL)
@@ -1248,6 +1244,7 @@ PlayerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
                                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
+       __pPlayerPresentationModel->RemoveMusicPlayerEventListener(*this);
        CancelAllThumbnailRequest();
        AppLogDebug("EXIT");
 }
@@ -1911,4 +1908,4 @@ PlayerForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file
index 2fdde03..3b1a263 100644 (file)
@@ -44,8 +44,12 @@ static const int COUNT_MESSAGE_BOX_TIMEOUT = 3000;
 PlaylistContentListForm::PlaylistContentListForm(void)
        : ContentListForm::ContentListForm()
        , ThumbnailBase::ThumbnailBase()
+       , __pContentListTableView(null)
        , __pThumbnail(null)
        , __pPresentationModel(null)
+       , __checkedItemCount(0)
+       , __currentContentType(-1)
+       , __activatedStateContextItem(-1)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -58,10 +62,37 @@ PlaylistContentListForm::~PlaylistContentListForm(void)
 }
 
 result
+PlaylistContentListForm::Initialize(void)
+{
+       AppLogDebug("ENTER");
+       if (IsFailed(Form::Construct(IDL_CONTENT_LIST_FORM)))
+       {
+               AppLogDebug("Construct(IDL_CONTENT_LIST_FORM) failed(%s)", GetErrorMessage(GetLastResult()));
+               return false;
+       }
+
+       AppLogDebug("EXIT");
+       return Construct();
+}
+
+result
+PlaylistContentListForm::Construct(void)
+{
+       AppLogDebug("ENTER");
+       __pContentListTableView = static_cast<TableView*>(GetControl(IDC_TABLEVIEW_CONTENT_LIST));
+       __pContentListTableView->AddTableViewItemEventListener(*this);
+       __pContentListTableView->SetItemProvider(this);
+
+       SetContentList(__pContentListTableView);
+       AppLogDebug("EXIT");
+       return ContentListForm::Construct();
+}
+
+result
 PlaylistContentListForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       SetContentListFooter();
+       SetFooter();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -70,8 +101,6 @@ result
 PlaylistContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       delete __pContextItem;
-       __pContextItem = null;
        AppLogDebug("EXIT");
        return ContentListForm::OnTerminating();
 }
@@ -86,6 +115,17 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        switch (actionId)
        {
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
+               {
+                       bool isChecked = true;
+                       if (__checkedItemCount == __pContentListTableView->GetItemCount())
+                       {
+                               isChecked = false;
+                       }
+                       SetItemCheckedAll(isChecked);
+               }
+               break;
+
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
@@ -94,7 +134,19 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
-                       ToggleContentListScreenMode(CONTENT_LIST_SCREEN_MODE_EDITOR);
+                       ToggleScreenState(SCREEN_STATE_EDITOR);
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_SHARE:
+               {
+                       LanucherPicker(PICKER_TYPE_SHARE_PICKER);
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
+               {
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER);
                }
                break;
 
@@ -107,7 +159,7 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_FOOTER_BUTTON_DELETE:
                {
-                       if (__currentContentIndex == RECENTLY_ADDED_CONTENT)
+                       if (__currentContentType == RECENTLY_ADDED_CONTENT)
                        {
                                RemoveCheckedTableviewItem(true);
                        }
@@ -116,15 +168,15 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int
                                int totalCount = __pPresentationModel->GetContentCount();
                                for (int iCount = 0; iCount < totalCount; iCount++)
                                {
-                                       if (__pContentTableView->IsItemChecked(iCount) == true)
+                                       if (__pContentListTableView->IsItemChecked(iCount) == true)
                                        {
                                                ContentInformation* pContentInfoStruct = __pPresentationModel->GetContentInfoN(iCount);
                                                if (pContentInfoStruct == null)
                                                {
                                                        return;
                                                }
-                                               __pContentTableView->SetItemChecked(iCount, false);
-                                               __pPresentationModel->DeleteContent(__currentContentIndex, *pContentInfoStruct);
+                                               __pContentListTableView->SetItemChecked(iCount, false);
+                                               __pPresentationModel->DeleteContent(__currentContentType, *pContentInfoStruct);
 
                                                delete pContentInfoStruct;
                                                pContentInfoStruct = null;
@@ -133,9 +185,9 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int
                                RemoveCheckedTableviewItem(false);
                        }
 
-                       __pPresentationModel->UpdatePlaylistContentList(__currentContentIndex, __headerTitle);
-                       UpdateContentListScreenState();
-                       __pContentTableView->UpdateTableView();
+                       __pPresentationModel->UpdatePlaylistContentList(__currentContentType, __headerTitle);
+                       UpdateScreenState();
+                       UpdateTableView();
                }
                break;
 
@@ -143,7 +195,7 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int
                break;
        }
 
-       ContentListForm::OnActionPerformed(source, actionId);
+       TryRemoveContextMenu(actionId);
        AppLogDebug("EXIT");
 }
 
@@ -157,19 +209,18 @@ PlaylistContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& pre
        {
                __prevSceneId.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_SCENE_NAME)));
                __headerTitle.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME)));
-               __currentContentIndex = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
+               __currentContentType = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
 
                __pPresentationModel = PlaylistListPresentationModel::GetInstance();
-               __pPresentationModel->UpdatePlaylistContentList(__currentContentIndex, __headerTitle);
+               __pPresentationModel->UpdatePlaylistContentList(__currentContentType, __headerTitle);
 
-               SetContentListHeader();
+               SetHeader();
+               UpdateScreenState();
+               UpdateTableView();
 
                pArgs->RemoveAll(true);
                delete pArgs;
        }
-
-       ContentListForm::OnSceneActivatedN(previousSceneId, currentSceneId, null);
-       __pContentTableView->UpdateTableView();
        AppLogDebug("EXIT");
 }
 
@@ -186,6 +237,11 @@ int
 PlaylistContentListForm::GetItemCount(void)
 {
        AppLogDebug("ENTER");
+       if (__pPresentationModel == null)
+       {
+               AppLogDebug("EXIT");
+               return INIT_VALUE;
+       }
        AppLogDebug("EXIT");
        return __pPresentationModel->GetContentCount();
 }
@@ -199,7 +255,7 @@ PlaylistContentListForm::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        TableViewAnnexStyle tableViewAnnexStyle  = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_MARK;
        }
@@ -235,7 +291,62 @@ PlaylistContentListForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableV
                                                        Tizen::Ui::Controls::TableViewItemStatus status)
 {
        AppLogDebug("ENTER");
-       ContentListForm::OnTableViewItemStateChanged(tableView, itemIndex, pItem, status);
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
+       {
+               SetItemCheckedStateChanged(status);
+               AppLogDebug("EXIT");
+               return;
+       }
+
+       if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
+       {
+               SceneManager* pSceneManager = SceneManager::GetInstance();
+               AppAssert(pSceneManager);
+
+               ArrayList* pSceneArg = MakePlayerSceneParam(itemIndex);
+               if (pSceneArg != null)
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pSceneArg);
+               }
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistContentListForm::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex,
+                                                                               Tizen::Ui::Controls::TableViewContextItem* pContextItem,
+                                                                               bool activated)
+{
+       AppLogDebug("ENTER");
+       if (itemIndex >= 0)
+       {
+               __activatedStateContextItem = itemIndex;
+       }
+       AppLogDebug("EXIT");
+}
+
+int
+PlaylistContentListForm::GetDefaultItemHeight(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return ITEM_HEIGHT;
+}
+
+bool
+PlaylistContentListForm::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return true;
+}
+
+void
+PlaylistContentListForm::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
+                                                       int itemIndexFrom,
+                                                       int itemIndexTo)
+{
+       AppLogDebug("ENTER");
        AppLogDebug("EXIT");
 }
 
@@ -253,7 +364,7 @@ PlaylistContentListForm::GetSearchResultContentList(int itemIndex)
 
        pTempList->Add(*(new (std::nothrow) String(MUSIC)));
        pTempList->Add(*(new (std::nothrow) Integer(itemIndex)));
-       pTempList->Add(*(__pPresentationModel->GetContentPathListN(__currentContentIndex)));
+       pTempList->Add(*(__pPresentationModel->GetContentPathListN(__currentContentType)));
        AppLogDebug("EXIT");
        return pTempList;
 }
@@ -272,7 +383,7 @@ PlaylistContentListForm::GetAudioContentInfoContentList(int itemIndex)
 
        pTempList->Add(*(new (std::nothrow) String(MUSIC)));
        pTempList->Add(*(new (std::nothrow) Integer(itemIndex)));
-       pTempList->Add(*(__pPresentationModel->GetContentPathListN(__currentContentIndex)));
+       pTempList->Add(*(__pPresentationModel->GetContentPathListN(__currentContentType)));
        AppLogDebug("EXIT");
        return pTempList;
 }
@@ -289,16 +400,24 @@ PlaylistContentListForm::IsEmptyContentList(void)
        return true;
 }
 
+int
+PlaylistContentListForm::GetCheckedItemCount(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __checkedItemCount;
+}
+
 Tizen::Base::Collection::ArrayList*
 PlaylistContentListForm::MakePlayerSceneParam(int startIndex)
 {
        AppLogDebug("ENTER");
-       if (__currentContentIndex != RECENTLY_ADDED_CONTENT)
+       if (__currentContentType != RECENTLY_ADDED_CONTENT)
        {
                AppLogDebug("EXIT");
                return GetAudioContentInfoContentList(startIndex);
        }
-       else if (__currentContentIndex == RECENTLY_ADDED_CONTENT)
+       else if (__currentContentType == RECENTLY_ADDED_CONTENT)
        {
                AppLogDebug("EXIT");
                return GetSearchResultContentList(startIndex);
@@ -307,17 +426,8 @@ PlaylistContentListForm::MakePlayerSceneParam(int startIndex)
        return null;
 }
 
-ContentInformation*
-PlaylistContentListForm::GetContentInformation(int index)
-{
-
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return __pPresentationModel->GetContentInfoN(index);
-}
-
 result
-PlaylistContentListForm::SetContentListHeader(void)
+PlaylistContentListForm::SetHeader(void)
 {
        AppLogDebug("ENTER");
        CommonUtil::SetSimpleTitleStyle(*GetHeader(), __headerTitle);
@@ -326,7 +436,7 @@ PlaylistContentListForm::SetContentListHeader(void)
 }
 
 result
-PlaylistContentListForm::SetContentListFooter(void)
+PlaylistContentListForm::SetFooter(void)
 {
        AppLogDebug("ENTER");
        CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_MORE_ADD);
@@ -339,7 +449,7 @@ PlaylistContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem&
 {
        AppLogDebug("ENTER");
        Panel* pTableViewItem =  new (std::nothrow) Panel();
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                if (IsFailed(pTableViewItem->Construct(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL)))
                {
@@ -393,7 +503,7 @@ PlaylistContentListForm::OnAppControlCompleteResponseReceived(const AppId& appId
                        AddressbookManager* pAddressbookManager = AddressbookManager::GetInstance();
                        Addressbook* pAddressbook = pAddressbookManager->GetAddressbookN(DEFAULT_ADDRESSBOOK_ID);
 
-                       ContentInformation* pCcontentInfo = __pPresentationModel->GetContentInfoN(GetActivatedContextItem());
+                       ContentInformation* pCcontentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
                        if (pCcontentInfo == null)
                        {
                                delete pAddressbook;
@@ -440,7 +550,7 @@ PlaylistContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
        {
                itemIndex = *(static_cast<int*>(pParam));
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       __pContentListTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
        delete pThumbnailInfo;
        delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
@@ -451,7 +561,7 @@ PlaylistContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableVie
 {
        AppLogDebug("ENTER");
        Panel* pItemPanel = null;
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL));
        }
@@ -483,3 +593,136 @@ PlaylistContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableVie
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
 }
+
+void
+PlaylistContentListForm::UpdateTableView(void)
+{
+       AppLogDebug("ENTER");
+       __pContentListTableView->UpdateTableView();
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistContentListForm::SetItemCheckedAll(bool isChecked)
+{
+       AppLogDebug("ENTER");
+       if (isChecked == true)
+       {
+               __checkedItemCount = __pContentListTableView->GetItemCount();
+       }
+       else
+       {
+               __checkedItemCount = INIT_VALUE;
+       }
+       CommonUtil::SetItemCheckedAll(isChecked, *__pContentListTableView);
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
+{
+       AppLogDebug("ENTER");
+       if (itemRemove)
+       {
+               int totalCount = __pContentListTableView->GetItemCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentListTableView->IsItemChecked(iCount) == true)
+                       {
+                               __pContentListTableView->SetItemChecked(iCount, false);
+                               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(iCount);
+                               RemoveContentAt(pContentInfo->contentId);
+                               delete pContentInfo;
+                       }
+               }
+       }
+
+       __checkedItemCount = INIT_VALUE;
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+       AppLogDebug("EXIT");
+}
+
+void
+PlaylistContentListForm::SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewItemStatus status)
+{
+       AppLogDebug("ENTER");
+       if (status == TABLE_VIEW_ITEM_STATUS_UNCHECKED)
+       {
+               __checkedItemCount--;
+               if (__checkedItemCount == INIT_VALUE)
+               {
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+               }
+       }
+       else if (status == TABLE_VIEW_ITEM_STATUS_CHECKED)
+       {
+               if (__checkedItemCount == INIT_VALUE)
+               {
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), true);
+               }
+
+               __checkedItemCount++;
+       }
+
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       AppLogDebug("EXIT");
+}
+
+Tizen::Base::Collection::IList*
+PlaylistContentListForm::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)
+{
+       AppLogDebug("ENTER");
+       Tizen::Base::Collection::ArrayList* pContentFilePathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       if (IsFailed(pContentFilePathList->Construct()))
+       {
+               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(GetLastResult()));
+               delete pContentFilePathList;
+               return null;
+       }
+
+       if (argumentType == PICKER_ARGUMENT_TYPE_ACTIVATED_STATE_CONTEXT_ITEM)
+       {
+               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
+               if (pContentInfo == null)
+               {
+                       delete pContentFilePathList;
+                       AppLogDebug("GetContentInfoN(%d) is null", __activatedStateContextItem);
+                       return null;
+               }
+
+               pContentFilePathList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
+               delete pContentInfo;
+       }
+       else if (argumentType == PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL)
+       {
+               int totalCount = __pContentListTableView->GetItemCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentListTableView->IsItemChecked(iCount) == true)
+                       {
+                               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(iCount);
+                               if (pContentInfo == null)
+                               {
+                                       AppLogDebug("GetContentInfoN(%d) is null", iCount);
+                                       delete pContentFilePathList;
+                                       return null;
+                               }
+
+                               if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER)
+                               {
+                                       pContentFilePathList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
+                               }
+                               else if (pickerType == PICKER_TYPE_SHARE_PICKER)
+                               {
+                                       pContentFilePathList->Add(*(new (std::nothrow) String(L"attachment:" + pContentInfo->ContentFilePath)));
+                               }
+                               delete pContentInfo;
+                       }
+               }
+       }
+       AppLogDebug("EXIT");
+       return pContentFilePathList;
+}
\ No newline at end of file
index e379c85..cabfdff 100644 (file)
@@ -298,25 +298,13 @@ 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));
-                                       //ìž„ì‹œ Add track ì¶”후 êµ¬í˜„ NEED
+                                       CommonUtil::SetAddtoPlaylistState(true);
+                                       CommonUtil::SetAddtoPlaylistName(editFieldName);
                                        __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
+                                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_CONTENT_PICKER,
+                                                                                                                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE,
+                                                                                                                                       SCENE_HISTORY_OPTION_NO_HISTORY,
+                                                                                                                                       SCENE_DESTROY_OPTION_DESTROY));
                                }
                        }
                        else
index a9113c0..13d26b7 100644 (file)
@@ -89,7 +89,7 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        switch (actionId)
        {
-       case IDA_HEADER_ALL_CHECK_BUTTON:
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
                {
                        if (totalCount == __checkedItemCount)
                        {
@@ -426,7 +426,7 @@ PlaylistListEditorPanel::SetEditHeaderStyle(void)
        RemoveParentHeaderActionEventListener();
        Header* pHeader = GetParentHeader();
        String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        pHeader->AddActionEventListener(*this);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
index f0c714b..2bb7680 100644 (file)
@@ -453,4 +453,4 @@ SetAsPopup::SetCurrentContentPath(Tizen::Base::String* contentPath)
        AppLogDebug("ENTER");
        __pCurrentContentPath = contentPath;
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file
index 4017872..c73a451 100644 (file)
@@ -23,6 +23,7 @@
 #include <FBase.h>
 #include <FUi.h>
 #include <FUiScenes.h>
+#include "MpAllListPresentationModel.h"
 #include "MpNowPlayContentPanel.h"
 #include "MpSceneRegister.h"
 #include "MpSettingForm.h"
@@ -36,20 +37,14 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int SETTING_ITEM_HEIGHT = 100;
-static const Tizen::Graphics::Rectangle RECT_MAIN_ITEM (20, 10, 720, 80);
+static const int SETTING_ITEM_HEIGHT = 112;
 
-static const int ID_MAIN_TAB_MENU_ITEM = 0;
-static const int ID_SUB_ALBUM_ITEM = 0;
-static const int ID_SUB_ARTIST_ITEM = 1;
-static const int ID_SUB_GENRE_ITEM = 2;
-static const int ID_SUB_COMPOSER_ITEM = 3;
-static const int ID_SUB_YEAR_ITEM = 4;
-static const int ID_SUB_FOLDER_ITEM = 5;
-//static const int ID_SUB_SONG_ITEM = 6;
-//static const int ID_SUB_PLAYERLIST_ITEM = 7;
+static const int ID_MAIN_DEFAULT_PLAYLIST_ITEM = 1;
+static const int ID_SUB_MOST_PLAYED_ITEM = 0;
+static const int ID_SUB_RECENTLY_PLAYED_ITEM = 1;
+static const int ID_SUB_RECENTLY_ADD_ITEM = 2;
 
-static const int ID_MAIN_AUTO_OFF_ITEM = 1;
+static const int ID_MAIN_AUTO_OFF_ITEM = 0;
 static const int ID_SUB_ZERO_ITEM = 0;
 static const int ID_SUB_FIFTEEN_ITEM = 1;
 static const int ID_SUB_THIRTY_ITEM = 2;
@@ -57,12 +52,11 @@ static const int ID_SUB_ONE_HOUR_ITEM = 3;
 static const int ID_SUB_ONE_HOUR_THIRTY_ITEM = 4;
 static const int ID_SUB_TWO_HOURS_ITEM = 5;
 
-static const int ID_MAIN_MENU_TAB_ITEM_COUNT = 6;
+static const int ID_MAIN_DEFAULT_PLAYLIST_ITEM_COUNT = 3;
 static const int ID_MAIN_AUTO_OFF_ITEM_COUNT = 6;
 
 SettingForm::SettingForm(void)
        : __pSettingPresentationModel(null)
-       , __pNowPlayContentPanel(null)
        , __pSettingTableView(null)
 {
        AppLogDebug("ENTER");
@@ -79,7 +73,7 @@ void
 SettingForm::Initialize(void)
 {
        AppLogDebug("ENTER");
-       Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       Construct(IDL_SETTING_FORM);
        AppLogDebug("EXIT");
 }
 
@@ -89,36 +83,25 @@ SettingForm::OnInitializing(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       Header* pHeader = GetHeader();
-       pHeader->SetStyle(HEADER_STYLE_TITLE);
-       pHeader->SetTitleText(ResourceManager::GetString(L"IDS_MUSIC_BODY_MUSIC_SETTINGS"));
-
-       Footer* pFooter = GetFooter();
-       pFooter->SetBackButton();
-//     pFooter->AddActionEventListener(*this);
-
+       Footer* pFooter = null;
+       pFooter = GetFooter();
+       pFooter->AddActionEventListener(*this);
        SetFormBackEventListener(this);
 
-       int width = GetClientAreaBounds().width;
-       int height = GetClientAreaBounds().height;
-
-       __pSettingTableView = new (std::nothrow) GroupedTableView();
-       __pSettingTableView->Construct(Rectangle(0, 0, width, height), true, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
+       __pSettingTableView = static_cast<GroupedTableView*>(GetControl(IDC_GROUPEDTABLEVIEW_CONTENT_LIST));
        __pSettingTableView->SetItemProvider(this);
        __pSettingTableView->AddGroupedTableViewItemEventListener(*this);
 
        __pSettingPresentationModel = SettingPresentationModel::GetInstance();
        __pSettingPresentationModel->InitializeSettingValue();
-       AddControl(*__pSettingTableView);
-
+       __pPresentationModel = AllListPresentationModel::GetInstance();
        __pSettingTableView->UpdateTableView();
-
        __pSettingTableView->CollapseAllGroup();
-       for (int itemIndex = 0; itemIndex < ID_MAIN_MENU_TAB_ITEM_COUNT; itemIndex++)
-       {
-               __pSettingTableView->SetItemChecked(0, itemIndex, __pSettingPresentationModel->IsTabEnable(itemIndex));
-       }
-       __pSettingTableView->SetItemChecked(1, __pSettingPresentationModel->GetAutoOffTime(), true);
+//     for (int itemIndex = 0; itemIndex < ID_MAIN_DEFAULT_PLAYLIST_ITEM_COUNT; itemIndex++)
+//     {
+//             __pSettingTableView->SetItemChecked(0, itemIndex, __pSettingPresentationModel->IsTabEnable(itemIndex));
+//     }
+       __pSettingTableView->SetItemChecked(ID_MAIN_AUTO_OFF_ITEM, __pSettingPresentationModel->GetAutoOffTime(), true);
 
        Invalidate(true);
        AppLogDebug("EXIT");
@@ -139,6 +122,7 @@ SettingForm::OnTerminating(void)
                pForm->SendUserEvent(0, null);
        }*/
 //     __pSettingPresentationModel->DestroySettingPresentationModel();
+
        AppLogDebug("EXIT");
        return r;
 }
@@ -148,7 +132,7 @@ SettingForm::GetGroupCount(void)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-       return 2;
+       return 1;
 }
 
 int
@@ -159,9 +143,9 @@ SettingForm::GetItemCount(int groupIndex)
 
        switch (groupIndex)
        {
-       case ID_MAIN_TAB_MENU_ITEM:
+       case ID_MAIN_DEFAULT_PLAYLIST_ITEM:
                {
-                       itemCount = ID_MAIN_MENU_TAB_ITEM_COUNT;
+                       itemCount = ID_MAIN_DEFAULT_PLAYLIST_ITEM_COUNT;
                }
                break;
 
@@ -181,23 +165,34 @@ SettingForm::GetItemCount(int groupIndex)
 Tizen::Ui::Controls::TableViewGroupItem*
 SettingForm::CreateGroupItem(int groupIndex, int itemWidth)
 {
-       AppLogDebug("ENTER");
-       TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
-       Tizen::Ui::Controls::Label* pGroupNameLabel = new (std::nothrow) Label();
+       AppLogDebug("ENTER %d", groupIndex);
+       RelativeLayout layout;
+       layout.Construct();
 
+       TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
+       pItem->Construct(layout, Dimension(itemWidth, SETTING_ITEM_HEIGHT));
+       Panel* pGroupTableViewItem =  new (std::nothrow) Panel();
        switch (groupIndex)
        {
-       case ID_MAIN_TAB_MENU_ITEM:
+       case ID_MAIN_DEFAULT_PLAYLIST_ITEM:
                {
-                       pItem->Construct(Dimension(itemWidth, SETTING_ITEM_HEIGHT));
-                       pGroupNameLabel->Construct(Rectangle(0, 0, itemWidth, SETTING_ITEM_HEIGHT), ResourceManager::GetString(L"IDS_MUSIC_BODY_MUSIC_MENU"));
+                       if (IsFailed(pGroupTableViewItem->Construct(IDL_SETTING_PLAYLIST_SET_ITEM_PANEL)))
+                       {
+                               AppLogDebug("Construct(IDL_SETTING_PLAYLIST_SET_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                               return null;
+                       }
                }
                break;
 
        case ID_MAIN_AUTO_OFF_ITEM:
                {
-                       pItem->Construct(Dimension(itemWidth, SETTING_ITEM_HEIGHT));
-                       pGroupNameLabel->Construct(Rectangle(0, 0, itemWidth, SETTING_ITEM_HEIGHT), ResourceManager::GetString(L"IDS_MUSIC_BODY_MUSIC_AUTO_OFF"));
+                       if (IsFailed(pGroupTableViewItem->Construct(IDL_SETTING_OFF_SET_ITEM_PANEL)))
+                       {
+                               AppLogDebug("Construct(IDL_SETTING_PLAYLIST_SET_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                               return null;
+                       }
+                       Label* pSubText = static_cast<Label*>(pGroupTableViewItem->GetControl(IDC_LABEL_SUB_TEXT));
+                       pSubText->SetText(GetAutoOffString());
                }
                break;
 
@@ -205,8 +200,7 @@ SettingForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
        }
 
-       pGroupNameLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pItem->AddControl(*pGroupNameLabel);
+       pItem->AddControl(*pGroupTableViewItem);
 
        AppLogDebug("EXIT");
        return pItem;
@@ -224,109 +218,96 @@ SettingForm::DeleteGroupItem(int groupIndex, TableViewGroupItem* pItem)
 Tizen::Ui::Controls::TableViewItem*
 SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
-       AppLogDebug("ENTER");
-       TableViewItem* pItem = new (std::nothrow) TableViewItem();
+       AppLogDebug("ENTER %d %d", groupIndex, itemIndex);
+       RelativeLayout layout;
+       layout.Construct();
 
-       Label* pGroupNameLable = null;
+       TableViewItem* pItem = new (std::nothrow) TableViewItem();
+       Panel* pGroupTableViewItem =  new (std::nothrow) Panel();
 
-       if (groupIndex == ID_MAIN_TAB_MENU_ITEM)
+       if (IsFailed(pGroupTableViewItem->Construct(IDL_GROUPEDTABLEVIEW_ITEM_PANEL)))
        {
-               pItem->Construct(Tizen::Graphics::Dimension(W_CLIENT_AREA, SETTING_ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
+               AppLogDebug("Construct(IDL_SETTING_PLAYLIST_SET_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
 
-               pGroupNameLable = new (std::nothrow) Label();
+       if (groupIndex == ID_MAIN_DEFAULT_PLAYLIST_ITEM)
+       {
+               pItem->Construct(layout, Tizen::Graphics::Dimension(W_CLIENT_AREA, SETTING_ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
+               Label* pMainText = static_cast<Label*>(pGroupTableViewItem->GetControl(IDC_LABEL_MAIN_TEXT));
 
                switch (itemIndex)
                {
-               case ID_SUB_ALBUM_ITEM:
+               case ID_SUB_MOST_PLAYED_ITEM:
                        {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_BODY_ALBUMS"));
+                               pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_MOST_PLAYED"));
                        }
                        break;
 
-               case ID_SUB_ARTIST_ITEM:
+               case ID_SUB_RECENTLY_PLAYED_ITEM:
                        {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_BODY_ARTISTS"));
+                               pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_PLAYLIST_RECENTLY_PLAYED"));
                        }
                        break;
 
-               case ID_SUB_GENRE_ITEM:
+               case ID_SUB_RECENTLY_ADD_ITEM:
                        {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_BODY_GENRES"));
-                       }
-                       break;
-
-               case ID_SUB_COMPOSER_ITEM:
-                       {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_BODY_COMPOSERS"));
-                       }
-                       break;
-
-               case ID_SUB_YEAR_ITEM:
-                       {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_BODY_YEARS"));
-                       }
-                       break;
-
-               case ID_SUB_FOLDER_ITEM:
-                       {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_TAB4_FOLDERS"));
+                               pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_RECENTLY_ADDED"));
                        }
                        break;
 
                default:
                        break;
                }
-               pItem->AddControl(*pGroupNameLable);
        }
-       else if (groupIndex == ID_MAIN_AUTO_OFF_ITEM)
+       else
        {
-               pItem->Construct(Tizen::Graphics::Dimension(720, SETTING_ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_RADIO);
-
-               pGroupNameLable = new (std::nothrow) Label();
+               pItem->Construct(layout, Tizen::Graphics::Dimension(W_CLIENT_AREA, SETTING_ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_RADIO);
+               Label* pMainText = static_cast<Label*>(pGroupTableViewItem->GetControl(IDC_LABEL_MAIN_TEXT));
 
                switch (itemIndex)
                {
                case ID_SUB_ZERO_ITEM:
                        {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_BUTTON_OFF"));
+                               pMainText->SetText(L"Not used");
                        }
                        break;
 
                case ID_SUB_FIFTEEN_ITEM:
                        {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_OPT_AFTER_15_MIN_ABB"));
+                               pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_AFTER_15_MIN_ABB"));
                        }
                        break;
 
                case ID_SUB_THIRTY_ITEM:
                        {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_BODY_AFTER_30_MIN"));
+                               pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_AFTER_30_MIN"));
                        }
                        break;
 
                case ID_SUB_ONE_HOUR_ITEM:
                        {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_BODY_AFTER_1_HOUR"));
+                               pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_AFTER_1_HOUR"));
                        }
                        break;
 
                case ID_SUB_ONE_HOUR_THIRTY_ITEM:
                        {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_POP_AFTER_1_HOUR_30_MIN"));
+                               pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_POP_AFTER_1_HOUR_30_MIN"));
                        }
                        break;
 
                case ID_SUB_TWO_HOURS_ITEM:
                        {
-                               pGroupNameLable->Construct(RECT_MAIN_ITEM, ResourceManager::GetString(L"IDS_MUSIC_BODY_AFTER_2_HOURS"));
+                               pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_AFTER_2_HOURS"));
                        }
                        break;
 
                default:
                        break;
                }
-               pItem->AddControl(*pGroupNameLable);
        }
+       pItem->AddControl(*pGroupTableViewItem);
        AppLogDebug("EXIT");
        return pItem;
 }
@@ -376,14 +357,36 @@ SettingForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::Groupe
        AppLogDebug("ENTER");
        if (tableView.IsGroupExpanded(groupIndex) == true)
        {
+               Label* pLabel = static_cast<Label*>(pItem->GetControl(IDC_LABEL_EX, true));
+               Bitmap* pBitmap = ResourceManager::GetBitmapN(L"00_button_expand_closed.png");
+               pLabel->SetBackgroundBitmap(*pBitmap);
+               pLabel->Invalidate(false);
+               delete pBitmap;
+
+               if (groupIndex == ID_MAIN_AUTO_OFF_ITEM)
+               {
+                       Label* pLabelSubtext = static_cast<Label*>(pItem->GetControl(IDC_LABEL_SUB_TEXT, true));
+                       pLabelSubtext->SetText(GetAutoOffString());
+                       pLabelSubtext->Invalidate(false);
+               }
+
+               AppLogDebug("CollapseGroup %d",groupIndex);
                tableView.CollapseGroup(groupIndex);
        }
        else
        {
+               Label* pLabel = static_cast<Label*>(pItem->GetControl(IDC_LABEL_EX, true));
+               Bitmap* pBitmap = ResourceManager::GetBitmapN(L"00_button_expand_opened.png");
+               pLabel->SetBackgroundBitmap(*pBitmap);
+               pLabel->Invalidate(false);
+               delete pBitmap;
+
+               AppLogDebug("ExpandGroup %d",groupIndex);
                tableView.ExpandGroup(groupIndex);
        }
        AppLogDebug("EXIT");
 }
+
 void
 SettingForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
 {
@@ -391,7 +394,7 @@ SettingForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTabl
        bool isChecked = false;
        switch (groupIndex)
        {
-       case ID_MAIN_TAB_MENU_ITEM:
+       case ID_MAIN_DEFAULT_PLAYLIST_ITEM:
                {
                        if (status == TABLE_VIEW_ITEM_STATUS_CHECKED)
                        {
@@ -424,7 +427,7 @@ SettingForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTabl
                                }
                        }
                        __pSettingTableView->Invalidate(true);
-                       __pSettingPresentationModel->SetAutoOffTime(itemIndex);
+                       __pPresentationModel->StartAutoOffTimer(__pSettingPresentationModel->SetAutoOffTime(itemIndex));
                }
                break;
 
@@ -473,30 +476,6 @@ SettingForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
-       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER))
-       {
-               if (__pNowPlayContentPanel == null)
-               {
-                       __pNowPlayContentPanel = new (std::nothrow) NowPlayContentPanel();
-                       __pNowPlayContentPanel->Initialize();
-                       AddControl(*__pNowPlayContentPanel);
-               }
-
-               int width = GetClientAreaBounds().width;
-               int height = GetClientAreaBounds().height;
-
-               if (__pNowPlayContentPanel != null && __pNowPlayContentPanel->GetPlayStatus() == true)
-               {
-                       __pSettingTableView->SetBounds(Rectangle(0, H_NOW_PLAY_BAR, width, height - __pNowPlayContentPanel->GetHeight()));
-                       __pSettingTableView->Invalidate(true);
-               }
-               else
-               {
-                       __pSettingTableView->SetBounds(Rectangle(0, 0, width, height));
-                       __pSettingTableView->Invalidate(true);
-               }
-       }
-
        if (pArgs != null)
        {
                pArgs->RemoveAll(true);
@@ -511,4 +490,57 @@ SettingForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-}
\ No newline at end of file
+}
+
+String
+SettingForm::GetAutoOffString(void)
+{
+       AppLogDebug("ENTER");
+       switch (__pSettingPresentationModel->GetAutoOffTime())
+       {
+       case ID_SUB_ZERO_ITEM:
+               {
+                       return L"Not used";
+               }
+               break;
+
+       case ID_SUB_FIFTEEN_ITEM:
+               {
+                       return ResourceManager::GetString(L"IDS_MUSIC_OPT_AFTER_15_MIN_ABB");
+               }
+               break;
+
+       case ID_SUB_THIRTY_ITEM:
+               {
+                       return ResourceManager::GetString(L"IDS_MUSIC_BODY_AFTER_30_MIN");
+               }
+               break;
+
+       case ID_SUB_ONE_HOUR_ITEM:
+               {
+                       return ResourceManager::GetString(L"IDS_MUSIC_BODY_AFTER_1_HOUR");
+               }
+               break;
+
+       case ID_SUB_ONE_HOUR_THIRTY_ITEM:
+               {
+                       return ResourceManager::GetString(L"IDS_MUSIC_POP_AFTER_1_HOUR_30_MIN");
+               }
+               break;
+
+       case ID_SUB_TWO_HOURS_ITEM:
+               {
+                       return ResourceManager::GetString(L"IDS_MUSIC_BODY_AFTER_2_HOURS");
+               }
+               break;
+
+       default:
+               {
+                       return L"Not used";
+               }
+               break;
+       }
+
+       AppLogDebug("EXIT");
+       return L"Not used";
+}
index 3432cba..705aff3 100644 (file)
@@ -36,14 +36,9 @@ static const int ONE_HOUR = 60 * 60 * 1000;
 static const int ONE_HOUR_THIRTY_MINUTE = 90 * 60 * 1000;
 static const int TWO_HOURS = 120 * 60 * 1000;
 
-static const int ID_SUB_ALBUM_ITEM = 0;
-static const int ID_SUB_ARTIST_ITEM = 1;
-static const int ID_SUB_GENRE_ITEM = 2;
-static const int ID_SUB_COMPOSER_ITEM = 3;
-static const int ID_SUB_YEAR_ITEM = 4;
-static const int ID_SUB_FOLDER_ITEM = 5;
-static const int ID_SUB_SONG_ITEM = 6;
-static const int ID_SUB_PLAYERLIST_ITEM = 7;
+static const int ID_SUB_MOST_PLAYED_ITEM = 0;
+static const int ID_SUB_RECENTLY_PLAYED_ITEM = 1;
+static const int ID_SUB_RECENTLY_ADD_ITEM = 2;
 
 SettingPresentationModel* SettingPresentationModel::pSettingPresentationModel = null;
 
@@ -70,15 +65,10 @@ CATCH:
 }
 
 SettingPresentationModel::SettingPresentationModel(void)
-       : __isAlbumsTab(false)
-       , __isArtistTab(false)
-       , __isGenresTab(false)
-       , __isComposersTab(false)
-       , __isYearsTab(false)
-       , __isFoldersTab(false)
-       , __isSongsTab(false)
-       , __isPlayerListsTab(false)
-       , __autoOffTime(null)
+       : __autoOffTime(null)
+       , __isMostPlayed(false)
+       , __isRecentlyPlayed(false)
+       , __isRecentlyAdd(false)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -106,14 +96,9 @@ void
 SettingPresentationModel::InitializeSettingValue(void)
 {
        AppLogDebug("ENTER");
-       __isAlbumsTab = static_cast<bool>(CommonUtil::GetValue(ALBUMS_TAB));
-       __isArtistTab = static_cast<bool>(CommonUtil::GetValue(ARTISTS_TAB));
-       __isGenresTab = static_cast<bool>(CommonUtil::GetValue(GENRES_TAB));
-       __isComposersTab = static_cast<bool>(CommonUtil::GetValue(COMPOSERS_TAB));
-       __isYearsTab = static_cast<bool>(CommonUtil::GetValue(YEARS_TAB));
-       __isFoldersTab = static_cast<bool>(CommonUtil::GetValue(FOLDERS_TAB));
-       __isSongsTab = true;
-       __isPlayerListsTab = true;
+       __isMostPlayed = static_cast<bool>(CommonUtil::GetValue(MOST_PLAYED));
+       __isRecentlyPlayed = static_cast<bool>(CommonUtil::GetValue(RECENTLY_PLAYED));
+       __isRecentlyAdd = static_cast<bool>(CommonUtil::GetValue(RECENTLY_ADD));
        __autoOffTime = CommonUtil::GetValue(AUTO_OFF_LEVEL);
        AppLogDebug("EXIT");
 }
@@ -132,45 +117,24 @@ SettingPresentationModel::SetTabEnable(int tabId, bool enabled)
        AppLogDebug("ENTER");
        switch (tabId)
        {
-       case ID_SUB_ALBUM_ITEM:
+       case ID_SUB_MOST_PLAYED_ITEM:
                {
-                       __isAlbumsTab = enabled;
-                       CommonUtil::SetValue(ALBUMS_TAB, static_cast<int>(enabled));
+                       __isMostPlayed = enabled;
+                       CommonUtil::SetValue(MOST_PLAYED, static_cast<int>(enabled));
                }
                break;
 
-       case ID_SUB_ARTIST_ITEM:
+       case ID_SUB_RECENTLY_PLAYED_ITEM:
                {
-                       __isArtistTab = enabled;
-                       CommonUtil::SetValue(ARTISTS_TAB, static_cast<int>(enabled));
+                       __isRecentlyPlayed = enabled;
+                       CommonUtil::SetValue(RECENTLY_PLAYED, static_cast<int>(enabled));
                }
                break;
 
-       case ID_SUB_GENRE_ITEM:
+       case ID_SUB_RECENTLY_ADD_ITEM:
                {
-                       __isGenresTab = enabled;
-                       CommonUtil::SetValue(GENRES_TAB, static_cast<int>(enabled));
-               }
-               break;
-
-       case ID_SUB_COMPOSER_ITEM:
-               {
-                       __isComposersTab = enabled;
-                       CommonUtil::SetValue(COMPOSERS_TAB, static_cast<int>(enabled));
-               }
-               break;
-
-       case ID_SUB_YEAR_ITEM:
-               {
-                       __isYearsTab = enabled;
-                       CommonUtil::SetValue(YEARS_TAB, static_cast<int>(enabled));
-               }
-               break;
-
-       case ID_SUB_FOLDER_ITEM:
-               {
-                       __isFoldersTab = enabled;
-                       CommonUtil::SetValue(FOLDERS_TAB, static_cast<int>(enabled));
+                       __isRecentlyAdd = enabled;
+                       CommonUtil::SetValue(RECENTLY_ADD, static_cast<int>(enabled));
                }
                break;
 
@@ -187,51 +151,21 @@ SettingPresentationModel::IsTabEnable(int tabId)
        bool enable = false;
        switch (tabId)
        {
-       case ID_SUB_ALBUM_ITEM:
-               {
-                       enable = __isAlbumsTab;
-               }
-               break;
-
-       case ID_SUB_ARTIST_ITEM:
-               {
-                       enable = __isArtistTab;
-               }
-               break;
-
-       case ID_SUB_GENRE_ITEM:
-               {
-                       enable = __isGenresTab;
-               }
-               break;
-
-       case ID_SUB_COMPOSER_ITEM:
-               {
-                       enable = __isComposersTab;
-               }
-               break;
-
-       case ID_SUB_YEAR_ITEM:
+       case ID_SUB_MOST_PLAYED_ITEM:
                {
-                       enable = __isYearsTab;
+                       enable = __isMostPlayed;
                }
                break;
 
-       case ID_SUB_FOLDER_ITEM:
+       case ID_SUB_RECENTLY_PLAYED_ITEM:
                {
-                       enable = __isFoldersTab;
+                       enable = __isRecentlyPlayed;
                }
                break;
 
-       case ID_SUB_SONG_ITEM:
+       case ID_SUB_RECENTLY_ADD_ITEM:
                {
-                       enable = __isSongsTab;
-               }
-               break;
-
-       case ID_SUB_PLAYERLIST_ITEM:
-               {
-                       enable = __isPlayerListsTab;
+                       enable = __isRecentlyAdd;
                }
                break;
 
@@ -242,7 +176,7 @@ SettingPresentationModel::IsTabEnable(int tabId)
        return enable;
 }
 
-void
+int
 SettingPresentationModel::SetAutoOffTime(int autoOffTime)// 0 - 5 (OFF, 15 MIN, 30 MIN, 1 HOUR, 1 HOUR 30 MIN, 2 HOURS)
 {
        AppLogDebug("ENTER");
@@ -288,9 +222,9 @@ SettingPresentationModel::SetAutoOffTime(int autoOffTime)// 0 - 5 (OFF, 15 MIN,
                break;
        }
        CommonUtil::SetValue(AUTO_OFF_LEVEL, autoOffTime);
-       CallOnAutoOffTimeChanged(millisecondValue);
        __autoOffTime = autoOffTime;
        AppLogDebug("EXIT");
+       return millisecondValue;
 }
 
 int
@@ -299,35 +233,4 @@ SettingPresentationModel::GetAutoOffTime(void)
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
        return __autoOffTime;
-}
-
-void
-SettingPresentationModel::AddSettingEventListener(const IMusicSettingEventListener& listener)
-{
-       AppLogDebug("ENTER");
-       __settingEventListener.Add(const_cast<IMusicSettingEventListener*>(&listener));
-       AppLogDebug("EXIT");
-}
-
-void
-SettingPresentationModel::RemoveSettingEventListener(const IMusicSettingEventListener& listener)
-{
-       AppLogDebug("ENTER");
-       __settingEventListener.Remove(const_cast<IMusicSettingEventListener*>(&listener));
-       AppLogDebug("EXIT");
-}
-
-void
-SettingPresentationModel::CallOnAutoOffTimeChanged(int autoOffTime)
-{
-       AppLogDebug("ENTER");
-       IMusicSettingEventListener* pListener = null;
-       IEnumeratorT<IMusicSettingEventListener*>* pEnum = __settingEventListener.GetEnumeratorN();
-
-       while (pEnum->MoveNext() == E_SUCCESS)
-       {
-               pEnum->GetCurrent(pListener);
-               pListener->OnAutoOffTimeChanged(autoOffTime);
-       }
-       AppLogDebug("EXIT");
 }
\ No newline at end of file
index 9f47465..6605fa6 100644 (file)
@@ -379,4 +379,4 @@ SharePopup::OnAppControlCompleteResponseReceived(const AppId& appId,
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file
diff --git a/src/MpTableviewItemTag.cpp b/src/MpTableviewItemTag.cpp
new file mode 100644 (file)
index 0000000..fbd4744
--- /dev/null
@@ -0,0 +1,37 @@
+//\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               MpTableviewItemTag.cpp\r
+ * @brief              This is the implementation file for TableviewItemTag class.\r
+ */\r
+\r
+#include <FBaseLog.h>\r
+#include "MpTableviewItemTag.h"\r
+\r
+TableviewItemTag::TableviewItemTag(int groupIndex, int itemIndex)\r
+       : __groupIndex(groupIndex)\r
+       , __itemIndex(itemIndex)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+TableviewItemTag::~TableviewItemTag(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT");\r
+}
\ No newline at end of file
index 563b4e2..c9d583a 100644 (file)
@@ -71,7 +71,15 @@ const wchar_t* IDL_CONTENT_LIST_FOLDER_EDITOR_ITEM_PANEL = L"IDL_CONTENT_LIST_FO
 const wchar_t* IDL_ALBUM_INFO_PANEL = L"IDL_ALBUM_INFO_PANEL";
 const wchar_t* IDL_ALBUM_CONTENT_ITEM_PANEL = L"IDL_ALBUM_CONTENT_ITEM_PANEL";
 const wchar_t* IDL_ALBUM_CONTENT_EDIT_ITEM_PANEL = L"IDL_ALBUM_CONTENT_EDIT_ITEM_PANEL";
-//_XML_UDL_
+const wchar_t* IDL_SETTING_FORM = L"IDL_SETTING_FORM";
+const wchar_t* IDL_SETTING_OFF_SET_ITEM_PANEL = L"IDL_SETTING_OFF_SET_ITEM_PANEL";
+const wchar_t* IDL_SETTING_PLAYLIST_SET_ITEM_PANEL = L"IDL_SETTING_PLAYLIST_SET_ITEM_PANEL";
+const wchar_t* IDL_GROUPEDTABLEVIEW_ITEM_PANEL = L"IDL_GROUPEDTABLEVIEW_ITEM_PANEL";
+const wchar_t* IDL_CONTENT_LIST_ARTIST_FORM = L"IDL_CONTENT_LIST_ARTIST_FORM";
+const wchar_t* IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL = L"IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL";
+const wchar_t* IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL = L"IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL";
+const wchar_t* IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL = L"IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL";
+//_XML_IDL_
 
 //_XML_IDC_
 const wchar_t* IDC_PALY_TOGGLE_CONTROL_BUTTON = L"IDC_PALY_TOGGLE_CONTROL_BUTTON";
@@ -138,26 +146,47 @@ const wchar_t* IDC_FORWARDING_DATA_LABEL = L"IDC_FORWARDING_DATA_LABEL";
 const wchar_t* IDC_DATE_DATA_LABEL = L"IDC_DATE_DATA_LABEL";
 const wchar_t* IDC_LOCATION_DATA_LABEL = L"IDC_LOCATION_DATA_LABEL";
 const wchar_t* IDC_TITLE_LABEL = L"IDC_TITLE_LABEL";
+const wchar_t* IDC_BALLOON_TOOLTIP_LABEL = L"IDC_BALLOON_TOOLTIP_LABEL";
+const wchar_t* IDC_NO_CONTENT_LABEL = L"IDC_NO_CONTENT_LABEL";
+const wchar_t* IDC_CONTENT_GROUPED_TABLEVIEW = L"IDC_CONTENT_GROUPED_TABLEVIEW";
+const wchar_t* IDC_LABEL_MAIN_TEXT = L"IDC_LABEL_MAIN_TEXT";
+const wchar_t* IDC_LABEL_SUB_TEXT = L"IDC_LABEL_SUB_TEXT";
+const wchar_t* IDC_LABEL_EX = L"IDC_LABEL_EX";
 //__XML_IDC_
 
+//<--__XML_IDC_ORDERING PREFIX : IDC_CONTROLTYPE_ EX) IDC_BUTTON_TOGGLE_PLAY
+const wchar_t* IDC_LABEL_BALLOON_TOOLTIP = L"IDC_LABEL_BALLOON_TOOLTIP";
+const wchar_t* IDC_LABEL_NO_CONTENT = L"IDC_LABEL_NO_CONTENT";
+const wchar_t* IDC_GROUPEDTABLEVIEW_CONTENT_LIST = L"IDC_GROUPEDTABLEVIEW_CONTENT_LIST";
+const wchar_t* IDC_TABLEVIEW_CONTENT_LIST = L"IDC_TABLEVIEW_CONTENT_LIST";
+const wchar_t* IDC_LABEL_CONTENT_THUMBNAIL = L"IDC_LABEL_CONTENT_THUMBNAIL";
+const wchar_t* IDC_LABEL_CONTENT_TITLE_NAME = L"IDC_LABEL_CONTENT_TITLE_NAME";
+const wchar_t* IDC_LABEL_CONTENT_ADDITIONAL_INFO = L"IDC_LABEL_CONTENT_ADDITIONAL_INFO";
+//__XML_IDC_ORDERING-->
+
 //IMAGE
 const wchar_t* IDB_STORAGE_SDCARD = L"T02_folder_storage_icon_memory.png";
 const wchar_t* IDB_STORAGE_PHONE = L"T02_folder_storage_icon_inner_memory.png";
 const wchar_t* IDB_STORAGE_EXTERNAL = L"T02_folder_storage_icon_memory.png";
 const wchar_t* IDB_NO_CONTENTS = L"T02_nocomposers.png";
+const wchar_t* IDB_MUSIC_LINE_CONTENT_FORM = L"T02_music_line.png";
 
 //COLOR
 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 unsigned int COLOR_ITEM_SUB_TEXT = Color32<128, 128, 128>::Value;
 
-const wchar_t* IDB_MUSIC_LINE_CONTENT_FORM = L"T02_music_line.png";
 //COMMON
 const Tizen::Base::String IDS_SEPARATOR_SLASH = L"/";
 const Tizen::Base::String IDS_STORAGE_PHONE_PATH = Environment::GetMediaPath() + L"Sounds/";
 const Tizen::Base::String IDS_STORAGE_SDCARD_PATH = Environment::GetExternalStoragePath();
 const Tizen::Base::String IDS_STORAGE_EXTERNAL_PATH = Environment::GetMediaPath();
 
+//SIZE
+const int H_TABLEVIEW_IITEM = 140;
+const int H_TABLEVIEW_GROUP_ITEM = 144;
+const int H_BALLOON_TOOL_TIP = 48;
+
 //VALUE
 const int MAX_PLAY_STATE_SLIDER_COUNT = 100;
-const int MIN_PLAY_STATE_SLIDER_COUNT = 0;
+const int MIN_PLAY_STATE_SLIDER_COUNT = 0;
\ No newline at end of file
index 71b47c6..ed7e655 100644 (file)
@@ -40,8 +40,11 @@ using namespace Tizen::Ui::Scenes;
 UserPlaylistContentListForm::UserPlaylistContentListForm(void)
        : ContentListForm::ContentListForm()
        , ThumbnailBase::ThumbnailBase()
+       , __pContentListTableView(null)
        , __pThumbnail(null)
        , __pPresentationModel(null)
+       , __checkedItemCount(0)
+       , __activatedStateContextItem(-1)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -54,10 +57,37 @@ UserPlaylistContentListForm::~UserPlaylistContentListForm(void)
 }
 
 result
+UserPlaylistContentListForm::Initialize(void)
+{
+       AppLogDebug("ENTER");
+       if (IsFailed(Form::Construct(IDL_CONTENT_LIST_FORM)))
+       {
+               AppLogDebug("Construct(IDL_CONTENT_LIST_FORM) failed(%s)", GetErrorMessage(GetLastResult()));
+               return false;
+       }
+
+       AppLogDebug("EXIT");
+       return Construct();
+}
+
+result
+UserPlaylistContentListForm::Construct(void)
+{
+       AppLogDebug("ENTER");
+       __pContentListTableView = static_cast<TableView*>(GetControl(IDC_TABLEVIEW_CONTENT_LIST));
+       __pContentListTableView->AddTableViewItemEventListener(*this);
+       __pContentListTableView->SetItemProvider(this);
+
+       SetContentList(__pContentListTableView);
+       AppLogDebug("EXIT");
+       return ContentListForm::Construct();
+}
+
+result
 UserPlaylistContentListForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       SetContentListFooter();
+       SetFooter();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -67,8 +97,6 @@ UserPlaylistContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
        __pPresentationModel = null;
-       delete __pContextItem;
-       __pContextItem = null;
        AppLogDebug("EXIT");
        return ContentListForm::OnTerminating();
 }
@@ -82,6 +110,29 @@ UserPlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source,
 
        switch (actionId)
        {
+       case IDA_HEADER_BUTTON_SELECTE_ALL:
+               {
+                       bool isChecked = true;
+                       if (__checkedItemCount == __pContentListTableView->GetItemCount())
+                       {
+                               isChecked = false;
+                       }
+                       SetItemCheckedAll(isChecked);
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_SHARE:
+               {
+                       LanucherPicker(PICKER_TYPE_SHARE_PICKER);
+               }
+               break;
+
+       case IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST:
+               {
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER);
+               }
+               break;
+
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
@@ -90,14 +141,27 @@ UserPlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source,
 
        case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
-                       ToggleContentListScreenMode(CONTENT_LIST_SCREEN_MODE_EDITOR);
+                       ToggleScreenState(SCREEN_STATE_EDITOR);
+               }
+               break;
+
+       case IDA_CONTEXT_MENU_ITEM_SHARE_VIA:
+               {
+                       ToggleScreenState(SCREEN_STATE_SHARE_VIA);
                }
                break;
 
        case IDA_FOOTER_BUTTON_MORE:
                {
                        CreateContextMenuN(source);
-                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, Point(X_MORE_POPUP, Y_MORE_POPUP));
+                       if (IsEmptyContentList())
+                       {
+                               SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_ADD, Point(X_MORE_POPUP, Y_MORE_POPUP));
+                       }
+                       else
+                       {
+                               SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_ADD | CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, Point(X_MORE_POPUP, Y_MORE_POPUP));
+                       }
                }
                break;
 
@@ -106,10 +170,10 @@ UserPlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source,
                        int totalCount = __pPresentationModel->GetContentCount();
                        for (int iCount = 0; iCount < totalCount; iCount++)
                        {
-                               if (__pContentTableView->IsItemChecked(iCount) == true)
+                               if (__pContentListTableView->IsItemChecked(iCount) == true)
                                {
                                        ContentInformation* pContentInfoStruct = __pPresentationModel->GetContentInfoN(iCount);
-                                       __pContentTableView->SetItemChecked(iCount, false);
+                                       __pContentListTableView->SetItemChecked(iCount, false);
                                        if (pContentInfoStruct == null)
                                        {
                                                return;
@@ -122,8 +186,16 @@ UserPlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source,
                        }
                        RemoveCheckedTableviewItem(false);
                        __pPresentationModel->UpdatePlaylistContentList(USER_CONTENT, __headerTitle);
-                       UpdateContentListScreenState();
-                       __pContentTableView->UpdateTableView();
+                       UpdateScreenState();
+                       UpdateTableView();
+               }
+               break;
+
+       case IDA_CONTEXT_MENU_ITEM_STYLE_ADD:
+               {
+                       CommonUtil::SetAddtoPlaylistState(true);
+                       CommonUtil::SetAddtoPlaylistName(__headerTitle);
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_CONTENT_PICKER));
                }
                break;
 
@@ -131,7 +203,7 @@ UserPlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source,
                break;
        }
 
-       ContentListForm::OnActionPerformed(source, actionId);
+       TryRemoveContextMenu(actionId);
        AppLogDebug("EXIT");
 }
 
@@ -149,14 +221,19 @@ UserPlaylistContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId&
                __pPresentationModel = PlaylistListPresentationModel::GetInstance();
                __pPresentationModel->UpdatePlaylistContentList(USER_CONTENT, __headerTitle);
 
-               SetContentListHeader();
+               SetHeader();
+               UpdateScreenState();
+               UpdateTableView();
 
                pArgs->RemoveAll(true);
                delete pArgs;
        }
-
-       ContentListForm::OnSceneActivatedN(previousSceneId, currentSceneId, null);
-       __pContentTableView->UpdateTableView();
+       else if (!(__headerTitle.Equals(L"", false)))
+       {
+               __pPresentationModel->UpdatePlaylistContentList(USER_CONTENT, __headerTitle);
+               UpdateScreenState();
+               UpdateTableView();
+       }
        AppLogDebug("EXIT");
 }
 
@@ -191,7 +268,7 @@ UserPlaylistContentListForm::CreateItem(const int itemIndex, int itemWidth)
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        TableViewAnnexStyle tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_MARK;
        }
@@ -227,16 +304,71 @@ UserPlaylistContentListForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::Ta
                                                        Tizen::Ui::Controls::TableViewItemStatus status)
 {
        AppLogDebug("ENTER");
-       ContentListForm::OnTableViewItemStateChanged(tableView, itemIndex, pItem, status);
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
+       {
+               SetItemCheckedStateChanged(status);
+               AppLogDebug("EXIT");
+               return;
+       }
+
+       if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
+       {
+               SceneManager* pSceneManager = SceneManager::GetInstance();
+               AppAssert(pSceneManager);
+
+               ArrayList* pSceneArg = MakePlayerSceneParam(itemIndex);
+               if (pSceneArg != null)
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pSceneArg);
+               }
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+UserPlaylistContentListForm::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex,
+                                                                               Tizen::Ui::Controls::TableViewContextItem* pContextItem,
+                                                                               bool activated)
+{
+       AppLogDebug("ENTER");
+       if (itemIndex >= 0)
+       {
+               __activatedStateContextItem = itemIndex;
+       }
+       AppLogDebug("EXIT");
+}
+
+int
+UserPlaylistContentListForm::GetDefaultItemHeight(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return ITEM_HEIGHT;
+}
+
+bool
+UserPlaylistContentListForm::DeleteItem(const int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return true;
+}
+
+void
+UserPlaylistContentListForm::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
+                                                       int itemIndexFrom,
+                                                       int itemIndexTo)
+{
+       AppLogDebug("ENTER");
        AppLogDebug("EXIT");
 }
 
 result
-UserPlaylistContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo)
+UserPlaylistContentListForm::CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfo)
 {
        AppLogDebug("ENTER");
        Panel* pTableViewItem = new (std::nothrow) Panel();
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                if (IsFailed(pTableViewItem->Construct(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL)))
                {
@@ -265,16 +397,8 @@ UserPlaylistContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewI
        return E_SUCCESS;
 }
 
-ContentInformation*
-UserPlaylistContentListForm::GetContentInformation(int index)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-       return __pPresentationModel->GetContentInfoN(index);
-}
-
 result
-UserPlaylistContentListForm::SetContentListHeader(void)
+UserPlaylistContentListForm::SetHeader(void)
 {
        AppLogDebug("ENTER");
        CommonUtil::SetSimpleTitleStyle(*GetHeader(), __headerTitle);
@@ -283,7 +407,7 @@ UserPlaylistContentListForm::SetContentListHeader(void)
 }
 
 result
-UserPlaylistContentListForm::SetContentListFooter(void)
+UserPlaylistContentListForm::SetFooter(void)
 {
        AppLogDebug("ENTER");
        CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_MORE_ADD);
@@ -335,7 +459,7 @@ UserPlaylistContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailI
        {
                itemIndex = *(static_cast<int*>(pParam));
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       __pContentListTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
        delete pThumbnailInfo;
        delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
@@ -349,7 +473,7 @@ UserPlaylistContentListForm::OnUserEventReceivedN(RequestId requestId, Tizen::Ba
        if (requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP)
        {
                __pPresentationModel->UpdatePlaylistContentList(USER_CONTENT, __headerTitle);
-               __pContentTableView->UpdateTableView();
+               __pContentListTableView->UpdateTableView();
        }
        AppLogDebug("EXIT");
 }
@@ -359,7 +483,7 @@ UserPlaylistContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::Tabl
 {
        AppLogDebug("ENTER");
        Panel* pItemPanel = null;
-       if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
+       if (GetScreenState() != SCREEN_STATE_NORMAL)
        {
                pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL));
        }
@@ -390,4 +514,145 @@ UserPlaylistContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::Tabl
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
+}
+
+int
+UserPlaylistContentListForm::GetCheckedItemCount(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __checkedItemCount;
+}
+
+void
+UserPlaylistContentListForm::UpdateTableView(void)
+{
+       AppLogDebug("ENTER");
+       __pContentListTableView->UpdateTableView();
+       AppLogDebug("EXIT");
+}
+
+void
+UserPlaylistContentListForm::SetItemCheckedAll(bool isChecked)
+{
+       AppLogDebug("ENTER");
+       if (isChecked == true)
+       {
+               __checkedItemCount = __pContentListTableView->GetItemCount();
+       }
+       else
+       {
+               __checkedItemCount = INIT_VALUE;
+       }
+       CommonUtil::SetItemCheckedAll(isChecked, *__pContentListTableView);
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       AppLogDebug("EXIT");
+}
+
+void
+UserPlaylistContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
+{
+       AppLogDebug("ENTER");
+       if (itemRemove)
+       {
+               int totalCount = __pContentListTableView->GetItemCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentListTableView->IsItemChecked(iCount) == true)
+                       {
+                               __pContentListTableView->SetItemChecked(iCount, false);
+                               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(iCount);
+                               RemoveContentAt(pContentInfo->contentId);
+                               delete pContentInfo;
+                       }
+               }
+       }
+
+       __checkedItemCount = INIT_VALUE;
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+       AppLogDebug("EXIT");
+}
+
+void
+UserPlaylistContentListForm::SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewItemStatus status)
+{
+       AppLogDebug("ENTER");
+       if (status == TABLE_VIEW_ITEM_STATUS_UNCHECKED)
+       {
+               __checkedItemCount--;
+               if (__checkedItemCount == INIT_VALUE)
+               {
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
+               }
+       }
+       else if (status == TABLE_VIEW_ITEM_STATUS_CHECKED)
+       {
+               if (__checkedItemCount == INIT_VALUE)
+               {
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), true);
+               }
+
+               __checkedItemCount++;
+       }
+
+       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       AppLogDebug("EXIT");
+}
+
+Tizen::Base::Collection::IList*
+UserPlaylistContentListForm::GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType)
+{
+       AppLogDebug("ENTER");
+       Tizen::Base::Collection::ArrayList* pContentFilePathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       if (IsFailed(pContentFilePathList->Construct()))
+       {
+               AppLogDebug("pContentList->Construct failed(%s)", GetErrorMessage(GetLastResult()));
+               delete pContentFilePathList;
+               return null;
+       }
+
+       if (argumentType == PICKER_ARGUMENT_TYPE_ACTIVATED_STATE_CONTEXT_ITEM)
+       {
+               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(__activatedStateContextItem);
+               if (pContentInfo == null)
+               {
+                       delete pContentFilePathList;
+                       AppLogDebug("GetContentInfoN(%d) is null", __activatedStateContextItem);
+                       return null;
+               }
+
+               pContentFilePathList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
+               delete pContentInfo;
+       }
+       else if (argumentType == PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL)
+       {
+               int totalCount = __pContentListTableView->GetItemCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       if (__pContentListTableView->IsItemChecked(iCount) == true)
+                       {
+                               ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(iCount);
+                               if (pContentInfo == null)
+                               {
+                                       AppLogDebug("GetContentInfoN(%d) is null", iCount);
+                                       delete pContentFilePathList;
+                                       return null;
+                               }
+
+                               if (pickerType == PICKER_TYPE_PLAY_LIST_PICKER)
+                               {
+                                       pContentFilePathList->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
+                               }
+                               else if (pickerType == PICKER_TYPE_SHARE_PICKER)
+                               {
+                                       pContentFilePathList->Add(*(new (std::nothrow) String(L"attachment:" + pContentInfo->ContentFilePath)));
+                               }
+                               delete pContentInfo;
+                       }
+               }
+       }
+       AppLogDebug("EXIT");
+       return pContentFilePathList;
 }
\ No newline at end of file
index f52ecaf..e7824ca 100644 (file)
@@ -89,7 +89,7 @@ YearContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
        __checkedItemCount = 0;
-       DestroyPlayListPickerPopup();
+       RemovePlayListPicker();
 
        delete __pContextItem;
        __pContextItem = null;