Fixed Nabi Issues

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

diff --git a/res/screen-size-normal/IDL_FIND_ON_PAGE.xml b/res/screen-size-normal/IDL_FIND_ON_PAGE.xml
index d16f92e..e248f79 100644 (file)
--- a/res/screen-size-normal/IDL_FIND_ON_PAGE.xml
+++ b/res/screen-size-normal/IDL_FIND_ON_PAGE.xml
@@ -3,7 +3,8 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
-<ScenePanel Bversion="2.0.0.201305311836" Dversion="20120315">
+
+<ScenePanel Bversion="2.0.0.201306151404" Dversion="20120315">
     <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"/>
@@ -70,7 +71,7 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="IDC_PANEL2" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="671.0" x="252.0" y="0.0"/>
     </EditField>
     <Label id="IDC_FIND_COUNT_LABEL2" parent="IDC_PANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" leftMargin="16" text="" textColor="#4E4945" textSize="22.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#4E4945" textSize="22.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="124.0" x="72.0" y="0.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="180.0" x="72.0" y="0.0"/>
     </Label>

diff --git a/src/IntEditHistoryListForm.cpp b/src/IntEditHistoryListForm.cpp
index c9a6425..0f38013 100644 (file)
--- a/src/IntEditHistoryListForm.cpp
+++ b/src/IntEditHistoryListForm.cpp
@@ -755,6 +755,7 @@ EditHistoryListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previou
        AppLogDebug("EditHistoryListForm::OnSceneActivatedN");
        int groupCount = 0;
        int count = 0;
+       String selectedText = L"";
 
        if(__pGroupData != null)
        {
@@ -779,6 +780,9 @@ EditHistoryListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previou
        }
        __pSelectAllCheck->SetSelected(false);
        __selectedCount = 0;
+       selectedText.Format(25, CommonUtil::GetString(L"IDS_BR_BODY_PD_ITEM_SELECTED").GetPointer() , __selectedCount);
+       __pSelectedLabel->SetText(selectedText);
+       __pSelectedLabel->Invalidate(true);
        GetFooter()->SetItemEnabled(0, false);
        Invalidate(true);
 }

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 60705a3..056e076 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -265,7 +265,7 @@ MainForm::Initialize(void)
        InternetApp* pInternet = static_cast<InternetApp*> (Application::GetInstance());
        Construct(L"IDL_FORM_HW_KEY");
 
-//     SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER);
+//     SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_FOOTER);
        return true;
 }
 
@@ -314,6 +314,7 @@ MainForm::OnInitializing(void)
        __pItemContextLandscape->SetElementBackgroundColor(IDA_CONTEXT_ITEM_DELETE,LIST_CONTEXT_ITEM_ELEMENT_STATUS_HIGHLIGHTED , CONTEXT_ITEM_DELETE_COLOR);
        __pItemContextLandscape->SetElementBackgroundColor(IDA_CONTEXT_ITEM_DELETE,LIST_CONTEXT_ITEM_ELEMENT_STATUS_PRESSED , CONTEXT_ITEM_DELETE_COLOR);
        SetFormMenuEventListener(this);
+       AppLog("SetFormMenuEventListener result %s",GetErrorMessage(GetLastResult()));
        return E_SUCCESS;
 }
 
@@ -571,6 +572,7 @@ MainForm::InitFooter(void)
 
 
        SetFormBackEventListener(this);
+       AppLog("SetFormBackEventListener result  %s",GetErrorMessage(GetLastResult()));
        if (__pMultiWindowButton != null)
        {
                Bitmap* pBitmap = null;
@@ -1649,7 +1651,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_PRINT_CLICKED:
        {
-               r = __pWebViewer->SavePageAsPdf(UiApp::GetInstance()->GetAppRootPath()+"//shared//data//test.pdf");
+               r = __pWebViewer->SavePageAsPdf(UiApp::GetInstance()->GetAppRootPath()+"//data//test.pdf");
                AppLog("SavePageAsPdf result %s",GetErrorMessage(r));
 
                AppLog("RequestPrint called!");
@@ -1668,7 +1670,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        String fileCount = L"service_print_files_count";
                        String countVal = L"1";
                        String fileFolder= L"service_print_files_folder_name";
-                       String folderVal = UiApp::GetInstance()->GetAppRootPath()+"//shared//data";
+                       String folderVal = UiApp::GetInstance()->GetAppRootPath()+"//data";
 
                        map.Add(&fileCount, &countVal);
                        map.Add(&fileFolder, &folderVal);
@@ -3704,11 +3706,11 @@ MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint
                AppLog("MainForm::OnWebPageBlockSelected web not null");
                __pHitElementResult = __pWebViewer->GetElementByPointN(startPoint);
 
-               if(GetLastResult() == E_INVALID_ARG)
+               if(GetLastResult() == E_INVALID_ARG || (__pHitElementResult->GetTagName().CompareTo(L"INPUT") != 0 && __pHitElementResult->GetTagName().CompareTo(L"TEXTAREA") != 0))
                {
                        AppLog("datafirst startpoint error %s",GetErrorMessage(GetLastResult()));
                        __pHitElementResult = __pWebViewer->GetElementByPointN(endPoint);
-                       if(GetLastResult() == E_INVALID_ARG)
+                       if(GetLastResult() == E_INVALID_ARG || (__pHitElementResult->GetTagName().CompareTo(L"INPUT") != 0 && __pHitElementResult->GetTagName().CompareTo(L"TEXTAREA") != 0))
                        {
                                __pHitElementResult = __pWebViewer->GetElementByPointN(__longPressPoint);
                        }