From f06c4e1ba59b56dec7c7e7d83e49dd8e376e32e1 Mon Sep 17 00:00:00 2001 From: Ajay Kumar Nayak Date: Mon, 28 Oct 2013 19:12:14 +0530 Subject: [PATCH] Fixed jira issues : N_SE-56423, N_SE-56330, N_SE-56326 Change-Id: Iade38cd54325d58ec366067205bcf974073f121b Signed-off-by: Ajay Kumar Nayak --- ...NTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_DEFAULT.xml | 26 ++++++++++++---------- ...THUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_GIANT.xml | 6 ++--- ...OTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_HUGE.xml | 26 ++++++++++++---------- ...THUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_LARGE.xml | 26 ++++++++++++---------- ...THUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_SMALL.xml | 26 ++++++++++++---------- .../IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_DEFAULT.xml | 26 ++++++++++++---------- ...TENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_GIANT.xml | 26 ++++++++++++---------- ...NTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_HUGE.xml | 26 ++++++++++++---------- ...TENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_LARGE.xml | 26 ++++++++++++---------- ...TENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_SMALL.xml | 26 ++++++++++++---------- src/MpFolderContentListForm.cpp | 9 +------- src/MpPlaylistContentListForm.cpp | 7 +++++- src/MpPlaylistCreatorForm.cpp | 10 +++++++++ src/MpSettingForm.cpp | 17 +------------- 14 files changed, 147 insertions(+), 136 deletions(-) diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_DEFAULT.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_DEFAULT.xml index c9fef43..dfdb0b1 100644 --- a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_DEFAULT.xml +++ b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_DEFAULT.xml @@ -2,21 +2,23 @@ - + + + 720 - + - - + + - diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_GIANT.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_GIANT.xml index b4a3cbe..021ae4b 100755 --- a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_GIANT.xml +++ b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_GIANT.xml @@ -11,12 +11,12 @@ diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_HUGE.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_HUGE.xml index 82a712a..f31b456 100644 --- a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_HUGE.xml +++ b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_HUGE.xml @@ -2,21 +2,23 @@ - + + + 720 - + - - + + - diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_LARGE.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_LARGE.xml index 0e67425..0bb50ea 100644 --- a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_LARGE.xml +++ b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_LARGE.xml @@ -2,21 +2,23 @@ - + + + 720 - + - - + + - diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_SMALL.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_SMALL.xml index 763c972..7d342a3 100644 --- a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_SMALL.xml +++ b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_EDITOR_ITEM_PANEL_FONT_SIZE_SMALL.xml @@ -2,21 +2,23 @@ - + + + 720 - + - - + + - diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_DEFAULT.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_DEFAULT.xml index e374df2..e15a720 100644 --- a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_DEFAULT.xml +++ b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_DEFAULT.xml @@ -2,21 +2,23 @@ - + + + 720 - + - - + + - diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_GIANT.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_GIANT.xml index 66c3768..8e40e18 100644 --- a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_GIANT.xml +++ b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_GIANT.xml @@ -2,21 +2,23 @@ - + + + 720 - + - - + + - diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_HUGE.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_HUGE.xml index 7ad8084..b7a3c2b 100644 --- a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_HUGE.xml +++ b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_HUGE.xml @@ -2,21 +2,23 @@ - + + + 720 - + - - + + - diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_LARGE.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_LARGE.xml index bb684eb..a631d51 100644 --- a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_LARGE.xml +++ b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_LARGE.xml @@ -2,21 +2,23 @@ - + + + 720 - + - - + + - diff --git a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_SMALL.xml b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_SMALL.xml index 8b51601..610c7c2 100644 --- a/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_SMALL.xml +++ b/res/screen-size-normal/IDL_CONTENT_NOTHUMBNAIL_ITEM_PANEL_FONT_SIZE_SMALL.xml @@ -2,21 +2,23 @@ - + + + 720 - + - - + + - diff --git a/src/MpFolderContentListForm.cpp b/src/MpFolderContentListForm.cpp index 59bfc6d..0db969e 100644 --- a/src/MpFolderContentListForm.cpp +++ b/src/MpFolderContentListForm.cpp @@ -911,14 +911,7 @@ FolderContentListForm::UpdateContentList(void) if (pSceneManager->GetCurrentSceneId().Equals(IDSCN_FOLDER_CONTENT_LIST,true)) { - if (__pPresentationModel->GetAllFolderCount()) - { - pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_NONE,SCENE_DESTROY_OPTION_KEEP)); - } - else - { - GoToLibrary(); - } + pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_NONE,SCENE_DESTROY_OPTION_KEEP)); } } diff --git a/src/MpPlaylistContentListForm.cpp b/src/MpPlaylistContentListForm.cpp index 3daf7e8..f5ddf60 100644 --- a/src/MpPlaylistContentListForm.cpp +++ b/src/MpPlaylistContentListForm.cpp @@ -206,6 +206,9 @@ PlaylistContentListForm::OnActionPerformed(const Tizen::Ui::Control& source, int if (__pContentListTableView->IsItemChecked(iCount) == true) { ContentInformation* pContentInfoStruct = __pPresentationModel->GetContentInfoN(iCount); + __pContentListTableView->SetItemChecked(iCount, false); + __checkedItemCount--; + if (pContentInfoStruct == null) { return; @@ -289,6 +292,7 @@ PlaylistContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& pre if (pArgs != null && previousSceneId.Equals(IDSCN_PLAYLIST_LIST, true) == true) { __headerTitle.Clear(); + __prevSceneId.Clear(); __prevSceneId.Append(*static_cast(pArgs->GetAt(DATA_ITEM_SCENE_NAME))); __headerTitle.Append(*static_cast(pArgs->GetAt(DATA_ITEM_CONTENT_NAME))); __currentContentType = static_cast(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt(); @@ -753,10 +757,10 @@ PlaylistContentListForm::UpdateContentList(void) if (__pPresentationModel->GetContentCount() == 0) { + ToggleScreenState(SCREEN_STATE_NORMAL); SceneManager* pSceneManager = SceneManager::GetInstance(); if (pSceneManager->GetCurrentSceneId().Equals(IDSCN_PLAYLIST_CONTENT_LIST,true)) { - ToggleScreenState(SCREEN_STATE_NORMAL); AppAssert(pSceneManager); pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_NONE,SCENE_DESTROY_OPTION_KEEP)); } @@ -803,6 +807,7 @@ PlaylistContentListForm::RemoveCheckedTableviewItem(bool itemRemove) if (__pContentListTableView->IsItemChecked(iCount) == true) { __pContentListTableView->SetItemChecked(iCount, false); + __checkedItemCount--; ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(iCount); if (pContentInfo != null) { diff --git a/src/MpPlaylistCreatorForm.cpp b/src/MpPlaylistCreatorForm.cpp index b62c900..7e778d9 100644 --- a/src/MpPlaylistCreatorForm.cpp +++ b/src/MpPlaylistCreatorForm.cpp @@ -26,6 +26,7 @@ #include "MpCommonUtil.h" #include "MpPlaylistCreatorForm.h" #include "MpPlaylistEditorPresentationModel.h" +#include "MpPlaylistListPresentationModel.h" #include "MpResourceManager.h" #include "MpSceneRegister.h" #include "MpTypes.h" @@ -495,6 +496,15 @@ PlaylistCreatorForm::OnMusicContentUpdateCompleted(void) pSceneManager->DestroyScene(scenId); } } + else if ((sceneIndex == pSceneList->GetCount()-1) + && (__previousSceneId.Equals(IDSCN_PLAYLIST_CONTENT_LIST,true))) + { + PlaylistListPresentationModel* pListPresentationModel = PlaylistListPresentationModel::GetInstance(); + if (pListPresentationModel->GetContentCount() ==0) + { + pSceneManager->DestroyScene(scenId); + } + } else { pSceneManager->AddToSceneHistory(scenId); diff --git a/src/MpSettingForm.cpp b/src/MpSettingForm.cpp index 8d51613..0f846ad 100644 --- a/src/MpSettingForm.cpp +++ b/src/MpSettingForm.cpp @@ -534,22 +534,7 @@ SettingForm::OnFocusLost(const Control& source) void SettingForm::OnKeyLongPressed(const Control& source, KeyCode keyCode) { - AppLogDebug("ENTER %ls", source.GetName().GetPointer()); - if (keyCode == KEY_ENTER) - { - const TableViewGroupItem* pSourcePanel = dynamic_cast(&source); - - if (pSourcePanel != null) - { - Label* pLabel = static_cast(pSourcePanel->GetControl(IDC_LABEL_SUB_TEXT,true)); - - if (pLabel) - { - pLabel->SetTextColor(Color::GetColor(COLOR_ID_WHITE)); - pLabel->Invalidate(false); - } - } - } + AppLogDebug("ENTER"); AppLogDebug("EXIT"); } -- 2.7.4