Merge "Remove share function in history and bookmarks menu" into 2.0_beta

2 files changed, 5 insertions, 40 deletions

diff --git a/src/browser-bookmark/browser-bookmark-view.cpp b/src/browser-bookmark/browser-bookmark-view.cpp
index bc9625b..aaf4c85 100755
--- a/src/browser-bookmark/browser-bookmark-view.cpp
+++ b/src/browser-bookmark/browser-bookmark-view.cpp
@@ -1381,30 +1381,6 @@ Evas_Object *Browser_Bookmark_View::__genlist_icon_get_cb(void *data, Evas_Objec
 			evas_object_smart_callback_add(edit_button, "clicked", __slide_edit_button_clicked_cb, item);
 			return edit_button;
 		} else if (!strncmp(part, "elm.slide.swallow.2", strlen("elm.slide.swallow.2"))) {
-			if (item->is_folder) {
-				Evas_Object *delete_button = elm_button_add(obj);
-				if (!delete_button) {
-					BROWSER_LOGE("elm_button_add is failed.\n");
-					return NULL;
-				}
-				elm_object_style_set(delete_button, "text_only/sweep");
-				elm_object_text_set(delete_button, BR_STRING_DELETE);
-				if (!item->is_editable)
-					elm_object_disabled_set(delete_button, EINA_TRUE);
-				evas_object_smart_callback_add(delete_button, "clicked", __slide_delete_button_clicked_cb, item);
-				return delete_button;
-			} else {
-				Evas_Object *share_button = elm_button_add(obj);
-				if (!share_button) {
-					BROWSER_LOGE("elm_button_add is failed.\n");
-					return NULL;
-				}
-				elm_object_style_set(share_button, "text_only/sweep");
-				elm_object_text_set(share_button, BR_STRING_SHARE);
-				evas_object_smart_callback_add(share_button, "clicked", __slide_share_button_clicked_cb, item);
-				return share_button;
-			}
-		} else if (!strncmp(part, "elm.slide.swallow.3", strlen("elm.slide.swallow.3"))) {
 			Evas_Object *delete_button = elm_button_add(obj);
 			if (!delete_button) {
 				BROWSER_LOGE("elm_button_add is failed.\n");
@@ -2137,7 +2113,7 @@ Evas_Object *Browser_Bookmark_View::_create_main_folder_genlist(void)
 		evas_object_smart_callback_add(genlist, "moved", __genlist_move_cb, this);
 
 		m_bookmark_genlist_item_class.item_style = "1text.1icon.2";
-		m_bookmark_genlist_item_class.decorate_item_style = "mode/slide3.text";
+		m_bookmark_genlist_item_class.decorate_item_style = "mode/slide2.text";
 		m_bookmark_genlist_item_class.decorate_all_item_style = "edit_default";
 		m_bookmark_genlist_item_class.func.text_get = __genlist_label_get_cb;
 		m_bookmark_genlist_item_class.func.content_get = __genlist_icon_get_cb;
@@ -2146,7 +2122,7 @@ Evas_Object *Browser_Bookmark_View::_create_main_folder_genlist(void)
 //		m_bookmark_genlist_item_class.func.moved = __genlist_move_cb;
 
 		m_folder_genlist_item_class.item_style = "1text.1icon.2";
-		m_folder_genlist_item_class.decorate_item_style = "mode/slide2";
+		m_folder_genlist_item_class.decorate_item_style = "mode/slide2.text";
 		m_folder_genlist_item_class.decorate_all_item_style = "edit_default";
 		m_folder_genlist_item_class.func.text_get = __genlist_label_get_cb;
 		m_folder_genlist_item_class.func.content_get = __genlist_icon_get_cb;
diff --git a/src/browser-history/browser-history-layout.cpp b/src/browser-history/browser-history-layout.cpp
index b74fba3..db25534 100755
--- a/src/browser-history/browser-history-layout.cpp
+++ b/src/browser-history/browser-history-layout.cpp
@@ -1180,7 +1180,7 @@ Eina_Bool Browser_History_Layout::_create_main_layout(void)
 		return EINA_FALSE;
 	}
 
-	m_history_genlist_item_class.decorate_item_style = "mode/slide3";
+	m_history_genlist_item_class.decorate_item_style = "mode/slide2";
 	m_history_genlist_item_class.item_style = "dialogue/2text.2icon.3";
 	m_history_genlist_item_class.decorate_all_item_style = "dialogue/edit";
 	m_history_genlist_item_class.func.text_get = __genlist_label_get_cb;
@@ -1606,22 +1606,11 @@ Evas_Object *Browser_History_Layout::__genlist_icon_get_cb(void *data, Evas_Obje
 			LOGD("elm_button_add() is failed.");
 			return NULL;
 		}
-
-		elm_object_style_set(button, "sweep/multiline");
-		elm_object_text_set(button, BR_STRING_SHARE);
-		evas_object_smart_callback_add(button, "clicked", __slide_share_button_clicked_cb, item);
-		return button;
-	} else if (!strncmp(part, "elm.slide.swallow.2", strlen("elm.slide.swallow.2"))) {
-		Evas_Object *button = elm_button_add(obj);
-		if (!button) {
-			LOGD("elm_button_add() is failed.");
-			return NULL;
-		}
 		elm_object_style_set(button, "sweep/multiline");
 		elm_object_text_set(button, BR_STRING_ADD_TO_BOOKMARKS);
 		evas_object_smart_callback_add(button, "clicked", __slide_add_to_bookmark_button_clicked_cb, item);
-		return button;	
-	} else if (!strncmp(part, "elm.slide.swallow.3", strlen("elm.slide.swallow.3"))) {
+		return button;
+	} else if (!strncmp(part, "elm.slide.swallow.2", strlen("elm.slide.swallow.2"))) {
 		Evas_Object *button = elm_button_add(obj);
 		if (!button) {
 			LOGD("elm_button_add() is failed.");