[MusciPlayer] Code cleanup and Additional work 2.1 UI (1depth, 2depth EDIT All check...

Change-Id: I1d207d5564730a504c7542e79be4c47a061c49fb

diff --git a/inc/MpAlbumContentListForm.h b/inc/MpAlbumContentListForm.h
index 965d01d..0937903 100644 (file)
--- a/inc/MpAlbumContentListForm.h
+++ b/inc/MpAlbumContentListForm.h
@@ -72,4 +72,4 @@ private:
        AlbumListPresentationModel* __pPresentationModel;
 };
 
-#endif // _MP_ALBUM_CONTENT_LIST_FORM_H_
+#endif // _MP_ALBUM_CONTENT_LIST_FORM_H_
\ No newline at end of file

diff --git a/inc/MpAlbumListEditorPanel.h b/inc/MpAlbumListEditorPanel.h
index d3c22d5..633e0b9 100644 (file)
--- a/inc/MpAlbumListEditorPanel.h
+++ b/inc/MpAlbumListEditorPanel.h
@@ -67,8 +67,6 @@ private:
        void SetEditHeaderStyle(void);
        void SetTabHeaderStyle(void);
        void SetDisableIconAllCheckButton(void);
-       void SetCheckedIconAllCheckButton(void);
-       void SetUnCheckedIconAllCheckButton(void);
 
 private:
        int __checkedItemCount;

diff --git a/inc/MpAllListEditorPanel.h b/inc/MpAllListEditorPanel.h
index cafb7f9..d0cbe89 100644 (file)
--- a/inc/MpAllListEditorPanel.h
+++ b/inc/MpAllListEditorPanel.h
@@ -78,8 +78,6 @@ private:
        void SetEditHeaderStyle(void);
        void SetTabHeaderStyle(void);
        void SetDisableIconAllCheckButton(void);
-       void SetCheckedIconAllCheckButton(void);
-       void SetUnCheckedIconAllCheckButton(void);
 
 private:
        PlayListPickerPopup* __pPlayListPickerPopup;
@@ -87,8 +85,6 @@ private:
 
 protected:
        int __checkedItemCount;
-//     Tizen::Ui::Controls::CheckButton* __pSelectAllCheckedButton;
-//     Tizen::Ui::Controls::Label* __pCheckedCountLabel;
        AllListPresentationModel* __pPresentationModel;
        Tizen::Graphics::Bitmap* __pThumbnail;
        int __editType;

diff --git a/inc/MpArtistContentListForm.h b/inc/MpArtistContentListForm.h
old mode 100755 (executable)
new mode 100644 (file)
index 0e38c5b..ffeb71b
--- a/inc/MpArtistContentListForm.h
+++ b/inc/MpArtistContentListForm.h
@@ -54,7 +54,7 @@ private:
                                const Tizen::Base::Collection::IMap* pExtraData);
 
 private:
-       result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfo);
+//     result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfo);
        Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
        void ToggleViewMode(bool editMode);
 

diff --git a/inc/MpCommonUtil.h b/inc/MpCommonUtil.h
index 08b0a87..bf8eaa7 100644 (file)
--- a/inc/MpCommonUtil.h
+++ b/inc/MpCommonUtil.h
@@ -161,4 +161,4 @@ public:
        static Tizen::Graphics::Bitmap* GetColorizedBitmapN(const Tizen::Graphics::Bitmap& bitmap, const Tizen::Graphics::Color& color);
 };
 
-#endif // _MP_COMMON_UTIL_H_
+#endif // _MP_COMMON_UTIL_H_
\ No newline at end of file

diff --git a/inc/MpComposerContentListForm.h b/inc/MpComposerContentListForm.h
old mode 100755 (executable)
new mode 100644 (file)
index ae90e36..5325622
--- a/inc/MpComposerContentListForm.h
+++ b/inc/MpComposerContentListForm.h
@@ -56,7 +56,7 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 private:
-       result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
+//     result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfoStruct);
        Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
        void ToggleViewMode(bool editMode);
 

diff --git a/inc/MpContentListForm.h b/inc/MpContentListForm.h
index e1f6eef..7dd9a0e 100644 (file)
--- a/inc/MpContentListForm.h
+++ b/inc/MpContentListForm.h
@@ -88,7 +88,7 @@ protected:
        result SetContextMenuItem(unsigned int contextMenuItemStyle, Tizen::Graphics::Point anchorPosition = Tizen::Graphics::Point(-1, -1));
        void SetCommonPopup(Tizen::Ui::Controls::Popup* commonUtilPopup);
        result ToggleContentListScreenMode(ContentListScreenMode screenMode);
-       void ToggleAllSelectedItemButton(bool isChecked);
+       void ToggleItemCheckedAll(bool isChecked);
 
        void UpdateContentListScreenState(void);
 
@@ -154,6 +154,7 @@ private:
        int __itemIndex;
        int __checkedItemCount;
        int __additionlInformationRegisterBarHeight;
+       bool __allSelectToggle;
 };
 
-#endif // _MP_CONTENT_LIST_FORM_H_
+#endif // _MP_CONTENT_LIST_FORM_H_
\ No newline at end of file

diff --git a/inc/MpFolderContentListForm.h b/inc/MpFolderContentListForm.h
index c6394af..c64cbca 100644 (file)
--- a/inc/MpFolderContentListForm.h
+++ b/inc/MpFolderContentListForm.h
@@ -72,4 +72,4 @@ private:
        FolderListPresentationModel* __pPresentationModel;
 };
 
-#endif // _MP_FOLDER_CONTENT_LIST_FORM_H_
+#endif // _MP_FOLDER_CONTENT_LIST_FORM_H_
\ No newline at end of file

diff --git a/inc/MpFolderListEditorPanel.h b/inc/MpFolderListEditorPanel.h
index 6022069..a5335f1 100644 (file)
--- a/inc/MpFolderListEditorPanel.h
+++ b/inc/MpFolderListEditorPanel.h
@@ -80,8 +80,6 @@ private:
        void SetEditHeaderStyle(void);
        void SetTabHeaderStyle(void);
        void SetDisableIconAllCheckButton(void);
-       void SetCheckedIconAllCheckButton(void);
-       void SetUnCheckedIconAllCheckButton(void);
 
 protected:
        int __checkedItemCount;

diff --git a/inc/MpGenreContentListForm.h b/inc/MpGenreContentListForm.h
old mode 100755 (executable)
new mode 100644 (file)
index 7e6f0a8..15bd59a
--- a/inc/MpGenreContentListForm.h
+++ b/inc/MpGenreContentListForm.h
@@ -60,7 +60,7 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 private:
-       result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfo);
+//     result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfo);
        Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
        void ToggleViewMode(bool editMode);
 

diff --git a/inc/MpPlaylistListEditorPanel.h b/inc/MpPlaylistListEditorPanel.h
index e5a27b2..093f01a 100644 (file)
--- a/inc/MpPlaylistListEditorPanel.h
+++ b/inc/MpPlaylistListEditorPanel.h
@@ -74,8 +74,7 @@ private:
        void UpdateContentList(void);
        void SetEditHeaderStyle(void);
        void SetTabHeaderStyle(void);
-       void SetCheckedIconAllCheckButton(void);
-       void SetUnCheckedIconAllCheckButton(void);
+       void SetDisableIconAllCheckButton(void);
 
 private:
        int __selectedItemIndex;

diff --git a/inc/MpTypes.h b/inc/MpTypes.h
index ce402f0..7f5146c 100644 (file)
--- a/inc/MpTypes.h
+++ b/inc/MpTypes.h
@@ -541,4 +541,4 @@ static const Tizen::Base::String RETURN_TYPE = L"returnType:contactId";
 
 static const Tizen::Base::String CONTENT_FORM_REQUSEST_ID = L"ContentFormRequestId";
 
-#endif // _MP_TYPES_H_
+#endif // _MP_TYPES_H_
\ No newline at end of file

diff --git a/inc/MpUserPlaylistContentListForm.h b/inc/MpUserPlaylistContentListForm.h
index 42f4840..fc52ca6 100644 (file)
--- a/inc/MpUserPlaylistContentListForm.h
+++ b/inc/MpUserPlaylistContentListForm.h
@@ -75,4 +75,4 @@ private:
        PlaylistListPresentationModel* __pPresentationModel;
 };
 
-#endif // _MP_USER_PLAYLIST_CONTENT_LIST_FORM_H_
+#endif // _MP_USER_PLAYLIST_CONTENT_LIST_FORM_H_
\ No newline at end of file

diff --git a/inc/MpYearContentListForm.h b/inc/MpYearContentListForm.h
old mode 100755 (executable)
new mode 100644 (file)
index 6b5715f..166c165
--- a/inc/MpYearContentListForm.h
+++ b/inc/MpYearContentListForm.h
@@ -58,7 +58,7 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 private:
-       result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfo);
+//     result CreateTableViewItem(Tizen::Ui::Container& parent, const ContentInformation& contentInfo);
        Tizen::Base::Collection::ArrayList* MakePlayerSceneParam(int startIndex);
        void ToggleViewMode(bool editMode);
 

diff --git a/res/screen-density-xhigh/00_icon_select_all_dim_web.png b/res/screen-density-xhigh/00_icon_select_all_dim_web.png
new file mode 100644 (file)
index 0000000..d427c9b
Binary files /dev/null and b/res/screen-density-xhigh/00_icon_select_all_dim_web.png differ

diff --git a/res/screen-density-xhigh/00_icon_select_all_press_web.png b/res/screen-density-xhigh/00_icon_select_all_press_web.png
new file mode 100644 (file)
index 0000000..9fd2ec5
Binary files /dev/null and b/res/screen-density-xhigh/00_icon_select_all_press_web.png differ

diff --git a/res/screen-density-xhigh/00_icon_select_all_web.png b/res/screen-density-xhigh/00_icon_select_all_web.png
new file mode 100644 (file)
index 0000000..56e3fbb
Binary files /dev/null and b/res/screen-density-xhigh/00_icon_select_all_web.png differ

diff --git a/src/MpAlbumContentListForm.cpp b/src/MpAlbumContentListForm.cpp
index 86b9c23..5cba7ff 100644 (file)
--- a/src/MpAlbumContentListForm.cpp
+++ b/src/MpAlbumContentListForm.cpp
@@ -69,7 +69,6 @@ result
 AlbumContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-
        delete __pContextItem;
        __pContextItem = null;
 
@@ -112,8 +111,6 @@ AlbumContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                }
                break;
 
-
-
        case IDA_FOOTER_BUTTON_DELETE:
                {
                        RemoveCheckedTableviewItem();
@@ -221,7 +218,7 @@ AlbumContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previo
                        pArtistName->SetText(pContentInfoStruct->ArtistName);
 
                        String albumCount = null;
-                       albumCount.Format(255,L"%d songs",__pPresentationModel->GetContentCount(__currentContentIndex));
+                       albumCount.Format(255, L"%d songs", __pPresentationModel->GetContentCount(__currentContentIndex));
                        Label* pAlbumCount = static_cast<Label*>(pContentInfoPanel->GetControl(IDC_PLAY_CONTENT_COUNT));
                        pAlbumCount->SetText(albumCount);
 
@@ -269,7 +266,7 @@ AlbumContentListForm::CreateItem(const int itemIndex, int itemWidth)
        layout.Construct();
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
-       TableViewAnnexStyle tableViewAnnexStyle  = TABLE_VIEW_ANNEX_STYLE_NORMAL;
+       TableViewAnnexStyle tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
        {
                tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_MARK;
@@ -352,7 +349,6 @@ result
 AlbumContentListForm::SetContentListHeader(void)
 {
        AppLogDebug("ENTER");
-
        CommonUtil::SetSimpleTitleStyle(*GetHeader(), __headerTitle);
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -471,7 +467,6 @@ void
 AlbumContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-
        Panel* pItemPanel = static_cast<Panel*>(GetRegisteredAdditionalInforamtionControl());
 
        if (pItemPanel == null)
@@ -527,7 +522,7 @@ AlbumContentListForm::RefreshAdditionalInformationRegisterBar(void)
        }
 
        String albumCount = null;
-       albumCount.Format(255,L"%d songs",__pPresentationModel->GetContentCount(__currentContentIndex));
+       albumCount.Format(255, L"%d songs", __pPresentationModel->GetContentCount(__currentContentIndex));
        Label* pAlbumCount = static_cast<Label*>(pItemPanel->GetControl(IDC_PLAY_CONTENT_COUNT));
        pAlbumCount->SetText(albumCount);
 

diff --git a/src/MpAlbumListEditorPanel.cpp b/src/MpAlbumListEditorPanel.cpp
index ccb6419..31194e5 100644 (file)
--- a/src/MpAlbumListEditorPanel.cpp
+++ b/src/MpAlbumListEditorPanel.cpp
@@ -93,7 +93,6 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                                SetCheckedCountBalloonPopup(__checkedItemCount);
-                               SetUnCheckedIconAllCheckButton();
                                CommonUtil::SetFooterItemEnabled(*pFooter, false);
                                break;
                        }
@@ -101,7 +100,6 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetCheckedIconAllCheckButton();
                        CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
@@ -133,8 +131,6 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 
                        __checkedItemCount = INIT_VALUE;
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetUnCheckedIconAllCheckButton();
-
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                        __pContentTableView->Invalidate(true);
                }
@@ -164,11 +160,10 @@ AlbumListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                        else
                        {
                                SetNoContentSongs(true);
+                               SetDisableIconAllCheckButton();
                        }
                        __checkedItemCount = INIT_VALUE;
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetUnCheckedIconAllCheckButton();
-
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                }
                break;
@@ -322,15 +317,6 @@ AlbumListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView
                CommonUtil::SetFooterItemEnabled(*pFooter, false);
        }
 
-       if (__checkedItemCount == __pPresentationModel->GetAllAlbumCount())
-       {
-               SetCheckedIconAllCheckButton();
-       }
-       else
-       {
-               SetUnCheckedIconAllCheckButton();
-       }
-
        SetCheckedCountBalloonPopup(__checkedItemCount);
        Invalidate(true);
        AppLogDebug("EXIT");
@@ -416,28 +402,6 @@ AlbumListEditorPanel::SetDisableIconAllCheckButton(void)
 }
 
 void
-AlbumListEditorPanel::SetCheckedIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       String titleText(L"EDIT");
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, true);
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-AlbumListEditorPanel::SetUnCheckedIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       String titleText(L"EDIT");
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
 AlbumListEditorPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
@@ -509,4 +473,4 @@ AlbumListEditorPanel::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewIt
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file

diff --git a/src/MpAllContentPickerPanel.cpp b/src/MpAllContentPickerPanel.cpp
index b41255d..b4d691f 100644 (file)
--- a/src/MpAllContentPickerPanel.cpp
+++ b/src/MpAllContentPickerPanel.cpp
@@ -211,4 +211,4 @@ AllContentPickerPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
        pFooter->RemoveAllItems();
        pFooter->RemoveActionEventListener(*this);
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file

diff --git a/src/MpAllListEditorPanel.cpp b/src/MpAllListEditorPanel.cpp
index 3c493f6..faf578a 100644 (file)
--- a/src/MpAllListEditorPanel.cpp
+++ b/src/MpAllListEditorPanel.cpp
@@ -105,7 +105,6 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                                SetCheckedCountBalloonPopup(__checkedItemCount);
-                               SetUnCheckedIconAllCheckButton();
                                CommonUtil::SetFooterItemEnabled(*pFooter, false);
                                break;
                        }
@@ -113,7 +112,6 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetCheckedIconAllCheckButton();
                        CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
@@ -137,16 +135,15 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
 
                        if (__pPresentationModel->GetTotalCount() != 0)
                        {
-//                             __pSelectAllCheckedButton->SetEnabled(true);
+                               // Empty statement
                        }
                        else
                        {
                                SetNoContentSongs(true);
+                               SetDisableIconAllCheckButton();
                        }
                        __checkedItemCount = INIT_VALUE;
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetUnCheckedIconAllCheckButton();
-
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                }
                break;
@@ -181,8 +178,6 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
 
                        __checkedItemCount = INIT_VALUE;
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetUnCheckedIconAllCheckButton();
-
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                        __pContentTableView->Invalidate(true);
                }
@@ -222,8 +217,6 @@ AllListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int acti
                        }
                        __checkedItemCount = INIT_VALUE;
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetUnCheckedIconAllCheckButton();
-
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                        __pContentTableView->Invalidate(true);
 
@@ -279,6 +272,7 @@ AllListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
 
        UpdateContentList();
        SetCheckedCountBalloonPopup(INIT_VALUE);
+
        if (__pPresentationModel->GetTotalCount() != INIT_VALUE)
        {
                SetNoContentSongs(false);
@@ -404,15 +398,6 @@ AllListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView&
                CommonUtil::SetFooterItemEnabled(*pFooter, false);
        }
 
-       if (__checkedItemCount == __pPresentationModel->GetTotalCount())
-       {
-               SetCheckedIconAllCheckButton();
-       }
-       else
-       {
-               SetUnCheckedIconAllCheckButton();
-       }
-
        SetCheckedCountBalloonPopup(__checkedItemCount);
        Invalidate(true);
        AppLogDebug("EXIT");
@@ -496,6 +481,7 @@ AllListEditorPanel::SetTabHeaderStyle(void)
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
 }
+
 void
 AllListEditorPanel::SetDisableIconAllCheckButton(void)
 {
@@ -505,42 +491,6 @@ AllListEditorPanel::SetDisableIconAllCheckButton(void)
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
 }
-void
-AllListEditorPanel::SetCheckedIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       if(__editType == IDA_MORE_CONTEXT_MENU_EDIT)
-       {
-               String titleText(L"EDIT");
-               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, true);
-       }
-       else
-       {
-               String titleText(L"Share via");//NEED STRING
-               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, true);
-       }
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-void
-AllListEditorPanel::SetUnCheckedIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       if(__editType == IDA_MORE_CONTEXT_MENU_EDIT)
-       {
-               String titleText(L"EDIT");
-               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
-       }
-       else
-       {
-               String titleText(L"Share via");//NEED STRING
-               CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
-       }
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
 
 void
 AllListEditorPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)

diff --git a/src/MpArtistContentListForm.cpp b/src/MpArtistContentListForm.cpp
index 2bea806..c8926d4 100644 (file)
--- a/src/MpArtistContentListForm.cpp
+++ b/src/MpArtistContentListForm.cpp
@@ -43,9 +43,11 @@ static const Tizen::Graphics::Rectangle RECT_CONTENT_PLAY_TIME (516, 16, 188, 88
 
 static const int X_OFFSET_EDIT_STYLE_TABLE_VIEW = 96;
 static const int COUNT_MESSAGE_BOX_TIMEOUT = 3000;
+
 #if 0
 #define ALL_SONG_INDEX_COUNT_PLUS(n) (n + 1)
 #define ALL_SONG_INDEX_COUNT_MINUS(n) (n - 1)
+
 ArtistContentListForm::ArtistContentListForm(void)
        : ContentListForm::ContentListForm()
        , __pPresentationModel(null)
@@ -666,4 +668,4 @@ ArtistContentListForm::OnAppControlCompleteResponseReceived(const AppId& appId,
        }
        AppLogDebug("EXIT");
 }
-#endif
+#endif
\ No newline at end of file

diff --git a/src/MpCommonUtil.cpp b/src/MpCommonUtil.cpp
index e883873..d87de5e 100644 (file)
--- a/src/MpCommonUtil.cpp
+++ b/src/MpCommonUtil.cpp
@@ -651,7 +651,6 @@ CommonUtil::SetTabHeaderStyle(Tizen::Ui::Controls::Header& pHeader)
                        pTabHeaderItem.Construct(IDA_HEADER_BUTTON_SONG + iCount);
                        pTabHeaderItem.SetText(ResourceManager::GetString(TabNameId[iCount]));
 
-//                     CommonUtil::SetBackgroundBitmapHeaderItem(pTabHeaderItem, null, null, null, null);
                        pHeader.AddItem(pTabHeaderItem);
                        headItemChecked++;
                }
@@ -665,7 +664,6 @@ CommonUtil::SetTabHeaderStyle(Tizen::Ui::Controls::Header& pHeader)
                        pTabHeaderItem.Construct(IDA_HEADER_BUTTON_SONG + iCount);
                        pTabHeaderItem.SetText(ResourceManager::GetString(TabNameId[iCount]));
 
-//                     CommonUtil::SetBackgroundBitmapHeaderItem(pTabHeaderItem, null, null, null, null);
                        pHeader.AddItem(pTabHeaderItem);
                        headItemChecked++;
                }
@@ -686,18 +684,11 @@ CommonUtil::SetEditHeaderStyle(Tizen::Ui::Controls::Header& pHeader, const Tizen
        ButtonItem buttonItem;
        buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, actionId);
 
-       Bitmap* checkedIcon = null;
-       if (isChecked == true)
-       {
-               checkedIcon =  ResourceManager::GetBitmapN(L"00_check_checking.png");
-       }
+       CommonUtil::SetIconButtonItem(buttonItem, ResourceManager::GetBitmapN(L"00_icon_select_all_web.png"),
+                                                                                         ResourceManager::GetBitmapN(L"00_icon_select_all_press_web.png"),
+                                                                                         ResourceManager::GetBitmapN(L"00_icon_select_all_dim_web.png"));
 
-       CommonUtil::SetIconButtonItem(buttonItem, checkedIcon, checkedIcon, null);
-       CommonUtil::SetBackgroundBitmapButtonItem(buttonItem, ResourceManager::GetBitmapN(L"00_check_bg.png"),
-                       ResourceManager::GetBitmapN(L"00_check_bg_press.png"), ResourceManager::GetBitmapN(L"00_check_bg_dim.png"));
        pHeader.SetButton(BUTTON_POSITION_RIGHT, buttonItem);
-       delete checkedIcon;
-
        pHeader.SetTitleTextColor(COLOR_HEADER_TITLE_TEXT);
        AppLogDebug("EXIT");
 }
@@ -793,10 +784,8 @@ CommonUtil::SetButtonItemCheckedIcon(Tizen::Ui::Controls::Header& header)
        delete pBgDisabled;
        delete pIconChecked;
        AppLogDebug("EXIT");
-
-       AppLogDebug("EXIT");
 }
-//
+
 //void
 //CommonUtil::SetButtonItemIcon(Tizen::Ui::Controls::ButtonItem& buttonItem, Tizen::Graphics::Bitmap* pIconNormal
 //                                                                                                                                                                                             , Tizen::Graphics::Bitmap* pIconPressed, Tizen::Graphics::Bitmap* pIconDisabled)
@@ -807,7 +796,7 @@ CommonUtil::SetButtonItemCheckedIcon(Tizen::Ui::Controls::Header& header)
 //     buttonItem.SetIcon(BUTTON_ITEM_STATUS_DISABLED, pIconDisabled);
 //     AppLogDebug("EXIT");
 //}
-//
+
 //void
 //CommonUtil::SetButtonItemBackgroundBitmap(Tizen::Ui::Controls::ButtonItem& buttonItem, Tizen::Graphics::Bitmap* pIconNormal
 //                                                                                                                     , Tizen::Graphics::Bitmap* pIconPressed, Tizen::Graphics::Bitmap* pIconDisabled)
@@ -818,7 +807,7 @@ CommonUtil::SetButtonItemCheckedIcon(Tizen::Ui::Controls::Header& header)
 //     buttonItem.SetBackgroundBitmap(BUTTON_ITEM_STATUS_DISABLED, pIconDisabled);
 //     AppLogDebug("EXIT");
 //}
-//
+
 //void
 //CommonUtil::SetButtonItemBackgroundBitmap(Tizen::Ui::Controls::HeaderItem& headerItem, Tizen::Graphics::Bitmap* pIconNormal
 //                                                                                                                     , Tizen::Graphics::Bitmap* pIconPressed, Tizen::Graphics::Bitmap* pIconDisabled, Tizen::Graphics::Bitmap* pIconSelected)
@@ -864,7 +853,7 @@ Tizen::Ui::Controls::TableViewContextItem*
 CommonUtil::CreateTableViewContextItemN(Tizen::Ui::IActionEventListener& listener, int itemWidth, FlickMenuStyle menuStyle)
 {
        AppLogDebug("ENTER");
-       Panel* pItem  = CommonUtil::CreateFlickMenuN(listener, menuStyle);
+       Panel* pItem = CommonUtil::CreateFlickMenuN(listener, menuStyle);
        if (pItem == null)
        {
                AppLogDebug("CommonUtil::CreateSweepMenuItemN failed");
@@ -1012,8 +1001,8 @@ CommonUtil::CreateContextMenuN(const Tizen::Ui::Control& source, Tizen::Ui::IAct
        pContextMenu->AddActionEventListener(listener);
        pContextMenu->SetAnchorPosition(itemPoint);
        pContextMenu->SetShowState(true);
-       AppLogDebug("EXIT");
 
+       AppLogDebug("EXIT");
        return pContextMenu;
 }
 
@@ -1098,11 +1087,9 @@ CommonUtil::AddContextMenuItem(Tizen::Ui::Controls::ContextMenu& contextMenu, un
 //             IDA_CONTEXT_MENU_ITEM_GO_TO_LIBARY
                contextMenu.AddItem(L"Go to Library", IDA_CONTEXT_MENU_ITEM_GO_TO_LIBARY);//NEED STRING
        }
-
        AppLogDebug("EXIT");
 }
 
-
 bool
 CommonUtil::IsVaildContextMenuItemActionId(int actionId)
 {
@@ -2073,4 +2060,4 @@ CommonUtil::SetHighDepthToEllipsisPath(const Tizen::Base::String& fullFilePath)
 
        AppLogDebug("EXIT");
        return folderPath;
-}
+}
\ No newline at end of file

diff --git a/src/MpComposerContentListForm.cpp b/src/MpComposerContentListForm.cpp
index fa9beb5..e79935d 100644 (file)
--- a/src/MpComposerContentListForm.cpp
+++ b/src/MpComposerContentListForm.cpp
@@ -49,6 +49,7 @@ static const Tizen::Graphics::Rectangle RECT_COMPOSER_ITEM_ARTIST_NAME (144, 66,
 static const Tizen::Graphics::Rectangle RECT_COMPOSER_EDIT_ITEM_TITLE_NAME (144, 8, (300 - X_OFFSET_EDIT_STYLE_TABLE_VIEW), 66);
 static const Tizen::Graphics::Rectangle RECT_COMPOSER_EDIT_ITEM_TIME ((444 - X_OFFSET_EDIT_STYLE_TABLE_VIEW), 8, 260, 66);
 static const Tizen::Graphics::Rectangle RECT_COMPOSER_EDIT_ITEM_ARTIST_NAME (144, 66, (560 - X_OFFSET_EDIT_STYLE_TABLE_VIEW), 46);
+
 #if 0
 ComposerContentListForm::ComposerContentListForm(void)
        : ContentListForm::ContentListForm()
@@ -915,4 +916,4 @@ ComposerContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableVie
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
 }
-#endif
+#endif
\ No newline at end of file

diff --git a/src/MpContentDetailForm.cpp b/src/MpContentDetailForm.cpp
index e957d51..6b8f724 100644 (file)
--- a/src/MpContentDetailForm.cpp
+++ b/src/MpContentDetailForm.cpp
@@ -94,29 +94,29 @@ ContentDetailForm::OnInitializing(void)
        Label* pSize = static_cast<Label*>(GetControl(IDC_SIZE_DATA_LABEL));
        contentSize = pAudioInfo->GetContentSize();
 
-       if ( contentSize >= SCALE_MBYTE)
+       if (contentSize >= SCALE_MBYTE)
        {
-               int megaByte = ( contentSize / SCALE_MBYTE);
-               int killoByte = (((( contentSize % SCALE_MBYTE) / SCALE_KBYTE ) * DECIMAL_ROUNDING) / SCALE_KBYTE);
+               int megaByte = (contentSize / SCALE_MBYTE);
+               int killoByte = ((((contentSize % SCALE_MBYTE) / SCALE_KBYTE ) * DECIMAL_ROUNDING) / SCALE_KBYTE);
 
-               stringContentSize.Format(256,L"%d.%dMB", megaByte, killoByte);
+               stringContentSize.Format(256, L"%d.%dMB", megaByte, killoByte);
        }
-       else if ( contentSize >= SCALE_KBYTE)
+       else if (contentSize >= SCALE_KBYTE)
        {
-               int killoByte = ( contentSize / SCALE_KBYTE);
-               int bytes = ((( contentSize % SCALE_KBYTE) * DECIMAL_ROUNDING) / SCALE_KBYTE);
-               stringContentSize.Format(256,L"%d.%dKB", killoByte, bytes);
+               int killoByte = (contentSize / SCALE_KBYTE);
+               int bytes = (((contentSize % SCALE_KBYTE) * DECIMAL_ROUNDING) / SCALE_KBYTE);
+               stringContentSize.Format(256, L"%d.%dKB", killoByte, bytes);
        }
        else
        {
-               stringContentSize.Format(256,L"%dB", contentSize);
+               stringContentSize.Format(256, L"%dB", contentSize);
        }
        pSize->SetText(stringContentSize);
 
        bool isDrmProtected = false;
        isDrmProtected = pAudioInfo->IsDrmProtected();
        Label* pForwarding = static_cast<Label*>(GetControl(IDC_FORWARDING_DATA_LABEL));
-       if ( isDrmProtected == true)
+       if (isDrmProtected == true)
        {
                pForwarding->SetText(ResourceManager::GetString(L"IDS_MUSIC_BODY_IMPOSSIBLE"));
        }
@@ -155,6 +155,8 @@ ContentDetailForm::OnInitializing(void)
        Label* pLocation = static_cast<Label*>(GetControl(IDC_LOCATION_DATA_LABEL));
        pLocation->SetText(stringContentPath);
        Invalidate(true);
+
+       AppLogDebug("EXIT");
        return r;
 }
 
@@ -204,4 +206,4 @@ ContentDetailForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 
        pSceneManager->GoBackward(BackwardSceneTransition());
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file

diff --git a/src/MpContentEditPanel.cpp b/src/MpContentEditPanel.cpp
index 00fabd5..2e02143 100644 (file)
--- a/src/MpContentEditPanel.cpp
+++ b/src/MpContentEditPanel.cpp
@@ -175,4 +175,4 @@ ContentEditPanel::SetContentEditHeader(void)
        CommonUtil::SetSimpleTitleStyle(*GetHeader(), L"EDIT");  //NEED String\r
        CommonUtil::SetButtonItemUnCheckedIcon(*GetParentHeader());\r
        AppLogDebug("EXIT");\r
-}\r
+}
\ No newline at end of file

diff --git a/src/MpContentListForm.cpp b/src/MpContentListForm.cpp
index 5adb3f6..c848e4c 100644 (file)
--- a/src/MpContentListForm.cpp
+++ b/src/MpContentListForm.cpp
@@ -48,15 +48,15 @@ ContentListForm::ContentListForm(void)
        , __pContextMenu(null)
        , __pCommonUtilPopupHandler(null)
        , __pNoContentLabel(null)
-       ,__pAdditionalInformationRegisterBar(null)
-       ,__pItemSelectedBalloonPopup(null)
+       , __pAdditionalInformationRegisterBar(null)
+       , __pItemSelectedBalloonPopup(null)
        , __pPlayListPickerPopup(null)
        , __pSharePopup(null)
        , __contentListScreenMode(CONTENT_LIST_SCREEN_MODE_NORMAL)
        , __itemIndex(-1)
        , __checkedItemCount(0)
        , __additionlInformationRegisterBarHeight(0)
-
+       , __allSelectToggle(0)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -234,7 +234,7 @@ ContentListForm::OnTableViewItemReordered(Tizen::Ui::Controls::TableView& tableV
 }
 
 void
-ContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId,        Tizen::Base::Collection::IList* pArgs)
+ContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
        GetHeader()->AddActionEventListener(*this);
@@ -256,15 +256,10 @@ ContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionI
        AppLogDebug("ENTER");
        switch (actionId)
        {
-       case IDA_HEADER_BUTTION_CHECK_BOX_UNCHECKED_ICON:
-               {
-                       ToggleAllSelectedItemButton(false);
-               }
-               break;
-
-       case IDA_HEADER_BUTTION_CHECK_BOX_CHECKED_ICON:
+       case IDA_HEADER_ALL_CHECK_BUTTON:
                {
-                       ToggleAllSelectedItemButton(true);
+                       __allSelectToggle = __allSelectToggle ? false : true;
+                       ToggleItemCheckedAll(__allSelectToggle);
                }
                break;
 
@@ -416,7 +411,8 @@ ContentListForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collecti
        {
                if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
                {
-                       ToggleAllSelectedItemButton(false);
+                       ToggleItemCheckedAll(false);
+                       __allSelectToggle = false;
                }
                DestroyPlayListPickerPopup();
        }
@@ -538,6 +534,8 @@ ContentListForm::UpdateContentListScreenState(void)
                SetShowStateNoContent(true);
                SetShowStateItemSelectedBalloonPopup(false);
                SetShowStateAdditionalInformationRegisterBar(false);
+               GetHeader()->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
+               GetHeader()->Invalidate(true);
                AppLogDebug("EXIT");
                return;
        }
@@ -568,7 +566,7 @@ ContentListForm::CreateContextMenuN(const Tizen::Ui::Control& source)
        {
                return E_SUCCESS;
        }
-
+       AppLogDebug("EXIT");
        return E_FAILURE;
 }
 
@@ -642,24 +640,24 @@ ContentListForm::ToggleContentListScreenMode(ContentListScreenMode screenMode)
        {
                if (screenMode == CONTENT_LIST_SCREEN_MODE_EDITOR)
                {
-                       GetHeader()->SetTitleText(L"EDIT"); //NEED String
+                       CommonUtil::SetEditHeaderStyle(*GetHeader(), L"EDIT", IDA_HEADER_ALL_CHECK_BUTTON, false);
                        CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_ADDTO_DELETE_ADD);
                }
                else if (screenMode == CONTENT_LIST_SCREEN_MODE_SHARE_VIA)
                {
-                       GetHeader()->SetTitleText(L"Share via"); //NEED String
+                       CommonUtil::SetEditHeaderStyle(*GetHeader(), L"Share via", IDA_HEADER_ALL_CHECK_BUTTON, false);
                        CommonUtil::SetBackButtonStyleFooter(*GetFooter(), STYLE_SHARE_ADD);
                }
 
                __checkedItemCount = INIT_VALUE;
                CommonUtil::SetItemCheckedAll(false, *__pContentTableView);
-               CommonUtil::SetButtonItemUnCheckedIcon(*GetHeader());
                CommonUtil::SetTextItemSelectedBalloonPopup(*__pItemSelectedBalloonPopup, __checkedItemCount);
                CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
        }
 
        UpdateContentListScreenState();
        __pContentTableView->UpdateTableView();
+
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -703,20 +701,17 @@ ContentListForm::GetActivatedContextItem(void)
 }
 
 void
-ContentListForm::ToggleAllSelectedItemButton(bool isChecked)
+ContentListForm::ToggleItemCheckedAll(bool isChecked)
 {
        AppLogDebug("ENTER");
        if (isChecked == true)
        {
-               CommonUtil::SetButtonItemCheckedIcon(*GetHeader());
                __checkedItemCount =  __pContentTableView->GetItemCount();
        }
        else
        {
-               CommonUtil::SetButtonItemUnCheckedIcon(*GetHeader());
                __checkedItemCount = INIT_VALUE;
        }
-
        CommonUtil::SetItemCheckedAll(isChecked, *__pContentTableView);
        CommonUtil::SetFooterItemEnabled(*GetFooter(), isChecked);
        CommonUtil::SetTextItemSelectedBalloonPopup(*__pItemSelectedBalloonPopup, __checkedItemCount);
@@ -729,16 +724,12 @@ ContentListForm::TableviewSelectedItemStateChanged(Tizen::Ui::Controls::TableVie
        AppLogDebug("ENTER");
        if (status == TABLE_VIEW_ITEM_STATUS_UNCHECKED)
        {
-               if (tableView.GetItemCount() == __checkedItemCount)
+               __allSelectToggle = false;
+               __checkedItemCount--;
+               if (__checkedItemCount == INIT_VALUE)
                {
-                       CommonUtil::SetButtonItemUnCheckedIcon(*GetHeader());
+                       CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
                }
-
-               __checkedItemCount--;
-                if (__checkedItemCount == INIT_VALUE)
-                {
-                               CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
-                }
        }
        else if (status == TABLE_VIEW_ITEM_STATUS_CHECKED)
        {
@@ -750,7 +741,7 @@ ContentListForm::TableviewSelectedItemStateChanged(Tizen::Ui::Controls::TableVie
                __checkedItemCount++;
                if (tableView.GetItemCount() == __checkedItemCount)
                {
-                       CommonUtil::SetButtonItemCheckedIcon(*GetHeader());
+                       __allSelectToggle = true;
                }
        }
 
@@ -775,7 +766,7 @@ ContentListForm::RemoveCheckedTableviewItem(void)
        }
 
        __checkedItemCount = INIT_VALUE;
-       CommonUtil::SetButtonItemUnCheckedIcon(*GetHeader());
+       __allSelectToggle = false;
        CommonUtil::SetTextItemSelectedBalloonPopup(*__pItemSelectedBalloonPopup, __checkedItemCount);
        CommonUtil::SetFooterItemEnabled(*GetFooter(), false);
        AppLogDebug("EXIT");
@@ -879,7 +870,8 @@ ContentListForm::SetCheckedTableviewItemToShareVia(void)
        __pSharePopup->SetShowState(true);
        __pSharePopup->Show();
 
-       ToggleAllSelectedItemButton(false);
+       ToggleItemCheckedAll(false);
+       __allSelectToggle = false;
 
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -919,6 +911,7 @@ ContentListForm::SetActivatedContextItemToPlaylist(void)
 
        __pPlayListPickerPopup->SetShowState(true);
        __pPlayListPickerPopup->Show();
+
        AppLogDebug("EXIT");
        return E_SUCCESS;
-}
+}
\ No newline at end of file

diff --git a/src/MpFolderContentListForm.cpp b/src/MpFolderContentListForm.cpp
index 9f9265c..0980086 100644 (file)
--- a/src/MpFolderContentListForm.cpp
+++ b/src/MpFolderContentListForm.cpp
@@ -441,6 +441,7 @@ FolderContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& p
        parent.SetIndividualSelectionEnabled(pTableViewItem, true);
 
        CommonUtil::SetLayoutFitToContainer(parent, *pTableViewItem);
+
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -577,7 +578,7 @@ void
 FolderContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-       Panel* pItemPanel =  null;
+       Panel* pItemPanel = null;
        if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
        {
                pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENT_LIST_FOLDER_EDITOR_ITEM_PANEL));
@@ -608,4 +609,4 @@ FolderContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewI
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file

diff --git a/src/MpFolderListEditorPanel.cpp b/src/MpFolderListEditorPanel.cpp
index 0931ead..cf3fc47 100644 (file)
--- a/src/MpFolderListEditorPanel.cpp
+++ b/src/MpFolderListEditorPanel.cpp
@@ -36,7 +36,7 @@ FolderListEditorPanel::FolderListEditorPanel(void)
        : ContentEditPanel::ContentEditPanel()
        , __checkedItemCount(0)
        , __pPlayListPickerPopup(null)
-       ,__pPresentationModel(null)
+       , __pPresentationModel(null)
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
@@ -75,8 +75,7 @@ FolderListEditorPanel::OnTerminating(void)
 void
 FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 {
-//
-       AppLogDebug("ENTER %d",actionId);
+       AppLogDebug("ENTER %d", actionId);
        Form* pForm = dynamic_cast<Form*>(GetParent());
        Footer* pFooter = pForm->GetFooter();
 
@@ -94,7 +93,6 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                                SetCheckedCountBalloonPopup(__checkedItemCount);
-                               SetUnCheckedIconAllCheckButton();
                                CommonUtil::SetFooterItemEnabled(*pFooter, false);
                                break;
                        }
@@ -102,7 +100,6 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetCheckedIconAllCheckButton();
                        CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
@@ -152,16 +149,15 @@ FolderListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int a
                        __pPresentationModel->UpdateFolderPathList();
                        if (__pPresentationModel->GetAllFolderCount() != 0)
                        {
-
+                               // Empty statement
                        }
                        else
                        {
                                SetNoContentSongs(true);
+                               SetDisableIconAllCheckButton();
                        }
                        __checkedItemCount = INIT_VALUE;
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetUnCheckedIconAllCheckButton();
-
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                }
                break;
@@ -208,7 +204,6 @@ FolderListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
                delete pArgs;
        }
        AppLogDebug("EXIT");
-
 }
 
 void
@@ -375,15 +370,6 @@ FolderListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
                CommonUtil::SetFooterItemEnabled(*pFooter, false);
        }
 
-       if (__checkedItemCount == __pPresentationModel->GetAllFolderCount())
-       {
-               SetCheckedIconAllCheckButton();
-       }
-       else
-       {
-               SetUnCheckedIconAllCheckButton();
-       }
-
        SetCheckedCountBalloonPopup(__checkedItemCount);
        Invalidate(true);
        AppLogDebug("EXIT");
@@ -489,26 +475,4 @@ FolderListEditorPanel::SetDisableIconAllCheckButton(void)
        pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
-}
-
-void
-FolderListEditorPanel::SetCheckedIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       String titleText(L"EDIT");
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, true);
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-FolderListEditorPanel::SetUnCheckedIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       String titleText(L"EDIT");
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
+}
\ No newline at end of file

diff --git a/src/MpFolderListPanel.cpp b/src/MpFolderListPanel.cpp
index 909ec0d..7c93b17 100644 (file)
--- a/src/MpFolderListPanel.cpp
+++ b/src/MpFolderListPanel.cpp
@@ -470,4 +470,4 @@ FolderListPanel::CreatePlayallAddtoContextItem(void)
        CommonUtil::SetLayoutFitToContainer(*pTableViewContextItem, *pSweepQuickMenu);
        AppLogDebug("EXIT");
        return pTableViewContextItem;
-}
+}
\ No newline at end of file

diff --git a/src/MpFolderListPresentationModel.cpp b/src/MpFolderListPresentationModel.cpp
index 22b8d7d..a81294d 100644 (file)
--- a/src/MpFolderListPresentationModel.cpp
+++ b/src/MpFolderListPresentationModel.cpp
@@ -283,8 +283,6 @@ FolderListPresentationModel::RemoveFolderList(int folderIndex)
        AppLogDebug("ENTER");
        IList* pRemoveFolderList = null;
        int totalCount = 0;
-       ContentInformation* pContentInformation = null;
-       ContentSearchResult* pResult = null;
 
        ContentManager contentManager;
        contentManager.Construct();
@@ -330,7 +328,6 @@ FolderListPresentationModel::RemoveFolderList(int folderIndex)
 
        pRemoveFolderList->RemoveAll(true);
        delete pRemoveFolderList;
-
        AppLogDebug("EXIT");
 }
 

diff --git a/src/MpFormFactory.cpp b/src/MpFormFactory.cpp
index 1c5a957..aa49b98 100644 (file)
--- a/src/MpFormFactory.cpp
+++ b/src/MpFormFactory.cpp
@@ -293,4 +293,4 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
        }
        AppLogDebug("EXIT");
        return pNewForm;
-}
+}
\ No newline at end of file

diff --git a/src/MpGenreContentListForm.cpp b/src/MpGenreContentListForm.cpp
index e4fa44e..796ebe0 100644 (file)
--- a/src/MpGenreContentListForm.cpp
+++ b/src/MpGenreContentListForm.cpp
@@ -49,6 +49,7 @@ static const Tizen::Graphics::Rectangle RECT_GENRE_ITEM_ARTIST_NAME (144, 66, 56
 static const Tizen::Graphics::Rectangle RECT_GENRE_EDIT_ITEM_TITLE_NAME (144, 8, (300 - X_OFFSET_EDIT_STYLE_TABLE_VIEW), 66);
 static const Tizen::Graphics::Rectangle RECT_GENRE_EDIT_ITEM_TIME ((444 - X_OFFSET_EDIT_STYLE_TABLE_VIEW), 8, 260, 66);
 static const Tizen::Graphics::Rectangle RECT_GENRE_EDIT_ITEM_ARTIST_NAME (144, 66, (560 - X_OFFSET_EDIT_STYLE_TABLE_VIEW), 46);
+
 #if 0
 GenreContentListForm::GenreContentListForm(void)
        : ContentListForm::ContentListForm()
@@ -913,4 +914,4 @@ GenreContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewIt
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
 }
-#endif
+#endif
\ No newline at end of file

diff --git a/src/MpMiniPlayer.cpp b/src/MpMiniPlayer.cpp
index 0efe11c..54d0750 100644 (file)
--- a/src/MpMiniPlayer.cpp
+++ b/src/MpMiniPlayer.cpp
@@ -133,7 +133,6 @@ MiniPlayer::Construct(void)
        __pProgressBar->SetEnabled(false);\r
        __pProgressBar->SetValue(__pPresentationModel->GetPlayPosition());\r
 \r
-\r
        Bitmap* pBackNormalBitmap = ResourceManager::GetBitmapN(L"00_icon_Back_02_web.png");\r
        Bitmap* pBackPressBitmap = ResourceManager::GetBitmapN(L"00_icon_Back_02_press_web.png");\r
 \r
@@ -156,6 +155,7 @@ MiniPlayer::Construct(void)
        delete pMoreContextPressBitmap;\r
 \r
        Invalidate(true);\r
+\r
        AppLogDebug("EXIT");\r
        return E_SUCCESS;\r
 }\r

diff --git a/src/MpMusicPlayerForm.cpp b/src/MpMusicPlayerForm.cpp
index 3df4a6c..3a1b432 100644 (file)
--- a/src/MpMusicPlayerForm.cpp
+++ b/src/MpMusicPlayerForm.cpp
@@ -348,7 +348,7 @@ PlayerForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::Or
 
        Rectangle clientBounds = GetClientAreaBounds();
        if (orientationStatus == ORIENTATION_STATUS_LANDSCAPE
-                       || orientationStatus == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
+               || orientationStatus == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
        {
                if (__pVolumePanel != null)
                {

diff --git a/src/MpPlaylistContentListForm.cpp b/src/MpPlaylistContentListForm.cpp
index 0fdad4c..4fb2cac 100644 (file)
--- a/src/MpPlaylistContentListForm.cpp
+++ b/src/MpPlaylistContentListForm.cpp
@@ -169,7 +169,6 @@ Tizen::Ui::Controls::TableViewItem*
 PlaylistContentListForm::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-
        RelativeLayout layout;
        layout.Construct();
 
@@ -339,6 +338,7 @@ PlaylistContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem&
 
        parent.AddControl(*pTableViewItem);
        CommonUtil::SetLayoutFitToContainer(parent, *pTableViewItem);
+
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -429,7 +429,7 @@ void
 PlaylistContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-       Panel* pItemPanel =  null;
+       Panel* pItemPanel = null;
        if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
        {
                pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL));
@@ -461,4 +461,4 @@ PlaylistContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableVie
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
-}
+}
\ No newline at end of file

diff --git a/src/MpPlaylistListEditorPanel.cpp b/src/MpPlaylistListEditorPanel.cpp
index 117d5a9..a9113c0 100644 (file)
--- a/src/MpPlaylistListEditorPanel.cpp
+++ b/src/MpPlaylistListEditorPanel.cpp
@@ -96,7 +96,6 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                                __checkedItemCount = INIT_VALUE;
                                CommonUtil::SetAllCheckState(false, *__pContentTableView, totalCount);
                                SetCheckedCountBalloonPopup(__checkedItemCount);
-                               SetUnCheckedIconAllCheckButton();
                                CommonUtil::SetFooterItemEnabled(*pFooter, false);
                                break;
                        }
@@ -104,7 +103,6 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
                        __checkedItemCount = totalCount;
                        CommonUtil::SetAllCheckState(true, *__pContentTableView, totalCount);
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetCheckedIconAllCheckButton();
                        CommonUtil::SetFooterItemEnabled(*pFooter, true);
                }
                break;
@@ -142,16 +140,15 @@ PlaylistListEditorPanel::OnActionPerformed(const Tizen::Ui::Control& source, int
 
                        if (__pPresentationModel->GetAllPlayListCount() != INIT_VALUE)
                        {
-                               //__pSelectAllCheckedButton->SetEnabled(true);
+                               // Empty statement
                        }
                        else
                        {
                                SetNoContentSongs(true);
+                               SetDisableIconAllCheckButton();
                        }
                        __checkedItemCount = INIT_VALUE;
                        SetCheckedCountBalloonPopup(__checkedItemCount);
-                       SetUnCheckedIconAllCheckButton();
-
                        CommonUtil::SetFooterItemEnabled(*pFooter, false);
                }
                break;
@@ -397,15 +394,6 @@ PlaylistListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableV
                CommonUtil::SetFooterItemEnabled(*pFooter, false);
        }
 
-       if (__checkedItemCount == __pPresentationModel->GetAllPlayListCount())
-       {
-               SetCheckedIconAllCheckButton();
-       }
-       else
-       {
-               SetUnCheckedIconAllCheckButton();
-       }
-
        SetCheckedCountBalloonPopup(__checkedItemCount);
        Invalidate(true);
        AppLogDebug("EXIT");
@@ -457,23 +445,11 @@ PlaylistListEditorPanel::SetTabHeaderStyle(void)
 }
 
 void
-PlaylistListEditorPanel::SetCheckedIconAllCheckButton(void)
-{
-       AppLogDebug("ENTER");
-       Header* pHeader = GetParentHeader();
-       String titleText(L"EDIT");
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, true);
-       pHeader->Invalidate(true);
-       AppLogDebug("EXIT");
-}
-
-void
-PlaylistListEditorPanel::SetUnCheckedIconAllCheckButton(void)
+PlaylistListEditorPanel::SetDisableIconAllCheckButton(void)
 {
        AppLogDebug("ENTER");
        Header* pHeader = GetParentHeader();
-       String titleText(L"EDIT");
-       CommonUtil::SetEditHeaderStyle(*pHeader, titleText, IDA_HEADER_ALL_CHECK_BUTTON, false);
+       pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
 }

diff --git a/src/MpTypes.cpp b/src/MpTypes.cpp
index 5340e45..af4a2e2 100644 (file)
--- a/src/MpTypes.cpp
+++ b/src/MpTypes.cpp
@@ -141,11 +141,11 @@ const wchar_t* IDC_TITLE_LABEL = L"IDC_TITLE_LABEL";
 //__XML_IDC_
 
 //IMAGE
-const wchar_t*  IDB_STORAGE_SDCARD = L"T02_folder_storage_icon_memory.png";
-const wchar_t*  IDB_STORAGE_PHONE = L"T02_folder_storage_icon_inner_memory.png";
+const wchar_t* IDB_STORAGE_SDCARD = L"T02_folder_storage_icon_memory.png";
+const wchar_t* IDB_STORAGE_PHONE = L"T02_folder_storage_icon_inner_memory.png";
 const wchar_t* IDB_STORAGE_EXTERNAL = L"T02_folder_storage_icon_memory.png";
 const wchar_t* IDB_NO_CONTENTS = L"T02_nocomposers.png";
-//
+
 //COLOR
 const unsigned int COLOR_HEADER_TITLE_TEXT = Color32<59, 115, 182>::Value;
 const unsigned int COLOR_HEADER_DESCRIPTION_TEXT = Color32<155, 154, 150>::Value;
@@ -153,7 +153,7 @@ const unsigned int COLOR_ITEM_SUB_TEXT = Color32<128, 128, 128>::Value;
 
 const wchar_t* IDB_MUSIC_LINE_CONTENT_FORM = L"T02_music_line.png";
 //COMMON
-const Tizen::Base::String IDS_SEPARATOR_SLASH =  L"/";
+const Tizen::Base::String IDS_SEPARATOR_SLASH = L"/";
 const Tizen::Base::String IDS_STORAGE_PHONE_PATH = Environment::GetMediaPath() + L"Sounds/";
 const Tizen::Base::String IDS_STORAGE_SDCARD_PATH = Environment::GetExternalStoragePath();
-const Tizen::Base::String IDS_STORAGE_EXTERNAL_PATH = Environment::GetMediaPath();
+const Tizen::Base::String IDS_STORAGE_EXTERNAL_PATH = Environment::GetMediaPath();
\ No newline at end of file

diff --git a/src/MpUserPlaylistContentListForm.cpp b/src/MpUserPlaylistContentListForm.cpp
index 16487c5..1edacb0 100644 (file)
--- a/src/MpUserPlaylistContentListForm.cpp
+++ b/src/MpUserPlaylistContentListForm.cpp
@@ -173,7 +173,7 @@ UserPlaylistContentListForm::CreateItem(const int itemIndex, int itemWidth)
        layout.Construct();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       TableViewAnnexStyle tableViewAnnexStyle  = TABLE_VIEW_ANNEX_STYLE_NORMAL;
+       TableViewAnnexStyle tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
        {
                tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_MARK;
@@ -218,7 +218,7 @@ result
 UserPlaylistContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& parent, const ContentInformation& contentInfo)
 {
        AppLogDebug("ENTER");
-       Panel* pTableViewItem =  new (std::nothrow) Panel();
+       Panel* pTableViewItem = new (std::nothrow) Panel();
        if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
        {
                if (IsFailed(pTableViewItem->Construct(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL)))
@@ -243,6 +243,7 @@ UserPlaylistContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewI
 
        parent.AddControl(*pTableViewItem);
        CommonUtil::SetLayoutFitToContainer(parent, *pTableViewItem);
+
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -340,7 +341,7 @@ void
 UserPlaylistContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
-       Panel* pItemPanel =  null;
+       Panel* pItemPanel = null;
        if (GetContentListScreenMode() != CONTENT_LIST_SCREEN_MODE_NORMAL)
        {
                pItemPanel = static_cast<Panel*>(pItem->GetControl(IDL_CONTENTS_LIBARY_EDITOR_ITEM_PANEL));
@@ -371,4 +372,5 @@ UserPlaylistContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::Tabl
        delete __pThumbnail;
        __pThumbnail = null;
        pThumbnailLabel->Invalidate(true);
-}
+       AppLogDebug("EXIT");
+}
\ No newline at end of file

diff --git a/src/MpYearContentListForm.cpp b/src/MpYearContentListForm.cpp
index 76dd046..f52ecaf 100644 (file)
--- a/src/MpYearContentListForm.cpp
+++ b/src/MpYearContentListForm.cpp
@@ -49,6 +49,7 @@ static const Tizen::Graphics::Rectangle RECT_YEAR_ITEM_ARTIST_NAME (144, 66, 560
 static const Tizen::Graphics::Rectangle RECT_YEAR_EDIT_ITEM_TITLE_NAME (144, 8, (300 - X_OFFSET_EDIT_STYLE_TABLE_VIEW), 66);
 static const Tizen::Graphics::Rectangle RECT_YEAR_EDIT_ITEM_TIME ((444 - X_OFFSET_EDIT_STYLE_TABLE_VIEW), 8, 260, 66);
 static const Tizen::Graphics::Rectangle RECT_YEAR_EDIT_ITEM_ARTIST_NAME        (144, 66, (560 - X_OFFSET_EDIT_STYLE_TABLE_VIEW), 46);
+
 #if 0
 YearContentListForm::YearContentListForm(void)
        : ContentListForm::ContentListForm()
@@ -917,4 +918,4 @@ YearContentListForm::UpdateItem(int itemIndex, Tizen::Ui::Controls::TableViewIte
        pThumbnailLabel->Invalidate(true);
        AppLogDebug("EXIT");
 }
-#endif
+#endif
\ No newline at end of file