merge with master

diff --git a/src/features/gl-albums-rename.c b/src/features/gl-albums-rename.c
index fe7379ef59e1027e9ce8964b0e65c3031811d1f2..6378f251f049ca69f5fd9e25cabdd64694e5161f 100755 (executable)
--- a/src/features/gl-albums-rename.c
+++ b/src/features/gl-albums-rename.c
@@ -84,7 +84,6 @@ static int __gl_albums_rename_push_view(void *data, Evas_Object *parent,
        gl_appdata *ad = (gl_appdata *)data;
        Elm_Object_Item *nf_it = NULL;
        Evas_Object *done_btn = NULL;
-       Evas_Object *cancel_btn = NULL;
        Evas_Object *end_btn = NULL;
 
        _gl_ctrl_show_tabbar(ad, false);
@@ -100,16 +99,9 @@ static int __gl_albums_rename_push_view(void *data, Evas_Object *parent,
 
        nf_it = elm_naviframe_item_push(parent, title, end_btn, NULL, obj,
                                        NULL);
-       /* Add 'Cancel' button */
-       cancel_btn = _gl_but_create_but(parent, NULL, NULL,
-                                       GL_BUTTON_STYLE_NAVI_PRE,
-                                       __gl_albums_rename_cancel_cb, data);
-       GL_CHECK_VAL(cancel_btn, -1);
-       elm_object_item_part_content_set(nf_it, GL_NAVIFRAME_TITLE_PREV_BTN,
-                                        cancel_btn);
        /* Add 'Done' button */
        done_btn = _gl_but_create_but(parent, NULL, GL_STR_DONE,
-                                     GL_BUTTON_STYLE_NAVI_TITLE,
+                                     GL_BUTTON_STYLE_NAVI_TOOLBAR,
                                      __gl_albums_rename_done_cb, data);
        GL_CHECK_VAL(done_btn, -1);
        elm_object_item_part_content_set(nf_it, GL_NAVIFRAME_BTN1, done_btn);

diff --git a/src/util/gl-ext-ug-load.c b/src/util/gl-ext-ug-load.c
index 2d36d35b5d16109098f3bd4ac6e789dace35cf6b..eae29a4e4ed3336859427a21f1bfaf9ea0810405 100755 (executable)
--- a/src/util/gl-ext-ug-load.c
+++ b/src/util/gl-ext-ug-load.c
@@ -26,6 +26,7 @@
 #include "gl-popup.h"
 #include "gl-strings.h"
 #include "gl-controlbar.h"
+#include "gl-editfield.h"
 
 #define GL_UG_PKG_MESSAGE              "msg-composer-efl"
 #define GL_UG_PKG_EMAIL                        "email-composer-efl"
@@ -115,6 +116,10 @@ static void __gl_ext_destroy_ug(void *data)
        ad->uginfo.ug_type = -1;
        ad->uginfo.iv_type = -1;
 
+       /* Show cursor and IMF if not popup showed */
+       if (ad->entryinfo.editfield)
+               _gl_editfield_show_imf(ad);
+
        /**
        * If (1) view_mode is set as GL_VIEW_THUMBS in gridview,
        * It means ug_called_by_me is ImageViewer UG.

diff --git a/src/util/gl-ui-util.c b/src/util/gl-ui-util.c
index 77bb4cf93db39a5996ba10f70dd44f11e36f474b..3a137a4bcc796c531c8a770278734b3c0b183f8e 100755 (executable)
--- a/src/util/gl-ui-util.c
+++ b/src/util/gl-ui-util.c
@@ -486,43 +486,16 @@ static void __gl_ui_show_title_toolbar(void *data, Evas_Object *obj,
                                       void *event_info)
 {
        GL_CHECK(data);
-       Evas_Object *done_btn = NULL;
-       Elm_Object_Item *it = NULL;
        gl_dbg("elm,state,sip,shown");
-
-       it = elm_naviframe_top_item_get((Evas_Object *)data);
-       GL_CHECK(it);
-       /* Set button to title toolbar */
-       done_btn = elm_object_item_part_content_get(it,
-                                                   GL_NAVIFRAME_TITLE_BTN1);
-       if (done_btn == NULL) {
-               done_btn = elm_object_item_part_content_unset(it,
-                                                             GL_NAVIFRAME_BTN1);
-               elm_object_item_part_content_set(it, GL_NAVIFRAME_TITLE_BTN1,
-                                                done_btn);
-       }
-       elm_object_item_signal_emit(it, "elm,state,sip,shown", "");
+       return;
 }
 
 static void __gl_ui_hide_title_toolbar(void *data, Evas_Object *obj,
                                       void *event_info)
 {
        GL_CHECK(data);
-       Evas_Object *done_btn = NULL;
-       Elm_Object_Item *it = NULL;
        gl_dbg("elm,state,sip,hidden");
-
-       it = elm_naviframe_top_item_get((Evas_Object *)data);
-       GL_CHECK(it);
-       /* Set button to bottom toolbar */
-       done_btn = elm_object_item_part_content_get(it, GL_NAVIFRAME_BTN1);
-       if (done_btn == NULL) {
-               done_btn = elm_object_item_part_content_unset(it,
-                                                             GL_NAVIFRAME_TITLE_BTN1);
-               elm_object_item_part_content_set(it, GL_NAVIFRAME_BTN1,
-                                                done_btn);
-       }
-       elm_object_item_signal_emit(it, "elm,state,sip,hidden", "");
+       return;
 }
 
 void _gl_ui_slideshow_cb(void *data, Evas_Object *obj, void *event_info)

diff --git a/src/util/gl-util.c b/src/util/gl-util.c
index 42263e2ac571f8dfa9e02ba187c4a1da4569d3f2..ba2627afd3dd31078e7883c8009f3b43fb320e5e 100755 (executable)
--- a/src/util/gl-util.c
+++ b/src/util/gl-util.c
@@ -1666,7 +1666,8 @@ int _gl_get_selected_paths(void *data, gchar sep_c, char **path_str,
 int _gl_share_load(void *data, const char *label)
 {
        GL_CHECK_VAL(label, -1);
-       GL_CHECK_VAL(data, -1);
+       GL_CHECK_VAL(data, GL_UG_FAIL);
+       gl_appdata *ad = (gl_appdata *)data;
        gl_dbg("label : %s ", label);
 
        if (!g_strcmp0(label, GL_SHARE_MESSAGE)) {
@@ -1675,6 +1676,9 @@ int _gl_share_load(void *data, const char *label)
                gl_ext_load_ug(data, GL_UG_EMAIL);
        } else if (!g_strcmp0(label, GL_SHARE_BLUETOOTH))       {
                gl_ext_load_ug(data, GL_UG_BT);
+               if (ad->entryinfo.imf_entry)
+                       elm_object_focus_set(ad->entryinfo.imf_entry,
+                                            EINA_FALSE);
        } else {
                gl_dbgE("Wrong UG name!");
                return -1;

diff --git a/src/widget/gl-controlbar.c b/src/widget/gl-controlbar.c
index 334c49f2c6505909ee0ca1c8b0faf1bc1425ffc0..2945be06d29caac947940ed443cc026857de68cc 100755 (executable)
--- a/src/widget/gl-controlbar.c
+++ b/src/widget/gl-controlbar.c
@@ -260,7 +260,6 @@ static void _gl_ctrl_view_change_cb(void *data, Evas_Object *obj, void *event_in
        } else if (!g_strcmp0(selected_label, GL_STR_CTRL_ITEM_TAGS)) {
                gl_dbg("Tags");
                if (ad->ctrlinfo.tab_mode == GL_CTRL_TAB_TAGS) {
-                       gl_set_view_mode(ad, GL_VIEW_TAGS);
                        gl_dbg("Already in Tags Tab.");
                        return;
                }