Fixed Nabi issues N_SE-49016, N_SE-48879, N_SE-48597, N_SE-48815, N_SE-48813, N_SE...

Change-Id: Iacf3f0299f2ccbbaf44b5e129793f72c3c5ce71d

diff --git a/inc/IntNotificationPanel.h b/inc/IntNotificationPanel.h
index a071bb8..8646089 100644 (file)
--- a/inc/IntNotificationPanel.h
+++ b/inc/IntNotificationPanel.h
@@ -71,6 +71,8 @@ class NotificationPanel
         */
        void SetText(Tizen::Base::String& message);
 
+       void OrientationChanged();
+
   private:
        Tizen::Ui::Controls::Form& __form;
        Tizen::Ui::Controls::Label* __pLabel;

diff --git a/inc/IntSettingForm.h b/inc/IntSettingForm.h
index a10396b..a4f27b0 100644 (file)
--- a/inc/IntSettingForm.h
+++ b/inc/IntSettingForm.h
@@ -29,6 +29,7 @@
 
 #include "IntMultipleWindowPresentationModel.h"
 #include "IntConfirmationPopup.h"
+#include "IntNotificationPanel.h"
 
 class SettingForm
        : public Tizen::Ui::Controls::Form
@@ -200,6 +201,7 @@ private:
        int __fontValue;
        ConfirmationPopup* __pConfirmationPopup;
        Tizen::Ui::Controls::GroupedListView* __pList;
+       NotificationPanel* __pNotification;
        Tizen::Ui::Controls::Popup* __pResetPopup;
        WindowInfo* __pWindowInfo;                          // Contains window information of current scene
        bool __isCurrentPageDisable;

diff --git a/res/screen-size-normal/IDL_ADDRESSBAR.xml b/res/screen-size-normal/IDL_ADDRESSBAR.xml
index fb00f6f..1ba6251 100644 (file)
--- a/res/screen-size-normal/IDL_ADDRESSBAR.xml
+++ b/res/screen-size-normal/IDL_ADDRESSBAR.xml
@@ -41,7 +41,7 @@
     </Button>
     <EditField id="IDC_URL_EDITFIELD" parent="IDC_BG_PANEL">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="::IDS_BR_BODY_SEARCH_OR_ENTER_URL" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#4E4945" horizontalMargin="0.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="2048" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="18.0" viewMode="false"/>
-        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_TOOLBAR_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="4.0" mode="Portrait" rightRelation="IDC_CLEAR_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="472.0" x="96.0" y="2.0"/>
+        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="70.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_TOOLBAR_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_CLEAR_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="472.0" x="96.0" y="2.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_TOOLBAR_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_CLEAR_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1026.0" x="96.0" y="1.0"/>
     </EditField>
     <Label id="IDC_URL_LABEL" parent="IDC_BG_PANEL">

diff --git a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
index 420f270..76f3bb3 100644 (file)
--- a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
+++ b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
@@ -18,7 +18,7 @@
         </itemSet>
     </Header>
     <ScrollPanel id="IDC_SCROLLPANEL2" parent="IDL_ADD_BOOKMARK">
-        <property autoResizingEnabled="true" backgroundColor="" backgroundColorOpacity="0" clientAreaHeight="0" clientAreaWidth="0" pageScrollEnabled="true" scrollBarVisible="true" scrollDirection="SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION"/>
+        <property autoResizingEnabled="true" backgroundColor="" backgroundColorOpacity="0" clientAreaHeight="0" clientAreaWidth="0" pageScrollEnabled="false" scrollBarVisible="true" scrollDirection="SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION"/>
         <panelLayout height="1123.0" mode="Portrait" width="720.0"/>
         <panelLayout height="563.0" mode="Landscape" width="1280.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1124.0" horizontalFitPolicy="FIT_POLICY_PARENT" 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_PARENT" width="720.0" x="0" y="0"/>

diff --git a/res/screen-size-normal/IDL_SETTING_FORM.xml b/res/screen-size-normal/IDL_SETTING_FORM.xml
index 7150b91..0198657 100644 (file)
--- a/res/screen-size-normal/IDL_SETTING_FORM.xml
+++ b/res/screen-size-normal/IDL_SETTING_FORM.xml
@@ -3,25 +3,16 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-
-<Scene Bversion="2.0.0.201307161751" Dversion="20120315">
+<Scene Bversion="2.0.0.201308142048" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SETTING_FORM">
         <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"/>
-        <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE" type="LAYOUT_RELATIVE"/>
-        <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE" type="LAYOUT_RELATIVE"/>
+        <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE" type="LAYOUT_RELATIVE"/>
+        <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE" type="LAYOUT_RELATIVE"/>
     </Form>
-    <Footer>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" showMenuButton="false"/>
-        <itemSet/>
-    </Footer>
-    <Header>
-        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="::IDS_COM_BODY_SETTINGS" titleTextColor=""/>
-        <itemSet/>
-    </Header>
     <GroupedListView id="IDC_SETTING_LIST" parent="IDL_SETTING_FORM">
         <property backgroundBitmapPath="" backgroundColor="#F9F9F9" backgroundColorOpacity="100" bitmapPathOfEmptyList="" colorOfEmptyListText="" itemDivider="true" itemDividerColor="#8E9AA3" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sectionColor="" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1026.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_SETTING_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0.0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="544.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_SETTING_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="1280.0" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1220.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_SETTING_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0.0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="546.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_SETTING_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="1280.0" x="0" y="0"/>
     </GroupedListView>
 </Scene>

diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index a7b413c..c4dcda8 100644 (file)
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -119,7 +119,7 @@ AddBookmarkForm::OnInitializing(void)
        {
                return E_FAILURE;
        }
-       __pScrollPanel->SetPageScrollEnabled(true);
+       //__pScrollPanel->SetPageScrollEnabled(true);
        // Title EditField added on the Scroll Panel
        __pEditFieldTitle = static_cast< EditField* >(__pScrollPanel->GetControl(L"IDC_EDITFIELD1"));
 

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 911ae38..4596800 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -4283,7 +4283,7 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
        AppLog("MainForm::OnTextFound totalCount %d",totalCount);
        AppLog("MainForm::OnTextFound currentOrdinal %d",currentOrdinal);
 
-       if(totalCount == -1 || totalCount == 0)
+       if(totalCount <= 9)
        {
                if (__pFindWordCountLabel)
                {
@@ -4294,7 +4294,7 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
                        __pFindWordEditField->SetBounds(__pFindWordEditField->GetX(),__pFindWordEditField->GetY(),214+80,__pFindWordEditField->GetHeight());
                }
        }
-       else if(totalCount > 100)
+       else if(totalCount >= 100)
        {
                if (__pFindWordCountLabel)
                {

diff --git a/src/IntNotificationPanel.cpp b/src/IntNotificationPanel.cpp
index a479bfb..9b68982 100644 (file)
--- a/src/IntNotificationPanel.cpp
+++ b/src/IntNotificationPanel.cpp
@@ -78,7 +78,7 @@ NotificationPanel::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
 void
 NotificationPanel::ShowNotification(void)
 {
-       SceneManager* pSceneManager = null;
+       SceneManager* pSceneManager = SceneManager::GetInstance();
        if ( __pLabel != NULL)
        {
                AddControl(__pLabel);
@@ -114,3 +114,22 @@ NotificationPanel::SetPositionDiff(int pos)
 {
        __position = pos ;
 }
+
+void
+NotificationPanel::OrientationChanged()
+{
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       SceneId sceneId = pSceneManager->GetInstance()->GetCurrentSceneId();
+
+       if (sceneId == IDSCN_EDIT_HISTORY_LIST || sceneId == IDSCN_EDIT_BOOKMARK_LIST /*|| sceneId == IDSCN_SETTINGS*/)
+       {
+               SetPosition(0,__form.GetClientAreaBounds().height - GetHeight());
+               SetSize(__form.GetWidth(),GetHeight());
+       }
+       else
+       {
+               // Since there is a footer panel for the Main form need to subtract __position which is equal to footer panel height.
+               SetPosition(0,__form.GetClientAreaBounds().height -__position - GetHeight());
+       }
+       Invalidate(true);
+}

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index c5a1314..de64910 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -50,7 +50,7 @@ using namespace Tizen::Ui::Scenes;
 
 
 SettingForm::SettingForm(void)
-: __fontValue(0),__pResetPopup(null),__pWindowInfo(null) , __pConfirmationPopup(null)
+: __fontValue(0),__pResetPopup(null),__pWindowInfo(null) , __pConfirmationPopup(null),__pNotification(null)
 {
        __currentURL = L"";
        __pList = null;
@@ -263,7 +263,7 @@ SettingForm::OnInitializing(void)
 
        bool isHwKeySupported = false;
 
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR);
+       //SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR);
        __pList = static_cast< GroupedListView* >(GetControl(L"IDC_SETTING_LIST"));
        if ( __pList != NULL )
        {
@@ -887,10 +887,17 @@ SettingForm::OnActionPerformed(const Control& source, int actionId)
                        delete __pConfirmationPopup;
                        __pConfirmationPopup = null;
 
-                       NotificationPanel* pNotification = new (std::nothrow) NotificationPanel(*this);
-                       pNotification->SetText(message);
-                       pNotification->SetPositionDiff(0);
-                       pNotification->ShowNotification();
+                       if (__pNotification != null)
+                       {
+                               RemoveControl(__pNotification);
+                               __pNotification = null;
+                       }
+                       __pNotification = new (std::nothrow) NotificationPanel(*this);
+
+                       //NotificationPanel* pNotification = new (std::nothrow) NotificationPanel(*this);
+                       __pNotification->SetText(message);
+                       __pNotification->SetPositionDiff(0);
+                       __pNotification->ShowNotification();
                }
                break;
 
@@ -903,7 +910,13 @@ void
 SettingForm::OnOrientationChanged(const Control& source, OrientationStatus orientationStatus)
 {
        Rectangle rect = GetClientAreaBounds();
-       if(__pList == null)
+
+       if (__pNotification != null && __pNotification->GetShowState() == true)
+       {
+               __pNotification->OrientationChanged();
+       }
+
+       if (__pList == null)
        {
                return;
        }