Adapt MMC event

Change-Id: I3285500b825582b524e2c50e9c53770172253101
Signed-off-by: HyukSoon Choi <hs619.choi@samsung.com>

diff --git a/inc/GlGalleryApp.h b/inc/GlGalleryApp.h
index 8d3ca1f..fdcc035 100644 (file)
--- a/inc/GlGalleryApp.h
+++ b/inc/GlGalleryApp.h
@@ -34,6 +34,7 @@ class FileListPresentationModel;
 class GalleryApp
        : public Tizen::App::UiApp
        , public Tizen::App::IAppControlProviderEventListener
+       , public Tizen::System::IDeviceEventListener
        , public Tizen::System::ISettingEventListener
 {
 public:
@@ -58,6 +59,9 @@ public:
        virtual void OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String& operationId,
                        const Tizen::Base::String* pUriScheme, const Tizen::Base::String* pDataType,
                        const Tizen::Base::Collection::IMap* pArgs);
+
+       virtual void OnDeviceStateChanged(Tizen::System::DeviceType deviceType, const Tizen::Base::String& state);
+
        virtual void OnSettingChanged(Tizen::Base::String& key);
 
        void SetFrameEnabled(bool enabled);

diff --git a/inc/GlTypes.h b/inc/GlTypes.h
index 97778df..fd495c1 100644 (file)
--- a/inc/GlTypes.h
+++ b/inc/GlTypes.h
@@ -251,6 +251,9 @@ extern const wchar_t* IDB_LIST_EXPAND_CLOSED_PRESS;
 extern const wchar_t* IDB_LIST_EXPAND_OPENED;
 extern const wchar_t* IDB_LIST_EXPAND_OPENED_PRESS;
 
+extern const wchar_t* DEVICE_STORAGE_CARD_MOUNTED;
+extern const wchar_t* DEVICE_STORAGE_CARD_UNMOUNTED;
+
 static const unsigned int CUSTOM_COLOR_GREY = Tizen::Graphics::Color32<124,124,124>::Value;
 static const unsigned int CUSTOM_COLOR_TRANSPARENT = Tizen::Graphics::Color32<0,0,0>::Value;
 static const unsigned int CUSTOM_BACKGROUND_COLOR_LISTVIEW = Tizen::Graphics::Color32<236,240,242>::Value;

diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp
index cc4da10..4fe5fc4 100644 (file)
--- a/src/GlAlbumListEditorForm.cpp
+++ b/src/GlAlbumListEditorForm.cpp
@@ -451,7 +451,6 @@ AlbumListEditorForm::CreateItem(int index)
                        pSelectedBitmap->Construct(canvas, canvas.GetBounds());
                        pIconListview->Construct(*pBitmap, null, pSelectedBitmap);
                        delete pSelectedBitmap;
-                       pSelectedBitmap = null;
                }
        }
        else

diff --git a/src/GlGalleryApp.cpp b/src/GlGalleryApp.cpp
index db54b7c..4554054 100644 (file)
--- a/src/GlGalleryApp.cpp
+++ b/src/GlGalleryApp.cpp
@@ -127,6 +127,7 @@ GalleryApp::OnAppInitialized(void)
        pMainFrame->Construct();
        AddFrame(*pMainFrame);
 
+       DeviceManager::AddDeviceEventListener(DEVICE_TYPE_STORAGE_CARD, *this);
        SettingInfo::AddSettingEventListener(*this);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
@@ -239,6 +240,37 @@ GalleryApp::OnAppControlRequestReceived(RequestId reqId, const String& operation
 }
 
 void
+GalleryApp::OnDeviceStateChanged(DeviceType deviceType, const Tizen::Base::String& state)
+{
+       AppLogDebug("ENTER");
+       if (deviceType == DEVICE_TYPE_STORAGE_CARD
+                       && (state == DEVICE_STORAGE_CARD_MOUNTED || state == DEVICE_STORAGE_CARD_UNMOUNTED))
+       {
+               SceneManager* pSceneManager = SceneManager::GetInstance();
+               AppAssert(pSceneManager);
+
+               Scene* pScene = pSceneManager->GetCurrentScene();
+               AppAssert(pSceneManager);
+
+               BasePanel* pBasePanel = dynamic_cast<BasePanel*>(pScene->GetPanel());
+               BaseForm* pBaseForm = dynamic_cast<BaseForm*>(pScene->GetForm());
+
+               if(pBasePanel != null  )
+               {
+                       pBasePanel->OnUpdateContentList();
+               }
+               else
+               {
+                       if (pBaseForm != null)
+                       {
+                               pBaseForm->OnUpdateContentList();
+                       }
+               }
+       }
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+void
 GalleryApp::OnSettingChanged(String& key)
 {
        AppLogDebug("ENTER");

diff --git a/src/GlTypes.cpp b/src/GlTypes.cpp
index e6cfa23..1470895 100644 (file)
--- a/src/GlTypes.cpp
+++ b/src/GlTypes.cpp
@@ -148,3 +148,6 @@ const wchar_t* IDB_LIST_EXPAND_CLOSED = L"00_circle_button_Expand_closed.png";
 const wchar_t* IDB_LIST_EXPAND_CLOSED_PRESS = L"00_list_expand_closed_press.png";
 const wchar_t* IDB_LIST_EXPAND_OPENED = L"00_circle_button_Expand_open.png";
 const wchar_t* IDB_LIST_EXPAND_OPENED_PRESS = L"00_list_expand_opened_press.png";
+
+const wchar_t* DEVICE_STORAGE_CARD_MOUNTED = L"Mounted";
+const wchar_t* DEVICE_STORAGE_CARD_UNMOUNTED = L"Unmounted";