[MusicPlayer] Fix Play, FF/RW wrong action after the last song seek and fix PlaylistR...
authorMyunkyu <mk70.kang@partner.samsung.com>
Tue, 2 Apr 2013 10:38:36 +0000 (19:38 +0900)
committerMyunkyu <mk70.kang@partner.samsung.com>
Tue, 2 Apr 2013 10:38:36 +0000 (19:38 +0900)
Change-Id: Ie6cd531672313f8628ef0117eb81e1bdbf20e065

29 files changed:
inc/MpAlbumListPanel.h
inc/MpAllListPanel.h
inc/MpArtistListPanel.h
inc/MpContentLibaryPanel.h
inc/MpFolderListPanel.h
inc/MpMusicPlayerPresentationModel.h [changed mode: 0755->0644]
inc/MpPlaylistListPanel.h
inc/MpTypes.h
res/screen-size-normal/IDL_PLAYLIST_CREATOR_FORM.xml
res/screen-size-normal/IDL_PLAYLIST_RENAME_FORM.xml
res/screen-size-normal/IDL_SETTING_FORM.xml
src/MpAlbumContentListForm.cpp
src/MpAlbumListPanel.cpp
src/MpAllListPanel.cpp
src/MpArtistContentListForm.cpp
src/MpArtistListPanel.cpp
src/MpCommonUtil.cpp
src/MpContentListPanel.cpp
src/MpFolderContentListForm.cpp
src/MpFolderListPanel.cpp
src/MpMiniPlayer.cpp
src/MpMusicPlayerForm.cpp
src/MpMusicPlayerPresentationModel.cpp
src/MpPlaylistContentListForm.cpp
src/MpPlaylistCreatorForm.cpp
src/MpPlaylistListPanel.cpp
src/MpPlaylistReNameForm.cpp
src/MpTypes.cpp
src/MpUserPlaylistContentListForm.cpp

index 2441db8..60e4c7b 100644 (file)
@@ -35,7 +35,6 @@ class PlayListPickerPopup;
 class AlbumListPanel
        : public ContentLibaryPanel
        , public ThumbnailBase
-       , public Tizen::Ui::Controls::IFastScrollListener
 {
 public:
        AlbumListPanel(void);
@@ -65,7 +64,7 @@ public:
                                                                        int itemIndex,
                                                                        Tizen::Ui::Controls::TableViewContextItem* pContextItem,
                                                                        bool activated);
-       virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
+
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
        virtual void OnUpdateContentList(void);
 
@@ -76,7 +75,6 @@ private:
        result CreateTableViewItem(Tizen::Ui::Container& parent,
                                                                const ContentInformation& contentInfoStruct,
                                                                const int contentTotalCount);
-       Tizen::Ui::Controls::TableViewContextItem* CreateTableViewContextItem(void);
        Tizen::Base::Collection::ArrayList* GetContentListN(int itemIndex);
        void UpdateContentList(void);
        virtual bool IsEmptyContentList(void);
@@ -87,7 +85,6 @@ protected:
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem;
        AlbumListPresentationModel* __pPresentationModel;
        Tizen::Graphics::Bitmap* __pThumbnail;
-       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
 };
 
 #endif // _MP_ALBUM_LIST_PANEL_H_
\ No newline at end of file
index 507f6f1..da52198 100644 (file)
@@ -81,7 +81,6 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 private:
-       Tizen::Ui::Controls::TableViewContextItem* CreateTableViewContextItem(void);
        result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
        Tizen::Base::Collection::ArrayList* GetContentListN(int itemIndex);
        void UpdateContentList(void);
@@ -89,9 +88,6 @@ private:
 
 private:
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem;
-       Tizen::Ui::Controls::ContextMenu* __pShareContextMenu;
-       Tizen::Ui::Controls::ContextMenu* __pSetContextMenu;
-       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
        Tizen::Ui::Controls::Popup* __pDeletePopup;
        Tizen::Graphics::Bitmap* __pThumbnail;
        PlayListPickerPopup* __pPlayListPickerPopup;
index eb0200a..bd16dbc 100644 (file)
@@ -77,7 +77,6 @@ private:
        result CreateTableViewItem(Tizen::Ui::Container& parent,
                                                                        const ContentInformation& contentInfoStruct,
                                                                        const int contentTotalCount);
-       Tizen::Ui::Controls::TableViewContextItem* CreateTableViewContextItem(void);
        void UpdateContentList(void);
        virtual bool IsEmptyContentList(void);
 
@@ -87,7 +86,6 @@ protected:
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem;
        Tizen::Graphics::Bitmap* __pThumbnail;
        ArtistListPresentationModel* __pPresentationModel;
-       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
 };
 
 #endif // _MP_ARTIST_LIST_PANEL_H_
\ No newline at end of file
index 89107ae..eeae3cb 100644 (file)
@@ -43,6 +43,13 @@ protected:
        void RemoveMiniPlayer(void);\r
        bool IsExistMiniPlayer(void);\r
        void TryRegisterMiniPlayer(void);\r
+\r
+       result CreateContextMenuN(const Tizen::Ui::Control& source);\r
+       result SetContextMenuItem(unsigned int contextMenuItemStyle, Tizen::Graphics::Point anchorPosition = Tizen::Graphics::Point(-1, -1));\r
+       result TryRemoveContextMenu(int actionId);\r
+       void RemoveContextMenu(void);\r
+\r
+       Tizen::Ui::OrientationStatus GetCurrentOrientationMode(void);\r
        void UpdateContentLibaryScreenState(void);\r
 \r
        virtual result Construct(void);\r
@@ -52,6 +59,7 @@ private:
 \r
 private:\r
        Tizen::Ui::Controls::Panel* __pMiniPlayerRegisterBar;\r
+       Tizen::Ui::Controls::ContextMenu* __pContextMenu;\r
 };\r
 \r
 #endif // _MP_CONTENT_LIBARY_PANEL_H_
\ No newline at end of file
index 76def6d..2f28190 100644 (file)
@@ -37,8 +37,6 @@ class PlayListPickerPopup;
 
 class FolderListPanel
        : public ContentLibaryPanel
-       , public Tizen::Ui::Controls::IFastScrollListener
-       , public Tizen::Ui::Controls::IScrollEventListener
 {
 public:
        FolderListPanel(void);
@@ -56,7 +54,6 @@ public:
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(const int itemIndex, int itemWidth);
        virtual void OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
        virtual void OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::TableView& tableView, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated);
-       virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
 
        virtual void OnScrollEndReached(Tizen::Ui::Control &source, Tizen::Ui::Controls::ScrollEndEvent type);
        virtual void OnScrollPositionChanged (Tizen::Ui::Control& source, int scrollPos);
@@ -67,7 +64,6 @@ public:
 
 private:
        void UpdateContentList(void);
-       Tizen::Ui::Controls::TableViewContextItem* CreatePlayallAddtoContextItem(void);
        virtual bool IsEmptyContentList(void);
 
 private:
@@ -78,7 +74,6 @@ protected:
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem;
        int __scrolledDistance;
        FolderListPresentationModel* __pPresentationModel;
-       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
 };
 
 #endif // _MP_FOLDERS_LIST_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 677068b..1e1fbc3
@@ -54,10 +54,10 @@ public:
        void Pause(void);
        void MovePreviousContent(bool forceMove = false);
        void MoveNextContent(void);
-       void Rewind(void);
-       void Forward(void);
+       void SeekToForward(void);
+       void SeekToRewind(void);
        void StopForwardRewind(void);
-       void SetPlayPosition(int playPosition);
+       result SetPlayPosition(int playPosition);
        int GetPlayPosition(void);
        ContentInformation* GetContentInfoN(int contentIndex);
        Tizen::Graphics::Bitmap* GetContentAlbumArtN(int contentIndex);
@@ -111,6 +111,9 @@ private:
        void UpdateContentDB(void);
        void GenerateNextIndex(void);
 
+       void Rewind(void);
+       void Forward(void);
+
        void CallOnPlayStateChanged(Tizen::Media::PlayerState playerState);
        void CallOnPlayContentChanged(int currentContentIndex);
        void CallOnPlayContentRemoved(int removedContentIndex);
index fc6fc60..e415a2a 100644 (file)
@@ -68,7 +68,6 @@ public:
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
 
 private:
-       Tizen::Ui::Controls::TableViewContextItem* CreateTableViewContextItem(int playListType);
        result CreateTableViewItem(Tizen::Ui::Container& parent,
                                                        Tizen::Base::String& labelName,
                                                        const Tizen::Graphics::Bitmap& bitmap,
@@ -84,7 +83,6 @@ private:
        Tizen::Ui::Controls::Popup* __pDeletePopup;
        int __selectedItemIndex;
        Tizen::Base::String* __pPlaylistName;
-       Tizen::Ui::Controls::ContextMenu* __pMoreContextMenu;
 };
 
 #endif // _MP_PLAY_LIST_LIST_PANEL_H_
\ No newline at end of file
index db9ae6c..9f7f828 100644 (file)
@@ -43,7 +43,9 @@ enum FlickMenuStyle
 {
        FLICK_MENU_STYLE_TYPE_BASE = FLICK_MENU_ITEM_NONE,
        FLICK_MENU_STYLE_TYPE_01 = FLICK_MENU_ITEM_SHARE | FLICK_MENU_ITEM_SET_AS | FLICK_MENU_ITEM_ADDTO | FLICK_MENU_ITEM_DELETE,
-       FLICK_MENU_STYLE_TYPE_02 = FLICK_MENU_ITEM_PLAYALL,
+       FLICK_MENU_STYLE_TYPE_02 = FLICK_MENU_ITEM_PLAYALL | FLICK_MENU_ITEM_ADDTO,
+       FLICK_MENU_STYLE_TYPE_03 = FLICK_MENU_ITEM_PLAYALL,
+       FLICK_MENU_STYLE_TYPE_04 = FLICK_MENU_ITEM_PLAYALL | FLICK_MENU_ITEM_DELETE,
        FLICK_MENU_STYLE_TYPE_MAX
 };
 //__FLICK_MENU_STYLE__-->
@@ -561,10 +563,13 @@ extern const unsigned int COLOR_HEADER_TITLE_TEXT;
 extern const unsigned int COLOR_HEADER_DESCRIPTION_TEXT;
 extern const unsigned int COLOR_ITEM_SUB_TEXT;
 
-//SIZE
+//SIZE, POINT
 extern const int H_TABLEVIEW_IITEM;
 extern const int H_TABLEVIEW_GROUP_ITEM;
 extern const int H_BALLOON_TOOL_TIP;
+extern const int X_POINT_FOOTER_MORE;
+extern const int Y_POINT_PORTRAIT_FOOTER_MORE;
+extern const int Y_POINT_LANDSCAPE_FOOTER_MORE;
 
 //VALUE
 extern const int MAX_PLAY_STATE_SLIDER_COUNT;
index eb877d6..70c24b1 100644 (file)
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-       This XML file was automatically generated by UiBuilder - do not modify by hand.
--->
-<!DOCTYPE Scene SYSTEM "UIForm.dtd">
-
-<Scene Bversion="2.0.0.201303250952" Dversion="20120315">
-    <LogicalCoordinate>720</LogicalCoordinate>
-    <Form id="IDL_PLAYLIST_CREATOR_FORM">
-        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
-        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
-        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
-    </Form>
-    <Footer>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/>
-        <itemSet>
-            <footerItem accessibilityHint="" actionId="3009" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="Save"/>
-        </itemSet>
-    </Footer>
-    <Header>
-        <property accessibilityHint="" backgroundBitmapPath="T02_music_line.png" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Create playlist" titleTextColor=""/>
-        <itemSet/>
-    </Header>
-    <EditField id="IDC_EDITFIELD" parent="IDL_PLAYLIST_CREATOR_FORM">
-        <property accessibilityHint="" commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="45.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PLAYLIST_CREATOR_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_PLAYLIST_CREATOR_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="IDL_PLAYLIST_CREATOR_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="89.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PLAYLIST_CREATOR_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_PLAYLIST_CREATOR_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="IDL_PLAYLIST_CREATOR_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>
-    </EditField>
-</Scene>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
+<Scene Bversion="2.0.0.201303041025" Dversion="20120315">\r
+    <LogicalCoordinate>720</LogicalCoordinate>\r
+    <Form id="IDL_PLAYLIST_CREATOR_FORM">\r
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
+        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>\r
+        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>\r
+    </Form>\r
+    <Footer>\r
+        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/>\r
+        <itemSet>\r
+            <footerItem actionId="3009" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="Save"/>\r
+        </itemSet>\r
+    </Footer>\r
+    <Header>\r
+        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Create playlist" titleTextColor=""/>\r
+        <itemSet/>\r
+    </Header>\r
+    <EditField id="IDC_EDITFIELD" parent="IDL_PLAYLIST_CREATOR_FORM">\r
+        <property commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="44" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12" viewMode="false"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PLAYLIST_CREATOR_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_PLAYLIST_CREATOR_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="IDL_PLAYLIST_CREATOR_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PLAYLIST_CREATOR_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_PLAYLIST_CREATOR_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="IDL_PLAYLIST_CREATOR_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>\r
+    </EditField>\r
+</Scene>\r
index 8bdc194..da8388e 100644 (file)
         </itemSet>\r
     </Footer>\r
     <Header>\r
-        <property backgroundBitmapPath="T02_music_line.png" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Rename playlist" titleTextColor=""/>\r
+        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Rename playlist" titleTextColor=""/>\r
         <itemSet/>\r
     </Header>\r
     <EditField id="IDC_EDITFIELD" parent="IDL_PLAYLIST_RENAME_FORM">\r
         <property commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="45" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12" viewMode="false"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="708" x="6" y="1"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="89" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="426" x="232" y="306"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PLAYLIST_RENAME_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_PLAYLIST_RENAME_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="IDL_PLAYLIST_RENAME_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PLAYLIST_RENAME_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_PLAYLIST_RENAME_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="IDL_PLAYLIST_RENAME_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>\r
     </EditField>\r
 </Scene>\r
index 7fc792d..126ed13 100644 (file)
@@ -3,7 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.\r
 -->\r
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
-<Scene Bversion="2.0.0.201303250953" Dversion="20120315">\r
+<Scene Bversion="2.0.0.201303280948" Dversion="20120315">\r
     <LogicalCoordinate>720</LogicalCoordinate>\r
     <Form id="IDL_SETTING_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
@@ -20,7 +20,7 @@
     </Header>\r
     <GroupedTableView id="IDC_GROUPEDTABLEVIEW_CONTENT_LIST" parent="IDL_SETTING_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="0" collapseByPinchEnabled="false" fastScrollIndex="" groupedLookEnabled="false" itemDivider="false" itemDividerColor="#000000" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
-        <layout bottomRelation="IDL_SETTING_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="1011.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>\r
+        <layout bottomRelation="IDL_SETTING_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="931.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>\r
         <layout bottomRelation="IDL_SETTING_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="484.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_SETTING_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_SETTING_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="1280.0" x="0" y="0"/>\r
     </GroupedTableView>\r
 </Scene>\r
index 452cd74..2221fab 100644 (file)
@@ -138,8 +138,14 @@ AlbumContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 
        case IDA_FOOTER_BUTTON_MORE:
                {
+                       Point anchorPoint(X_POINT_FOOTER_MORE, Y_POINT_PORTRAIT_FOOTER_MORE);
+                       if ((GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE) || (GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
+                       {
+                               anchorPoint.y = Y_POINT_LANDSCAPE_FOOTER_MORE;
+                       }
+
                        CreateContextMenuN(source);
-                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_EDIT | CONTEXT_MENU_ITEM_STYLE_SEARCH, Point(X_MORE_POPUP, Y_MORE_POPUP));
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_EDIT | CONTEXT_MENU_ITEM_STYLE_SEARCH, anchorPoint);
                }
                break;
 
index 8164014..a683720 100644 (file)
@@ -39,7 +39,6 @@ AlbumListPanel::AlbumListPanel(void)
        , __pPlayListPickerPopup(null)
        , __pContextItem(null)
        , __pThumbnail(null)
-       , __pMoreContextMenu(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -55,20 +54,8 @@ result
 AlbumListPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
        __pPresentationModel = AlbumListPresentationModel::GetInstance();
-       __pContextItem = CreateTableViewContextItem();
-
-       if (__pContextItem == null)
-       {
-               delete __pContextItem;
-               __pContextItem = null;
-
-               AppLogDebug("CommonUtil::CreateContentDeletePopup failed");
-               return E_FAILURE;
-       }
+       __pContextItem = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_02);
 
        SetFooterStyle(STYLE_MORE_ADD);
        SetLayoutFitToForm();
@@ -80,15 +67,14 @@ result
 AlbumListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       RemoveContextMenu();
+
        if (__pPlayListPickerPopup != null)
        {
                delete __pPlayListPickerPopup;
                __pPlayListPickerPopup = null;
        }
 
-       delete __pContextItem;
-       __pContextItem = null;
-
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -102,7 +88,7 @@ AlbumListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId
 
        switch (actionId)
        {
-       case IDA_FLICK_BUTTON_ADD_TO_PALYLIST:
+       case IDA_FLICK_MENU_ITEM_ADDTO:
                {
                        __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
                        __pPlayListPickerPopup->Initialize(this, __pPresentationModel->GetContentPathListN(__itemIndex));
@@ -111,7 +97,7 @@ AlbumListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId
                }
                break;
 
-       case IDA_FLICK_BUTTON_PLAY_ALL:
+       case IDA_FLICK_MENU_ITEM_PLAYALL:
                {
                        ArrayList* pData = new (std::nothrow) ArrayList();
                        pData->Construct();
@@ -126,48 +112,36 @@ AlbumListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId
 
        case IDA_FOOTER_BUTTON_MORE:
                {
-                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
-                       if (__pMoreContextMenu != null)
+                       Point anchorPoint(X_POINT_FOOTER_MORE, Y_POINT_PORTRAIT_FOOTER_MORE);
+                       if ((GetCurrentOrientationMode() == ORIENTATION_STATUS_LANDSCAPE) || (GetCurrentOrientationMode() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
                        {
-                               delete __pMoreContextMenu;
-                               __pMoreContextMenu = null;
+                               anchorPoint.y = Y_POINT_LANDSCAPE_FOOTER_MORE;
                        }
-
-                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
-                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
-
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"), IDA_MORE_CONTEXT_MENU_EDIT);
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"), IDA_MORE_CONTEXT_MENU_SEARCH);
-                       __pMoreContextMenu->AddItem(L"Folder view", IDA_MORE_CONTEXT_MENU_FOLDER_VIEW);//NEED STRING
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_MORE_CONTEXT_MENU_SETTINGS);
-
-                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
-                       __pMoreContextMenu->AddActionEventListener(*this);
-                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
-                       __pMoreContextMenu->SetShowState(true);
-                       __pMoreContextMenu->Show();
+                       CreateContextMenuN(source);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SETTINGS | CONTEXT_MENU_ITEM_STYLE_SEARCH |
+                                                                       CONTEXT_MENU_ITEM_STYLE_EDIT | CONTEXT_MENU_ITEM_STYLE_FOLDER_VIEW, anchorPoint);
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_EDIT:
+       case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST_EDITOR));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_SEARCH:
+       case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_FOLDER_VIEW:
+       case IDA_CONTEXT_MENU_ITEM_FOLDER_VIEW:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_SETTINGS:
+       case IDA_CONTEXT_MENU_ITEM_SETTINGS:
                {
                        SettingPresentationModel::GetInstance()->InitializeSettingValue();
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MUSIC_SETTING));
@@ -183,6 +157,8 @@ AlbumListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId
        default:
                break;
        }
+
+       TryRemoveContextMenu(actionId);
        AppLogDebug("EXIT");
 }
 
@@ -313,53 +289,6 @@ AlbumListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls
        AppLogDebug("EXIT");
 }
 
-void
-AlbumListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index)
-{
-       AppLogDebug("ENTER");
-       int totalCount = __pPresentationModel->GetAllAlbumCount();
-       for (int iCount = 0; iCount < totalCount; iCount++)
-       {
-               String* pName = __pPresentationModel->GetAlbumName(iCount);
-               String firstCharacter;
-
-               pName->SubString(0, 1, firstCharacter);
-               firstCharacter.ToUpper();
-
-               mchar language;
-               firstCharacter.GetCharAt(0, language);
-
-               if (Character::GetUnicodeCategory(language) == UNICODE_HANGUL)
-               {
-                       Tizen::Base::String HangulIndex[] = {"ㄱ", "ㄲ", "ㄴ", "ㄷ", "ㄸ", "ㄹ", "ㅁ", "ㅂ", "ㅃ", "ㅅ", "ㅆ", "ㅇ" , "ㅈ", "ㅉ", "ㅊ", "ㅋ", "ㅌ", "ㅍ", "ㅎ"};
-
-                       wchar_t songName;
-                       pName->GetCharAt(0, songName);
-
-                       wchar_t UnicodeValue = (songName - 0xAC00);
-                       wchar_t InitialConsonant = ((UnicodeValue - (UnicodeValue % 28)) / 28) / 21;
-                       int tempIndex = static_cast<int>(InitialConsonant);
-
-                       if (HangulIndex[tempIndex].CompareTo(index) == 0)
-                       {
-                               __pContentTableView->ScrollToItem(iCount);
-                               break;
-                       }
-               }
-               else if (index.CompareTo("0") == 0 && Character::IsDigit(language) == true)
-               {
-                       __pContentTableView->ScrollToItem(iCount);
-                       break;
-               }
-               else if (firstCharacter.CompareTo(index) == 0)
-               {
-                       __pContentTableView->ScrollToItem(iCount);
-                       break;
-               }
-       }
-       AppLogDebug("EXIT");
-}
-
 result
 AlbumListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
                                                                        const ContentInformation& contentInfoStruct,
@@ -375,17 +304,10 @@ AlbumListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
                return E_FAILURE;
        }
 
-       Label* pThumbnailLabel = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_THUMBNAIL));
-       pThumbnailLabel->SetBackgroundBitmap(*GetDefaultThumbnail());
-
-       Label* pTitleName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME));
-       pTitleName->SetText(contentInfoStruct.AlbumName);
-
-       Label* pArtistName = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_ARTIST_NAME));
-       pArtistName->SetText(contentInfoStruct.ArtistName);
-
-       Label* pContentCount = static_cast<Label*>(pTableViewItem->GetControl(IDC_PLAY_CONTENT_COUNT));
-       pContentCount->SetText(CommonUtil::SetSongsString(itemTotalCount));
+       static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_THUMBNAIL))->SetBackgroundBitmap(*GetDefaultThumbnail());
+       static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME))->SetText(contentInfoStruct.AlbumName);
+       static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_ARTIST_NAME))->SetText(contentInfoStruct.ArtistName);
+       static_cast<Label*>(pTableViewItem->GetControl(IDC_PLAY_CONTENT_COUNT))->SetText(CommonUtil::SetSongsString(itemTotalCount));
 
        parent.AddControl(*pTableViewItem);
        CommonUtil::SetLayoutFitToContainer(parent, *pTableViewItem);
@@ -394,42 +316,6 @@ AlbumListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
        return r;
 }
 
-Tizen::Ui::Controls::TableViewContextItem*
-AlbumListPanel::CreateTableViewContextItem(void)
-{
-       AppLogDebug("ENTER");
-       TableViewContextItem* pContextItem = new (std::nothrow) TableViewContextItem();
-
-       if (IsFailed(pContextItem->Construct(Dimension(GetWidth(), ITEM_HEIGHT))))
-       {
-               AppLogDebug("Construct(Dimension(GetWidth(), ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
-               return null;
-       }
-
-       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
-       if (IsFailed(pSweepQuickMenu->Construct(IDL_SWEEP_QUICK_ALBUM_PANEL)))
-       {
-               AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
-               return null;
-       }
-
-       Button* pShareButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_PLAY_ALL_BUTTON));
-       pShareButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
-       pShareButton->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
-       pShareButton->AddActionEventListener(*this);
-
-       Button* pAddToPlaylistButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_ADD_TO_BUTTON));
-       pAddToPlaylistButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_BUTTON2_ADD_TO_PLAYLIST"));
-       pAddToPlaylistButton->SetActionId(IDA_FLICK_BUTTON_ADD_TO_PALYLIST);
-       pAddToPlaylistButton->AddActionEventListener(*this);
-
-       pContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
-       pContextItem->AddControl(*pSweepQuickMenu);
-
-       AppLogDebug("EXIT");
-       return pContextItem;
-}
-
 Tizen::Base::Collection::ArrayList*
 AlbumListPanel::GetContentListN(int itemIndex)
 {
@@ -475,12 +361,6 @@ AlbumListPanel::UpdateContentList(void)
                __pPresentationModel->UpdateAlbumList();
                __pContentTableView->UpdateTableView();
        }
-
-       if (__pMoreContextMenu != null && __pMoreContextMenu->GetShowState() == true)
-       {
-               __pMoreContextMenu->SetShowState(false);
-               __pMoreContextMenu->Invalidate(true);
-       }
        AppLogDebug("EXIT");
 }
 
index c0db300..9ed218e 100644 (file)
@@ -45,9 +45,6 @@ AllListPanel::AllListPanel(void)
        : ContentLibaryPanel::ContentLibaryPanel()
        , ThumbnailBase::ThumbnailBase()
        , __pContextItem(null)
-       , __pShareContextMenu(null)
-       , __pSetContextMenu(null)
-       , __pMoreContextMenu(null)
        , __pDeletePopup(null)
        , __pThumbnail(null)
        , __pPlayListPickerPopup(null)
@@ -84,7 +81,7 @@ AllListPanel::OnInitializing(void)
        __pPresentationModel = AllListPresentationModel::GetInstance();
        __pContentTableView->AddFastScrollListener(*this);
 
-       __pContextItem = CreateTableViewContextItem();
+       __pContextItem = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_01);
        __pDeletePopup = CommonUtil::CreateContentDeletePopup(*this, IDA_DELETE_POPUP_DELETE, IDA_DELETE_POPUP_CANCEL);
        if (__pDeletePopup == null || __pContextItem == null)
        {
@@ -107,15 +104,12 @@ result
 AllListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       RemoveContextMenu();
        if (__pPlayListPickerPopup != null)
        {
                delete __pPlayListPickerPopup;
                __pPlayListPickerPopup = null;
        }
-
-       delete __pContextItem;
-       __pContextItem = null;
-
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -189,61 +183,17 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        switch (actionId)
        {
-       case IDA_FLICK_BUTTON_SHARE:
-               // fall through
-       case IDA_FLICK_BUTTON_SET:
+       case IDA_FLICK_MENU_ITEM_SHARE:
                {
-                       Point itemPoint;
-
-                       Form *pForm = dynamic_cast<Form*>(GetParent());
-                       AppAssert(pForm);
-                       int screenHeight = pForm->GetHeight();
-                       Point convertPosition = source.ConvertToScreenPosition(Point(source.GetWidth() / 2, 0));
-                       itemPoint.x = convertPosition.x;
-                       itemPoint.y = convertPosition.y + source.GetHeight();
-
-                       ContextMenuAnchorDirection direction = CONTEXT_MENU_ANCHOR_DIRECTION_DOWNWARD;
-
-                       if (itemPoint.y > screenHeight / 2)
-                       {
-                               itemPoint.y = itemPoint.y - source.GetHeight();
-                               direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
-                       }
+                       CreateContextMenuN(source);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_EMAIL);
+               }
+               break;
 
-                       if (source.GetName() == IDC_SHARE_BUTTON)
-                       {
-                               if (__pShareContextMenu != null)
-                               {
-                                       delete __pShareContextMenu;
-                                       __pShareContextMenu = null;
-                               }
-                               __pShareContextMenu = new (std::nothrow) ContextMenu();
-                               __pShareContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, direction);
-                               //__pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"), IDA_SHARE_CONTEXT_MENU_MESSAGE); NEED
-                               __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"), IDA_SHARE_CONTEXT_MENU_EMAIL);
-                               //__pShareContextMenu->AddItem(L"Bluetooth", IDA_SHARE_CONTEXT_MENU_BLUETOOTH);//NEED STRING NEED
-                               __pShareContextMenu->AddActionEventListener(*this);
-                               __pShareContextMenu->SetAnchorPosition(itemPoint);
-                               __pShareContextMenu->SetShowState(true);
-                               __pShareContextMenu->Show();
-                       }
-                       else if (source.GetName() == IDC_SET_AS_BUTTON)
-                       {
-                               if (__pSetContextMenu != null)
-                               {
-                                       delete __pSetContextMenu;
-                                       __pSetContextMenu = null;
-                               }
-                               __pSetContextMenu = new (std::nothrow) ContextMenu();
-                               __pSetContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, direction);
-                               __pSetContextMenu->AddItem(L"Phone ringtone", IDA_SET_CONTEXT_MENU_CALL);//NEED STRING
-                               __pSetContextMenu->AddItem(L"Caller ringtone", IDA_SET_CONTEXT_MENU_CALLER);
-                               //__pSetContextMenu->AddItem(ResourceManager::GetString(L"IDS_MUSIC_OPT_SETAS_ALARM_TONE"), IDA_SET_CONTEXT_MENU_ALARM); NEED
-                               __pSetContextMenu->AddActionEventListener(*this);
-                               __pSetContextMenu->SetAnchorPosition(itemPoint);
-                               __pSetContextMenu->SetShowState(true);
-                               __pSetContextMenu->Show();
-                       }
+       case IDA_FLICK_MENU_ITEM_SET_AS:
+               {
+                       CreateContextMenuN(source);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_CALL | CONTEXT_MENU_ITEM_STYLE_CALLER);
                }
                break;
 
@@ -262,11 +212,11 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_SHARE_CONTEXT_MENU_EMAIL:
+       case IDA_CONTEXT_MENU_ITEM_EMAIL:
                // fall through         
-       case IDA_SHARE_CONTEXT_MENU_MESSAGE:
+       case IDA_CONTEXT_MENU_ITEM_MESSAGE:
                {
-                       String providerID = ((actionId == IDA_SHARE_CONTEXT_MENU_EMAIL) ? PROVIDER_ID_EMAIL : PROVIDER_ID_MESSAGE);
+                       String providerID = ((actionId == IDA_CONTEXT_MENU_ITEM_EMAIL) ? PROVIDER_ID_EMAIL : PROVIDER_ID_MESSAGE);
                        AppControl* pAppControl = AppManager::FindAppControlN(providerID, OPERATION_ID_COMPOSE);
                        if (pAppControl == null)
                        {
@@ -290,29 +240,24 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        pFrame->SetEnabled(false);
 
                        delete pContentInfoStruct;
-                       pContentInfoStruct = null;
-
                        delete pAppControl;
-                       pAppControl = null;
                }
                break;
 
-       case IDA_SET_CONTEXT_MENU_CALL:
+       case IDA_CONTEXT_MENU_ITEM_CALL:
                {
                        result r = __pPresentationModel->SetCallRingtone(__itemIndex);
                        if (r == E_SUCCESS)
                        {
                                MessageBox messageBox;
-                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_POP_SUCCESS"),
-                                               MSGBOX_STYLE_OK,
-                                               3000);
+                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_POP_SUCCESS"), MSGBOX_STYLE_OK, 3000);
                                int modalResult = 0;
                                messageBox.ShowAndWait(modalResult);
                        }
                }
                break;
 
-       case IDA_SET_CONTEXT_MENU_CALLER:
+       case IDA_CONTEXT_MENU_ITEM_CALLER:
                {
                        AppControl* pAppControl = AppManager::FindAppControlN(PROVIDER_ID_CONTACT, OPERATION_ID_SOCIAL_PICK);
                        if (pAppControl == null)
@@ -337,7 +282,7 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_FLICK_BUTTON_ADD_TO_PALYLIST:
+       case IDA_FLICK_MENU_ITEM_ADDTO:
                {
                        ContentInformation* pContentInfoStruct = __pPresentationModel->GetContentInfoN(__itemIndex);
                        if (pContentInfoStruct == null)
@@ -355,7 +300,6 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        __pPlayListPickerPopup->Show();
 
                        delete pContentInfoStruct;
-                       pContentInfoStruct = null;
                }
                break;
 
@@ -369,9 +313,9 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_EDIT:
+       case IDA_CONTEXT_MENU_ITEM_EDIT:
                // fall through
-       case IDA_MORE_CONTEXT_MENU_SHARE_VIA:
+       case IDA_CONTEXT_MENU_ITEM_SHARE_VIA:
                {
                        if (__pPresentationModel->GetTotalCount() == 0)
                        {
@@ -389,7 +333,7 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_SEARCH:
+       case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
                }
@@ -397,25 +341,14 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        case IDA_FOOTER_BUTTON_MORE:
                {
-                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
-                       if (__pMoreContextMenu != null)
+                       Point anchorPoint(X_POINT_FOOTER_MORE, Y_POINT_PORTRAIT_FOOTER_MORE);
+                       if ((GetCurrentOrientationMode() == ORIENTATION_STATUS_LANDSCAPE) || (GetCurrentOrientationMode() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
                        {
-                               delete __pMoreContextMenu;
-                               __pMoreContextMenu = null;
+                               anchorPoint.y = Y_POINT_LANDSCAPE_FOOTER_MORE;
                        }
-
-                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
-                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"), IDA_MORE_CONTEXT_MENU_SEARCH);
-                       __pMoreContextMenu->AddItem(L"Share via", IDA_MORE_CONTEXT_MENU_SHARE_VIA);//NEED STRING
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"), IDA_MORE_CONTEXT_MENU_EDIT);
-                       __pMoreContextMenu->AddItem(L"Folder view", IDA_MORE_CONTEXT_MENU_FOLDER_VIEW);//NEED STRING
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_MORE_CONTEXT_MENU_SETTINGS);
-                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
-                       __pMoreContextMenu->AddActionEventListener(*this);
-                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
-                       __pMoreContextMenu->SetShowState(true);
-                       __pMoreContextMenu->Show();
+                       CreateContextMenuN(source);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SETTINGS | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_SHARE_VIA |
+                                                                       CONTEXT_MENU_ITEM_STYLE_EDIT | CONTEXT_MENU_ITEM_STYLE_FOLDER_VIEW, anchorPoint);
                }
                break;
 
@@ -425,13 +358,13 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_FOLDER_VIEW:
+       case IDA_CONTEXT_MENU_ITEM_FOLDER_VIEW:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_SETTINGS:
+       case IDA_CONTEXT_MENU_ITEM_SETTINGS:
                {
                        SettingPresentationModel::GetInstance()->InitializeSettingValue();
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MUSIC_SETTING));
@@ -441,6 +374,8 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        default:
                break;
        }
+
+       TryRemoveContextMenu(actionId);
        AppLogDebug("EXIT");
 }
 
@@ -629,51 +564,6 @@ AllListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base:
        AppLogDebug("EXIT");
 }
 
-Tizen::Ui::Controls::TableViewContextItem*
-AllListPanel::CreateTableViewContextItem(void)
-{
-       AppLogDebug("ENTER");
-       TableViewContextItem* pContextItem = new (std::nothrow) TableViewContextItem();
-       if (IsFailed(pContextItem->Construct(Dimension(GetWidth(), ITEM_HEIGHT))))
-       {
-               AppLogDebug("Construct(Dimension(GetWidth(), ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
-               return null;
-       }
-
-       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
-       if (IsFailed(pSweepQuickMenu->Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL)))
-       {
-               AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
-               return null;
-       }
-
-       Button* pShareButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_SHARE_BUTTON));
-       pShareButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_BUTTON_SHARE"));
-       pShareButton->SetActionId(IDA_FLICK_BUTTON_SHARE);
-       pShareButton->AddActionEventListener(*this);
-
-       Button* pSetButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_SET_AS_BUTTON));
-       pSetButton->SetText(ResourceManager::GetString(L"IDS_COM_SK_SET_AS"));
-       pSetButton->SetActionId(IDA_FLICK_BUTTON_SET);
-       pSetButton->AddActionEventListener(*this);
-
-       Button* pAddToPlaylistButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_ADD_TO_BUTTON));
-       pAddToPlaylistButton->SetText(L"Add to"); //NEED STRING
-       pAddToPlaylistButton->SetActionId(IDA_FLICK_BUTTON_ADD_TO_PALYLIST);
-       pAddToPlaylistButton->AddActionEventListener(*this);
-
-       Button* pDeleteButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_BUTTON_DELETE));
-       pDeleteButton->SetText(ResourceManager::GetString("IDS_MUSIC_SK3_DELETE"));
-       pDeleteButton->SetActionId(IDA_FLICK_BUTTON_DELETE);
-       pDeleteButton->AddActionEventListener(*this);
-
-       pContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
-       pContextItem->AddControl(*pSweepQuickMenu);
-
-       AppLogDebug("EXIT");
-       return pContextItem;
-}
-
 Tizen::Base::Collection::ArrayList*
 AllListPanel::GetContentListN(int itemIndex)
 {
@@ -697,21 +587,6 @@ AllListPanel::UpdateContentList(void)
        {
                __pPresentationModel->UpdateContentList();
                __pContentTableView->UpdateTableView();
-               if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true)
-               {
-                       __pShareContextMenu->SetShowState(false);
-                       __pShareContextMenu->Invalidate(true);
-               }
-               if (__pSetContextMenu != null && __pSetContextMenu->GetShowState() == true)
-               {
-                       __pSetContextMenu->SetShowState(false);
-                       __pSetContextMenu->Invalidate(true);
-               }
-               if (__pMoreContextMenu != null && __pMoreContextMenu->GetShowState() == true)
-               {
-                       __pMoreContextMenu->SetShowState(false);
-                       __pMoreContextMenu->Invalidate(true);
-               }
        }
        AppLogDebug("EXIT");
 }
index 041f187..1b25937 100644 (file)
@@ -210,8 +210,13 @@ ArtistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_FOOTER_BUTTON_MORE:
                {
+                       Point anchorPoint(X_POINT_FOOTER_MORE, Y_POINT_PORTRAIT_FOOTER_MORE);
+                       if ((GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE) || (GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
+                       {
+                               anchorPoint.y = Y_POINT_LANDSCAPE_FOOTER_MORE;
+                       }
                        CreateContextMenuN(source);
-                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, Point(X_MORE_POPUP, Y_MORE_POPUP));
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, anchorPoint);
                }
                break;
 
index f981136..d87e7b2 100644 (file)
@@ -21,6 +21,7 @@
 
 #include "MpArtistListPanel.h"
 #include "MpPlaylistPickerPopup.h"
+#include "MpSettingPresentationModel.h"
 #include "MpThumbnailInfo.h"
 
 using namespace Tizen::Base;
@@ -38,7 +39,6 @@ ArtistListPanel::ArtistListPanel(void)
        , __pPlayListPickerPopup(null)
        , __pContextItem(null)
        , __pThumbnail(null)
-       , __pMoreContextMenu(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -54,20 +54,8 @@ result
 ArtistListPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
-
        __pPresentationModel = ArtistListPresentationModel::GetInstance();
-       __pContextItem = CreateTableViewContextItem();
-
-       if (__pContextItem == null)
-       {
-               delete __pContextItem;
-               __pContextItem = null;
-
-               AppLogDebug("CommonUtil::CreateContentDeletePopup failed");
-               return E_FAILURE;
-       }
+       __pContextItem = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_02);
 
        SetFooterStyle(STYLE_MORE_ADD);
        SetLayoutFitToForm();
@@ -79,9 +67,7 @@ result
 ArtistListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       delete __pContextItem;
-       __pContextItem = null;
-
+       RemoveContextMenu();
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -95,7 +81,16 @@ ArtistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
 
        switch (actionId)
        {
-       case IDA_FLICK_BUTTON_PLAY_ALL:
+       case IDA_FLICK_MENU_ITEM_ADDTO:
+               {
+                       __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
+                       __pPlayListPickerPopup->Initialize(this, __pPresentationModel->GetContentPathListN(__itemIndex));
+                       __pPlayListPickerPopup->SetShowState(true);
+                       __pPlayListPickerPopup->Show();
+               }
+               break;
+
+       case IDA_FLICK_MENU_ITEM_PLAYALL:
                {
                        ArrayList* pData = new (std::nothrow) ArrayList();
                        pData->Construct();
@@ -116,50 +111,39 @@ ArtistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
 
        case IDA_FOOTER_BUTTON_MORE:
                {
-                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
-                       if (__pMoreContextMenu != null)
+                       Point anchorPoint(X_POINT_FOOTER_MORE, Y_POINT_PORTRAIT_FOOTER_MORE);
+                       if ((GetCurrentOrientationMode() == ORIENTATION_STATUS_LANDSCAPE) || (GetCurrentOrientationMode() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
                        {
-                               delete __pMoreContextMenu;
-                               __pMoreContextMenu = null;
+                               anchorPoint.y = Y_POINT_LANDSCAPE_FOOTER_MORE;
                        }
-
-                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
-                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
-
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"), IDA_MORE_CONTEXT_MENU_EDIT);
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"), IDA_MORE_CONTEXT_MENU_SEARCH);
-                       __pMoreContextMenu->AddItem(L"Folder view", IDA_MORE_CONTEXT_MENU_FOLDER_VIEW);//NEED STRING
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_MORE_CONTEXT_MENU_SETTINGS);
-
-                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
-                       __pMoreContextMenu->AddActionEventListener(*this);
-                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
-                       __pMoreContextMenu->SetShowState(true);
-                       __pMoreContextMenu->Show();
+                       CreateContextMenuN(source);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SETTINGS | CONTEXT_MENU_ITEM_STYLE_SEARCH |
+                                                                       CONTEXT_MENU_ITEM_STYLE_EDIT | CONTEXT_MENU_ITEM_STYLE_FOLDER_VIEW, anchorPoint);
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_EDIT:
+       case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ARTIST_LIST_EDITOR));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_SEARCH:
+       case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_FOLDER_VIEW:
+       case IDA_CONTEXT_MENU_ITEM_FOLDER_VIEW:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_SETTINGS:
+       case IDA_CONTEXT_MENU_ITEM_SETTINGS:
                {
-                       // NEED
+                       SettingPresentationModel::GetInstance()->InitializeSettingValue();
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MUSIC_SETTING));
                }
                break;
 
@@ -172,6 +156,8 @@ ArtistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
        default:
                break;
        }
+
+       TryRemoveContextMenu(actionId);
        AppLogDebug("EXIT");
 }
 
@@ -392,42 +378,6 @@ ArtistListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
        return r;
 }
 
-Tizen::Ui::Controls::TableViewContextItem*
-ArtistListPanel::CreateTableViewContextItem(void)
-{
-       AppLogDebug("ENTER");
-       TableViewContextItem* pContextItem = new (std::nothrow) TableViewContextItem();
-
-       if (IsFailed(pContextItem->Construct(Dimension(GetWidth(), ITEM_HEIGHT))))
-       {
-               AppLogDebug("Construct(Dimension(GetWidth(), ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
-               return null;
-       }
-
-       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
-       if (IsFailed(pSweepQuickMenu->Construct(IDL_SWEEP_QUICK_ALBUM_PANEL)))
-       {
-               AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
-               return null;
-       }
-
-       Button* pShareButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_PLAY_ALL_BUTTON));
-       pShareButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
-       pShareButton->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
-       pShareButton->AddActionEventListener(*this);
-
-       Button* pAddToPlaylistButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_ADD_TO_BUTTON));
-       pAddToPlaylistButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_BUTTON2_ADD_TO_PLAYLIST"));
-       pAddToPlaylistButton->SetActionId(IDA_FLICK_BUTTON_ADD_TO_PALYLIST);
-       pAddToPlaylistButton->AddActionEventListener(*this);
-
-       pContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
-       pContextItem->AddControl(*pSweepQuickMenu);
-
-       AppLogDebug("EXIT");
-       return pContextItem;
-}
-
 void
 ArtistListPanel::UpdateContentList(void)
 {
@@ -437,12 +387,6 @@ ArtistListPanel::UpdateContentList(void)
                __pPresentationModel->UpdateArtistList();
                __pContentTableView->UpdateTableView();
        }
-
-       if (__pMoreContextMenu != null && __pMoreContextMenu->GetShowState() == true)
-       {
-               __pMoreContextMenu->SetShowState(false);
-               __pMoreContextMenu->Invalidate(true);
-       }
        AppLogDebug("EXIT");
 }
 
index b1b36ff..555aa2a 100644 (file)
@@ -807,10 +807,31 @@ CommonUtil::CreateFlickMenuN(Tizen::Ui::IActionEventListener& listener, FlickMen
        }
        else if (menuStyle == FLICK_MENU_STYLE_TYPE_02)
        {
-               return null;
+               if (IsFailed(pFlickMenuPanel->Construct(IDL_SWEEP_QUICK_ALBUM_PANEL)))
+               {
+                       AppLogDebug("Construct(IDL_SWEEP_QUICK_ALBUM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                       return null;
+               }
+       }
+       else if (menuStyle == FLICK_MENU_STYLE_TYPE_03)
+       {
+               if (IsFailed(pFlickMenuPanel->Construct(IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL)))
+               {
+                       AppLogDebug("Construct(IDL_SWEEP_QUICK_ALBUM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                       return null;
+               }
+       }
+       else if (menuStyle == FLICK_MENU_STYLE_TYPE_04)
+       {
+               if (IsFailed(pFlickMenuPanel->Construct(IDL_SWEEP_QUICK_ITEM2_PANEL)))
+               {
+                       AppLogDebug("Construct(IDL_SWEEP_QUICK_ALBUM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
+                       return null;
+               }
        }
        else
        {
+               AppLogDebug("EXIT");
                return null;
        }
 
@@ -846,6 +867,14 @@ CommonUtil::CreateFlickMenuN(Tizen::Ui::IActionEventListener& listener, FlickMen
                pDeleteButton->AddActionEventListener(listener);
        }
 
+       if (menuStyle & FLICK_MENU_ITEM_PLAYALL)
+       {
+               Button* pDeleteButton = static_cast<Button*>(pFlickMenuPanel->GetControl(IDC_PLAY_ALL_BUTTON));
+               pDeleteButton->SetText(ResourceManager::GetString("IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
+               pDeleteButton->SetActionId(IDA_FLICK_MENU_ITEM_PLAYALL);
+               pDeleteButton->AddActionEventListener(listener);
+       }
+
        AppLogDebug("EXIT");
        return pFlickMenuPanel;
 }
@@ -1007,6 +1036,7 @@ CommonUtil::AddContextMenuItem(Tizen::Ui::Controls::ContextMenu& contextMenu, un
        if (CONTEXT_MENU_ITEM_STYLE_CREATE_PLAYLIST & contextMenuItemStyle)
        {
 //             IDA_CONTEXT_MENU_ITEM_CREATE_PLAYLIST
+               contextMenu.AddItem(ResourceManager::GetString(L"IDS_MUSIC_OPT_CREATE_PLAYLIST"), IDA_CONTEXT_MENU_ITEM_CREATE_PLAYLIST);
        }
 
        if (CONTEXT_MENU_ITEM_STYLE_SHARE_VIA & contextMenuItemStyle)
index ed34c0e..56773ef 100644 (file)
@@ -38,6 +38,7 @@ static const int H_HIDE_MINI_PLAYER_REGISTER_BAR = 0;
 ContentLibaryPanel::ContentLibaryPanel(void)\r
        : ContentPanel::ContentPanel()\r
        , __pMiniPlayerRegisterBar(null)\r
+       , __pContextMenu(null)\r
 {\r
        AppLogDebug("ENTER");\r
        AppLogDebug("EXIT");\r
@@ -120,6 +121,15 @@ ContentLibaryPanel::IsExistMiniPlayer(void)
        return false;\r
 }\r
 \r
+Tizen::Ui::OrientationStatus\r
+ContentLibaryPanel::GetCurrentOrientationMode(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       const Form* pForm = dynamic_cast<Form*>(GetParent());\r
+       AppLogDebug("EXIT");\r
+       return pForm->GetOrientationStatus();\r
+}\r
+\r
 void\r
 ContentLibaryPanel::UpdateContentLibaryScreenState(void)\r
 {\r
@@ -226,4 +236,73 @@ ContentLibaryPanel::TryRegisterMiniPlayer(void)
        AddMiniPlayer(*pMiniPlayer);\r
        SetShowStateFooter(false);\r
        AppLogDebug("EXIT");\r
+}\r
+\r
+result\r
+ContentLibaryPanel::CreateContextMenuN(const Tizen::Ui::Control& source)\r
+{\r
+       AppLogDebug("ENTER");\r
+       RemoveContextMenu();\r
+       __pContextMenu = CommonUtil::CreateContextMenuN(source, *this);\r
+       if (__pContextMenu != null)\r
+       {\r
+               return E_SUCCESS;\r
+       }\r
+       AppLogDebug("EXIT");\r
+       return E_FAILURE;\r
+}\r
+\r
+result\r
+ContentLibaryPanel::SetContextMenuItem(unsigned int contextMenuItemStyle, Tizen::Graphics::Point anchorPosition)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pContextMenu == null)\r
+       {\r
+               AppLogDebug("EXIT");\r
+               return E_FAILURE;\r
+       }\r
+\r
+       CommonUtil::AddContextMenuItem(*__pContextMenu, contextMenuItemStyle);\r
+       CommonUtil::ShowContextMenu(*__pContextMenu, true);\r
+\r
+       Point prevAnchorPosition = __pContextMenu->GetAnchorPosition();\r
+       if (anchorPosition.x != -1 && IsExistMiniPlayer() == false)\r
+       {\r
+               prevAnchorPosition.x = anchorPosition.x;\r
+       }\r
+\r
+       if (anchorPosition.y != -1 && IsExistMiniPlayer() == false)\r
+       {\r
+               prevAnchorPosition.y = anchorPosition.y;\r
+       }\r
+\r
+       __pContextMenu->SetAnchorPosition(prevAnchorPosition);\r
+       AppLogDebug("EXIT(anchor.x=%d, anchor.y=%d", prevAnchorPosition.x, prevAnchorPosition.y);\r
+       return E_SUCCESS;\r
+}\r
+\r
+void\r
+ContentLibaryPanel::RemoveContextMenu(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       if (__pContextMenu != null)\r
+       {\r
+               delete __pContextMenu;\r
+               __pContextMenu = null;\r
+       }\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+result\r
+ContentLibaryPanel::TryRemoveContextMenu(int actionId)\r
+{\r
+       AppLogDebug("ENTER");\r
+       result r = E_FAILURE;\r
+       if (CommonUtil::IsVaildContextMenuItemActionId(actionId) == true)\r
+       {\r
+               RemoveContextMenu();\r
+               r = E_SUCCESS;\r
+       }\r
+       AppLogDebug("EXIT");\r
+       return r;\r
 }
\ No newline at end of file
index 3012921..ce8dca7 100644 (file)
@@ -191,8 +191,13 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_FOOTER_BUTTON_MORE:
                {
+                       Point anchorPoint(X_POINT_FOOTER_MORE, Y_POINT_PORTRAIT_FOOTER_MORE);
+                       if ((GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE) || (GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
+                       {
+                               anchorPoint.y = Y_POINT_LANDSCAPE_FOOTER_MORE;
+                       }
                        CreateContextMenuN(source);
-                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_GO_TO_LIBARY | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, Point(X_MORE_POPUP, Y_MORE_POPUP));
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_GO_TO_LIBARY | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, anchorPoint);
                }
                break;
 
index 060e415..f94e2d0 100644 (file)
@@ -39,7 +39,6 @@ FolderListPanel::FolderListPanel(void)
        , __pPlayListPickerPopup(null)
        , __pContextItem(null)
        , __scrolledDistance(0)
-       , __pMoreContextMenu(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -56,12 +55,10 @@ FolderListPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
        __pContentTableView->SetItemDividerColor(Color(COLOR_ID_WHITE));
-       __pContextItem = CreatePlayallAddtoContextItem();
-
        __pPresentationModel = FolderListPresentationModel::GetInstance();
+       __pContextItem = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_02);
 
        SetLayoutFitToForm();
-//     CommonUtil::SetSimpleTitleStyle(*GetHeader(), L"Folder View");
        SetFooterStyle(STYLE_MORE_ADD);
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -71,9 +68,7 @@ result
 FolderListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       delete __pContextItem;
-       __pContextItem = null;
-
+       RemoveContextMenu();
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -87,7 +82,7 @@ FolderListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
 
        switch (actionId)
        {
-       case IDA_FLICK_BUTTON_PLAY_ALL:
+       case IDA_FLICK_MENU_ITEM_PLAYALL:
                {
                        ArrayList* pData = new (std::nothrow) ArrayList();
                        pData->Construct();
@@ -100,7 +95,7 @@ FolderListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
                }
                break;
 
-       case IDA_FLICK_BUTTON_ADD_TO_PALYLIST:
+       case IDA_FLICK_MENU_ITEM_ADDTO:
                {
                        __pPlayListPickerPopup = new (std::nothrow) PlayListPickerPopup();
                        __pPlayListPickerPopup->Initialize(this, __pPresentationModel->GetContentPathListN(__itemIndex));
@@ -111,41 +106,29 @@ FolderListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
 
        case IDA_FOOTER_BUTTON_MORE:
                {
-                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
-                       if (__pMoreContextMenu != null)
+                       Point anchorPoint(X_POINT_FOOTER_MORE, Y_POINT_PORTRAIT_FOOTER_MORE);
+                       if ((GetCurrentOrientationMode() == ORIENTATION_STATUS_LANDSCAPE) || (GetCurrentOrientationMode() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
                        {
-                               delete __pMoreContextMenu;
-                               __pMoreContextMenu = null;
+                               anchorPoint.y = Y_POINT_LANDSCAPE_FOOTER_MORE;
                        }
-
-                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
-                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
-
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"), IDA_MORE_CONTEXT_MENU_EDIT);
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"), IDA_MORE_CONTEXT_MENU_SEARCH);
-                       __pMoreContextMenu->AddItem(L"Go to Library", IDA_MORE_CONTEXT_MENU_GO_TO_LIBRARY);//NEED STRING
-
-                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
-                       __pMoreContextMenu->AddActionEventListener(*this);
-                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
-                       __pMoreContextMenu->SetShowState(true);
-                       __pMoreContextMenu->Show();
+                       CreateContextMenuN(source);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT | CONTEXT_MENU_ITEM_STYLE_GO_TO_LIBARY, anchorPoint);
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_EDIT:
+       case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST_EDITOR));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_SEARCH:
+       case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_GO_TO_LIBRARY:
+       case IDA_CONTEXT_MENU_ITEM_GO_TO_LIBARY:
                {
                        CommonUtil::SetTabHeaderStyle(*GetHeader());
                        GetHeader()->Invalidate(true);
@@ -162,6 +145,8 @@ FolderListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
        default:
                break;
        }
+
+       TryRemoveContextMenu(actionId);
        AppLogDebug("EXIT");
 }
 
@@ -247,23 +232,19 @@ FolderListPanel::CreateItem(const int itemIndex, int itemWidth)
                return null;
        }
 
-       Label* pStorageIcon = static_cast<Label*>(pTableViewItem->GetControl(IDC_STORAGE_TYPE_ICON));
-       pStorageIcon->SetBackgroundBitmap(*StorageIconBitmap);
+       static_cast<Label*>(pTableViewItem->GetControl(IDC_STORAGE_TYPE_ICON))->SetBackgroundBitmap(*StorageIconBitmap);
        delete StorageIconBitmap;
 
-       Label* pFolderPath = static_cast<Label*>(pTableViewItem->GetControl(IDC_FOLDER_PATH));
        String fullContentPath;
        pContentPath->SubString(INIT_VALUE, folderNamePosition, fullContentPath);
-       pFolderPath->SetText(CommonUtil::SetHighDepthToEllipsisPath(fullContentPath));
+       static_cast<Label*>(pTableViewItem->GetControl(IDC_FOLDER_PATH))->SetText(CommonUtil::SetHighDepthToEllipsisPath(fullContentPath));
 
-       Label* pFolderName = static_cast<Label*>(pTableViewItem->GetControl(IDC_FOLDER_NAME));
-       pFolderName->SetText(strFolderName);
-
-       Label* pFolderItemCount = static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_ITEM_COUNT));
-       pFolderItemCount->SetText(CommonUtil::SetSongsString(__pPresentationModel->GetContentCount(itemIndex)));
+       static_cast<Label*>(pTableViewItem->GetControl(IDC_FOLDER_NAME))->SetText(strFolderName);
+       static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_ITEM_COUNT))->SetText(CommonUtil::SetSongsString(__pPresentationModel->GetContentCount(itemIndex)));
 
        RelativeLayout layout;
        layout.Construct();
+
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
@@ -271,8 +252,6 @@ FolderListPanel::CreateItem(const int itemIndex, int itemWidth)
        CommonUtil::SetLayoutFitToContainer(*pItem, *pTableViewItem);
 
        pItem->SetContextItem(__pContextItem);
-       pItem->SetIndividualSelectionEnabled(pTableViewItem, true);
-
        AppLogDebug("EXIT");
        return pItem;
 }
@@ -322,53 +301,6 @@ FolderListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Control
 }
 
 void
-FolderListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index)
-{
-       AppLogDebug("ENTER");
-       int totalCount = __pPresentationModel->GetAllFolderCount();
-       for (int iCount = 0; iCount < totalCount; iCount++)
-       {
-               String* pName = __pPresentationModel->GetFolderName(iCount);
-               String firstCharacter;
-
-               pName->SubString(0, 1, firstCharacter);
-               firstCharacter.ToUpper();
-
-               mchar language;
-               firstCharacter.GetCharAt(0, language);
-
-               if (Character::GetUnicodeCategory(language) == UNICODE_HANGUL)
-               {
-                       Tizen::Base::String HangulIndex[] = {"ㄱ", "ㄲ", "ㄴ", "ㄷ", "ㄸ", "ㄹ", "ㅁ", "ㅂ", "ㅃ", "ㅅ", "ㅆ", "ㅇ" , "ㅈ", "ㅉ", "ㅊ", "ㅋ", "ㅌ", "ㅍ", "ㅎ"};
-
-                       wchar_t songName;
-                       pName->GetCharAt(0, songName);
-
-                       wchar_t UnicodeValue = (songName - 0xAC00);
-                       wchar_t InitialConsonant = ((UnicodeValue - (UnicodeValue % 28)) / 28) / 21;
-                       int tempIndex = static_cast<int>(InitialConsonant);
-
-                       if (HangulIndex[tempIndex].CompareTo(index) == 0)
-                       {
-                               __pContentTableView->ScrollToItem(iCount);
-                               break;
-                       }
-               }
-               else if (index.CompareTo("0") == 0 && Character::IsDigit(language) == true)
-               {
-                       __pContentTableView->ScrollToItem(iCount);
-                       break;
-               }
-               else if (firstCharacter.CompareTo(index) == 0)
-               {
-                       __pContentTableView->ScrollToItem(iCount);
-                       break;
-               }
-       }
-       AppLogDebug("EXIT");
-}
-
-void
 FolderListPanel::OnScrollEndReached (Tizen::Ui::Control& source, Tizen::Ui::Controls::ScrollEndEvent type)
 {
        AppLogDebug("ENTER");
@@ -420,12 +352,6 @@ FolderListPanel::UpdateContentList(void)
                __pPresentationModel->UpdateFolderPathList();
                __pContentTableView->UpdateTableView();
        }
-
-       if (__pMoreContextMenu != null && __pMoreContextMenu->GetShowState() == true)
-       {
-               __pMoreContextMenu->SetShowState(false);
-               __pMoreContextMenu->Invalidate(true);
-       }
        AppLogDebug("EXIT");
 }
 
@@ -440,35 +366,4 @@ FolderListPanel::IsEmptyContentList(void)
        }
        AppLogDebug("EXIT");
        return false;
-}
-
-Tizen::Ui::Controls::TableViewContextItem*
-FolderListPanel::CreatePlayallAddtoContextItem(void)
-{
-       AppLogDebug("ENTER");
-       TableViewContextItem* pTableViewContextItem = new (std::nothrow) TableViewContextItem();
-       if (IsFailed(pTableViewContextItem->Construct(Dimension(GetWidth(), ITEM_HEIGHT))))
-       {
-               AppLogDebug("Construct(Dimension(GetWidth(), ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
-               return null;
-       }
-       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
-       if (IsFailed(pSweepQuickMenu->Construct(IDL_CONTEXT_ITEM_PLAYALL_ADDTO)))
-       {
-               AppLogDebug("Construct(IDL_CONTEXT_ITEM_PLAYALL_ADDTO) failed(%s)", GetErrorMessage(GetLastResult()));
-               return null;
-       }
-       Button* pPlayAllButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_PLAY_ALL));
-       pPlayAllButton->SetText(L"Play all"); ////NEED STRING
-       pPlayAllButton->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
-       pPlayAllButton->AddActionEventListener(*this);
-       Button* pAddtoPlayListButton = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_ADD_TO_PLAYLIST));
-       pAddtoPlayListButton->SetText(L"Add to Playlist"); //NEED STRING
-       pAddtoPlayListButton->SetActionId(IDA_FLICK_BUTTON_ADD_TO_PALYLIST);
-       pAddtoPlayListButton->AddActionEventListener(*this);
-       pTableViewContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
-       pTableViewContextItem->AddControl(*pSweepQuickMenu);
-       CommonUtil::SetLayoutFitToContainer(*pTableViewContextItem, *pSweepQuickMenu);
-       AppLogDebug("EXIT");
-       return pTableViewContextItem;
 }
\ No newline at end of file
index 6042afd..1769fb8 100644 (file)
@@ -438,13 +438,12 @@ MiniPlayer::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Gr
        if (__pMinPlayerPrevButton->GetHashCode() == source.GetHashCode() )\r
        {\r
                __isLongPressed = true;\r
-               __pPresentationModel->Rewind();\r
-               AppLogDebug("__pMinPlayerPrevButton");\r
+               __pPresentationModel->SeekToRewind();\r
        }\r
        else if (__pMinPlayerNextButton->GetHashCode() == source.GetHashCode() )\r
        {\r
                __isLongPressed = true;\r
-               __pPresentationModel->Forward();\r
+               __pPresentationModel->SeekToForward();\r
                AppLogDebug("__pMinPlayerNextButton");\r
        }\r
        else\r
index fdbf96c..a85d850 100644 (file)
@@ -676,17 +676,13 @@ PlayerForm::OnTouchLongPressed(const Control& source, const Point& currentPositi
                __isLongPressed = true;
                if (source.Equals(*__pRewindButton))
                {
-                       __pPlayerPresentationModel->Rewind();
+                       __pPlayerPresentationModel->SeekToRewind();
                }
                else
                {
-                       __pPlayerPresentationModel->Forward();
+                       __pPlayerPresentationModel->SeekToForward();
                }
        }
-       else
-       {
-               // Empty statement
-       }
        AppLogDebug("EXIT");
 }
 
index 9a49ef5..1fb194b 100644 (file)
@@ -1101,26 +1101,39 @@ PlayerPresentationModel::MoveNextContent(void)
 }
 
 void
+PlayerPresentationModel::SeekToRewind(void)
+{
+       AppLogDebug("ENTER");
+       int playDuration = __pPlayer->GetDuration();
+       __playposition = static_cast<int>(__pPlayer->GetPosition() / (playDuration / TIMER_INTERVAL));
+       Rewind();
+       AppLogDebug("EXIT");
+}
+
+void
 PlayerPresentationModel::Rewind(void)
 {
        AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       if (__pFastRewindTimer != null)
-       {
-               r = __pFastRewindTimer->Start(PROGRESS_TIMER_DURATION);
-               TryCatch(r == E_SUCCESS, , "__pFastRewindTimer start failed. [%ls]", GetErrorMessage(r));
-       }
        __playposition = __playposition - __xTimesValue;
-
-//     if ((__playposition >= MIN_SLIDER_COUNT) && (__playposition <= MAX_SLIDER_COUNT))
+       result r = SetPlayPosition(__playposition);
+       if (IsFailed(r))
        {
-               SetPlayPosition(__playposition);
+               StopForwardRewind();
+               return;
        }
-       AppLogDebug("__playposition : %d", __playposition);
+
        if (__playposition < MIN_SLIDER_COUNT && GetPlayerState() == PLAYER_STATE_PAUSED)
        {
                StopForwardRewind();
+               return;
+       }
+
+       if (__pFastRewindTimer != null)
+       {
+               r = __pFastRewindTimer->Start(PROGRESS_TIMER_DURATION);
+               TryCatch(r == E_SUCCESS, , "__pFastRewindTimer start failed. [%ls]", GetErrorMessage(r));
        }
+
        AppLogDebug("EXIT");
        return;
 
@@ -1130,26 +1143,39 @@ CATCH:
 }
 
 void
+PlayerPresentationModel::SeekToForward(void)
+{
+       AppLogDebug("ENTER");
+       int playDuration = __pPlayer->GetDuration();
+       __playposition = static_cast<int>(__pPlayer->GetPosition() / (playDuration / TIMER_INTERVAL));
+       Forward();
+       AppLogDebug("EXIT");
+}
+
+void
 PlayerPresentationModel::Forward(void)
 {
        AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       if (__pFastForwardTimer != null)
-       {
-               r = __pFastForwardTimer->Start(PROGRESS_TIMER_DURATION);
-               TryCatch(r == E_SUCCESS, , "__pFastForwardTimer start failed. [%ls]", GetErrorMessage(r));
-       }
        __playposition = __playposition - __xTimesValue;
-
-//     if ((__playposition >= MIN_SLIDER_COUNT) && (__playposition <= MAX_SLIDER_COUNT))
+       result r = SetPlayPosition(__playposition);
+       if (IsFailed(r))
        {
-               SetPlayPosition(__playposition);
+               StopForwardRewind();
+               return;
        }
-       AppLogDebug("__playposition : %d", __playposition);
+
        if (__playposition > MAX_SLIDER_COUNT && GetPlayerState() == PLAYER_STATE_PAUSED)
        {
                StopForwardRewind();
+               return;
        }
+
+       if (__pFastForwardTimer != null)
+       {
+               r = __pFastForwardTimer->Start(PROGRESS_TIMER_DURATION);
+               TryCatch(r == E_SUCCESS, , "__pFastForwardTimer start failed. [%ls]", GetErrorMessage(r));
+       }
+
        AppLogDebug("EXIT");
        return;
 
@@ -1174,18 +1200,19 @@ PlayerPresentationModel::StopForwardRewind(void)
                TryLog(r == E_SUCCESS, "[%s] __pFastRewindTimer cancel failed", GetErrorMessage(r));
        }
        __xTimesValue = INIT_X_VALUE;
+       __seekCompleted = true;
        AppLogDebug("EXIT");
        return;
 }
 
-void
+result
 PlayerPresentationModel::SetPlayPosition(int playPosition)
 {
        AppLogDebug("ENTER");
        if (__pPlayer == null)
        {
                AppLogDebug("EXIT");
-               return;
+               return E_FAILURE;
        }
 
        result r = E_SUCCESS;
@@ -1222,13 +1249,13 @@ PlayerPresentationModel::SetPlayPosition(int playPosition)
                }
                else
                {
-                       __playposition = playPosition;
-                       currentDuration = CommonUtil::GetFormatDate(playPosition * (__currentPlayContentDuration / TIMER_INTERVAL));
-                       CallOnPlayTimeChanged(currentDuration, __playposition);
+//                     __playposition = playPosition;
+//                     currentDuration = CommonUtil::GetFormatDate(playPosition * (__currentPlayContentDuration / TIMER_INTERVAL));
+//                     CallOnPlayTimeChanged(currentDuration, __playposition);
                        __seekCompleted = true;
                }
        }
-       return;
+       return r;
 
 CATCH:
        //AppLogException( "[%s]", GetErrorMessage(r));
@@ -1239,7 +1266,7 @@ CATCH:
        }
        __seekCompleted = false;
        AppLogDebug("EXIT");
-       return;
+       return r;
 }
 
 int
@@ -1682,8 +1709,8 @@ PlayerPresentationModel::OnPlayerEndOfClip(void)
                        if (__pPlayContentList->GetCount() - 1 == __currentContentIndex)
                        {
                                StopForwardRewind();
-                               __pPlayer->SeekTo(MIN_SLIDER_COUNT);
                                InitializeProgress();
+                               Play(__currentContentIndex, MIN_SLIDER_COUNT, true);
                                Pause();
                        }
                        else
index e23adff..fee3734 100644 (file)
@@ -152,8 +152,13 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_FOOTER_BUTTON_MORE:
                {
+                       Point anchorPoint(X_POINT_FOOTER_MORE, Y_POINT_PORTRAIT_FOOTER_MORE);
+                       if ((GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE) || (GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
+                       {
+                               anchorPoint.y = Y_POINT_LANDSCAPE_FOOTER_MORE;
+                       }
                        CreateContextMenuN(source);
-                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, Point(X_MORE_POPUP, Y_MORE_POPUP));
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, anchorPoint);
                }
                break;
 
index cabfdff..1859b65 100644 (file)
@@ -64,7 +64,6 @@ PlaylistCreatorForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
        __pPlaylistEditField = static_cast<EditField*>(GetControl(IDC_EDITFIELD));
-       __pPlaylistEditField->SetOverlayKeypadCommandButtonVisible(false);
        __pPlaylistEditField->AddTextEventListener(*this);
        __pPlaylistEditField->AddKeypadEventListener(*this);
 
@@ -72,6 +71,9 @@ PlaylistCreatorForm::OnInitializing(void)
        __pPlaylistEditField->ShowKeypad();
        __pPlaylistEditorPresentationModel = PlaylistEditorPresentationModel::GetInstance();
 
+       SetFormBackEventListener(this);
+       GetFooter()->AddActionEventListener(*this);
+
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -134,9 +136,6 @@ PlaylistCreatorForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previou
        __previousSceneId = previousSceneId;
        AppLogDebug("%d", totalPlaylistCount);
 
-       SetFormBackEventListener(this);
-       GetFooter()->AddActionEventListener(*this);
-
        if (totalPlaylistCount != 0)
        {
                int lastNum = 0;
@@ -302,9 +301,7 @@ PlaylistCreatorForm::OnActionPerformed(const Tizen::Ui::Control& source, int act
                                        CommonUtil::SetAddtoPlaylistName(editFieldName);
                                        __pPlaylistEditField->HideKeypad();
                                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_CONTENT_PICKER,
-                                                                                                                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE,
-                                                                                                                                       SCENE_HISTORY_OPTION_NO_HISTORY,
-                                                                                                                                       SCENE_DESTROY_OPTION_DESTROY));
+                                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY));
                                }
                        }
                        else
index 349d2cd..c9859c4 100644 (file)
@@ -53,7 +53,6 @@ PlaylistListPanel::PlaylistListPanel(void)
        , __pDeletePopup(null)
        , __selectedItemIndex(-1)
        , __pPlaylistName(null)
-       , __pMoreContextMenu(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -69,8 +68,8 @@ result
 PlaylistListPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       __pContextItem_default = CreateTableViewContextItem(DEFAULT_PLAY_LIST);
-       __pContextItem_user = CreateTableViewContextItem(USER_CREATED_PLAY_LIST);
+       __pContextItem_default = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_03);
+       __pContextItem_user = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_04);
        __pDeletePopup = CommonUtil::CreateContentDeletePopup(*this, IDA_DELETE_POPUP_DELETE, IDA_DELETE_POPUP_CANCEL);
 
        if (__pDeletePopup == null || __pContextItem_default == null || __pContextItem_user == null)
@@ -98,7 +97,7 @@ result
 PlaylistListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-
+       RemoveContextMenu();
        if (__pDeletePopup != null)
        {
                delete __pDeletePopup;
@@ -143,7 +142,26 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_EDIT:
+       case IDA_FOOTER_BUTTON_MORE:
+               {
+                       Point anchorPoint(X_POINT_FOOTER_MORE, Y_POINT_PORTRAIT_FOOTER_MORE);
+                       if ((GetCurrentOrientationMode() == ORIENTATION_STATUS_LANDSCAPE) || (GetCurrentOrientationMode() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
+                       {
+                               anchorPoint.y = Y_POINT_LANDSCAPE_FOOTER_MORE;
+                       }
+                       CreateContextMenuN(source);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT | CONTEXT_MENU_ITEM_STYLE_SETTINGS |
+                                       CONTEXT_MENU_ITEM_STYLE_FOLDER_VIEW | CONTEXT_MENU_ITEM_STYLE_CREATE_PLAYLIST, anchorPoint);
+               }
+               break;
+
+       case IDA_CONTEXT_MENU_ITEM_SEARCH:
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+               }
+               break;
+
+       case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
                        if (__pPlaylistListPresentationModel->GetAllPlayListCount() == 0)
                        {
@@ -162,32 +180,26 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_CREATE_PLAYLIST:
+       case IDA_CONTEXT_MENU_ITEM_CREATE_PLAYLIST:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYLIST_CREATOR));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_SEARCH:
-               {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
-               }
-               break;
-
-       case IDA_MORE_CONTEXT_MENU_FOLDER_VIEW:
+       case IDA_CONTEXT_MENU_ITEM_FOLDER_VIEW:
                {
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST));
                }
                break;
 
-       case IDA_MORE_CONTEXT_MENU_SETTINGS:
+       case IDA_CONTEXT_MENU_ITEM_SETTINGS:
                {
                        SettingPresentationModel::GetInstance()->InitializeSettingValue();
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MUSIC_SETTING));
                }
                break;
 
-       case IDA_FLICK_BUTTON_PLAY_ALL:
+       case IDA_FLICK_MENU_ITEM_PLAYALL:
                {
                        if (__selectedItemIndex >= USER_CONTENT)
                        {
@@ -212,7 +224,7 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                }
                break;
 
-       case IDA_FLICK_BUTTON_DELETE:
+       case IDA_FLICK_MENU_ITEM_DELETE:
                {
                        if (__pDeletePopup != null)
                        {
@@ -222,32 +234,6 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                }
                break;
 
-       case IDA_FOOTER_BUTTON_MORE:
-               {
-                       Point pointMorePopup = Point(X_MORE_POPUP, Y_MORE_POPUP);
-
-                       if (__pMoreContextMenu != null)
-                       {
-                               delete __pMoreContextMenu;
-                               __pMoreContextMenu = null;
-                       }
-
-                       __pMoreContextMenu = new (std::nothrow) ContextMenu();
-                       __pMoreContextMenu->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_MUSIC_OPT_CREATE_PLAYLIST"), IDA_MORE_CONTEXT_MENU_CREATE_PLAYLIST);
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"), IDA_MORE_CONTEXT_MENU_EDIT);
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"), IDA_MORE_CONTEXT_MENU_SEARCH);
-                       __pMoreContextMenu->AddItem(L"Folder view", IDA_MORE_CONTEXT_MENU_FOLDER_VIEW);//NEED STRING
-                       __pMoreContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_MORE_CONTEXT_MENU_SETTINGS);
-
-                       __pMoreContextMenu->SetMaxVisibleItemsCount(__pMoreContextMenu->GetItemCount());
-                       __pMoreContextMenu->AddActionEventListener(*this);
-                       __pMoreContextMenu->SetAnchorPosition(pointMorePopup);
-                       __pMoreContextMenu->SetShowState(true);
-                       __pMoreContextMenu->Show();
-               }
-               break;
-
        case IDA_FOOTER_BUTTON_BACK:
                {
                        Tizen::App::Application::GetInstance()->Terminate();
@@ -258,6 +244,7 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                break;
        }
 
+       TryRemoveContextMenu(actionId);
        AppLogDebug("EXIT");
 }
 
@@ -282,28 +269,7 @@ PlaylistListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousS
        GetHeader()->SetItemSelected(1);
        GetHeader()->Invalidate(true);
 
-       SceneManager* pSceneManager = SceneManager::GetInstance();
-       AppAssert(pSceneManager);
-
-       if (pSceneManager->IsSceneAlive(IDSCN_PLAYER) && IsExistMiniPlayer() == false)
-       {
-               MiniPlayer* pMiniPlayer = new (std::nothrow) MiniPlayer();
-               if (IsFailed(pMiniPlayer->Construct()))
-               {
-                       AppLogDebug("MiniPlayer.Construct() failed");
-                       SetShowStateFooter(true);
-                       delete pMiniPlayer;
-               }
-               else
-               {
-                       pMiniPlayer->SetBackActionEventListner(*this, IDA_FOOTER_BUTTON_BACK);
-                       pMiniPlayer->SetMoreContextMenuActionEventListner(this, IDA_FOOTER_BUTTON_MORE);
-                       AddMiniPlayer(*pMiniPlayer);
-                       SetShowStateFooter(false);
-               }
-       }
        UpdateContentList();
-
        ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
        AppLogDebug("EXIT");
 }
@@ -520,70 +486,6 @@ PlaylistListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Contr
        AppLogDebug("EXIT");
 }
 
-Tizen::Ui::Controls::TableViewContextItem*
-PlaylistListPanel::CreateTableViewContextItem(int playListType)
-{
-       AppLogDebug("ENTER");
-       TableViewContextItem* pContextItem = new (std::nothrow) TableViewContextItem();
-       if (IsFailed(pContextItem->Construct(Dimension(GetWidth(), ITEM_HEIGHT))))
-       {
-               AppLogDebug("Construct(Dimension(GetWidth(), ITEM_HEIGHT) failed(%s)", GetErrorMessage(GetLastResult()));
-               return null;
-       }
-
-       switch (playListType)
-       {
-       case DEFAULT_PLAY_LIST:
-               {
-                       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
-                       if (IsFailed(pSweepQuickMenu->Construct(IDL_SWEEP_QUICK_PLAYALL_ITEM_PANEL)))
-                       {
-                               AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
-                               return null;
-                       }
-
-                       Button* pButtonPlayAll = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_PLAY_ALL_BUTTON));
-                       pButtonPlayAll->SetText(ResourceManager::GetString("IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
-                       pButtonPlayAll->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
-                       pButtonPlayAll->AddActionEventListener(*this);
-
-                       pContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
-                       pContextItem->AddControl(*pSweepQuickMenu);
-               }
-               break;
-
-       case USER_CREATED_PLAY_LIST:
-               {
-                       Panel* pSweepQuickMenu = new (std::nothrow) Panel();
-                       if (IsFailed(pSweepQuickMenu->Construct(IDL_SWEEP_QUICK_ITEM2_PANEL)))
-                       {
-                               AppLogDebug("Construct(IDL_SWEEP_QUICK_MENU_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
-                               return null;
-                       }
-
-                       Button* pButtonPlayAll = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_PLAY_ALL_BUTTON));
-                       pButtonPlayAll->SetText(ResourceManager::GetString("IDS_MUSIC_OPT_MOREMENU_PLAY_ALL"));
-                       pButtonPlayAll->SetActionId(IDA_FLICK_BUTTON_PLAY_ALL);
-                       pButtonPlayAll->AddActionEventListener(*this);
-
-                       Button* pButtonDelete = static_cast<Button*>(pSweepQuickMenu->GetControl(IDC_BUTTON_DELETE));
-                       pButtonDelete->SetText(ResourceManager::GetString("IDS_MUSIC_SK3_DELETE"));
-                       pButtonDelete->SetActionId(IDA_FLICK_BUTTON_DELETE);
-                       pButtonDelete->AddActionEventListener(*this);
-
-                       pContextItem->SetIndividualSelectionEnabled(pSweepQuickMenu, true);
-                       pContextItem->AddControl(*pSweepQuickMenu);
-               }
-               break;
-
-       default:
-               break;
-       }
-
-       AppLogDebug("EXIT");
-       return pContextItem;
-}
-
 result
 PlaylistListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
                                                                Tizen::Base::String& labelName,
@@ -591,8 +493,6 @@ PlaylistListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
                                                                int totalCount)
 {
        AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-
        Panel* pPanelTableViewItem = new (std::nothrow) Panel();
        if (IsFailed(pPanelTableViewItem->Construct(IDL_CONTENTS_LIBARY_ITEM_SUBTEXT_PANEL)))
        {
@@ -600,18 +500,13 @@ PlaylistListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
                return E_FAILURE;
        }
 
-       Label* pLabelThumbnail = static_cast<Label*>(pPanelTableViewItem->GetControl(IDC_CONTENTS_THUMBNAIL));
-       pLabelThumbnail->SetBackgroundBitmap(bitmap);
-
-       Label* pLabelTitleName = static_cast<Label*>(pPanelTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME));
-       pLabelTitleName->SetText(labelName);
-
-       Label* pLabelPlaylistItemCount = static_cast<Label*>(pPanelTableViewItem->GetControl(IDC_CONTENT_TOTAL_COUNT));
-       pLabelPlaylistItemCount->SetText(CommonUtil::SetSongsString(totalCount));
+       static_cast<Label*>(pPanelTableViewItem->GetControl(IDC_CONTENTS_THUMBNAIL))->SetBackgroundBitmap(bitmap);
+       static_cast<Label*>(pPanelTableViewItem->GetControl(IDC_CONTENTS_TITLE_NAME))->SetText(labelName);
+       static_cast<Label*>(pPanelTableViewItem->GetControl(IDC_CONTENT_TOTAL_COUNT))->SetText(CommonUtil::SetSongsString(totalCount));
 
        if (totalCount <= NUM_NOT_DISPLAY_CONTENT_COUNT)
        {
-               pLabelPlaylistItemCount->SetShowState(false);
+               static_cast<Label*>(pPanelTableViewItem->GetControl(IDC_CONTENT_TOTAL_COUNT))->SetShowState(false);
                static_cast<Label*>(pPanelTableViewItem->GetControl(L"IDC_THUMBNAIL_INNER_STROKE"))->SetShowState(false);
        }
        else if (totalCount == INIT_VALUE)
@@ -623,7 +518,7 @@ PlaylistListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
        CommonUtil::SetLayoutFitToContainer(parent, *pPanelTableViewItem);
 
        AppLogDebug("EXIT");
-       return r;
+       return E_SUCCESS;
 }
 
 void
@@ -668,11 +563,6 @@ bool
 PlaylistListPanel::IsEmptyContentList(void)
 {
        AppLogDebug("ENTER");
-//     if (__pPresentationModel == null || __pPresentationModel->GetTotalCount() == INIT_VALUE)
-//     {
-//             AppLogDebug("EXIT");
-//             return true;
-//     }
        AppLogDebug("EXIT");
        return false;
 }
\ No newline at end of file
index 4bad5db..b01fa33 100644 (file)
@@ -64,7 +64,6 @@ PlaylistReNameForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
        __pPlaylistEditField = static_cast<EditField*>(GetControl(IDC_EDITFIELD));
-       __pPlaylistEditField->SetOverlayKeypadCommandButtonVisible(false);
        __pPlaylistEditField->AddTextEventListener(*this);
        __pPlaylistEditField->AddKeypadEventListener(*this);
 
index 78086ed..9f7c5fe 100644 (file)
@@ -184,10 +184,13 @@ const Tizen::Base::String IDS_STORAGE_PHONE_PATH = Environment::GetMediaPath() +
 const Tizen::Base::String IDS_STORAGE_SDCARD_PATH = Environment::GetExternalStoragePath();
 const Tizen::Base::String IDS_STORAGE_EXTERNAL_PATH = Environment::GetMediaPath();
 
-//SIZE
+//SIZE,POINT
 const int H_TABLEVIEW_IITEM = 140;
 const int H_TABLEVIEW_GROUP_ITEM = 144;
 const int H_BALLOON_TOOL_TIP = 48;
+const int X_POINT_FOOTER_MORE = 57;
+const int Y_POINT_PORTRAIT_FOOTER_MORE = 1200;
+const int Y_POINT_LANDSCAPE_FOOTER_MORE = 646;
 
 //VALUE
 const int MAX_PLAY_STATE_SLIDER_COUNT = 100;
index a7e6aef..8480538 100644 (file)
@@ -153,14 +153,20 @@ UserPlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source,
 
        case IDA_FOOTER_BUTTON_MORE:
                {
+                       Point anchorPoint(X_POINT_FOOTER_MORE, Y_POINT_PORTRAIT_FOOTER_MORE);
+                       if ((GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE) || (GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
+                       {
+                               anchorPoint.y = Y_POINT_LANDSCAPE_FOOTER_MORE;
+                       }
+
                        CreateContextMenuN(source);
                        if (IsEmptyContentList())
                        {
-                               SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_ADD, Point(X_MORE_POPUP, Y_MORE_POPUP));
+                               SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_ADD, anchorPoint);
                        }
                        else
                        {
-                               SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_ADD | CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, Point(X_MORE_POPUP, Y_MORE_POPUP));
+                               SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_ADD | CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, anchorPoint);
                        }
                }
                break;