[MusicPlayer] Applied Multilanguage and applied IContentUpdateEventListener and delet...
authorMyunkyu <mk70.kang@partner.samsung.com>
Tue, 9 Apr 2013 11:33:38 +0000 (20:33 +0900)
committerMyunkyu <mk70.kang@partner.samsung.com>
Wed, 10 Apr 2013 00:23:28 +0000 (09:23 +0900)
Change-Id: I4f795566fa66b13c60125b01b6a97793f382ded6

65 files changed:
inc/MpAlbumContentListForm.h
inc/MpAlbumListEditorPanel.h
inc/MpAlbumListPanel.h
inc/MpAllListEditorPanel.h
inc/MpAllListPanel.h
inc/MpArtistContentListForm.h
inc/MpArtistListEditorPanel.h
inc/MpArtistListPanel.h
inc/MpBaseForm.h [changed mode: 0755->0644]
inc/MpBasePanel.h [changed mode: 0755->0644]
inc/MpComposerListEditorPanel.h [changed mode: 0755->0644]
inc/MpComposerListPanel.h [changed mode: 0755->0644]
inc/MpContentEditPanel.h
inc/MpContentLibaryPanel.h
inc/MpContentListForm.h
inc/MpContentPanel.h
inc/MpFolderContentListForm.h
inc/MpFolderListEditorPanel.h
inc/MpFolderListPanel.h
inc/MpGenreListEditorPanel.h [changed mode: 0755->0644]
inc/MpGenreListPanel.h [changed mode: 0755->0644]
inc/MpMusicContentUpdateEventListner.h [new file with mode: 0644]
inc/MpMusicPlayerApp.h
inc/MpPlaylistContentListForm.h
inc/MpPlaylistListEditorPanel.h
inc/MpPlaylistListPanel.h
inc/MpTypes.h
inc/MpUserPlaylistContentListForm.h
inc/MpYearListEditorPanel.h [changed mode: 0755->0644]
inc/MpYearListPanel.h [changed mode: 0755->0644]
res/screen-size-normal/IDL_CREATE_PLAYLIST_POPUP.xml
res/screen-size-normal/IDL_PLAYLIST_CREATOR_FORM.xml
res/screen-size-normal/IDL_PLAYLIST_RENAME_FORM.xml
src/MpAlbumContentListForm.cpp
src/MpAlbumListEditorPanel.cpp
src/MpAlbumListPanel.cpp
src/MpAllListEditorPanel.cpp
src/MpAllListPanel.cpp
src/MpArtistContentListForm.cpp
src/MpArtistListEditorPanel.cpp
src/MpArtistListPanel.cpp
src/MpCommonUtil.cpp
src/MpComposerListEditorPanel.cpp
src/MpComposerListPanel.cpp
src/MpContentDetailForm.cpp
src/MpContentEditPanel.cpp
src/MpContentListForm.cpp
src/MpContentListPanel.cpp
src/MpContentPanel.cpp
src/MpFolderContentListForm.cpp
src/MpFolderListEditorPanel.cpp
src/MpFolderListPanel.cpp
src/MpGenreListEditorPanel.cpp
src/MpGenreListPanel.cpp
src/MpMusicPlayerApp.cpp
src/MpPlaylistContentListForm.cpp
src/MpPlaylistListEditorPanel.cpp
src/MpPlaylistListPanel.cpp
src/MpSearchForm.cpp
src/MpSettingForm.cpp
src/MpSharePopup.cpp
src/MpTypes.cpp
src/MpUserPlaylistContentListForm.cpp
src/MpYearListEditorPanel.cpp
src/MpYearListPanel.cpp

index f3a4d54..4187f9d 100644 (file)
@@ -43,12 +43,9 @@ public:
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
 
-       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
-                                                                       const Tizen::Ui::Scenes::SceneId& currentSceneId,
-                                                                       Tizen::Base::Collection::IList* pArgs);
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
 
-       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
-                                                                       const Tizen::Ui::Scenes::SceneId& nextSceneId);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
        virtual int GetItemCount(void);
@@ -66,9 +63,9 @@ public:
                                                int itemIndexFrom,
                                                int itemIndexTo);
 
-       virtual void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
-                               const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
-                               const Tizen::Base::Collection::IMap* pExtraData);
+       virtual void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
+                                                                                                                                                       const Tizen::Base::Collection::IMap* pExtraData);
+
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
@@ -81,6 +78,7 @@ protected:
        virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
        virtual void UpdateExtraInformaionArea(void);
        virtual void UpdateTableView(void);
+       virtual void UpdateContentList(void);
 
 private:
        result Construct(void);
index 8a20aa1..388d197 100644 (file)
@@ -55,7 +55,6 @@ public:
                                                        int itemIndex,
                                                        Tizen::Ui::Controls::TableViewItem* pItem,
                                                        Tizen::Ui::Controls::TableViewItemStatus status);
-       virtual void OnUpdateContentList(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
index 7e481fb..c8baccc 100644 (file)
@@ -66,7 +66,6 @@ public:
                                                                        bool activated);
 
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
-       virtual void OnUpdateContentList(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
index c6799df..121ad2a 100644 (file)
@@ -51,7 +51,6 @@ public:
        result OnTerminating(void);
 
        void SetTabHeaderStyle(void);
-       void UpdateContentList(void);
        void SetDisableIconAllCheckButton(void);
 
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
@@ -69,14 +68,13 @@ public:
                                                        Tizen::Ui::Controls::TableViewItem* pItem,
                                                        Tizen::Ui::Controls::TableViewItemStatus status);
 
-       virtual void OnUpdateContentList(void);
-
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
 protected:
        virtual int GetCheckedItemCount(void);
+       virtual void UpdateContentList(void);
 
 private:
        result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
index 038e427..0ede6b2 100644 (file)
@@ -72,19 +72,19 @@ public:
                                                                        int itemIndex,
                                                                        Tizen::Ui::Controls::TableViewContextItem* pContextItem,
                                                                        bool activated);
-       virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
 
+       virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
-       virtual void OnUpdateContentList(void);
-
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
+protected:
+       virtual void UpdateContentList(void);
+
 private:
        result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
        Tizen::Base::Collection::ArrayList* GetContentListN(int itemIndex);
        virtual bool IsEmptyContentList(void);
-       virtual void UpdateContentList(void);
 
 private:
        Tizen::Ui::Controls::TableViewContextItem* __pContextItem;
index 9fcd003..b7192c4 100644 (file)
@@ -85,6 +85,7 @@ protected:
        virtual void SetItemCheckedAll(bool isChecked);
 
        virtual void UpdateTableView(void);
+       virtual void UpdateContentList(void);
 
 private:
        result Construct(void);
index 3779fe0..0c65b97 100644 (file)
@@ -63,7 +63,6 @@ public:
                                                        int itemIndex,
                                                        Tizen::Ui::Controls::TableViewItem* pItem,
                                                        Tizen::Ui::Controls::TableViewItemStatus status);
-       virtual void OnUpdateContentList(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
index 2362a58..faac13c 100644 (file)
@@ -68,17 +68,16 @@ public:
 
        virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
-       virtual void OnUpdateContentList(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
+protected:
+       virtual void UpdateContentList(void);
+
 private:
-       result CreateTableViewItem(Tizen::Ui::Container& parent,
-                                                                       const ContentInformation& contentInfoStruct,
-                                                                       const int contentTotalCount);
+       result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct, const int contentTotalCount);
        virtual bool IsEmptyContentList(void);
-       virtual void UpdateContentList(void);
 
 protected:
        int __itemIndex;
old mode 100755 (executable)
new mode 100644 (file)
index c2df41e..424b529
@@ -29,7 +29,7 @@ class BaseForm
 {
 public:
        virtual ~BaseForm(void){}
-       virtual void OnUpdateContentList(void){}
+       virtual void OnMusicContentUpdateCompleted(void){}
        virtual void OnChangedContentList(Tizen::Base::Collection::IList* pArgs){}
 };
 
old mode 100755 (executable)
new mode 100644 (file)
index 1369dc1..6344d72
@@ -30,7 +30,7 @@ class BasePanel
 {
 public:
        virtual ~BasePanel(void){}
-       virtual void OnUpdateContentList(void) = 0;
+       virtual void OnMusicContentUpdateCompleted(void) = 0;
 };
 
 #endif // _MP_BASE_PANEL_H_
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 2851786..25a7dd0
@@ -70,7 +70,7 @@ public:
        virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
                                                int itemIndexFrom,
                                                int itemIndexTo);
-       virtual void OnUpdateContentList(void);
+       virtual void OnMusicContentUpdateCompleted(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
old mode 100755 (executable)
new mode 100644 (file)
index 7fa42c6..cd89c5e
@@ -75,7 +75,7 @@ public:
                                                int itemIndexTo);
        virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
-       virtual void OnUpdateContentList(void);
+       virtual void OnMusicContentUpdateCompleted(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
index cd1ef3b..e821296 100644 (file)
 #define _MP_CONTENT_EDIT_PANEL_H_\r
 \r
 #include "MpContentPanel.h"\r
+#include "MpMusicContentUpdateEventListner.h"\r
 \r
 class ContentForm;\r
 \r
 class ContentEditPanel\r
        : public ContentPanel\r
+       , public MusicContentUpdateEventListner\r
 {\r
 public:\r
        ContentEditPanel(void);\r
        virtual ~ContentEditPanel(void);\r
 \r
        virtual bool Initialize(void);\r
+       virtual void OnMusicContentUpdateCompleted(void);\r
 \r
 protected:\r
        Tizen::Ui::Controls::Header* GetParentHeader(void);\r
@@ -47,6 +50,7 @@ protected:
 \r
        virtual int GetCheckedItemCount(void) = 0;\r
        virtual void OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orientationStatus);\r
+       virtual void UpdateContentList(void) = 0;\r
 \r
 private:\r
        result Construct(void);\r
index eeae3cb..f7fc1f3 100644 (file)
 #define _MP_CONTENT_LIBARY_PANEL_H_\r
 \r
 #include "MpContentPanel.h"\r
+#include "MpMusicContentUpdateEventListner.h"\r
 \r
 class ContentLibaryPanel\r
        : public ContentPanel\r
+       , public MusicContentUpdateEventListner\r
 {\r
 public:\r
        ContentLibaryPanel(void);\r
@@ -34,8 +36,9 @@ public:
        virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);\r
        virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId,\r
                                                                        Tizen::Base::Collection::IList* pArgs);\r
+\r
        virtual void OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orientationStatus);\r
-       virtual void OnUpdateContentList(void) = 0;\r
+       virtual void OnMusicContentUpdateCompleted(void);\r
 \r
 protected:\r
        result AddMiniPlayer(Tizen::Ui::Control& control);\r
@@ -53,6 +56,7 @@ protected:
        void UpdateContentLibaryScreenState(void);\r
 \r
        virtual result Construct(void);\r
+       virtual void UpdateContentList(void) = 0;\r
 \r
 private:\r
        virtual bool IsEmptyContentList(void);\r
index ac15c6b..4a975f7 100644 (file)
@@ -28,6 +28,7 @@
 #include <FSystem.h>
 #include <FUi.h>
 #include "MpCommonUtil.h"
+#include "MpMusicContentUpdateEventListner.h"
 #include "MpResourceManager.h"
 #include "MpSceneRegister.h"
 
@@ -35,7 +36,8 @@ class PlayListPickerPopup;
 class SharePopup;
 
 class ContentListForm
-       : public Tizen::Ui::Controls::Form
+       : public MusicContentUpdateEventListner
+       , public Tizen::Ui::Controls::Form
        , public Tizen::Ui::Controls::IScrollEventListener
        , public Tizen::Ui::Controls::IFormBackEventListener
        , public Tizen::Ui::IActionEventListener
@@ -64,6 +66,8 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
 
+       virtual void OnMusicContentUpdateCompleted(void);
+
 protected:
        result LanucherPicker(PickerType pickerType, PickerArgumentType argumentType = PICKER_ARGUMENT_TYPE_CHECKED_ITEM_ALL);
        result Construct(void);
@@ -92,6 +96,7 @@ protected:
        virtual bool IsEmptyContentList(void) = 0;
        virtual int GetCheckedItemCount(void) = 0;
        virtual void UpdateTableView(void) = 0;
+       virtual void UpdateContentList(void) = 0;
 
        virtual void UpdateExtraInformaionArea(void);
        virtual Tizen::Base::Collection::IList* GetPickerArgumentListN(PickerType pickerType, PickerArgumentType argumentType);
index 89063ed..9f40098 100644 (file)
 #define _MP_CONTENT_PANEL_H_\r
 \r
 #include <FContent.h>\r
-//#include <FIo.h>\r
 #include <FUi.h>\r
 #include "MpSceneRegister.h"\r
 #include "MpTypes.h"\r
 \r
 class ContentPanel\r
        : public Tizen::Ui::Controls::Panel\r
-       , public Tizen::Content::IContentUpdateEventListener\r
        , public Tizen::Ui::Controls::ITableViewItemProvider\r
        , public Tizen::Ui::Controls::ITableViewItemEventListener\r
        , public Tizen::Ui::Controls::IFormBackEventListener\r
@@ -59,14 +57,10 @@ public:
        virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);\r
        virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId,\r
                                                                        Tizen::Base::Collection::IList* pArgs);\r
+\r
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId){}\r
-       virtual void OnUpdateContentList(void) = 0;\r
        virtual void OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orientationStatus);\r
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);\r
-       virtual void OnContentDirectoryScanCompleted(const Tizen::Base::String& directoryPath, result r);\r
-       virtual void OnContentFileCreated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r);\r
-       virtual void OnContentFileDeleted(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r);\r
-       virtual void OnContentFileUpdated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r);\r
 \r
 protected:\r
        Tizen::Ui::Controls::Header* GetHeader(void);\r
@@ -83,9 +77,6 @@ protected:
        void RemoveBackEventListner(void);\r
        void SetShowStateFooter(bool isShow);\r
 \r
-private:\r
-       virtual void UpdateContentList(void) = 0;\r
-\r
 protected:\r
        Tizen::Ui::Controls::TableView* __pContentTableView;\r
        Tizen::Ui::Controls::Label* __pNoContentLabel;\r
index 63ccb84..b15afcc 100644 (file)
@@ -82,6 +82,7 @@ protected:
        virtual void SetItemCheckedAll(bool isChecked);
 
        virtual void UpdateTableView(void);
+       virtual void UpdateContentList(void);
 
 private:
        result Construct(void);
index 49ea02b..840249e 100644 (file)
@@ -69,17 +69,17 @@ public:
        virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
                                                int itemIndexFrom,
                                                int itemIndexTo);
+
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
-       virtual void OnUpdateContentList(void);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 protected:
        virtual int GetCheckedItemCount(void);
+       virtual void UpdateContentList(void);
 
 private:
        result CreateTableViewItem(Tizen::Ui::Container& parent, const Tizen::Base::String& contentPath, int contentCount);
 
-       void UpdateContentList(void);
        void SetEditHeaderStyle(void);
        void SetDisableIconAllCheckButton(void);
 
index 2107e84..61af28a 100644 (file)
@@ -59,12 +59,14 @@ public:
        virtual void OnScrollPositionChanged (Tizen::Ui::Control& source, int scrollPos);
        virtual void OnScrollStopped(Tizen::Ui::Control& source){}
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
-       virtual void OnUpdateContentList(void);
+
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
+protected:
+       virtual void UpdateContentList(void);
+
 private:
        result CreateTableViewItem(Tizen::Ui::Container& parent, const Tizen::Base::String& contentPath, int contentCount);
-       virtual void UpdateContentList(void);
        virtual bool IsEmptyContentList(void);
 
 private:
old mode 100755 (executable)
new mode 100644 (file)
index a185cfc..2f8453a
@@ -71,7 +71,7 @@ public:
                                                int itemIndexFrom,
                                                int itemIndexTo);
 
-       virtual void OnUpdateContentList(void);
+       virtual void OnMusicContentUpdateCompleted(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
old mode 100755 (executable)
new mode 100644 (file)
index 14e57e5..d645464
@@ -80,7 +80,7 @@ public:
        virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
-       virtual void OnUpdateContentList(void);
+       virtual void OnMusicContentUpdateCompleted(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
diff --git a/inc/MpMusicContentUpdateEventListner.h b/inc/MpMusicContentUpdateEventListner.h
new file mode 100644 (file)
index 0000000..067c1a5
--- /dev/null
@@ -0,0 +1,37 @@
+//\r
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Flora License, Version 1.0 (the License);\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//     http://floralicense.org/license/\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an AS IS BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+/**\r
+ * @file               MpMusicContentUpdateEventListner.h\r
+ * @brief              This is the header file for MusicContentUpdateEventListner class.\r
+ */\r
+\r
+#ifndef _MP_MUSIC_CONTENT_UPDATE_EVENT_LISTNER_H_\r
+#define _MP_MUSIC_CONTENT_UPDATE_EVENT_LISTNER_H_\r
+\r
+class MusicContentUpdateEventListner\r
+{\r
+public:\r
+       virtual ~MusicContentUpdateEventListner(void){}\r
+\r
+//     virtual void OnMusicContentCreated(void) = 0;\r
+//     virtual void OnMusicContentUpdated(void) = 0;\r
+//     virtual void OnMusicContentDeleted(void) = 0;\r
+       virtual void OnMusicContentUpdateStarted(void){}\r
+       virtual void OnMusicContentUpdateCompleted(void) = 0;\r
+};\r
+\r
+#endif // _MP_MUSIC_CONTENT_UPDATE_EVENT_LISTNER_H_
\ No newline at end of file
index f7a25eb..4e0d41e 100644 (file)
@@ -25,6 +25,7 @@
 #include <new>
 #include <FApp.h>
 #include <FBase.h>
+#include <FContent.h>
 #include <FSystem.h>
 #include <FUi.h>
 #include <FUiScenes.h>
@@ -33,6 +34,8 @@
 class MusicPlayerApp
        : public Tizen::App::UiApp
        , public Tizen::App::IAppControlProviderEventListener
+       , public Tizen::Base::Runtime::ITimerEventListener
+       , public Tizen::Content::IContentUpdateEventListener
        , public Tizen::System::IScreenEventListener
        , public Tizen::System::ISettingEventListener
 {
@@ -61,8 +64,17 @@ public:
 
        virtual void OnSettingChanged(Tizen::Base::String& key);
 
+       virtual void OnContentFileCreated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r);
+       virtual void OnContentFileUpdated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r);
+       virtual void OnContentFileDeleted(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r);
+       virtual void OnContentDirectoryScanCompleted(const Tizen::Base::String& directoryPath, result r);
+
+       virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
+
 private:
        void ParsingArgument(const Tizen::Base::String* pUriData, const Tizen::Base::Collection::IMap* pArgs);
+       void ReStartTimerToContentUpdate(void);
+       void FireImpleContentUpdate(void);
 
 private:
        RequestId __requestId;
@@ -70,6 +82,9 @@ private:
        Tizen::Ui::Scenes::SceneId __sceneId;
        Tizen::Base::Collection::ArrayList* __pDataList;
        MainFrame* __pMainFrame;
+
+       Tizen::Content::ContentManager* __pContentManager;
+       Tizen::Base::Runtime::Timer* __pContentUpdateCompleteTimer;
 };
 
 #endif // _MP_MUSIC_PLAYER_APP_H_
\ No newline at end of file
index 2dccd6b..8da4663 100644 (file)
@@ -84,6 +84,7 @@ protected:
        virtual void SetItemCheckedAll(bool isChecked);
 
        virtual void UpdateTableView(void);
+       virtual void UpdateContentList(void);
 
 private:
        result Construct(void);
index 2303dce..c35cc5d 100644 (file)
@@ -63,18 +63,17 @@ public:
                                                        int itemIndex,
                                                        Tizen::Ui::Controls::TableViewItem* pItem,
                                                        Tizen::Ui::Controls::TableViewItemStatus status);
-       virtual void OnUpdateContentList(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
 protected:
        virtual int GetCheckedItemCount(void);
+       virtual void UpdateContentList(void);
 
 private:
        result CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const Tizen::Base::String& title, int itemIndex);
 
-       void UpdateContentList(void);
        void SetEditHeaderStyle(void);
        void SetTabHeaderStyle(void);
        void SetDisableIconAllCheckButton(void);
index 443b9b2..6b4b470 100644 (file)
@@ -62,17 +62,15 @@ public:
                                                                        int itemIndex,
                                                                        Tizen::Ui::Controls::TableViewContextItem* pContextItem,
                                                                        bool activated);
-       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
-       virtual void OnUpdateContentList(void);
 
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
 
-private:
-       result CreateTableViewItem(Tizen::Ui::Container& parent,
-                                                       Tizen::Base::String& labelName,
-                                                       const Tizen::Graphics::Bitmap& bitmap,
-                                                       int totalCount);
+protected:
        virtual void UpdateContentList(void);
+
+private:
+       result CreateTableViewItem(Tizen::Ui::Container& parent, Tizen::Base::String& labelName, const Tizen::Graphics::Bitmap& bitmap, int totalCount);
        virtual bool IsEmptyContentList(void);
 
 private:
index 6dca885..9edb0e1 100644 (file)
@@ -539,6 +539,12 @@ extern const wchar_t* IDC_LABEL_MAIN_TEXT;
 extern const wchar_t* IDC_LABEL_SUB_TEXT;
 extern const wchar_t* IDC_LABEL_EX;
 extern const wchar_t* IDC_MEDIA_INFO_LABEL;
+extern const wchar_t* IDC_NAME_LABEL;
+extern const wchar_t* IDC_FORMAT_LABEL;
+extern const wchar_t* IDC_SIZE_LABEL;
+extern const wchar_t* IDC_FORWARDING_LABEL;
+extern const wchar_t* IDC_DATE_LABEL;
+extern const wchar_t* IDC_LOCATION_LABEL;
 //_XML IDC_
 
 //<--__XML_IDC_ORDERING PREFIX : IDC_CONTROLTYPE_ EX) IDC_BUTTON_TOGGLE_PLAY
index 19aecf9..9992ffe 100644 (file)
@@ -80,6 +80,7 @@ protected:
        virtual void SetItemCheckedAll(bool isChecked);
 
        virtual void UpdateTableView(void);
+       virtual void UpdateContentList(void);
 
 private:
        result Construct(void);
old mode 100755 (executable)
new mode 100644 (file)
index 0dccbca..aab4b8a
@@ -70,7 +70,7 @@ public:
        virtual void OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableView,
                                                int itemIndexFrom,
                                                int itemIndexTo);
-       virtual void OnUpdateContentList(void);
+       virtual void OnMusicContentUpdateCompleted(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
old mode 100755 (executable)
new mode 100644 (file)
index 0448d42..f36049c
@@ -82,7 +82,7 @@ public:
 
        virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
-       virtual void OnUpdateContentList(void);
+       virtual void OnMusicContentUpdateCompleted(void);
 
        virtual void OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
index 0c5f9ea..041ea56 100644 (file)
     </Popup>
     <Button id="IDC_CREATE_BUTTON" parent="IDL_CREATE_PLAYLIST_POPUP">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Create" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="20.0" y="456.0"/>
-        <layout bottomRelation="IDL_CREATE_PLAYLIST_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="20.0" y="458.0"/>
+        <layout bottomRelation="IDL_CREATE_PLAYLIST_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CREATE_PLAYLIST_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="20.0" y="458.0"/>
+        <layout bottomRelation="IDL_CREATE_PLAYLIST_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CREATE_PLAYLIST_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="20.0" y="458.0"/>
     </Button>
     <TableView id="IDC_TABLEVIEW" parent="IDL_CREATE_PLAYLIST_POPUP">
         <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>
-        <layout bottomRelation="IDC_CREATE_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="true" centerVertical="false" height="416.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_CREATE_PLAYLIST_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="20.0" y="20.0"/>
+        <layout bottomRelation="IDC_CREATE_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="true" centerVertical="false" height="418.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_CREATE_PLAYLIST_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="20.0" y="20.0"/>
         <layout bottomRelation="IDC_CREATE_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="true" centerVertical="false" height="418.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="20.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_CREATE_PLAYLIST_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="20.0" y="20.0"/>
     </TableView>
     <Button id="IDC_CANCEL_BUTTON" parent="IDL_CREATE_PLAYLIST_POPUP">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="354.0" y="456.0"/>
-        <layout bottomRelation="IDL_CREATE_PLAYLIST_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CREATE_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="20.0" marginLeft="20.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="354.0" y="458.0"/>
+        <layout bottomRelation="IDL_CREATE_PLAYLIST_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="20.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CREATE_PLAYLIST_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="354.0" y="458.0"/>
+        <layout bottomRelation="IDL_CREATE_PLAYLIST_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="None" leftRelationType="" marginBottom="20.0" marginLeft="20.0" marginRight="20.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CREATE_PLAYLIST_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="354.0" y="458.0"/>
     </Button>
 </ScenePopup>
index 70c24b1..e072989 100644 (file)
@@ -6,23 +6,23 @@
 <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
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_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
+            <footerItem accessibilityHint="" actionId="3009" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="::IDS_COM_OPT_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
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Create playlist" titleTextColor=""/>\r
         <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
+        <property accessibilityHint="" 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="44.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.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"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.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"/>\r
     </EditField>\r
 </Scene>\r
index da8388e..9f72b92 100644 (file)
@@ -6,23 +6,23 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">\r
     <LogicalCoordinate>720</LogicalCoordinate>\r
     <Form id="IDL_PLAYLIST_RENAME_FORM">\r
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_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
+            <footerItem accessibilityHint="" actionId="3009" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="::IDS_COM_OPT_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="Rename playlist" titleTextColor=""/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="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="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
+        <property accessibilityHint="" 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"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PLAYLIST_RENAME_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_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.0" x="0.0" y="0.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PLAYLIST_RENAME_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_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.0" x="0.0" y="0.0"/>\r
     </EditField>\r
 </Scene>\r
index 8094ba9..0d06cb2 100644 (file)
@@ -146,7 +146,7 @@ AlbumContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                        }
 
                        CreateContextMenuN(source);
-                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_EDIT | CONTEXT_MENU_ITEM_STYLE_SEARCH, anchorPoint);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_EDIT, anchorPoint);
                }
                break;
 
@@ -164,7 +164,7 @@ AlbumContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY));
                }
                break;
 
@@ -625,6 +625,16 @@ AlbumContentListForm::UpdateTableView(void)
 }
 
 void
+AlbumContentListForm::UpdateContentList(void)
+{
+       AppLogDebug("ENTER");
+       __pPresentationModel->UpdateAlbumList();
+       __pPresentationModel->InitializeContentList(__currentAlbumIndex);
+       __pContentListTableView->UpdateTableView();
+       AppLogDebug("EXIT");
+}
+
+void
 AlbumContentListForm::SetItemCheckedAll(bool isChecked)
 {
        AppLogDebug("ENTER");
index f3b6072..8cbaf39 100644 (file)
@@ -322,14 +322,6 @@ AlbumListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView
        AppLogDebug("EXIT");
 }
 
-void
-AlbumListEditorPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
-       AppLogDebug("EXIT");
-}
-
 result
 AlbumListEditorPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
                                                        const ContentInformation& contentInfoStruct)
index 5ce6c07..c577310 100644 (file)
@@ -55,10 +55,11 @@ AlbumListPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
        __pPresentationModel = AlbumListPresentationModel::GetInstance();
+       __pContextItem = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_02);
 
        SetFooterStyle(STYLE_MORE_ADD);
        SetLayoutFitToForm();
-       __pContextItem = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_02);
+       UpdateContentList();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -126,13 +127,25 @@ AlbumListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId
 
        case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST_EDITOR));
+                       if (__pPresentationModel->GetAllAlbumCount() == 0)
+                       {
+                               MessageBox messageBox;
+                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_HEADER_NO_SONGS"), MSGBOX_STYLE_NONE, 500);
+
+                               int modalResult = 0;
+                               messageBox.ShowAndWait(modalResult);
+                               break;
+                       }
+                       else
+                       {
+                               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST_EDITOR));
+                       }
                }
                break;
 
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY));
                }
                break;
 
@@ -192,7 +205,6 @@ AlbumListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScen
        AppLogDebug("ENTER");
        GetHeader()->SetItemSelected(2);
        GetHeader()->Invalidate(true);
-       UpdateContentList();
        ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
 
        if (pArgs != null)
@@ -343,21 +355,12 @@ AlbumListPanel::GetContentListN(int itemIndex)
 }
 
 void
-AlbumListPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
-       AppLogDebug("EXIT");
-}
-
-void
 AlbumListPanel::UpdateContentList(void)
 {
        AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
+       if (__pPresentationModel != null)
        {
                __pPresentationModel->UpdateAlbumList();
-               __pContentTableView->UpdateTableView();
        }
        AppLogDebug("EXIT");
 }
index 6b7d8b5..7b42c19 100644 (file)
@@ -421,14 +421,6 @@ AllListEditorPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
 }
 
 void
-AllListEditorPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
-       AppLogDebug("EXIT");
-}
-
-void
 AllListEditorPanel::UpdateContentList(void)
 {
        AppLogDebug("ENTER");
@@ -453,7 +445,7 @@ AllListEditorPanel::SetEditHeaderStyle(void)
        }
        else
        {
-               String titleText(L"Share via");//NEED STRING
+               String titleText(ResourceManager::GetString(L"IDS_IV_BODY_SHARE_VIA"));
                CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        }
 
index 5f195ea..d1cae11 100644 (file)
@@ -96,6 +96,7 @@ AllListPanel::OnInitializing(void)
 
        SetFooterStyle(STYLE_MORE_ADD);
        SetLayoutFitToForm();
+       UpdateContentList();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -361,7 +362,7 @@ AllListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY));
                }
                break;
 
@@ -414,14 +415,6 @@ AllListPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 }
 
 void
-AllListPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
-       AppLogDebug("EXIT");
-}
-
-void
 AllListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                const Tizen::Ui::Scenes::SceneId& currentSceneId,
                                                                Tizen::Base::Collection::IList* pArgs)
@@ -429,7 +422,6 @@ AllListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneI
        AppLogDebug("ENTER");
        GetHeader()->SetItemSelected(0);
        GetHeader()->Invalidate(true);
-       UpdateContentList();
        ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
        AppLogDebug("EXIT");
 }
@@ -583,10 +575,9 @@ void
 AllListPanel::UpdateContentList(void)
 {
        AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
+       if (__pPresentationModel != null)
        {
                __pPresentationModel->UpdateContentList();
-               __pContentTableView->UpdateTableView();
        }
        AppLogDebug("EXIT");
 }
index 8f1df9b..cfd5787 100644 (file)
@@ -193,7 +193,7 @@ ArtistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY));
                }
                break;
 
@@ -217,7 +217,7 @@ ArtistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
                                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, anchorPoint);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_EDIT, anchorPoint);
                }
                break;
 
@@ -928,6 +928,17 @@ ArtistContentListForm::UpdateTableView(void)
        AppLogDebug("EXIT");
 }
 
+void
+ArtistContentListForm::UpdateContentList(void)
+{
+       AppLogDebug("ENTER");
+       __pPresentationModel->UpdateArtistList();
+       __pPresentationModel->InitializeArtistAlbumList(__headerTitle);
+       __pPresentationModel->InitializeContentList(INIT_VALUE);
+       UpdateTableView();
+       AppLogDebug("EXIT");
+}
+
 ContentInformation*
 ArtistContentListForm::GetContentInformationActivatedStateContextItem(void)
 {
index 75e8c11..af07971 100644 (file)
@@ -325,14 +325,6 @@ ArtistListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
        AppLogDebug("EXIT");
 }
 
-void
-ArtistListEditorPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
-       AppLogDebug("EXIT");
-}
-
 result
 ArtistListEditorPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
                                                        const ContentInformation& contentInfoStruct)
@@ -409,7 +401,7 @@ ArtistListEditorPanel::SetCheckedIconAllCheckButton(void)
 {
        AppLogDebug("ENTER");
        Header* pHeader = GetParentHeader();
-       String titleText(L"Edit");
+       String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
        CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
@@ -420,7 +412,7 @@ ArtistListEditorPanel::SetUnCheckedIconAllCheckButton(void)
 {
        AppLogDebug("ENTER");
        Header* pHeader = GetParentHeader();
-       String titleText(L"Edit");
+       String titleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
        CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
index 542f5ad..a0076ed 100644 (file)
@@ -59,6 +59,7 @@ ArtistListPanel::OnInitializing(void)
 
        SetFooterStyle(STYLE_MORE_ADD);
        SetLayoutFitToForm();
+       UpdateContentList();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -125,13 +126,25 @@ ArtistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
 
        case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ARTIST_LIST_EDITOR));
+                       if (__pPresentationModel->GetArtistListCount() == 0)
+                       {
+                               MessageBox messageBox;
+                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_HEADER_NO_SONGS"), MSGBOX_STYLE_NONE, 500);
+
+                               int modalResult = 0;
+                               messageBox.ShowAndWait(modalResult);
+                               break;
+                       }
+                       else
+                       {
+                               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ARTIST_LIST_EDITOR));
+                       }
                }
                break;
 
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY));
                }
                break;
 
@@ -191,7 +204,6 @@ ArtistListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSce
        AppLogDebug("ENTER");
        GetHeader()->SetItemSelected(3);
        GetHeader()->Invalidate(true);
-       UpdateContentList();
        ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
 
        if (pArgs != null)
@@ -344,14 +356,6 @@ ArtistListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Ba
        AppLogDebug("EXIT");
 }
 
-void
-ArtistListPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
-       AppLogDebug("EXIT");
-}
-
 result
 ArtistListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
                                                                        const ContentInformation& contentInfoStruct,
@@ -382,10 +386,9 @@ void
 ArtistListPanel::UpdateContentList(void)
 {
        AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
+       if (__pPresentationModel != null)
        {
                __pPresentationModel->UpdateArtistList();
-               __pContentTableView->UpdateTableView();
        }
        AppLogDebug("EXIT");
 }
index 025bb95..71426eb 100644 (file)
@@ -838,7 +838,7 @@ CommonUtil::CreateFlickMenuN(Tizen::Ui::IActionEventListener& listener, FlickMen
        if (menuStyle & FLICK_MENU_ITEM_ADDTO)
        {
                Button* pAddToPlaylistButton = static_cast<Button*>(pFlickMenuPanel->GetControl(IDC_ADD_TO_BUTTON));
-               pAddToPlaylistButton->SetText(L"Add to"); //NEED STRING
+               pAddToPlaylistButton->SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_ADD_TO"));
                pAddToPlaylistButton->SetActionId(IDA_FLICK_MENU_ITEM_ADDTO);
                pAddToPlaylistButton->AddActionEventListener(listener);
        }
@@ -878,7 +878,7 @@ CommonUtil::GetStringItemSelectd(int itemCount)
        }
 //     else
 //     {
-//             StrSelectStr.Format(STRING_LENGTH,L"Select <Noun>s");//NEED STRING
+//             StrSelectStr.Format(STRING_LENGTH, L"Select <Noun>s");//NEED STRING
 //     }
        AppLogDebug("EXIT");
        return StrSelectStr;
@@ -990,7 +990,7 @@ CommonUtil::AddContextMenuItem(Tizen::Ui::Controls::ContextMenu& contextMenu, un
        if (CONTEXT_MENU_ITEM_STYLE_FOLDER_VIEW & contextMenuItemStyle)
        {
 //             IDA_CONTEXT_MENU_ITEM_FOLDER_VIEW
-               contextMenu.AddItem(L"Folder view", IDA_CONTEXT_MENU_ITEM_FOLDER_VIEW);//NEED STRING
+               contextMenu.AddItem(ResourceManager::GetString(L"IDS_MSGF_SK3_FOLDER_VIEW"), IDA_CONTEXT_MENU_ITEM_FOLDER_VIEW);
        }
 
        if (CONTEXT_MENU_ITEM_STYLE_CREATE_PLAYLIST & contextMenuItemStyle)
@@ -1002,8 +1002,7 @@ CommonUtil::AddContextMenuItem(Tizen::Ui::Controls::ContextMenu& contextMenu, un
        if (CONTEXT_MENU_ITEM_STYLE_SHARE_VIA & contextMenuItemStyle)
        {
 //             IDA_CONTEXT_MENU_ITEM_SHARE_VIA
-               contextMenu.AddItem(L"Share via", IDA_CONTEXT_MENU_ITEM_SHARE_VIA);//NEED STRING
-
+               contextMenu.AddItem(ResourceManager::GetString(L"IDS_IV_BODY_SHARE_VIA"), IDA_CONTEXT_MENU_ITEM_SHARE_VIA);
        }
 
        if (CONTEXT_MENU_ITEM_STYLE_EDIT & contextMenuItemStyle)
@@ -1021,31 +1020,31 @@ CommonUtil::AddContextMenuItem(Tizen::Ui::Controls::ContextMenu& contextMenu, un
        if (CONTEXT_MENU_ITEM_STYLE_GO_TO_LIBARY & contextMenuItemStyle)
        {
 //             IDA_CONTEXT_MENU_ITEM_GO_TO_LIBARY
-               contextMenu.AddItem(L"Go to Library", IDA_CONTEXT_MENU_ITEM_GO_TO_LIBARY);//NEED STRING
+               contextMenu.AddItem(ResourceManager::GetString(L"IDS_MUSIC_OPT_GO_TO_LIBRARY"), IDA_CONTEXT_MENU_ITEM_GO_TO_LIBARY);
        }
 
        if (CONTEXT_MENU_ITEM_STYLE_ADD & contextMenuItemStyle)
        {
 //             IDA_CONTEXT_MENU_ITEM_STYLE_ADD
-               contextMenu.AddItem(L"Add", IDA_CONTEXT_MENU_ITEM_STYLE_ADD);//NEED STRING
+               contextMenu.AddItem(ResourceManager::GetString(L"IDS_MUSIC_OPT_ADD"), IDA_CONTEXT_MENU_ITEM_STYLE_ADD);
        }
 
        if (CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST & contextMenuItemStyle)
        {
 //             IDA_CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST
-               contextMenu.AddItem(L"Add To PlayList", IDA_CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST);//NEED STRING
+               contextMenu.AddItem(ResourceManager::GetString(L"IDS_MUSIC_BODY_ADD_TO_PLAYLIST"), IDA_CONTEXT_MENU_ITEM_STYLE_ADD_TO_PLAYLIST);
        }
 
        if (CONTEXT_MENU_ITEM_STYLE_SET_AS & contextMenuItemStyle)
        {
 //             IDA_CONTEXT_MENU_ITEM_STYLE_SET_AS
-               contextMenu.AddItem(L"Set as", IDA_CONTEXT_MENU_ITEM_STYLE_SET_AS);//NEED STRING
+               contextMenu.AddItem(ResourceManager::GetString(L"IDS_MUSIC_SK3_SET_AS"), IDA_CONTEXT_MENU_ITEM_STYLE_SET_AS);
        }
 
        if (CONTEXT_MENU_ITEM_STYLE_DETAILS & contextMenuItemStyle)
        {
 //             IDA_CONTEXT_MENU_ITEM_STYLE_DETAILS
-               contextMenu.AddItem(L"Details", IDA_CONTEXT_MENU_ITEM_STYLE_DETAILS);//NEED STRING
+               contextMenu.AddItem(ResourceManager::GetString(L"IDS_COM_BODY_DETAILS"), IDA_CONTEXT_MENU_ITEM_STYLE_DETAILS);
        }
 
        if (CONTEXT_MENU_ITEM_STYLE_SOUND_PATH & contextMenuItemStyle)
@@ -1534,7 +1533,7 @@ CommonUtil::CreateBackButtonStyleFooter(const Tizen::Ui::Controls::Form& form, F
                {
                        FooterItem footerItemAddto;
                        footerItemAddto.Construct(IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST);
-                       footerItemAddto.SetText(L"Add to");//NEED STRING
+                       footerItemAddto.SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_ADD_TO"));
 
                        FooterItem footerItemDelete;
                        footerItemDelete.Construct(IDA_FOOTER_BUTTON_DELETE);
@@ -1610,7 +1609,7 @@ CommonUtil::SetBackButtonStyleFooter(Tizen::Ui::Controls::Footer& footer, Footer
                {
                        FooterItem footerItemAddto;
                        footerItemAddto.Construct(IDA_FOOTER_BUTTON_ADD_TO_PLAYLIST);
-                       footerItemAddto.SetText(L"Add to");//NEED STRING
+                       footerItemAddto.SetText(ResourceManager::GetString(L"IDS_MUSIC_OPT_ADD_TO"));
                        FooterItem footerItemDelete;
                        footerItemDelete.Construct(IDA_FOOTER_BUTTON_DELETE);
                        footerItemDelete.SetText(ResourceManager::GetString(L"IDS_MUSIC_SK3_DELETE"));
index fd910b7..1f3643a 100644 (file)
@@ -346,7 +346,7 @@ ComposerListEditorPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView
 }
 
 void
-ComposerListEditorPanel::OnUpdateContentList(void)
+ComposerListEditorPanel::OnMusicContentUpdateCompleted(void)
 {
        AppLogDebug("ENTER");
        UpdateContentList();
index 09bb4be..97c89f0 100644 (file)
@@ -214,7 +214,7 @@ ComposerListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousS
                CommonUtil::ShowNowPlayPanel(*__pContentTableView, __pNowPlayContentPanel->GetPlayStatus(), pForm->GetClientAreaBounds());
        }
 
-       OnUpdateContentList();
+       OnMusicContentUpdateCompleted();
        if (__pPresentationModel != null)
        {
                int totalComposerCount = __pPresentationModel->GetAllComposerCount();
@@ -411,7 +411,7 @@ ComposerListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::
 }
 
 void
-ComposerListPanel::OnUpdateContentList(void)
+ComposerListPanel::OnMusicContentUpdateCompleted(void)
 {
        AppLogDebug("ENTER");
        UpdateContentList();
index 34e2aa5..a454156 100644 (file)
@@ -87,13 +87,31 @@ ContentDetailForm::OnInitializing(void)
 
        Label* pMediaInfo = static_cast<Label*>(GetControl(IDC_MEDIA_INFO_LABEL));
        pMediaInfo->SetTextConfig(52,LABEL_TEXT_STYLE_NORMAL);
-       pMediaInfo->SetText(L"Media info");
+       pMediaInfo->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_MEDIA_INFO"));
+
+       Label* pNameLabel = static_cast<Label*>(GetControl(IDC_NAME_LABEL));
+       pNameLabel->SetText(ResourceManager::GetString(L"IDS_COM_BODY_DETAILS_NAME"));
+
+       Label* pFormatLabel = static_cast<Label*>(GetControl(IDC_FORMAT_LABEL));
+       pFormatLabel->SetText(ResourceManager::GetString(L"IDS_COM_BODY_FORMAT"));
+
+       Label* pSizeLabel = static_cast<Label*>(GetControl(IDC_SIZE_LABEL));
+       pSizeLabel->SetText(ResourceManager::GetString(L"IDS_COM_BODY_SIZE"));
+
+       Label* pForwardingLabel = static_cast<Label*>(GetControl(IDC_FORWARDING_LABEL));
+       pForwardingLabel->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_FORWARDING"));
+
+       Label* pDateLabel = static_cast<Label*>(GetControl(IDC_DATE_LABEL));
+       pDateLabel->SetText(ResourceManager::GetString(L"IDS_IV_BODY_DATE_CREATED"));
+
+       Label*  plocationLable= static_cast<Label*>(GetControl(IDC_LOCATION_LABEL));
+       plocationLable->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_MUSIC_LOCATION"));
 
        Label* pTitletNameInMediaInfo = static_cast<Label*>(GetControl(IDC_NAME_DATA_LABEL));
        pTitletNameInMediaInfo->SetText(pAudioInfo->GetTitle());
 
-       Label* pFormat = static_cast<Label*>(GetControl(IDC_FORMAT_DATA_LABEL));
-       pFormat->SetText(pAudioInfo->GetMediaFormat());
+       Label* pFormatData = static_cast<Label*>(GetControl(IDC_FORMAT_DATA_LABEL));
+       pFormatData->SetText(pAudioInfo->GetMediaFormat());
 
        unsigned long contentSize = 0;
        String stringContentSize = null;
index 5cef2fe..c9c4a58 100644 (file)
@@ -190,7 +190,7 @@ void
 ContentEditPanel::SetContentEditHeader(void)\r
 {\r
        AppLogDebug("ENTER");\r
-       CommonUtil::SetSimpleTitleStyle(*GetHeader(), L"Edit");  //NEED String\r
+       CommonUtil::SetSimpleTitleStyle(*GetHeader(), ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));\r
        CommonUtil::SetButtonItemUnCheckedIcon(*GetParentHeader());\r
        AppLogDebug("EXIT");\r
 }\r
@@ -201,4 +201,12 @@ ContentEditPanel::OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orienta
        AppLogDebug("ENTER");\r
        __pContentTableView->Invalidate(true);\r
        AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentEditPanel::OnMusicContentUpdateCompleted(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       UpdateContentList();\r
+       AppLogDebug("EXIT");\r
 }
\ No newline at end of file
index d223029..d9bebbf 100644 (file)
@@ -390,6 +390,14 @@ ContentListForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::U
        AppLogDebug("EXIT");
 }
 
+void
+ContentListForm::OnMusicContentUpdateCompleted(void)
+{
+       AppLogDebug("ENTER");
+       UpdateContentList();
+       AppLogDebug("EXIT");
+}
+
 result
 ContentListForm::SetShowStateNoContent(bool isShow)
 {
@@ -588,7 +596,7 @@ ContentListForm::ToggleScreenState(ScreenState screenState)
                }
                else if (screenState == SCREEN_STATE_SHARE_VIA)
                {
-                       CommonUtil::SetEditHeaderStyle(*GetHeader(), L"Share via"); //NEED STRING
+                       CommonUtil::SetEditHeaderStyle(*GetHeader(), ResourceManager::GetString(L"IDS_IV_BODY_SHARE_VIA"));
                        CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_SHARE_ADD);
                }
 
index 0dce5c3..3543321 100644 (file)
@@ -218,6 +218,18 @@ ContentLibaryPanel::OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orien
 }\r
 \r
 void\r
+ContentLibaryPanel::OnMusicContentUpdateCompleted(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       UpdateContentList();\r
+       if (__pContentTableView != null)\r
+       {\r
+               __pContentTableView->UpdateTableView();\r
+       }\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
 ContentLibaryPanel::TryRegisterMiniPlayer(void)\r
 {\r
        AppLogDebug("ENTER");\r
index 5ce529e..ef394d3 100644 (file)
@@ -34,20 +34,12 @@ ContentPanel::ContentPanel(void)
        , __footerButtonStyle(STYLE_MAX)\r
 {\r
        AppLogDebug("ENTER");\r
-       ContentManager contentManager;\r
-       contentManager.Construct();\r
-\r
-       contentManager.AddContentUpdateEventListener(*this);\r
        AppLogDebug("EXIT");\r
 }\r
 \r
 ContentPanel::~ContentPanel(void)\r
 {\r
        AppLogDebug("ENTER");\r
-       ContentManager contentManager;\r
-       contentManager.Construct();\r
-\r
-       contentManager.RemoveContentUpdateEventListener(*this);\r
        AppLogDebug("EXIT");\r
 }\r
 \r
@@ -286,36 +278,4 @@ ContentPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        AppLogDebug("ENTER");\r
        Tizen::App::Application::GetInstance()->Terminate();\r
        AppLogDebug("EXIT");\r
-}\r
-\r
-void\r
-ContentPanel::OnContentDirectoryScanCompleted(const Tizen::Base::String& directoryPath, result r)\r
-{\r
-       AppLogDebug("ENTER");\r
-       UpdateContentList();\r
-       AppLogDebug("EXIT");\r
-}\r
-\r
-void\r
-ContentPanel::OnContentFileCreated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r)\r
-{\r
-       AppLogDebug("ENTER");\r
-       UpdateContentList();\r
-       AppLogDebug("EXIT");\r
-}\r
-\r
-void\r
-ContentPanel::OnContentFileDeleted(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r)\r
-{\r
-       AppLogDebug("ENTER");\r
-       UpdateContentList();\r
-       AppLogDebug("EXIT");\r
-}\r
-\r
-void\r
-ContentPanel::OnContentFileUpdated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r)\r
-{\r
-       AppLogDebug("ENTER");\r
-       UpdateContentList();\r
-       AppLogDebug("EXIT");\r
 }
\ No newline at end of file
index 283106e..e00163a 100644 (file)
@@ -180,7 +180,7 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
 
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY));
                }
                break;
 
@@ -198,7 +198,7 @@ FolderContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
                                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, anchorPoint);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_GO_TO_LIBARY | CONTEXT_MENU_ITEM_STYLE_EDIT, anchorPoint);
                }
                break;
 
@@ -751,6 +751,16 @@ FolderContentListForm::UpdateTableView(void)
 }
 
 void
+FolderContentListForm::UpdateContentList(void)
+{
+       AppLogDebug("ENTER");
+       __pPresentationModel->UpdateFolderPathList();
+       __pPresentationModel->InitializeContentList(__currentFolderIndex);
+       UpdateTableView();
+       AppLogDebug("EXIT");
+}
+
+void
 FolderContentListForm::SetItemCheckedAll(bool isChecked)
 {
        AppLogDebug("ENTER");
index 8ec7b6a..4956598 100644 (file)
@@ -368,14 +368,6 @@ FolderListEditorPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 }
 
 void
-FolderListEditorPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
-       AppLogDebug("EXIT");
-}
-
-void
 FolderListEditorPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
index 248a38f..708433f 100644 (file)
@@ -60,6 +60,7 @@ FolderListPanel::OnInitializing(void)
 
        SetLayoutFitToForm();
        SetFooterStyle(STYLE_MORE_ADD);
+       UpdateContentList();
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -118,13 +119,25 @@ FolderListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
 
        case IDA_CONTEXT_MENU_ITEM_EDIT:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST_EDITOR));
+                       if (__pPresentationModel->GetAllFolderCount() == 0)
+                       {
+                               MessageBox messageBox;
+                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_HEADER_NO_SONGS"), MSGBOX_STYLE_NONE, 500);
+
+                               int modalResult = 0;
+                               messageBox.ShowAndWait(modalResult);
+                               break;
+                       }
+                       else
+                       {
+                               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_FOLDER_LIST_EDITOR));
+                       }
                }
                break;
 
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY));
                }
                break;
 
@@ -153,7 +166,11 @@ FolderListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
 void
 FolderListPanel::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
-       Tizen::App::Application::GetInstance()->Terminate();
+       AppLogDebug("ENTER");
+       CommonUtil::SetTabHeaderStyle(*GetHeader());
+       GetHeader()->Invalidate(true);
+       SceneManager::GetInstance()->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
+       AppLogDebug("EXIT");
 }
 
 void
@@ -162,8 +179,7 @@ FolderListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSce
                                        Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-       CommonUtil::SetSimpleTitleStyle(*GetHeader(), L"Folder View");
-       UpdateContentList();
+       CommonUtil::SetSimpleTitleStyle(*GetHeader(), ResourceManager::GetString(L"IDS_MSGF_SK3_FOLDER_VIEW"));
        ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
 
        if (pArgs != null)
@@ -283,14 +299,6 @@ FolderListPanel::OnScrollPositionChanged (Tizen::Ui::Control& source, int scroll
 }
 
 void
-FolderListPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
-       AppLogDebug("EXIT");
-}
-
-void
 FolderListPanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
@@ -310,10 +318,9 @@ void
 FolderListPanel::UpdateContentList(void)
 {
        AppLogDebug("ENTER");
-       if (__pPresentationModel != null && __pContentTableView != null)
+       if (__pPresentationModel != null)
        {
                __pPresentationModel->UpdateFolderPathList();
-               __pContentTableView->UpdateTableView();
        }
        AppLogDebug("EXIT");
 }
index ac343ca..f3003cb 100644 (file)
@@ -343,7 +343,7 @@ GenresListEditorPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView&
 }
 
 void
-GenresListEditorPanel::OnUpdateContentList(void)
+GenresListEditorPanel::OnMusicContentUpdateCompleted(void)
 {
        AppLogDebug("ENTER");
        UpdateContentList();
index 300f676..18f38dd 100644 (file)
@@ -419,7 +419,7 @@ GenreListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Bas
 }
 
 void
-GenreListPanel::OnUpdateContentList(void)
+GenreListPanel::OnMusicContentUpdateCompleted(void)
 {
        AppLogDebug("ENTER");
        UpdateContentList();
index cc9a213..9c990dc 100644 (file)
@@ -22,6 +22,7 @@
 #include "MpBaseForm.h"
 #include "MpBasePanel.h"
 #include "MpCommonUtil.h"
+#include "MpMusicContentUpdateEventListner.h"
 #include "MpMusicPlayerApp.h"
 #include "MpMusicPlayerForm.h"
 #include "MpResourceManager.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Base::Runtime;
+using namespace Tizen::Content;
 using namespace Tizen::System;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
-using namespace Tizen::Base::Collection;
 
 const wchar_t* TIZEN_APPCONTORL_PROVIDER_AUDIO = L"http://tizen.org/appcontrol/provider/musicplayer";
 const wchar_t* TIZEN_APPCONTROL_OPERATION_PLAY = L"http://tizen.org/appcontrol/operation/play";
@@ -45,12 +48,16 @@ const wchar_t* TIZEN_APPCONTROL_OPERATION_CONFIGURE = L"http://tizen.org/appcont
 static const wchar_t* PARAM_LANGUAGE = L"http://tizen.org/setting/locale.language";
 static const wchar_t* PARAM_COUNTRY = L"http://tizen.org/setting/locale.country";
 
+static const int TIMER_CONTENT_UPDATE_DELAY = 500;
+
 MusicPlayerApp::MusicPlayerApp(void)
        : __requestId(null)
        , __operationId(null)
        , __sceneId(IDSCN_ALL_LIST)
        , __pDataList(null)
        , __pMainFrame(null)
+       , __pContentManager(null)
+       , __pContentUpdateCompleteTimer(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -105,6 +112,16 @@ MusicPlayerApp::OnAppInitialized(void)
                return false;
        }
 
+       __pContentManager = new (std::nothrow) ContentManager();
+       r = __pContentManager->Construct();
+       TryCatch(r == E_SUCCESS, r = E_FAILURE, "AddFrame failed.\n");
+
+       __pContentManager->AddContentUpdateEventListener(*this);
+
+       __pContentUpdateCompleteTimer = new (std::nothrow) Timer();
+       r = __pContentUpdateCompleteTimer->Construct(*this);
+       TryCatch(r == E_SUCCESS, r = E_FAILURE, "AddFrame failed.\n");
+
        __pMainFrame->Construct();
        r = AddFrame(*__pMainFrame);
        TryCatch(r == E_SUCCESS, r = E_FAILURE, "AddFrame failed.\n");
@@ -121,7 +138,12 @@ MusicPlayerApp::OnAppInitialized(void)
        return true;
 
 CATCH:
-       //AppLogDebug("[E_OUT_OF_MEMORY] Unable to AddFrame MainFrame.");
+       delete __pContentUpdateCompleteTimer;
+       __pContentUpdateCompleteTimer = null;
+       delete __pContentManager;
+       __pContentManager = null;
+
+       AppLogDebug("EXIT(%s)", GetErrorMessage(r));
        return false;
 }
 
@@ -129,6 +151,15 @@ bool
 MusicPlayerApp::OnAppWillTerminate(void)
 {
        AppLogDebug("ENTER");
+       if (__pContentManager != null)
+       {
+               __pContentManager->RemoveContentUpdateEventListener(*this);
+       }
+
+       if (__pContentUpdateCompleteTimer != null)
+       {
+               __pContentUpdateCompleteTimer->Cancel();
+       }
        AppLogDebug("EXIT");
        return true;
 }
@@ -149,6 +180,12 @@ MusicPlayerApp::OnAppTerminating(AppRegistry& appRegistry, bool forcedTerminatio
        {
                pThumbnailProvider->Quit();
        }
+
+       delete __pContentUpdateCompleteTimer;
+       __pContentUpdateCompleteTimer = null;
+       delete __pContentManager;
+       __pContentManager = null;
+
        AppLogDebug("EXIT");
        return true;
 }
@@ -174,13 +211,13 @@ MusicPlayerApp::OnForeground(void)
 //     PlayerForm* pBaseForm = dynamic_cast<PlayerForm*>(pScene->GetForm());
 //     if (pBasePanel)
 //     {
-//             pBasePanel->OnUpdateContentList();
+//             pBasePanel->OnMusicContentUpdateCompleted();
 //     }
 //     else
 //     {
 //             if (pBaseForm)
 //             {
-//                     pBaseForm->OnUpdateContentList();
+//                     pBaseForm->OnMusicContentUpdateCompleted();
 //             }
 //     }
        PlayerForm* pBaseForm = dynamic_cast<PlayerForm*>(pScene->GetForm());
@@ -371,4 +408,130 @@ MusicPlayerApp::GetOperationId(void)
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
        return __operationId;
+}
+
+void
+MusicPlayerApp::OnContentFileCreated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r)
+{
+       AppLogDebug("ENTER");
+       if (contentType == CONTENT_TYPE_AUDIO && !IsFailed(r))
+       {
+               ReStartTimerToContentUpdate();
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+MusicPlayerApp::OnContentFileUpdated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r)
+{
+       AppLogDebug("ENTER");
+       if (contentType == CONTENT_TYPE_AUDIO && !IsFailed(r))
+       {
+               ReStartTimerToContentUpdate();
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+MusicPlayerApp::OnContentFileDeleted(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r)
+{
+       AppLogDebug("ENTER");
+       if (contentType == CONTENT_TYPE_AUDIO && !IsFailed(r))
+       {
+               ReStartTimerToContentUpdate();
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+MusicPlayerApp::OnContentDirectoryScanCompleted(const Tizen::Base::String& directoryPath, result r)
+{
+       AppLogDebug("ENTER");
+       if (!IsFailed(r))
+       {
+               ReStartTimerToContentUpdate();
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+MusicPlayerApp::ReStartTimerToContentUpdate(void)
+{
+       AppLogDebug("ENTER");
+       if (__pContentUpdateCompleteTimer != null)
+       {
+               __pContentUpdateCompleteTimer->Cancel();
+               __pContentUpdateCompleteTimer->Start(TIMER_CONTENT_UPDATE_DELAY);
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+MusicPlayerApp::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
+{
+       AppLogDebug("ENTER");
+       if (__pContentUpdateCompleteTimer != &timer)
+       {
+               AppLogDebug("EXIT(UnKnown Timer)");
+               return;
+       }
+
+       FireImpleContentUpdate();
+       AppLogDebug("EXIT");
+}
+
+void
+MusicPlayerApp::FireImpleContentUpdate(void)
+{
+       AppLogDebug("ENTER");
+       UiApp* pApp = UiApp::GetInstance();
+       AppAssert(pApp);
+#if 0
+       if (pApp->GetAppUiState() == APP_UI_STATE_FOREGROUND || pApp->GetAppUiState() == APP_UI_STATE_PARTIAL_BACKGROUND)
+       {
+               SceneManager* pSceneManager = SceneManager::GetInstance();
+               AppAssert(pSceneManager);
+
+               MusicContentUpdateEventListner* pEventListner = dynamic_cast<MusicContentUpdateEventListner*>(pSceneManager->GetCurrentScene()->GetForm());
+               if (pEventListner == null)
+               {
+                       pEventListner = dynamic_cast<MusicContentUpdateEventListner*>(pSceneManager->GetCurrentScene()->GetPanel());
+               }
+
+               if (pEventListner != null)
+               {
+                       pEventListner->OnMusicContentUpdateCompleted();
+
+               }
+               AppLogDebug("EXIT");
+               return;
+       }
+#endif
+       int frameChildControlCount = __pMainFrame->GetControlCount();
+       for (int iCount = 0; iCount < frameChildControlCount; iCount++)
+       {
+               Form* pForm = dynamic_cast<Form*>(__pMainFrame->GetControl(iCount));
+               if (pForm == null)
+               {
+                       continue;
+               }
+
+               MusicContentUpdateEventListner* pEventListner = dynamic_cast<MusicContentUpdateEventListner*>(pForm);
+               if (pEventListner != null)
+               {
+                       pEventListner->OnMusicContentUpdateCompleted();
+                       continue;
+               }
+
+               int formChildControlCount = pForm->GetControlCount();
+               for (int iCount = 0; iCount < formChildControlCount; iCount++)
+               {
+                       MusicContentUpdateEventListner* pEventListner = dynamic_cast<MusicContentUpdateEventListner*>(pForm->GetControl(iCount));
+                       if (pEventListner != null)
+                       {
+                               pEventListner->OnMusicContentUpdateCompleted();
+                       }
+               }
+       }
+       AppLogDebug("EXIT");
 }
\ No newline at end of file
index 5f2b1b9..2f056cf 100644 (file)
@@ -129,7 +129,7 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int
 
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY));
                }
                break;
 
@@ -159,7 +159,7 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int
                                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, anchorPoint);
+                       SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_EDIT, anchorPoint);
                }
                break;
 
@@ -604,6 +604,15 @@ PlaylistContentListForm::UpdateTableView(void)
 }
 
 void
+PlaylistContentListForm::UpdateContentList(void)
+{
+       AppLogDebug("ENTER");
+       __pPresentationModel->UpdatePlaylistContentList(__currentContentType, __headerTitle);
+       UpdateTableView();
+       AppLogDebug("EXIT");
+}
+
+void
 PlaylistContentListForm::SetItemCheckedAll(bool isChecked)
 {
        AppLogDebug("ENTER");
index ce93916..e1939a6 100644 (file)
@@ -360,14 +360,6 @@ PlaylistListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableV
 }
 
 void
-PlaylistListEditorPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
-       AppLogDebug("EXIT");
-}
-
-void
 PlaylistListEditorPanel::UpdateContentList(void)
 {
        AppLogDebug( "ENTER");
index d37356f..16a4e73 100644 (file)
@@ -89,6 +89,7 @@ PlaylistListPanel::OnInitializing(void)
        __pPlaylistListPresentationModel = PlaylistListPresentationModel::GetInstance();
        SetFooterStyle(STYLE_MORE_ADD);
        SetLayoutFitToForm();
+       UpdateContentList();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -158,7 +159,7 @@ PlaylistListPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actio
 
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY));
                }
                break;
 
@@ -270,7 +271,6 @@ PlaylistListPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousS
        GetHeader()->SetItemSelected(1);
        GetHeader()->Invalidate(true);
 
-       UpdateContentList();
        ContentLibaryPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
        AppLogDebug("EXIT");
 }
@@ -533,21 +533,12 @@ PlaylistListPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
 }
 
 void
-PlaylistListPanel::OnUpdateContentList(void)
-{
-       AppLogDebug("ENTER");
-       UpdateContentList();
-       AppLogDebug("EXIT");
-}
-
-void
 PlaylistListPanel::UpdateContentList(void)
 {
        AppLogDebug("ENTER");
-       if (__pPlaylistListPresentationModel != null && __pContentTableView != null)
+       if (__pPlaylistListPresentationModel != null)
        {
                __pPlaylistListPresentationModel->UpdatePlaylistList();
-               __pContentTableView->UpdateTableView();
        }
        AppLogDebug("EXIT");
 }
index cc19a4f..13789f3 100644 (file)
@@ -670,4 +670,4 @@ SearchForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 
        pSceneManager->GoForward(ForwardSceneTransition(__pSceneId->GetPointer(), SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY));
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file
index 8f53301..a8b9cb8 100644 (file)
@@ -191,7 +191,9 @@ SettingForm::CreateGroupItem(int groupIndex, int itemWidth)
                                AppLogDebug("Construct(IDL_SETTING_PLAYLIST_SET_ITEM_PANEL) failed(%s)", GetErrorMessage(GetLastResult()));
                                return null;
                        }
+                       Label* pMainText = static_cast<Label*>(pGroupTableViewItem->GetControl(IDC_LABEL_MAIN_TEXT));
                        Label* pSubText = static_cast<Label*>(pGroupTableViewItem->GetControl(IDC_LABEL_SUB_TEXT));
+                       pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_MUSIC_AUTO_OFF"));
                        pSubText->SetText(GetAutoOffString());
                }
                break;
@@ -272,7 +274,7 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                {
                case ID_SUB_ZERO_ITEM:
                        {
-                               pMainText->SetText(L"Not used");
+                               pMainText->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_NOT_USED"));
                        }
                        break;
 
@@ -495,6 +497,8 @@ SettingForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
+       CommonUtil::SetSimpleTitleStyle(*GetHeader(), ResourceManager::GetString(L"IDS_MUSIC_BODY_MUSIC_SETTINGS"));
+
        if (pArgs != null)
        {
                pArgs->RemoveAll(true);
@@ -519,7 +523,7 @@ SettingForm::GetAutoOffString(void)
        {
        case ID_SUB_ZERO_ITEM:
                {
-                       return L"Not used";
+                       return ResourceManager::GetString(L"IDS_MUSIC_BODY_NOT_USED");
                }
                break;
 
@@ -555,11 +559,11 @@ SettingForm::GetAutoOffString(void)
 
        default:
                {
-                       return L"Not used";
+                       return ResourceManager::GetString(L"IDS_MUSIC_BODY_NOT_USED");
                }
                break;
        }
 
        AppLogDebug("EXIT");
-       return L"Not used";
+       return ResourceManager::GetString(L"IDS_MUSIC_BODY_NOT_USED");
 }
index 66eef7a..e7dd306 100644 (file)
@@ -70,7 +70,7 @@ SharePopup::Initialize(Tizen::Ui::Control* pControl)
        result r = E_SUCCESS;
 
        Construct(IDL_SHARE_VIA_POPUP);
-       SetTitleText(L"Share via");//NEED STRING
+       SetTitleText(ResourceManager::GetString(L"IDS_IV_BODY_SHARE_VIA"));
 
        AddKeyEventListener(*this);
        AddTouchEventListener(*this);
@@ -82,6 +82,7 @@ SharePopup::Initialize(Tizen::Ui::Control* pControl)
        __pCancelButton = static_cast<Button*>(GetControl(IDC_CANCEL_BUTTON));
        __pCancelButton->SetActionId(IDA_BUTTON_CANCEL);
        __pCancelButton->AddActionEventListener(*this);
+       __pCancelButton->SetText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT_CANCEL"));
        __pControl = pControl;
        AppLogDebug("EXIT");
        return r;
@@ -227,7 +228,7 @@ SharePopup::CreateItem(const int itemIndex, int itemWidth)
        }
 
        //String shareItemName[] = {L"Message", L"Email", L"Bluetooth"};//NEED STRING Bluetooth
-       String shareItemName[] = {L"Email"};//NEED
+       String shareItemName[] = {ResourceManager::GetString(L"IDS_COM_BODY_EMAIL")};
        Label* pShareItemLabel = new (std::nothrow) Label();
        pShareItemLabel->Construct(Rectangle(0, 0, POPUP_ITEM_WIDTH, HEIGHT_POPUP_ITEM), L"");
        pShareItemLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -293,9 +294,9 @@ SharePopup::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableVie
 
 //             case INDEX_SHARE_TOTAL_BLUETOOTH: NEED
 //                     {
-//                             //LaunchAppControl(OPERATION_ID_COMPOSE, PROVIDER_ID_EMAIL);
+//                             LaunchAppControl(OPERATION_ID_COMPOSE, PROVIDER_ID_EMAIL);
 //                     }
-                       break;
+//                     break;
 
                default:
                        break;
index 5b224e9..4da4bab 100644 (file)
@@ -154,6 +154,12 @@ const wchar_t* IDC_LABEL_MAIN_TEXT = L"IDC_LABEL_MAIN_TEXT";
 const wchar_t* IDC_LABEL_SUB_TEXT = L"IDC_LABEL_SUB_TEXT";
 const wchar_t* IDC_LABEL_EX = L"IDC_LABEL_EX";
 const wchar_t* IDC_MEDIA_INFO_LABEL = L"IDC_MEDIA_INFO_LABEL";
+const wchar_t* IDC_NAME_LABEL = L"IDC_NAME_LABEL";
+const wchar_t* IDC_FORMAT_LABEL = L"IDC_FORMAT_LABEL";
+const wchar_t* IDC_SIZE_LABEL = L"IDC_SIZE_LABEL";
+const wchar_t* IDC_FORWARDING_LABEL = L"IDC_FORWARDING_LABEL";
+const wchar_t* IDC_DATE_LABEL = L"IDC_DATE_LABEL";
+const wchar_t* IDC_LOCATION_LABEL = L"IDC_LOCATION_LABEL";
 //__XML_IDC_
 
 //<--__XML_IDC_ORDERING PREFIX : IDC_CONTROLTYPE_ EX) IDC_BUTTON_TOGGLE_PLAY
index 6382012..419f78d 100644 (file)
@@ -136,7 +136,7 @@ UserPlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source,
 
        case IDA_CONTEXT_MENU_ITEM_SEARCH:
                {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH));
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SEARCH, SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY));
                }
                break;
 
@@ -167,7 +167,7 @@ UserPlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source,
                        }
                        else
                        {
-                               SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_ADD | CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_SEARCH | CONTEXT_MENU_ITEM_STYLE_EDIT, anchorPoint);
+                               SetContextMenuItem(CONTEXT_MENU_ITEM_STYLE_ADD | CONTEXT_MENU_ITEM_STYLE_SHARE_VIA | CONTEXT_MENU_ITEM_STYLE_EDIT, anchorPoint);
                        }
                }
                break;
@@ -534,6 +534,15 @@ UserPlaylistContentListForm::UpdateTableView(void)
 }
 
 void
+UserPlaylistContentListForm::UpdateContentList(void)
+{
+       AppLogDebug("ENTER");
+       __pPresentationModel->UpdatePlaylistContentList(USER_CONTENT, __headerTitle);
+       UpdateTableView();
+       AppLogDebug("EXIT");
+}
+
+void
 UserPlaylistContentListForm::SetItemCheckedAll(bool isChecked)
 {
        AppLogDebug("ENTER");
index 09a99d1..39ca88c 100644 (file)
@@ -350,7 +350,7 @@ YearsListEditorPanel::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& t
 }
 
 void
-YearsListEditorPanel::OnUpdateContentList(void)
+YearsListEditorPanel::OnMusicContentUpdateCompleted(void)
 {
        AppLogDebug("ENTER");
        UpdateContentList();
index a59a2fb..33b1f5e 100644 (file)
@@ -427,7 +427,7 @@ YearsListPanel::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Bas
 }
 
 void
-YearsListPanel::OnUpdateContentList(void)
+YearsListPanel::OnMusicContentUpdateCompleted(void)
 {
        AppLogDebug("ENTER");
        UpdateContentList();