Fixed Nabi Issues

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

diff --git a/res/screen-density-xhigh/I01_toolbar_input_field.9.png b/res/screen-density-xhigh/I01_toolbar_input_field.#.png
similarity index 100%
rename from res/screen-density-xhigh/I01_toolbar_input_field.9.png
rename to res/screen-density-xhigh/I01_toolbar_input_field.#.png

diff --git a/res/screen-density-xhigh/I01_toolbar_input_field_findword.9.png b/res/screen-density-xhigh/I01_toolbar_input_field_findword.#.png
similarity index 100%
rename from res/screen-density-xhigh/I01_toolbar_input_field_findword.9.png
rename to res/screen-density-xhigh/I01_toolbar_input_field_findword.#.png

diff --git a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
index 76f3bb3..d8848ae 100644 (file)
--- a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
+++ b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
@@ -3,7 +3,8 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201308142048" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201308220944" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_ADD_BOOKMARK">
         <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"/>
@@ -13,8 +14,8 @@
     <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="Add Bookmarks" titleTextColor=""/>
         <itemSet>
-            <buttonItem accessibilityHint="" actionId="103" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="left"/>
-            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_COM_SK_SAVE" type="right"/>
+            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_COM_SK_SAVE" type="left"/>
+            <buttonItem accessibilityHint="" actionId="103" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="right"/>
         </itemSet>
     </Header>
     <ScrollPanel id="IDC_SCROLLPANEL2" parent="IDL_ADD_BOOKMARK">

diff --git a/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml b/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
index 79d80ea..fb2c97d 100644 (file)
--- a/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
+++ b/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201307161751" Dversion="20120315">
+<Scene Bversion="2.0.0.201308220944" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_CREATE_BOOKMARK_FOLDER">
         <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"/>
@@ -14,8 +14,8 @@
     <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="" titleTextColor=""/>
         <itemSet>
-            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="left"/>
-            <buttonItem accessibilityHint="" actionId="101" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_DONE" type="right"/>
+            <buttonItem accessibilityHint="" actionId="101" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_DONE" type="left"/>
+            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="right"/>
         </itemSet>
     </Header>
     <Label id="IDC_LABEL1" parent="IDL_CREATE_BOOKMARK_FOLDER">

diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index c4dcda8..d21500c 100644 (file)
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -1059,12 +1059,12 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
        // To disable done button if either of the Title or Url field is empty
        if (title.GetLength() == 0 || url.GetLength() == 0)
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
                pHeader->Invalidate(true);
        }
        else
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
                pHeader->Invalidate(true);
        }
 
@@ -1145,12 +1145,12 @@ AddBookmarkForm::OnTextValueChanged(const Control& source)
        // To disable done button if either of the Title or Url field is empty
        if (title.GetLength() == 0 || url.GetLength() == 0)
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
                pHeader->Invalidate(true);
        }
        else
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
                pHeader->Invalidate(true);
        }
 

diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index 1c39882..a9f26c9 100644 (file)
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -33,7 +33,7 @@ using namespace Tizen::System;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 
-static const wchar_t* IDB_SEARCH_INPUT_FIELD_BG = L"I01_toolbar_input_field.9.png";
+static const wchar_t* IDB_SEARCH_INPUT_FIELD_BG = L"I01_toolbar_input_field.#.png";
 static const wchar_t* IDB_TITLE_PROGRESS_BAR_BG = L"I01_title_progress_bar_bg.png";
 static const wchar_t* IDB_TITLE_PROGRESS_BAR = L"I01_title_progress_bar.png";
 static const wchar_t* IDB_ICON_PRIVATE = L"I01_icon_private.png";
@@ -432,6 +432,7 @@ Addressbar::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        {
        case IDA_CANCEL:
        {
+               __isAppBackGround = false;
 //             __pAddressbarUrlField->HideKeypad();
                __pListener->OnAddressCancelledClicked(*this);
                //SetAddressbarMode(ADDRESSBAR_MODE_LOADING_COMPLETE);

diff --git a/src/IntArticleReaderForm.cpp b/src/IntArticleReaderForm.cpp
index 3af0e9b..314febd 100644 (file)
--- a/src/IntArticleReaderForm.cpp
+++ b/src/IntArticleReaderForm.cpp
@@ -38,7 +38,7 @@ using namespace Tizen::Web::Controls;
 
 static const wchar_t* IDB_SMALL_FONT = L"I01_font_button_left.png";
 static const wchar_t* IDB_LARGE_FONT = L"I01_font_button_right.png";
-static const wchar_t* IDB_FINDWORD_INPUT_FIELD_BG = L"I01_toolbar_input_field_findword.9.png";
+static const wchar_t* IDB_FINDWORD_INPUT_FIELD_BG = L"I01_toolbar_input_field_findword.#.png";
 
 const int ArticleReaderForm::IDA_MORE_BUTTON = 101;
 const int ArticleReaderForm::IDA_BACK_BUTTON = 102;

diff --git a/src/IntCreateBookmarkFolderForm.cpp b/src/IntCreateBookmarkFolderForm.cpp
index d1b750b..838805b 100644 (file)
--- a/src/IntCreateBookmarkFolderForm.cpp
+++ b/src/IntCreateBookmarkFolderForm.cpp
@@ -443,11 +443,11 @@ CreateBookmarkFolderForm::OnTextValueChanged(const Control& source)
        // To disable done button when folder title edit-field is empty
        if (__pFolderTitle && title.GetLength() == 0)
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
        }
        else
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
        }
        pHeader->Invalidate(true);
        return;

diff --git a/src/IntEditHistoryListForm.cpp b/src/IntEditHistoryListForm.cpp
index e6b9cfd..5e79a57 100644 (file)
--- a/src/IntEditHistoryListForm.cpp
+++ b/src/IntEditHistoryListForm.cpp
@@ -95,7 +95,7 @@ EditHistoryListForm::OnInitializing(void)
        SetFormBackEventListener(this);
 
        AppLogDebug("EditHistoryListForm::OnInitializing");
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+//     SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
 
        __fontSize = CommonUtil::GetFontSize();
 

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index 43929d5..32a17a6 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -320,6 +320,20 @@ InternetApp::OnSettingChanged(Tizen::Base::String& key)
        {
                Terminate();
        }
+       else if (key == L"http://tizen.org/setting/screen.brightness" )
+       {
+               AppRegistry* pAppRegistry = App::GetInstance()->GetAppRegistry();
+               String sliderKey("SliderValue");
+
+               int sliderValue = 10;
+
+
+               result r = pAppRegistry->Get(sliderKey, sliderValue);
+               r = PowerManager::SetScreenBrightness(sliderValue);
+               //      r = PowerManager::RestoreScreenBrightness();
+
+       }
+
 }
 
 void

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 072e148..70c1f4c 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -55,8 +55,8 @@ using namespace Tizen::System;
 using namespace Tizen::Web;
 using namespace Tizen::Web::Controls;
 
-static const wchar_t* IDB_SEARCH_INPUT_FIELD_BG = L"I01_toolbar_input_field.9.png";
-static const wchar_t* IDB_FINDWORD_INPUT_FIELD_BG = L"I01_toolbar_input_field_findword.9.png";
+static const wchar_t* IDB_SEARCH_INPUT_FIELD_BG = L"I01_toolbar_input_field.#.png";
+static const wchar_t* IDB_FINDWORD_INPUT_FIELD_BG = L"I01_toolbar_input_field_findword.#.png";
 static const wchar_t* IDB_BTN_BACK = L"I01_icon_Back.png";
 static const wchar_t* IDB_BTN_BACK_PRESS = L"I01_icon_Back_press.png";
 static const wchar_t* IDB_CONTRLBAR_ICON_BOOKMARK = L"I01_search_list_icon_favorite.png";
@@ -2487,6 +2487,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_PASTE_TEXT_CLICKED:
        {
+               __pWebViewer->ReleaseBlock();
                Clipboard* pClipboard = Clipboard::GetInstance();
 
                if(pClipboard == null)
@@ -2537,10 +2538,9 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        }
                        else if(tagElement.GetLength() != 0) //adding for twitter post page
                        {
-                               script = L"function insertAtCursor(myField, myValue) {  if (document.selection) {   document.getElementsByTagName(myField)[0].focus();   sel = document.selection.createRange();   sel.text = myValue;  }   else if (myField.selectionStart || myField.selectionStart == '0'){   var startPos = myField.selectionStart;   var endPos = myField.selectionEnd;   myField.value = myField.value.substring(0, startPos)+ myValue + myField.value.substring(endPos, myField.value.length);   } else {    document.getElementsByTagName(myField)[0].value += myValue;   }  } ";
-                               script.Append("insertAtCursor(document.getElementsByTagName('");
-                               script.Append(tagElement);
-                               script.Append("')[0],");
+                               script = L"function insertAtCursor(myField, myValue) {  if (document.selection) {   myField.focus();   sel = document.selection.createRange();   sel.text = myValue;  }   else if (myField.selectionStart || myField.selectionStart == '0'){   var startPos = myField.selectionStart;   var endPos = myField.selectionEnd;   myField.value = myField.value.substring(0, startPos)+ myValue + myField.value.substring(endPos, myField.value.length);   } else {    myField.value += myValue;   }  } ";
+
+                               script.Append("insertAtCursor(document.activeElement,");
                                script.Append("\"");
                                script.Append(*pString);
                                script.Append("\");");
@@ -3106,7 +3106,6 @@ MainForm::OnLoadingCanceled(void)
 
 }
 
-
 void
 MainForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
@@ -3120,7 +3119,7 @@ MainForm::OnKeypadOpened(Tizen::Ui::Control& source)
        AppLog("XYZ::MainForm::OnKeypadOpened");
        __isKeypadOpened = true;
        __pFooterPanel->SetShowState(false);
-
+       RelayoutControls(false);
 }
 
 void
@@ -4209,7 +4208,7 @@ MainForm::RelayoutControls(bool showAddressbar,bool relayoutFooter)
        AppLog("xyz:: MainForm::RelayoutControls called");
        __webControlPosition.y = 0;
        __webControlHeight = GetClientAreaBounds().height;
-       AppLog("Client area height: %d", __webControlHeight);
+       AppLog("Client area height: %d width %d", __webControlHeight,GetClientAreaBounds().width);
 
        AppLog("Client area height: %d", __webControlHeight);
        if(__pAddressbar != null && __pAddressbar->GetShowState() == true)
@@ -4659,6 +4658,8 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
                AppLog("Returning because of more than one touch point.");
                return;
        }
+       if(__pWebViewer)
+               __pWebViewer->ReleaseBlock();
        __longPressPoint = currentPosition;
 
        if (__pHitElementResult != null)
@@ -5010,6 +5011,7 @@ MainForm::OnSettingsChange(int settingvalue)
                        settings.SetAutoFittingEnabled(false);
                }
                __pWebViewer->SetSetting(settings);
+
        }
        else if (settingvalue == (int) REGISTRY_SETTING_RUN_JAVASCRIPT)
        {

diff --git a/src/IntMultipleWindowForm.cpp b/src/IntMultipleWindowForm.cpp
index 88e7f50..b95ae84 100644 (file)
--- a/src/IntMultipleWindowForm.cpp
+++ b/src/IntMultipleWindowForm.cpp
@@ -29,6 +29,7 @@
 #include "IntMultipleWindowForm.h"
 #include "IntMultipleWindowPresentationModel.h"
 #include "IntSceneRegister.h"
+#include "IntSettingPresentationModel.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
@@ -103,7 +104,7 @@ MultipleWindowForm::OnInitializing(void)
                return E_FAILURE;
        }
 
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+//     SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
 
        r = pSceneManager->AddSceneEventListener(IDSCN_MULTIPLE_WINDOW, *this);
 
@@ -304,12 +305,25 @@ MultipleWindowForm::OnActionPerformed(const Control& source, int actionId)
                        SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
                }
                pAllWindowList->RemoveAll(true);
-               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN();
+               String homePage = SettingPresentationModel::GetInstance()->GetHomepage();
+               if (homePage == (L"IDS_BR_BODY_MOST_VISITED_SITES") || homePage == (L"IDS_BR_BODY_BLANK_PAGE"))
+               {
+                       homePage = L"";
+               }
+               else if (homePage == CommonUtil::GetString(L"IDS_BR_BODY_USER_HOMEPAGE"))
+               {
+                       AppLog("InternetApp::OnAppInitialized homaepage = userhomepage");
+                       homePage = SettingPresentationModel::GetInstance()->GetFavoriteUrl();
+                       AppLog("InternetApp::OnAppInitialized fav URL = %ls ",homePage.GetPointer());
+               }
+
+               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN(homePage);
 
                if (pNewWindowInfo == null)
                {
                        return;
                }
+               pNewWindowInfo->isAppcontrolTriggered = true;
                result r = E_SUCCESS;
                SceneManager* pSceneManager = SceneManager::GetInstance();
                if (pSceneManager == NULL)

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index de64910..426e6b3 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -1022,7 +1022,14 @@ SettingForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& cu
                {
                        __isCurrentPageDisable = false;
                        AppLog("set item enabled is true");
-                       __pList->SetItemEnabled(0, 1, true);
+                       if (settingInfo[0].isOpen == false)
+                       {
+                               __pList->SetItemEnabled(0,1,false);
+                       }
+                       else
+                       {
+                               __pList->SetItemEnabled(0,1,true);
+                       }
                }
                for(int grpindex = 0; grpindex < groupCount; grpindex++)
                {