Fixes for PLM 2452 & 1158

Change-Id: I79f66ebe2cbb2e9f9a5a62da1138dd2c6c46c933
Signed-off-by: santhosh.au <santhosh.au@samsung.com>

diff --git a/project/src/FileManagerForm.cpp b/project/src/FileManagerForm.cpp
index d58dcd7..d05e8de 100644 (file)
--- a/project/src/FileManagerForm.cpp
+++ b/project/src/FileManagerForm.cpp
@@ -449,7 +449,7 @@ FileManagerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSce
     }
     else if (currentSceneId == "ChooseExistingFeatureSetScene")
     {
-        pFooter-> SetShowState(false);
+        pFooter-> SetShowState(true);
     }
        
     __currentPath = Tizen::System::Environment::GetMediaPath();

diff --git a/project/src/UpdatePanel.cpp b/project/src/UpdatePanel.cpp
index 9a547de..c805e15 100644 (file)
--- a/project/src/UpdatePanel.cpp
+++ b/project/src/UpdatePanel.cpp
@@ -248,7 +248,15 @@ UpdatePanel::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::
                MainForm* pForm = static_cast<MainForm*>(pFrame->GetControl(IDF_FORM, true));
 
                Tizen::Base::String message;
-               message.Format(80, L"Deleted %i features.", __prevFeaturesCount - pForm->GetFeatureManager()->GetTotalNumberOfFeatures());
+
+               if(__prevFeaturesCount - pForm->GetFeatureManager()->GetTotalNumberOfFeatures() == 1)
+               {
+                       message.Format(80, L"Deleted 1 feature.");
+               }
+               else
+               {
+                       message.Format(80, L"Deleted %i features.", __prevFeaturesCount - pForm->GetFeatureManager()->GetTotalNumberOfFeatures());
+               }
 
         MessageBox msgBox;
         int res = 0;