Fix nabi issue(N_SE-34456, N_SE-34287)

Change-Id: I5ef9184f7e46fae61cb6dc69451abbfd1e3dee96
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/inc/CmCamcorderForm.h b/inc/CmCamcorderForm.h
index 6d9b6f2..1250af9 100644 (file)
--- a/inc/CmCamcorderForm.h
+++ b/inc/CmCamcorderForm.h
@@ -368,6 +368,7 @@ private:
        void HideScreenOverlayHelp(void);
        result DrawScreenOverlayHelp(void);
        result TerminateApp(void);
+       void RemoveAllEventListener(void);
 
 private:
        CameraPresentationModel* __pCamcorderPresentationModel;

diff --git a/inc/CmCameraForm.h b/inc/CmCameraForm.h
index e86dec7..17ee1b6 100644 (file)
--- a/inc/CmCameraForm.h
+++ b/inc/CmCameraForm.h
@@ -332,6 +332,7 @@ private:
        AppLaunchType GetAppLaunchType(void) const;
        void OnTimerCapturePause(void);
        result TerminateApp(void);
+       void RemoveAllEventListener(void);
 
 private:
        CameraPresentationModel* __pCameraPresentationModel;

diff --git a/inc/CmCameraPresentationModel.h b/inc/CmCameraPresentationModel.h
index 471f897..417ac82 100644 (file)
--- a/inc/CmCameraPresentationModel.h
+++ b/inc/CmCameraPresentationModel.h
@@ -171,7 +171,8 @@ public:
        result SetExifOrientation(int orientation);
        void KeepScreenOnState(bool keepOn, bool dimming);
 
-       void SetPresentationChangedEventListener(ICameraEventListner* pObserverListener);
+       void AddPresentationChangedEventListener(ICameraEventListner& pObserverListener);
+       void RemovePresentationChangedEventListener(ICameraEventListner* pObserverListener);
        void CallOnPresentationModeChanged(CameraActionEvent event);
 
        bool GetOnVideoRecorderStopped(void);

diff --git a/inc/CmTypes.h b/inc/CmTypes.h
index 72742c3..a5ae846 100644 (file)
--- a/inc/CmTypes.h
+++ b/inc/CmTypes.h
@@ -66,8 +66,12 @@ extern const unsigned int COLOR_SETTING_LINE;
 extern const unsigned int COLOR_SETTING_UNDER_LINE;
 extern const unsigned int COLOR_TITLE;
 extern const unsigned int COLOR_TIMER_TEXT;
+extern const unsigned int COLOR_SCREEN_OVERLAY_HELP_TEXT;
+
 extern const int FONT_SIZE_CANCEL_CONFIRM;
 extern const int FONT_SIZE_CANCEL_BUTTON;
+extern const int FONT_SIZE_SCREEN_OVERLAY_HELP;
+
 extern const unsigned int COLOR_DELETE_BUTTON_NORMAL;
 extern const unsigned int COLOR_DELETE_BUTTON_PRESSED;
 extern const unsigned int COLOR_DELETE_BUTTON_TEXT;
@@ -222,5 +226,14 @@ extern const wchar_t* IDS_RECORDING_MODE_SHARING;
 extern const wchar_t* IDS_CAM_BODY_CANCEL_RECORDING_Q;
 extern const wchar_t* IDS_COM_SK_OK;
 extern const wchar_t* IDS_COM_POP_CANCEL;
+extern const wchar_t* IDS_HELP_GOTO_GALLERY;
+extern const wchar_t* IDS_HELP_SWITCH_CAMERA;
+extern const wchar_t* IDS_HELP_QUICK_SETTINGT;
+extern const wchar_t* IDS_HELP_CAPTURE_IMAGE;
+extern const wchar_t* IDS_HELP_RECORD_VIDEO;
+extern const wchar_t* IDS_HELP_RECORDER;
+extern const wchar_t* IDS_HELP_SHUTTER;
+extern const wchar_t* IDS_HELP_GOTO_GALLERY;
+extern const wchar_t* IDS_HELP_GOTO_PREVIOUS_SCREEN;
 
 #endif // _CM_TYPES_H_
\ No newline at end of file

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index 87f137f..210daa9 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -620,6 +620,8 @@ CamcorderForm::OnTerminating(void)
 
        __pCamcorderPresentationModel->KeepScreenOnState(false, true);
 
+       __pCamcorderPresentationModel->RemovePresentationChangedEventListener(null);
+
        __pCameraInfoPanel->SetDrawIndicatorStroageInfo(false);
 
        __lowMemoryCapacity = false;
@@ -628,6 +630,8 @@ CamcorderForm::OnTerminating(void)
 
        __isCapacityBelow = false;
 
+       RemoveAllEventListener();
+
        r = __pCamcorderPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_DISABLE);
        AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
 
@@ -680,8 +684,6 @@ CamcorderForm::OnTerminating(void)
 
        delete __pFileEventManager;
 
-       RemoveOrientationEventListener(*this);
-
        AppLogDebug("EXIT");
        return r;
 }
@@ -1092,7 +1094,6 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                                return;
                                        }
 
-                                       RemoveTouchEventListener(*this);
                                        if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET)
                                        {
                                                r = PressBackButton();
@@ -1171,9 +1172,6 @@ CamcorderForm::SendAppControlResult(RequestId requestId)
        {
                requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
 
-               RemoveOrientationEventListener(*this);
-               RemoveTouchEventListener(*this);
-
                switch (requestType)
                {
                case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_CANCELED:
@@ -1268,6 +1266,8 @@ CamcorderForm::TerminateApp(void)
 
        __AppControlActionCompleted = true;
 
+       RemoveAllEventListener();
+
        DeleteTimer();
 
        __blinkCount = 0;
@@ -1482,7 +1482,7 @@ CamcorderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
 
        StartInitChargingTimer();
 
-       __pCamcorderPresentationModel->SetPresentationChangedEventListener(this);
+       __pCamcorderPresentationModel->AddPresentationChangedEventListener(*this);
 
        __pCamcorderPresentationModel->KeepScreenOnState(true, false);
 
@@ -2033,8 +2033,10 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
        AppLogDebug("ENTER");
        __timeCount = 0;
 
-       __pIntervalValueTimer->Cancel();
-
+       if (__pIntervalValueTimer)
+       {
+               __pIntervalValueTimer->Cancel();
+       }
        __doRecording = false;
 
        if (__pPopupTimer)
@@ -2049,6 +2051,7 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                __pCameraInfoPanel->Invalidate(true);
        }
 
+       AppLogDebug("OnCameraActionPerformed - event %d", event);
        switch (event)
        {
        case CAMERA_ACTION_EVENT_TOUCH_AUTO_FOCUSED:
@@ -2129,8 +2132,6 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                CameraApp* pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
                                pCameraApp->SetFrameEnabled(false);
 
-                               RemoveTouchEventListener(*this);
-
                                r = TerminateApp();
                                AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
                        }
@@ -10641,6 +10642,8 @@ CamcorderForm::DrawScreenOverlayHelp(void)
        Bitmap* pBitmap = null;
        result r = E_SUCCESS;
        int overlayHelpEnable = 0;
+       //AppResource* pAppResource = null;
+       String ovelayHelpStr = L"";
 
        TryCatch(__pHelpGoToGallery != null, r = E_FAILURE, "__pHelpGoToGallery is null");
        TryCatch(__pHelpGoToGalleryText != null, r = E_FAILURE, "__pHelpGoToGalleryText is null");
@@ -10677,17 +10680,55 @@ CamcorderForm::DrawScreenOverlayHelp(void)
        }
        else
        {
+               //pAppResource = Application::GetInstance()->GetAppResource();
+               //TryCatch(pAppResource != null, , "Failed to allocate memory for pAppResource");
+
                __pHelpGoToGallery->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_GOTO_GALLERY", ovelayHelpStr);
+               ovelayHelpStr = L"GO to Gallery";
+               __pHelpGoToGalleryText->SetText(ovelayHelpStr);
+               __pHelpGoToGalleryText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpGoToGalleryText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpGoToGalleryText->SetShowState(true);
+
                __pHelpSwitchCamera->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_SWITCH_CAMERA", ovelayHelpStr);
+               ovelayHelpStr = L"Switch camera";
+               __pHelpSwitchCameraText->SetText(ovelayHelpStr);
+               __pHelpSwitchCameraText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpSwitchCameraText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpSwitchCameraText->SetShowState(true);
+
                __pHelpQuickSetting->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_QUICK_SETTINGT", ovelayHelpStr);
+               ovelayHelpStr = L"Quick Settings";
+               __pHelpQuickSettingText->SetText(ovelayHelpStr);
+               __pHelpQuickSettingText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpQuickSettingText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpQuickSettingText->SetShowState(true);
+
                __pHelpRecordVideo->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_RECORD_VIDEO", ovelayHelpStr);
+               ovelayHelpStr = L"Record video";
+               __pHelpRecordVideoText->SetText(ovelayHelpStr);
+               __pHelpRecordVideoText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpRecordVideoText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpRecordVideoText->SetShowState(true);
+
                __pHelpShutter->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_RECORDER", ovelayHelpStr);
+               ovelayHelpStr = L"Recorder";
+               __pHelpShutterText->SetText(ovelayHelpStr);
+               __pHelpShutterText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpShutterText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpShutterText->SetShowState(true);
+
                __pHelpGoToPreviousScreen->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_GOTO_PREVIOUS_SCREEN", ovelayHelpStr);
+               ovelayHelpStr = L"Go to Previous Screen";
+               __pHelpGoToPreviousScreenText->SetText(ovelayHelpStr);
+               __pHelpGoToPreviousScreenText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpGoToPreviousScreenText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpGoToPreviousScreenText->SetShowState(true);
 
                if (__dir == ORIENTATION_STATUS_PORTRAIT
@@ -13103,4 +13144,14 @@ CATCH:
        delete pCancelButton;
        pCancelButton = null;
        return E_FAILURE;
+}
+
+void
+CamcorderForm::RemoveAllEventListener(void)
+{
+       AppLogDebug("ENTER");           
+       RemoveOrientationEventListener(*this);
+       RemoveTouchEventListener(*this);
+       RemoveKeyEventListener(*this);
+       AppLogDebug("EXIT");
 }
\ No newline at end of file

diff --git a/src/CmCameraForm.cpp b/src/CmCameraForm.cpp
index be18dc0..dd14387 100644 (file)
--- a/src/CmCameraForm.cpp
+++ b/src/CmCameraForm.cpp
@@ -580,8 +580,12 @@ CameraForm::OnTerminating(void)
 
        __pCameraPresentationModel->KeepScreenOnState(false, true);
 
+       __pCameraPresentationModel->RemovePresentationChangedEventListener(null);
+
        __pCameraInfoPanel->SetDrawIndicatorStroageInfo(false);
 
+       RemoveAllEventListener();
+
        r = __pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_DISABLE);
        AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
 
@@ -649,8 +653,6 @@ CameraForm::OnTerminating(void)
 
        delete __pFileEventManager;
 
-       RemoveOrientationEventListener(*this);
-
        AppLogDebug("EXIT");
        return r;
 }
@@ -685,7 +687,7 @@ CameraForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
 
        StartInitChargingTimer();
 
-       __pCameraPresentationModel->SetPresentationChangedEventListener(this);
+       __pCameraPresentationModel->AddPresentationChangedEventListener(*this);
 
        __pCameraPresentationModel->KeepScreenOnState(true, false);
 
@@ -1224,6 +1226,7 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
+       AppLogDebug("OnCameraActionPerformed - event %d", event);
        switch (event)
        {
        case CAMERA_ACTION_EVENT_AUTO_FOCUSED:
@@ -1280,8 +1283,6 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                                CameraApp* pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
                                pCameraApp->SetFrameEnabled(false);
 
-                               RemoveTouchEventListener(*this);
-
                                r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
                                TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
 
@@ -3932,7 +3933,6 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                        return;
                                }
 
-                               RemoveTouchEventListener(*this);                                        
                                if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET)
                                {
                                        r = PressBackButton();
@@ -4000,9 +4000,6 @@ CameraForm::SendAppControlResult(RequestId requestId)
        {
                requestType = __pCameraPresentationModel->GetAppControlRequestType();
 
-               RemoveOrientationEventListener(*this);
-               RemoveTouchEventListener(*this);
-
                switch (requestType)
                {
                case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_CANCELED:
@@ -4094,6 +4091,8 @@ CameraForm::TerminateApp(void)
        result r = E_SUCCESS;
        CameraApp* pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
 
+       RemoveAllEventListener();
+
        __AppControlActionCompleted = true;
 
        DeleteTimer();
@@ -10197,6 +10196,8 @@ CameraForm::DrawScreenOverlayHelp(void)
        Bitmap* pBitmap = null;
        result r = E_SUCCESS;
        int overlayHelpEnable = 0;
+       String ovelayHelpStr = L"";
+       //AppResource* pAppResource = null;
 
        TryCatch(__pHelpGoToGallery != null, r = E_FAILURE, "__pHelpGoToGallery is null");
        TryCatch(__pHelpGoToGalleryText != null, r = E_FAILURE, "__pHelpGoToGalleryText is null");
@@ -10222,17 +10223,55 @@ CameraForm::DrawScreenOverlayHelp(void)
        }
        else
        {
+               //pAppResource = Application::GetInstance()->GetAppResource();
+               //TryCatch(pAppResource != null, , "Failed to allocate memory for pAppResource");
+
                __pHelpGoToGallery->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_GOTO_GALLERY", ovelayHelpStr);
+               ovelayHelpStr = L"GO to Gallery";
+               __pHelpGoToGalleryText->SetText(ovelayHelpStr);
+               __pHelpGoToGalleryText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpGoToGalleryText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpGoToGalleryText->SetShowState(true);
+
                __pHelpSwitchCamera->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_SWITCH_CAMERA", ovelayHelpStr);
+               ovelayHelpStr = L"Switch camera";
+               __pHelpSwitchCameraText->SetText(ovelayHelpStr);
+               __pHelpSwitchCameraText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpSwitchCameraText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpSwitchCameraText->SetShowState(true);
+
                __pHelpQuickSetting->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_QUICK_SETTINGT", ovelayHelpStr);
+               ovelayHelpStr = L"Quick Settings";
+               __pHelpQuickSettingText->SetText(ovelayHelpStr);
+               __pHelpQuickSettingText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpQuickSettingText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpQuickSettingText->SetShowState(true);
+
                __pHelpRecordVideo->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_CAPTURE_IMAGE", ovelayHelpStr);
+               ovelayHelpStr = L"Capture image";
+               __pHelpRecordVideoText->SetText(ovelayHelpStr);
+               __pHelpRecordVideoText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpRecordVideoText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpRecordVideoText->SetShowState(true);
+
                __pHelpShutter->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_SHUTTER", ovelayHelpStr);
+               ovelayHelpStr = L"Shutter";
+               __pHelpShutterText->SetText(ovelayHelpStr);
+               __pHelpShutterText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpShutterText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpShutterText->SetShowState(true);
+
                __pHelpGoToPreviousScreen->SetShowState(true);
+               //pAppResource->GetString(L"IDS_HELP_GOTO_PREVIOUS_SCREEN", ovelayHelpStr);
+               ovelayHelpStr = L"Go to Previous Screen";
+               __pHelpGoToPreviousScreenText->SetText(ovelayHelpStr);
+               __pHelpGoToPreviousScreenText->SetTextColor(COLOR_SCREEN_OVERLAY_HELP_TEXT);
+               __pHelpGoToPreviousScreenText->SetTextConfig(FONT_SIZE_SCREEN_OVERLAY_HELP, LABEL_TEXT_STYLE_NORMAL);
                __pHelpGoToPreviousScreenText->SetShowState(true);
 
                if (__dir == ORIENTATION_STATUS_PORTRAIT
@@ -12528,4 +12567,14 @@ CATCH:
 
        AppLogDebug("EXIT - CATCH");
        return null;
+}
+
+void
+CameraForm::RemoveAllEventListener(void)
+{
+       AppLogDebug("ENTER");
+       RemoveOrientationEventListener(*this);
+       RemoveTouchEventListener(*this);
+       RemoveKeyEventListener(*this);
+       AppLogDebug("EXIT");
 }
\ No newline at end of file

diff --git a/src/CmCameraPresentationModel.cpp b/src/CmCameraPresentationModel.cpp
index 836655d..d0cf771 100644 (file)
--- a/src/CmCameraPresentationModel.cpp
+++ b/src/CmCameraPresentationModel.cpp
@@ -2795,7 +2795,15 @@ CameraPresentationModel::KeepScreenOnState(bool keepOn, bool dimming)
 }
 
 void
-CameraPresentationModel::SetPresentationChangedEventListener(ICameraEventListner* pObserverListener)
+CameraPresentationModel::AddPresentationChangedEventListener(ICameraEventListner& pObserverListener)
+{
+       AppLogDebug("ENTER");
+       __pCameraListener = &pObserverListener;
+       AppLogDebug("EXIT");
+}
+
+void
+CameraPresentationModel::RemovePresentationChangedEventListener(ICameraEventListner* pObserverListener)
 {
        AppLogDebug("ENTER");
        __pCameraListener = pObserverListener;
@@ -2806,7 +2814,11 @@ void
 CameraPresentationModel::CallOnPresentationModeChanged(CameraActionEvent event)
 {
        AppLogDebug("ENTER");
-       __pCameraListener->OnCameraActionPerformed(event);
+       AppLogDebug("CallOnPresentationModeChanged - event = %d", event);
+       if (__pCameraListener != null)
+       {
+               __pCameraListener->OnCameraActionPerformed(event);
+       }
        AppLogDebug("EXIT");
 }
 
@@ -3466,7 +3478,10 @@ void
 CameraPresentationModel::SetDeviceManagerEventListner(void)
 {
        AppLogDebug("ENTER");
-       DeviceManager::AddDeviceEventListener(DEVICE_TYPE_STORAGE_CARD, *this);
+       result r = E_SUCCESS;
+
+       r = DeviceManager::AddDeviceEventListener(DEVICE_TYPE_STORAGE_CARD, *this);
+       AppLogDebug("AddDeviceEventListener [%s] fail", GetErrorMessage(r));
        AppLogDebug("EXIT");
 }
 
@@ -3474,7 +3489,10 @@ void
 CameraPresentationModel::RemoveDeviceManagerEventListner(void)
 {
        AppLogDebug("ENTER");
-       DeviceManager::RemoveAllDeviceEventListeners();
+       result r = E_SUCCESS;
+
+       r = DeviceManager::RemoveDeviceEventListener(DEVICE_TYPE_STORAGE_CARD, *this);
+       AppLogDebug("RemoveDeviceManagerEventListner [%s] fail", GetErrorMessage(r));
        AppLogDebug("EXIT");
 }
 

diff --git a/src/CmTypes.cpp b/src/CmTypes.cpp
index eaa24cc..7b9fd6b 100644 (file)
--- a/src/CmTypes.cpp
+++ b/src/CmTypes.cpp
@@ -37,11 +37,13 @@ const unsigned int COLOR_TIMER_TEXT = Color32<249, 249, 249>::Value;
 const unsigned int COLOR_DELETE_BUTTON_NORMAL = Color32<128, 128, 128>::Value;
 const unsigned int COLOR_DELETE_BUTTON_PRESSED = Color32<0, 192, 255>::Value;
 const unsigned int COLOR_DELETE_BUTTON_TEXT = Color32<248, 246, 239>::Value;
+const unsigned int COLOR_SCREEN_OVERLAY_HELP_TEXT = Color32<255, 255, 255>::Value;
 
 const unsigned int COLOR_CANCEL_BUTTON_TEXT = Color32<0, 0, 0>::Value;
 const unsigned int COLOR_CANCEL_BUTTON_NORMAL = Color32<255, 255, 255>::Value;
 const int FONT_SIZE_CANCEL_CONFIRM = 42;
 const int FONT_SIZE_CANCEL_BUTTON = 36;
+const int FONT_SIZE_SCREEN_OVERLAY_HELP = 32;
 
 const int X_THUMBNAIL_IMG_PANEL_LANDSCAPE = 26;
 const int Y_THUMBNAIL_IMG_PANEL_LANDSCAPE = 590;
@@ -184,3 +186,11 @@ const wchar_t* IDS_RECORDING_MODE_SHARING = L"Sharing";
 const wchar_t* IDS_CAM_BODY_CANCEL_RECORDING_Q = L"IDS_CAM_BODY_CANCEL_RECORDING_Q";
 const wchar_t* IDS_COM_SK_OK = L"IDS_COM_SK_OK";
 const wchar_t* IDS_COM_POP_CANCEL = L"IDS_COM_POP_CANCEL";
+const wchar_t* IDS_HELP_GOTO_GALLERY = L"IDS_HELP_GOTO_GALLERY";
+const wchar_t* IDS_HELP_SWITCH_CAMERA = L"IDS_HELP_SWITCH_CAMERA";
+const wchar_t* IDS_HELP_QUICK_SETTINGT = L"IDS_HELP_QUICK_SETTINGT";
+const wchar_t* IDS_HELP_CAPTURE_IMAGE = L"IDS_HELP_CAPTURE_IMAGE";
+const wchar_t* IDS_HELP_RECORD_VIDEO = L"IDS_HELP_RECORD_VIDEO";
+const wchar_t* IDS_HELP_RECORDER = L"IDS_HELP_RECORDER";
+const wchar_t* IDS_HELP_SHUTTER = L"IDS_HELP_SHUTTER";
+const wchar_t* IDS_HELP_GOTO_PREVIOUS_SCREEN = L"IDS_HELP_GOTO_PREVIOUS_SCREEN";
\ No newline at end of file