From 3b96930e2d3b6897a1870b3e662ac2f16fd1ce68 Mon Sep 17 00:00:00 2001 From: Himanshu Date: Thu, 24 Oct 2013 11:33:55 +0530 Subject: [PATCH] Fixed issue N_SE-55858 Change-Id: I8525673be0a687faa2ef184865303f036e691d7f Signed-off-by: Himanshu --- inc/GlAllListEditorPanel.h | 4 ++-- inc/GlAllListSelectionPanel.h | 4 ++-- inc/GlFileListEditorForm.h | 1 + src/GlAllListEditorPanel.cpp | 15 +++++++++++++++ src/GlAllListSelectionPanel.cpp | 15 +++++++++++++++ src/GlFileListEditorForm.cpp | 15 +++++++++++++-- 6 files changed, 48 insertions(+), 6 deletions(-) diff --git a/inc/GlAllListEditorPanel.h b/inc/GlAllListEditorPanel.h index e8423a7..873356f 100644 --- a/inc/GlAllListEditorPanel.h +++ b/inc/GlAllListEditorPanel.h @@ -79,8 +79,8 @@ public: virtual void OnFileOpInvalidate(enum FileActionMode actionId); virtual void OnFileOpComplete(enum FileActionMode actionId, enum FileActionCompleteRes); - virtual void OnScanDirStart(){} - virtual void OnScanDirComplete(){} + virtual void OnScanDirStart(); + virtual void OnScanDirComplete(); void ChangeOrientation(void); private: diff --git a/inc/GlAllListSelectionPanel.h b/inc/GlAllListSelectionPanel.h index 1f3cb1c..4329924 100644 --- a/inc/GlAllListSelectionPanel.h +++ b/inc/GlAllListSelectionPanel.h @@ -79,8 +79,8 @@ public: virtual void OnFileOpInvalidate(enum FileActionMode); virtual void OnFileOpComplete(enum FileActionMode, enum FileActionCompleteRes); - virtual void OnScanDirStart(){} - virtual void OnScanDirComplete(){} + virtual void OnScanDirStart(); + virtual void OnScanDirComplete(); void ChangeOrientation(void); private: diff --git a/inc/GlFileListEditorForm.h b/inc/GlFileListEditorForm.h index bcda6df..b25d965 100644 --- a/inc/GlFileListEditorForm.h +++ b/inc/GlFileListEditorForm.h @@ -58,6 +58,7 @@ public: void OnFormBackRequested(Tizen::Ui::Controls::Form& source); void SetTitleText(const Tizen::Base::String& titleText); + void SetProgressState(const bool progressState); void RefreshFolderList(void); void SetFooterButtonsState(const bool enableState); result MoveToAlbum(const Tizen::Base::String& destDirectory); diff --git a/src/GlAllListEditorPanel.cpp b/src/GlAllListEditorPanel.cpp index 381a26d..83c53e8 100644 --- a/src/GlAllListEditorPanel.cpp +++ b/src/GlAllListEditorPanel.cpp @@ -933,3 +933,18 @@ void AllListEditorPanel::CancelUpdateProgress(void) __pFileUpdateTimer = null; } } + +void +AllListEditorPanel::OnScanDirStart() +{ + AppLogDebug("ENTER"); + __pFileListEditorForm->SetProgressState(true); + AppLogDebug("EXIT"); +} +void +AllListEditorPanel::OnScanDirComplete() +{ + AppLogDebug("ENTER"); + __pFileListEditorForm->SetProgressState(false); + AppLogDebug("EXIT"); +} diff --git a/src/GlAllListSelectionPanel.cpp b/src/GlAllListSelectionPanel.cpp index 6921cc9..51c2f45 100644 --- a/src/GlAllListSelectionPanel.cpp +++ b/src/GlAllListSelectionPanel.cpp @@ -791,3 +791,18 @@ void AllListSelectionPanel::CancelUpdateProgress(void) __pFileUpdateTimer = null; } } + +void +AllListSelectionPanel::OnScanDirStart() +{ + AppLogDebug("ENTER"); + __pFileListEditorForm->SetProgressState(true); + AppLogDebug("EXIT"); +} +void +AllListSelectionPanel::OnScanDirComplete() +{ + AppLogDebug("ENTER"); + __pFileListEditorForm->SetProgressState(false); + AppLogDebug("EXIT"); +} diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp index 39929ca..6475638 100644 --- a/src/GlFileListEditorForm.cpp +++ b/src/GlFileListEditorForm.cpp @@ -119,6 +119,7 @@ FileListEditorForm::Initialize(void) void FileListEditorForm::ShowAnimation() { + AppLogDebug("ENTER"); Rectangle clientRect= GetClientAreaBounds(); Rectangle rect(0, 0, clientRect.width, clientRect.height); _pProgressAnim = new (std::nothrow) ProgressAnimation; @@ -129,11 +130,13 @@ FileListEditorForm::ShowAnimation() _pProgressAnim->AnimationStart(); _pProgressAnim->Draw(); _overlayMsg = true; + AppLogDebug("EXIT"); } void FileListEditorForm::StopAnimation(void) { + AppLogDebug("ENTER"); if (_pProgressAnim) { _pProgressAnim->AnimationStop(); @@ -143,6 +146,7 @@ FileListEditorForm::StopAnimation(void) _pProgressAnim = null; _overlayMsg = false; } + AppLogDebug("EXIT"); } result @@ -844,7 +848,7 @@ FileListEditorForm::OnScanDirStart() GetHeader()->SetButtonEnabled(BUTTON_POSITION_RIGHT, false); __isScanProgress = true; Invalidate(true); - AppLogDebug("ENTER"); + AppLogDebug("EXIT"); } void FileListEditorForm::OnScanDirComplete() @@ -853,7 +857,7 @@ FileListEditorForm::OnScanDirComplete() GetHeader()->SetButtonEnabled(BUTTON_POSITION_RIGHT, true); __isScanProgress = false; Invalidate(true); - AppLogDebug("ENTER"); + AppLogDebug("EXIT"); } @@ -1077,6 +1081,7 @@ FileListEditorForm::OnFormBackRequested(Form& source) if(__isScanProgress) { + AppLog (" Skip the call"); return; } @@ -1419,3 +1424,9 @@ FileListEditorForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source) __pOptionMenu->Show(); } } + +void +FileListEditorForm::SetProgressState(const bool progressState) +{ + __isScanProgress = progressState; +} -- 2.7.4