Fixed Nabi Issues 55388,55397,55254, Implementation of slider Adjustment Event Listen...

Change-Id: Ie7e3c5fd246a04cbb664d177dcfb95a9fbf26c86
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/inc/IntBrightnessForm.h b/inc/IntBrightnessForm.h
index 4ae31e0..aa2c343 100644 (file)
--- 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 (file)
--- a/res/screen-size-normal/IDL_ADDRESSBAR.xml
+++ b/res/screen-size-normal/IDL_ADDRESSBAR.xml
@@ -2,9 +2,9 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
 <ScenePanel Bversion="2.0.0.201307161751" Dversion="20120315">
-    <Panel id="IDL_ADDRESSBAR">
+    <LogicalCoordinate>720</LogicalCoordinate>
+<Panel id="IDL_ADDRESSBAR">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="94.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="0.0"/>
         <layout height="93.0" mode="Landscape" type="LAYOUT_RELATIVE" width="1280.0" x="0.0" y="0.0"/>

diff --git a/res/screen-size-normal/IDL_ARTICLE_READER.xml b/res/screen-size-normal/IDL_ARTICLE_READER.xml
index 73f303b..bcf4331 100644 (file)
--- a/res/screen-size-normal/IDL_ARTICLE_READER.xml
+++ b/res/screen-size-normal/IDL_ARTICLE_READER.xml
@@ -2,9 +2,9 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
 <ScenePanel Bversion="3.0.0.201209071526" Dversion="20120315">
-    <Panel id="IDL_ARTICLE_READER">
+    <LogicalCoordinate>720</LogicalCoordinate>
+<Panel id="IDL_ARTICLE_READER">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="981" mode="Portrait" type="NONE" width="620" x="0" y="0"/>
         <layout height="560" mode="Landscape" type="NONE" width="1180" x="0" y="0"/>

diff --git a/res/screen-size-normal/IDL_BLANK_PANEL.xml b/res/screen-size-normal/IDL_BLANK_PANEL.xml
index 3a60f45..39064a7 100644 (file)
--- a/res/screen-size-normal/IDL_BLANK_PANEL.xml
+++ b/res/screen-size-normal/IDL_BLANK_PANEL.xml
@@ -2,9 +2,9 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
 <ScenePanel Bversion="3.0.0.201209071526" Dversion="20120315">
-    <Panel id="IDL_BLANK_PANEL">
+    <LogicalCoordinate>720</LogicalCoordinate>
+<Panel id="IDL_BLANK_PANEL">
         <property backgroundColor="#000000" backgroundColorOpacity="80" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="1280" mode="Portrait" type="NONE" width="720" x="0" y="0"/>
         <layout height="720" mode="Landscape" type="NONE" width="1280" x="0" y="0"/>

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 (file)
--- a/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml
+++ b/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201309242034" Dversion="20120315">
+<Scene Bversion="2.0.0.201310162149" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_EDIT_BOOKMARK_LIST">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -24,12 +24,12 @@
     <Panel id="IDC_INFO_PANEL" parent="IDL_EDIT_BOOKMARK_LIST">
         <property backgroundColor="#444444" backgroundColorOpacity="100" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="1070.0"/>
-        <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="60.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="569.0"/>
+        <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="581.0"/>
     </Panel>
     <Label id="IDC_INFO_LABEL" parent="IDC_INFO_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#FFFFFF" textSize="35.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </Label>
     <CheckButton id="IDC_SELECT_CHECKBUTTON" parent="IDL_EDIT_BOOKMARK_LIST">
         <property accessibilityHint1="" accessibilityHint2="" backgroundStyle="BACKGROUND_STYLE_DEFAULT" colorOfText="" colorOfTitleText="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" disabledTitleTextColor="" groupId="0" groupStyle="GROUP_STYLE_NONE" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" highlightedTitleTextColor="" horizontalAlign="ALIGN_LEFT" normalColor="#DCDAD3" normalColorOpacity="100" pressedColor="" pressedColorOpacity="100" pressedTextColor="" pressedTitleTextColor="" showTitleText="false" text="::IDS_BR_OPT_SELECT_ALL" titleText="" verticalAlign="ALIGN_MIDDLE"/>
@@ -39,6 +39,6 @@
     <ListView id="IDC_LISTVIEW1" parent="IDL_EDIT_BOOKMARK_LIST">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" itemDivider="true" itemDividerColor="" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
         <layout bottomRelation="IDC_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="958.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="112.0"/>
-        <layout bottomRelation="IDC_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="457.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_EDIT_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="112.0"/>
+        <layout bottomRelation="IDC_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="469.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_EDIT_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="112.0"/>
     </ListView>
 </Scene>

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 (file)
--- a/res/screen-size-normal/IDL_FIND_ON_PAGE.xml
+++ b/res/screen-size-normal/IDL_FIND_ON_PAGE.xml
@@ -2,10 +2,9 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
-
 <ScenePanel Bversion="2.0.0.201307161751" Dversion="20120315">
-    <Panel id="IDL_FIND_ON_PAGE">
+    <LogicalCoordinate>720</LogicalCoordinate>
+<Panel id="IDL_FIND_ON_PAGE">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="82.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="3.0" y="27.0"/>
         <layout height="82.0" mode="Landscape" type="LAYOUT_RELATIVE" width="1280.0" x="3.0" y="142.0"/>

diff --git a/res/screen-size-normal/IDL_NOTIFICATION_PANEL.xml b/res/screen-size-normal/IDL_NOTIFICATION_PANEL.xml
index 9246bd7..3f59b87 100644 (file)
--- a/res/screen-size-normal/IDL_NOTIFICATION_PANEL.xml
+++ b/res/screen-size-normal/IDL_NOTIFICATION_PANEL.xml
@@ -2,9 +2,9 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
 <ScenePanel Bversion="2.0.0.201305162056" Dversion="20120315">
-    <Panel id="IDL_NOTIFICATION_PANEL">
+    <LogicalCoordinate>720</LogicalCoordinate>
+<Panel id="IDL_NOTIFICATION_PANEL">
         <property backgroundColor="#444444" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="54.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="113.0"/>
         <layout height="48.0" mode="Landscape" type="LAYOUT_RELATIVE" width="1280.0" x="0.0" y="538.0"/>

diff --git a/src/IntBrightnessForm.cpp b/src/IntBrightnessForm.cpp
index 4c88a66..51e0963 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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);