From: Amith Kumar Mahale Date: Wed, 20 Mar 2013 13:56:52 +0000 (+0530) Subject: Fixed Nabi issues N_SE-29062 N_SE-28663 N_SE-26280 N_SE-26281 N_SE-25992 N_SE-29298... X-Git-Tag: accepted/tizen_2.1/20130425.023544~21 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c5895d42d56bc6f88c48bc955473ec7d2ba1e63;hp=4711ba9d753006a5456eba411f221a032fa48dc8;p=apps%2Fosp%2FCall.git Fixed Nabi issues N_SE-29062 N_SE-28663 N_SE-26280 N_SE-26281 N_SE-25992 N_SE-29298 N_SE-27053 N_SE-27298 N_SE-27114 N_SE-27288 N_SE-27233 N_SE-26652 N_SE-29513 N_SE-29450 N_SE-29422 N_SE-28303 Change-Id: I41852f9541174a41d290c631d04de7df337b5bff Signed-off-by: Amith Kumar Mahale --- diff --git a/inc/AppResourceId.h b/inc/AppResourceId.h index 9e259f8..8edfef6 100644 --- a/inc/AppResourceId.h +++ b/inc/AppResourceId.h @@ -1,6 +1,7 @@ #ifndef _APPRESOURCEID_H_ #define _APPRESOURCEID_H_ +extern const wchar_t* IDC_EDITFIELD1; extern const wchar_t* IDF_FORM; #endif // _APPRESOURCEID_H_ diff --git a/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml b/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml index 4b24d62..11a2fa3 100644 --- a/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml +++ b/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml @@ -10,14 +10,14 @@ - - - - - + + + + + diff --git a/src/AppResourceId.cpp b/src/AppResourceId.cpp index f563fb2..4ca9d6b 100644 --- a/src/AppResourceId.cpp +++ b/src/AppResourceId.cpp @@ -1,3 +1,4 @@ #include "AppResourceId.h" +const wchar_t* IDC_EDITFIELD1 = L"IDC_EDITFIELD1"; const wchar_t* IDF_FORM = L"IDF_FORM"; diff --git a/src/CallActiveCallForm.cpp b/src/CallActiveCallForm.cpp index 1bdc61f..c502712 100644 --- a/src/CallActiveCallForm.cpp +++ b/src/CallActiveCallForm.cpp @@ -78,7 +78,7 @@ static const wchar_t* IDC_CONF_CALL_MORE_BUTTON = L"IDC_CONF_CALL_MORE_BUTTON"; static const wchar_t* IDC_HOLD_BUTTON = L"IDC_HOLD_BUTTON"; static const wchar_t* IDC_SWAP_BUTTON = L"IDC_SWAP_BUTTON"; static const wchar_t* IDC_HOLD_LABEL = L"IDC_HOLD_LABEL"; -static const wchar_t* IDC_TEXTBOX = L"IDC_TEXTBOX"; +static const wchar_t* IDC_TEXTBOX = L"IDC_NUM_EDITFIELD"; static const wchar_t* IDC_CALLER1_LABEL = L"IDC_CALLER1_LABEL"; static const wchar_t* IDC_BACKGROUND_LABEL = L"IDC_BACKGROUND_LABEL"; static const wchar_t* IDC_CALLER1_TIME_LABEL = L"IDC_CALLER1_TIME_LABEL"; @@ -224,7 +224,7 @@ ActiveCallForm::ShowDTMFKeypad(void) __pDTMFKeypad->Initialize(this, rect); AddControl(*__pDTMFKeypad); } - TextBox* pTextBox = static_cast(__pDTMFKeypad->GetControl(IDC_TEXTBOX)); + EditField* pTextBox = static_cast(__pDTMFKeypad->GetControl(IDC_TEXTBOX)); pTextBox->SetText(L""); __pDTMFKeypad->SetShowState(true); __pDTMFKeypad->Draw(true); @@ -271,10 +271,10 @@ ActiveCallForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui //in Portrait mode it is hidden beneath DTMF Keypad. SetShowStateOnKeypad(false); } - String dtmfText = static_cast(__pDTMFKeypad->GetControl(IDC_TEXTBOX))->GetText(); + String dtmfText = static_cast(__pDTMFKeypad->GetControl(IDC_TEXTBOX))->GetText(); ShowDTMFKeypad(); //get new text box. - TextBox* pTextBox = static_cast(__pDTMFKeypad->GetControl(IDC_TEXTBOX)); + EditField* pTextBox = static_cast(__pDTMFKeypad->GetControl(IDC_TEXTBOX)); pTextBox->SetText(dtmfText); } } @@ -838,8 +838,9 @@ ActiveCallForm::SetTextToDTMFTextField(const String& dtmfStr) { if(__pDTMFKeypad != null) { - TextBox* pTextBox = static_cast(__pDTMFKeypad->GetControl(IDC_TEXTBOX)); + EditField* pTextBox = static_cast(__pDTMFKeypad->GetControl(IDC_TEXTBOX)); pTextBox->AppendText(dtmfStr); + pTextBox->SetFocus(); pTextBox->Invalidate(true); } } diff --git a/src/CallDtmfKeypadPanel.cpp b/src/CallDtmfKeypadPanel.cpp index c3bfcf4..cb62907 100644 --- a/src/CallDtmfKeypadPanel.cpp +++ b/src/CallDtmfKeypadPanel.cpp @@ -45,7 +45,7 @@ const int RIGHT_TEXT_X_OFFSET = 94; const int W_DTMF_BTN = 212; const int H_DTMF_BTN = 134; const Color COLOR_KEYPAD_BG(0, 0, 0, 100); -const wchar_t* IDC_TEXTBOX = L"IDC_TEXTBOX"; +const wchar_t* IDC_TEXTBOX = L"IDC_NUM_EDITFIELD"; const wchar_t* IDC_BUTTON = L"IDC_BUTTON"; const wchar_t* IDC_DTMF_KEY_BG_LABEL = L"IDC_DTMF_KEY_BG_LABEL"; @@ -74,10 +74,11 @@ DtmfKeyPadPanel::Initialize(IActionEventListener* pEventListener, Rectangle& bou } //disable auto link detection - TextBox* pTextBox = static_cast(GetControl(IDC_TEXTBOX)); + EditField* pTextBox = static_cast(GetControl(IDC_TEXTBOX)); if (pTextBox != null) { pTextBox->SetAutoLinkMask(0); + pTextBox->SetFocus(); } __pActionListener = pEventListener; return true; @@ -284,14 +285,13 @@ DtmfKeyPadPanel::SetBackgroundtoButton() case PAUSE_KEY: { - DrawImageToCanvas(IDB_DIALER_STAR_ICON, Dimension(75, 36), canvasNormal, POSITION_LEFT); + DrawTextToCanvas(L"*", FONT_KEYPAD_NUMBER, canvasNormal, POSITION_LEFT, BUTTON_STATUS_NORMAL); DrawTextToCanvas(L"P", FONT_KEYPAD_P, canvasNormal, POSITION_RIGHT, BUTTON_STATUS_NORMAL); - r = SetPressedBgToCanvas(canvasPressed, IDB_KEYPAD_BUTTON_PRESS); TryCatch(r == E_SUCCESS,,"DtmfKeyPadPanel::AddButtonsToKeypad() SetPressedBgToCanvas failed"); - DrawImageToCanvas(IDB_DIALER_STAR_ICON, Dimension(75, 36), canvasPressed, POSITION_LEFT); + DrawTextToCanvas(L"*", FONT_KEYPAD_NUMBER, canvasPressed, POSITION_LEFT, BUTTON_STATUS_PRESSED); DrawTextToCanvas(L"P", FONT_KEYPAD_P, canvasPressed, POSITION_RIGHT, BUTTON_STATUS_PRESSED); - } + } break; case NUM_KEY0: diff --git a/src/CallOptionPopup.cpp b/src/CallOptionPopup.cpp index ce619b6..05333a2 100644 --- a/src/CallOptionPopup.cpp +++ b/src/CallOptionPopup.cpp @@ -80,6 +80,8 @@ CallOptionPopup::Initialize(void) int popupHeight = H_CANCEL_BUTTON + listHeight + CANCEL_BUTTON_PADDING + VERTICAL_PADDING; r = SetSize(Dimension(W_POPUP + HORIZONTAL_PADDING, popupHeight)); TryReturn(r == E_SUCCESS, r, "CallOptionPopup::SetSize() failed"); + SetMinimumSize(Dimension(W_POPUP + HORIZONTAL_PADDING, popupHeight)); + TryReturn(r == E_SUCCESS, r, "CallOptionPopup::SetMinSize() failed"); String strText; Application::GetInstance()->GetAppResource()->GetString(L"IDS_CANCEL", strText); @@ -91,11 +93,13 @@ CallOptionPopup::Initialize(void) TryReturn(r == E_SUCCESS, r, "CallOptionPopup::AddControl() failed"); ListView* pListView = new (std::nothrow) ListView(); - pListView->Construct(Rectangle(0, 0, W_POPUP - HORIZONTAL_PADDING, listHeight), true, SCROLL_STYLE_FADE_OUT); + pListView->Construct(Rectangle(0, 0, W_POPUP, listHeight), true, SCROLL_STYLE_FADE_OUT); pListView->AddListViewItemEventListener(*this); pListView->SetItemProvider(*this); r = AddControl(*pListView); + + return r; } @@ -139,8 +143,8 @@ CallOptionPopup::ConstructListData(void) //If contact number is also not present show unknown if(callInfo.GetContactNumber().IsEmpty() == false) { - pDisplayName->Append(callInfo.GetContactNumber()); - } + pDisplayName->Append(callInfo.GetContactNumber()); + } else { pDisplayName->Append(AppUtility::GetResourceString(IDS_NUMBER_UNKNOWN)); @@ -178,7 +182,7 @@ CallOptionPopup::ConstructListData(void) { if(firstCallInfo.GetContactNumber().IsEmpty() == false) { - pDisplayName->Append(firstCallInfo.GetContactNumber()); + pDisplayName->Append(firstCallInfo.GetContactNumber()); } else {