From: Vinay Sachdeva Date: Mon, 21 Oct 2013 22:24:39 +0000 (+0530) Subject: Fixed Nabi Issues 55388,55397,55254, Implementation of slider Adjustment Event Listen... X-Git-Tag: 2.2.1_release~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7321398a43153bea508142403732fe3e21aea895;p=apps%2Fosp%2FInternet.git Fixed Nabi Issues 55388,55397,55254, Implementation of slider Adjustment Event Listener for Brightness form Change-Id: Ie7e3c5fd246a04cbb664d177dcfb95a9fbf26c86 Signed-off-by: Vinay Sachdeva --- diff --git a/inc/IntBrightnessForm.h b/inc/IntBrightnessForm.h index 4ae31e0..aa2c343 100644 --- a/inc/IntBrightnessForm.h +++ b/inc/IntBrightnessForm.h @@ -30,6 +30,7 @@ class BrightnessForm : public Tizen::Ui::Controls::Form , public Tizen::Ui::IActionEventListener + , public Tizen::Ui::IAdjustmentEventListener , public Tizen::Ui::Controls::IFormBackEventListener , public Tizen::Ui::IOrientationEventListener , public Tizen::Ui::Scenes::ISceneEventListener @@ -79,6 +80,8 @@ protected: //IActionEventListener virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId); + //IAdjustmentEventListener + void OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment); //IFormBackEventListener virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source); diff --git a/res/screen-size-normal/IDL_ADDRESSBAR.xml b/res/screen-size-normal/IDL_ADDRESSBAR.xml index 1ba6251..a1a1869 100644 --- a/res/screen-size-normal/IDL_ADDRESSBAR.xml +++ b/res/screen-size-normal/IDL_ADDRESSBAR.xml @@ -2,9 +2,9 @@ - - + 720 + diff --git a/res/screen-size-normal/IDL_ARTICLE_READER.xml b/res/screen-size-normal/IDL_ARTICLE_READER.xml index 73f303b..bcf4331 100644 --- a/res/screen-size-normal/IDL_ARTICLE_READER.xml +++ b/res/screen-size-normal/IDL_ARTICLE_READER.xml @@ -2,9 +2,9 @@ - - + 720 + diff --git a/res/screen-size-normal/IDL_BLANK_PANEL.xml b/res/screen-size-normal/IDL_BLANK_PANEL.xml index 3a60f45..39064a7 100644 --- a/res/screen-size-normal/IDL_BLANK_PANEL.xml +++ b/res/screen-size-normal/IDL_BLANK_PANEL.xml @@ -2,9 +2,9 @@ - - + 720 + diff --git a/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml b/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml index ca8481c..87a9a4b 100644 --- a/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml +++ b/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml @@ -4,7 +4,7 @@ --> - + 720
@@ -24,12 +24,12 @@ - + @@ -39,6 +39,6 @@ - + diff --git a/res/screen-size-normal/IDL_FIND_ON_PAGE.xml b/res/screen-size-normal/IDL_FIND_ON_PAGE.xml index 51153bb..229bf77 100644 --- a/res/screen-size-normal/IDL_FIND_ON_PAGE.xml +++ b/res/screen-size-normal/IDL_FIND_ON_PAGE.xml @@ -2,10 +2,9 @@ - - - + 720 + diff --git a/res/screen-size-normal/IDL_NOTIFICATION_PANEL.xml b/res/screen-size-normal/IDL_NOTIFICATION_PANEL.xml index 9246bd7..3f59b87 100644 --- a/res/screen-size-normal/IDL_NOTIFICATION_PANEL.xml +++ b/res/screen-size-normal/IDL_NOTIFICATION_PANEL.xml @@ -2,9 +2,9 @@ - - + 720 + diff --git a/src/IntBrightnessForm.cpp b/src/IntBrightnessForm.cpp index 4c88a66..51e0963 100644 --- a/src/IntBrightnessForm.cpp +++ b/src/IntBrightnessForm.cpp @@ -137,6 +137,7 @@ BrightnessForm::OnInitializing(void) __pBrightnessSlider->SetRange(1,10); __pBrightnessSlider->SetValue(sliderValue); __pBrightnessSlider->AddSliderEventListener(*this); + __pBrightnessSlider->AddAdjustmentEventListener(*this); GetFooter()->AddActionEventListener(*this); return r; @@ -211,6 +212,24 @@ BrightnessForm::OnSliderBarMoved(Slider& source, int value) } } } +void +BrightnessForm::OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment) +{ + if(source.Equals(*__pBrightnessSlider) == true) + { + AppLog("coming to OnSliderBarMoved"); + if (__manualBrightness == true) + { + PowerManager::SetScreenBrightness(adjustment); + AppRegistry* pAppRegistry = App::GetInstance()->GetAppRegistry(); + String sliderKey("SliderValue"); + if (pAppRegistry) + { + pAppRegistry->Set(sliderKey,adjustment); + } + } + } +} void BrightnessForm::OnFormBackRequested(Form& source) diff --git a/src/IntEditHomePageForm.cpp b/src/IntEditHomePageForm.cpp index 6f237d5..f63ee23 100644 --- a/src/IntEditHomePageForm.cpp +++ b/src/IntEditHomePageForm.cpp @@ -176,8 +176,16 @@ EditHomePageForm::OnActionPerformed(const Control& source, int actionId) if (flag == true) { String validUrl; - validUrl = L"http://"; - validUrl.Append(urlText); + if(urlText.Contains("http://") == true) + { + validUrl.Append(urlText); + } + else + { + validUrl = L"http://"; + validUrl.Append(urlText); + } + // save Url SettingPresentationModel::GetInstance()->SetHomepage(validUrl); SettingPresentationModel::GetInstance()->SetFavoriteValue(validUrl); diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp index 80c3f9b..1852498 100644 --- a/src/IntMainForm.cpp +++ b/src/IntMainForm.cpp @@ -987,7 +987,11 @@ MainForm::InitSelectTextContextMenuF(FloatPoint p, bool pasteOption, bool onlyPa // __pWebViewer->GetBlockRange(p,q); if(p.y < 150) { - p.y = p.y + 50; + p.y = p.y + 100; + if(GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE ) + { + p.y = p.y - 50; + } direction = CONTEXT_MENU_ANCHOR_DIRECTION_DOWNWARD; } else if(__pWebViewer != null && (p.y > (__pWebViewer->GetHeight() + __pWebViewer->GetY()))) @@ -1039,10 +1043,6 @@ MainForm::InitSelectTextContextMenuF(FloatPoint p, bool pasteOption, bool onlyPa r = __pImageMenu->Construct(p, CONTEXT_MENU_STYLE_GRID, direction); TryCatch(!IsFailed(r),, "Context image menu creation failed with%s",GetErrorMessage(r)); - - - - if(onlyPasteOption == false && __pHitElementResult->GetAttributeValue("type").Equals(L"password",false) == false) { r = __pImageMenu->AddItem(CommonUtil::GetString(L"IDS_COM_OPT_COPY"),IDA_COPY_TEXT_CLICKED);