From b288c117c1eb97713006a0988809c844dc55e232 Mon Sep 17 00:00:00 2001 From: "k.lis2" Date: Tue, 4 Aug 2015 16:06:54 +0200 Subject: [PATCH] Task TT-80 Implement History view [Issue#] https://bugs.tizen.org/jira/browse/TT-80 [Task] TT-80 Implement History view [Cause] - [Solution] Add HistoryUI. Enable code referring to HistoryUI in SimpleUI [Verify] Perform basic sanity check. Change-Id: I87c20a27f825cda1ec7166e16133f2a5328c45a4 --- services/CMakeLists.txt | 3 +- services/HistoryUI/CMakeLists.txt | 29 + services/HistoryUI/HistoryUI.cpp | 384 ++++++++++++ services/HistoryUI/HistoryUI.h | 91 +++ services/HistoryUI/edc/History.edc | 827 +++++++++++++++++++++++++ services/HistoryUI/edc/error.edc | 144 +++++ services/HistoryUI/images/btn_bar_stop_nor.png | Bin 0 -> 3255 bytes services/HistoryUI/images/ico_delete.png | Bin 0 -> 18365 bytes services/SimpleUI/CMakeLists.txt | 7 +- services/SimpleUI/SimpleUI.cpp | 25 +- services/SimpleUI/SimpleUI.h | 4 +- 11 files changed, 1491 insertions(+), 23 deletions(-) create mode 100644 services/HistoryUI/CMakeLists.txt create mode 100644 services/HistoryUI/HistoryUI.cpp create mode 100644 services/HistoryUI/HistoryUI.h create mode 100644 services/HistoryUI/edc/History.edc create mode 100644 services/HistoryUI/edc/error.edc create mode 100644 services/HistoryUI/images/btn_bar_stop_nor.png create mode 100644 services/HistoryUI/images/ico_delete.png diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt index 5515ac1..167a2f8 100644 --- a/services/CMakeLists.txt +++ b/services/CMakeLists.txt @@ -3,8 +3,7 @@ project(services) add_subdirectory(WebKitEngineService) add_subdirectory(MoreMenuUI) add_subdirectory(MainUI) -# MERGE_ME -#add_subdirectory(HistoryUI) +add_subdirectory(HistoryUI) add_subdirectory(TabUI) add_subdirectory(SimpleUI) # MERGE_ME diff --git a/services/HistoryUI/CMakeLists.txt b/services/HistoryUI/CMakeLists.txt new file mode 100644 index 0000000..9d3bd37 --- /dev/null +++ b/services/HistoryUI/CMakeLists.txt @@ -0,0 +1,29 @@ +project(HistoryUI) + +set(HistoryUI_SRCS + HistoryUI.cpp + ) + +set(HistoryUI_HEADERS + HistoryUI.h + ) + +include(Coreheaders) +include(EFLHelpers) + +include_directories(${CMAKE_SOURCE_DIR}/services/FavoriteService) + +add_library(${PROJECT_NAME} SHARED ${HistoryUI_SRCS}) + +if(TIZEN_BUILD) + target_link_libraries(${PROJECT_NAME} ${pkgs_LDFLAGS}) +endif(TIZEN_BUILD) + +install(TARGETS ${PROJECT_NAME} + LIBRARY DESTINATION services + ARCHIVE DESTINATION services/static) + +include(EDCCompile) +EDJ_TARGET(History.edj + ${CMAKE_CURRENT_SOURCE_DIR}/edc/History.edc + ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/services/HistoryUI/HistoryUI.cpp b/services/HistoryUI/HistoryUI.cpp new file mode 100644 index 0000000..be63ad0 --- /dev/null +++ b/services/HistoryUI/HistoryUI.cpp @@ -0,0 +1,384 @@ +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +#include "HistoryUI.h" +#include "ServiceManager.h" +#include "BrowserLogger.h" +#include "Tools/EflTools.h" +#include "../Tools/BrowserImage.h" + + +namespace tizen_browser{ +namespace base_ui{ + +EXPORT_SERVICE(HistoryUI, "org.tizen.browser.historyui") + +typedef struct _HistoryItemData +{ + std::shared_ptr item; + std::shared_ptr historyUI; +} HistoryItemData; + +struct ItemData{ + tizen_browser::base_ui::HistoryUI* historyUI; + Elm_Object_Item * e_item; +}; + +static std::vector m_history_item_data; + +#define efl_scale (elm_config_scale_get() / elm_app_base_scale_get()) +HistoryUI::HistoryUI() + : m_gengrid(NULL) + , m_parent(NULL) + , m_item_class(NULL) + , m_gengridSetup(false) + , m_history_layout(NULL) + , m_historyitem_layout(NULL) + , m_genListActionBar(NULL) + , m_genListToday(NULL) + , m_itemClassToday(NULL) +{ + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + edjFilePath = EDJE_DIR; + edjFilePath.append("HistoryUI/History.edj"); +} + +HistoryUI::~HistoryUI() +{ +} + +void HistoryUI::show(Evas_Object* parent) +{ + elm_theme_extension_add(NULL, edjFilePath.c_str()); + m_history_layout = elm_layout_add(parent); + elm_layout_file_set(m_history_layout, edjFilePath.c_str(), "history-layout"); + evas_object_size_hint_weight_set(m_history_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(m_history_layout, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_show(m_history_layout); + + showActionBar(); + + m_gengrid = elm_gengrid_add(m_history_layout); + elm_object_part_content_set(m_history_layout, "history_gengird", m_gengrid); + + /*evas_object_smart_callback_add(m_gengrid, "item,focused", focusItem, NULL); + evas_object_smart_callback_add(m_gengrid, "item,unfocused", unFocusItem, NULL); + evas_object_smart_callback_add(m_gengrid, "activated", _itemSelected, this);*/ + + if (!m_item_class) { + m_item_class = elm_gengrid_item_class_new(); + m_item_class->item_style = "history_item"; + m_item_class->func.text_get = _grid_text_get; + m_item_class->func.content_get = _history_grid_content_get; + m_item_class->func.state_get = NULL; + m_item_class->func.del = NULL; + } + + M_ASSERT(m_parent); + elm_gengrid_align_set(m_gengrid, 0, 0); + elm_gengrid_select_mode_set(m_gengrid, ELM_OBJECT_SELECT_MODE_ALWAYS); + elm_gengrid_multi_select_set(m_gengrid, EINA_FALSE); + elm_gengrid_horizontal_set(m_gengrid, EINA_TRUE); + elm_gengrid_highlight_mode_set(m_gengrid, EINA_TRUE); + elm_scroller_policy_set(m_gengrid, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON); + elm_scroller_page_size_set(m_gengrid, 0, 580); + + evas_object_size_hint_weight_set(m_gengrid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(m_gengrid, EVAS_HINT_FILL, EVAS_HINT_FILL); + + elm_gengrid_item_size_set(m_gengrid, 580 * efl_scale, 580 * efl_scale); + + addItems(); + +} + +void HistoryUI::showActionBar() +{ + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + elm_theme_extension_add(NULL, edjFilePath.c_str()); + m_genListActionBar = elm_genlist_add(m_history_layout); + elm_object_part_content_set(m_history_layout, "action_bar_history_genlist", m_genListActionBar); + elm_genlist_homogeneous_set(m_genListActionBar, EINA_FALSE); + elm_genlist_multi_select_set(m_genListActionBar, EINA_FALSE); + elm_genlist_select_mode_set(m_genListActionBar, ELM_OBJECT_SELECT_MODE_ALWAYS); + elm_genlist_mode_set(m_genListActionBar, ELM_LIST_LIMIT); + elm_genlist_decorate_mode_set(m_genListActionBar, EINA_TRUE); + evas_object_size_hint_weight_set(m_genListActionBar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + + m_itemClassActionBar = elm_genlist_item_class_new(); + m_itemClassActionBar->item_style = "action_bar_history_items"; + m_itemClassActionBar->func.text_get = NULL; // &listTopItemTextGet; + m_itemClassActionBar->func.content_get = &listActionBarContentGet; + m_itemClassActionBar->func.state_get = 0; + m_itemClassActionBar->func.del = 0; + + ItemData * id = new ItemData; + id->historyUI = this; + Elm_Object_Item* elmItem = elm_genlist_item_append(m_genListActionBar, //genlist + m_itemClassActionBar, //item Class + id, + NULL, //parent item + ELM_GENLIST_ITEM_NONE,//item type + NULL, + NULL //data passed to above function + ); + id->e_item = elmItem; + ItemData * id2 = new ItemData; + id2->historyUI = this; + Elm_Object_Item* elmItem2 = elm_genlist_item_append(m_genListActionBar, //genlist + m_itemClassActionBar, //item Class + id2, + NULL, //parent item + ELM_GENLIST_ITEM_NONE,//item type + NULL, + NULL //data passed to above function + ); + id2->e_item = elmItem2; +} + +Evas_Object* HistoryUI::listActionBarContentGet(void* data, Evas_Object* obj , const char* part) +{ + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + if(!strcmp(part, "clearhistory_click")) + { + Evas_Object *clearHistoryButton = elm_button_add(obj); + elm_object_style_set(clearHistoryButton, "history_button"); + evas_object_smart_callback_add(clearHistoryButton, "clicked", tizen_browser::base_ui::HistoryUI::_clearhistory_clicked, data); + return clearHistoryButton; + } + else if(!strcmp(part, "close_click")) + { + Evas_Object *close_click = elm_button_add(obj); + elm_object_style_set(close_click, "history_button"); + evas_object_smart_callback_add(close_click, "clicked", HistoryUI::close_clicked_cb, data); + return close_click; + } + + return NULL; +} + +void HistoryUI::close_clicked_cb(void * data, Evas_Object * /* obj */, void * event_info) +{ + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + ItemData * id = static_cast(data); + id->historyUI->closeHistoryUIClicked(std::string()); + id->historyUI->clearItems(); +} + +char* HistoryUI::listTodayTextGet(void* data, Evas_Object* obj , const char* part) +{ + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + HistoryItemData * id = static_cast(data); + if(!strcmp(part, "history_url_text")) + { + if(!id->item->getUrl().empty()){ + std::string str = id->item->getTitle() + " - " + id->item->getUrl(); + return strdup(str.c_str()); + } + } + return NULL; +} + +void HistoryUI::_clearhistory_clicked(void * data, Evas_Object * /* obj */, void * event_info) +{ + /* + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + ItemData* itemData = reinterpret_cast(data); + itemData->tabUI->clearItems(); + itemData->tabUI->newTabClicked(std::string()); + */ +} + +void HistoryUI::addItems() +{ + BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__); + for (size_t i = 0; i < 1; i++) { + HistoryItemData *itemData = new HistoryItemData(); + itemData->historyUI = std::shared_ptr(this); + Elm_Object_Item* historyView = elm_gengrid_item_append(m_gengrid, m_item_class, itemData, NULL, this); + elm_gengrid_item_selected_set(historyView, EINA_FALSE); + } + BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__); +} + +void HistoryUI::addHistoryItem(std::shared_ptr hi) +{ + BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__); + HistoryItemData *itemData = new HistoryItemData(); + itemData->item = hi; + itemData->historyUI = std::shared_ptr(this); + m_history_item_data.push_back(itemData); + setEmptyGengrid(false); +} + +void HistoryUI::addHistoryItems(std::vector > items) +{ + BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__); + m_history_item_data.clear(); + for (auto it = items.begin(); it != items.end(); ++it) + addHistoryItem(*it); +} + +char* HistoryUI::_grid_text_get(void *data, Evas_Object *obj, const char *part) +{ + BROWSER_LOGD("%s:%d %s part=%s", __FILE__, __LINE__, __func__, part); + HistoryItemData *itemData = reinterpret_cast(data); + const char* item_name = NULL; + if (!strcmp(part, "menu_label")) { + item_name = "Today"; + return strdup(item_name); + } + return NULL; +} + +Evas_Object * HistoryUI::_history_grid_content_get(void *data, Evas_Object *obj, const char *part) +{ + BROWSER_LOGD("[%s:%d] part : %s", __PRETTY_FUNCTION__, __LINE__, part); + HistoryItemData * id = static_cast(data); + if(!strcmp(part, "history_genlist")) + { + id->historyUI->m_genListToday = elm_genlist_add(id->historyUI->m_history_layout); + + elm_genlist_homogeneous_set(id->historyUI->m_genListToday, EINA_FALSE); + elm_genlist_multi_select_set(id->historyUI->m_genListToday, EINA_FALSE); + elm_genlist_select_mode_set(id->historyUI->m_genListToday, ELM_OBJECT_SELECT_MODE_ALWAYS); + elm_genlist_mode_set(id->historyUI->m_genListToday, ELM_LIST_LIMIT); + elm_genlist_decorate_mode_set(id->historyUI->m_genListToday, EINA_TRUE); + evas_object_size_hint_weight_set(id->historyUI->m_genListToday, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + + id->historyUI->m_itemClassToday = elm_genlist_item_class_new(); + id->historyUI->m_itemClassToday->item_style = "history_url_items"; + id->historyUI->m_itemClassToday->func.text_get = &listTodayTextGet; + id->historyUI->m_itemClassToday->func.content_get = NULL; + id->historyUI->m_itemClassToday->func.state_get = 0; + id->historyUI->m_itemClassToday->func.del = 0; + + for(auto it = m_history_item_data.begin(); it != m_history_item_data.end(); it++) { + Elm_Object_Item* historyView = elm_genlist_item_append(id->historyUI->m_genListToday, id->historyUI->m_itemClassToday, *it, NULL, ELM_GENLIST_ITEM_NONE, NULL, id->historyUI.get()); + id->historyUI->m_map_history_views.insert(std::pair((*it)->item->getUrl(), historyView)); + } + + return id->historyUI->m_genListToday; + } + return NULL; +} + +void HistoryUI::removeHistoryItem(const std::string& uri) +{ + BROWSER_LOGD("[%s] uri=%s", __func__, uri.c_str()); + if(m_map_history_views.find(uri) == m_map_history_views.end()) { + return; + } + + Elm_Object_Item* historyView = m_map_history_views.at(uri); + elm_object_item_del(historyView); + m_map_history_views.erase(uri); + + setEmptyGengrid(0 == m_map_history_views.size()); +} + +void HistoryUI::_item_deleted(void * /* data */, Evas_Object * /* obj */) +{ + +} + +void HistoryUI::_itemSelected(void * data, Evas_Object * /* obj */, void * event_info) +{ + Elm_Object_Item * selected = reinterpret_cast(event_info); + HistoryItemData * itemData = reinterpret_cast(elm_object_item_data_get(selected)); + HistoryUI * self = reinterpret_cast(data); + + self->historyItemClicked(itemData->item); +} + +void HistoryUI::_deleteHistory(void *data, Evas_Object * /* obj */, void * /* event_info */) +{ + HistoryItemData * itemData = reinterpret_cast(data); + //itemData->historysUI->historyDeleteClicked(itemData->item); +} + +void HistoryUI::_thumbSelected(void * data, Evas_Object * /* obj */, void * /* event_info */) +{ + HistoryItemData * itemData = reinterpret_cast(data); + // itemData->historysUI->historyClicked(itemData->item); +} + +Evas_Object* HistoryUI::createNoHistorysLabel() +{ + Evas_Object *label = elm_label_add(m_parent); + elm_object_text_set(label, "No favorite websites."); + evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL); + return label; +} + +void HistoryUI::setEmptyGengrid(bool setEmpty) +{ + if(setEmpty) { + elm_object_part_content_set(m_gengrid, "elm.swallow.empty", createNoHistorysLabel()); + } else { + elm_object_part_content_set(m_gengrid, "elm.swallow.empty", NULL); + } +} + +void HistoryUI::hide() +{ + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + evas_object_hide(elm_layout_content_get(m_history_layout, "m_genListToday")); + evas_object_hide(elm_layout_content_get(m_history_layout, "m_gengrid")); + evas_object_hide(elm_layout_content_get(m_history_layout, "m_genListActionBar")); + evas_object_hide(m_history_layout); +} + +void HistoryUI::clearItems() +{ + hide(); + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + elm_genlist_clear(m_genListToday); + elm_gengrid_clear(m_gengrid); + elm_genlist_clear(m_genListActionBar); + m_map_history_views.clear(); + m_history_item_data.clear(); + setEmptyGengrid(true); +} + +void HistoryUI::focusItem(void* /*data*/, Evas_Object* /*obj*/, void* event_info) +{ + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + Elm_Object_Item *item = reinterpret_cast(event_info); + elm_object_item_signal_emit( item, "mouse,in", "over2"); + + // selected manually + elm_gengrid_item_selected_set(item, EINA_TRUE); +} + +void HistoryUI::unFocusItem(void* /*data*/, Evas_Object* /*obj*/, void* event_info) +{ + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + Elm_Object_Item *item = reinterpret_cast(event_info); + elm_object_item_signal_emit( item, "mouse,out", "over2"); + + // unselected manually + elm_gengrid_item_selected_set(item, EINA_FALSE); +} + +} +} diff --git a/services/HistoryUI/HistoryUI.h b/services/HistoryUI/HistoryUI.h new file mode 100644 index 0000000..89c26a3 --- /dev/null +++ b/services/HistoryUI/HistoryUI.h @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef HISTORYUI_H +#define HISTORYUI_H + +#include +#include + +#include "AbstractUIComponent.h" +#include "AbstractService.h" +#include "ServiceFactory.h" +#include "service_macros.h" +#include "services/HistoryService/HistoryItem.h" + +namespace tizen_browser{ +namespace base_ui{ + +class BROWSER_EXPORT HistoryUI + : public tizen_browser::interfaces::AbstractUIComponent + , public tizen_browser::core::AbstractService +{ +public: + HistoryUI(); + ~HistoryUI(); + void init(Evas_Object *main_layout); + virtual std::string getName(); + void addHistoryItem(std::shared_ptr); + void addHistoryItems(std::vector >); + void removeHistoryItem(const std::string& uri); + void clearItems(); + void hide(); + void showActionBar(); + void show(Evas_Object *main_layout); + void addItems(); + boost::signals2::signal closeHistoryUIClicked; + boost::signals2::signal)> historyItemClicked; + boost::signals2::signal)> historyDeleteClicked; +private: + static char* _grid_text_get(void *data, Evas_Object *obj, const char *part); + static Evas_Object * _history_grid_content_get(void *data, Evas_Object *obj, const char *part); + static Evas_Object * _grid_content_get(void *data, Evas_Object *obj, const char *part); + static Evas_Object* listActionBarContentGet(void *data, Evas_Object *obj, const char *part); + static Evas_Object* listTodayContentGet(void *data, Evas_Object *obj, const char *part); + static void _itemSelected(void * data, Evas_Object * obj, void * event_info); + static void _item_deleted(void *data, Evas_Object *obj); + static void _thumbSelected(void * data, Evas_Object * obj, void * event_info); + static void _deleteHistory(void *data, Evas_Object *obj, void *event_info); + static void _clearhistory_clicked(void *data, Evas_Object *obj, void *event_info); + void setEmptyGengrid(bool setEmpty); + static char* listTodayTextGet(void* data, Evas_Object* obj , const char* part); + static void close_clicked_cb(void *data, Evas_Object *obj, void *event_info); + +private: + + Evas_Object *m_history_layout; + Evas_Object *m_historyitem_layout; + Evas_Object *m_genListActionBar; + Evas_Object *m_genListToday; + Elm_Genlist_Item_Class *m_itemClassActionBar; + Elm_Genlist_Item_Class *m_itemClassToday; + Evas_Object *m_gengrid; + Evas_Object *m_parent; + Elm_Gengrid_Item_Class * m_item_class; + std::map m_map_history_views; + bool m_gengridSetup; + std::string edjFilePath; + Evas_Object *createNoHistorysLabel(); + + static void focusItem(void* data, Evas_Object* obj, void* event_info); + static void unFocusItem(void* data, Evas_Object* obj, void* event_info); +}; + + +} +} + +#endif // BOOKMARKSUI_H diff --git a/services/HistoryUI/edc/History.edc b/services/HistoryUI/edc/History.edc new file mode 100644 index 0000000..4f36aef --- /dev/null +++ b/services/HistoryUI/edc/History.edc @@ -0,0 +1,827 @@ + +#define DEBUG_RECT_OVER(over_part, r, g, b) \ + part { name: __CONCAT("dbg_rect_at_", __stringify(__LINE__)); \ + \ +scale:1; \ + type : RECT; \ + repeat_events: 1; \ + description { \ + state: "default" 0.0; \ + visible: 1; \ + color: r g b 128; \ + rel1 { to: over_part; relative: 0 0; } \ + rel2 { to: over_part; relative: 1 1; } \ + } \ + } + +collections { + +group{ + name: "elm/button/base/history_button"; + parts{ + part{ + name: "button"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + visible: 1; + fixed: 1 1; + color: 0 0 0 0; + } + } + part{ + name: "over"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + visible: 1; + fixed: 1 1; + rel1 { relative: 0.0 0.0;to: "button";} + rel2 { relative: 1.0 1.0;to: "button";} + color: 0 0 0 0; + } + } + } + programs{ + program { + name: "mouse_click"; + signal: "mouse,clicked,1"; + source: "over"; + script { + emit("elm,action,click", ""); + } + } + } + } + +group { + name: "history-layout"; + data { + item: "highlight_focus" "off"; + } + images { + image: "btn_bar_stop_nor.png" COMP; + } + color_classes{ + color_class{ + name: "defaultBgColor"; + color: 18 22 34 255; + } + color_class{ + name: "focusBgColor"; + color: 69 143 255 255; + } + color_class{ + name: "highlightBgColor"; + color: 69 143 255 102; + } + color_class{ + name: "imageHighlight"; + color: 255 255 255 102; + } + color_class{ + name: "focusbtBgColor"; + color: 22 120 224 255; + } + color_class{ + name: "titleTextColor"; + color: 74 74 74 255; + } + color_class{ + name: "focusTextColor"; + color: 255 255 255 255; + } + color_class{ + name: "highlightTextColor"; + color: 255 255 255 51; + } + color_class{ + name: "urlTextColor"; + color: 116 116 116 204; + } + color_class{ + name: "transparent"; + color: 0 0 0 0; + } + } + + images { + image: "web_shadow.png" COMP; + } + parts { + part { name: "action_bar_history_genlist_bg"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + visible: 1; + align: 0.0 0.0; + min: 1920 104; + max: 1920 104; + color: 70 143 254 255; + rel1 { + relative: 0 0; + } + rel2{ + relative: 1 1; + } + } + } + part { name: "gengrid_bg"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + visible: 1; + align: 0.0 0.0; + min: 1920 976; + max: 1920 976; + color: 231 231 231 255; + rel1 { + relative: 0 1; to: "action_bar_history_genlist_bg"; + } + + rel2{ + relative: 1 1; + } + } + } + part { name: "action_bar_history_genlist"; + type : SWALLOW; + scale: 1; + description { + state: "default" 0.0; + visible: 1; + min: 1920 104; + max: 1920 104; + align: 0.0 0.0; + fixed: 0 0; + rel1 { relative: 0.0 0.0; to: "action_bar_history_genlist_bg";} + rel2 { relative: 1.0 1.0; } + } + description { + state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "history_gengird"; + type : SWALLOW; + scale: 1; + description { + state: "default" 0.0; + visible: 1; + min: 1920 976; + max: 1920 976; + align: 0.0 0.0; + fixed: 0 0; + rel1 { relative: 0.0 0.0; to: "gengrid_bg"; offset: 63 63;} + rel2 { relative: 1.0 1.0; } + } + description { + state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } +} + + + group { name: "elm/genlist/item/history_url_items/default"; + min: 500 600; + max: 500 600; + data.item: "texts" "history_url_text"; + //data.item: "contents" "clearhistory_click"; + parts{ + part { + name: "bg_clipper"; + scale:1; + type: RECT; + description { + state: "default" 0.0; + color: 255 255 255 255; + align: 0 0; + min: 1004 60; + max: 1004 60; + rel1 { relative: 0.0 0.0;} + rel2 { relative: 1.0 1.0;} + } + } + part { + name: "history_url_text"; + scale:1; + mouse_events: 1; + type: TEXT; + description { + state: "default" 0.0; + visible: 1; + fixed: 1 1; + align: 0 0; + min: 1004 55; + max: 1004 55; + color: 116 116 116 255; + rel1 { relative: 0.0 0.0; to: "bg_clipper"; } + rel2 { relative: 1.0 1.0; to: "bg_clipper"; } + text { + text: "Title - url"; + font: "Sans"; + size: 28; + align: 0.0 0.0; + } + } + description { + state: "highlight" 0.0; + inherit: "default" 0.0; + color_class: focusBgColor1; + visible: 1; + } + description { + state: "focus" 0.0; + inherit: "default" 0.0; + color_class: focusbtBgColor1; + visible: 1; + } + } + } + +} + group { name: "elm/genlist/item/action_bar_history_items/default"; + min: 1920 104; + max: 1920 104; + data.item: "texts" "clearhistory_text"; + data.item: "contents" "clearhistory_click close_click"; + parts{ + part { + name: "bg_clipper"; + scale:1; + type: RECT; + description { + state: "default" 0.0; + color: 255 255 255 255; + align: 0 0; + min: 1920 104; + max: 1920 104; + rel1 { relative: 0.0 0.0;} + rel2 { relative: 1.0 1.0;} + } + } + + + part { + name: "item3_bg"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + visible: 1; + fixed: 1 1; + min: 348 65; + max: 348 65; + align: 0.5 0.5; + rel1 { relative: 0.0 0.0;to: "bg_clipper";} + rel2 { relative: 1.0 1.0;to: "bg_clipper";} + color : 255 255 255 255; + + } + } + + part { + name: "HistoryManager"; + scale:1; + mouse_events: 1; + type: TEXT; + description { + state: "default" 0.0; + visible: 1; + fixed: 1 1; + align: 0 .3; + min: 348 65; + max: 348 65; + color: 116 116 116 255; + rel1 { relative: 0.0 0.0; to: "item3_bg"; } + rel2 { relative: 1.0 1.0; to: "item3_bg"; } + text { + text: "History Manager"; + font: "Sans"; + size: 40; + align: 0.5 0.5; + } + } + description { + state: "highlight" 0.0; + inherit: "default" 0.0; + color_class: focusBgColor1; + visible: 1; + } + description { + state: "focus" 0.0; + inherit: "default" 0.0; + color_class: focusbtBgColor1; + visible: 1; + } + } + part { + name: "clearhistory_button_bg"; + scale:1; + mouse_events: 1; + type: RECT; + description { + state: "default" 0.0; + color: 192 192 192 255; + align: 0 0; + min: 220 65; + max: 220 65; + rel1 { relative: 0.0 0.0; to: "bg_clipper"; offset: 1500 20;} + rel2 { relative: 1.0 1.0; to: "bg_clipper"; } + } + } + part { + name: "clearhistory_button"; + scale:1; + mouse_events: 1; + type: RECT; + description { + state: "default" 0.0; + visible: 1; + fixed: 1 1; + align: 0 0; + + min: 220 65; + max: 220 65; + rel1 { relative: 0.0 0.0; to: "clearhistory_button_bg"; } + rel2 { relative: 1.0 1.0; to: "clearhistory_button_bg"; } + color_class: transparent; + } + description { + state: "highlight" 0.0; + inherit: "default" 0.0; + color_class: focusBgColor; + visible: 1; + } + description { + state: "focus" 0.0; + inherit: "default" 0.0; + color_class: focusbtBgColor; + visible: 1; + } + } + part{ + name: "clearhistory_text"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + + visible: 1; + fixed: 1 1; + rel1 { relative: 0.0 0.0;to: "clearhistory_button";} + rel2 { relative: 1.0 1.0;to: "clearhistory_button";} + color: 0 0 0 255; + text { + text: "Clear History"; + font: "Sans"; + size: 27; + align: 0.5 0.5; + } + } + } + + part { + name: "clearhistory_over"; + scale:1; + type: RECT; + description { + state: "default" 0.0; + visible: 1; + align: 0 0; + fixed: 1 1; + + min: 220 65; + max: 220 65; + rel1 { relative: 0.0 0.0; to: "clearhistory_button";} + rel2 { relative: 1.0 1.0; to: "clearhistory_button";} + color_class: transparent; + } + } + + part { + name: "clearhistory_click"; + scale:1; + type: SWALLOW; + description { + state: "default" 0.0; + visible: 1; + align: 0 0; + fixed: 1 1; + min: 220 65; + max: 220 65; + rel1 { relative: 0.0 0.0; to: "clearhistory_over";} + rel2 { relative: 1.0 1.0; to: "clearhistory_over";} + color_class: transparent; + } + } + + part { + name: "close_bg"; + scale:1; + mouse_events: 1; + type: RECT; + description { + state: "default" 0.0; + visible: 1; + fixed: 1 1; + align: 0 0.5; + min: 82 102; + max: 82 102; + rel1 { relative: 0.0 0.0; to: "bg_clipper"; offset: 1758 0;} + rel2 { relative: 1.0 1.0; to: "bg_clipper";} + color_class: transparent; + } + description { + state: "highlight" 0.0; + inherit: "default" 0.0; + color_class: focusBgColor; + visible: 1; + } + description { + state: "focus" 0.0; + inherit: "default" 0.0; + color_class: focusDelBgColor; + visible: 1; + } + } + part { + name: "close_icon"; + type: IMAGE; + scale: 1; + description { state: "default" 0.0; + visible: 1; + fixed: 1 1; + align: 0 0; + min: 82 102; + max: 82 102; + rel1 { relative: 0.0 0.0; to: "close_bg";} + rel2 { relative: 1.0 1.0; to: "close_bg";} + image.normal: "btn_bar_stop_nor.png"; + } + description { state: "highlight" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "focus" 0.0; + inherit: "highlight" 0.0; + } + } + part { + name: "close_over"; + scale:1; + + type: RECT; + description { + state: "default" 0.0; + visible: 1; + align: 0 0; + fixed: 1 1; + min: 82 102; + max: 82 102; + rel1 { relative: 0.0 0.0; to: "close_bg";} + rel2 { relative: 1.0 1.0; to: "close_bg";} + color_class: transparent; + } + } + part { + name: "close_click"; + scale:1; + type: SWALLOW; + description { + state: "default" 0.0; + visible: 1; + align: 0 0; + fixed: 1 1; + min: 82 102; + max: 82 102; + rel1 { relative: 0.0 0.0; to: "close_over";} + rel2 { relative: 1.0 1.0; to: "close_over";} + color_class: transparent; + } + } + + } + programs{ + + program { + name: "mouse_click_clearhistory"; + signal: "mouse,clicked,1"; + source: "clearhistory_over"; + script { + emit("elm,action,click", ""); + } + } + program { + name: "mouse_in_clearhistory_click"; + signal: "mouse,in"; + source: "clearhistory_*"; + action: STATE_SET "highlight" 0.0; + target: "clearhistory_button"; + target: "clearhistory_over"; + target: "clearhistory_text"; + } + program { + name: "mouse_out_clearhistory_click"; + signal: "mouse,out"; + source: "clearhistory_*"; + action: STATE_SET "default" 0.0; + target: "clearhistory_button"; + target: "clearhistory_over"; + target: "clearhistory_text"; + } + program { + name: "mouse_in_close_click"; + signal: "mouse,in"; + source: "close_click"; + script { + emit("mouse_in_close_click", ""); + } + } + program { + name: "mouse_out_close_click"; + signal: "mouse,out"; + source: "close_click"; + script { + emit("mouse_out_close_click", ""); + } + } + program { + name: "mouse_in_close"; + signal: "mouse_in_close_click"; + source: ""; + action: STATE_SET "highlight" 0.0; + target: "close_over"; + target: "close_bg"; + target: "close_icon"; + } + program { + + name: "mouse_out_close"; + signal: "mouse_out_close_click"; + source: ""; + action: STATE_SET "default" 0.0; + target: "close_over"; + target: "close_bg"; + target: "close_icon"; + } + } + } + +group { name: "elm/gengrid/item/history_item/default"; + +data.item: "texts" "menu_label"; + data.item: "contents" "history_genlist"; + images { + image: "web_frame_selected.png" COMP; + image: "ico_bg_round_shape_37x37.png" COMP; + } + styles { + style { name: "textblock_white"; + base: "font=Sans font_size="20" color=#5c5c5c"; + } + } + +styles { + style { name: "textblock_white_bold"; + base: "font=Sans:style=Bold font_size="20" color=#5c5c5c"; + } + } + parts { + + part { name: "menu_label_bg"; + type: RECT; + description { state: "default" 0.0; + min: 1004 80; + max: 1004 80; + align: 0.0 0.0; + color: 0 0 0 0; + + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: 70 143 254 255; + } + } + + part { name: "menu_label"; + type: TEXT; + description { state: "default" 0.0; + min: 1004 80; + max: 1004 80; + align: 0.5 0.5; + fixed: 0 0; + visible: 1; + rel1 { relative: 0.0 0.0;to: "menu_label_bg";} + rel2 { relative: 1.0 1.0;to: "menu_label_bg";} + + color: 92 92 92 255; + text { + text: "Web page title"; + font: "Sans"; + size: 28; + align: 0.0 0.0; + } + } + } + + + part { name: "genlist_bg"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + visible: 1; + align: 0.0 0.0; + min: 1004 600; + max: 1004 600; + color: 255 255 255 255; + rel1 { + relative: 0 1; to: "menu_label_bg"; + } + rel2{ + relative: 1 1; + } + } + } + + part { name: "history_genlist"; + type : SWALLOW; + scale: 1; + description { + state: "default" 0.0; + visible: 1; + min: 1004 600; + max: 1004 600; + align: 0.0 0.0; + fixed: 0 0; + rel1 { relative: 0.0 0.0; to: "genlist_bg";} + rel2 { relative: 1.0 1.0; } + } + description { + state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + +} +} + +group { name: "elm/button/base/thumbButton"; + images { + image: "ico_delete.png" COMP; + } + parts { + part { name: "elm.swallow.content"; + type: RECT; + mouse_events: 1; + repeat_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 1; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.0 0.0; + } + } + } + + programs { + program { name: "mouse,clicked"; + signal: "mouse,down,1"; + source: "elm.swallow.content"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + } +} + +group { name: "elm/button/base/deleteButton"; + parts { + part { name: "delete_x"; + type: IMAGE; + description { state: "default" 0.0; + min: 27 27; + max: 27 27; + image.normal: "ico_delete.png"; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.5 0.5; + visible: 0; + } + description { state: "over" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + + part { name: "elm.swallow.content"; + type: RECT; + mouse_events: 1; + repeat_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 1; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.0 0.0; + } + } + } + programs { + program { name: "mouse,clicked"; + signal: "mouse,down,1"; + source: "elm.swallow.content"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "mouse_in"; + signal: "mouse,in"; + source: "elm.swallow.content"; + action: STATE_SET "over" 0.0; + target: "delete_x"; + } + program { name: "mouse_out"; + signal: "mouse,out"; + source: "elm.swallow.content"; + action: STATE_SET "default" 0.0; + target: "delete_x"; + } + } +} + +group { name: "elm/gengrid/base/bookmarks"; + data { + item: "focus_highlight" "off"; + } + + parts { + part { name: "clipper"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1 { + relative: 0 0; + } + rel2{ + relative: 1 1; + } + } + } + part { name: "background"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 42 50 64 255; + rel1 { + relative: 0 0; + } + rel2{ + relative: 1 1; + } + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1 { + relative: 0 0; + offset: 169 110; + } + rel2 { + relative: 1 1; + offset: -169 0; + } + } + } + part { name: "elm.swallow.empty"; + type: SWALLOW; + description { state: "default" 0.0; + align: 0.5 0.5; + rel1 { + relative: 0.5 0.5; + } + rel2 { + relative: 0.5 0.5; + } + } + } + } +} +} diff --git a/services/HistoryUI/edc/error.edc b/services/HistoryUI/edc/error.edc new file mode 100644 index 0000000..0291971 --- /dev/null +++ b/services/HistoryUI/edc/error.edc @@ -0,0 +1,144 @@ +collections { + images { + image: "web_browsing_icon_error.png" COMP; + } + group { name: "error_message"; + styles { + style { name: "mssage_style"; + base: "font=Sans font_size=35 color=#d3d3d3 wrap=word align=0.5"; + } + style { name: "mssage_hint_style"; + base: "font=Sans font_size=24 color=#868686 wrap=word align=0.5"; + } + } + parts { + part{ + name: "message_background"; + type: RECT; + description{ + state: "default" 0.0; + visible: 1; + rel1.relative: 0 0; + rel2.relative: 1 1; + color: 42 50 64 255; + } + } + part{ + name: "error_message_background"; + type:RECT; + description{ + state: "default" 0.0; + visible: 1; + min: 1582 730; + max: 1582 730; + fixed: 1 1; + align: 0.5 0.5; + color: 30 38 50 153; + } + } + part{ + name: "err_ico"; + type: IMAGE; + description{ + state: "default" 0.0; + visible: 1; + min: 140 140; + max:140 140; + fixed: 1 1; + align: 0.5 0; + rel1{ + relative: 0 0; + offset:0 163; + to: "error_message_background"; + } + rel2{ + relative: 1 1; + to: "error_message_background"; + } + image{ + normal: "web_browsing_icon_error.png"; + } + } + } + + part{ + name: "error_text"; + type: TEXTBLOCK; + description{ + state: "default" 0.0; + visible: 1; + fixed: 1 1; + min: 1502 96; + max: 1502 96; + //color: 211 211 211 255; + align: 0.5 0; + rel1{ + relative: 0 1; + to_x: "error_message_background"; + to_y: "err_ico"; + } + rel2{ + relative: 1 1; + to: "error_message_background"; + } + text{ + style: "mssage_style"; + text: "Server not found.
sdf Please check the followings:"; + //min: 0 0; + //max: 1 1; + //align: 1 0; + //size: 35; + } + } + } + + + part{ + name: "error_hint"; + type: TEXTBLOCK; + description{ + state: "default" 0.0; + visible: 1; + fixed: 1 1; + min: 1502 117; + max: 1502 117; + color: 134 134 134 255; + align: 0.5 0; + rel1{ + relative: 0 1; + to_x: "error_message_background"; + to_y: "error_text"; + } + rel2{ + relative: 1 1; + to: "error_message_background"; + } + text{ + max: 0 1; + style: "mssage_hint_style"; + text: "Check for any typing error in URL.
" + "Check your network settings.
" + "Try again later.
" + "Click refresh to reload."; + } + } + } + } +/* + programs { + program { name: "mouse_down"; + signal: "mouse,down,1"; + source: "logo"; + action: STATE_SET "hide" 0.0; + target: "logo"; + } + program { name: "mouse_up"; + signal: "mouse,up,1"; + source: "logo"; + action: STATE_SET "default" 0.0; + target: "logo"; + } + } +*/ + } +} diff --git a/services/HistoryUI/images/btn_bar_stop_nor.png b/services/HistoryUI/images/btn_bar_stop_nor.png new file mode 100644 index 0000000000000000000000000000000000000000..c5cdc11ca8ea537497a1a794d79d40362f8659a9 GIT binary patch literal 3255 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 literal 0 HcmV?d00001 diff --git a/services/SimpleUI/CMakeLists.txt b/services/SimpleUI/CMakeLists.txt index 4a5c6d7..96ceae1 100644 --- a/services/SimpleUI/CMakeLists.txt +++ b/services/SimpleUI/CMakeLists.txt @@ -48,8 +48,7 @@ include_directories(${CMAKE_SOURCE_DIR}/services/StorageService/Storage/include) include_directories(${CMAKE_SOURCE_DIR}/services/FavoriteService) include_directories(${CMAKE_SOURCE_DIR}/services/HistoryService) include_directories(${CMAKE_SOURCE_DIR}/services/MoreMenuUI) -#MERGE_ME -#include_directories(${CMAKE_SOURCE_DIR}/services/HistoryUI) +include_directories(${CMAKE_SOURCE_DIR}/services/HistoryUI) include_directories(${CMAKE_SOURCE_DIR}/services/MainUI) #MERGE_ME #include_directories(${CMAKE_SOURCE_DIR}/services/SettingsUI) @@ -70,8 +69,8 @@ add_dependencies(${PROJECT_NAME} HistoryService) #add_dependencies(${PROJECT_NAME} MoreMenuUI) add_dependencies(${PROJECT_NAME} BookmarkManagerUI) add_dependencies(${PROJECT_NAME} MainUI) +add_dependencies(${PROJECT_NAME} HistoryUI) #MERGE_ME -#add_dependencies(${PROJECT_NAME} HistoryUI) #add_dependencies(${PROJECT_NAME} SettingsUI) add_dependencies(${PROJECT_NAME} TabUI) add_dependencies(${PROJECT_NAME} PlatformInputManager) @@ -81,8 +80,8 @@ target_link_libraries(${PROJECT_NAME} StorageService) target_link_libraries(${PROJECT_NAME} HistoryService) target_link_libraries(${PROJECT_NAME} MoreMenuUI) target_link_libraries(${PROJECT_NAME} MainUI) +target_link_libraries(${PROJECT_NAME} HistoryUI) #MERGE_ME -#target_link_libraries(${PROJECT_NAME} HistoryUI) #target_link_libraries(${PROJECT_NAME} SettingsUI) target_link_libraries(${PROJECT_NAME} TabUI) target_link_libraries(${PROJECT_NAME} BookmarkManagerUI) diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp index d5e6a6d..0862b66 100644 --- a/services/SimpleUI/SimpleUI.cpp +++ b/services/SimpleUI/SimpleUI.cpp @@ -1062,26 +1062,21 @@ void SimpleUI::showMainUI() void SimpleUI::showHistoryUI(const std::string& str) { -#if MERGE_ME BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); - m_historyUI = - std::dynamic_pointer_cast - - (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.historyui")); - M_ASSERT(m_historyUI); - m_historyUI->closeHistoryUIClicked.connect(boost::bind(&SimpleUI::closeHistoryUI, this,_1)); - m_historyUI->historyItemClicked.connect(boost::bind(&SimpleUI::onHistoryClicked, this,_1)); - m_historyUI->addHistoryItems(getHistory()); - m_historyUI->show(m_window.get()); -#endif + m_historyUI = + std::dynamic_pointer_cast + (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.historyui")); + M_ASSERT(m_historyUI); + m_historyUI->closeHistoryUIClicked.connect(boost::bind(&SimpleUI::closeHistoryUI, this,_1)); + m_historyUI->historyItemClicked.connect(boost::bind(&SimpleUI::onHistoryClicked, this,_1)); + m_historyUI->addHistoryItems(getHistory()); + m_historyUI->show(m_window.get()); } void SimpleUI::closeHistoryUI(const std::string& str) { -#if MERGE_ME - BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); - m_historyUI = nullptr; -#endif + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + m_historyUI = nullptr; } void SimpleUI::showSettingsUI(const std::string& str) diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h index 9d64421..713beda 100644 --- a/services/SimpleUI/SimpleUI.h +++ b/services/SimpleUI/SimpleUI.h @@ -35,8 +35,8 @@ // components #include "AbstractWebEngine.h" #include "MoreMenuUI.h" -#if MERGE_ME #include "HistoryUI.h" +#if MERGE_ME #include "SettingsUI.h" #endif #include "MainUI.h" @@ -295,8 +295,8 @@ private: std::shared_ptr m_moreMenuUI; std::shared_ptr m_bookmarkManagerUI; std::shared_ptr m_mainUI; -#if MERGE_ME std::shared_ptr m_historyUI; +#if MERGE_ME std::shared_ptr m_settingsUI; #endif std::shared_ptr m_tabUI; -- 2.7.4