[MusicPlayer] fixed context meun position error, clean up created playlist land and...
authorMyunkyu <mk70.kang@partner.samsung.com>
Thu, 28 Mar 2013 11:07:02 +0000 (20:07 +0900)
committerMyunkyu <mk70.kang@partner.samsung.com>
Thu, 28 Mar 2013 11:07:02 +0000 (20:07 +0900)
Change-Id: Ib48cbc5ad97f16f2c60b071d656cc48f290fb185

36 files changed:
inc/MpAlbumListEditorPanel.h
inc/MpAllListEditorPanel.h
inc/MpArtistContentListForm.h
inc/MpArtistListEditorPanel.h
inc/MpContentEditPanel.h
inc/MpContentListForm.h
inc/MpFolderListEditorPanel.h
inc/MpMiniPlayer.h
inc/MpMusicPlayerApp.h [changed mode: 0755->0644]
inc/MpMusicPlayerForm.h
inc/MpPlaylistListEditorPanel.h
inc/MpSearchPresentationModel.h
inc/MpSetAsPopup.h [changed mode: 0755->0644]
inc/MpTypes.h
res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_FORM.xml
res/screen-size-normal/IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL.xml
src/MpAlbumContentListForm.cpp
src/MpAlbumListEditorPanel.cpp
src/MpAllContentPickerPanel.cpp
src/MpAllListEditorPanel.cpp
src/MpArtistContentListForm.cpp
src/MpArtistListEditorPanel.cpp
src/MpCommonUtil.cpp
src/MpContentEditPanel.cpp
src/MpContentListForm.cpp
src/MpFolderContentListForm.cpp
src/MpFolderListEditorPanel.cpp
src/MpMiniPlayer.cpp
src/MpMusicPlayerApp.cpp
src/MpMusicPlayerForm.cpp
src/MpPlaylistContentListForm.cpp
src/MpPlaylistListEditorPanel.cpp
src/MpSearchForm.cpp
src/MpSearchPresentationModel.cpp
src/MpSetAsPopup.cpp
src/MpUserPlaylistContentListForm.cpp

index 633e0b9..8a20aa1 100644 (file)
@@ -61,6 +61,9 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
+protected:
+       virtual int GetCheckedItemCount(void);
+
 private:
        result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
        void UpdateContentList(void);
index 9f79cd4..c6799df 100644 (file)
@@ -75,6 +75,9 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
+protected:
+       virtual int GetCheckedItemCount(void);
+
 private:
        result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
        void SetEditHeaderStyle(void);
index 89719ac..9fcd003 100644 (file)
@@ -27,8 +27,6 @@
 #include "MpThumbnailBase.h"
 
 class ArtistListPresentationModel;
-class PlayListPickerPopup;
-class SharePopup;
 
 class ArtistContentListForm
        : public ContentListForm
index 1c1f178..3779fe0 100644 (file)
@@ -69,6 +69,9 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
+protected:
+       virtual int GetCheckedItemCount(void);
+
 private:
        result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
        void UpdateContentList(void);
index f59f7cc..aefd96a 100644 (file)
@@ -40,16 +40,18 @@ protected:
        result AddParentHeaderActionEventListener(void);\r
        result RemoveParentHeaderActionEventListener(void);\r
 \r
-       result SetShowStateBalloonPopup(bool isShow);\r
-       result SetCheckedCountBalloonPopup(int itemCount);\r
+       result SetShowStateBalloonTooltip(bool isShow);\r
+       void SetCheckedCountBallonTooltip(unsigned int checkedItemCount);\r
        void SetNoContentSongs(bool isNoContents);\r
        void SetContentEditHeader(void);\r
 \r
+       virtual int GetCheckedItemCount(void) = 0;\r
+\r
 private:\r
        result Construct(void);\r
 \r
 private:\r
-       Tizen::Ui::Controls::Label* __pItemCheckedCountBallooPopup;\r
+       Tizen::Ui::Controls::Label* __pBallonTooltip;\r
 };\r
 \r
 #endif // _MP_CONTENT_EDIT_PANEL_H_
\ No newline at end of file
index 89f83e8..ac15c6b 100644 (file)
@@ -81,7 +81,7 @@ protected:
        result TryRemoveContextMenu(int actionId);
        result TryRemoveCommonPopup(int actionId);
 
-       void SetTextBallonTooltip(Tizen::Base::String tooltipText);
+       void SetCheckedCountBallonTooltip(unsigned int checkedItemCount);
        void SetCommonPopup(Tizen::Ui::Controls::Popup* commonUtilPopup);
        void SetContentList(Tizen::Ui::Container* pTableview);
        void UpdateScreenState(void);
index a5335f1..8b4e771 100644 (file)
@@ -73,6 +73,9 @@ public:
        virtual void OnUpdateContentList(void);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
+protected:
+       virtual int GetCheckedItemCount(void);
+
 private:
        result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfo);
 
index f88ad1c..21e08ad 100644 (file)
@@ -71,6 +71,7 @@ protected:
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);\r
 \r
 private:\r
+       result SetContentInfo(int currentContentIndex);\r
        void SetPauseButtonImage(void);\r
        void SetPlayButtonImage(void);\r
 \r
old mode 100755 (executable)
new mode 100644 (file)
index faf822f..f7a25eb
@@ -56,7 +56,8 @@ public:
 
        Tizen::Base::String GetOperationId(void);
 
-       virtual void OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pMimeType, const Tizen::Base::Collection::IMap* pExtraData);
+       virtual void OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData,
+                                                                                                       const Tizen::Base::String* pMimeType, const Tizen::Base::Collection::IMap* pExtraData);
 
        virtual void OnSettingChanged(Tizen::Base::String& key);
 
index 634de46..076d589 100644 (file)
@@ -136,6 +136,25 @@ private:
        void UpdateAnimationAlbumArt(AlbumArtImage position);
        result InitializeVolumeBar(void);
 
+       void SetPlayerScreenState(unsigned int playerScreenState);
+       unsigned int GetPlayerScreenState(void);
+
+       result CreateContextMenuN(const Tizen::Ui::Control& source);
+       result SetContextMenuItem(unsigned int contextMenuItemStyle, Tizen::Graphics::Point anchorPosition = Tizen::Graphics::Point(-1, -1));
+       result TryRemoveContextMenu(int actionId);
+       void RemoveContextMenu(void);
+
+       result LanucherPicker(PickerType pickerType);
+       Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType);
+
+       result ShowSharePicker(Tizen::Base::Collection::IList* pIList);
+       result ShowPlayListPicker(Tizen::Base::Collection::IList* pIList);
+       result ShowSetAsPicker(Tizen::Base::Collection::IList* pIList);
+
+       void RemoveSharePicker(void);
+       void RemovePlayListPicker(void);
+       void RemoveSetAsPicker(void);
+
        void PlayAnimation(void);
        void StopAnimation(void);
 
@@ -176,22 +195,25 @@ private:
        Tizen::Ui::Controls::Slider* __pVolumeSlider;
 
 //     Tizen::Ui::Controls::TableView* __pContentsListView;
-       Tizen::Ui::Controls::ContextMenu* __pContextMenuIconText;
+//     Tizen::Ui::Controls::ContextMenu* __pContextMenuIconText;
        Tizen::Graphics::Bitmap* __pThumbnail;
 
-       PlayListPickerPopup* __pPlayListPickerPopup;
+       PlayListPickerPopup* __pPlayListPicker;
+       SharePopup* __pSharePicker;
+       SetAsPopup* __pSetAsPicker;
        SoundPathPopup* __pSoundPathPopup;
-       SharePopup* __pSharePopup;
-       SetAsPopup* __pSetAsPopup;
+
        bool __isLongPressed;
        Tizen::Ui::FlickDirection flickDirection;
        int __transactionID;
+       unsigned int __playerScreenState;
        bool __isAnimationPerformed;
+
        Tizen::Base::Runtime::Timer* __pAnimationFinishedTimer;
        Tizen::Base::Runtime::Timer* __pContentPlayTimer;
        Tizen::Ui::Scenes::SceneId __pPreviousSceneId;
        Tizen::Base::String* __pPath;
-       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
+       Tizen::Ui::Controls::ContextMenu* __pContextMenu;
 };
 
 #endif // _MP_MUSIC_PLAYER_FORM_H_
\ No newline at end of file
index 093f01a..ff2551d 100644 (file)
@@ -70,6 +70,9 @@ public:
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
+protected:
+       virtual int GetCheckedItemCount(void);
+
 private:
        void UpdateContentList(void);
        void SetEditHeaderStyle(void);
index 65b6176..eea655e 100644 (file)
@@ -52,4 +52,4 @@ private:
        Tizen::Base::Collection::IList* __pSearchList;
 };
 
-#endif // _MP_SEARCH_PRESENTATION_MODEL_H_
+#endif // _MP_SEARCH_PRESENTATION_MODEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 59bee53..8220fb0
@@ -40,7 +40,7 @@ class SetAsPopup
 public:
        SetAsPopup(void);
        virtual ~SetAsPopup(void);
-       result Initialize(void);
+       result Initialize(Tizen::Ui::Control* pControl);
 
        void SetCurrentContentPath(Tizen::Base::String* contentPath);
 
@@ -102,6 +102,7 @@ private:
        Tizen::Ui::Controls::TableView* __pSetAsItemTableView;
        Tizen::Ui::Controls::Button* __pCancelButton;
        Tizen::Base::String* __pCurrentContentPath;
+       Tizen::Ui::Control* __pControl;
 };
 
 #endif // _MP_SET_AS_POPUP_H_
\ No newline at end of file
index a0dab8b..fdd78e7 100644 (file)
@@ -78,7 +78,12 @@ enum ContextMenuItemStyle
        CONTEXT_MENU_ITEM_STYLE_CREATE_PLAYLIST= 0x00000400,
        CONTEXT_MENU_ITEM_STYLE_SHARE_VIA = 0x00001000,
        CONTEXT_MENU_ITEM_STYLE_EDIT = 0x00002000,
-       CONTEXT_MENU_ITEM_STYLE_ADD = 0x00004000
+       CONTEXT_MENU_ITEM_STYLE_ADD = 0x00004000,
+       CONTEXT_MENU_ITEM_STYLE_SET_AS = 0x00008000,
+       CONTEXT_MENU_ITEM_STYLE_DETAILS = 0x00010000,
+       CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST = 0x00020000,
+       CONTEXT_MENU_ITEM_STYLE_SOUND_PATH = 0x00040000,
+       CONTEXT_MENU_ITEM_STYLE_MAX = 0x00080000
 };
 //__CONTEXT_MENU_ITEM_STYLE-->
 
@@ -109,6 +114,7 @@ enum PickerType
        PICKER_TYPE_BASE = 0,
        PICKER_TYPE_PLAY_LIST_PICKER = PICKER_TYPE_BASE,
        PICKER_TYPE_SHARE_PICKER,
+       PICKER_TYPE_SET_AS_PICKER,
        PICKER_TYPE_MAX
 };
 //__PICKER_ARGUMENT_TYPE-->
@@ -131,6 +137,10 @@ enum IDAContextMenuitemActionId
        IDA_CONTEXT_MENU_ITEM_EDIT,
        IDA_CONTEXT_MENU_ITEM_GO_TO_LIBARY,
        IDA_CONTEXT_MENU_ITEM_STYLE_ADD,
+       IDA_CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST,
+       IDA_CONTEXT_MENU_ITEM_STYLE_SET_AS,
+       IDA_CONTEXT_MENU_ITEM_STYLE_DETAILS,
+       IDA_CONTEXT_MENU_ITEM_STYLE_SOUND_PATH,
        IDA_CONTEXT_MENU_ITEM_MAX
 };
 //__CONTEXT_MENU_ITEM_ACTION_ID-->
index d2c458c..6c3eaa5 100644 (file)
@@ -29,7 +29,7 @@
         <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
+        <property backgroundColor="" backgroundColorOpacity="0" collapseByPinchEnabled="false" fastScrollIndex="" groupedLookEnabled="false" itemDivider="true" itemDividerColor="#808080" 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
index 18577b1..9af05da 100644 (file)
@@ -3,7 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.\r
 -->\r
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
-<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+<ScenePanel Bversion="2.0.0.201303041025" 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
     </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
+        <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="16" 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="16"/>\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="16" 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="16"/>\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
+        <layout bottomRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="38" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="14" 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="92"/>\r
+        <layout bottomRelation="IDL_CONTENT_LIST_ARTIST_GROUPITEM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="38" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="14" 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="92"/>\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
+        <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="22" y="18"/>\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="22" y="18"/>\r
     </Label>\r
 </ScenePanel>\r
index cfae838..597068e 100644 (file)
@@ -591,8 +591,9 @@ AlbumContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
                }
                __pPresentationModel->RefreshContentList(__currentAlbumIndex);
        }
+
        __checkedItemCount = INIT_VALUE;
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
        AppLogDebug("EXIT");
 }
@@ -619,7 +620,7 @@ AlbumContentListForm::SetItemCheckedAll(bool isChecked)
        }
        CommonUtil::SetItemCheckedAll(isChecked, *__pContentListTableView);
        CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        AppLogDebug("EXIT");
 }
 
@@ -645,7 +646,7 @@ AlbumContentListForm::SetItemCheckedStateChanged(Tizen::Ui::Controls::TableViewI
                __checkedItemCount++;
        }
 
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        AppLogDebug("EXIT");
 }
 
index cf3a1df..ec756ff 100644 (file)
@@ -92,14 +92,14 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                        {
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBalloonPopup(__checkedItemCount);
+                               SetCheckedCountBallonTooltip(__checkedItemCount);
                                CommonUtil::SetFooterItemEnabled(*pFooter, false);
                                break;
                        }
 
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
@@ -157,7 +157,7 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                                SetDisableIconAllCheckButton();
                        }
                        __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                }
                break;
@@ -186,7 +186,7 @@ AlbumListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previo
        CommonUtil::SetFooterItemEnabled(*pFooter, false);
 
        UpdateContentList();
-       SetCheckedCountBalloonPopup(INIT_VALUE);
+       SetCheckedCountBallonTooltip(INIT_VALUE);
 
        if (__pPresentationModel->GetAllAlbumCount() != INIT_VALUE)
        {
@@ -220,7 +220,7 @@ AlbumListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curre
        pFooter->RemoveActionEventListener(*this);
 
        __checkedItemCount = INIT_VALUE;
-       SetCheckedCountBalloonPopup(__checkedItemCount);
+       SetCheckedCountBallonTooltip(__checkedItemCount);
 
        int totalCount = __pPresentationModel->GetAllAlbumCount();
        for (int iCount = 0; iCount < totalCount; iCount++)
@@ -311,7 +311,7 @@ AlbumListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView
                CommonUtil::SetFooterItemEnabled(*pFooter, false);
        }
 
-       SetCheckedCountBalloonPopup(__checkedItemCount);
+       SetCheckedCountBallonTooltip(__checkedItemCount);
        Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -436,7 +436,7 @@ AlbumListEditorPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Col
                if (pIsInitialize->Equals(true))
                {
                        __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
 
                        int totalCount = __pPresentationModel->GetAllAlbumCount();
                        for (int iCount = 0; iCount < totalCount; iCount++)
@@ -493,4 +493,12 @@ AlbumListEditorPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewIt
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
+}
+
+int
+AlbumListEditorPanel::GetCheckedItemCount(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __checkedItemCount;
 }
\ No newline at end of file
index 12a1247..78f0dd4 100644 (file)
@@ -66,14 +66,14 @@ AllContentPickerPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                        {
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBalloonPopup(__checkedItemCount);
+                               SetCheckedCountBallonTooltip(__checkedItemCount);
                                CommonUtil::SetFooterItemEnabled(*pFooter, false);
                                break;
                        }
 
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
@@ -127,7 +127,7 @@ AllContentPickerPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
 
        SetAddHeaderStyle();
        UpdateContentList();
-       SetCheckedCountBalloonPopup(INIT_VALUE);
+       SetCheckedCountBallonTooltip(INIT_VALUE);
 
        if (__pPresentationModel->GetTotalCount() != INIT_VALUE)
        {
index 7ec3fd9..35233af 100644 (file)
@@ -105,14 +105,14 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
                        {
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBalloonPopup(__checkedItemCount);
+                               SetCheckedCountBallonTooltip(__checkedItemCount);
                                CommonUtil::SetFooterItemEnabled(*pFooter, false);
                                break;
                        }
 
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
@@ -144,7 +144,7 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
                                SetDisableIconAllCheckButton();
                        }
                        __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                }
                break;
@@ -260,7 +260,7 @@ AllListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
        CommonUtil::SetFooterItemEnabled(*pFooter, false);
 
        UpdateContentList();
-       SetCheckedCountBalloonPopup(INIT_VALUE);
+       SetCheckedCountBallonTooltip(INIT_VALUE);
 
        if (__pPresentationModel->GetTotalCount() != INIT_VALUE)
        {
@@ -295,7 +295,7 @@ AllListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& current
        pFooter->RemoveActionEventListener(*this);
 
        __checkedItemCount = INIT_VALUE;
-       SetCheckedCountBalloonPopup(__checkedItemCount);
+       SetCheckedCountBallonTooltip(__checkedItemCount);
 
        int totalCount = __pPresentationModel->GetTotalCount();
        for (int iCount = 0; iCount < totalCount; iCount++)
@@ -387,7 +387,7 @@ AllListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView&
                CommonUtil::SetFooterItemEnabled(*pFooter, false);
        }
 
-       SetCheckedCountBalloonPopup(__checkedItemCount);
+       SetCheckedCountBallonTooltip(__checkedItemCount);
        Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -532,7 +532,7 @@ AllListEditorPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Colle
                        if (pIsInitialize->Equals(true))
                        {
                                __checkedItemCount = INIT_VALUE;
-                               SetCheckedCountBalloonPopup(__checkedItemCount);
+                               SetCheckedCountBallonTooltip(__checkedItemCount);
 
                                int totalCount = __pPresentationModel->GetTotalCount();
                                for (int iCount = 0; iCount < totalCount; iCount++)
@@ -605,4 +605,12 @@ AllListEditorPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
+}
+
+int
+AllListEditorPanel::GetCheckedItemCount(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __checkedItemCount;
 }
\ No newline at end of file
index 65d7711..2ac297f 100644 (file)
@@ -330,7 +330,7 @@ ArtistContentListForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Contro
                }
 
                SetItemCheckedAt(groupIndex, ischeck);
-               SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+               SetCheckedCountBallonTooltip(GetCheckedItemCount());
                tableView.Invalidate(true);
 
                CommonUtil::SetFooterItemEnabled(*GetFooter(), ischeck);
@@ -887,7 +887,7 @@ ArtistContentListForm::SetItemCheckedAll(bool isChecked)
        }
 
        CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        __pContentGroupedTableView->Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -1120,7 +1120,7 @@ ArtistContentListForm::SetItemCheckedStateChanged(Tizen::Ui::Controls::TableView
                        CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
                }
        }
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        AppLogDebug("EXIT");
 }
 
index 5f8fa2d..4927ca5 100644 (file)
@@ -33,7 +33,8 @@ using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
 ArtistListEditorPanel::ArtistListEditorPanel(void)
-       : ThumbnailBase::ThumbnailBase()
+       : ContentEditPanel::ContentEditPanel()
+       , ThumbnailBase::ThumbnailBase()
        , __checkedItemCount(0)
        , __pThumbnail(null)
        , __pPlayListPickerPopup(null)
@@ -87,7 +88,7 @@ ArtistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                        {
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBalloonPopup(__checkedItemCount);
+                               SetCheckedCountBallonTooltip(__checkedItemCount);
                                SetUnCheckedIconAllCheckButton();
                                CommonUtil::SetFooterItemEnabled(*pFooter, false);
                                break;
@@ -95,7 +96,7 @@ ArtistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        SetCheckedIconAllCheckButton();
                        CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
@@ -152,7 +153,7 @@ ArtistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                                SetNoContentSongs(true);
                        }
                        __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        SetUnCheckedIconAllCheckButton();
 
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
@@ -183,7 +184,7 @@ ArtistListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        CommonUtil::SetFooterItemEnabled(*pFooter, false);
 
        UpdateContentList();
-       SetCheckedCountBalloonPopup(INIT_VALUE);
+       SetCheckedCountBallonTooltip(INIT_VALUE);
 
        if (__pPresentationModel->GetArtistListCount() != INIT_VALUE)
        {
@@ -217,7 +218,7 @@ ArtistListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
        pFooter->RemoveActionEventListener(*this);
 
        __checkedItemCount = INIT_VALUE;
-       SetCheckedCountBalloonPopup(__checkedItemCount);
+       SetCheckedCountBallonTooltip(__checkedItemCount);
        int totalCount = __pPresentationModel->GetArtistListCount();
        for (int iCount = 0; iCount < totalCount; iCount++)
        {
@@ -493,4 +494,12 @@ ArtistListEditorPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewI
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
+}
+
+int
+ArtistListEditorPanel::GetCheckedItemCount(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __checkedItemCount;
 }
\ No newline at end of file
index ee4a550..f5ec8c6 100644 (file)
@@ -886,10 +886,10 @@ CommonUtil::GetStringItemSelectd(int itemCount)
 
                StrSelectStr.Format(STRING_LENGTH, ResSelect.GetPointer(), itemCount);
        }
-       else
-       {
-               StrSelectStr.Format(STRING_LENGTH,L"Select <Noun>s");//NEED STRING
-       }
+//     else
+//     {
+//             StrSelectStr.Format(STRING_LENGTH,L"Select <Noun>s");//NEED STRING
+//     }
        AppLogDebug("EXIT");
        return StrSelectStr;
 }
@@ -944,6 +944,7 @@ CommonUtil::CreateContextMenuN(const Tizen::Ui::Control& source, Tizen::Ui::IAct
        pContextMenu->SetName(L"IDC_CONTEXT_MENU");
        pContextMenu->AddActionEventListener(listener);
        pContextMenu->SetAnchorPosition(itemPoint);
+       pContextMenu->SetMaxVisibleItemsCount(5);
        pContextMenu->SetShowState(true);
 
        AppLogDebug("EXIT");
@@ -1037,6 +1038,30 @@ CommonUtil::AddContextMenuItem(Tizen::Ui::Controls::ContextMenu& contextMenu, un
 //             IDA_CONTEXT_MENU_ITEM_STYLE_ADD
                contextMenu.AddItem(L"Add", IDA_CONTEXT_MENU_ITEM_STYLE_ADD);//NEED STRING
        }
+
+       if (CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST & contextMenuItemStyle)
+       {
+//             IDA_CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST
+               contextMenu.AddItem(L"Add To PlayList", IDA_CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST);//NEED STRING
+       }
+
+       if (CONTEXT_MENU_ITEM_STYLE_SET_AS & contextMenuItemStyle)
+       {
+//             IDA_CONTEXT_MENU_ITEM_STYLE_SET_AS
+               contextMenu.AddItem(L"Set as", IDA_CONTEXT_MENU_ITEM_STYLE_SET_AS);//NEED STRING
+       }
+
+       if (CONTEXT_MENU_ITEM_STYLE_DETAILS & contextMenuItemStyle)
+       {
+//             IDA_CONTEXT_MENU_ITEM_STYLE_DETAILS
+               contextMenu.AddItem(L"Details", IDA_CONTEXT_MENU_ITEM_STYLE_DETAILS);//NEED STRING
+       }
+
+       if (CONTEXT_MENU_ITEM_STYLE_SOUND_PATH & contextMenuItemStyle)
+       {
+//             IDA_CONTEXT_MENU_ITEM_STYLE_SOUND_PATH
+               contextMenu.AddItem(L"Sound Path", IDA_CONTEXT_MENU_ITEM_STYLE_SOUND_PATH);//NEED STRING
+       }
        AppLogDebug("EXIT");
 }
 
index 2e02143..7795b77 100644 (file)
@@ -34,7 +34,7 @@ static const int H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP = 48;
 \r
 ContentEditPanel::ContentEditPanel(void)\r
        : ContentPanel::ContentPanel()\r
-       , __pItemCheckedCountBallooPopup(null)\r
+       , __pBallonTooltip(null)\r
 {\r
        AppLogDebug("ENTER");\r
        AppLogDebug("EXIT");\r
@@ -67,7 +67,7 @@ ContentEditPanel::Construct(void)
        __pContentTableView = static_cast<TableView*>(GetControl(IDC_CONTENTS_EDIT_TABLEVIEW));\r
        __pContentTableView->SetItemProvider(this);\r
        __pContentTableView->AddTableViewItemEventListener(*this);\r
-       __pItemCheckedCountBallooPopup = static_cast<Label*>(GetControl(IDC_ITEM_SELECTED_COUNT_LABEL));\r
+       __pBallonTooltip = static_cast<Label*>(GetControl(IDC_ITEM_SELECTED_COUNT_LABEL));\r
        __pNoContentLabel = static_cast<Label*>(GetControl(IDC_NO_CONTENTS_LABEL));\r
 \r
        AppLogDebug("EXIT");\r
@@ -128,25 +128,43 @@ ContentEditPanel::AddParentHeaderActionEventListener(void)
 }\r
 \r
 result\r
-ContentEditPanel::SetShowStateBalloonPopup(bool isShow)\r
+ContentEditPanel::SetShowStateBalloonTooltip(bool isShow)\r
 {\r
        AppLogDebug("ENTER");\r
        int balloonTooltipHeight = INIT_VALUE;\r
-       if (isShow == true)\r
+       if (isShow == true && GetCheckedItemCount() != INIT_VALUE)\r
        {\r
                balloonTooltipHeight = H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP;\r
        }\r
+       else\r
+       {\r
+               isShow = false;\r
+       }\r
+\r
        AppLogDebug("EXIT");\r
-       return CommonUtil::SetShowStateVariableHeightSizeControl(*__pItemCheckedCountBallooPopup, balloonTooltipHeight, isShow);\r
+       return CommonUtil::SetShowStateVariableHeightSizeControl(*__pBallonTooltip, balloonTooltipHeight, isShow);\r
 }\r
 \r
-result\r
-ContentEditPanel::SetCheckedCountBalloonPopup(int itemCount)\r
+void\r
+ContentEditPanel::SetCheckedCountBallonTooltip(unsigned int checkedItemCount)\r
 {\r
        AppLogDebug("ENTER");\r
-       CommonUtil::SetTextItemSelectedBalloonPopup(*__pItemCheckedCountBallooPopup, itemCount);\r
+       if (checkedItemCount == INIT_VALUE)\r
+       {\r
+               SetShowStateBalloonTooltip(false);\r
+               return ;\r
+       }\r
+\r
+       __pBallonTooltip->SetText(CommonUtil::GetStringItemSelectd(checkedItemCount));\r
+       if (__pBallonTooltip->GetShowState() == false)\r
+       {\r
+               SetShowStateBalloonTooltip(true);\r
+       }\r
+       else\r
+       {\r
+               __pBallonTooltip->Invalidate(true);\r
+       }\r
        AppLogDebug("EXIT");\r
-       return CommonUtil::SetShowStateVariableHeightSizeControl(*__pItemCheckedCountBallooPopup, H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP, true);\r
 }\r
 \r
 void\r
@@ -155,7 +173,7 @@ ContentEditPanel::SetNoContentSongs(bool isNoContents)
        AppLogDebug("ENTER");\r
        if (isNoContents == true)\r
        {\r
-               SetShowStateBalloonPopup(false);\r
+               SetShowStateBalloonTooltip(false);\r
                SetShowStateContentTableview(false);\r
 \r
                SetShowStateNoContent(true);\r
index ba82072..54b3eb8 100644 (file)
@@ -403,22 +403,38 @@ ContentListForm::SetShowStateBalloonTooltip(bool isShow)
 {
        AppLogDebug("ENTER");
        int balloonTooltipHeight = INIT_VALUE;
-       if (isShow == true)
+       if (isShow == true && GetCheckedItemCount() != INIT_VALUE)
        {
                balloonTooltipHeight = H_SHOW_CHECKED_COUNT_BALLOON_TOOL_TIP;
        }
+       else
+       {
+               isShow = false;
+       }
 
        AppLogDebug("EXIT");
        return CommonUtil::SetShowStateVariableHeightSizeControl(*__pBallonTooltip, balloonTooltipHeight, isShow);
 }
 
 void
-ContentListForm::SetTextBallonTooltip(Tizen::Base::String tooltipText)
+ContentListForm::SetCheckedCountBallonTooltip(unsigned int checkedItemCount)
 {
        AppLogDebug("ENTER");
-       __pBallonTooltip->SetText(tooltipText);
-       __pBallonTooltip->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       __pBallonTooltip->Invalidate(true);
+       if (checkedItemCount == INIT_VALUE)
+       {
+               SetShowStateBalloonTooltip(false);
+               return;
+       }
+
+       __pBallonTooltip->SetText(CommonUtil::GetStringItemSelectd(checkedItemCount));
+       if (__pBallonTooltip->GetShowState() == false)
+       {
+               SetShowStateBalloonTooltip(true);
+       }
+       else
+       {
+               __pBallonTooltip->Invalidate(true);
+       }
        AppLogDebug("EXIT");
 }
 
@@ -577,7 +593,7 @@ ContentListForm::ToggleScreenState(ScreenState screenState)
                }
 
                GetHeader()->Invalidate(true);
-               SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+               SetCheckedCountBallonTooltip(GetCheckedItemCount());
                CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
        }
 
index 2be7738..891d082 100644 (file)
@@ -726,7 +726,7 @@ FolderContentListForm::SetItemCheckedAll(bool isChecked)
        }
        CommonUtil::SetItemCheckedAll(isChecked, *__pContentListTableView);
        CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        AppLogDebug("EXIT");
 }
 
@@ -750,7 +750,7 @@ FolderContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
        }
 
        __checkedItemCount = INIT_VALUE;
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
        AppLogDebug("EXIT");
 }
@@ -777,7 +777,7 @@ FolderContentListForm::SetItemCheckedStateChanged(Tizen::Ui::Controls::TableView
                __checkedItemCount++;
        }
 
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        AppLogDebug("EXIT");
 }
 
index c23e5ae..e3c94e2 100644 (file)
@@ -92,14 +92,14 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                        {
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBalloonPopup(__checkedItemCount);
+                               SetCheckedCountBallonTooltip(__checkedItemCount);
                                CommonUtil::SetFooterItemEnabled(*pFooter, false);
                                break;
                        }
 
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
@@ -157,7 +157,7 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                                SetDisableIconAllCheckButton();
                        }
                        __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                }
                break;
@@ -186,7 +186,7 @@ FolderListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        CommonUtil::SetFooterItemEnabled(*pFooter, false);
 
        UpdateContentList();
-       SetCheckedCountBalloonPopup(INIT_VALUE);
+       SetCheckedCountBallonTooltip(INIT_VALUE);
 
        if (__pPresentationModel->GetAllFolderCount() != INIT_VALUE)
        {
@@ -220,7 +220,7 @@ FolderListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
        pFooter->RemoveActionEventListener(*this);
 
        __checkedItemCount = INIT_VALUE;
-       SetCheckedCountBalloonPopup(__checkedItemCount);
+       SetCheckedCountBallonTooltip(__checkedItemCount);
 
        int totalCount = __pPresentationModel->GetAllFolderCount();
        for (int iCount = 0; iCount < totalCount; iCount++)
@@ -370,7 +370,7 @@ FolderListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
                CommonUtil::SetFooterItemEnabled(*pFooter, false);
        }
 
-       SetCheckedCountBalloonPopup(__checkedItemCount);
+       SetCheckedCountBallonTooltip(__checkedItemCount);
        Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -437,7 +437,7 @@ FolderListEditorPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Co
                if (pIsInitialize->Equals(true))
                {
                        __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
 
                        int totalCount = __pPresentationModel->GetAllFolderCount();
                        for (int iCount = 0; iCount < totalCount; iCount++)
@@ -456,6 +456,14 @@ FolderListEditorPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Co
        AppLogDebug("EXIT");
 }
 
+int
+FolderListEditorPanel::GetCheckedItemCount(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __checkedItemCount;
+}
+
 void
 FolderListEditorPanel::UpdateContentList(void)
 {
index 1dafb56..1787924 100644 (file)
@@ -356,28 +356,7 @@ void
 MiniPlayer::OnPlayContentChanged(int currentContentIndex)\r
 {\r
        AppLogDebug("ENTER");\r
-       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(currentContentIndex);\r
-       if (pContentInfo == null)\r
-       {\r
-               AppLogDebug("__pPresentationModel->GetContentInfoN(currentContentIndex) failed");\r
-               return;\r
-       }\r
-\r
-       String miniPlayerAtritsName;\r
-       miniPlayerAtritsName.Append(L" - ");\r
-       miniPlayerAtritsName.Append(pContentInfo->ArtistName);\r
-\r
-       __pTitleLabel->SetText(pContentInfo->TitleName);\r
-       __pArtistLabel->SetText(miniPlayerAtritsName);\r
-\r
-       Bitmap* pAlbumArt = __pPresentationModel->GetContentAlbumArtN(currentContentIndex);\r
-       __pThumbnailLabel->SetBackgroundBitmap(*pAlbumArt);\r
-       delete pAlbumArt;\r
-\r
-       __pProgressBar->SetRange(INIT_VALUE, PROGRESS_MAX_VALUE);\r
-\r
-       delete pContentInfo;\r
-\r
+       SetContentInfo(currentContentIndex);\r
        Invalidate(true);\r
        AppLogDebug("EXIT");\r
 }\r
@@ -556,6 +535,10 @@ void
 MiniPlayer::MiniPlayerActivate(void)\r
 {\r
        AppLogDebug("ENTER");\r
+//     if (__pPlayerPresentationModel->GetContentListCount() == INIT_VALUE)\r
+//     {\r
+//     }\r
+\r
        switch (__pPresentationModel->GetPlayerState())\r
        {\r
        case PLAYER_STATE_PLAYING:\r
@@ -574,22 +557,8 @@ MiniPlayer::MiniPlayerActivate(void)
                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
+       SetContentInfo(__pPresentationModel->GetCurrentContentIndex());\r
        __pProgressBar->SetValue(__pPresentationModel->GetPlayPosition());\r
-       __pProgressBar->Draw(true);\r
-\r
        __pPresentationModel->AddMusicPlayerEventListener(*this);\r
        AppLogDebug("EXIT");\r
 }\r
@@ -600,4 +569,34 @@ MiniPlayer::MiniPlayerDeactivate(void)
        AppLogDebug("ENTER");\r
        __pPresentationModel->RemoveMusicPlayerEventListener(*this);\r
        AppLogDebug("EXIT");\r
+}\r
+\r
+result\r
+MiniPlayer::SetContentInfo(int currentContentIndex)\r
+{\r
+       AppLogDebug("ENTER");\r
+       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(currentContentIndex);\r
+       if (pContentInfo == null)\r
+       {\r
+               AppLogDebug("__pPresentationModel->GetContentInfoN(currentContentIndex) failed");\r
+               AppLogDebug("__pPlayerPresentationModel->GetContentInfoN is null");\r
+               return E_FAILURE;\r
+       }\r
+\r
+       String miniPlayerAtritsName;\r
+       miniPlayerAtritsName.Append(L" - ");\r
+       miniPlayerAtritsName.Append(pContentInfo->ArtistName);\r
+\r
+       __pTitleLabel->SetText(pContentInfo->TitleName);\r
+       __pArtistLabel->SetText(miniPlayerAtritsName);\r
+\r
+       Bitmap* pAlbumArt = __pPresentationModel->GetContentAlbumArtN(currentContentIndex);\r
+       __pThumbnailLabel->SetBackgroundBitmap(*pAlbumArt);\r
+       delete pAlbumArt;\r
+\r
+       __pProgressBar->SetRange(INIT_VALUE, PROGRESS_MAX_VALUE);\r
+\r
+       delete pContentInfo;\r
+       AppLogDebug("EXIT");\r
+       return E_SUCCESS;\r
 }
\ No newline at end of file
index b251d92..9192a61 100644 (file)
@@ -265,7 +265,8 @@ MusicPlayerApp::OnSettingChanged(Tizen::Base::String& key)
 }
 
 void
-MusicPlayerApp::OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pMimeType, const Tizen::Base::Collection::IMap* pExtraData)
+MusicPlayerApp::OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData,
+                                                                                                       const Tizen::Base::String* pMimeType, const Tizen::Base::Collection::IMap* pExtraData)
 {
        AppLogDebug("ENTER");
 //     result r = E_SUCCESS;
index 0212245..927905e 100644 (file)
@@ -51,40 +51,17 @@ using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
 static const int H_CONTROLLER_PANEL = 288;
-
 static const int W_HORIZONTAL_PLAYER = 720;
 static const int H_HORIZONTAL_CONTROLLER_PANEL = 300;
-
 static const int H_VOLUME_PANEL = 112;
 
-//static const int X_PLAYSTATE_SLIDER = 82;
-//static const int Y_PLAYSTATE_SLIDER = 105;
-//static const int W_PLAYSTATE_SLIDER = 558;
-//static const int H_PLAYSTATE_SLIDER = 70;
-
 static const int TRANSPARENT_COLOR = 0x00000000;
 
 static const int MIN_VOLUME_SLIDER_COUNT = 0;
 static const int MAX_VOLUME_SLIDER_COUNT = 15;
 
-static const int IDA_BUTTON_CONTENTS_LIST_VIEW = 100;
-static const int IDA_BUTTON_CONTENTS_ALBUM_VIEW = 101;
-static const int IDA_BUTTON_VOLUME = 102;
-static const int IDA_BUTTON_REWIND = 103;
-static const int IDA_BUTTON_PLAY = 104;
-static const int IDA_BUTTON_PAUSE = 105;
-static const int IDA_BUTTON_FORWARD = 106;
-static const int IDA_BUTTON_BACK = 107;
-static const int IDA_BUTTON_REPEAT = 108;
-static const int IDA_BUTTON_SHUFFLE = 109;
-static const int IDA_BUTTON_MORE_CONTEXT_MENU = 111;
-
-static const int IDA_CONTEXT_SHARE = 112;
-static const int IDA_CONTEXT_SET = 113;
-static const int IDA_CONTEXT_SOUND_PATH = 114;
-static const int IDA_CONTEXT_DETAILS = 115;
-static const int IDA_CONTEXT_SETTINGS = 116;
-static const int IDA_CONTEXT_ADDTO = 117;
+static const int IDA_BUTTON_CONTENTS_LIST_VIEW = 200;
+static const int IDA_BUTTON_CONTENTS_ALBUM_VIEW = 201;
 
 static const Tizen::Base::String INVALID_VALUE_OF_CONTENT_ID = L"00000000-0000-0000-0000-000000000000";
 
@@ -106,6 +83,30 @@ enum RepeatType
        IDA_TYPE_REPEAT_ALL             /**< The repeat type is ALL */
 };
 
+enum PlayerScreenState
+{
+       PLAYER_SCREEN_STATE_BASE = 0,
+       PLAYER_SCREEN_STATE_NORMAL = PLAYER_SCREEN_STATE_BASE,
+       PLAYER_SCREEN_STATE_NO_CONTENT_LIST,
+       PLAYER_SCREEN_STATE_APP_CONTROL,
+       PLAYER_SCREEN_STATE_MAX
+};
+
+enum IDAPlayerController
+{
+       IDA_PLAYER_CONTROLLER_BASE = 100,
+       IDA_PLAYER_CONTROLLER_REWIND = IDA_PLAYER_CONTROLLER_BASE,
+       IDA_PLAYER_CONTROLLER_PLAY,
+       IDA_PLAYER_CONTROLLER_PAUSE,
+       IDA_PLAYER_CONTROLLER_FORWARD,
+       IDA_PLAYER_CONTROLLER_VOLUME,
+       IDA_PLAYER_CONTROLLER_REPEAT,
+       IDA_PLAYER_CONTROLLER_SHUFFLE,
+       IDA_PLAYER_CONTROLLER_BACK,
+       IDA_PLAYER_CONTROLLER_MORE,
+       IDA_PLAYER_CONTROLLER_MAX
+};
+
 PlayerForm::PlayerForm(void)
        : __pPlayerPresentationModel(null)
        , __pAlbumArtElements(null)
@@ -129,21 +130,21 @@ PlayerForm::PlayerForm(void)
        , __pMoreContextButton(null)
        , __pPlayStateSlider(null)
        , __pVolumeSlider(null)
-       , __pContextMenuIconText(null)
        , __pThumbnail(null)
-       , __pPlayListPickerPopup(null)
+       , __pPlayListPicker(null)
+       , __pSharePicker(null)
+       , __pSetAsPicker(null)
        , __pSoundPathPopup(null)
-       , __pSharePopup(null)
-       , __pSetAsPopup(null)
        , __isLongPressed(false)
        , flickDirection(FLICK_DIRECTION_NONE)
        , __transactionID(ANIMATION_TRANSACTION_STATUS_STOPPED)
+       , __playerScreenState(PLAYER_SCREEN_STATE_NORMAL)
        , __isAnimationPerformed(false)
        , __pAnimationFinishedTimer(null)
        , __pContentPlayTimer(null)
        , __pPreviousSceneId(null)
        , __pPath(null)
-       , __pMoreContextMenu(null)
+       , __pContextMenu(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -182,28 +183,28 @@ PlayerForm::OnInitializing(void)
        __pContentsViewToggleButton->AddActionEventListener(*this);
 
        __pVolumeButton = static_cast<Button*>(__pControllerPanel->GetControl(L"IDC_OPTION_VOLUMN"));
-       __pVolumeButton->SetActionId(IDA_BUTTON_VOLUME);
+       __pVolumeButton->SetActionId(IDA_PLAYER_CONTROLLER_VOLUME);
        __pVolumeButton->AddActionEventListener(*this);
        __pShuffleButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_OPTION_SHUFFLE));
-       __pShuffleButton->SetActionId(IDA_BUTTON_SHUFFLE);
+       __pShuffleButton->SetActionId(IDA_PLAYER_CONTROLLER_SHUFFLE);
        __pShuffleButton->AddActionEventListener(*this);
        __pRepeatButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_OPTION_REPEAT));
-       __pRepeatButton->SetActionId(IDA_BUTTON_REPEAT);
+       __pRepeatButton->SetActionId(IDA_PLAYER_CONTROLLER_REPEAT);
        __pRepeatButton->AddActionEventListener(*this);
 
        Button* pButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_OPTION_PLAY_LIST_ADD));
        pButton->SetShowState(false);
 
        __pRewindButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_PREVIOUS_CONTROL_BUTTON));
-       __pRewindButton->SetActionId(IDA_BUTTON_REWIND);
+       __pRewindButton->SetActionId(IDA_PLAYER_CONTROLLER_REWIND);
        __pRewindButton->AddTouchEventListener(*this);
 
        __pPlayPauseButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_PALY_TOGGLE_CONTROL_BUTTON));
-       __pPlayPauseButton->SetActionId(IDA_BUTTON_PLAY);
+       __pPlayPauseButton->SetActionId(IDA_PLAYER_CONTROLLER_PLAY);
        __pPlayPauseButton->AddActionEventListener(*this);
 
        __pForwardButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_NEXT_CONTROL_BUTTON));
-       __pForwardButton->SetActionId(IDA_BUTTON_FORWARD);
+       __pForwardButton->SetActionId(IDA_PLAYER_CONTROLLER_FORWARD);
        __pForwardButton->AddTouchEventListener(*this);
 
        Bitmap* pBackNormalBitmap = ResourceManager::GetBitmapN(L"00_icon_Back_02_web.png");
@@ -214,7 +215,7 @@ PlayerForm::OnInitializing(void)
        __pBackButton->SetNormalBitmap(__pBackButton->GetPosition(), *pBackNormalBitmap);
        __pBackButton->SetPressedBitmap(__pBackButton->GetPosition(), *pBackPressBitmap);
 
-       __pBackButton->SetActionId(IDA_BUTTON_BACK);
+       __pBackButton->SetActionId(IDA_PLAYER_CONTROLLER_BACK);
        __pBackButton->AddActionEventListener(*this);
 
        delete pBackNormalBitmap;
@@ -227,6 +228,7 @@ PlayerForm::OnInitializing(void)
 
        __pPlayStateSlider->SetThumbTextColor(SLIDER_THUMB_STATUS_NORMAL, Color(255, 255, 255, 0));
        __pPlayStateSlider->SetThumbTextColor(SLIDER_THUMB_STATUS_PRESSED, Color(255, 255, 255, 0));
+       __pPlayStateSlider->SetThumbTextColor(SLIDER_THUMB_STATUS_DISABLED, Color(255, 255, 255, 0));
 
        __pMoreContextButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_MORE_CONTEXT_MENU_BUTTON));
 
@@ -238,7 +240,7 @@ PlayerForm::OnInitializing(void)
        __pMoreContextButton->SetPressedBitmap(__pMoreContextButton->GetPosition(), *pMoreContextPressBitmap);
        __pMoreContextButton->SetDisabledBitmap(__pMoreContextButton->GetPosition(), *pMoreContextDisableBitmap);
 
-       __pMoreContextButton->SetActionId(IDA_BUTTON_MORE_CONTEXT_MENU);
+       __pMoreContextButton->SetActionId(IDA_PLAYER_CONTROLLER_MORE);
        __pMoreContextButton->AddActionEventListener(*this);
 
        delete pMoreContextNormalBitmap;
@@ -372,30 +374,15 @@ PlayerForm::OnTerminating(void)
                __pAlbumArtElements->Destroy();
                __pAlbumArtElements = null;
        }
-       if (__pContextMenuIconText != null)
-       {
-               delete __pContextMenuIconText;
-               __pContextMenuIconText = null;
-       }
 
-       if (__pMoreContextMenu != null)
-       {
-               delete __pMoreContextMenu;
-               __pMoreContextMenu = null;
-       }
+       RemoveContextMenu();
+       RemoveSharePicker();
+       RemovePlayListPicker();
+       RemoveSetAsPicker();
 
        RemoveOrientationEventListener(*this);
        RemoveKeyEventListener(*this);
 
-       delete __pPlayListPickerPopup;
-       __pPlayListPickerPopup = null;
-
-       delete __pSharePopup;
-       __pSharePopup = null;
-
-       delete __pSetAsPopup;
-       __pSetAsPopup = null;
-
        delete __pSoundPathPopup;
        __pSoundPathPopup = null;
 
@@ -428,9 +415,6 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
-       int currentContentIndex = -1;
-       String* contentPath = null;
-
        switch (actionId)
        {
        case IDA_BUTTON_CONTENTS_ALBUM_VIEW:
@@ -459,7 +443,7 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_BUTTON_VOLUME:
+       case IDA_PLAYER_CONTROLLER_VOLUME:
                {
                        if (__pVolumePanel == null)
                        {
@@ -484,15 +468,10 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_BUTTON_PLAY:
+       case IDA_PLAYER_CONTROLLER_PLAY:
                {
-                       int currentContentIndex = -1;
-                       String* currentPlayConent = null;
-                       String* ContentPath = null;
-
-                       currentContentIndex = __pPlayerPresentationModel->GetCurrentContentIndex();
-                       currentPlayConent = __pPlayerPresentationModel->GetPlayContentPath();
-                       ContentPath = __pPlayerPresentationModel->GetContentPath(currentContentIndex);
+                       String* currentPlayConent = __pPlayerPresentationModel->GetPlayContentPath();
+                       String* ContentPath = __pPlayerPresentationModel->GetContentPath(__pPlayerPresentationModel->GetCurrentContentIndex());
 
                        if (currentPlayConent->Equals(*ContentPath))
                        {
@@ -510,17 +489,16 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_BUTTON_PAUSE:
+       case IDA_PLAYER_CONTROLLER_PAUSE:
                {
                        __pPlayerPresentationModel->Pause();
                }
                break;
 
-       case IDA_BUTTON_BACK:
+       case IDA_PLAYER_CONTROLLER_BACK:
                {
                        result r = pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_DESTROY_OPTION_KEEP));
-
-                       if (r != E_SUCCESS)
+                       if (IsFailed(r))
                        {
                                UiApp* pApp = UiApp::GetInstance();
                                pApp->Terminate();
@@ -528,11 +506,9 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_BUTTON_REPEAT:
+       case IDA_PLAYER_CONTROLLER_REPEAT:
                {
-                       int repeatState = __pPlayerPresentationModel->GetRepeatState();
-
-                       switch (repeatState)
+                       switch (__pPlayerPresentationModel->GetRepeatState())
                        {
                        case IDA_TYPE_REPEAT_A:
                                {
@@ -558,7 +534,7 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_BUTTON_SHUFFLE:
+       case IDA_PLAYER_CONTROLLER_SHUFFLE:
                {
                        if (__pPlayerPresentationModel->IsShuffleEnable() == false)
                        {
@@ -571,93 +547,41 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_BUTTON_MORE_CONTEXT_MENU:
+       case IDA_PLAYER_CONTROLLER_MORE:
                {
-                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
-                       if (__pMoreContextMenu != null)
+                       if (GetPlayerScreenState() == PLAYER_SCREEN_STATE_NORMAL)
                        {
-                               delete __pMoreContextMenu;
-                               __pMoreContextMenu = null;
+                               CreateContextMenuN(source);
+                               SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SET_AS | CONTEXT_MENU_ITEM_STYLE_DETAILS | CONTEXT_MENU_ITEM_STYLE_SHARE_VIA
+                                                                                                                                                               | CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST | CONTEXT_MENU_ITEM_STYLE_SETTINGS);
+                       }
+                       else if (GetPlayerScreenState() == PLAYER_SCREEN_STATE_APP_CONTROL)
+                       {
+                               CreateContextMenuN(source);
+                               SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SET_AS | CONTEXT_MENU_ITEM_STYLE_DETAILS | CONTEXT_MENU_ITEM_STYLE_SHARE_VIA);
                        }
-
-                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
-                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
-
-                       __pMoreContextMenu->AddItem(L"Share via", IDA_CONTEXT_SHARE);//NEED STRING
-                       __pMoreContextMenu->AddItem(L"Add to Playlist", IDA_CONTEXT_ADDTO);//NEED STRING
-                       __pMoreContextMenu->AddItem(L"Set as", IDA_CONTEXT_SET);//NEED STRING
-                       __pMoreContextMenu->AddItem(L"Details", IDA_CONTEXT_DETAILS);//NEED STRING
-                       __pMoreContextMenu->AddItem(L"Settings", IDA_CONTEXT_SETTINGS);//NEED STRING
-
-                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
-                       __pMoreContextMenu->AddActionEventListener(*this);
-                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
-                       __pMoreContextMenu->SetShowState(true);
-                       __pMoreContextMenu->Show();
                }
                break;
 
-       case IDA_CONTEXT_SHARE:
+       case IDA_CONTEXT_MENU_ITEM_SHARE_VIA:
                {
-                       currentContentIndex = __pPlayerPresentationModel->GetCurrentContentIndex();
-                       contentPath = __pPlayerPresentationModel->GetContentPath(currentContentIndex);
-
-                       Tizen::Base::Collection::ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       pDataList->Construct();
-
-                       if (__pSharePopup == null)
-                       {
-                               __pSharePopup = new (std::nothrow) SharePopup();
-                               __pSharePopup->Initialize(this);
-                       }
-                       pDataList->Add(*(new (std::nothrow) String(*contentPath)));
-                       __pSharePopup->SetArguments(pDataList);
-
-                       __pSharePopup->SetShowState(true);
-                       __pSharePopup->Show();
+                       LanucherPicker(PICKER_TYPE_SHARE_PICKER);
                }
                break;
 
-       case IDA_CONTEXT_ADDTO:
+       case IDA_CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST:
                {
-                       currentContentIndex = __pPlayerPresentationModel->GetCurrentContentIndex();
-                       contentPath = __pPlayerPresentationModel->GetContentPath(currentContentIndex);
-
-                       Tizen::Base::Collection::ArrayList* pDataList = new (std::nothrow) ArrayList();
-                       pDataList->Construct();
-                       pDataList->Add(*(new (std::nothrow) String(*contentPath)));
-                       if (__pPlayListPickerPopup != null)
-                       {
-                               AppLogDebug("1");
-                               delete __pPlayListPickerPopup;
-                               __pPlayListPickerPopup = null;
-                               AppLogDebug("2");
-                       }
-
-                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
-                       __pPlayListPickerPopup->Initialize(this, pDataList);
-                       __pPlayListPickerPopup->SetShowState(true);
-                       __pPlayListPickerPopup->Show();
+                       LanucherPicker(PICKER_TYPE_PLAY_LIST_PICKER);
                }
                break;
 
-       case IDA_CONTEXT_SET:
+       case IDA_CONTEXT_MENU_ITEM_STYLE_SET_AS:
                {
-                       currentContentIndex = __pPlayerPresentationModel->GetCurrentContentIndex();
-                       contentPath = __pPlayerPresentationModel->GetContentPath(currentContentIndex);
-
-                       if (__pSetAsPopup == null)
-                       {
-                               __pSetAsPopup = new (std::nothrow) SetAsPopup();
-                               __pSetAsPopup->Initialize();
-                       }
-                       __pSetAsPopup->SetCurrentContentPath(contentPath);
-                       __pSetAsPopup->SetShowState(true);
-                       __pSetAsPopup->Show();
+                       LanucherPicker(PICKER_TYPE_SET_AS_PICKER);
                }
                break;
 
-       case IDA_CONTEXT_SOUND_PATH:
+       case IDA_CONTEXT_MENU_ITEM_STYLE_SOUND_PATH:
                {
                        if (__pSoundPathPopup == null)
                        {
@@ -668,13 +592,13 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_CONTEXT_DETAILS:
+       case IDA_CONTEXT_MENU_ITEM_STYLE_DETAILS:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_CONTENT_DETAIL));
                }
                break;
 
-       case IDA_CONTEXT_SETTINGS:
+       case IDA_CONTEXT_MENU_ITEM_SETTINGS:
                {
                        SettingPresentationModel::GetInstance()->InitializeSettingValue();
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MUSIC_SETTING));
@@ -684,6 +608,8 @@ PlayerForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        default:
                break;
        }
+
+       TryRemoveContextMenu(actionId);
        AppLogDebug("EXIT");
 }
 
@@ -1204,24 +1130,37 @@ PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
        */
 
        __pPlayerPresentationModel->AddMusicPlayerEventListener(*this);
-       if (previousSceneId != IDSCN_MUSIC_SETTING
-               && previousSceneId != IDSCN_PLAYLIST_CREATOR
-               && previousSceneId != IDSCN_CONTENT_DETAIL)
+       if (pArgs != null)
        {
-//             __pPlayerPresentationModel->AddMusicPlayerEventListener(*this);
-
-               if (pArgs != null)
+               if (IsFailed(__pPlayerPresentationModel->SetContentList(pArgs)))
                {
-                       __pPlayerPresentationModel->SetContentList(pArgs);
+                       AppLogDebug("__pPlayerPresentationModel->SetContentList failed(%s)", GetErrorMessage(GetLastResult()));
+                       SetPlayerScreenState(PLAYER_SCREEN_STATE_NO_CONTENT_LIST);
+                       return;
+               }
+
+               __pPlayerPresentationModel->Play(static_cast<Integer*>(pArgs->GetAt(1))->ToInt(), MIN_PLAY_STATE_SLIDER_COUNT);
+               SetRepeatButtonImage(__pPlayerPresentationModel->GetRepeatState());// 0 - 2 (OFF, ONE, ALL)
+               SetShuffleButtonImage(__pPlayerPresentationModel->IsShuffleEnable());// 0 - 1 (OFF, ON)
 
-                       int playIndex = (static_cast<Integer*>(pArgs->GetAt(1)))->ToInt();
-                       __pPlayerPresentationModel->Play(playIndex, MIN_PLAY_STATE_SLIDER_COUNT);
-                       SetRepeatButtonImage(__pPlayerPresentationModel->GetRepeatState());// 0 - 2 (OFF, ONE, ALL)
-                       SetShuffleButtonImage(__pPlayerPresentationModel->IsShuffleEnable());// 0 - 1 (OFF, ON)
+               if (!static_cast<String*>(pArgs->GetAt(0))->Equals(MUSIC, false))
+               {
+                       SetPlayerScreenState(PLAYER_SCREEN_STATE_APP_CONTROL);
                }
+
+               pArgs->RemoveAll(true);
+               delete pArgs;
        }
        else
        {
+               if (__pPlayerPresentationModel->GetContentListCount() == INIT_VALUE)
+               {
+                       AppLogDebug("__pPlayerPresentationModel->GetContentListCount() is 0");
+                       SetPlayerScreenState(PLAYER_SCREEN_STATE_NO_CONTENT_LIST);
+                       return;
+               }
+
+               SetContentInfo( __pPlayerPresentationModel->GetCurrentContentIndex());
                OnPlayStateChanged(__pPlayerPresentationModel->GetPlayerState());
        }
 
@@ -1235,6 +1174,7 @@ PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
        {
                SetMoreContentMenuStatus(false);
        }
+
        Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -1284,22 +1224,10 @@ PlayerForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::I
 {
        AppLogDebug("ENTER");
        AppLogDebug("OnUserEventReceivedN %d", requestId);
-       if (requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP)
+       if (requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP || requestId == ID_DESTORY_PLAY_LIST_PICKER_POPUP)
        {
-               if (__pPlayListPickerPopup != null)
-               {
-                       delete __pPlayListPickerPopup;
-                       __pPlayListPickerPopup = null;
-               }
-       }
-
-       if (requestId == ID_DESTORY_SHARE_POPUP)
-       {
-               if (__pSharePopup != null)
-               {
-                       delete __pSharePopup;
-                       __pSharePopup = null;
-               }
+               RemovePlayListPicker();
+               RemoveSharePicker();
        }
 
        if (pArgs != null)
@@ -1321,11 +1249,13 @@ PlayerForm::OnPlayStateChanged(PlayerState playerState)
                __pPlayStateSlider->SetEnabled(false);
                SetMoreContentMenuStatus(false);
        }
-       /*else
+       else
        {
-               __pPlayStateSlider->SetEnabled(true);
-               SetMoreContentMenuStatus(true);
-       }*/
+//             __pPlayStateSlider->SetEnabled(true);
+//             SetMoreContentMenuStatus(true);
+               __pPlayStateSlider->SetValue(__pPlayerPresentationModel->GetPlayPosition());
+       }
+
        TogglePlayPauseImage(playerState);
        AppLogDebug("EXIT");
 }
@@ -1616,7 +1546,7 @@ PlayerForm::SetShuffleButtonImage(bool shuffleEnable)
 
        if (shuffleEnable == false)
        {
-               pOptionShuffleBitmap = ResourceManager::GetBitmapN(L"T02_option_shuffle_off.png");
+               pOptionShuffleBitmap = ResourceManager::GetBitmapN(L"T02_option_shuffle_on_press.png");
        }
        else
        {
@@ -1639,56 +1569,6 @@ PlayerForm::SetMoreContentMenuStatus(bool buttonEnable)
        __pMoreContextButton->Invalidate(true);
 }
 
-//void
-//PlayerForm::SetControlButtonImage(void)
-//{
-//     AppLogDebug("ENTER");
-//     Bitmap* pVolumeNormalBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_volume.png");
-//     Bitmap* pVolumePressBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_volume_press.png");
-
-//     Bitmap* pRewindNormalBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_previous.png");
-//     Bitmap* pRewindPressBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_previous_press.png");
-
-//     Bitmap* pForwardNormalBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_next.png");
-//     Bitmap* pForwardPressBitmap = ResourceManager::GetBitmapN(L"T02_Play_btn_next_press.png");
-
-//     Bitmap* pBackNormalBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_back.png");
-//     Bitmap* pBackPressBitmap = ResourceManager::GetBitmapN(L"T02_controller_icon_back_press.png");
-
-//     __pVolumeButton->SetNormalBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pVolumeNormalBitmap);
-//     __pVolumeButton->SetPressedBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pVolumePressBitmap);
-
-//     __pRewindButton->SetNormalBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pRewindNormalBitmap);
-//     __pRewindButton->SetPressedBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pRewindPressBitmap);
-
-//     __pForwardButton->SetNormalBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pForwardNormalBitmap);
-//     __pForwardButton->SetPressedBitmap(Point(POINT_X_PLAY_BUTTON_BITMAP, POINT_Y_PLAY_BUTTON_BITMAP), *pForwardPressBitmap);
-
-//     __pBackButton->SetNormalBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pBackNormalBitmap);
-//     __pBackButton->SetPressedBitmap(Point(POINT_X_CONTROLLER_BUTTON_BITMAP, POINT_Y_CONTROLLER_BUTTON_BITMAP), *pBackPressBitmap);
-
-//     delete pVolumeNormalBitmap;
-//     pVolumeNormalBitmap = null;
-//     delete pVolumePressBitmap;
-//     pVolumePressBitmap = null;
-
-//     delete pRewindNormalBitmap;
-//     pRewindNormalBitmap = null;
-//     delete pRewindPressBitmap;
-//     pRewindPressBitmap = null;
-
-//     delete pForwardNormalBitmap;
-//     pForwardNormalBitmap = null;
-//     delete pForwardPressBitmap;
-//     pForwardPressBitmap = null;
-
-//     delete pBackNormalBitmap;
-//     pBackNormalBitmap = null;
-//     delete pBackPressBitmap;
-//     pBackPressBitmap = null;
-//     AppLogDebug("EXIT");
-//}
-
 void
 PlayerForm::TogglePlayPauseImage(PlayerState playerState)
 {
@@ -1712,6 +1592,7 @@ PlayerForm::TogglePlayPauseImage(PlayerState playerState)
                pAlbumTurnTable->SetShowState(false);
                SetPlayButtonImage();
        }
+
        if (__pContentsAlbumViewPanel->GetShowState() == true)
        {
                __pContentsAlbumViewPanel->Invalidate(true);
@@ -1733,7 +1614,7 @@ PlayerForm::SetPlayButtonImage(void)
        pBitmap = ResourceManager::GetBitmapN(IDB_PLAY_BUTTON_ICON_DISABLED);
        __pPlayPauseButton->SetDisabledBitmap(point, *pBitmap);
        delete pBitmap;
-       __pPlayPauseButton->SetActionId(IDA_BUTTON_PLAY);
+       __pPlayPauseButton->SetActionId(IDA_PLAYER_CONTROLLER_PLAY);
        __pPlayPauseButton->Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -1752,7 +1633,7 @@ PlayerForm::SetPauseButtonImage(void)
        pBitmap = ResourceManager::GetBitmapN(IDB_PAUSE_BUTTON_ICON_DISABLED);
        __pPlayPauseButton->SetDisabledBitmap(point, *pBitmap);
        delete pBitmap;
-       __pPlayPauseButton->SetActionId(IDA_BUTTON_PAUSE);
+       __pPlayPauseButton->SetActionId(IDA_PLAYER_CONTROLLER_PAUSE);
        __pPlayPauseButton->Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -1908,4 +1789,291 @@ PlayerForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
+}
+
+void
+PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
+{
+       AppLogDebug("ENTER");
+       switch (playerScreenState)
+       {
+       case PLAYER_SCREEN_STATE_NO_CONTENT_LIST:
+               {
+                       __pVolumeButton->SetEnabled(false);
+                       __pContentsViewToggleButton->SetEnabled(false);
+                       __pShuffleButton->SetEnabled(false);
+                       __pRepeatButton->SetEnabled(false);
+                       __pRewindButton->SetEnabled(false);
+                       __pPlayPauseButton->SetEnabled(false);
+                       __pForwardButton->SetEnabled(false);
+                       __pPlayStateSlider->SetEnabled(false);
+                       __pMoreContextButton->SetEnabled(false);
+
+                       Bitmap* pThumb = ResourceManager::GetBitmapN(L"music_play_grid_thumb_loading.png");
+                       static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->SetBackgroundBitmap(*pThumb);
+                       delete pThumb;
+                       static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->RemoveTouchEventListener(*this);
+               }
+               break;
+
+       case PLAYER_SCREEN_STATE_APP_CONTROL:
+               {
+                       __pContentsViewToggleButton->SetEnabled(false);
+                       __pShuffleButton->SetEnabled(false);
+                       __pRepeatButton->SetEnabled(false);
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       __playerScreenState = playerScreenState;
+       Invalidate(true);
+       AppLogDebug("EXIT");
+}
+
+unsigned int
+PlayerForm::GetPlayerScreenState(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __playerScreenState;
+}
+
+result
+PlayerForm::SetContextMenuItem(unsigned int contextMenuItemStyle, Tizen::Graphics::Point anchorPosition)
+{
+       AppLogDebug("ENTER");
+       if (__pContextMenu == null)
+       {
+               AppLogDebug("EXIT");
+               return E_FAILURE;
+       }
+
+       CommonUtil::AddContextMenuItem(*__pContextMenu, contextMenuItemStyle);
+       CommonUtil::ShowContextMenu(*__pContextMenu, true);
+
+       if (anchorPosition.x != -1 && anchorPosition.y != -1)
+       {
+               __pContextMenu->SetAnchorPosition(anchorPosition);
+       }
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
+
+result
+PlayerForm::CreateContextMenuN(const Tizen::Ui::Control& source)
+{
+       AppLogDebug("ENTER");
+       RemoveContextMenu();
+       __pContextMenu = CommonUtil::CreateContextMenuN(source, *this);
+       if (__pContextMenu != null)
+       {
+               return E_SUCCESS;
+       }
+       AppLogDebug("EXIT");
+       return E_FAILURE;
+}
+
+void
+PlayerForm::RemoveContextMenu(void)
+{
+       AppLogDebug("ENTER");
+       if (__pContextMenu != null)
+       {
+               delete __pContextMenu;
+               __pContextMenu = null;
+       }
+       AppLogDebug("EXIT");
+}
+
+result
+PlayerForm::TryRemoveContextMenu(int actionId)
+{
+       AppLogDebug("ENTER");
+       result r = E_FAILURE;
+       if (CommonUtil::IsVaildContextMenuItemActionId(actionId) == true)
+       {
+               RemoveContextMenu();
+               r = E_SUCCESS;
+       }
+       AppLogDebug("EXIT");
+       return r;
+}
+
+result
+PlayerForm::ShowSharePicker(Tizen::Base::Collection::IList* pIList)
+{
+       AppLogDebug("ENTER");
+       RemoveSharePicker();
+
+       __pSharePicker = new (std::nothrow) SharePopup();
+       if (IsFailed(__pSharePicker->Initialize(this)))
+       {
+               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;
+}
+
+void
+PlayerForm::RemoveSharePicker(void)
+{
+       AppLogDebug("ENTER");
+       if (__pSharePicker != null)
+       {
+               delete __pSharePicker;
+               __pSharePicker = null;
+       }
+       AppLogDebug("EXIT");
+}
+
+result
+PlayerForm::ShowPlayListPicker(Tizen::Base::Collection::IList* pIList)
+{
+       AppLogDebug("ENTER");
+       RemovePlayListPicker();
+
+       __pPlayListPicker = new (std::nothrow) PlayListPickerPopup();
+       if (IsFailed(__pPlayListPicker->Initialize(this, pIList)))
+       {
+               AppLogDebug("__pSharePicker->Initialize failed(%s)", GetErrorMessage(E_FAILURE));
+               RemovePlayListPicker();
+               return E_FAILURE;
+       }
+
+       __pPlayListPicker->SetShowState(true);
+       __pPlayListPicker->Show();
+
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
+
+void
+PlayerForm::RemovePlayListPicker(void)
+{
+       AppLogDebug("ENTER");
+       if (__pPlayListPicker != null )
+       {
+               delete __pPlayListPicker;
+               __pPlayListPicker = null;
+       }
+       AppLogDebug("EXIT");
+}
+
+result
+PlayerForm::ShowSetAsPicker(Tizen::Base::Collection::IList* pIList)
+{
+       AppLogDebug("ENTER");
+       RemoveSetAsPicker();
+
+       __pSetAsPicker = new (std::nothrow) SetAsPopup();
+       if (IsFailed(__pSetAsPicker->Initialize(this)))
+       {
+               AppLogDebug("__pSharePicker->Initialize failed(%s)", GetErrorMessage(E_FAILURE));
+               RemoveSetAsPicker();
+               return E_FAILURE;
+       }
+
+       __pSetAsPicker->SetCurrentContentPath(new (std::nothrow) String(*static_cast<String*>(pIList->GetAt(0))));
+       __pSetAsPicker->SetShowState(true);
+       __pSetAsPicker->Show();
+
+       pIList->RemoveAll(true);
+       delete pIList;
+
+       AppLogDebug("EXIT");
+       return E_SUCCESS;
+}
+
+void
+PlayerForm::RemoveSetAsPicker(void)
+{
+       AppLogDebug("ENTER");
+       if (__pSetAsPicker != null)
+       {
+               delete __pSetAsPicker;
+               __pSetAsPicker = null;
+       }
+       AppLogDebug("EXIT");
+}
+
+result
+PlayerForm::LanucherPicker(PickerType pickerType)
+{
+       AppLogDebug("ENTER");
+       IList* pArgumentList = GetPickerArgumentListN(pickerType);
+       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);
+       }
+       else if (pickerType == PICKER_TYPE_SET_AS_PICKER)
+       {
+               r = ShowSetAsPicker(pArgumentList);
+       }
+
+       if (IsFailed(r))
+       {
+               AppLogDebug("ShowPlayListPicker failed(%s)", GetErrorMessage(r));
+               delete pArgumentList;
+       }
+       AppLogDebug("EXIT");
+       return r;
+}
+
+Tizen::Base::Collection::IList*
+PlayerForm::GetPickerArgumentListN(PickerType pickerType)
+{
+       AppLogDebug("ENTER");
+       String contentPath;
+       switch (pickerType)
+       {
+       case PICKER_TYPE_SET_AS_PICKER:
+               // fall through
+       case PICKER_TYPE_PLAY_LIST_PICKER:
+               // fall through
+       case PICKER_TYPE_SHARE_PICKER:
+               {
+                       contentPath.Append(*__pPlayerPresentationModel->GetContentPath(__pPlayerPresentationModel->GetCurrentContentIndex()));
+               }
+               break;
+
+       default:
+               {
+                       AppLogDebug("EXIT");
+                       return null;
+               }
+               break;
+       }
+
+       Tizen::Base::Collection::ArrayList* pDataList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       if (IsFailed(pDataList->Construct()))
+       {
+               AppLogDebug("Construct failed(%s)", GetErrorMessage(GetLastResult()));
+               delete pDataList;
+               return null;
+       }
+
+       pDataList->Add(*(new (std::nothrow) String(contentPath)));
+       AppLogDebug("EXIT");
+       return pDataList;
 }
\ No newline at end of file
index 3b1a263..c6c3fb7 100644 (file)
@@ -616,7 +616,7 @@ PlaylistContentListForm::SetItemCheckedAll(bool isChecked)
        }
        CommonUtil::SetItemCheckedAll(isChecked, *__pContentListTableView);
        CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        AppLogDebug("EXIT");
 }
 
@@ -640,7 +640,7 @@ PlaylistContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
        }
 
        __checkedItemCount = INIT_VALUE;
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
        AppLogDebug("EXIT");
 }
@@ -667,7 +667,7 @@ PlaylistContentListForm::SetItemCheckedStateChanged(Tizen::Ui::Controls::TableVi
                __checkedItemCount++;
        }
 
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        AppLogDebug("EXIT");
 }
 
index 13d26b7..4a4a5bc 100644 (file)
@@ -95,14 +95,14 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                        {
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
-                               SetCheckedCountBalloonPopup(__checkedItemCount);
+                               SetCheckedCountBallonTooltip(__checkedItemCount);
                                CommonUtil::SetFooterItemEnabled(*pFooter, false);
                                break;
                        }
 
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
@@ -148,7 +148,7 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                                SetDisableIconAllCheckButton();
                        }
                        __checkedItemCount = INIT_VALUE;
-                       SetCheckedCountBalloonPopup(__checkedItemCount);
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                }
                break;
@@ -189,7 +189,7 @@ PlaylistListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& pre
        CommonUtil::SetFooterItemEnabled(*pFooter, false);
 
        UpdateContentList();
-       SetCheckedCountBalloonPopup(INIT_VALUE);
+       SetCheckedCountBallonTooltip(INIT_VALUE);
 
        SetNoContentSongs(false);
        if (pArgs != null)
@@ -216,7 +216,7 @@ PlaylistListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& cu
        pFooter->RemoveActionEventListener(*this);
 
        __checkedItemCount = INIT_VALUE;
-       SetCheckedCountBalloonPopup(__checkedItemCount);
+       SetCheckedCountBallonTooltip(__checkedItemCount);
 
        int totalCount = __pPresentationModel->GetAllPlayListCount();
        for (int iCount = 0; iCount < totalCount; iCount++)
@@ -394,7 +394,7 @@ PlaylistListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableV
                CommonUtil::SetFooterItemEnabled(*pFooter, false);
        }
 
-       SetCheckedCountBalloonPopup(__checkedItemCount);
+       SetCheckedCountBallonTooltip(__checkedItemCount);
        Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -482,4 +482,12 @@ PlaylistListEditorPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        SetTabHeaderStyle();
        pSceneManager->GoBackward(BackwardSceneTransition());
        AppLogDebug("EXIT");
+}
+
+int
+PlaylistListEditorPanel::GetCheckedItemCount(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+       return __checkedItemCount;
 }
\ No newline at end of file
index 62ac560..a7c8d5d 100644 (file)
@@ -657,4 +657,4 @@ SearchForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 
        pSceneManager->GoForward(ForwardSceneTransition(__pSceneId->GetPointer(), SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY));
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file
index 308410e..fc86141 100644 (file)
@@ -243,4 +243,4 @@ SearchPresentationModel::MakeQuery(const Tizen::Base::String& WhereExpr, const T
 
        AppLogDebug("EXIT");
        return StrMakeQuery;
-}
+}
\ No newline at end of file
index 2bb7680..d5eab0d 100644 (file)
@@ -51,6 +51,7 @@ static const int SET_AT_POPUP_HEIGHT = 450;
 SetAsPopup::SetAsPopup(void)
        : __pSetAsItemTableView(null)
        , __pCancelButton(null)
+       , __pControl(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -63,7 +64,7 @@ SetAsPopup::~SetAsPopup(void)
 }
 
 result
-SetAsPopup::Initialize(void)
+SetAsPopup::Initialize(Tizen::Ui::Control* pControl)
 {
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
@@ -88,9 +89,10 @@ SetAsPopup::Initialize(void)
        __pCancelButton->SetActionId(IDA_BUTTON_CANCEL);
        __pCancelButton->AddActionEventListener(*this);
 
+       __pControl = pControl;
+
        AddControl(*__pSetAsItemTableView);
        AddControl(*__pCancelButton);
-
        AppLogDebug("EXIT");
        return r;
 
index ed7e655..95f181d 100644 (file)
@@ -546,7 +546,7 @@ UserPlaylistContentListForm::SetItemCheckedAll(bool isChecked)
        }
        CommonUtil::SetItemCheckedAll(isChecked, *__pContentListTableView);
        CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        AppLogDebug("EXIT");
 }
 
@@ -570,7 +570,7 @@ UserPlaylistContentListForm::RemoveCheckedTableviewItem(bool itemRemove)
        }
 
        __checkedItemCount = INIT_VALUE;
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
        AppLogDebug("EXIT");
 }
@@ -597,7 +597,7 @@ UserPlaylistContentListForm::SetItemCheckedStateChanged(Tizen::Ui::Controls::Tab
                __checkedItemCount++;
        }
 
-       SetTextBallonTooltip(CommonUtil::GetStringItemSelectd(GetCheckedItemCount()));
+       SetCheckedCountBallonTooltip(GetCheckedItemCount());
        AppLogDebug("EXIT");
 }