Remove of More Menu 48/81848/3
authorMaciej Skrzypkowski <m.skrzypkows@samsung.com>
Thu, 28 Jul 2016 15:33:38 +0000 (17:33 +0200)
committerHye Kyoung Hwang <cookie@samsung.com>
Mon, 1 Aug 2016 00:34:48 +0000 (17:34 -0700)
[Issue]    N/A
[Problem]  There is no more menu in new UI
[Solution] Removed
[Verify]   Build and run

Change-Id: I2b2a84a9369d35d297d200eb8add05bd7df057fb
Signed-off-by: Maciej Skrzypkowski <m.skrzypkows@samsung.com>
66 files changed:
core/CMakeLists.txt
services/CMakeLists.txt
services/MoreMenuUI/CMakeLists.txt [deleted file]
services/MoreMenuUI/edc/MoreMenu.edc [deleted file]
services/MoreMenuUI/edc/MoreMenu_mob.edc [deleted file]
services/MoreMenuUI/edc/error.edc [deleted file]
services/MoreMenuUI/images/btn_bar_new_dis.png [deleted file]
services/MoreMenuUI/images/btn_bar_new_foc.png [deleted file]
services/MoreMenuUI/images/btn_bar_new_nor.png [deleted file]
services/MoreMenuUI/images/btn_bar_stop_nor.png [deleted file]
services/MoreMenuUI/images/favicon.png [deleted file]
services/MoreMenuUI/images/ic_add_bookmark.png [deleted file]
services/MoreMenuUI/images/ic_add_bookmark_new.png [deleted file]
services/MoreMenuUI/images/ic_more_bookmark_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_bookmark_nor.png [deleted file]
services/MoreMenuUI/images/ic_more_desktopview_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_desktopview_nor.png [deleted file]
services/MoreMenuUI/images/ic_more_exit_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_exit_nor.png [deleted file]
services/MoreMenuUI/images/ic_more_focusmode_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_focusmode_nor.png [deleted file]
services/MoreMenuUI/images/ic_more_history_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_history_nor.png [deleted file]
services/MoreMenuUI/images/ic_more_minibrowser_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_minibrowser_nor.png [deleted file]
services/MoreMenuUI/images/ic_more_mobileview_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_mobileview_nor.png [deleted file]
services/MoreMenuUI/images/ic_more_readermode_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_readermode_nor.png [deleted file]
services/MoreMenuUI/images/ic_more_setting_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_setting_nor.png [deleted file]
services/MoreMenuUI/images/ic_more_share_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_share_nor.png [deleted file]
services/MoreMenuUI/images/ic_more_zoom_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_zoom_nor.png [deleted file]
services/MoreMenuUI/images/ico_bg_round_shape_37x37.png [deleted file]
services/MoreMenuUI/images/ico_delete.png [deleted file]
services/MoreMenuUI/images/ico_url.png [deleted file]
services/MoreMenuUI/images/modal_dialogs_bg.png [deleted file]
services/MoreMenuUI/images/modal_dialogs_title_bg.png [deleted file]
services/MoreMenuUI/images/moremenu_ic_01.png [deleted file]
services/MoreMenuUI/images/moremenu_ic_01_edit.png [deleted file]
services/MoreMenuUI/images/moremenu_ic_02.png [deleted file]
services/MoreMenuUI/images/moremenu_ic_03.png [deleted file]
services/MoreMenuUI/images/moremenu_ic_04.png [deleted file]
services/MoreMenuUI/images/moremenu_ic_05.png [deleted file]
services/MoreMenuUI/images/moremenu_ic_06.png [deleted file]
services/MoreMenuUI/images/moremenu_ic_07.png [deleted file]
services/MoreMenuUI/images/web_frame_selected.png [deleted file]
services/MoreMenuUI/images/web_shadow.png [deleted file]
services/MoreMenuUI/images_mob/moremenu_ic_01.png [deleted file]
services/MoreMenuUI/images_mob/moremenu_ic_01_edit.png [deleted file]
services/MoreMenuUI/images_mob/moremenu_ic_02.png [deleted file]
services/MoreMenuUI/images_mob/moremenu_ic_03.png [deleted file]
services/MoreMenuUI/images_mob/moremenu_ic_04.png [deleted file]
services/MoreMenuUI/images_mob/moremenu_ic_05.png [deleted file]
services/MoreMenuUI/images_mob/moremenu_ic_06.png [deleted file]
services/MoreMenuUI/images_mob/moremenu_ic_07.png [deleted file]
services/MoreMenuUI/images_mob/user_thumbnail_mask.png [deleted file]
services/SimpleUI/CMakeLists.txt
services/SimpleUI/SimpleUI.cpp
services/SimpleUI/SimpleUI.h
services/WebPageUI/CMakeLists.txt
services/WebPageUI/WebPageUI.cpp
services/WebPageUI/WebPageUI.h
services/WebPageUI/edc/WebPageUI.edc

index 4771d7961e0a565ddd6bc7691417b3af9a213eab..bf2f34b91ebedcf537f5837463fbdb624fc7c461 100755 (executable)
@@ -106,7 +106,6 @@ if(TIZEN_BUILD)
     FindOnPageUI
     HistoryService
     HistoryUI
-    MoreMenuUI
     PlatformInputManager
     QuickAccess
     SettingsUI
index de1c1cba1d76de19e5718a46c2492682a9c58332..e88470d28d759300c07846b64f83f86e08904edc 100644 (file)
@@ -1,7 +1,6 @@
 project(services)
 
 add_subdirectory(WebEngineService)
-add_subdirectory(MoreMenuUI)
 add_subdirectory(QuickAccess)
 add_subdirectory(HistoryUI)
 add_subdirectory(TabUI)
diff --git a/services/MoreMenuUI/CMakeLists.txt b/services/MoreMenuUI/CMakeLists.txt
deleted file mode 100644 (file)
index 897c050..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-project(MoreMenuUI)
-
-set(MoreMenuUI_SRCS
-    MoreMenuUI.cpp
-    )
-
-include(Coreheaders)
-include(EFLHelpers)
-
-include_directories(${CMAKE_SOURCE_DIR}/services/FavoriteService)
-
-add_library(${PROJECT_NAME} SHARED ${MoreMenuUI_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)
-#please do not add edc/ directory
-if (${PROFILE} MATCHES "mobile")    # mobile profile
-    set(edcFiles
-        MoreMenu_mob.edc
-        )
-else (${PROFILE} MATCHES "mobile")  # tv profile
-    set(edcFiles
-        MoreMenu.edc
-        )
-endif (${PROFILE} MATCHES "mobile")
-
-foreach(edec ${edcFiles})
-    string(REGEX REPLACE "(_mob)?.edc" ".edj" target_name ${edec})
-    EDJ_TARGET(${target_name}
-        ${CMAKE_CURRENT_SOURCE_DIR}/edc/${edec}
-        ${CMAKE_CURRENT_BINARY_DIR})
-endforeach(edec)
diff --git a/services/MoreMenuUI/edc/MoreMenu.edc b/services/MoreMenuUI/edc/MoreMenu.edc
deleted file mode 100644 (file)
index 63e2b55..0000000
+++ /dev/null
@@ -1,1046 +0,0 @@
-#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; }                  \
-        }                                                           \
-    }
-
-#define RESOURCE_IMAGE_LOSSY( FILE_NAME ) \
-   group { \
-      name: FILE_NAME; \
-      images.image: FILE_NAME LOSSY 100; \
-      parts { \
-         part { name: "image"; \
-            description { \
-               state: "default" 0.0; \
-               image.normal: FILE_NAME; \
-               aspect: 1 1; \
-               aspect_preference: BOTH; \
-            } \
-         } \
-      } \
-   }
-
-collections { base_scale: 2.0;
-
-RESOURCE_IMAGE_LOSSY("ic_more_readermode_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_more_bookmark_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_more_history_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_more_zoom_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_more_minibrowser_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_more_mobileview_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_more_desktopview_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_more_share_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_more_setting_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_more_exit_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_add_bookmark.png")
-RESOURCE_IMAGE_LOSSY("ic_add_bookmark_new.png")
-RESOURCE_IMAGE_LOSSY("ic_more_readermode_foc.png")
-RESOURCE_IMAGE_LOSSY("ic_more_bookmark_foc.png")
-RESOURCE_IMAGE_LOSSY("ic_more_history_foc.png")
-RESOURCE_IMAGE_LOSSY("ic_more_zoom_foc.png")
-RESOURCE_IMAGE_LOSSY("ic_more_minibrowser_foc.png")
-RESOURCE_IMAGE_LOSSY("ic_more_mobileview_foc.png")
-RESOURCE_IMAGE_LOSSY("ic_more_desktopview_foc.png")
-RESOURCE_IMAGE_LOSSY("ic_more_share_foc.png")
-RESOURCE_IMAGE_LOSSY("ic_more_setting_foc.png")
-RESOURCE_IMAGE_LOSSY("ic_more_exit_foc.png")
-RESOURCE_IMAGE_LOSSY("ico_url.png")
-
-#define WIDTH 1920
-#define HEIGHT 366
-#define ITEM_WIDTH 1200
-
-    group {
-        name: "current_tab_layout";
-        min: WIDTH HEIGHT;
-        max: WIDTH HEIGHT;
-        images {
-            image: "ico_delete.png" COMP;
-            image: "ic_add_bookmark" COMP;
-            image: "thumbnail.png" COMP;
-            image: "btn_bar_stop_nor.png" COMP;
-        }
-        data.item: "texts" "webpage_title webpage_url";
-        data.item: "contents" "favicon star_click close_click";
-        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: "focusDelBgColor";
-                color: 96 114 146 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;
-            }
-        }
-        parts {
-            part {
-                name: "toast_popup";
-                scale:1;
-                type: SWALLOW;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    align: 0 0;
-                    fixed: 1 1;
-                min: 200 120;
-                max: 338 120;
-                rel1 { relative: 0.0 0.0; offset: 63 700;}
-                rel2 { relative: 1.0 1.0;}
-                }
-            }
-            part {
-            name: "toast_text";
-            scale: 1;
-            type: TEXT;
-            description {
-                state: "default" 0.0;
-                visible: 1;
-                fixed: 1 1;
-                align: 0.5 0.5;
-                rel1 { relative: 0.0 0.0; to: "toast_popup";}
-                rel2 { relative: 1.0 1.0; to: "toast_popup";}
-                color_class: titleTextColor;
-                text {
-                    font: "Sans";
-                    size: 28;
-                    align: 0.5 0.5;
-                }
-            }
-            }
-            part {
-                name: "bg_rect";
-                scale:1;
-                mouse_events: 1;
-                type: RECT;
-                description {
-                    state: "default" 0.0;
-                    color: 231 231 231 255;
-                    align: 0 0;
-                    min: 1920 366;
-                    max: 1920 366;
-                   rel1 { relative: 0.0 0.0; offset: 0 0;}
-                }
-            }
-           part {
-                name: "action_bar_bg";
-                type: RECT;
-                scale: 1;
-                description { state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 1;
-                    min: 1920 104;
-                    max: 1920 104;
-                    align: 0 0;
-                    rel1 { relative: 0.0 0.0;to: "bg_rect"; offset: 0 0;}
-                    rel2 { relative: 1.0 1.0;to: "bg_rect";}
-                    color : 255 255 255 255;
-                }
-            }
-           part { name: "action_bar_shadow";
-                type: IMAGE;
-                scale: 1;
-                repeat_events: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    align: 0.0 0.0;
-                    fixed: 0 0;
-                    min: 1920 14;
-                    max: 1920 14;
-                    image.normal: "web_shadow.png";
-                    rel1 { relative: 0.0 1.0; to: "action_bar_bg"; }
-                    rel2 { relative: 1.0 1.0; }
-                }
-             }
-           part { name: "moremenu_title";
-                scale: 1;
-                type: TEXT;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 1;
-                    min: 500 58;
-                    max: 500 58;
-                    align: 0.5 0.5;
-                    rel1 { relative: 0.0 0.0; to: "action_bar_bg";}
-                    rel2 { relative: 1.0 1.0; to: "action_bar_bg";}
-                    color_class: titleTextColor;
-                    text {
-                        text: "More Menu";
-                        font: "Sans";
-                        size: 58;
-                        align: 0.5 0.5;
-                    }
-                }
-            }
-           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: "action_bar_bg"; offset: 1758 0;}
-                    rel2 { relative: 1.0 1.0; to: "action_bar_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: 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;
-                }
-            }
-            part {
-                name: "item_background";
-                type: RECT;
-                scale: 1;
-                description { state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 1;
-                    min: 1200 78;
-                    max: 1200 78;
-                    align: 0 0;
-                    rel1 { relative: 0.0 0.0;to: "bg_rect"; offset: 62 190;}
-                    rel2 { relative: 1.0 1.0;to: "bg_rect";}
-                   color : 231 231 231 231;
-                    //color_class: defaultBgColor;
-                }
-            }
-            //SPACER_ITEM_BR("horizontal_line", ITEM_WIDTH, 2, "bg_rect")
-            part {
-                name: "favicon_bg";
-                type: RECT;
-                scale: 1;
-                description { state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 0;
-                    min: 58 58;
-                    max: 58 58;
-                    align: 0.0 0.5;
-                    rel1 { relative: 0.0 0.0; to: "item_background";}
-                    rel2 { relative: 1.0 1.0; to: "item_background";}
-                    color_class: transparent;
-                }
-                description { state: "highlight" 0.0;
-                    inherit: "default" 0.0;
-                    color_class: imageHighlight;
-                }
-                description { state: "focus" 0.0;
-                    inherit: "default" 0.0;
-                    color_class: focusTextColor;
-                }
-            }
-            part {
-                name: "favicon";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 1;
-                    min: 58 58;
-                    max: 58 58;
-                    align: 0.0 0.0;
-                    rel1 { relative: 0.0 0.0; to: "favicon_bg";}
-                    rel2 { relative: 1.0 1.0; to: "favicon_bg";}
-                }
-                description { state: "highlight" 0.0;
-                    inherit: "default" 0.0;
-                    color_class: imageHighlight;
-                }
-                description { state: "focus" 0.0;
-                    inherit: "default" 0.0;
-                    color_class: focusTextColor;
-                }
-            }
-            part {
-                name: "webpage_title";
-                scale: 1;
-                type: TEXT;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 1;
-                    min: 1146 36;
-                    max: 1146 36;
-                    align: 0 0.0;
-                    rel1 { relative: 0.0 0.0; to: "item_background"; offset: 98 0;}
-                    rel2 { relative: 1.0 1.0; to: "item_background";}
-                    color_class: titleTextColor;
-                    text {
-                        text: "Web page title";
-                        font: "font_name";
-                        size: 36;
-                        align: 0 0.5;
-                    }
-                }
-                description { state: "focus" 0.0;
-                    inherit: "default" 0.0;
-                    color_class: focusTextColor;
-                }
-                description { state: "highlight" 0.0;
-                    inherit: "default" 0.0;
-                    color_class: highlightTextColor;
-                }
-            }
-            part {
-                name: "webpage_url";
-                scale: 1;
-                type: TEXT;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 1;
-                    min: 1146 28;
-                    max: 1146 28;
-                    align: 0 0;
-                    rel1 { relative: 0.0 0.0; to: "item_background"; offset: 98 51;}
-                    rel2 { relative: 1.0 1.0; to: "item_background";}
-                    color_class: urlTextColor;
-                    text {
-                        font: "font_name";
-                        size: 28;
-                        align: 0 0.5;
-                    }
-                }
-                description { state: "focus" 0.0;
-                    inherit: "default" 0.0;
-                    color_class: focusTextColor;
-                }
-                description { state: "highlight" 0.0;
-                    inherit: "default" 0.0;
-                    color_class: highlightTextColor;
-                }
-            }
-            part {
-                name: "star_bg";
-                scale:1;
-                mouse_events: 1;
-                type: RECT;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 1;
-                    align: 0 0;
-                    min: 338 58;
-                    max: 338 58;
-                    rel1 { relative: 0.0 0.0; to: "bg_rect"; offset: 1519 200;}
-                    rel2 { relative: 1.0 1.0; to: "bg_rect";}
-                    color: 255 255 255 255;
-                }
-                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: "bookmark_ico";
-                type: SWALLOW;
-                scale: 1;
-                mouse_events: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    min: 58 58;
-                    max: 58 58;
-                    fixed: 1 1;
-                    align: 0.0 0.0;
-                    rel1 { relative: 0.0 0.0; to: "star_bg";}
-                }
-            }
-            part{
-                name: "add_to_bookmark_text";
-                type: TEXT;
-                scale: 1;
-                description { state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 1;
-                    align: 0 0;
-                    rel1 { relative: 0.0 0.0;to: "star_bg"; offset: 56 0;}
-                    rel2 { relative: 1.0 1.0;to: "star_bg";}
-                    color: 0 0 0 255;
-                    text {
-                        font: "Sans";
-                        size: 28;
-                        align: 0 0.5;
-                    }
-                }
-            }
-
-            part {
-                name: "star_over";
-                scale:1;
-                type: RECT;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    align: 0 0;
-                    fixed: 1 1;
-                    min: 338 58;
-                    max: 338 58;
-                    rel1 { relative: 0.0 0.0; to: "star_bg";}
-                    rel2 { relative: 1.0 1.0; to: "star_bg";}
-                    color_class: transparent;
-                }
-            }
-            part {
-                name: "star_click";
-                scale:1;
-                type: SWALLOW;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    align: 0 0;
-                    fixed: 1 1;
-                    min: 338 58;
-                    max: 338 58;
-                    rel1 { relative: 0.0 0.0; to: "star_over";}
-                    rel2 { relative: 1.0 1.0; to: "star_over";}
-                    color_class: transparent;
-                }
-            }
-        }
-        programs{
-            program {
-                name: "mouse_in_star_click";
-                signal: "mouse,in";
-                source: "star_click";
-                script {
-                    emit("mouse_in_star_click", "");
-                }
-            }
-            program {
-                name: "mouse_out_star_click";
-                signal: "mouse,out";
-                source: "star_click";
-                script {
-                    emit("mouse_out_star_click", "");
-                }
-            }
-            program {
-                name: "mouse_in_star";
-                signal: "mouse_in_star_click";
-                source: "";
-                action: STATE_SET "highlight" 0.0;
-                //target: "item_background";
-                //target: "favicon";
-                //target: "webpage_title";
-                //target: "webpage_url";
-                target: "star_bg";
-                //target: "star_icon";
-                //target: "over";
-            }
-            program {
-                name: "mouse_out_star";
-                signal: "mouse_out_star_click";
-                source: "";
-                action: STATE_SET "default" 0.0;
-                //target: "item_background";
-                //target: "favicon";
-                //target: "webpage_title";
-                //target: "webpage_url";
-                target: "star_bg";
-                //target: "star_icon";
-                //target: "over";
-            }
-           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: "item_background";
-                //target: "favicon";
-                //target: "webpage_title";
-                //target: "webpage_url";
-                //target: "star_bg";
-                //target: "star_icon";
-                //target: "over";
-                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: "item_background";
-                //target: "favicon";
-                //target: "webpage_title";
-                //target: "webpage_url";
-                //target: "star_bg";
-                //target: "star_icon";
-                //target: "over";
-                target: "close_over";
-                target: "close_bg";
-                target: "close_icon";
-            }
-        }
-    }
-
-    group{
-        name: "elm/button/base/dimmed_button";
-        mouse_events: 0;
-        parts{
-            part{
-                name: "button";
-                type: RECT;
-                scale: 1;
-                description { state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 1;
-                    color: 255 255 255 127;
-                }
-            }
-        }
-    }
-
-    group{
-        name: "elm/button/base/hidden_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: "*";
-                script {
-                    emit("elm,action,click", "");
-                }
-            }
-        }
-    }
-
-group { name: "elm/button/base/clickButton";
-               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: "moremenu-layout";
-    data {
-        item: "highlight_focus" "off";
-    }
-
-       images {
-            image: "web_shadow.png" COMP;
-        }
-        parts {
-            part { name: "current_tab_bar_bg";
-                type: RECT;
-                mouse_events: 0;
-                description { state: "default" 0.0;
-                               visible: 1;
-                               align: 0.0 0.0;
-                               min: 1920 366;
-                               max: 1920 366;
-                                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 714;
-                               max: 1920 714;
-                                        color: 231 231 231 255;
-                    rel1 {
-                                                relative: 0 1; to: "current_tab_bar_bg";
-                    }
-                    rel2{
-                                                relative: 1 1;
-                    }
-                }
-            }
-            part { name: "elm.swallow.grid";
-                type : SWALLOW;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    min: 1920 714;
-                   max: 1920 714;
-                    align: 0.0 0.0;
-                    fixed: 0 0;
-                    rel1 { relative: 0.0 0.0; to: "gengrid_bg"; offset: 63 0;}
-                    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: "current_tab_bar";
-                type : SWALLOW;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    min: 1920 366;
-                    max: 1920 366;
-                    align: 0.0 0.0;
-                    fixed: 0 0;
-                    rel1 { relative: 0.0 0.0; to: "current_tab_bar_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: "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;
-                    }
-                }
-            }
-            part {
-                name: "popup_bg";
-                type: RECT;
-                scale: 1;
-                mouse_events: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 0;
-                    align: 0.0 0.0;
-                    min: 1920 1080;
-                    max: 1920 1080;
-                    fixed: 1 1;
-                    color: 0 0 0 102;
-                    rel1.relative: 0.0 0.0;
-                    rel2.relative: 1.0 1.0;
-                }
-                description {
-                    state: "visible" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 1;
-                }
-            }
-            part {
-                name: "popup";
-                type: SWALLOW;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 0;
-                    min: 740 658;
-                    max: 740 894;
-                    fixed: 1 1;
-                    align: 0.5 0.5;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        to: "popup_bg";
-                    }
-                    rel2 {
-                        relative: 1.0 1.0;
-                        to: "popup_bg";
-                    }
-                 }
-                 description {
-                    state: "visible" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 1;
-                }
-            }
-        }
-        programs {
-            program {
-                name: "show_popup";
-                signal: "show_popup";
-                source: "ui";
-                action: STATE_SET "visible" 0.0;
-                target: "popup";
-                target: "popup_bg";
-            }
-            program {
-                name: "hide_popup";
-                signal: "hide_popup";
-                source: "ui";
-                action: STATE_SET "default" 0.0;
-                target: "popup";
-                target: "popup_bg";
-            }
-        }
-    }
-
-group { name: "elm/gengrid/item/menu_item/default";
-       data.item: "texts" "menu_label";
-       data.item: "contents" "thumbnail_item thumbbutton_item";
-       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 ellipsis=1.0";
-      }
-   }
-   styles {
-      style { name: "textblock_white_bold";
-         base: "font=Sans:style=Bold font_size="20" color=#5c5c5c ellipsis=1.0";
-      }
-   }
-       parts {
-               part { name: "thumbnail_bg";
-                       type: RECT;
-                       mouse_events: 0;
-                       description { state: "default" 0.0;
-                               min: 338 294;
-                               max: 338 294;
-                               visible: 1;
-                               color: 255 255 255 255;
-                               rel1.offset: -26 -26;
-                       }
-                       description { state: "selected";
-                               inherit: "default" 0.0;
-                               color: 70 143 254 255;
-                       }
-               }
-
-               part { name: "thumbnail_item";
-                       type: SWALLOW;
-                       description { state: "default" 0.0;
-                               fixed: 1 0;
-                               align: 0.0 0.0;
-                               //color : 255 255 255 255;
-                               min: 338 207;
-                               max: 338 207;
-                               rel1 {
-                                       relative: 0.0  0.0; to: "thumbnail_bg";
-                               }
-                               rel2 {
-                                       relative: 1.0  1.0; to: "thumbnail_bg";
-                               }
-                       }
-                       description { state: "selected";
-                               inherit: "default" 0.0;
-                       }
-               }
-
-               part { name: "highlight_focus";
-                       type: IMAGE;
-                       description { state: "default" 0.0;
-                               rel1 {
-                                       to: "thumbnail_item";
-                                       relative: 0.0  0.0;
-                               }
-                               rel2 {
-                                       to: "thumbnail_item";
-                                       relative: 1.0  1.0;
-                               }
-                               image.normal: "web_frame_selected.png";
-                               image.border: 8 8 8 0;
-                               image.border_scale: 1;
-                               image.middle: NONE;
-                               visible: 0;
-                       }
-                       description { state: "selected";
-                               inherit: "default" 0.0;
-                               visible: 1;
-                       }
-               }
-
-               part { name: "menu_label_bg";
-                       type: RECT;
-                       description { state: "default" 0.0;
-                               min: 338 87;
-                               max: 338 87;
-                               align: 0.0 0.0;
-                               color: 255 255 255 255;
-                               rel1 {
-                                       to: "thumbnail_item";
-                                       relative: 0.0  1.0;
-                               }
-                               rel2 {
-                                       relative: 1.0  1.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: 338 87;
-                               max: 338 87;
-                               align: 0 0;
-                               fixed: 0 0;
-                               visible: 1;
-                               rel1 {
-                                       to: "menu_label_bg";
-                                       relative: 0.0 0.0;
-                               }
-                               rel2 {
-                                       to: "menu_label_bg";
-                                       relative: 1.0  1.0;
-                               }
-                           color: 92 92 92 255; 
-                           text {
-                               text: "Web page title";
-                               font: "Sans";
-                               size: 28;
-                               align: 0.5 0.5;
-                           }
-                        }
-                       description { state: "selected" 0.0;
-                           inherit: "default" 0.0;
-                           color: 255 255 255 255;
-                       }
-               }
-
-               part { name: "thumbbutton_item";
-                       type: SWALLOW;
-                       description { state: "default" 0.0;
-                               rel1.to: "thumbnail_bg";
-                               rel2.to: "thumbnail_bg";
-                       }
-               }
-
-               part { name: "over2";
-                       type: RECT;
-                       mouse_events: 1;
-                       repeat_events: 1;
-                       description { state: "default" 0.0;
-                               color: 0 0 0 0;
-                               rel1.to: "thumbnail_bg";
-                               rel2.to: "menu_label_bg";
-                       }
-               }
-               part { name: "over3";
-                       type: RECT;
-                       mouse_events: 1;
-                       repeat_events: 1;
-                       description { state: "default" 0.0;
-                               color: 0 0 0 0;
-                               rel1.to: "menu_label_bg";
-                               rel2.to: "menu_label_bg";
-                       }
-               }
-       }
-
-       programs{
-               program { name: "mouse_in";
-                       signal: "mouse,in";
-                       source: "over2";
-                       action: STATE_SET "selected" 0.0;
-                       target: "menu_label_bg";
-                       target: "highlight_focus";
-                       target: "thumbnail_bg";
-                       target: "menu_label";
-               }
-               program { name: "mouse_out";
-                       signal: "mouse,out";
-                       source: "over2";
-                       action: STATE_SET "default" 0.0;
-                       target: "menu_label_bg";
-                       target: "highlight_focus";
-                       target: "thumbnail_bg";
-                       target: "menu_label";
-               }
-       }
-}
-}
diff --git a/services/MoreMenuUI/edc/MoreMenu_mob.edc b/services/MoreMenuUI/edc/MoreMenu_mob.edc
deleted file mode 100644 (file)
index f7d4c0c..0000000
+++ /dev/null
@@ -1,825 +0,0 @@
-#include "../../../core/Tools/edc/InvisibleButton.edc"
-
-#define RESOURCE_IMAGE_LOSSY( FILE_NAME ) \
-   group { \
-      name: FILE_NAME; \
-      images.image: FILE_NAME LOSSY 100; \
-      parts { \
-         part { name: "image"; \
-            description { \
-               state: "default" 0.0; \
-               image.normal: FILE_NAME; \
-               aspect: 1 1; \
-               aspect_preference: BOTH; \
-            } \
-         } \
-      } \
-   }
-
-collections { base_scale: 2.6;
-
-RESOURCE_IMAGE_LOSSY("moremenu_ic_01.png")
-RESOURCE_IMAGE_LOSSY("moremenu_ic_01_edit.png")
-RESOURCE_IMAGE_LOSSY("moremenu_ic_02.png")
-RESOURCE_IMAGE_LOSSY("moremenu_ic_03.png")
-RESOURCE_IMAGE_LOSSY("moremenu_ic_04.png")
-RESOURCE_IMAGE_LOSSY("moremenu_ic_05.png")
-RESOURCE_IMAGE_LOSSY("moremenu_ic_06.png")
-RESOURCE_IMAGE_LOSSY("moremenu_ic_07.png")
-
-#define DEVELOPMENT 0
-
-#define TITLE_HEIGHT 120
-#define TITLE_TEXT_OFFSET_Y 43
-#define TITLE_TEXT_OFFSET_LEFT 32
-#define TITLE_TEXT_LEFT_WIDTH 200
-#define TITLE_TEXT_RIGHT_WIDTH 250
-#define TITLE_TEXT_OFFSET_RIGHT 128
-#define TITLE_TEXT_HEIGHT 34
-#define TITLE_ICON_OFFSET_X 30
-#define TITLE_ICON_OFFSET_Y 23
-#define TITLE_ICON_WIDTH 74
-#define TITLE_ICON_HEIGHT 74
-#define TITLE_BUTTON_WIDTH 132
-#define TITLE_BUTTON_HEIGHT 68
-#define SIGNIN_OFFSET_X 16
-#define SIGNIN_OFFSET_Y 26
-#define GRID_OFFSET_X_VERTICAL 18
-#define GRID_OFFSET_X_LANDSCAPE 16
-#define GRID_OFFSET_Y 20
-#define ITEM_ICON_SIZE 90
-#define ITEM_ICON_OFFSET_Y 20
-#define ITEM_TEXT_WIDTH 148
-
-    group {
-        name: "elm/button/base/dimmed_button";
-        mouse_events: 0;
-        parts {
-            part {
-                name: "button";
-                type: RECT;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    fixed: 1 1;
-                    color: 255 255 255 127;
-                }
-            }
-        }
-    }
-
-    group {
-        name: "elm/button/base/hidden_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: "*";
-                script {
-                    emit("elm,action,click", "");
-                }
-            }
-        }
-    }
-
-    group {
-        name: "elm/button/base/clickButton";
-        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: "moremenu-layout";
-        styles {
-            style {
-                name: "title_area_text_style_menu";
-                base: "font=Tizen:style=Regular font_size=34 color=#333333 align=0.0 ellipsis=1.0";
-            }
-            style {
-                name: "title_area_text_style_user";
-                base: "font=Tizen:style=Regular font_size=34 color=#333333 align=1.0 ellipsis=1.0";
-            }
-            style {
-                name: "title_area_button_style";
-                base: "font=Tizen:style=Regular font_size=34 color=#389ae9 align=0.5 ellipsis=1.0";
-            }
-        }
-        parts {
-            part {
-                name: "title_area_bg";
-                type: RECT;
-                mouse_events: 1;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    align: 0.0 0.0;
-                    min: 0 TITLE_HEIGHT;
-                    max: -1 TITLE_HEIGHT;
-                    fixed: 0 1;
-                    color: 255 255 255 255;
-                    rel1.relative: 0.0 0.0;
-                    rel2.relative: 1.0 1.0;
-                }
-            }
-            part {
-                name: "title_area_text_left_spacer";
-                type: RECT;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: DEVELOPMENT;
-                    align: 0.0 0.0;
-                    min: TITLE_TEXT_OFFSET_LEFT TITLE_TEXT_OFFSET_Y;
-                    max: TITLE_TEXT_OFFSET_LEFT TITLE_TEXT_OFFSET_Y;
-                    color: 255 255 255 127;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        to: "title_area_bg";
-                    }
-                    rel2.relative: 1.0 1.0;
-                }
-            }
-            part {
-                name: "title_area_text_left_bg";
-                type: RECT;
-                mouse_events: 0;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: DEVELOPMENT;
-                    align: 0.0 0.0;
-                    min: TITLE_TEXT_LEFT_WIDTH TITLE_TEXT_HEIGHT;
-                    max: TITLE_TEXT_LEFT_WIDTH -1;
-                    fixed: 1 0;
-                    color: 237 145 33 255; //carrot
-                    rel1 { relative: 1.0 1.0;
-                           to: "title_area_text_left_spacer";
-                         }
-                    rel2 { relative: 1.0 1.0;
-                           to: "title_area_bg";
-                         }
-                }
-            }
-            part {
-                name: "title_area_text_left";
-                type: TEXTBLOCK;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    align: 0 0;
-                    visible: 1;
-                    rel1 {
-                        to: "title_area_text_left_bg";
-                        relative: 0.0 0.0;
-                    }
-                    rel2 {
-                        to: "title_area_text_left_bg";
-                        relative: 1.0  1.0;
-                    }
-                    text {
-                        style: "title_area_text_style_menu";
-                        align: 0 0;
-                        text: "More menu";
-                    }
-                }
-            }
-            part {
-                name: "title_area_text_right_spacer";
-                type: RECT;
-                mouse_events: 0;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: DEVELOPMENT;
-                    color: 255 255 255 127;
-                    align: 1.0 1.0;
-                    min: TITLE_TEXT_OFFSET_RIGHT 0;
-                    max: TITLE_TEXT_OFFSET_RIGHT 0;
-                    fixed: 1 1;
-                    rel1 { relative: 0.0 0.0;
-                           to: "title_area_bg";
-                         }
-                    rel2 { relative: 1.0 1.0;
-                           to: "title_area_bg";
-                         }
-                }
-            }
-            part {
-                name: "title_area_text_right_bg";
-                type: RECT;
-                mouse_events: 0;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: DEVELOPMENT;
-                    align: 1.0 0.0;
-                    min: TITLE_TEXT_RIGHT_WIDTH TITLE_TEXT_HEIGHT;
-                    max: TITLE_TEXT_RIGHT_WIDTH -1;
-                    fixed: 1 0;
-                    color: 255 218 185 255; //peach
-                    rel1 { relative: 1.0 1.0;
-                           to: "title_area_text_left_spacer";
-                         }
-                    rel2 { relative: 0.0 0.0;
-                           to: "title_area_text_right_spacer";
-                         }
-                }
-                description {
-                    state: "button_visible" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 0;
-                }
-                description {
-                    state: "button_hidden" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 1;
-                }
-            }
-            part {
-                name: "title_area_text_right";
-                type: TEXTBLOCK;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    align: 0.0 0.0;
-                    visible: DEVELOPMENT;
-                    rel1 {
-                        to: "title_area_text_right_bg";
-                        relative: 0.0 0.0;
-                    }
-                    rel2 {
-                        to: "title_area_text_right_bg";
-                        relative: 1.0 1.0;
-                    }
-                    text {
-                        style: "title_area_text_style_user";
-                        align: 1 0;
-                        text: "Surname";
-                    }
-                }
-                description {
-                    state: "button_visible" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 0;
-                }
-                description {
-                    state: "button_hidden" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 1;
-                }
-            }
-            part { name: "title_area_button_spacer";
-                   type: RECT;
-                   scale: 1;
-                   description { state: "default" 0.0;
-                                 visible: DEVELOPMENT;
-                                 align: 1.0 1.0;
-                                 min: SIGNIN_OFFSET_X SIGNIN_OFFSET_Y;
-                                 max: SIGNIN_OFFSET_X SIGNIN_OFFSET_Y;
-                                 color: 255 255 255 127;
-                                 rel1 { relative: 0.0 0.0;
-                                        to: "title_area_bg";
-                                      }
-                                 rel2 { relative: 1.0 1.0;
-                                        to: "title_area_bg";
-                                      }
-                               }
-                 }
-            part { name: "title_area_button_bg";
-                   type: RECT;
-                   mouse_events: 0;
-                   scale: 1;
-                   description { state: "default" 0.0;
-                                 visible: 0;
-                                 align: 1.0 1.0;
-                                 min: TITLE_BUTTON_WIDTH TITLE_BUTTON_HEIGHT;
-                                 max: TITLE_BUTTON_WIDTH TITLE_BUTTON_HEIGHT;
-                                 fixed: 1 1;
-                                 color: 224 237 251 255;
-                                 rel1 { relative: 0.0 0.0;
-                                        to: "title_area_bg";
-                                      }
-                                 rel2 { relative: 0.0 0.0;
-                                        to: "title_area_button_spacer";
-                                      }
-                               }
-                   description { state: "button_visible" 0.0;
-                                 inherit: "default" 0.0;
-                                 visible: 1;
-                               }
-                   description { state: "button_hidden" 0.0;
-                                 inherit: "default" 0.0;
-                                 visible: 0;
-                               }
-                 }
-            part {
-                name: "title_area_button_text";
-                type: TEXTBLOCK;
-                mouse_events: 0;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 0;
-                    align: 0.0 0.0;
-                    rel1 { relative: 0.0 0.0;
-                           to: "title_area_button_bg";
-                         }
-                    rel2 { relative: 1.0 1.0;
-                           to: "title_area_button_bg";
-                         }
-                    text { style: "title_area_button_style";
-                           align: 0.5 0.5;
-                           text: "Sign in";
-                         }
-                }
-                description {
-                    state: "button_visible" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 1;
-                }
-                description {
-                    state: "button_hidden" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 0;
-                }
-            }
-            part {
-                name: "title_area_icon_spacer";
-                type: RECT;
-                scale: 1;
-                mouse_events: 0;
-                description {
-                    state: "default" 0.0;
-                    visible: DEVELOPMENT;
-                    align: 1.0 1.0;
-                    min: TITLE_ICON_OFFSET_X TITLE_ICON_OFFSET_Y;
-                    max: TITLE_ICON_OFFSET_X TITLE_ICON_OFFSET_Y;
-                    fixed: 1 1;
-                    color: 255 255 255 127;
-                    rel1 { relative: 0.0 0.0;
-                           to: "title_area_bg";
-                         }
-                    rel2 { relative: 1.0 1.0;
-                           to: "title_area_bg";
-                         }
-                }
-            }
-            part {
-                name: "title_area_icon_bg";
-                type: RECT;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: DEVELOPMENT;
-                    align: 1.0 1.0;
-                    min: TITLE_ICON_WIDTH TITLE_ICON_HEIGHT;
-                    max: TITLE_ICON_WIDTH TITLE_ICON_HEIGHT;
-                    color: 250 128 114 255; //salmon
-                    rel1 { relative: 0.0 0.0;
-                           to: "title_area_bg";
-                         }
-                    rel2 { relative: 0.0 0.0;
-                           to: "title_area_icon_spacer";
-                         }
-                }
-                description {
-                    state: "button_visible" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 0;
-                }
-                description {
-                    state: "button_hidden" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 1;
-                }
-            }
-            part {
-                name: "gengrid_spacer_1";
-                type: RECT;
-                mouse_events: 0;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: DEVELOPMENT;
-                    align: 0.0 0.0;
-                    min: GRID_OFFSET_X_VERTICAL GRID_OFFSET_Y;
-                    max: GRID_OFFSET_X_VERTICAL GRID_OFFSET_Y;
-                    fixed: 1 1;
-                    color: 255 255 255 127;
-                    rel1 {
-                        relative: 0.0 1.0;
-                        to: "title_area_bg";
-                    }
-                    rel2.relative: 1.0 1.0;
-                }
-                description { state: "landscape" 0.0;
-                              inherit: "default";
-                              min: GRID_OFFSET_X_LANDSCAPE GRID_OFFSET_Y;
-                              max: GRID_OFFSET_X_LANDSCAPE GRID_OFFSET_Y;
-                            }
-            }
-            part {
-                name: "gengrid_spacer_2";
-                type: RECT;
-                mouse_events: 0;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: DEVELOPMENT;
-                    align: 1.0 1.0;
-                    min: GRID_OFFSET_X_VERTICAL GRID_OFFSET_Y;
-                    max: GRID_OFFSET_X_VERTICAL GRID_OFFSET_Y;
-                    fixed: 1 1;
-                    color: 255 255 255 127;
-                    rel1 {
-                        relative: 0.0 1.0;
-                        to: "title_area_bg";
-                    }
-                    rel2.relative: 1.0 1.0;
-                }
-                description { state: "landscape" 0.0;
-                              inherit: "default";
-                              min: GRID_OFFSET_X_LANDSCAPE GRID_OFFSET_Y;
-                              max: GRID_OFFSET_X_LANDSCAPE GRID_OFFSET_Y;
-                            }
-            }
-            part {
-                name: "gengrid_bg";
-                type: RECT;
-                mouse_events: 0;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: DEVELOPMENT;
-                    align: 0.0 0.0;
-                    min: 0 0;
-                    max: -1 -1;
-                    fixed: 0 0;
-                    color: 187 255 255 255; //turquoise
-                    rel1 { relative: 1 1;
-                           to: "gengrid_spacer_1";
-                         }
-                    rel2 { relative: 0 0;
-                           to: "gengrid_spacer_2";
-                         }
-                }
-            }
-            part {
-                name: "elm.swallow.grid";
-                type : SWALLOW;
-                scale: 1;
-                mouse_events: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    min: 0 0;
-                    max: -1 -1;
-                    fixed: 0 0;
-                    align: 0.5 0.5;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        to: "gengrid_bg";
-                    }
-                    rel2 {
-                        relative: 1.0 1.0;
-                        to: "gengrid_bg";
-                    }
-                }
-                description {
-                    state: "hidden" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 0;
-                }
-                description {
-                    state: "visible" 0.0;
-                    inherit: "default" 0.0;
-                    visible: 1;
-                }
-            }
-        }
-        programs {
-            program { name: "switch_landscape";
-                      source: "ui";
-                      signal: "switch_landscape";
-                      action: STATE_SET "landscape" 0.0;
-                      target: "gengrid_spacer_1";
-                      target: "gengrid_spacer_2";
-                    }
-            program { name: "switch_vertical";
-                      source: "ui";
-                      signal: "switch_vertical";
-                      action: STATE_SET "default" 0.0;
-                      target: "gengrid_spacer_1";
-                      target: "gengrid_spacer_2";
-                    }
-            program {
-                name: "show_signin_button";
-                source: "ui";
-                signal: "show_sign_button";
-                action: STATE_SET "button_visible" 0.0;
-                target: "title_area_text_right_bg";
-                target: "title_area_text_right";
-                target: "title_area_button_bg";
-                target: "title_area_button_text";
-                target: "title_area_icon_bg";
-            }
-            program {
-                name: "hide_signin_button";
-                source: "ui";
-                signal: "hide_sign_button";
-                action: STATE_SET "button_hidden" 0.0;
-                target: "title_area_text_right_bg";
-                target: "title_area_text_right";
-                target: "title_area_button_bg";
-                target: "title_area_button_text";
-                target: "title_area_icon_bg";
-            }
-        }
-    }
-
-    group {
-        name: "elm/gengrid/item/menu_item/default";
-        data.item: "texts" "thumbnail_text";
-        data.item: "contents" "thumbnail_icon thumbbutton_item";
-        styles {
-            style {
-                name: "thumbnail_text_style";
-                base: "font=Tizen:style=Regular font_size=28 color=#696f76 linegap=2 wrap=mixed align=0.5 ellipsis=1.0";
-            }
-        }
-        parts {
-            part {
-                name: "thumbnail_bg";
-                type: RECT;
-                mouse_events: 0;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    min: 0 0;
-                    max: -1 -1;
-                    fixed: 0 0;
-                    visible: 1;
-                    color: 244 244 244 255;
-                }
-                description {
-                    state: "selected" 0.0;
-                    inherit: "default" 0.0;
-                    color: 224 237 251 255;
-                }
-            }
-            part {
-                name: "thumbnail_icon_spacer";
-                type: RECT;
-                mouse_events: 0;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    min: 0 ITEM_ICON_OFFSET_Y;
-                    max: 0 ITEM_ICON_OFFSET_Y;
-                    fixed: 1 1;
-                    visible: DEVELOPMENT;
-                    color: 255 255 255 127;
-                    align: 0.0 0.0;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        to: "thumbnail_bg";
-                    }
-                    rel2.relative: 1.0 1.0;
-                }
-            }
-            part {
-                name: "thumbnail_icon_bg";
-                type: RECT;
-                mouse_events: 0;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    min: ITEM_ICON_SIZE ITEM_ICON_SIZE;
-                    max: ITEM_ICON_SIZE ITEM_ICON_SIZE;
-                    fixed: 1 1;
-                    visible: DEVELOPMENT;
-                    color: 192 192 192 255; //silver
-                    align: 0.5 0.0;
-                    rel1 {
-                        relative: 1.0 1.0;
-                        to: "thumbnail_icon_spacer";
-                    }
-                    rel2.relative: 1.0 1.0;
-                }
-            }
-            part {
-                name: "thumbnail_icon";
-                type: SWALLOW;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    align: 0.0 0.0;
-                    min: ITEM_ICON_SIZE ITEM_ICON_SIZE;
-                    max: ITEM_ICON_SIZE ITEM_ICON_SIZE;
-                    fixed: 1 1;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        to: "thumbnail_icon_bg";
-                    }
-                    rel2 {
-                        relative: 1.0 1.0;
-                        to: "thumbnail_icon_bg";
-                    }
-                }
-            }
-            part {
-                name: "thumbnail_text_spacer";
-                scale: 1;
-                type: RECT;
-                description {
-                    state: "default" 0.0;
-                    min: 0 (ITEM_ICON_OFFSET_Y+ITEM_ICON_SIZE);
-                    max: 0 (ITEM_ICON_OFFSET_Y+ITEM_ICON_SIZE);
-                    fixed: 1 1;
-                    align: 0.0 0.0;
-                    color: 255 255 255 127;
-                    visible: DEVELOPMENT;
-                    rel1 {
-                        relative: 1.0 1.0;
-                        to: "thumbnail_icon_spacer";
-                    }
-                    rel2.relative: 1.0 1.0;
-                }
-            }
-            part {
-                name: "thumbnail_text_bg";
-                scale: 1;
-                type: RECT;
-                description {
-                    state: "default" 0.0;
-                    min: ITEM_TEXT_WIDTH 0;
-                    max: ITEM_TEXT_WIDTH -1;
-                    fixed: 1 0;
-                    align: 0.5 0.0;
-                    color: 255 182 193 255; //pink
-                    visible: DEVELOPMENT;
-                    rel1 {
-                        relative: 1.0 1.0;
-                        to: "thumbnail_text_spacer";
-                    }
-                    rel2.relative: 1.0 1.0;
-                }
-            }
-            part {
-                name: "thumbnail_text";
-                type: TEXTBLOCK;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    rel1 {
-                        to: "thumbnail_text_bg";
-                        relative: 0.0 0.0;
-                    }
-                    rel2 {
-                        to: "thumbnail_text_bg";
-                        relative: 1.0 1.0;
-                    }
-                    color: 92 92 92 255;
-                    text { style: "thumbnail_text_style";
-                           align: 0.5 0;
-                         }
-                }
-            }
-            part {
-                name: "thumbbutton_item";
-                type: SWALLOW;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    rel1.to: "thumbnail_bg";
-                    rel2.to: "thumbnail_bg";
-                }
-            }
-            part {
-                name: "thumbnail_click";
-                type: SWALLOW;
-                mouse_events: 1;
-                repeat_events: 1;
-                description {
-                    state: "default" 0.0;
-                    color: 0 0 0 0;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        to: "thumbnail_bg";
-                    }
-                    rel2 {
-                        relative: 1.0 1.0;
-                        to: "thumbnail_bg";
-                    }
-                }
-            }
-            part {
-                name: "thumbnail_over";
-                type: RECT;
-                mouse_events: 1;
-                repeat_events: 1;
-                description {
-                    state: "default" 0.0;
-                    color: 0 0 0 0;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        to: "thumbnail_bg";
-                    }
-                    rel2 {
-                        relative: 1.0 1.0;
-                        to: "thumbnail_bg";
-                    }
-                }
-            }
-        }
-        programs {
-            program {
-                name: "thumbnail_down";
-                source: "thumbnail_click";
-                signal: "mouse,down,*";
-                script {
-                    emit("elm,action,click", "");
-                }
-            }
-            program {
-                name: "thumbnail_up";
-                signal: "mouse,up,*";
-                source: "thumbnail_click";
-                action: STATE_SET "default" 0.0;
-                target: "thumbnail_bg";
-            }
-            program {
-                name: "mouse_in";
-                signal: "mouse,in";
-                source: "thumbnail_over";
-                action: STATE_SET "selected" 0.0;
-                target: "thumbnail_bg";
-            }
-            program {
-                name: "mouse_out";
-                signal: "mouse,out";
-                source: "thumbnail_over";
-                action: STATE_SET "default" 0.0;
-                target: "thumbnail_bg";
-            }
-        }
-    }
-}
diff --git a/services/MoreMenuUI/edc/error.edc b/services/MoreMenuUI/edc/error.edc
deleted file mode 100644 (file)
index 9292278..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-collections { base_scale: 2.0;
-    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 ellipsis=1.0";
-        }
-        style { name: "mssage_hint_style";
-            base: "font=Sans font_size=24 color=#868686 wrap=word align=0.5 ellipsis=1.0";
-        }
-    }
-    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.<br/>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. <br/>"
-                    "Check your network settings.<br/>"
-                    "Try again later.<br/>"
-                    "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/MoreMenuUI/images/btn_bar_new_dis.png b/services/MoreMenuUI/images/btn_bar_new_dis.png
deleted file mode 100644 (file)
index af49c5a..0000000
Binary files a/services/MoreMenuUI/images/btn_bar_new_dis.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/btn_bar_new_foc.png b/services/MoreMenuUI/images/btn_bar_new_foc.png
deleted file mode 100644 (file)
index 2a5c00b..0000000
Binary files a/services/MoreMenuUI/images/btn_bar_new_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/btn_bar_new_nor.png b/services/MoreMenuUI/images/btn_bar_new_nor.png
deleted file mode 100644 (file)
index 352a2f4..0000000
Binary files a/services/MoreMenuUI/images/btn_bar_new_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/btn_bar_stop_nor.png b/services/MoreMenuUI/images/btn_bar_stop_nor.png
deleted file mode 100644 (file)
index c5cdc11..0000000
Binary files a/services/MoreMenuUI/images/btn_bar_stop_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/favicon.png b/services/MoreMenuUI/images/favicon.png
deleted file mode 100644 (file)
index 15ac957..0000000
Binary files a/services/MoreMenuUI/images/favicon.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_add_bookmark.png b/services/MoreMenuUI/images/ic_add_bookmark.png
deleted file mode 100644 (file)
index 0ea3265..0000000
Binary files a/services/MoreMenuUI/images/ic_add_bookmark.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_add_bookmark_new.png b/services/MoreMenuUI/images/ic_add_bookmark_new.png
deleted file mode 100644 (file)
index dabcfd7..0000000
Binary files a/services/MoreMenuUI/images/ic_add_bookmark_new.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_bookmark_foc.png b/services/MoreMenuUI/images/ic_more_bookmark_foc.png
deleted file mode 100644 (file)
index 7cfbba9..0000000
Binary files a/services/MoreMenuUI/images/ic_more_bookmark_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_bookmark_nor.png b/services/MoreMenuUI/images/ic_more_bookmark_nor.png
deleted file mode 100644 (file)
index addcd5a..0000000
Binary files a/services/MoreMenuUI/images/ic_more_bookmark_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_desktopview_foc.png b/services/MoreMenuUI/images/ic_more_desktopview_foc.png
deleted file mode 100644 (file)
index 21bcc68..0000000
Binary files a/services/MoreMenuUI/images/ic_more_desktopview_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_desktopview_nor.png b/services/MoreMenuUI/images/ic_more_desktopview_nor.png
deleted file mode 100644 (file)
index 462151f..0000000
Binary files a/services/MoreMenuUI/images/ic_more_desktopview_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_exit_foc.png b/services/MoreMenuUI/images/ic_more_exit_foc.png
deleted file mode 100644 (file)
index 779fc48..0000000
Binary files a/services/MoreMenuUI/images/ic_more_exit_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_exit_nor.png b/services/MoreMenuUI/images/ic_more_exit_nor.png
deleted file mode 100644 (file)
index b6dcd88..0000000
Binary files a/services/MoreMenuUI/images/ic_more_exit_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_focusmode_foc.png b/services/MoreMenuUI/images/ic_more_focusmode_foc.png
deleted file mode 100644 (file)
index f5fdac8..0000000
Binary files a/services/MoreMenuUI/images/ic_more_focusmode_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_focusmode_nor.png b/services/MoreMenuUI/images/ic_more_focusmode_nor.png
deleted file mode 100644 (file)
index f7a61fb..0000000
Binary files a/services/MoreMenuUI/images/ic_more_focusmode_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_history_foc.png b/services/MoreMenuUI/images/ic_more_history_foc.png
deleted file mode 100644 (file)
index a397ea0..0000000
Binary files a/services/MoreMenuUI/images/ic_more_history_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_history_nor.png b/services/MoreMenuUI/images/ic_more_history_nor.png
deleted file mode 100644 (file)
index 698a8cf..0000000
Binary files a/services/MoreMenuUI/images/ic_more_history_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_minibrowser_foc.png b/services/MoreMenuUI/images/ic_more_minibrowser_foc.png
deleted file mode 100644 (file)
index 4f37952..0000000
Binary files a/services/MoreMenuUI/images/ic_more_minibrowser_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_minibrowser_nor.png b/services/MoreMenuUI/images/ic_more_minibrowser_nor.png
deleted file mode 100644 (file)
index 0c29899..0000000
Binary files a/services/MoreMenuUI/images/ic_more_minibrowser_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_mobileview_foc.png b/services/MoreMenuUI/images/ic_more_mobileview_foc.png
deleted file mode 100644 (file)
index e95981d..0000000
Binary files a/services/MoreMenuUI/images/ic_more_mobileview_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_mobileview_nor.png b/services/MoreMenuUI/images/ic_more_mobileview_nor.png
deleted file mode 100644 (file)
index 91aebfe..0000000
Binary files a/services/MoreMenuUI/images/ic_more_mobileview_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_readermode_foc.png b/services/MoreMenuUI/images/ic_more_readermode_foc.png
deleted file mode 100644 (file)
index d257732..0000000
Binary files a/services/MoreMenuUI/images/ic_more_readermode_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_readermode_nor.png b/services/MoreMenuUI/images/ic_more_readermode_nor.png
deleted file mode 100644 (file)
index b8d4ee2..0000000
Binary files a/services/MoreMenuUI/images/ic_more_readermode_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_setting_foc.png b/services/MoreMenuUI/images/ic_more_setting_foc.png
deleted file mode 100644 (file)
index a881c62..0000000
Binary files a/services/MoreMenuUI/images/ic_more_setting_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_setting_nor.png b/services/MoreMenuUI/images/ic_more_setting_nor.png
deleted file mode 100644 (file)
index 284d423..0000000
Binary files a/services/MoreMenuUI/images/ic_more_setting_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_share_foc.png b/services/MoreMenuUI/images/ic_more_share_foc.png
deleted file mode 100644 (file)
index dadf09b..0000000
Binary files a/services/MoreMenuUI/images/ic_more_share_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_share_nor.png b/services/MoreMenuUI/images/ic_more_share_nor.png
deleted file mode 100644 (file)
index 2863187..0000000
Binary files a/services/MoreMenuUI/images/ic_more_share_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_zoom_foc.png b/services/MoreMenuUI/images/ic_more_zoom_foc.png
deleted file mode 100644 (file)
index 4433579..0000000
Binary files a/services/MoreMenuUI/images/ic_more_zoom_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_zoom_nor.png b/services/MoreMenuUI/images/ic_more_zoom_nor.png
deleted file mode 100644 (file)
index de75812..0000000
Binary files a/services/MoreMenuUI/images/ic_more_zoom_nor.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ico_bg_round_shape_37x37.png b/services/MoreMenuUI/images/ico_bg_round_shape_37x37.png
deleted file mode 100644 (file)
index 00182ed..0000000
Binary files a/services/MoreMenuUI/images/ico_bg_round_shape_37x37.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ico_delete.png b/services/MoreMenuUI/images/ico_delete.png
deleted file mode 100644 (file)
index 92f42cc..0000000
Binary files a/services/MoreMenuUI/images/ico_delete.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ico_url.png b/services/MoreMenuUI/images/ico_url.png
deleted file mode 100755 (executable)
index fa4625f..0000000
Binary files a/services/MoreMenuUI/images/ico_url.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/modal_dialogs_bg.png b/services/MoreMenuUI/images/modal_dialogs_bg.png
deleted file mode 100644 (file)
index 6ce4506..0000000
Binary files a/services/MoreMenuUI/images/modal_dialogs_bg.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/modal_dialogs_title_bg.png b/services/MoreMenuUI/images/modal_dialogs_title_bg.png
deleted file mode 100644 (file)
index 36aaab4..0000000
Binary files a/services/MoreMenuUI/images/modal_dialogs_title_bg.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/moremenu_ic_01.png b/services/MoreMenuUI/images/moremenu_ic_01.png
deleted file mode 100644 (file)
index 0ec6c64..0000000
Binary files a/services/MoreMenuUI/images/moremenu_ic_01.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/moremenu_ic_01_edit.png b/services/MoreMenuUI/images/moremenu_ic_01_edit.png
deleted file mode 100644 (file)
index 043fc42..0000000
Binary files a/services/MoreMenuUI/images/moremenu_ic_01_edit.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/moremenu_ic_02.png b/services/MoreMenuUI/images/moremenu_ic_02.png
deleted file mode 100644 (file)
index 97a9b6e..0000000
Binary files a/services/MoreMenuUI/images/moremenu_ic_02.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/moremenu_ic_03.png b/services/MoreMenuUI/images/moremenu_ic_03.png
deleted file mode 100644 (file)
index b7e1b99..0000000
Binary files a/services/MoreMenuUI/images/moremenu_ic_03.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/moremenu_ic_04.png b/services/MoreMenuUI/images/moremenu_ic_04.png
deleted file mode 100644 (file)
index 75d564a..0000000
Binary files a/services/MoreMenuUI/images/moremenu_ic_04.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/moremenu_ic_05.png b/services/MoreMenuUI/images/moremenu_ic_05.png
deleted file mode 100644 (file)
index 768cef7..0000000
Binary files a/services/MoreMenuUI/images/moremenu_ic_05.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/moremenu_ic_06.png b/services/MoreMenuUI/images/moremenu_ic_06.png
deleted file mode 100644 (file)
index ea765a8..0000000
Binary files a/services/MoreMenuUI/images/moremenu_ic_06.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/moremenu_ic_07.png b/services/MoreMenuUI/images/moremenu_ic_07.png
deleted file mode 100644 (file)
index 8aadfd4..0000000
Binary files a/services/MoreMenuUI/images/moremenu_ic_07.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/web_frame_selected.png b/services/MoreMenuUI/images/web_frame_selected.png
deleted file mode 100644 (file)
index 4470ca4..0000000
Binary files a/services/MoreMenuUI/images/web_frame_selected.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/web_shadow.png b/services/MoreMenuUI/images/web_shadow.png
deleted file mode 100644 (file)
index f9018b0..0000000
Binary files a/services/MoreMenuUI/images/web_shadow.png and /dev/null differ
diff --git a/services/MoreMenuUI/images_mob/moremenu_ic_01.png b/services/MoreMenuUI/images_mob/moremenu_ic_01.png
deleted file mode 100644 (file)
index 0ec6c64..0000000
Binary files a/services/MoreMenuUI/images_mob/moremenu_ic_01.png and /dev/null differ
diff --git a/services/MoreMenuUI/images_mob/moremenu_ic_01_edit.png b/services/MoreMenuUI/images_mob/moremenu_ic_01_edit.png
deleted file mode 100644 (file)
index 043fc42..0000000
Binary files a/services/MoreMenuUI/images_mob/moremenu_ic_01_edit.png and /dev/null differ
diff --git a/services/MoreMenuUI/images_mob/moremenu_ic_02.png b/services/MoreMenuUI/images_mob/moremenu_ic_02.png
deleted file mode 100644 (file)
index 97a9b6e..0000000
Binary files a/services/MoreMenuUI/images_mob/moremenu_ic_02.png and /dev/null differ
diff --git a/services/MoreMenuUI/images_mob/moremenu_ic_03.png b/services/MoreMenuUI/images_mob/moremenu_ic_03.png
deleted file mode 100644 (file)
index b7e1b99..0000000
Binary files a/services/MoreMenuUI/images_mob/moremenu_ic_03.png and /dev/null differ
diff --git a/services/MoreMenuUI/images_mob/moremenu_ic_04.png b/services/MoreMenuUI/images_mob/moremenu_ic_04.png
deleted file mode 100644 (file)
index 75d564a..0000000
Binary files a/services/MoreMenuUI/images_mob/moremenu_ic_04.png and /dev/null differ
diff --git a/services/MoreMenuUI/images_mob/moremenu_ic_05.png b/services/MoreMenuUI/images_mob/moremenu_ic_05.png
deleted file mode 100644 (file)
index 768cef7..0000000
Binary files a/services/MoreMenuUI/images_mob/moremenu_ic_05.png and /dev/null differ
diff --git a/services/MoreMenuUI/images_mob/moremenu_ic_06.png b/services/MoreMenuUI/images_mob/moremenu_ic_06.png
deleted file mode 100644 (file)
index ea765a8..0000000
Binary files a/services/MoreMenuUI/images_mob/moremenu_ic_06.png and /dev/null differ
diff --git a/services/MoreMenuUI/images_mob/moremenu_ic_07.png b/services/MoreMenuUI/images_mob/moremenu_ic_07.png
deleted file mode 100644 (file)
index 8aadfd4..0000000
Binary files a/services/MoreMenuUI/images_mob/moremenu_ic_07.png and /dev/null differ
diff --git a/services/MoreMenuUI/images_mob/user_thumbnail_mask.png b/services/MoreMenuUI/images_mob/user_thumbnail_mask.png
deleted file mode 100644 (file)
index 28f614c..0000000
Binary files a/services/MoreMenuUI/images_mob/user_thumbnail_mask.png and /dev/null differ
index 7e7b7336a7bc9c7512bfdece904e9a2b2888d7ce..2afc8ddf7cddc5b999ca8edc278ce8ed5a1ac889 100644 (file)
@@ -31,7 +31,6 @@ include_directories(${CMAKE_SOURCE_DIR}/services/BookmarkManagerUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/FavoriteService)
 include_directories(${CMAKE_SOURCE_DIR}/services/HistoryService)
 include_directories(${CMAKE_SOURCE_DIR}/services/TabService)
-include_directories(${CMAKE_SOURCE_DIR}/services/MoreMenuUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/HistoryUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/QuickAccess)
 include_directories(${CMAKE_SOURCE_DIR}/services/SettingsUI)
@@ -54,7 +53,6 @@ add_dependencies(${PROJECT_NAME} WebPageUI)
 add_dependencies(${PROJECT_NAME} StorageService)
 add_dependencies(${PROJECT_NAME} HistoryService)
 add_dependencies(${PROJECT_NAME} TabService)
-add_dependencies(${PROJECT_NAME} MoreMenuUI)
 add_dependencies(${PROJECT_NAME} BookmarkFlowUI)
 add_dependencies(${PROJECT_NAME} BookmarkManagerUI)
 add_dependencies(${PROJECT_NAME} QuickAccess)
@@ -72,7 +70,6 @@ target_link_libraries(${PROJECT_NAME} WebPageUI)
 target_link_libraries(${PROJECT_NAME} StorageService)
 target_link_libraries(${PROJECT_NAME} HistoryService)
 target_link_libraries(${PROJECT_NAME} TabService)
-target_link_libraries(${PROJECT_NAME} MoreMenuUI)
 target_link_libraries(${PROJECT_NAME} QuickAccess)
 target_link_libraries(${PROJECT_NAME} HistoryUI)
 target_link_libraries(${PROJECT_NAME} TabUI)
index 25cf5bc599e4b66a8199d1ebbd0e44a9cb07f572..37ba18738f271e3806f78548851b3df162443b31 100755 (executable)
@@ -68,7 +68,6 @@ const int SCALE_FACTOR =
 SimpleUI::SimpleUI()
     : AbstractMainWindow()
     , m_webPageUI()
-    , m_moreMenuUI()
     , m_bookmarkFlowUI()
 #if PROFILE_MOBILE
     , m_findOnPageUI()
@@ -213,11 +212,6 @@ int SimpleUI::exec(const std::string& _url, const std::string& _caller)
     return 0;
 }
 
-void SimpleUI::titleChanged(const std::string& title)
-{
-    m_moreMenuUI->setWebTitle(title);
-}
-
 void SimpleUI::faviconChanged(tools::BrowserImagePtr favicon)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
@@ -267,11 +261,6 @@ void SimpleUI::loadUIServices()
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.settingsui"));
     m_settingsUI = m_settingsManager->getView(SettingsMainOptions::BASE);
 
-    m_moreMenuUI =
-        std::dynamic_pointer_cast
-        <tizen_browser::base_ui::MoreMenuUI,tizen_browser::core::AbstractService>
-        (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.moremenuui"));
-
     m_bookmarkFlowUI =
         std::dynamic_pointer_cast
         <tizen_browser::base_ui::BookmarkFlowUI,tizen_browser::core::AbstractService>
@@ -309,7 +298,6 @@ void SimpleUI::connectUISignals()
     m_webPageUI->backPage.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::back, m_webEngine.get()));
     m_webPageUI->showTabUI.connect(boost::bind(&SimpleUI::showTabUI, this));
     m_webPageUI->showBookmarksUI.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this,m_favoriteService->getRoot()));
-    m_webPageUI->showMoreMenu.connect(boost::bind(&SimpleUI::showMoreMenu, this));
     m_webPageUI->forwardPage.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::forward, m_webEngine.get()));
     m_webPageUI->showQuickAccess.connect(boost::bind(&SimpleUI::showQuickAccess, this));
     m_webPageUI->hideQuickAccess.connect(boost::bind(&QuickAccess::hideUI, m_quickAccess));
@@ -322,7 +310,6 @@ void SimpleUI::connectUISignals()
     m_webPageUI->showBookmarkFlowUI.connect(boost::bind(&SimpleUI::showBookmarkFlowUI, this));
     m_webPageUI->showFindOnPageUI.connect(boost::bind(&SimpleUI::showFindOnPageUI, this, std::string()));
     m_webPageUI->showSettingsUI.connect(boost::bind(&SettingsManager::showSettingsBaseUI, m_settingsManager.get()));
-    m_webPageUI->hideMoreMenu.connect(boost::bind(&SimpleUI::closeMoreMenu, this));
     m_webPageUI->addNewTab.connect(boost::bind(&SimpleUI::newTabClicked, this));
     m_webPageUI->getURIEntry().mobileEntryFocused.connect(boost::bind(&WebPageUI::mobileEntryFocused, m_webPageUI));
     m_webPageUI->getURIEntry().mobileEntryUnfocused.connect(boost::bind(&WebPageUI::mobileEntryUnfocused, m_webPageUI));
@@ -333,6 +320,7 @@ void SimpleUI::connectUISignals()
         boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::reload, m_webEngine.get()));
     m_webPageUI->getURIEntry().stopLoadingPage.connect(
         boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::stopLoading, m_webEngine.get()));
+    m_webPageUI->isLandscape.connect(boost::bind(&SimpleUI::isLandscape, this));
 
     M_ASSERT(m_quickAccess.get());
     m_quickAccess->getDetailPopup().openURL.connect(boost::bind(&SimpleUI::onOpenURL, this, _1, _2));
@@ -371,23 +359,6 @@ void SimpleUI::connectUISignals()
 
     connectSettingsSignals();
 
-    M_ASSERT(m_moreMenuUI.get());
-    m_moreMenuUI->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this, m_favoriteService->getRoot()));
-    m_moreMenuUI->historyUIClicked.connect(boost::bind(&SimpleUI::showHistoryUI, this));
-    m_moreMenuUI->settingsClicked.connect(boost::bind(&SettingsManager::showSettingsBaseUI, m_settingsManager.get()));
-    m_moreMenuUI->closeMoreMenuClicked.connect(boost::bind(&SimpleUI::closeMoreMenu, this));
-    m_moreMenuUI->switchToMobileMode.connect(boost::bind(&SimpleUI::switchToMobileMode, this));
-    m_moreMenuUI->switchToDesktopMode.connect(boost::bind(&SimpleUI::switchToDesktopMode, this));
-    m_moreMenuUI->isBookmark.connect(boost::bind(&SimpleUI::checkBookmark, this));
-    m_moreMenuUI->bookmarkFlowClicked.connect(boost::bind(&SimpleUI::showBookmarkFlowUI, this));
-#if PROFILE_MOBILE
-    m_moreMenuUI->findOnPageClicked.connect(boost::bind(&SimpleUI::showFindOnPageUI, this, std::string()));
-    m_moreMenuUI->isRotated.connect(boost::bind(&SimpleUI::isLandscape, this));
-    m_webPageUI->isLandscape.connect(boost::bind(&SimpleUI::isLandscape, this));
-#else
-    m_moreMenuUI->zoomUIClicked.connect(boost::bind(&SimpleUI::showZoomUI, this));
-#endif
-
     M_ASSERT(m_bookmarkFlowUI.get());
     m_bookmarkFlowUI->closeBookmarkFlowClicked.connect(boost::bind(&SimpleUI::closeBookmarkFlowUI, this));
     m_bookmarkFlowUI->saveBookmark.connect(boost::bind(&SimpleUI::addBookmark, this, _1));
@@ -511,13 +482,6 @@ void SimpleUI::initUIServices()
     M_ASSERT(m_historyUI.get());
     m_historyUI->init(m_viewManager.getContent());
 
-    M_ASSERT(m_moreMenuUI.get());
-#if PROFILE_MOBILE
-    m_moreMenuUI->init(m_webPageUI->getContent());
-#else
-    m_moreMenuUI->init(m_viewManager.getContent());
-#endif
-
     M_ASSERT(m_settingsUI.get());
     m_settingsUI->init(m_viewManager.getContent());
 
@@ -578,7 +542,6 @@ void SimpleUI::connectModelSignals()
     m_webEngine->tabClosed.connect(boost::bind(&SimpleUI::tabClosed,this,_1));
     m_webEngine->IMEStateChanged.connect(boost::bind(&SimpleUI::setwvIMEStatus, this, _1));
     m_webEngine->switchToWebPage.connect(boost::bind(&SimpleUI::switchViewToWebPage, this));
-    m_webEngine->titleChanged.connect(boost::bind(&SimpleUI::titleChanged, this, _1));
     m_webEngine->favIconChanged.connect(boost::bind(&SimpleUI::faviconChanged, this, _1));
     m_webEngine->windowCreated.connect(boost::bind(&SimpleUI::windowCreated, this));
     m_webEngine->createTabId.connect(boost::bind(&SimpleUI::onCreateTabId, this));
@@ -588,7 +551,6 @@ void SimpleUI::connectModelSignals()
     m_webEngine->setCertificatePem.connect(boost::bind(&services::CertificateContents::saveCertificateInfo, m_certificateContents, _1, _2));
     m_webEngine->setWrongCertificatePem.connect(boost::bind(&services::CertificateContents::saveWrongCertificateInfo, m_certificateContents, _1, _2));
 #if PROFILE_MOBILE
-    m_webEngine->uriChanged.connect(boost::bind(&SimpleUI::webEngineURLChanged, this, _1));
     m_webEngine->confirmationRequest.connect(boost::bind(&SimpleUI::handleConfirmationRequest, this, _1));
     m_webEngine->getRotation.connect(boost::bind(&SimpleUI::getRotation, this));
     m_webEngine->openFindOnPage.connect(boost::bind(&SimpleUI::showFindOnPageUI, this, _1));
@@ -596,9 +558,6 @@ void SimpleUI::connectModelSignals()
     m_webEngine->unsecureConnection.connect(boost::bind(&SimpleUI::showUnsecureConnectionPopup, this));
 #endif
 
-    m_favoriteService->bookmarkAdded.connect(boost::bind(&SimpleUI::onBookmarkAdded, this,_1));
-    m_favoriteService->bookmarkDeleted.connect(boost::bind(&SimpleUI::onBookmarkRemoved, this, _1));
-
     m_historyService->historyDeleted.connect(boost::bind(&SimpleUI::onHistoryRemoved, this,_1));
 
     m_tabService->generateThumb.connect(boost::bind(&SimpleUI::onGenerateThumb, this, _1));
@@ -732,23 +691,6 @@ bool SimpleUI::checkBookmark()
         return false;
     }
 }
-// Consider removing these functions
-void SimpleUI::onBookmarkAdded(std::shared_ptr<tizen_browser::services::BookmarkItem>)
-{
-    if (m_moreMenuUI) {
-        m_moreMenuUI->changeBookmarkStatus(true);
-        m_moreMenuUI->createToastPopup( (std::string(m_webEngine->getTitle()) + std::string(" added to bookmark")).c_str() );
-    }
-}
-
-void SimpleUI::onBookmarkRemoved(const std::string& uri)
-{
-    BROWSER_LOGD("[%s] deleted %s", __func__, uri.c_str());
-    if (m_moreMenuUI) {
-        m_moreMenuUI->changeBookmarkStatus(false);
-        m_moreMenuUI->createToastPopup( (std::string(m_webEngine->getTitle()) + std::string(" removed from bookmark")).c_str() );
-    }
-}
 
 void SimpleUI::onOpenURL(std::shared_ptr<tizen_browser::services::HistoryItem> historyItem, bool desktopMode)
 {
@@ -1047,10 +989,6 @@ void SimpleUI::onBackPressed()
         return;
     } else if (m_popupVector.size() > 0) {
         m_popupVector.back()->onBackPressed();
-#if PROFILE_MOBILE
-    } else if (m_moreMenuUI->isVisible()) {
-        m_moreMenuUI->hideUI();
-#endif
     } else if ((m_viewManager.topOfStack() == m_tabUI.get()) && m_tabUI->isEditMode()) {
         m_tabUI->onBackKey();
     } else if (m_viewManager.topOfStack() == m_bookmarkManagerUI.get()) {
@@ -1119,7 +1057,6 @@ void SimpleUI::onRotation()
 
     m_current_angle = m_temp_angle;
     elm_win_rotation_with_resize_set(main_window, m_current_angle);
-    m_moreMenuUI->resetContent();
     m_bookmarkFlowUI->orientationChanged();
     m_settingsUI->orientationChanged();
     m_bookmarkManagerUI->orientationChanged();
@@ -1285,7 +1222,6 @@ void SimpleUI::showZoomUI()
     if(! m_webPageUI->stateEquals(WPUState::QUICK_ACCESS)) {
         m_viewManager.popStackTo(m_webPageUI.get());
         m_webPageUI->showTabUI.connect(boost::bind(&SimpleUI::closeZoomUI, this));
-        m_webPageUI->showMoreMenu.connect(boost::bind(&SimpleUI::closeZoomUI, this));
         m_zoomUI->show(m_window.get());
     }
 }
@@ -1315,13 +1251,6 @@ void SimpleUI::scrollView(const int& dx, const int& dy)
 }
 
 #if PROFILE_MOBILE
-void SimpleUI::webEngineURLChanged(const std::string url)
-{
-    BROWSER_LOGD("webEngineURLChanged:%s", url.c_str());
-    if (m_moreMenuUI->isVisible())
-        m_moreMenuUI->updateBookmarkButton();
-}
-
 void SimpleUI::showFindOnPageUI(const std::string& str)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
@@ -1546,53 +1475,6 @@ std::string SimpleUI::requestSettingsCurrentPage()
     return m_webEngine->getURI();
 }
 
-void SimpleUI::showMoreMenu()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-
-#if PROFILE_MOBILE
-    M_ASSERT(m_webPageUI);
-    if (m_moreMenuUI->isVisible())
-        m_moreMenuUI->hideUI();
-    else {
-        m_moreMenuUI->shouldShowFindOnPage(!m_webEngine->getURI().empty());
-        m_moreMenuUI->blockThumbnails(m_webPageUI->stateEquals(WPUState::QUICK_ACCESS));
-        m_webEngine->moreKeyPressed();
-        m_moreMenuUI->showUI();
-    }
-#else
-    bool desktopMode = m_webPageUI->stateEquals(WPUState::QUICK_ACCESS) ? m_quickAccess->isDesktopMode() : m_webEngine->isDesktopMode();
-    m_moreMenuUI->setDesktopMode(desktopMode);
-    m_viewManager.pushViewToStack(m_moreMenuUI.get());
-    m_moreMenuUI->showCurrentTab();
-
-    if (!m_webPageUI->stateEquals(WPUState::QUICK_ACCESS)) {
-        m_moreMenuUI->setFavIcon(m_webEngine->getFavicon());
-        m_moreMenuUI->setWebTitle(m_webEngine->getTitle());
-        m_moreMenuUI->setURL(m_webEngine->getURI());
-    }
-    else {
-        m_moreMenuUI->setHomePageInfo();
-    }
-#endif
-}
-
-void SimpleUI::closeMoreMenu()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-
-#if PROFILE_MOBILE
-    M_ASSERT(m_webPageUI);
-    if (m_moreMenuUI->isVisible())
-        m_moreMenuUI->hideUI();
-#else
-    if (m_viewManager.topOfStack() == m_moreMenuUI.get())
-        m_viewManager.popTheStack();
-    else
-        BROWSER_LOGD("[%s:%d] WARNING!!! closeMoreMenu is not topOfStack", __PRETTY_FUNCTION__, __LINE__);
-#endif
-}
-
 void SimpleUI::switchToMobileMode()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
index 118545c29f658a12ae3519c3626a900711ac3439..0210d221e916e6bad9c7d2cd0eb0dce4c6763869 100644 (file)
@@ -37,7 +37,6 @@
 #include "WebPageUI.h"
 #include "AbstractWebEngine.h"
 #include "TabOrigin.h"
-#include "MoreMenuUI.h"
 #include "HistoryUI.h"
 #include "FindOnPageUI.h"
 #include "SettingsUI.h"
@@ -95,7 +94,6 @@ private:
     void initModelServices();
     void initUIServices();
     void connectModelSignals();
-    void titleChanged(const std::string& title);
     void faviconChanged(tools::BrowserImagePtr favicon);
     void restoreLastSession();
     Evas_Object* createWebLayout(Evas_Object* parent);
@@ -146,9 +144,6 @@ private:
     std::shared_ptr<services::HistoryItemVector> getHistory();
     std::shared_ptr<services::HistoryItemVector> getMostVisitedItems();
 
-    //UI signal handling functions
-    void onBookmarkAdded(std::shared_ptr<tizen_browser::services::BookmarkItem> bookmarkItem);
-
     void onBookmarkClicked(std::shared_ptr<tizen_browser::services::BookmarkItem> bookmarkItem);
     void onNewQuickAccessClicked();
     void onBookmarkEdit(std::shared_ptr<tizen_browser::services::BookmarkItem> bookmarkItem);
@@ -164,7 +159,6 @@ private:
     static void onUrlIMEOpened(void* data, Evas_Object*, void*);
     static void onUrlIMEClosed(void* data, Evas_Object*, void*);
 #endif
-    void onBookmarkRemoved(const std::string& uri);
 
     void onHistoryRemoved(const std::string& uri);
     void onOpenURL(std::shared_ptr<tizen_browser::services::HistoryItem> historyItem, bool desktopMode);
@@ -197,14 +191,6 @@ private:
 #if PROFILE_MOBILE
     void onMenuButtonPressed();
     void handleConfirmationRequest(basic_webengine::WebConfirmationPtr webConfirmation);
-
-    /**
-     * \brief check if url comming back from WebEngine should be passed to URI.
-     *
-     * For filtered addresses we need to hide real URI so the user would be confused.
-     * and this is a back function that checks if address emited from browser should be changed.
-     */
-    void webEngineURLChanged(const std::string url);
 #else
     void onRedKeyPressed();
     void onYellowKeyPressed();
@@ -269,8 +255,6 @@ private:
 
     void showTabUI();
     void closeTabUI();
-    void showMoreMenu();
-    void closeMoreMenu();
     void switchToMobileMode();
     void switchToDesktopMode();
     void showHistoryUI();
@@ -339,7 +323,6 @@ private:
     std::shared_ptr<interfaces::AbstractFavoriteService> m_favoriteService;
     std::shared_ptr<services::HistoryService> m_historyService;
     services::TabServicePtr m_tabService;
-    std::shared_ptr<MoreMenuUI> m_moreMenuUI;
 #if PROFILE_MOBILE
     std::shared_ptr<BookmarkFlowUI> m_bookmarkFlowUI;
     std::shared_ptr<FindOnPageUI> m_findOnPageUI;
index 7c05fb9fcd52f0c02783e236e4f79c0821a548ed..44073cc8dee2b32ee21a9371344c34abf3724cac 100755 (executable)
@@ -22,7 +22,6 @@ include_directories(${CMAKE_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/services)
 include_directories(${CMAKE_SOURCE_DIR}/services/WebEngineService)
 include_directories(${CMAKE_SOURCE_DIR}/services/WebEngineService/src)
-include_directories(${CMAKE_SOURCE_DIR}/services/MoreMenuUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/QuickAccess)
 include_directories(${CMAKE_SOURCE_DIR}/services/SettingsUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/TabUI)
@@ -34,10 +33,8 @@ pkg_check_modules(capi_net QUIET capi-network-connection)
 
 add_library(${PROJECT_NAME} SHARED ${WebPageUI_SRCS})
 
-add_dependencies(${PROJECT_NAME} MoreMenuUI)
 add_dependencies(${PROJECT_NAME} QuickAccess)
 add_dependencies(${PROJECT_NAME} TabUI)
-target_link_libraries(${PROJECT_NAME} MoreMenuUI)
 target_link_libraries(${PROJECT_NAME} QuickAccess)
 target_link_libraries(${PROJECT_NAME} TabUI)
 target_link_libraries(${PROJECT_NAME} ${EFL_LDFLAGS})
index f9ef8f9a9be4de6f73be308baad0b413d1251287..16058fd808a2d7a274111c37528f7b96c6dde948 100755 (executable)
@@ -136,7 +136,6 @@ void WebPageUI::hideUI()
 #if GESTURE
     elm_gesture_layer_cb_del(m_gestureLayer, ELM_GESTURE_N_LINES, ELM_GESTURE_STATE_MOVE, _gesture_move, this);
 #endif
-    hideMoreMenu();
     hideFindOnPage();
 }
 
@@ -523,7 +522,6 @@ void WebPageUI::createLayout()
     elm_object_part_content_set(m_mainLayout, "uri_bar_buttons_right", m_rightButtonBar->getContent());
 
     elm_layout_signal_callback_add(m_URIEntry->getContent(), "slide_websearch", "elm", faviconClicked, this);
-    edje_object_signal_callback_add(elm_layout_edje_get(m_mainLayout), "mouse,clicked,1", "moremenu_dimmed_bg", _more_menu_background_clicked, this);
 
 //    elm_theme_extension_add(nullptr, edjePath("WebPageUI/UrlHistoryList.edj").c_str());
 //    m_urlHistoryList->setMembers(m_mainLayout, m_URIEntry->getEntryWidget());
@@ -620,13 +618,6 @@ void WebPageUI::_content_clicked(void *data, Evas_Object *, void *)
     webpageUI->setContentFocus();
 }
 
-void WebPageUI::_more_menu_background_clicked(void* data, Evas_Object*, const char*, const char*)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    WebPageUI*  webPageUI = static_cast<WebPageUI*>(data);
-    webPageUI->hideMoreMenu();
-}
-
 void WebPageUI::createActions()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
@@ -712,12 +703,6 @@ std::string WebPageUI::edjePath(const std::string& file)
     return std::string(EDJE_DIR) + file;
 }
 
-void WebPageUI::showMoreMenuConnect()
-{
-    hideFindOnPage();
-    showMoreMenu();
-}
-
 #if GESTURE
 Evas_Event_Flags WebPageUI::_gesture_move(void* data , void* event_info)
 {
index dda2fe22749b8e830ecedbed3bdfa4ca8514e22b..1e969dbf5cb40877439ab9e8e187361146346238 100644 (file)
@@ -93,9 +93,7 @@ public:
     boost::signals2::signal<void ()> forwardPage;
     boost::signals2::signal<void ()> showTabUI;
     boost::signals2::signal<void ()> showBookmarksUI;
-    boost::signals2::signal<void ()> hideMoreMenu;
     boost::signals2::signal<void ()> qaOrientationChanged;
-    boost::signals2::signal<void ()> showMoreMenu;
     boost::signals2::signal<void ()> hideQuickAccess;
     boost::signals2::signal<void ()> showQuickAccess;
     boost::signals2::signal<void ()> bookmarkManagerClicked;
@@ -154,7 +152,6 @@ private:
     // wrappers to call singal as a reaction to other signal
     void backPageConnect() { backPage(); }
     void forwardPageConnect() { forwardPage(); }
-    void showMoreMenuConnect();
     void addNewTabConnect() { addNewTab(); }
 
     Evas_Object* m_parent;
index 778be88747e994d0bf8eef31c579354cd23a8735..e7bf2129a925e9860a1b0ef149cc374928383178 100644 (file)
@@ -347,99 +347,6 @@ collections { base_scale: 2.6;
             }
 
             #include "WebPageUIUrlHistoryList.edc"
-            part {
-                name: "moremenu_dimmed_bg";
-                type: RECT;
-                scale: 1;
-                mouse_events: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 0;
-                    align: 0.0 0.0;
-                    min: 0 0;
-                    max: -1 -1;
-                    fixed: 0 0;
-                    color: 0 0 0 102.4;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        to: "web_view";
-                    }
-                    rel2 {
-                        relative: 1.0 1.0;
-                        to: "web_view";
-                    }
-                }
-                description {
-                    state: "visible" 0.0;
-                    inherit: "default";
-                    visible: 1;
-                }
-            }
-            part {
-                name: "moremenu_bg";
-                type: RECT;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 0;
-                    align: 0.0 0.0;
-                    min: 0 MORE_HEIGHT_VERTICAL;
-                    max: -1 MORE_HEIGHT_VERTICAL;
-                    fixed: 0 1;
-                    color: 244 244 244 255;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        to: "web_view";
-                    }
-                    rel2.relative: 1.0 1.0;
-                }
-                description { state: "landscape" 0.0;
-                              inherit: "default";
-                              visible: 1;
-                              min: 0 MORE_HEIGHT_LANDSCAPE;
-                              max: -1 MORE_HEIGHT_LANDSCAPE;
-                            }
-                description { state: "vertical" 0.0;
-                              inherit: "default";
-                              visible: 1;
-                              min: 0 MORE_HEIGHT_VERTICAL;
-                              max: -1 MORE_HEIGHT_VERTICAL;
-                            }
-            }
-            part {
-                name: "moremenu";
-                type: SWALLOW;
-                scale: 1;
-                mouse_events: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 0;
-                    align: 0.0 0.0;
-                    min: 0 MORE_HEIGHT_VERTICAL;
-                    max: -1 MORE_HEIGHT_VERTICAL;
-                    fixed: 0 1;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        to: "moremenu_bg";
-                    }
-                    rel2 {
-                        relative: 1.0 1.0;
-                        to: "moremenu_bg";
-                    }
-                }
-                description { state: "landscape" 0.0;
-                              inherit: "default";
-                              visible: 1;
-                              min: 0 MORE_HEIGHT_LANDSCAPE;
-                              max: -1 MORE_HEIGHT_LANDSCAPE;
-                            }
-                description { state: "vertical" 0.0;
-                              inherit: "default";
-                              visible: 1;
-                              min: 0 MORE_HEIGHT_VERTICAL;
-                              max: -1 MORE_HEIGHT_VERTICAL;
-                            }
-            }
             part {
                name: "findonpage";
                type: SWALLOW;
@@ -529,38 +436,6 @@ collections { base_scale: 2.6;
                 target: "bottom_toolbar";
                 transition: LINEAR 0.15;
             }
-            program {
-                name: "hide_moremenu";
-                signal: "hide_moremenu";
-                source: "ui";
-                action: STATE_SET "default" 0.0;
-                target: "moremenu";
-                target: "moremenu_bg";
-                target: "moremenu_dimmed_bg";
-            }
-            program {
-                name: "show_moremenu_landscape";
-                signal: "show_moremenu_landscape";
-                source: "ui";
-                action: STATE_SET "landscape" 0.0;
-                target: "moremenu";
-                target: "moremenu_bg";
-                after: "show_moremenu_dimmed_bg";
-            }
-            program {
-                name: "show_moremenu_vertical";
-                signal: "show_moremenu_vertical";
-                source: "ui";
-                action: STATE_SET "vertical" 0.0;
-                target: "moremenu";
-                target: "moremenu_bg";
-                after: "show_moremenu_dimmed_bg";
-            }
-            program {
-                name: "show_moremenu_dimmed_bg";
-                action: STATE_SET "visible" 0.0;
-                target: "moremenu_dimmed_bg";
-            }
             program {
                 name: "hide_findonpage";
                 signal: "hide_findonpage";