Modify recorde selection popup

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

diff --git a/inc/CmTypes.h b/inc/CmTypes.h
index 739749b..dcc7823 100644 (file)
--- a/inc/CmTypes.h
+++ b/inc/CmTypes.h
@@ -66,9 +66,16 @@ 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 int FONT_SIZE_CANCEL_CONFIRM;
+extern const int FONT_SIZE_CANCEL_BUTTON;
 extern const unsigned int COLOR_DELETE_BUTTON_NORMAL;
 extern const unsigned int COLOR_DELETE_BUTTON_PRESSED;
 extern const unsigned int COLOR_DELETE_BUTTON_TEXT;
+extern const unsigned int COLOR_CANCEL_BUTTON_TEXT;
+extern const unsigned int COLOR_CANCEL_BUTTON_NORMAL;
+
+extern const int FONT_SIZE_CANCEL_CONFIRM;
+extern const int FONT_SIZE_CANCEL_BUTTON;
 
 extern const int X_THUMBNAIL_IMG_PANEL_LANDSCAPE;
 extern const int Y_THUMBNAIL_IMG_PANEL_LANDSCAPE;

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index e3dcaf7..59ec56f 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -293,11 +293,11 @@ static const int SCREEN_OVERLAY_HELP_ENABLE = 1;
 static const int SCREEN_OVERLAY_HELP_DISABLE = 0;
 
 static const int GAP_W_POPUP_ITEM = 5;
-static const int W_DELETE_POPUP = 600;
-static const int H_DELETE_POPUP = 300;
-static const int H_DELETE_LABEL = 180;
-static const int Y_DELETE_BUTTON = 180;
-static const int H_DELETE_BUTTON = 80;
+static const int W_DELETE_POPUP = 688;
+static const int H_DELETE_POPUP = 204;
+static const int H_DELETE_LABEL = 94;
+static const int Y_DELETE_BUTTON = 114;
+static const int H_DELETE_BUTTON = 74;
 
 static const wchar_t* IDS_MENU_SETTING_MAIN_MENU_NAME = L"SettingMainMenu";
 static const wchar_t* IDS_MENU_SETTING_GEN_MAIN_MENU_NAME = L"SettingGenMainMenu";
@@ -12684,27 +12684,35 @@ CamcorderForm::InitializePopup(void)
                Rectangle popupClientBounds = __pCancelPopup->GetClientAreaBounds();
                pTitleLabel = new (std::nothrow) Label();
                pAppResource->GetString(L"IDS_CAM_BODY_CANCEL_RECORDING_Q", strTitle);
+
                r = pTitleLabel->Construct(Rectangle(X_BASE_POS, Y_BASE_POS, popupClientBounds.width, H_DELETE_LABEL), strTitle);
                TryCatch(r == E_SUCCESS, , "pTitleLabel::Construct() fail[%s]", GetErrorMessage(r));
 
+               pTitleLabel->SetTextConfig(FONT_SIZE_CANCEL_CONFIRM, LABEL_TEXT_STYLE_NORMAL);
+               pTitleLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
+               pTitleLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+
                pOkButton = new (std::nothrow) Button();
                //pAppResource->GetString(L"IDS_RECORDING_OK", okString);
                okString = L"Ok";
-               r = pOkButton->Construct( Rectangle(X_BASE_POS, Y_DELETE_BUTTON, popupClientBounds.width / DIVIDE_BY_TWO - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), okString);
+               r = pOkButton->Construct(Rectangle(X_BASE_POS, Y_DELETE_BUTTON, popupClientBounds.width / DIVIDE_BY_TWO - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), okString);
                TryCatch(r == E_SUCCESS, r = E_OUT_OF_MEMORY, "Unable to construct pOkButton button.\n");
 
-               pOkButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_DELETE_BUTTON_NORMAL);
-               pOkButton->SetColor(BUTTON_STATUS_PRESSED, COLOR_DELETE_BUTTON_PRESSED);
-               pOkButton->SetTextColor(COLOR_DELETE_BUTTON_TEXT);
+               pOkButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_CANCEL_BUTTON_NORMAL);
+               pOkButton->SetTextColor(COLOR_CANCEL_BUTTON_TEXT);
+               pOkButton->SetTextSize(FONT_SIZE_CANCEL_BUTTON);
                pOkButton->SetActionId(IDA_BUTTON_RECORDING_POPUP_OK);
                pOkButton->AddActionEventListener(*this);
 
                pCancelButton = new (std::nothrow) Button();
                cancelString = L"Cancel";
                //pAppResource->GetString(L"IDS_RECORDING_CANCEL", cancelString);
-               r = pCancelButton->Construct(Rectangle(popupClientBounds.width / DIVIDE_BY_TWO + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON,popupClientBounds.width / DIVIDE_BY_TWO - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), cancelString);
+               r = pCancelButton->Construct(Rectangle(popupClientBounds.width / DIVIDE_BY_TWO + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON, popupClientBounds.width / DIVIDE_BY_TWO - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), cancelString);
                TryCatch(r == E_SUCCESS, r = E_OUT_OF_MEMORY, "Unable to construct pCancelButton button.\n");
-               
+
+               pCancelButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_CANCEL_BUTTON_NORMAL);
+               pCancelButton->SetTextColor(COLOR_CANCEL_BUTTON_TEXT);
+               pCancelButton->SetTextSize(FONT_SIZE_CANCEL_BUTTON);
                pCancelButton->SetActionId(IDA_BUTTON_RECORDING_POPUP_CANCEL);
                pCancelButton->AddActionEventListener(*this);
 

diff --git a/src/CmTypes.cpp b/src/CmTypes.cpp
index ab14229..aef9546 100644 (file)
--- a/src/CmTypes.cpp
+++ b/src/CmTypes.cpp
@@ -38,6 +38,11 @@ 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_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 X_THUMBNAIL_IMG_PANEL_LANDSCAPE = 26;
 const int Y_THUMBNAIL_IMG_PANEL_LANDSCAPE = 590;
 const int W_THUMBNAIL_IMG_PANEL_LANDSCAPE = 108;