From 80b97a05067a944cd4ea3cc0ee026e24b20b624b Mon Sep 17 00:00:00 2001 From: Kim Kibum Date: Fri, 27 Apr 2012 13:25:44 +0900 Subject: Tizen souce update --- debian/changelog | 78 +++++++++++++++++++++ packaging/org.tizen.browser.spec | 2 +- resource/org.tizen.browser.desktop.in | 2 +- resource/org.tizen.browser.png | Bin 12448 -> 30312 bytes src/browser-bookmark/browser-bookmark-view.cpp | 14 ++-- src/browser-bookmark/browser-new-folder-view.cpp | 17 +++-- src/browser-bookmark/browser-new-folder-view.h | 2 +- src/browser-history/browser-history-layout.cpp | 12 ++-- .../browser-settings-clear-data-view.cpp | 4 +- src/browser-view/browser-view.cpp | 19 +++-- src/database/browser-bookmark-db.cpp | 5 +- src/include/browser-string.h | 1 + 12 files changed, 129 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index f9a59edf..967050f4 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,81 @@ +browser (0.1.14-0) unstable; urgency=low + + * Git : slp/plgs/b/browser + * Tag : browser_0.1.14-0 + + * Replace icon of browser(internet) + * update spec file + + -- Junghwan Kang Sat, 21 Apr 2012 20:05:28 +0900 + +browser (0.1.13-0) unstable; urgency=low + + * Git : slp/pkgs/b/browser + * Tag : browser_0.1.13-0 + + * Fix context menu minor bug. + * update spec file. + + -- Hyerim Bae Thu, 19 Apr 2012 19:12:02 +0900 + +browser (0.1.12-0) unstable; urgency=low + + * Git : slp/pkgs/b/browser + * Tag : browser_0.1.12-0 + + * Fix minor bug in history view. + * update spec file. + + -- Hyerim bae Thu, 19 Apr 2012 13:57:38 +0900 + +browser (0.1.11-0) unstable; urgency=low + + * Git : slp/pkgs/b/browser + * Tag : browser_0.1.11-0 + + * Fix minor bugs in bookmark view. + * update spec file. + + -- Hyerim Bae Tue, 17 Apr 2012 19:08:26 +0900 + +browser (0.1.10-0) unstable; urgency=low + + * Git : slp/pkgs/b/browser + * Tag : browser_0.1.10-0 + + * Fix minor bugs. + + -- Hyerim Bae Mon, 16 Apr 2012 18:22:25 +0900 + +browser (0.1.9-0) unstable; urgency=low + + * Git : slp/pkgs/b/browser + * Tag : browser_0.1.9-0 + + * Fix minor bugs + + -- Junghwan Kang Tue, 10 Apr 2012 17:33:28 +0900 + +browser (0.1.8-0) unstable; urgency=low + + * Git : slp/pkgs/b/browser + * Tag : browser_0.1.8-0 + + * Fix minor bugs + * change version name of spec file + + -- Sangpyo Kim Tue, 10 Apr 2012 16:56:59 +0900 + +browser (0.1.7-0) unstable; urgency=low + + * Git : slp/pkgs/b/browser + * Tag : browser_0.1.7-0 + + * Fix minor translation issue of delete popup + * git clone git@165.213.180.234:shared/pkgs/b/browser + + -- Junghwan Kang Tue, 10 Apr 2012 11:37:04 +0900 + browser (0.1.6-0) unstable; urgency=low * Git : slp/pkgs/b/browser diff --git a/packaging/org.tizen.browser.spec b/packaging/org.tizen.browser.spec index da8a8783..34e833a6 100644 --- a/packaging/org.tizen.browser.spec +++ b/packaging/org.tizen.browser.spec @@ -2,7 +2,7 @@ Name: org.tizen.browser Summary: webkit browser with EFL -Version: 0.1.6 +Version: 0.1.14 Release: 2 Group: Applications License: Samsung Proprietary License diff --git a/resource/org.tizen.browser.desktop.in b/resource/org.tizen.browser.desktop.in index c1805587..4a171a74 100755 --- a/resource/org.tizen.browser.desktop.in +++ b/resource/org.tizen.browser.desktop.in @@ -26,4 +26,4 @@ X-TIZEN-IsHorizontalScale=1 X-TIZEN-TaskManage=True X-TIZEN-Multiple=False X-TIZEN-Removable=False -X-TIZEN-SVC=http://tizen.org/appsvc/operation/view|http|NULL,http://tizen.org/appsvc/operation/view|file|NULL,http://tizen.org/appsvc/operation/view|NULL|application/x-shockwave-flash,http://tizen.org/appsvc/operation/view|NULL|image/svg+xml,http://tizen.org/appsvc/operation/view|NULL|text/html,http://tizen.org/appsvc/operation/view|NULL|application/xml \ No newline at end of file +X-TIZEN-SVC=http://tizen.org/appsvc/operation/view|http|NULL,http://tizen.org/appsvc/operation/view|https|NULL,http://tizen.org/appsvc/operation/view|file|NULL,http://tizen.org/appsvc/operation/view|NULL|application/x-shockwave-flash,http://tizen.org/appsvc/operation/view|NULL|image/svg+xml,http://tizen.org/appsvc/operation/view|NULL|text/html,http://tizen.org/appsvc/operation/view|NULL|application/xml diff --git a/resource/org.tizen.browser.png b/resource/org.tizen.browser.png index a9102254..d844acae 100755 Binary files a/resource/org.tizen.browser.png and b/resource/org.tizen.browser.png differ diff --git a/src/browser-bookmark/browser-bookmark-view.cpp b/src/browser-bookmark/browser-bookmark-view.cpp index ab611552..565c152c 100755 --- a/src/browser-bookmark/browser-bookmark-view.cpp +++ b/src/browser-bookmark/browser-bookmark-view.cpp @@ -1087,7 +1087,8 @@ void Browser_Bookmark_View::__rename_folder_unfocus_cb(void *data, Evas_Object * Evas_Object *genlist = bookmark_view->_get_current_folder_genlist(); Evas_Object *edit_field_entry = obj; - char *text = elm_entry_markup_to_utf8(elm_entry_entry_get(edit_field_entry)); + char *markup_text = elm_entry_markup_to_utf8(elm_entry_entry_get(edit_field_entry)); + char *text = bookmark_view->_trim(markup_text); if (!text) { BROWSER_LOGE("elm_entry_markup_to_utf8 failed"); return; @@ -1113,6 +1114,8 @@ void Browser_Bookmark_View::__rename_folder_unfocus_cb(void *data, Evas_Object * item->title = text; m_data_manager->get_bookmark_db()->modify_bookmark_title(item->id, text); } else { + if (elm_genlist_decorate_mode_get(bookmark_view->_get_current_folder_genlist())) + bookmark_view->show_msg_popup(BR_STRING_ALREADY_EXISTS); std::string folder_name = m_data_manager->get_bookmark_db()->get_folder_name_by_id(item->id); elm_entry_entry_set(edit_field_entry, folder_name.c_str()); } @@ -1123,7 +1126,7 @@ void Browser_Bookmark_View::__rename_folder_unfocus_cb(void *data, Evas_Object * bookmark_view->m_rename_edit_field = NULL; - free(text); + free(markup_text); } void Browser_Bookmark_View::__drag_genlist_cb(void *data, Evas_Object *obj, void *event_info) @@ -1338,9 +1341,7 @@ Evas_Object *Browser_Bookmark_View::_show_delete_confirm_popup(void) } evas_object_size_hint_weight_set(m_delete_confirm_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - - std::string confirm_msg = std::string(BR_STRING_DELETE) + std::string("?"); - elm_object_text_set(m_delete_confirm_popup, confirm_msg.c_str()); + elm_object_text_set(m_delete_confirm_popup, BR_STRING_DELETE_Q); Evas_Object *ok_button = elm_button_add(m_delete_confirm_popup); elm_object_text_set(ok_button, BR_STRING_YES); @@ -2001,6 +2002,8 @@ Eina_Bool Browser_Bookmark_View::_set_controlbar_type(controlbar_type type) elm_object_item_part_content_set(navi_it, ELM_NAVIFRAME_ITEM_CONTROLBAR, m_bottom_control_bar); } + elm_object_focus_allow_set(m_bottom_control_bar, EINA_FALSE); + return EINA_TRUE; } @@ -2110,6 +2113,7 @@ Eina_Bool Browser_Bookmark_View::_create_main_layout(void) BR_STRING_BOOKMARKS, __controlbar_tab_changed_cb, this); elm_toolbar_item_append(m_top_control_bar, NULL, BR_STRING_HISTORY, __controlbar_tab_changed_cb, this); + elm_toolbar_select_mode_set(m_top_control_bar, ELM_OBJECT_SELECT_MODE_ALWAYS); elm_toolbar_item_selected_set(bookmark_tab_item, EINA_TRUE); evas_object_show(m_top_control_bar); diff --git a/src/browser-bookmark/browser-new-folder-view.cpp b/src/browser-bookmark/browser-new-folder-view.cpp index 004ab2db..b5ad5f27 100755 --- a/src/browser-bookmark/browser-new-folder-view.cpp +++ b/src/browser-bookmark/browser-new-folder-view.cpp @@ -88,8 +88,13 @@ void Browser_New_Folder_View::__save_button_clicked_cb(void *data, Evas_Object * elm_entry_entry_set(br_elm_editfield_entry_get(edit_field), new_folder_view->m_folder_name.c_str()); free(utf8_text); return; - } else - new_folder_view->_create_new_folder(folder_name); + } else { + if (!new_folder_view->_create_new_folder(folder_name)) { + BROWSER_LOGD("_create_new_folder failed"); + free(utf8_text); + return; + } + } free(utf8_text); @@ -108,7 +113,7 @@ void Browser_New_Folder_View::__save_button_clicked_cb(void *data, Evas_Object * bookmark_view->return_to_bookmark_view(); } -void Browser_New_Folder_View::_create_new_folder(const char *folder_name) +Eina_Bool Browser_New_Folder_View::_create_new_folder(const char *folder_name) { BROWSER_LOGD("folder_name=[%s]", folder_name); @@ -117,11 +122,11 @@ void Browser_New_Folder_View::_create_new_folder(const char *folder_name) if (bookmark_db->is_duplicated(folder_name)) { show_msg_popup(BR_STRING_ALREADY_EXISTS); - return; + return EINA_FALSE; } else if (bookmark_db->is_full()) { show_msg_popup(BR_STRING_WARNING, BR_STRING_WARNING_OVER_BOOKMARK_LIMIT, 3); - return; + return EINA_FALSE; } else { Eina_Bool ret = bookmark_db->save_folder(folder_name); @@ -151,6 +156,8 @@ void Browser_New_Folder_View::_create_new_folder(const char *folder_name) } } + + return EINA_TRUE; } void Browser_New_Folder_View::__title_entry_changed_cb(void *data, Evas_Object *obj, void *event_info) diff --git a/src/browser-bookmark/browser-new-folder-view.h b/src/browser-bookmark/browser-new-folder-view.h index e7234cc5..678c472d 100755 --- a/src/browser-bookmark/browser-new-folder-view.h +++ b/src/browser-bookmark/browser-new-folder-view.h @@ -34,7 +34,7 @@ public: Eina_Bool init(void); private: Eina_Bool _create_main_layout(void); - void _create_new_folder(const char *folder_name); + Eina_Bool _create_new_folder(const char *folder_name); string _get_default_new_folder_name(void); /* Elementary event callback functions */ diff --git a/src/browser-history/browser-history-layout.cpp b/src/browser-history/browser-history-layout.cpp index 5d2e77ef..6ae7d982 100755 --- a/src/browser-history/browser-history-layout.cpp +++ b/src/browser-history/browser-history-layout.cpp @@ -254,9 +254,15 @@ void Browser_History_Layout::__search_delay_changed_cb(void *data, Evas_Object * if (!data || !search_text) return; + char *utf8_text = elm_entry_markup_to_utf8(search_text); + if (!utf8_text) + return; + Browser_History_Layout *history_layout = (Browser_History_Layout *)data; - if (!history_layout->_show_searched_history(search_text)) + if (!history_layout->_show_searched_history(utf8_text)) BROWSER_LOGE("_show_searched_history failed"); + + free(utf8_text); } void Browser_History_Layout::_enable_searchbar_layout(Eina_Bool enable) @@ -1179,9 +1185,7 @@ Evas_Object *Browser_History_Layout::_show_delete_confirm_popup(void) } evas_object_size_hint_weight_set(m_delete_confirm_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - - std::string confirm_msg = std::string(BR_STRING_DELETE) + std::string("?"); - elm_object_text_set(m_delete_confirm_popup, confirm_msg.c_str()); + elm_object_text_set(m_delete_confirm_popup, BR_STRING_DELETE_Q); Evas_Object *ok_button = elm_button_add(m_delete_confirm_popup); elm_object_text_set(ok_button, BR_STRING_YES); diff --git a/src/browser-settings/browser-settings-clear-data-view.cpp b/src/browser-settings/browser-settings-clear-data-view.cpp index c65a8cb0..68958853 100755 --- a/src/browser-settings/browser-settings-clear-data-view.cpp +++ b/src/browser-settings/browser-settings-clear-data-view.cpp @@ -135,9 +135,7 @@ Evas_Object *Browser_Settings_Clear_Data_View::_show_delete_confirm_popup(void) } evas_object_size_hint_weight_set(m_delete_confirm_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - - std::string confirm_msg = std::string(BR_STRING_DELETE) + std::string("?"); - elm_object_text_set(m_delete_confirm_popup, confirm_msg.c_str()); + elm_object_text_set(m_delete_confirm_popup, BR_STRING_DELETE_Q); Evas_Object *ok_button = elm_button_add(m_delete_confirm_popup); if (!ok_button) { diff --git a/src/browser-view/browser-view.cpp b/src/browser-view/browser-view.cpp index 8de45034..5a542d06 100755 --- a/src/browser-view/browser-view.cpp +++ b/src/browser-view/browser-view.cpp @@ -599,6 +599,9 @@ void Browser_View::_navigationbar_visible_set_signal(Eina_Bool visible) if (visible && m_data_manager->is_in_view_stack(BR_MULTI_WINDOW_VIEW)) return; + if (m_navi_it != elm_naviframe_top_item_get(m_navi_bar)) + return; + evas_object_data_set(m_navi_bar, "visible", (Eina_Bool *)visible); Elm_Object_Item *top_it = elm_naviframe_top_item_get(m_navi_bar); @@ -614,6 +617,9 @@ void Browser_View::_navigationbar_visible_set(Eina_Bool visible) if (visible && m_data_manager->is_in_view_stack(BR_MULTI_WINDOW_VIEW)) return; + if (m_navi_it != elm_naviframe_top_item_get(m_navi_bar)) + return; + evas_object_data_set(m_navi_bar, "visible", (Eina_Bool *)visible); Elm_Object_Item *top_it = elm_naviframe_top_item_get(m_navi_bar); @@ -1443,7 +1449,7 @@ void Browser_View::__go_to_bookmark_cb(void *data, Evas_Object *obj, void *event return; Browser_View *browser_view = (Browser_View *)data; - + browser_view->suspend_webview(browser_view->m_focused_window->m_ewk_view); if (!m_data_manager->create_bookmark_view()) { BROWSER_LOGE("m_data_manager->create_bookmark_view failed"); return; @@ -1467,6 +1473,7 @@ void Browser_View::__backward_cb(void *data, Evas_Object *obj, void *event_info) Browser_View *browser_view = (Browser_View *)data; __title_back_button_clicked_cb(data, obj, event_info); browser_view->_destroy_more_context_popup(); + browser_view->m_context_menu->destroy_context_popup(); } void Browser_View::__forward_cb(void *data, Evas_Object *obj, void *event_info) @@ -1717,13 +1724,13 @@ Eina_Bool Browser_View::_show_more_context_popup(void) elm_ctxpopup_item_append(m_more_context_popup, BR_STRING_SETTINGS, NULL, __internet_settings_cb, this); - elm_ctxpopup_hover_parent_set(m_more_context_popup, m_scroller); + elm_ctxpopup_hover_parent_set(m_more_context_popup, m_navi_bar); Evas_Coord navibar_width = 0; Evas_Coord navibar_height = 0; evas_object_geometry_get(m_navi_bar, NULL, NULL, &navibar_width, &navibar_height); - evas_object_move(m_more_context_popup, BROWSER_MORE_CTX_POPUP_MARGIN, + evas_object_move(m_more_context_popup, BROWSER_MORE_CTX_POPUP_MARGIN * 7, navibar_height - BROWSER_MORE_CTX_POPUP_MARGIN); evas_object_show(m_more_context_popup); @@ -2869,8 +2876,10 @@ void Browser_View::__naviframe_pop_finished_cb(void *data , Evas_Object *obj, vo Browser_View *browser_view = (Browser_View *)data; Elm_Object_Item *it = (Elm_Object_Item *)event_info; - if (browser_view->m_navi_it != elm_naviframe_top_item_get(m_navi_bar)) + if (browser_view->m_navi_it != elm_naviframe_top_item_get(m_navi_bar)) { + browser_view->suspend_webview(browser_view->m_focused_window->m_ewk_view); return; + } m_data_manager->destroy_bookmark_view(); m_data_manager->destroy_history_layout(); @@ -2882,6 +2891,8 @@ void Browser_View::__naviframe_pop_finished_cb(void *data , Evas_Object *obj, vo delete browser_view->m_browser_settings; browser_view->m_browser_settings = NULL; } + + browser_view->resume_webview(browser_view->m_focused_window->m_ewk_view); } void Browser_View::__dim_area_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source) diff --git a/src/database/browser-bookmark-db.cpp b/src/database/browser-bookmark-db.cpp index fad9d4e3..f3c10912 100755 --- a/src/database/browser-bookmark-db.cpp +++ b/src/database/browser-bookmark-db.cpp @@ -675,15 +675,14 @@ Eina_Bool Browser_Bookmark_DB::get_untitled_folder_count(int *count) std::string title; std::string title_from_db; - char buf[32] = {0, }; + char *buf = "Folder_"; for (int i = 1; ; i++) { *count = i; error = sqlite3_step(sqlite3_stmt); if (error == SQLITE_ROW) { - snprintf(buf, sizeof(buf)-1, "Folder_%02d", i); title = buf; title_from_db = reinterpret_cast(sqlite3_column_text(sqlite3_stmt,0)); - if (title_from_db != title) + if (strncmp(title_from_db.c_str(), title.c_str(), title.length())) break; } else break; diff --git a/src/include/browser-string.h b/src/include/browser-string.h index 2f561757..60c8aca6 100755 --- a/src/include/browser-string.h +++ b/src/include/browser-string.h @@ -41,6 +41,7 @@ distributing this software or its derivatives. #define BR_STRING_DELETE dgettext("sys_string", "IDS_COM_SK_DELETE") #define BR_STRING_SEARCH "Search" #define BR_STRING_DELETED _("IDS_BR_POP_DELETED") +#define BR_STRING_DELETE_Q dgettext("sys_string", "IDS_COM_POP_DELETE_Q") #define BR_STRING_CLOSE dgettext("sys_string", "IDS_COM_POP_CLOSE") #define BR_STRING_VIEW_CHANGE _("IDS_BR_SK3_CHANGE_VIEW") #define BR_STRING_NEW_WINDOW _("IDS_BR_SK1_NEW_WINDOW") -- cgit v1.2.3