jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=48fb17f938e5b875314aeed35ba64c535e24a200
commit 48fb17f938e5b875314aeed35ba64c535e24a200
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Fri Apr 29 19:51:17 2016 +0900
file_browser: Change refresh button.
Change the refresh button to an icon button and move it next to the
"Workspace".
---
data/themes/default/Makefile.am | 3 +-
data/themes/default/enventor.edc | 1 +
data/themes/default/file_browser.edc | 65 ++++++++++++++++++++
data/themes/default/images.edc | 2 +
data/themes/default/images/Makefile.am | 3 +-
data/themes/default/images/refresh.png | Bin 0 -> 462 bytes
src/bin/file_browser.c | 106 +++++++++++++--------------------
7 files changed, 115 insertions(+), 65 deletions(-)
diff --git a/data/themes/default/Makefile.am b/data/themes/default/Makefile.am
index 02ad5f2..452eb91 100644
--- a/data/themes/default/Makefile.am
+++ b/data/themes/default/Makefile.am
@@ -15,7 +15,8 @@ EXTRA_DIST = enventor.edc \
layout_common.edc \
layout_setting.edc \
theme_ext.edc \
- live_edit.edc
+ live_edit.edc \
+ file_browser.edc
enventor.edj: Makefile $(EXTRA_DIST)
$(EDJE_CC) $(EDJE_FLAGS) \
diff --git a/data/themes/default/enventor.edc b/data/themes/default/enventor.edc
index e1cd21e..cd2bed4 100644
--- a/data/themes/default/enventor.edc
+++ b/data/themes/default/enventor.edc
@@ -15,4 +15,5 @@ collections {
#include "layout_common.edc"
#include "layout_setting.edc"
#include "live_edit.edc"
+ #include "file_browser.edc"
}
diff --git a/data/themes/default/file_browser.edc
b/data/themes/default/file_browser.edc
new file mode 100644
index 0000000..74cd7e2
--- /dev/null
+++ b/data/themes/default/file_browser.edc
@@ -0,0 +1,65 @@
+group { "workspace";
+ parts {
+ spacer { "title_base";
+ scale: 1.0;
+ desc { "default";
+ min: 186 22;
+ max: 186 22;
+ align: 0.0 0.0;
+ fixed: 1 1;
+ }
+ }
+ spacer { "title_left_padding";
+ scale: 1.0;
+ desc { "default";
+ rel1.to: "title_base";
+ rel2 {
+ to: "title_base";
+ relative: 0.0 1.0;
+ }
+ min: 5 0;
+ max: 5 0;
+ align: 0.0 0.5;
+ fixed: 1 0;
+ }
+ }
+ text { "title_text";
+ scale: 1.0;
+ desc { "default";
+ text {
+ text: "Workspace";
+ size: 10;
+ align: 0.0 0.5;
+ }
+ rel1 {
+ to: "title_left_padding";
+ relative: 1.0 0.0;
+ }
+ rel2.to: "title_base";
+ }
+ }
+ swallow { "refresh_btn";
+ scale: 1.0;
+ desc { "default";
+ rel1 {
+ to: "title_base";
+ relative: 1.0 0.0;
+ }
+ rel2.to: "title_base";
+ min: 22 0;
+ max: 22 -1;
+ align: 1.0 0.5;
+ fixed: 1 0;
+ }
+ }
+ swallow { "content";
+ scale: 1.0;
+ desc { "default";
+ rel1 {
+ to: "title_base";
+ relative: 0.0 1.0;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index c437f0d..1a1c194 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -38,6 +38,7 @@ images {
image: "navi_unknown.png" COMP;
image: "navi_play.png" COMP;
image: "navi_stop.png" COMP;
+ image: "refresh.png" COMP;
}
#define ICON_GROUP(_group_name, _image_path) \
@@ -89,5 +90,6 @@ ICON_GROUP("navi_program", "navi_program.png")
ICON_GROUP("navi_unknown", "navi_unknown.png")
ICON_GROUP("navi_play", "navi_play.png")
ICON_GROUP("navi_stop", "navi_stop.png")
+ICON_GROUP("refresh", "refresh.png")
#undef ICON_GROUP
diff --git a/data/themes/default/images/Makefile.am
b/data/themes/default/images/Makefile.am
index e3899a3..5e2aa58 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -86,4 +86,5 @@ EXTRA_DIST = \
navi_program.png \
navi_play.png \
navi_stop.png \
- bg_demo.png
+ bg_demo.png \
+ refresh.png
diff --git a/data/themes/default/images/refresh.png
b/data/themes/default/images/refresh.png
new file mode 100644
index 0000000..72273a7
Binary files /dev/null and b/data/themes/default/images/refresh.png differ
diff --git a/src/bin/file_browser.c b/src/bin/file_browser.c
index 38ac392..afed9cd 100644
--- a/src/bin/file_browser.c
+++ b/src/bin/file_browser.c
@@ -23,14 +23,11 @@ typedef struct file_browser_s
{
brows_file *workspace; //workspace directory
- Evas_Object *box;
+ Evas_Object *workspace_ly;
+ Evas_Object *refresh_btn;
Evas_Object *genlist;
- Evas_Object *button;
Elm_Genlist_Item_Class *itc;
- Elm_Genlist_Item_Class *group_itc;
-
- Elm_Object_Item *workspace_group_it; //Show "Workspace" group index.
} brows_data;
static brows_data *g_bd = NULL;
@@ -286,6 +283,19 @@ file_set_internal(const char *file_path)
return file;
}
+static void
+refresh_btn_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ brows_data *bd = g_bd;
+ if (!bd) return;
+
+ brows_file_free(bd->workspace);
+ bd->workspace = NULL;
+
+ file_browser_workspace_set(config_workspace_path_get());
+}
+
/*****************************************************************************/
/* Externally accessible calls */
/*****************************************************************************/
@@ -310,23 +320,6 @@ file_browser_workspace_set(const char *workspace_path)
bd->workspace = NULL;
}
- if (bd->workspace_group_it)
- {
- elm_object_item_del(bd->workspace_group_it);
- bd->workspace_group_it = NULL;
- }
- //Show "Workspace" group index.
- bd->workspace_group_it =
- elm_genlist_item_append(bd->genlist,
- bd->group_itc, /* item class */
- "Workspace", /* item data */
- NULL, /* parent */
- ELM_GENLIST_ITEM_NONE, /* item type */
- NULL, /* select_cb */
- NULL); /* select_cb data */
- elm_genlist_item_select_mode_set(bd->workspace_group_it,
- ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
brows_file *workspace = file_set_internal(workspace_path);
if (!workspace) return;
bd->workspace = workspace;
@@ -335,27 +328,11 @@ file_browser_workspace_set(const char *workspace_path)
gl_exp_req(NULL, NULL, workspace->it);
}
-static void
-btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- brows_data *bd = data;
- if (!bd) return;
-
- if (bd->workspace_group_it)
- elm_object_item_del(bd->workspace_group_it);
-
- brows_file_free(bd->workspace);
- bd->workspace = NULL;
-
- file_browser_workspace_set(config_workspace_path_get());
-}
-
Evas_Object *
file_browser_init(Evas_Object *parent)
{
brows_data *bd = g_bd;
- if (bd) return bd->box;
+ if (bd) return bd->workspace_ly;
bd = calloc(1, sizeof(brows_data));
if (!bd)
@@ -365,11 +342,30 @@ file_browser_init(Evas_Object *parent)
}
g_bd = bd;
- Evas_Object *box = elm_box_add(parent);
+ Evas_Object *workspace_ly = elm_layout_add(parent);
+ elm_layout_file_set(workspace_ly, EDJE_PATH, "workspace");
+
+ Evas_Object *box = elm_box_add(workspace_ly);
+ elm_object_tooltip_text_set(box, "Refresh");
+
+ Evas_Object *refresh_btn = elm_button_add(box);
+ evas_object_size_hint_weight_set(refresh_btn, EVAS_HINT_EXPAND,
+ EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(refresh_btn, EVAS_HINT_FILL,
EVAS_HINT_FILL);
+ elm_object_scale_set(refresh_btn, 0.5);
+ evas_object_smart_callback_add(refresh_btn, "clicked",
+ refresh_btn_clicked_cb, NULL);
+
+ Evas_Object *refresh_btn_img = elm_image_add(refresh_btn);
+ elm_image_file_set(refresh_btn_img, EDJE_PATH, "refresh");
+ elm_object_content_set(refresh_btn, refresh_btn_img);
- Evas_Object *genlist = elm_genlist_add(box);
- evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_show(refresh_btn);
+ elm_box_pack_end(box, refresh_btn);
+
+ elm_object_part_content_set(workspace_ly, "refresh_btn", box);
+
+ Evas_Object *genlist = elm_genlist_add(workspace_ly);
elm_object_focus_allow_set(genlist, EINA_FALSE);
evas_object_smart_callback_add(genlist, "expand,request", gl_exp_req, NULL);
@@ -378,8 +374,7 @@ file_browser_init(Evas_Object *parent)
evas_object_smart_callback_add(genlist, "expanded", gl_exp, bd);
evas_object_smart_callback_add(genlist, "contracted", gl_con, NULL);
- evas_object_show(genlist);
- elm_box_pack_end(box, genlist);
+ elm_object_part_content_set(workspace_ly, "content", genlist);
//Item Class
Elm_Genlist_Item_Class *itc;
@@ -389,24 +384,10 @@ file_browser_init(Evas_Object *parent)
itc->func.content_get = gl_file_content_get_cb;
bd->itc = itc;
- //Group Index Item Class
- Elm_Genlist_Item_Class *group_itc;
- group_itc = elm_genlist_item_class_new();
- group_itc->item_style = "group_index";
- group_itc->func.text_get = gl_group_text_get_cb;
- bd->group_itc = group_itc;
-
- Evas_Object *button = elm_button_add(box);
- evas_object_smart_callback_add(button, "clicked", btn_clicked_cb, bd);
- elm_object_text_set(button, "Refresh");
- evas_object_show(button);
- elm_box_pack_end(box, button);
-
- bd->box = box;
+ bd->workspace_ly = workspace_ly;
bd->genlist = genlist;
- bd->button = button;
- return box;
+ return workspace_ly;
}
void
@@ -418,9 +399,8 @@ file_browser_term(void)
if (bd->workspace) brows_file_free(bd->workspace);
elm_genlist_item_class_free(bd->itc);
- elm_genlist_item_class_free(bd->group_itc);
- evas_object_del(bd->box);
+ evas_object_del(bd->workspace_ly);
free(bd);
g_bd = NULL;
--
