[EGIT] [tools/eflete] master 01/05: main_window: remove unreachable code
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=762612fed4edee6f18f72b7d8bafee77cb8b9ad8
commit 762612fed4edee6f18f72b7d8bafee77cb8b9ad8
Author: Vyacheslav Reutskiy
Date: Fri Sep 22 08:25:07 2017 +0300
main_window: remove unreachable code
---
src/bin/ui/main_window.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c
index c7bac1232..c9239948a 100644
--- a/src/bin/ui/main_window.c
+++ b/src/bin/ui/main_window.c
@@ -478,7 +478,6 @@ _label_get(void *data, Evas_Object *obj __UNUSED__, const
char *pr __UNUSED__)
{
Shortcut_Data *sc = (Shortcut_Data *)data;
return strdup(sc->description);
-return sc->description != NULL ? strdup(sc->description) :
strdup("NONE");
}
else if (!strcmp(pr, "elm.text"))
{
--
[EGIT] [tools/eflete] master 03/05: ruler: adapt to new eo API
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=796d22455a5be8c3c537ea1d3fb64c7f40fac06c
commit 796d22455a5be8c3c537ea1d3fb64c7f40fac06c
Author: Vyacheslav Reutskiy
Date: Fri Sep 22 14:10:41 2017 +0300
ruler: adapt to new eo API
---
src/lib/ewe_ruler.c | 33 -
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index e31abe1a6..87b08cc0f 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -861,19 +861,19 @@ _ewe_ruler_efl_gfx_visible_set(Eo *obj,
Ewe_Ruler_Smart_Data *sd, Eina_Bool vis)
EOLIAN static void
_ewe_ruler_efl_gfx_position_set(Eo *obj,
Ewe_Ruler_Smart_Data *sd,
-Evas_Coord x,
-Evas_Coord y)
+Eina_Position2D pos)
{
- if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x,
y))
+ if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0,
pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), x, y);
+ efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ evas_object_move(obj, pos.x, pos.y);
- evas_object_move(sd->clip, x, y);
- evas_object_move(sd->bg, x, y);
+ evas_object_move(sd->clip, pos.x, pos.y);
+ evas_object_move(sd->bg, pos.x, pos.y);
- sd->geometry.x = x;
- sd->geometry.y = y;
+ sd->geometry.x = pos.x;
+ sd->geometry.y = pos.y;
sd->position_changed = EINA_TRUE;
evas_object_smart_changed(obj);
}
@@ -881,23 +881,22 @@ _ewe_ruler_efl_gfx_position_set(Eo *obj,
EOLIAN static void
_ewe_ruler_efl_gfx_size_set(Eo *obj,
Ewe_Ruler_Smart_Data *sd,
-Evas_Coord w,
-Evas_Coord h)
+Eina_Size2D size)
{
- if ((w == sd->geometry.width) && (h == sd->geometry.height)) return;
- if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, w,
h))
+ if ((size.w == sd->geometry.width) && (size.h == sd->geometry.height))
return;
+ if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0,
size.w, size.h))
return;
sd->size_changed = EINA_TRUE;
- sd->geometry.width = w;
- sd->geometry.height = h;
+ sd->geometry.width = size.w;
+ sd->geometry.height = size.h;
- evas_object_resize(sd->clip, w, h);
- evas_object_resize(sd->bg, w, h);
+ evas_object_resize(sd->clip, size.w, size.h);
+ evas_object_resize(sd->bg, size.w, size.h);
evas_object_smart_changed(obj);
- efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h);
+ efl_gfx_size_set(efl_super(obj, MY_CLASS), size);
}
EOLIAN static void
--
[EGIT] [tools/eflete] master 02/05: image_manager: fix the argument order
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=f97e019c5f3e437c28a89e8a8c87564570ec6ba8 commit f97e019c5f3e437c28a89e8a8c87564570ec6ba8 Author: Vyacheslav Reutskiy Date: Fri Sep 22 08:28:30 2017 +0300 image_manager: fix the argument order --- src/bin/ui/image_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c index d53c33c56..0322c659e 100644 --- a/src/bin/ui/image_manager.c +++ b/src/bin/ui/image_manager.c @@ -354,7 +354,7 @@ _image_manager_image_set_grid_create(Evas_Object *parent, image_set_item->set.position = place; edje_edit_image_set_image_border_get(ap.project->global_object, res->common.name, place, &image_set_item->set.border_l, &image_set_item->set.border_r, - &image_set_item->set.border_t, &image_set_item->set.border_b); + &image_set_item->set.border_b, &image_set_item->set.border_t); edje_edit_image_set_image_max_get(ap.project->global_object, res->common.name, place, &image_set_item->set.max_w, &image_set_item->set.max_h); edje_edit_image_set_image_min_get(ap.project->global_object, res->common.name, place, --
[EGIT] [tools/eflete] master 05/05: property: update property_dummy example, return random subitems
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=21f90e3f419d4c685a6abe102455adf92971d585
commit 21f90e3f419d4c685a6abe102455adf92971d585
Author: Vyacheslav Reutskiy
Date: Fri Sep 22 14:21:33 2017 +0300
property: update property_dummy example, return random subitems
---
src/bin/ui/property/property_dummy.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/bin/ui/property/property_dummy.c
b/src/bin/ui/property/property_dummy.c
index d489f635a..248c495c3 100644
--- a/src/bin/ui/property/property_dummy.c
+++ b/src/bin/ui/property/property_dummy.c
@@ -188,8 +188,7 @@ _dynamic_subitems_get(Property_Attribute *pa __UNUSED__)
Property_Attribute *new_pa;
Eina_List *items = NULL;
int i, num;
- /* num = rand()%200; */
- num = 0;
+ num = rand()%200;
for (i = 0; i < num; i++)
{
new_pa = mem_calloc(1, sizeof(Property_Attribute));
--
[EGIT] [tools/eflete] master 04/05: project manager: remove premature exit from function
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=b93a17f4225280e0dac953ae43c13a847b2ad360
commit b93a17f4225280e0dac953ae43c13a847b2ad360
Author: Vyacheslav Reutskiy
Date: Fri Sep 22 14:19:44 2017 +0300
project manager: remove premature exit from function
---
src/bin/project_manager/project_manager2.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/bin/project_manager/project_manager2.c
b/src/bin/project_manager/project_manager2.c
index 3b6cf1037..46727 100644
--- a/src/bin/project_manager/project_manager2.c
+++ b/src/bin/project_manager/project_manager2.c
@@ -578,9 +578,6 @@ _project_trylock(const char *pro_path)
{
return _project_lock_pid_check(path);
}
- else
- return PM_PROJECT_SUCCESS;
-
fd = open(path, O_RDWR);
if (fd < 1)
--
[EGIT] [tools/eflete] master 01/02: ewe: update the Efl theme API usage accordingly to changes in efl
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3985ed09c01e40045a38c068b582d1626943feee
commit 3985ed09c01e40045a38c068b582d1626943feee
Author: Vyacheslav Reutskiy
Date: Tue Aug 15 14:57:38 2017 +0300
ewe: update the Efl theme API usage accordingly to changes in efl
---
src/lib/ewe_ruler.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index 4476a51e9..e31abe1a6 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -954,13 +954,13 @@ _ewe_ruler_efl_canvas_group_group_calculate(Eo *obj
EINA_UNUSED,
}
}
-EOLIAN static Elm_Theme_Apply
+EOLIAN static Efl_Ui_Theme_Apply
_ewe_ruler_elm_widget_theme_apply(Eo *obj, Ewe_Ruler_Smart_Data *sd)
{
- Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
+ Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int count;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
- if (int_ret == ELM_THEME_APPLY_FAILED) return ELM_THEME_APPLY_FAILED;
+ if (int_ret == EFL_UI_THEME_APPLY_FAILED) return EFL_UI_THEME_APPLY_FAILED;
Ewe_Ruler_Scale *scale;
Eina_List *ls;
--
[EGIT] [tools/eflete] master 02/02: ewe: update the Efl layout inheritance accordingly to changes in efl
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=05c350c7a79e55eb087cdde1d7fd1b0dba50f4d4
commit 05c350c7a79e55eb087cdde1d7fd1b0dba50f4d4
Author: Vyacheslav Reutskiy
Date: Tue Aug 15 14:58:22 2017 +0300
ewe: update the Efl layout inheritance accordingly to changes in efl
---
src/lib/ewe_ruler.eo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ewe_ruler.eo b/src/lib/ewe_ruler.eo
index a38c2b2f8..6b27ca66a 100644
--- a/src/lib/ewe_ruler.eo
+++ b/src/lib/ewe_ruler.eo
@@ -1,7 +1,7 @@
type Ewe_Ruler_Scale: __undefined_type;
type Ewe_Ruler_Marker: __undefined_type;
-class Ewe.Ruler (Elm.Layout)
+class Ewe.Ruler (Efl.Ui.Layout)
{
eo_prefix: ewe_obj_ruler;
legacy_prefix: ewe_ruler;
--
[EGIT] [tools/eflete] master 03/03: about: update Copyright
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=dfbadbef4817104325292bce4269be920ad18617 commit dfbadbef4817104325292bce4269be920ad18617 Author: Vyacheslav Reutskiy Date: Tue Jul 25 14:13:18 2017 +0300 about: update Copyright --- src/bin/ui/main_window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c index e00e0d17a..c7bac1232 100644 --- a/src/bin/ui/main_window.c +++ b/src/bin/ui/main_window.c @@ -285,7 +285,7 @@ _about_window_content_get(void *data, Evas_Object *popup __UNUSED__, Evas_Object "This application was written for Enlightenment project." "It is designed to create and modify styles of Elementary widgets." "" - "Copyright (C) 2013 - 2015 Samsung Electronics." + "Copyright (C) 2013 - 2017 Samsung Electronics." "" "Authors:"); --
[EGIT] [tools/eflete] master 01/03: configure: bump efl dependencies and Eflete version
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=932654f53022dcd116f66096482b98e138f1b032 commit 932654f53022dcd116f66096482b98e138f1b032 Author: Vyacheslav Reutskiy Date: Tue Jul 25 14:11:49 2017 +0300 configure: bump efl dependencies and Eflete version --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 18f27efa7..c102e5624 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFLETE_VERSION([1], [19], [1], [release]) +EFLETE_VERSION([1], [20], [0], [beta]) AC_INIT([eflete], [eflete_version], [enlightenment-devel@lists.sourceforge.net], [eflete]) AC_PREREQ([2.60]) @@ -13,8 +13,8 @@ AM_INIT_AUTOMAKE([1.13 dist-xz subdir-objects color-tests foreign]) LT_INIT([win32-dll disable-static pic-only]) dnl m4_define([package], "EFL\ Edje\ Theme\ Editor") -m4_define([efl_version], [1.19.0]) -m4_define([efl_version_max], [1.19.]) +m4_define([efl_version], [1.20.0]) +m4_define([efl_version_max], [1.20.]) m4_define([enventor_version], [0.5.0]) --
[EGIT] [tools/eflete] master 02/03: ewe: update eo syntax usage for ewe_ruler
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=694ee5a7590265eed33ed986c2f95271d6bb36a7
commit 694ee5a7590265eed33ed986c2f95271d6bb36a7
Author: Vyacheslav Reutskiy
Date: Tue Jul 25 14:12:46 2017 +0300
ewe: update eo syntax usage for ewe_ruler
---
src/lib/ewe_ruler.c | 66
src/lib/ewe_ruler.eo | 4 +---
2 files changed, 1 insertion(+), 69 deletions(-)
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index 95888c0dc..4476a51e9 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -782,72 +782,6 @@ _ewe_ruler_marker_style_get(Eo *obj EINA_UNUSED,
/*Smart functions */
-EOLIAN static void
-_ewe_ruler_efl_canvas_group_group_add(Eo *obj, Ewe_Ruler_Smart_Data *sd)
-{
- const char *data_dir = NULL;
- Eina_Strbuf *theme_path = NULL;
-
- efl_canvas_group_add(efl_super(obj, MY_CLASS));
- elm_widget_sub_object_parent_add(obj);
-
- data_dir = elm_app_data_dir_get();
- if (data_dir && strcmp(data_dir, ""))
- {
-theme_path = eina_strbuf_new();
-eina_strbuf_append_printf(theme_path,
-
"%s"EINA_PATH_SEP_S"themes"EINA_PATH_SEP_S"default"EINA_PATH_SEP_S"ewe.edj",
- data_dir);
-sd->theme_file = eina_strbuf_string_steal(theme_path);
-eina_strbuf_free(theme_path);
- }
- else
- {
-sd->theme_file = strdup(EWE_THEME);
- }
-
- sd->obj = obj;
- sd->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
- evas_object_smart_member_add(sd->clip, obj);
- sd->bg = elm_layout_add(obj);
- elm_layout_file_set(sd->bg, sd->theme_file,
"ewe/ruler/horizontal_background/default");
- evas_object_smart_member_add(sd->bg, obj);
-
- sd->horizontal = EINA_TRUE;
- sd->geometry.width = 0;
- sd->geometry.height = 0;
- sd->geometry.x = 0;
- sd->geometry.y = 0;
- sd->ruler_visible = EINA_FALSE;
- sd->size_changed = EINA_TRUE;
- sd->text_changed = EINA_TRUE;
- sd->position_changed = EINA_TRUE;
- ewe_ruler_scale_add(obj, NULL);
-}
-
-EOLIAN static void
-_ewe_ruler_efl_canvas_group_group_del(Eo *obj,
- Ewe_Ruler_Smart_Data *sd)
-{
- Ewe_Ruler_Scale *scale;
- Ewe_Ruler_Marker *marker;
- Eina_List *l, *ls;
-
- EINA_LIST_FOREACH_SAFE(sd->markers, l, ls, marker)
- ewe_ruler_marker_del(obj, marker);
-
- EINA_LIST_FOREACH_SAFE(sd->scales, l, ls, scale)
- ewe_ruler_scale_del(obj, scale);
-
- evas_object_smart_member_del(sd->clip);
- evas_object_del(sd->clip);
-
- evas_object_smart_member_del(sd->bg);
- evas_object_del(sd->bg);
-
- free(sd->theme_file);
-}
-
static void
_ewe_ruler_show(Eo* obj, Ewe_Ruler_Smart_Data *sd)
{
diff --git a/src/lib/ewe_ruler.eo b/src/lib/ewe_ruler.eo
index 5330afed9..a38c2b2f8 100644
--- a/src/lib/ewe_ruler.eo
+++ b/src/lib/ewe_ruler.eo
@@ -1,7 +1,7 @@
type Ewe_Ruler_Scale: __undefined_type;
type Ewe_Ruler_Marker: __undefined_type;
-class Ewe.Ruler (Elm.Widget)
+class Ewe.Ruler (Elm.Layout)
{
eo_prefix: ewe_obj_ruler;
legacy_prefix: ewe_ruler;
@@ -317,8 +317,6 @@ class Ewe.Ruler (Elm.Widget)
Efl.Gfx.size { set; }
Efl.Gfx.position { set; }
Efl.Gfx.visible { set; }
- Efl.Canvas.Group.group_add;
- Efl.Canvas.Group.group_del;
Efl.Canvas.Group.group_calculate;
Elm.Widget.theme_apply;
}
--
[EGIT] [tools/eflete] master 01/02: Update NEWS for version 1.19.1
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=47aa3af5cd465865da69afe0e3dc4fff6a5598d6 commit 47aa3af5cd465865da69afe0e3dc4fff6a5598d6 Author: Vyacheslav Reutskiy Date: Fri Jul 21 16:02:41 2017 +0300 Update NEWS for version 1.19.1 --- NEWS | 875 ++- 1 file changed, 874 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 18bc3b3ae..145d2a3f1 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,880 @@ = -Eflete 1.19.0 +Eflete 1.19.1 = +Changes since 1.19.0 + + +Features: + * menu item: add new menu item "Script manager" + * fileselector: add mode switcher between list and grid + * script viewer: make script code colorized + * project6_navigator: selecet fresh added group + * project manager: implement project recovery + * image manager: add basic view for image set. + * import_edj: add specific item loading option. + * resource_manager2: initial commit + * export-edc: add the command option to set the export-edc path. + * demo: make posible set to swallow custom layout from opened project + * workspace: markers for show part on ruler + * property: make posible call sound manager from property + * property: make posible call colorclass manager from property + * property: add to style combobox item for call style manager + * property: add button for call image manager from image picker + * export: export edj with only used groups and add append feature. + * export: export edj with only used groups and add append feature. + * group_navigator: add UI and apply editor's functions for part copy + * editor: add API for part copy behaviour and history + * editor: implement default_is and reset functions for rotation and point color + * container: implement size aspect + * navigator: possible to add/copy and aliased new group + * Eflete: add option for import edj file from command line + * Property: make possible to rename layouts and styles + * Widget list: set the name for new layout on add + * Groupedit: apply layout to BOX part + * Property: add BOX property called layout and alternative layout + * Groupedit: showing BOX and it's items on workspace + * Property: add attribure multiplier + * Widget manager: add field 'items' into Part structure. + * Shortcuts: add GROUP part shortcut + * Workspace: show GROUP part on workspace + * Property: support GROUP's params + * Part Dialog: new part type GROUP + * Inwin: new style that adds nice animation of modal window. + * animator: add program sequence submodule + * Shortcuts: adding posibility to add proxy with "Alt + P" + * Shortcuts: moving zoom in and out shortcuts into apropriate module. + * Highlight,Workspace: new API for getting/setting visibility + * Project manager: implement the import edj in separeted thread + * Shortcuts: switching between Layouts and Themes + * Shortcuts: adding shortcuts that invoke editors + * Shortcuts: shortcuts for deleting layout/style groups + * History: initial commit for undo/redo feature. + * Shortcuts: shortcut for creating new style/layout + * Shortcuts: switching between separate and normal mode + * Shortcuts: deleting part's STATE by clicking on Delete + * Shortcuts: adding new parts into workspace with random name. + * Shortcuts: implementing shortcuts for main window + * Workspace: now it can be zoomed by wheel. + * Groupedit: adding Zoom in and Zoom out by using Map. + * Workspace: scroller works with real geometry of groupedit. + * Shortcuts: Adding shortcuts for main commands. + * program_editor: added highlight of associated programs + * Highlight/Workspace: changing align by moving handler within part's object area. + * Container: remaking container to slightly fix wrong behaviour with scroller + * Container: sending delta of handlers with container geometry. + * Container: adding API for hiding and showing container (handlers and border) + * program_editor: added filter support + * program_editor: added program player + * program_editor: added program playback + * program_editor: added check for FROM_CURRENT option of transition + * Image editor: choose a image on double click. + * Property: turn on/off ellipsis attribute + * Live View Settings: adding ability to send signals to Live View + * Live View Settings: setting data into text and textblock parts. + * Live View Settings: check's callbacks sets and unsets rectangles into swallows + * Live View Settings: making a list of swallows. + * Live View Settings: adding new frame style for Swallows and Textblocks/Texts + * Live View Settings: seting scale spinner into Live View Property panel. + * Live View Settings: adding Settings Panel for Live VIew. + * Live View Settings: adding new mod
[EGIT] [tools/eflete] master 02/02: Update configure for version 1.19.1
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=ffcee26e10c4c5f08726400abfb39dd9e8e39a06 commit ffcee26e10c4c5f08726400abfb39dd9e8e39a06 Author: Vyacheslav Reutskiy Date: Fri Jul 21 16:02:46 2017 +0300 Update configure for version 1.19.1 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8dbbc801c..18f27efa7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFLETE_VERSION([1], [19], [0], [beta]) +EFLETE_VERSION([1], [19], [1], [release]) AC_INIT([eflete], [eflete_version], [enlightenment-devel@lists.sourceforge.net], [eflete]) AC_PREREQ([2.60]) --
[EGIT] [tools/eflete] master 01/02: genlist_property.edc: aboid set a not correct state
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=733e3263c72b0d77b2f0c4f96bbaebb09356e7df
commit 733e3263c72b0d77b2f0c4f96bbaebb09356e7df
Author: Vyacheslav Reutskiy
Date: Tue Jun 27 09:29:22 2017 +0300
genlist_property.edc: aboid set a not correct state
---
data/themes/default/widgets/genlist_property.edc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/themes/default/widgets/genlist_property.edc
b/data/themes/default/widgets/genlist_property.edc
index fec995dcf..e99797538 100644
--- a/data/themes/default/widgets/genlist_property.edc
+++ b/data/themes/default/widgets/genlist_property.edc
@@ -257,7 +257,7 @@ group { name: "elm/genlist/tree/caption/property";
signal: "elm,state,contracted";
source: "elm";
action: STATE_SET "default" 0.00;
- target: "event";
+ target: "arrow";
}
program { name: "go_disabled";
signal: "elm,state,disabled";
@@ -269,7 +269,7 @@ group { name: "elm/genlist/tree/caption/property";
signal: "elm,state,expanded";
source: "elm";
action: STATE_SET "selected" 0.00;
- target: "event";
+ target: "arrow";
}
}
}
--
[EGIT] [tools/eflete] master 02/02: slider.edc: avoid to set a not correct state for part
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=ede2285e0b44969deb4b31257c79a1886b3be64b
commit ede2285e0b44969deb4b31257c79a1886b3be64b
Author: Vyacheslav Reutskiy
Date: Tue Jun 27 09:29:45 2017 +0300
slider.edc: avoid to set a not correct state for part
---
data/themes/default/widgets/slider.edc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/data/themes/default/widgets/slider.edc
b/data/themes/default/widgets/slider.edc
index b2f587e32..a1a3772e8 100644
--- a/data/themes/default/widgets/slider.edc
+++ b/data/themes/default/widgets/slider.edc
@@ -50,6 +50,9 @@ group { name: "elm/slider/horizontal/indicator/default";
fixed: 1 1;
min: 16 16;
}
+ description { state: "disabled" 0.0;
+inherit: "default";
+ }
}
part { name: "clip";
type: RECT;
--
[EGIT] [tools/eflete] master 05/05: resource_manager: search part by index not by name
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=0a776ef7a41bac2ad078a02aafd9d3fbc8463f83
commit 0a776ef7a41bac2ad078a02aafd9d3fbc8463f83
Author: Vyacheslav Reutskiy
Date: Tue Jun 20 16:25:07 2017 +0300
resource_manager: search part by index not by name
@fix
Fixes T5559
---
src/bin/editor/editor_part.c | 16
src/bin/resource_manager/resource_manager_react.c | 2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/bin/editor/editor_part.c b/src/bin/editor/editor_part.c
index 40aeef869..b80b455c2 100644
--- a/src/bin/editor/editor_part.c
+++ b/src/bin/editor/editor_part.c
@@ -332,10 +332,12 @@ editor_part_item_index_padding_left_set(Evas_Object
*edit_object, Change *change
Editor_Attribute_Change send;
send.edit_object = edit_object;
- send.attribute = RM_ATTRIBUTE_PART_ITEM_PADDING_LEFT;
assert(edit_object != NULL);
assert(part_name != NULL);
edje_edit_part_item_index_padding_get(edit_object, part_name, index, &o3,
&o4, &o5, &o6);
+ send.attribute = RM_ATTRIBUTE_PART_ITEM_PADDING_LEFT;
+ send.part_name = eina_stringshare_add(part_name);
+ send.item_index = index;
if (change)
{
diff = mem_calloc(1, sizeof(Diff));
@@ -373,10 +375,12 @@ editor_part_item_index_padding_right_set(Evas_Object
*edit_object, Change *chang
Editor_Attribute_Change send;
send.edit_object = edit_object;
- send.attribute = RM_ATTRIBUTE_PART_ITEM_PADDING_RIGHT;
assert(edit_object != NULL);
assert(part_name != NULL);
edje_edit_part_item_index_padding_get(edit_object, part_name, index, &o3,
&o4, &o5, &o6);
+ send.attribute = RM_ATTRIBUTE_PART_ITEM_PADDING_RIGHT;
+ send.part_name = eina_stringshare_add(part_name);
+ send.item_index = index;
if (change)
{
diff = mem_calloc(1, sizeof(Diff));
@@ -414,10 +418,12 @@ editor_part_item_index_padding_top_set(Evas_Object
*edit_object, Change *change,
Editor_Attribute_Change send;
send.edit_object = edit_object;
- send.attribute = RM_ATTRIBUTE_PART_ITEM_PADDING_TOP;
assert(edit_object != NULL);
assert(part_name != NULL);
edje_edit_part_item_index_padding_get(edit_object, part_name, index, &o3,
&o4, &o5, &o6);
+ send.attribute = RM_ATTRIBUTE_PART_ITEM_PADDING_TOP;
+ send.part_name = eina_stringshare_add(part_name);
+ send.item_index = index;
if (change)
{
diff = mem_calloc(1, sizeof(Diff));
@@ -455,10 +461,12 @@ editor_part_item_index_padding_bottom_set(Evas_Object
*edit_object, Change *chan
Editor_Attribute_Change send;
send.edit_object = edit_object;
- send.attribute = RM_ATTRIBUTE_PART_ITEM_PADDING_BOTTOM;
assert(edit_object != NULL);
assert(part_name != NULL);
edje_edit_part_item_index_padding_get(edit_object, part_name, index, &o3,
&o4, &o5, &o6);
+ send.attribute = RM_ATTRIBUTE_PART_ITEM_PADDING_BOTTOM;
+ send.part_name = eina_stringshare_add(part_name);
+ send.item_index = index;
if (change)
{
diff = mem_calloc(1, sizeof(Diff));
diff --git a/src/bin/resource_manager/resource_manager_react.c
b/src/bin/resource_manager/resource_manager_react.c
index 05c6db58a..2f86a84f5 100644
--- a/src/bin/resource_manager/resource_manager_react.c
+++ b/src/bin/resource_manager/resource_manager_react.c
@@ -466,7 +466,7 @@ _property_attribute_changed(void *data,
break;
case RM_ATTRIBUTE_PART_ITEM_SOURCE:
part = resource_manager_find(group->parts, change->part_name);
- item = resource_manager_find(((Part2 *)part)->items,
change->item_name);
+ item = resource_manager_id_find(((Part2 *)part)->items,
change->item_index);
/* if old_valuye wasn't null and wasn't compared to
EFLETE_INTERNAL_GROUP_NAME */
if (change->old_value && strcmp(change->old_value,
EFLETE_INTERNAL_GROUP_NAME))
--
[EGIT] [tools/eflete] master 02/05: property: avoid situation to add data to uninit Eina_List
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=f4972da629b4e0cb7df79900804726112aae81e1
commit f4972da629b4e0cb7df79900804726112aae81e1
Author: Vyacheslav Reutskiy
Date: Tue Jun 20 13:44:59 2017 +0300
property: avoid situation to add data to uninit Eina_List
---
src/bin/ui/property/property_common_tween.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/bin/ui/property/property_common_tween.c
b/src/bin/ui/property/property_common_tween.c
index 99c331705..2c5a2114c 100644
--- a/src/bin/ui/property/property_common_tween.c
+++ b/src/bin/ui/property/property_common_tween.c
@@ -68,8 +68,8 @@ _item_del(void *data,
/* tweens functions */
-static Eina_List *deleted_tweens;
-static Eina_List *added_tweens;
+static Eina_List *deleted_tweens = NULL;
+static Eina_List *added_tweens = NULL;;
static void
_del_tween_image(void *data,
@@ -110,7 +110,8 @@ _on_image_editor_tween_done(void *data,
added_tweens = eina_list_append(added_tweens, name);
}
- evas_object_smart_callback_call(control,
signals.eflete.property.image_tween_control.changed, NULL);
+ if (added_tweens)
+ evas_object_smart_callback_call(control,
signals.eflete.property.image_tween_control.changed, NULL);
TODO("apply when popup will be fixed");
// elm_object_scroll_freeze_pop(tween_list);
@@ -162,6 +163,8 @@ property_image_tween_lists_free()
eina_stringshare_del(eina_list_data_get(deleted_tweens));
deleted_tweens = eina_list_remove(deleted_tweens,
eina_list_data_get(deleted_tweens));
}
+ added_tweens = NULL;
+ deleted_tweens = NULL;
}
void
--
[EGIT] [tools/eflete] master 01/05: property: correct update 'filter' combobox data on part delete
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=2f035fc00913c39820d052c8959c67d2acd7c25a
commit 2f035fc00913c39820d052c8959c67d2acd7c25a
Author: Vyacheslav Reutskiy
Date: Tue Jun 20 11:10:52 2017 +0300
property: correct update 'filter' combobox data on part delete
@fix
Fixes T5571
---
src/bin/ui/property/property_group.c | 13 -
src/bin/ui/workspace/group_navigator.c | 1 +
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/bin/ui/property/property_group.c
b/src/bin/ui/property/property_group.c
index 53337c8ab..f7898a39b 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -1331,7 +1331,7 @@ static void
_parts_combobox_fill(Evas_Object *combo, const char *selected, int
allowed_types_mask)
{
Eina_List *l;
- Part2 *part, *part_check;
+ Part2 *part, *part_check = NULL;
unsigned int i = 1;
Combobox_Item *combobox_item;
Elm_Genlist_Item_Class *itc;
@@ -1352,10 +1352,13 @@ _parts_combobox_fill(Evas_Object *combo, const char
*selected, int allowed_types
combobox_item, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
- if (group_pd.group->current_selected->common.type == RESOURCE2_TYPE_STATE)
- part_check = ((State2 *)group_pd.group->current_selected)->part;
- else
- part_check = (Part2 *)group_pd.group->current_selected;
+ if (group_pd.group->current_selected)
+ {
+if (group_pd.group->current_selected->common.type ==
RESOURCE2_TYPE_STATE)
+ part_check = ((State2 *)group_pd.group->current_selected)->part;
+else
+ part_check = (Part2 *)group_pd.group->current_selected;
+ }
if (allowed_types_mask)
{
diff --git a/src/bin/ui/workspace/group_navigator.c
b/src/bin/ui/workspace/group_navigator.c
index d3d132060..63996b347 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -1909,6 +1909,7 @@ _part_del(Part_List *pl,
assert(glit != NULL);
part = elm_object_item_data_get(glit);
+ _unselect_internal(pl);
part_name = eina_stringshare_add(part->common.name);
msg = eina_stringshare_printf(_("deleted part \"%s\""), part_name);
--
[EGIT] [tools/eflete] master 04/05: editor: remove item in reverse order
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=0f74877cb636ad42a01625cee56b51e1268c9316
commit 0f74877cb636ad42a01625cee56b51e1268c9316
Author: Vyacheslav Reutskiy
Date: Tue Jun 20 14:55:22 2017 +0300
editor: remove item in reverse order
Fix segfault on delete TABLE part with more then 1 item. When item
removed all ather items reordered and changed they index, so in this
case for create a correct change for history, with correct item index,
we need to remove items reversly.
@fix
Fixes T5561
---
src/bin/editor/editor_part.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bin/editor/editor_part.c b/src/bin/editor/editor_part.c
index ec8f872c0..40aeef869 100644
--- a/src/bin/editor/editor_part.c
+++ b/src/bin/editor/editor_part.c
@@ -805,7 +805,8 @@ editor_part_reset(Evas_Object *edit_object, Change *change,
Eina_Bool apply,
Eina_List *states, *l;
Eina_Stringshare *state, *name;
double state_val;
- unsigned int items_count, i = 0;
+ unsigned int items_count;
+ int i = 0;
assert(edit_object != NULL);
assert(part_name != NULL);
@@ -872,7 +873,7 @@ editor_part_reset(Evas_Object *edit_object, Change *change,
Eina_Bool apply,
if ((type == EDJE_PART_TYPE_BOX) || (type == EDJE_PART_TYPE_TABLE))
{
items_count = edje_edit_part_items_count_get(edit_object, part_name);
-for (i = 0; i < items_count; i++)
+for (i = (int)items_count - 1; i >= 0; i--)
res = res && editor_part_item_index_del(edit_object, change, false,
apply, part_name, i);
}
--
[EGIT] [tools/eflete] master 03/05: property: user can not add 'None' image as tween
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=152003872406b06690f012f781043eeb3703d22d
commit 152003872406b06690f012f781043eeb3703d22d
Author: Vyacheslav Reutskiy
Date: Tue Jun 20 13:46:05 2017 +0300
property: user can not add 'None' image as tween
@fix
Fixes T5551
---
src/bin/ui/property/property_common_tween.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/ui/property/property_common_tween.c
b/src/bin/ui/property/property_common_tween.c
index 2c5a2114c..1e9dbc947 100644
--- a/src/bin/ui/property/property_common_tween.c
+++ b/src/bin/ui/property/property_common_tween.c
@@ -107,7 +107,8 @@ _on_image_editor_tween_done(void *data,
if (!selected) return false;
EINA_LIST_FOREACH(selected, l, name)
{
-added_tweens = eina_list_append(added_tweens, name);
+if (strcmp(name, EFLETE_DUMMY_IMAGE_NAME) != 0)
+ added_tweens = eina_list_append(added_tweens, name);
}
if (added_tweens)
--
[EGIT] [tools/eflete] master 33/34: Update NEWS for version 1.19.0
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=c9f94b4747c5be1152903741562c2b7971b91900 commit c9f94b4747c5be1152903741562c2b7971b91900 Author: Vyacheslav Reutskiy Date: Wed May 31 15:43:41 2017 +0300 Update NEWS for version 1.19.0 --- NEWS | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index c8e28299d..18bc3b3ae 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,17 @@ - -Eflete 0.7.0 - += +Eflete 1.19.0 += + +Changes since 0.7.0 +--- +Features: + * many improvments + +Fixes: + * make the Eflete theme scalable + * project_navigator: remove ghost alias items + * project_navigator: fix abort on recursive group deletion + * project_manager: fix crash on folder del Changes since 0.6.1 --- --
[EGIT] [tools/eflete] master 34/34: Update configure for version 1.19.0
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=68f955808caa6b0fb22941eb5790365d69a9c7a7 commit 68f955808caa6b0fb22941eb5790365d69a9c7a7 Author: Vyacheslav Reutskiy Date: Wed May 31 15:43:53 2017 +0300 Update configure for version 1.19.0 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f9ce9f09c..8dbbc801c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFLETE_VERSION([1], [19], [0], [release]) +EFLETE_VERSION([1], [19], [0], [beta]) AC_INIT([eflete], [eflete_version], [enlightenment-devel@lists.sourceforge.net], [eflete]) AC_PREREQ([2.60]) --
[EGIT] [tools/eflete] master 05/15: theme: made single line entry scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=09361a2c1a45f24cb5c66f8fd8f22120f1b2e753
commit 09361a2c1a45f24cb5c66f8fd8f22120f1b2e753
Author: Vyacheslav Reutskiy
Date: Wed May 3 14:01:36 2017 +0300
theme: made single line entry scalable
---
data/themes/default/widgets/entry.edc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/themes/default/widgets/entry.edc
b/data/themes/default/widgets/entry.edc
index 9b53c5d..80d3e36 100644
--- a/data/themes/default/widgets/entry.edc
+++ b/data/themes/default/widgets/entry.edc
@@ -809,6 +809,7 @@ group { name: "elm/scroller/entry_single/default";
parts {
part { name: "bg";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
min: 0 19;
max: -1 19;
@@ -1062,6 +1063,7 @@ group { name: "elm/scroller/entry_single/default";
part { name: "elm.swallow.elipsis";
type: SWALLOW;
clip_to: "clipper";
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
max: 19 -1;
--
[EGIT] [tools/eflete] master 10/15: theme: made genlist scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=fae64af9f7f6d4c6dfe51544ae57b17f64ab7f3b
commit fae64af9f7f6d4c6dfe51544ae57b17f64ab7f3b
Author: Vyacheslav Reutskiy
Date: Fri May 5 17:54:54 2017 +0300
theme: made genlist scalable
---
data/themes/default/widgets/genlist.edc | 51 +++--
1 file changed, 49 insertions(+), 2 deletions(-)
diff --git a/data/themes/default/widgets/genlist.edc
b/data/themes/default/widgets/genlist.edc
index 9332af2..4bfd5ad 100644
--- a/data/themes/default/widgets/genlist.edc
+++ b/data/themes/default/widgets/genlist.edc
@@ -50,6 +50,7 @@ group { name: "elm/genlist/item/default/default";
}
part { name: "elm.swallow.pad";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
fixed: 1 0;
@@ -64,6 +65,7 @@ group { name: "elm/genlist/item/default/default";
}
part { name: "elm.swallow.icon";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
min: 14 14;
@@ -87,6 +89,7 @@ group { name: "elm/genlist/item/default/default";
}
part { name: "elm.text";
type: TEXT;
+ scale: 1;
description { state: "default" 0.0;
min: 0 26;
color_class: "main";
@@ -113,6 +116,7 @@ group { name: "elm/genlist/item/default/default";
}
part { name: "elm.swallow.end";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
aspect: 1.0 1.0;
@@ -176,6 +180,7 @@ group { name: "elm/genlist/item/aligned/default";
parts {
part { name: "elm.swallow.pad";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
rel1.offset: 20 0;
@@ -218,6 +223,7 @@ group { name: "elm/genlist/item/title/default";
part { name: "elm.text";
type: TEXT;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
min: 0 26;
color: 214 214 214 255;
@@ -289,6 +295,7 @@ group { name: "elm/genlist/item/group_index/default";
part { name: "elm.text";
type: TEXT;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
color: 214 214 214 255;
rel1 {
@@ -374,6 +381,7 @@ group { name: "elm/genlist/tree/default/default";
part { name: "elm.swallow.icon";
type: SWALLOW;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
min: 14 14;
@@ -410,6 +418,7 @@ group { name: "elm/genlist/tree/default/default";
}
part { name: "elm.swallow.pad";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
fixed: 1 0;
@@ -428,6 +437,7 @@ group { name: "elm/genlist/tree/default/default";
part { name: "elm.text";
type: TEXT;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
min: 0 26;
color_class: "main";
@@ -469,6 +479,7 @@ group { name: "elm/genlist/tree/default/default";
}
part { name: "elm.swallow.end";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
aspect: 1.0 1.0;
@@ -506,6 +517,7 @@ group { name: "elm/genlist/tree/default/default";
}
part { name: "arrow";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
max: 14 14;
@@ -688,6 +700,7 @@ group { name: "elm/genlist/tree/part/default";
part { name: "elm.swallow.icon";
type: SWALLOW;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
min: 14 14;
@@ -706,6 +719,7 @@ group { name: "elm/genlist/tree/part/default";
part { name: "elm.text";
type: TEXT;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
min: 0 26;
color_class: "main";
@@ -728,6 +742,7 @@ group { name: "elm/genlist/tree/part/default";
}
part { name: "elm.swallow.end&
[EGIT] [tools/eflete] master 02/15: eflete: don't force scale factor to 1
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=62ed7c774c9b168279866fd6af3be1b5619a6e9c
commit 62ed7c774c9b168279866fd6af3be1b5619a6e9c
Author: Vyacheslav Reutskiy
Date: Wed May 3 14:03:37 2017 +0300
eflete: don't force scale factor to 1
This is start of making Eflete theme scalable.
---
src/bin/main.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 267007d..b15bbec 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -251,8 +251,6 @@ elm_main(int argc, char **argv)
enventor_init(argc, argv);
#endif
elm_config_profile_set("standard");
- /*FIXME: remove forcing setup scale value to 1, after fix theme.*/
- elm_config_scale_set(1);
elm_config_icon_theme_set(NULL);
pos = ecore_getopt_parse(&options, values, argc, argv);
--
[EGIT] [tools/eflete] master 12/15: theme: made image(icons) scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=5832f23870141d73eab95ca556166601bdbdcc89
commit 5832f23870141d73eab95ca556166601bdbdcc89
Author: Vyacheslav Reutskiy
Date: Fri May 5 17:55:44 2017 +0300
theme: made image(icons) scalable
---
data/themes/default/widgets/image.edc | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/themes/default/widgets/image.edc
b/data/themes/default/widgets/image.edc
index defd2c3..a7c3e86 100644
--- a/data/themes/default/widgets/image.edc
+++ b/data/themes/default/widgets/image.edc
@@ -4,6 +4,7 @@
parts { \
part { name: "image"; \
type: IMAGE; \
+scale: 1; \
description { state: "default" 0.0; \
max: MAX_X_Y; \
image { \
--
[EGIT] [tools/eflete] master 01/15: project_manager: fix crash on folder del
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=5a36b7d805afeab38bb9e0205217aa063bab249c
commit 5a36b7d805afeab38bb9e0205217aa063bab249c
Author: Vyacheslav Reutskiy
Date: Fri May 5 13:51:03 2017 +0300
project_manager: fix crash on folder del
Actually, previous implementation was based on genlist search genlist
item, but it does not work for collapced tree items. Now on remove
folder check the all groups by prefix, what saved in item, as example
elm\
bubble\
base\
default
top_left\
default
If try to remove folder 'bubble' will be delete all groups which have
prefix 'elm\bubble'. Except groups opened for edit.
Fixes T5457
@fix
---
src/bin/ui/project_navigator.c | 121 +++--
1 file changed, 79 insertions(+), 42 deletions(-)
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 18dfeec..c268efc 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -576,52 +576,90 @@ _folder_check(const char *prefix, Eina_Bool del)
}
static void
-_folder_del(Elm_Object_Item *item)
+_editor_group_del(const char *name, Eina_Bool event_call)
{
- Elm_Object_Item *itm, *parent;
+ Eina_Stringshare *tmp = eina_stringshare_add(name);
+
+ if (!editor_group_del(ap.project->global_object, tmp, event_call))
+ {
+Eina_Stringshare *msg = eina_stringshare_printf(_("Can't remove layout
\"%s\""), name);
+popup_add(_("Error"), msg, BTN_OK, NULL, NULL);
+eina_stringshare_del(msg);
+ }
+ eina_stringshare_del(tmp);
+}
+
+static Eina_Bool
+_folder_del_recursively(Elm_Object_Item *item, const char *folder)
+{
+ Eina_Stringshare *prefix;
+ Eina_List *folders = NULL, *groups = NULL, *l;
const Eina_List *items;
- Eina_List *l;
- Eina_Stringshare *tmp, *msg;
+ Elm_Object_Item *itm;
Group2 *group;
const Elm_Genlist_Item_Class *itc;
+ Eina_Bool ret = true, rett;
- items = elm_genlist_item_subitems_get(item);
- EINA_LIST_FOREACH((Eina_List *)items, l, itm)
+ widget_tree_items_get(ap.project->RM.groups, folder, &folders, &groups);
+ if ((item) && elm_genlist_item_expanded_get(item))
{
-itc = elm_genlist_item_item_class_get(itm);
-if (itc == project_navigator.itc_folder)
+items = elm_genlist_item_subitems_get(item);
+EINA_LIST_FOREACH((Eina_List *)items, l, itm)
{
- // recursion for del folder
- _folder_del(itm);
- }
-else if (itc == project_navigator.itc_group)
- {
- group = elm_object_item_data_get(itm);
- tmp = eina_stringshare_add(group->common.name);
- if (!editor_group_del(ap.project->global_object, tmp, false))
+ itc = elm_genlist_item_item_class_get(itm);
+ if (itc == project_navigator.itc_folder)
{
- msg = eina_stringshare_printf(_("Can't delete layout \"%s\".
"
- "Please close a tab with
given group."),
-group->common.name);
- TODO("Check if it's correct to ignore error");
- popup_add(_("Error"), msg, BTN_OK, NULL, NULL);
- eina_stringshare_del(msg);
+ prefix = elm_object_item_data_get(itm);
+ rett = _folder_del_recursively(itm, prefix);
+ ret = ret ? rett : ret;
+ if (rett) elm_object_item_del(itm);
}
- eina_stringshare_del(tmp);
}
-elm_object_item_del(itm);
}
+ else
+ {
+EINA_LIST_FREE(folders, prefix)
+ {
+ rett = _folder_del_recursively(NULL, prefix);
+ ret = ret ? rett : ret;
+ }
+ }
+ EINA_LIST_FREE(groups, group)
+ {
+if (group->edit_object)
+ {
+ popup_add(_("Warning: Delete layout"),
+ _("Can't delete the opened layout. Please, "
+ "close the layout tab before delete it."),
+ BTN_CANCEL, NULL, NULL);
+ ret = false;
+ }
+else
+ _editor_group_del(group->common.name, true);
+ }
+ return ret;
+}
- parent = elm_genlist_item_parent_get(item);
- elm_object_item_del(item);
- while ((parent != project_navigator.item_top) &&
- (elm_genlist_item_subitems_count(parent) == 0 ))
+static void
+_folder_del(Elm_Object_Item *item)
+{
+ Elm_Object_Item *parent;
+ Eina_Stringshare *folder;
+
+ folder = elm_object_item_data_get(item)
[EGIT] [tools/eflete] master 15/15: theme: made property color picker scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=c7cab4951eaaab5a054b00f110817c0d5f736635
commit c7cab4951eaaab5a054b00f110817c0d5f736635
Author: Vyacheslav Reutskiy
Date: Mon May 8 11:44:14 2017 +0300
theme: made property color picker scalable
---
data/themes/default/widgets/layout.edc | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/themes/default/widgets/layout.edc
b/data/themes/default/widgets/layout.edc
index 9bca762..63088f9 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -1742,6 +1742,7 @@ group { name: "elm/layout/property/color";
parts {
part { name: "base";
type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
min: 60 19;
max: 60 19;
--
[EGIT] [tools/eflete] master 11/15: theme: made icons scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=595a85cb4c3ed2b2e4d57787c39c1b7f54d98369
commit 595a85cb4c3ed2b2e4d57787c39c1b7f54d98369
Author: Vyacheslav Reutskiy
Date: Fri May 5 17:55:17 2017 +0300
theme: made icons scalable
---
data/themes/default/widgets/icon.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/themes/default/widgets/icon.edc
b/data/themes/default/widgets/icon.edc
index 2efcb39..670e3be 100644
--- a/data/themes/default/widgets/icon.edc
+++ b/data/themes/default/widgets/icon.edc
@@ -1,7 +1,7 @@
#define IC(Name, Alias1, Alias2, File, Min, Max) \
group { name: "elm/icon/"##Name##"/default"; min: Min Min; max: Max Max; \
alias: "elm/icon/"##Alias1##"/default"; alias:
"elm/icon/"##Alias2##"/default"; \
- images.image: File COMP; parts { part { name: "base"; \
+ images.image: File COMP; parts { part { name: "base"; scale: 1; \
description { aspect: 1.0 1.0; aspect_preference: BOTH; \
image.normal: File; } } } }
IC("go-up", "toolbar/go-up","menu/go-up",
"icon_arrow_up.png", 14, 0);
--
[EGIT] [tools/eflete] master 08/15: theme: made statusbar scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=a18504694aefe06d4263c4065374c88b4ae0654c
commit a18504694aefe06d4263c4065374c88b4ae0654c
Author: Vyacheslav Reutskiy
Date: Wed May 3 14:48:57 2017 +0300
theme: made statusbar scalable
---
data/themes/default/widgets/layout.edc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/data/themes/default/widgets/layout.edc
b/data/themes/default/widgets/layout.edc
index 118aa60..9bca762 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -37,8 +37,8 @@ group { name: "elm/layout/window/main";
}
part { name: "eflete.project.time";
type: TEXT;
+ scale: 1;
description {
-max: 500 -1;
align: 0.0 0.5;
rel1 {
to: "statusbar";
@@ -46,6 +46,7 @@ group { name: "elm/layout/window/main";
}
rel2 {
to: "statusbar";
+ relative: 0.5 1.0;
}
text {
size: 11;
@@ -56,6 +57,7 @@ group { name: "elm/layout/window/main";
}
part { name: "eflete.project.part";
type: TEXT;
+ scale: 1;
description {
align: 0.0 0.5;
rel1 {
--
[EGIT] [tools/eflete] master 06/15: theme: made elipsis button scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=08423231197e2bab57eec6aebea0e51b1c7ea17b
commit 08423231197e2bab57eec6aebea0e51b1c7ea17b
Author: Vyacheslav Reutskiy
Date: Wed May 3 14:08:30 2017 +0300
theme: made elipsis button scalable
---
data/themes/default/widgets/button.edc | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/themes/default/widgets/button.edc
b/data/themes/default/widgets/button.edc
index 9ce3695..9ef29b1 100644
--- a/data/themes/default/widgets/button.edc
+++ b/data/themes/default/widgets/button.edc
@@ -1202,6 +1202,7 @@ group { name: "elm/button/base/elipsis";
parts {
part { name: "bg";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
min: 19 17;
max: 19 17;
--
[EGIT] [tools/eflete] master 13/15: theme: made genlist property style scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=afcb4e9795d6db174c2160601d2434619c70b133
commit afcb4e9795d6db174c2160601d2434619c70b133
Author: Vyacheslav Reutskiy
Date: Mon May 8 08:30:49 2017 +0300
theme: made genlist property style scalable
---
data/themes/default/widgets/genlist_property.edc | 21 +
1 file changed, 21 insertions(+)
diff --git a/data/themes/default/widgets/genlist_property.edc
b/data/themes/default/widgets/genlist_property.edc
index 9125380..777c07d 100644
--- a/data/themes/default/widgets/genlist_property.edc
+++ b/data/themes/default/widgets/genlist_property.edc
@@ -41,6 +41,7 @@ group { name: "elm/genlist/item/caption/property";
}
part { name: "elm.swallow.pad";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
fixed: 1 0;
@@ -52,6 +53,7 @@ group { name: "elm/genlist/item/caption/property";
part { name: "swallow.icon";
type: SWALLOW;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
min: 14 14;
@@ -72,6 +74,7 @@ group { name: "elm/genlist/item/caption/property";
part { name: "text.item.name";
type: TEXT;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
min: 0 26;
color_class: "main";
@@ -153,6 +156,7 @@ group { name: "elm/genlist/tree/caption/property";
}
part { name: "elm.swallow.pad";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
fixed: 1 0;
@@ -164,6 +168,7 @@ group { name: "elm/genlist/tree/caption/property";
part { name: "text.item.name";
type: TEXT;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
min: 0 26;
color_class: "main";
@@ -188,6 +193,7 @@ group { name: "elm/genlist/tree/caption/property";
}
part { name: "arrow";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
max: 14 14;
@@ -279,6 +285,7 @@ group { name: "elm/genlist/item/1swallow/property";
parts {
part { name: "elm.swallow.pad";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
fixed: 1 0;
@@ -290,6 +297,7 @@ group { name: "elm/genlist/item/1swallow/property";
part { name: "swallow.icon";
type: SWALLOW;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
min: 14 14;
@@ -310,6 +318,7 @@ group { name: "elm/genlist/item/1swallow/property";
part { name: "text.item.name";
type: TEXT;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
min: 0 22;
color_class: "main";
@@ -337,6 +346,7 @@ group { name: "elm/genlist/item/1swallow/property";
}
part { name: "text.action1.name";
type: TEXT;
+ scale: 1;
description { state: "default" 0.0;
color_class: "main";
align: 1.0 0.5;
@@ -400,6 +410,7 @@ group { name: "elm/genlist/item/1swallow_wide/property";
part { name: "text.item.name";
type: TEXT;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.00;
align: 0.00 0.00;
fixed: 1 0;
@@ -441,6 +452,7 @@ group { name: "elm/genlist/item/1swallow_wide/property";
}
part { name: "text.action1.name";
type: TEXT;
+ scale: 1;
description { state: "default" 0.00;
align: 1.00 0.50;
color_class: "main";
@@ -487,6 +499,7 @@ group { name: "elm/genlist/item/2swallow/property";
parts {
part { name: "elm.swallow.pad";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
fixed: 1 0;
@@ -498,6 +511,7 @@ group { name: "elm/genlist/item/2swallow/property";
part { name: "swallow.icon";
type: SWALLOW;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
min: 14 14;
@@ -518
[EGIT] [tools/eflete] master 09/15: theme: made menu scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=c337451345b1b2b71025774002c7c20ff4c99f98
commit c337451345b1b2b71025774002c7c20ff4c99f98
Author: Vyacheslav Reutskiy
Date: Fri May 5 14:19:44 2017 +0300
theme: made menu scalable
---
data/themes/default/widgets/menu.edc | 11 +++
1 file changed, 11 insertions(+)
diff --git a/data/themes/default/widgets/menu.edc
b/data/themes/default/widgets/menu.edc
index 71920ac..a7cb382 100644
--- a/data/themes/default/widgets/menu.edc
+++ b/data/themes/default/widgets/menu.edc
@@ -2,6 +2,7 @@ group { name: "elm/menu/item/default";
parts {
part { name: "base";
type: RECT;
+ scale: 1;
description { state: "default" 0.0;
min: 0 21;
max: -1 21;
@@ -54,6 +55,7 @@ group { name: "elm/menu/item/default";
part { name: "elm.swallow.content";
type: SWALLOW;
clip_to: "clipper.content";
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
min: 16 16;
@@ -87,6 +89,7 @@ group { name: "elm/menu/item/default";
part { name: "elm.text";
type: TEXT;
clip_to: "clipper.text";
+ scale: 1;
description { state: "default" 0.0;
rel1 {
relative: 1.0 0.0;
@@ -126,6 +129,7 @@ group { name: "elm/menu/item/default";
part { name: "elm.shortcut";
type: TEXT;
clip_to: "clipper.shortcut";
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
rel1 {
@@ -311,6 +315,7 @@ group { name: "elm/menu/item_with_submenu/default";
parts {
part { name: "base";
type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
min: 0 21;
max: -1 21;
@@ -362,6 +367,7 @@ group { name: "elm/menu/item_with_submenu/default";
part { name: "elm.swallow.content";
type: SWALLOW;
clip_to: "clipper.content";
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
min: 16 16;
@@ -395,6 +401,7 @@ group { name: "elm/menu/item_with_submenu/default";
part { name: "elm.text";
type: TEXT;
clip_to: "clipper.text";
+ scale: 1;
description { state: "default" 0.0;
rel1 {
relative: 1.0 0.0;
@@ -418,6 +425,7 @@ group { name: "elm/menu/item_with_submenu/default";
part { name: "arrow";
type: IMAGE;
clip_to: "clipper.text";
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
min: 4 4;
@@ -610,6 +618,7 @@ group { name: "elm/menu/main_menu_submenu/default";
parts {
part { name: "base";
type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
min: 0 19;
max: -1 19;
@@ -623,6 +632,7 @@ group { name: "elm/menu/main_menu_submenu/default";
}
part { name: "bg";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
min: 19 19;
visible: 0;
@@ -671,6 +681,7 @@ group { name: "elm/menu/main_menu_submenu/default";
}
part { name: "elm.text";
type: TEXT;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
color_class: "main";
--
[EGIT] [tools/eflete] master 07/15: tabs: remove unnecessary box from tabs
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=2bea87c9084c477971a5def296d78492579d68b9
commit 2bea87c9084c477971a5def296d78492579d68b9
Author: Vyacheslav Reutskiy
Date: Wed May 3 14:43:43 2017 +0300
tabs: remove unnecessary box from tabs
This box were used when resource manages were in tabs, not in inwin.
Now manages is in madal window (inwin) and this box is extra
---
src/bin/ui/tabs.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index 8007494..c272fda 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -54,7 +54,6 @@ typedef struct _Tab_Home Tab_Home;
struct _Tabs {
Evas_Object *layout;
Evas_Object *toolbar;
- Evas_Object *box;
Elm_Object_Item *selected;
Eina_List *items;
Evas_Object *current_workspace;
@@ -999,12 +998,6 @@ tabs_add(void)
tabs.layout = elm_layout_add(ap.win);
elm_layout_theme_set(tabs.layout, "layout", "tabs", "default");
- BOX_ADD(tabs.layout, tabs.box, true, false);
- evas_object_size_hint_weight_set(tabs.box, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(tabs.box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_align_set(tabs.box, 0.0, 0.5);
- elm_layout_content_set(tabs.layout, "elm.swallow.toolbar", tabs.box);
- evas_object_show(tabs.box);
tabs.toolbar = elm_toolbar_add(tabs.layout);
elm_object_style_set(tabs.toolbar, "tabs_horizontal");
@@ -1013,7 +1006,7 @@ tabs_add(void)
evas_object_size_hint_weight_set(tabs.toolbar, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(tabs.toolbar, EVAS_HINT_FILL,
EVAS_HINT_FILL);
elm_toolbar_align_set(tabs.toolbar, 0.0);
- elm_box_pack_end(tabs.box, tabs.toolbar);
+ elm_layout_content_set(tabs.layout, "elm.swallow.toolbar", tabs.toolbar);
evas_object_show(tabs.toolbar);
tabs_home_tab_add(TAB_HOME_OPEN_PROJECT);
--
[EGIT] [tools/eflete] master 03/15: theme: made button scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=feffa9494874ff4a860c9d456b84cac521fa9c48
commit feffa9494874ff4a860c9d456b84cac521fa9c48
Author: Vyacheslav Reutskiy
Date: Wed May 3 13:37:35 2017 +0300
theme: made button scalable
---
data/themes/default/widgets/button.edc | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/themes/default/widgets/button.edc
b/data/themes/default/widgets/button.edc
index 7264067..9ce3695 100644
--- a/data/themes/default/widgets/button.edc
+++ b/data/themes/default/widgets/button.edc
@@ -11,6 +11,7 @@ group { name: "elm/button/base/default";
parts {
part { name: "bg";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
min: 19 19;
image {
--
[EGIT] [tools/eflete] master 04/15: theme: made default scroller scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3a3504991b95f6e0a5015ae39d9a015ef0ad6984
commit 3a3504991b95f6e0a5015ae39d9a015ef0ad6984
Author: Vyacheslav Reutskiy
Date: Wed May 3 13:55:42 2017 +0300
theme: made default scroller scalable
---
data/themes/default/widgets/scroller.edc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/themes/default/widgets/scroller.edc
b/data/themes/default/widgets/scroller.edc
index e8991ff..eb1dbb7 100644
--- a/data/themes/default/widgets/scroller.edc
+++ b/data/themes/default/widgets/scroller.edc
@@ -240,6 +240,7 @@ group { name: "elm/scroller/base/default";
part { name: "runner_vbar";
type: IMAGE;
mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
min: 8 8;
@@ -287,6 +288,7 @@ group { name: "elm/scroller/base/default";
part { name: "runner_hbar";
type: IMAGE;
mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
min: 8 8;
--
[EGIT] [tools/eflete] master 14/15: theme: made combobox scalable
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=54961e5c17c80ac7a429632a115f3d4bbf5a4564
commit 54961e5c17c80ac7a429632a115f3d4bbf5a4564
Author: Vyacheslav Reutskiy
Date: Mon May 8 11:37:49 2017 +0300
theme: made combobox scalable
---
data/themes/default/widgets/combobox.edc | 16
1 file changed, 16 insertions(+)
diff --git a/data/themes/default/widgets/combobox.edc
b/data/themes/default/widgets/combobox.edc
index 14876c2..da38a49 100644
--- a/data/themes/default/widgets/combobox.edc
+++ b/data/themes/default/widgets/combobox.edc
@@ -11,6 +11,7 @@ group { name: "elm/button/base/combobox_vertical/default";
parts {
part { name: "base";
type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
max: -1 19;
}
@@ -118,6 +119,7 @@ group { name: "elm/button/base/combobox_vertical/default";
}
part { name: "select_line";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
max: 6 4;
rel1 {
@@ -240,6 +242,7 @@ group { name:
"elm/button/base/combobox_vertical/color_class";
parts {
part { name: "base";
type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
max: -1 19;
}
@@ -379,6 +382,7 @@ group { name:
"elm/button/base/combobox_vertical/color_class";
}
part { name: "bg.color3";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
min: 16 13;
@@ -400,6 +404,7 @@ group { name:
"elm/button/base/combobox_vertical/color_class";
}
part { name: "bg.color2";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
min: 16 13;
@@ -421,6 +426,7 @@ group { name:
"elm/button/base/combobox_vertical/color_class";
}
part { name: "bg.color1";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
min: 16 13;
@@ -749,6 +755,7 @@ group { name:
"elm/genlist/item_compress/default/combobox_vertical/color_class";
parts {
part { name: "bg";
type: RECT;
+ scale: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
min: 0 24;
@@ -763,6 +770,7 @@ group { name:
"elm/genlist/item_compress/default/combobox_vertical/color_class";
part { name: "elm.text";
type: TEXT;
repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
color: 213 213 213 255;
rel1 {
@@ -786,6 +794,7 @@ group { name:
"elm/genlist/item_compress/default/combobox_vertical/color_class";
}
part { name: "bg.color3";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
min: 16 13;
@@ -801,6 +810,7 @@ group { name:
"elm/genlist/item_compress/default/combobox_vertical/color_class";
}
part { name: "bg.color2";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
min: 16 13;
@@ -818,6 +828,7 @@ group { name:
"elm/genlist/item_compress/default/combobox_vertical/color_class";
}
part { name: "bg.color1";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.5;
min: 16 13;
@@ -868,6 +879,7 @@ group { name:
"elm/genlist/item_compress/default/combobox_vertical/color_class";
}
part { name: "shadow.color1";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
rel1 {
to: "bg.color1";
@@ -884,6 +896,7 @@ group { name:
"elm/genlist/item_compress/default/combobox_vertical/color_class";
}
part { name: "shadow.color2";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
rel1 {
to: "bg.color2";
@@ -900,6 +913,7 @@ group { name:
"elm/genlist/item_compress/default/combobox_vertical/color_class";
}
part { name: "shadow.color3";
type: IMAGE;
+ scale: 1;
description { state: "default" 0.0;
rel1 {
to: "bg.color3";
@@ -955,6 +969,7 @@ group { name:
"elm/genlist/ite
[EGIT] [tools/eflete] master 01/01: theme: allow expand and collapse property caption by text too
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=78eacdf62c86eb9c165d4ee276a36e2dae2ebea3
commit 78eacdf62c86eb9c165d4ee276a36e2dae2ebea3
Author: Vyacheslav Reutskiy
Date: Thu Apr 27 11:05:30 2017 +0300
theme: allow expand and collapse property caption by text too
---
data/themes/default/widgets/genlist_property.edc | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/data/themes/default/widgets/genlist_property.edc
b/data/themes/default/widgets/genlist_property.edc
index 46a8378..9125380 100644
--- a/data/themes/default/widgets/genlist_property.edc
+++ b/data/themes/default/widgets/genlist_property.edc
@@ -217,6 +217,15 @@ group { name: "elm/genlist/tree/caption/property";
}
}
}
+ part { name: "event";
+ type: RECT;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+color: 0 0 0 0;
+rel1.to: "arrow";
+rel2.to: "text.item.name";
+ }
+ }
part { name: "disclip";
type: RECT;
repeat_events: 1;
@@ -234,14 +243,14 @@ group { name: "elm/genlist/tree/caption/property";
}
program { name: "expanded_sig";
signal: "mouse,up,1";
- source: "arrow";
+ source: "event";
action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
}
program { name: "arrow_conract";
signal: "elm,state,contracted";
source: "elm";
action: STATE_SET "default" 0.00;
- target: "arrow";
+ target: "event";
}
program { name: "go_disabled";
signal: "elm,state,disabled";
@@ -253,7 +262,7 @@ group { name: "elm/genlist/tree/caption/property";
signal: "elm,state,expanded";
source: "elm";
action: STATE_SET "selected" 0.00;
- target: "arrow";
+ target: "event";
}
}
}
--
[EGIT] [tools/eflete] master 01/01: theme: fix name for wheel progress bar for fileselector
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=a91188b2f26b83b8209862f1e3463bff6919ba7d
commit a91188b2f26b83b8209862f1e3463bff6919ba7d
Author: Vyacheslav Reutskiy
Date: Thu Apr 27 08:33:47 2017 +0300
theme: fix name for wheel progress bar for fileselector
I was made mistake, I was set name for default filesector, but we use
style 'exteneded'.
---
data/themes/default/widgets/thumb.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/themes/default/widgets/thumb.edc
b/data/themes/default/widgets/thumb.edc
index 2e0f2ae..aed9fbd 100644
--- a/data/themes/default/widgets/thumb.edc
+++ b/data/themes/default/widgets/thumb.edc
@@ -1,6 +1,6 @@
group { name: "elm/thumb/base/noframe";
alias: "elm/progressbar/horizontal/wheel";
- alias: "elm/progressbar/horizontal/fileselector/default";
+ alias: "elm/progressbar/horizontal/fileselector/extended";
images {
image: "ProgressBar0001.png" COMP;
image: "ProgressBar0002.png" COMP;
--
[EGIT] [tools/eflete] master 01/01: theme: add alias for "wheel" progressbar for filelector
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=1237acd1c97d0b561751b30bca4dc18c11f95b0d
commit 1237acd1c97d0b561751b30bca4dc18c11f95b0d
Author: Vyacheslav Reutskiy
Date: Wed Apr 26 11:26:37 2017 +0300
theme: add alias for "wheel" progressbar for filelector
This cover more the fileselector styles.
---
data/themes/default/widgets/thumb.edc | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/themes/default/widgets/thumb.edc
b/data/themes/default/widgets/thumb.edc
index 0595c77..2e0f2ae 100644
--- a/data/themes/default/widgets/thumb.edc
+++ b/data/themes/default/widgets/thumb.edc
@@ -1,5 +1,6 @@
group { name: "elm/thumb/base/noframe";
alias: "elm/progressbar/horizontal/wheel";
+ alias: "elm/progressbar/horizontal/fileselector/default";
images {
image: "ProgressBar0001.png" COMP;
image: "ProgressBar0002.png" COMP;
--
[EGIT] [core/efl] master 01/01: elm_fileselector: made fileselector styling more flexible
rimmed pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f9702fe1f9357b3112930ccea6f8c1def9722cdd
commit f9702fe1f9357b3112930ccea6f8c1def9722cdd
Author: Vyacheslav Reutskiy
Date: Wed Apr 26 11:16:01 2017 +0300
elm_fileselector: made fileselector styling more flexible
Previously the progressbar in fileselector use hardcoded style name
"wheel", that made unpossible to create different style for
fileselector. This commit made it possible.
@fix
---
data/elementary/themes/edc/elm/progress.edc | 1 +
src/lib/elementary/elc_fileselector.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/elementary/themes/edc/elm/progress.edc
b/data/elementary/themes/edc/elm/progress.edc
index 01d67bc..703fe46 100644
--- a/data/elementary/themes/edc/elm/progress.edc
+++ b/data/elementary/themes/edc/elm/progress.edc
@@ -1129,6 +1129,7 @@ group { name: "elm/progressbar/vertical/default";
group { name: "elm/progressbar/horizontal/wheel";
alias: "elm/progressbar/vertical/wheel";
+ alias: "elm/progressbar/horizontal/fileselector/default";
images.image: "knob_round_busy.png" COMP;
images.image: "glow_round_corners.png" COMP;
parts {
diff --git a/src/lib/elementary/elc_fileselector.c
b/src/lib/elementary/elc_fileselector.c
index 74e84a3..68d5ffe 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -225,7 +225,7 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj,
Elm_Fileselector_Data *sd)
elm_widget_style_set(sd->up_button, buf);
elm_widget_style_set(sd->home_button, buf);
- elm_widget_style_set(sd->spinner, "wheel");
+ elm_widget_style_set(sd->spinner, buf);
elm_widget_style_set(sd->files_view, buf);
--
[EGIT] [tools/clouseau] master 01/01: clouseau_client: expand/collapse item by double click
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/clouseau.git/commit/?id=b79b2f9033a88828f7e42dad96d8f0b016b9179f
commit b79b2f9033a88828f7e42dad96d8f0b016b9179f
Author: Vyacheslav Reutskiy
Date: Wed Apr 26 09:39:44 2017 +0300
clouseau_client: expand/collapse item by double click
Open/Close the tree item in Genlist by double click make work with
clouseau more comfortable.
---
src/bin/clouseau_client.c | 15 +++
1 file changed, 15 insertions(+)
diff --git a/src/bin/clouseau_client.c b/src/bin/clouseau_client.c
index 5a2a7e6..5a0deb1 100644
--- a/src/bin/clouseau_client.c
+++ b/src/bin/clouseau_client.c
@@ -1107,6 +1107,19 @@ gl_exp_req(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
}
static void
+gl_clk_double(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info)
+{
+ Elm_Object_Item *glit = (Elm_Object_Item *)event_info;
+ if (elm_genlist_item_type_get(glit) == ELM_GENLIST_ITEM_TREE)
+ {
+if (elm_genlist_item_expanded_get(glit))
+ elm_genlist_item_subitems_clear(glit);
+else
+ elm_genlist_item_expanded_set(glit, EINA_TRUE);
+ }
+}
+
+static void
gl_con_req(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info)
{
Elm_Object_Item *glit = event_info;
@@ -2223,6 +2236,8 @@ _main_list_create(Evas_Object *panes)
"contracted", gl_con, gui->gl);
evas_object_smart_callback_add(gui->gl,
"selected", _gl_selected, gui);
+ evas_object_smart_callback_add(gui->gl,
+ "clicked,double", gl_clk_double, gui->gl);
}
static void
--
[EGIT] [core/efl] master 01/01: elm_cursor: add style name for sub cursor
rimmed pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a17a91b22f0d20ed1a5e8a42141a825473d64642
commit a17a91b22f0d20ed1a5e8a42141a825473d64642
Author: Vyacheslav Reutskiy
Date: Wed Apr 26 08:57:22 2017 +0300
elm_cursor: add style name for sub cursor
Missing style name for sub cursor call the next error output:
ERR<24193>:elementary lib/elementary/els_cursor.c:734 elm_cursor_theme()
Could not apply the theme to the cursor style=(null)
Also this error call extra recalc for cursor hot spots.
Fixes T5408
@fix
---
src/lib/elementary/els_cursor.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/elementary/els_cursor.c b/src/lib/elementary/els_cursor.c
index 04f8a28..b090de0 100644
--- a/src/lib/elementary/els_cursor.c
+++ b/src/lib/elementary/els_cursor.c
@@ -591,6 +591,7 @@ elm_object_sub_cursor_set(Evas_Object *eventarea,
Evas_Object *owner, const char
cur->eventarea = eventarea;
cur->theme_search = !_elm_config->cursor_engine_only;
cur->visible = EINA_FALSE;
+ cur->style = eina_stringshare_add("default");
cur->cursor_name = eina_stringshare_add(cursor);
if (!cur->cursor_name)
--
[EGIT] [tools/eflete] master 02/03: theme: silence warning about missing state for combobox
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=c837c7e272617d369c3080368b9a60f3821bfdfa
commit c837c7e272617d369c3080368b9a60f3821bfdfa
Author: Vyacheslav Reutskiy
Date: Tue Apr 25 16:51:06 2017 +0300
theme: silence warning about missing state for combobox
---
data/themes/default/widgets/combobox.edc | 7 ---
1 file changed, 7 deletions(-)
diff --git a/data/themes/default/widgets/combobox.edc
b/data/themes/default/widgets/combobox.edc
index 072b986..14876c2 100644
--- a/data/themes/default/widgets/combobox.edc
+++ b/data/themes/default/widgets/combobox.edc
@@ -157,7 +157,6 @@ group { name: "elm/button/base/combobox_vertical/default";
}
program { name: "button_click_anim";
action: STATE_SET "clicked" 0.0;
- target: "base";
target: "select_line";
}
program { name: "button_unclick";
@@ -167,7 +166,6 @@ group { name: "elm/button/base/combobox_vertical/default";
}
program { name: "button_unclick_anim";
action: STATE_SET "default" 0.0;
- target: "base";
target: "select_line";
}
program { name: "buttonactivate";
@@ -179,7 +177,6 @@ group { name: "elm/button/base/combobox_vertical/default";
program { name: "button_unpressed_anim";
action: STATE_SET "default" 0.0;
in: 0.5 0.0;
- target: "base";
target: "select_line";
}
program {
@@ -533,7 +530,6 @@ group { name:
"elm/button/base/combobox_vertical/color_class";
}
program { name: "button_click_anim";
action: STATE_SET "clicked" 0.0;
- target: "base";
target: "select_line";
}
program { name: "button_unclick";
@@ -543,20 +539,17 @@ group { name:
"elm/button/base/combobox_vertical/color_class";
}
program { name: "button_unclick_anim";
action: STATE_SET "default" 0.0;
- target: "base";
target: "select_line";
}
program { name: "buttonactivate";
signal: "elm,anim,activate"; source: "elm";
action: STATE_SET "clicked" 0.0;
- target: "base";
target: "select_line";
after: "button_unpressed_anim";
}
program { name: "button_unpressed_anim";
action: STATE_SET "default" 0.0;
in: 0.5 0.0;
- target: "base";
target: "select_line";
}
program {
--
[EGIT] [tools/eflete] master 01/03: theme: fix color for entry icons
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=e056735ff1dd2566cfb6d35f7d0d7418bb0b61a3
commit e056735ff1dd2566cfb6d35f7d0d7418bb0b61a3
Author: Vyacheslav Reutskiy
Date: Tue Apr 25 16:44:02 2017 +0300
theme: fix color for entry icons
---
data/themes/default/widgets/entry.edc | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/data/themes/default/widgets/entry.edc
b/data/themes/default/widgets/entry.edc
index e6c14d4..9b53c5d 100644
--- a/data/themes/default/widgets/entry.edc
+++ b/data/themes/default/widgets/entry.edc
@@ -973,7 +973,7 @@ group { name: "elm/scroller/entry_single/default";
}
part { name: "elm.swallow.icon";
type: SWALLOW;
- clip_to: "clipper";
+ clip_to: "icon_clipper";
description { state: "default" 0.0;
visible: 0;
align: 0.0 0.5;
@@ -1001,7 +1001,7 @@ group { name: "elm/scroller/entry_single/default";
}
part { name: "elm.swallow.end";
type: SWALLOW;
- clip_to: "clipper";
+ clip_to: "icon_clipper";
description { state: "default" 0.0;
visible: 0;
align: 1.0 0.5;
@@ -1123,6 +1123,19 @@ group { name: "elm/scroller/entry_single/default";
}
}
}
+ part { name: "icon_clipper";
+ type: RECT;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+color_class: "main";
+rel1 {
+ to: "elm.swallow.icon";
+}
+rel2 {
+ to: "elm.swallow.end";
+}
+ }
+ }
}
programs {
program { name: "icon_show";
--
[EGIT] [tools/eflete] master 03/03: theme: silence warning abount non fixed parts for panes
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=ab035d5382667136cd3796939a4343584358a582
commit ab035d5382667136cd3796939a4343584358a582
Author: Vyacheslav Reutskiy
Date: Tue Apr 25 16:51:15 2017 +0300
theme: silence warning abount non fixed parts for panes
---
data/themes/default/widgets/panes.edc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/themes/default/widgets/panes.edc
b/data/themes/default/widgets/panes.edc
index 6b292a7..0750b13 100644
--- a/data/themes/default/widgets/panes.edc
+++ b/data/themes/default/widgets/panes.edc
@@ -710,6 +710,7 @@ group { name: "elm/panes/horizontal/pan_hide";
max: -1 4;
color_class: "select";
color: 255 255 255 0;
+fixed: 1 1;
rel1 {
offset: 0 1;
to: "bar";
@@ -750,7 +751,7 @@ group { name: "elm/panes/horizontal/pan_hide";
type: IMAGE;
description { state: "default" 0.0;
visible: 0;
-fixed: 1 0;
+fixed: 1 1;
min: 102 2;
max: 102 2;
rel1 {
--
[EGIT] [tools/eflete] master 03/03: theme: add icon 'edit-find"
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=65cc8c335a85b90d23a2b290a5ba7d3050e10a9a
commit 65cc8c335a85b90d23a2b290a5ba7d3050e10a9a
Author: Vyacheslav Reutskiy
Date: Tue Apr 25 16:29:48 2017 +0300
theme: add icon 'edit-find"
Fixes T5397
---
data/themes/default/widgets/icon.edc | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/themes/default/widgets/icon.edc
b/data/themes/default/widgets/icon.edc
index e44bf10..2efcb39 100644
--- a/data/themes/default/widgets/icon.edc
+++ b/data/themes/default/widgets/icon.edc
@@ -23,6 +23,7 @@ IC("folder","toolbar/folder",
"menu/folder","i
IC("file", "toolbar/file", "menu/file",
"icon_file.png", 14, 0);
IC("save", "toolbar/save", "menu/save",
"icon_save.png", 14, 0);
IC("search","toolbar/search", "menu/search",
"icon_search.png", 14, 0);
+IC("edit-find", "toolbar/edit-find","menu/edit-find",
"icon_search.png", 14, 0);
IC("plus", "toolbar/plus", "menu/plus",
"icon_plus.png", 14, 0);
IC("minus", "toolbar/minus","menu/minus",
"icon_minus.png", 14, 0);
IC("animator", "toolbar/animator", "menu/animator",
"icon_animator.png", 14, 0);
--
[EGIT] [tools/eflete] master 01/03: sound_player: remove ugly label from player preview
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=b24b56eeb54bc745b483c2fe00574e9ce19f49ec
commit b24b56eeb54bc745b483c2fe00574e9ce19f49ec
Author: Vyacheslav Reutskiy
Date: Tue Apr 25 11:36:50 2017 +0300
sound_player: remove ugly label from player preview
Fixes T5402
@fix
---
data/themes/default/widgets/layout.edc | 17 -
src/bin/ui/sound_manager.c | 3 ---
2 files changed, 20 deletions(-)
diff --git a/data/themes/default/widgets/layout.edc
b/data/themes/default/widgets/layout.edc
index f59265f..118aa60 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -990,21 +990,6 @@ group { name: "elm/layout/image_manager/usage_info";
group { name: "elm/layout/sound_editor/player";
parts {
- part { name: "eflete.sound.type";
- type: TEXT;
- description { state: "default" 0.00;
-align: 0.00 0.00;
-color_class: "main";
-text {
- font: "PT";
- size: 10;
- min: 0 1;
- max: 0 1;
-}
-rel1.offset: 3 3;
-rel2.offset: -4 -1;
- }
- }
part { name: "eflete.sound.value";
type: TEXT;
description { state: "default" 0.00;
@@ -1014,9 +999,7 @@ group { name: "elm/layout/sound_editor/player";
size: 42;
}
rel1 {
- relative: 0.00 1.00;
offset: 3 3;
- to_y: "eflete.sound.type";
}
rel2 {
relative: 1.00 0.00;
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index 417ecc4..fdbbad1 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -139,11 +139,9 @@ _grid_sel_cb(void *data __UNUSED__,
{
case SOUND_TYPE_SAMPLE:
res = resource_manager_find(ap.project->RM.sounds, snd->name);
- elm_layout_text_set(mng.player, "eflete.sound.type", _("sample"));
break;
case SOUND_TYPE_TONE:
res = resource_manager_find(ap.project->RM.tones, snd->name);
- elm_layout_text_set(mng.player, "eflete.sound.type", _("tone"));
break;
}
elm_layout_text_set(mng.player, "eflete.sound.value", snd->type_label);
@@ -520,7 +518,6 @@ _mw_cancel_cb(void *data __UNUSED__,
Evas_Object *content;
elm_layout_text_set(mng.player, "eflete.sound.value", NULL);
- elm_layout_text_set(mng.player, "eflete.sound.type", NULL);
/* unset and hide the image property */
content = elm_object_content_unset(mng.win);
--
[EGIT] [tools/eflete] master 02/03: image_property: remove hardcoded size for image preview
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=5c78243519c26dd8e0b0c12579076290cd4191da commit 5c78243519c26dd8e0b0c12579076290cd4191da Author: Vyacheslav Reutskiy Date: Tue Apr 25 11:41:41 2017 +0300 image_property: remove hardcoded size for image preview Fixes T5398 @fix --- src/bin/ui/image_manager.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c index 6d6604e..d53c33c 100644 --- a/src/bin/ui/image_manager.c +++ b/src/bin/ui/image_manager.c @@ -1104,8 +1104,6 @@ image_manager_add(void) elm_panes_horizontal_set(mng.property_panes, true); elm_object_part_content_set(mng.panes, "right", mng.property_panes); elm_object_part_content_set(mng.property_panes, "right", ap.property.image_manager); - elm_panes_content_left_size_set(mng.property_panes, 0); - elm_panes_content_left_min_size_set(mng.property_panes, 400); #endif if (!gic) --
[EGIT] [tools/eflete] master 02/04: property_sound: replace alwayes disabled controls to label
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3884ed33e9831e028438598b01f7b0606ec35f11
commit 3884ed33e9831e028438598b01f7b0606ec35f11
Author: Vyacheslav Reutskiy
Date: Tue Apr 25 10:58:37 2017 +0300
property_sound: replace alwayes disabled controls to label
Fixes T5400
@fix
---
src/bin/ui/property/property_sound.c | 34 +-
1 file changed, 5 insertions(+), 29 deletions(-)
diff --git a/src/bin/ui/property/property_sound.c
b/src/bin/ui/property/property_sound.c
index 160030e..05acf38 100644
--- a/src/bin/ui/property/property_sound.c
+++ b/src/bin/ui/property/property_sound.c
@@ -53,30 +53,6 @@ typedef struct _Property_Sound_Update_Info
Property_Sound_Update_Info;
static Property_Sound_Update_Info attribute_map[PROPERTY_SOUND_ITEM_LAST];
static void
-_fill_combobox_with_enum(Evas_Object *control, const char **array)
-{
- unsigned int i = 0;
- Combobox_Item *combobox_item;
- Elm_Genlist_Item_Class *itc;
-
- assert(control != NULL);
- assert(array != NULL);
-
- itc = evas_object_data_get(control, "COMMON_ITC");
-
- while (array[i] != NULL)
- {
-combobox_item = mem_malloc(sizeof(Combobox_Item));
-combobox_item->index = i;
-combobox_item->data = eina_stringshare_add(array[i]);
-elm_genlist_item_append(control, itc,
-combobox_item, NULL,
-ELM_GENLIST_ITEM_NONE, NULL, NULL);
-++i;
- }
-}
-
-static void
_init_cb(Property_Attribute *pa, Property_Action *action)
{
assert(pa != NULL);
@@ -90,7 +66,6 @@ _init_cb(Property_Attribute *pa, Property_Action *action)
break;
case PROPERTY_SOUND_ITEM_COMPRESSION_QUALITY:
elm_object_disabled_set(action->control, true);
- elm_spinner_label_format_set(action->control, "%.2f");
break;
case PROPERTY_SOUND_ITEM_FREQ:
elm_spinner_min_max_set(action->control, 20, 2);
@@ -106,7 +81,6 @@ _init_cb(Property_Attribute *pa, Property_Action *action)
break;
case PROPERTY_SOUND_ITEM_COMPRESSION_TYPE:
elm_object_disabled_set(action->control, true);
- _fill_combobox_with_enum(action->control, edje_sound_compression);
break;
default:
TODO("remove default case after all attributes will be added");
@@ -165,7 +139,9 @@ _update_cb(Property_Attribute *pa, Property_Action *action)
{
double_val1 =
edje_edit_sound_compression_rate_get(ap.project->global_object,
sound_pd.snd->name);
- elm_spinner_value_set(action->control, double_val1);
+ str_val1 = eina_stringshare_printf("%.2f", double_val1);
+ elm_object_text_set(action->control, str_val1);
+ eina_stringshare_del(str_val1);
}
break;
case PROPERTY_SOUND_ITEM_FREQ:
@@ -315,12 +291,12 @@ _init_items()
case PROPERTY_SOUND_ITEM_COMPRESSION_TYPE:
IT.filter_data.sound_types = SOUND_SAMPLE;
IT.name = "Compression type";
- _action1(&IT, NULL, NULL, PROPERTY_CONTROL_COMBOBOX);
+ _action1(&IT, NULL, NULL, PROPERTY_CONTROL_LABEL);
break;
case PROPERTY_SOUND_ITEM_COMPRESSION_QUALITY:
IT.filter_data.sound_types = SOUND_SAMPLE;
IT.name = "Compression quality";
- _action1(&IT, NULL, NULL, PROPERTY_CONTROL_SPINNER);
+ _action1(&IT, NULL, NULL, PROPERTY_CONTROL_LABEL);
break;
case PROPERTY_SOUND_ITEM_FREQ:
IT.filter_data.sound_types = SOUND_TONE;
--
[EGIT] [tools/eflete] master 03/04: theme: silence noise warning abount not fixed part for default slider style
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=a8de4f41b74402052cc837585e17cb805e56164c
commit a8de4f41b74402052cc837585e17cb805e56164c
Author: Vyacheslav Reutskiy
Date: Tue Apr 25 11:02:49 2017 +0300
theme: silence noise warning abount not fixed part for default slider style
@fix
---
data/themes/default/widgets/slider.edc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/themes/default/widgets/slider.edc
b/data/themes/default/widgets/slider.edc
index cf18a32..b2f587e 100644
--- a/data/themes/default/widgets/slider.edc
+++ b/data/themes/default/widgets/slider.edc
@@ -360,7 +360,7 @@ group { name: "elm/slider/horizontal/default";
description { state: "default" 0.0;
visible: 0;
align: 0.0 0.5;
-fixed: 1 0;
+fixed: 1 1;
rel1 {
to_y: "elm.swallow.bar";
}
@@ -371,7 +371,7 @@ group { name: "elm/slider/horizontal/default";
}
description { state: "visible" 0.0;
align: 0.0 0.5;
-fixed: 1 0;
+fixed: 1 1;
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
rel1 {
--
[EGIT] [tools/eflete] master 01/04: theme: made item for colorselector in property more wide
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3cfc780411d15b499e1de4808e98e4ac48ca7753
commit 3cfc780411d15b499e1de4808e98e4ac48ca7753
Author: Vyacheslav Reutskiy
Date: Tue Apr 25 10:44:06 2017 +0300
theme: made item for colorselector in property more wide
Fixes T5405
@fix
---
data/themes/default/widgets/genlist_property.edc | 77
1 file changed, 77 insertions(+)
diff --git a/data/themes/default/widgets/genlist_property.edc
b/data/themes/default/widgets/genlist_property.edc
index d7b4733..46a8378 100644
--- a/data/themes/default/widgets/genlist_property.edc
+++ b/data/themes/default/widgets/genlist_property.edc
@@ -387,6 +387,83 @@ group { name: "elm/genlist/item/1swallow/property";
group { name: "elm/genlist/item/1swallow_wide/property";
inherit: "elm/genlist/item/1swallow/property";
+ parts {
+ part { name: "text.item.name";
+ type: TEXT;
+ repeat_events: 1;
+ description { state: "default" 0.00;
+align: 0.00 0.00;
+fixed: 1 0;
+min: 0 22;
+color_class: "main";
+text {
+ font: "PT";
+ size: 12;
+ max: 1 1;
+ min: 1 1;
+}
+rel1 {
+ relative: 1.00 0.00;
+ offset: 6 0;
+ to_x: "swallow.icon";
+ to_y: "";
+}
+rel2 {
+ relative: 0.00 1.00;
+ offset: -7 -1;
+ to_x: "";
+}
+ }
+ description { state: "changed" 0.00;
+inherit: "default" 0.00;
+text.font: "PT-Bold";
+rel1 {
+ relative: 1.00 0.00;
+ offset: 6 0;
+ to_x: "swallow.icon";
+ to_y: "";
+}
+rel2 {
+ relative: 0.00 1.00;
+ offset: -7 -1;
+ to_x: "";
+}
+ }
+ }
+ part { name: "text.action1.name";
+ type: TEXT;
+ description { state: "default" 0.00;
+align: 1.00 0.50;
+color_class: "main";
+text {
+ font: "PT";
+ size: 12;
+ min: 1 0;
+ max: 1 0;
+ align: 1.00 0.00;
+ ellipsis: -1.00;
+}
+rel1.to_y: "";
+rel2 {
+ relative: 0.00 1.00;
+ offset: -4 -1;
+ to_x: "";
+}
+ }
+ }
+ part { name: "swallow.action1";
+ type: SWALLOW;
+ description { state: "default" 0.00;
+rel1 {
+ relative: 1.00 0.00;
+ offset: 6 3;
+ to_x: "swallow.icon";
+ to_y: "";
+}
+rel2.offset: -7 -4;
+ }
+ }
+ }
}
group { name: "elm/genlist/item/2swallow/property";
--
[EGIT] [tools/eflete] master 04/04: property_sound: enable labels
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=f5dad9154e322b5016ac7ec39a2b049197e6b24d
commit f5dad9154e322b5016ac7ec39a2b049197e6b24d
Author: Vyacheslav Reutskiy
Date: Tue Apr 25 11:06:18 2017 +0300
property_sound: enable labels
This legacy code, when we decided to use contols for display some
attributes, but in fact these controls was alwayes disable. Now property
for sound manager looks like other property.
@fix
---
src/bin/ui/property/property_sound.c | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/bin/ui/property/property_sound.c
b/src/bin/ui/property/property_sound.c
index 05acf38..8cda915 100644
--- a/src/bin/ui/property/property_sound.c
+++ b/src/bin/ui/property/property_sound.c
@@ -61,12 +61,6 @@ _init_cb(Property_Attribute *pa, Property_Action *action)
switch (pa->type.sound_item)
{
- case PROPERTY_SOUND_ITEM_NAME:
- elm_object_disabled_set(action->control, true);
- break;
- case PROPERTY_SOUND_ITEM_COMPRESSION_QUALITY:
- elm_object_disabled_set(action->control, true);
- break;
case PROPERTY_SOUND_ITEM_FREQ:
elm_spinner_min_max_set(action->control, 20, 2);
elm_object_disabled_set(action->control, true);
@@ -74,13 +68,12 @@ _init_cb(Property_Attribute *pa, Property_Action *action)
#ifdef HAVE_AUDIO
case PROPERTY_SOUND_ITEM_DURATION:
#endif
+ case PROPERTY_SOUND_ITEM_NAME:
+ case PROPERTY_SOUND_ITEM_COMPRESSION_QUALITY:
case PROPERTY_SOUND_ITEM_TYPE:
case PROPERTY_SOUND_ITEM_SIZE:
case PROPERTY_SOUND_ITEM_FILE_NAME:
- elm_object_disabled_set(action->control, true);
- break;
case PROPERTY_SOUND_ITEM_COMPRESSION_TYPE:
- elm_object_disabled_set(action->control, true);
break;
default:
TODO("remove default case after all attributes will be added");
--
[EGIT] [core/efl] master 01/01: elm_entry: reset 'icon' and 'end' swallow when style changed
rimmed pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d54e130b701f27888d2d0714fbb2b6c1e3be990a commit d54e130b701f27888d2d0714fbb2b6c1e3be990a Author: Vyacheslav Reutskiy Date: Tue Apr 25 16:34:03 2017 +0300 elm_entry: reset 'icon' and 'end' swallow when style changed Fixes T5397 --- src/lib/elementary/elm_entry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index f90e9d7..46fd873 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -961,6 +961,8 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) _elm_theme_object_set(obj, sd->end_handler, "entry", "handler/end", style); } + elm_entry_icon_visible_set(obj, EINA_TRUE); + elm_entry_end_visible_set(obj, EINA_TRUE); if (sd->scroll) edje_obj_signal_emit(sd->entry_edje, "elm,scroll,enable", "elm"); --
[EGIT] [tools/eflete] master 02/02: theme: made the combobox drop-down list pretty
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=a353f457ba3043f938f2154611aef29f26b6968e
commit a353f457ba3043f938f2154611aef29f26b6968e
Author: Vyacheslav Reutskiy
Date: Mon Apr 24 11:45:55 2017 +0300
theme: made the combobox drop-down list pretty
Fixes T5403
@fix
---
data/themes/default/widgets/combobox.edc | 608 ---
data/themes/default/widgets/genlist.edc | 3 +
2 files changed, 3 insertions(+), 608 deletions(-)
diff --git a/data/themes/default/widgets/combobox.edc
b/data/themes/default/widgets/combobox.edc
index 7ef4bfc..072b986 100644
--- a/data/themes/default/widgets/combobox.edc
+++ b/data/themes/default/widgets/combobox.edc
@@ -748,614 +748,6 @@ group { name: "elm/hover/base/combobox_vertical/default";
}
}
-group { name: "elm/genlist/base/combobox_vertical/default";
- alias: "elm/scroller/base/popup/no_inset_shadow"; /* that's for hoversel */
- alias: "elm/genlist/base/combobox_vertical/zoom";
- data {
- item: "focus_highlight" "on";
- }
- images {
- image: "scroll-runner-vbar.png" COMP;
- image: "scroll-runner-hbar.png" COMP;
- image: "scroll-bar.png" COMP;
- }
- parts {
- part { name: "bg";
- type: RECT;
- description { state: "default" 0.0;
-color_class: "bg_scroller";
- }
- description { state: "disabled" 0.0;
-color: 0 0 0 0;
- }
- }
- part { name: "sb_vbar";
- type: RECT;
- scale: 1;
- description { state: "default" 0.0;
-align: 1.0 0.0;
-fixed: 1 0;
-min: 6 8;
-max: 6 -1;
-rel1 {
- offset: 0 1;
- to: "bg";
-}
-rel2 {
- relative: 1.0 0.0;
- offset: -2 -2;
- to_x: "bg";
- to_y: "sb_hbar";
-}
- }
- description { state: "hidden" 0.0;
-align: 1.0 0.0;
-fixed: 1 0;
-max: 0 -1;
-rel1 {
- offset: 0 1;
- to: "bg";
-}
-rel2 {
- relative: 1.0 0.0;
- offset: -2 -2;
- to_x: "bg";
- to_y: "sb_hbar";
-}
- }
- }
- part { name: "sb_vbar_p1";
- type: RECT;
- clip_to: "sb_vbar";
- description { state: "default" 0.0;
-color: 0 0 0 0;
-rel1 {
- to: "sb_vbar";
-}
-rel2 {
- relative: 1.0 0.0;
- to: "elm.dragable.vbar";
-}
- }
- }
- part { name: "sb_vbar_p2";
- type: RECT;
- clip_to: "sb_vbar";
- description { state: "default" 0.0;
-color: 0 0 0 0;
-rel1 {
- relative: 0.0 1.0;
- to: "elm.dragable.vbar";
-}
-rel2 {
- to: "sb_vbar";
-}
- }
- }
- part { name: "elm.dragable.vbar";
- type: RECT;
- scale: 1;
- clip_to: "sb_vbar";
- dragable {
-x: 0 0 0;
-y: 1 1 0;
-confine: "sb_vbar";
- }
- description { state: "default" 0.0;
-fixed: 1 1;
-min: 6 24;
-max: 6 -1;
-color: 0 0 0 0;
-rel1 {
- to: "sb_vbar";
-}
-rel2 {
- relative: 0.0 0.0;
- to: "sb_vbar";
-}
- }
- }
- part { name: "sb_hbar";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
-align: 0.0 1.0;
-fixed: 0 1;
-min: 0 6;
-max: -1 6;
-rel1 {
- offset: 1 0;
- to: "bg";
-}
-rel2 {
- relative: 0.0 1.0;
- offset: -2 -2;
- to_x: "sb_vbar";
- to_y: "bg";
-}
- }
- description { state: "hidden" 0.0;
-align: 0.0 1.0;
-fixed: 0 1;
-max: -1 0;
-rel1 {
- offset: 1 0;
- to: "bg";
-}
-rel2 {
- relative: 0.0 1.0;
- offset: -2 -2;
- to_x: "sb_vbar";
- to_y: "bg";
[EGIT] [tools/eflete] master 01/02: menu: enable 'Sript manager' item when it available
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=56f33ff451b50b78e47fac82866add22001301ee
commit 56f33ff451b50b78e47fac82866add22001301ee
Author: Vyacheslav Reutskiy
Date: Mon Apr 24 10:49:37 2017 +0300
menu: enable 'Sript manager' item when it available
Fixes T5406
@fix
---
src/bin/ui/tabs.c | 6 +-
src/bin/ui/workspace/group_navigator.c | 5 -
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index 8a5ce15..8007494 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -104,10 +104,14 @@ _content_set(void *data,
evas_object_smart_callback_call(ap.win, SIGNAL_GROUP_CHANGED,
NULL);
/* this case for when Property shows something selected in DEMO
mode */
evas_object_smart_callback_call(ap.win,
SIGNAL_DIFFERENT_TAB_CLICKED, NULL);
+ ui_menu_disable_set(ap.menu, MENU_WINDOW_MANAGER_SCRIPT, true);
return;
}
else
- elm_object_part_content_set(ap.panes.left_ver, "right",
workspace_group_navigator_get(item->content));
+ {
+ elm_object_part_content_set(ap.panes.left_ver, "right",
workspace_group_navigator_get(item->content));
+ ui_menu_disable_set(ap.menu, MENU_WINDOW_MANAGER_SCRIPT, false);
+ }
tabs.current_workspace = item->content;
tabs.current_group = item->group;
if (ap.project)
diff --git a/src/bin/ui/workspace/group_navigator.c
b/src/bin/ui/workspace/group_navigator.c
index 8be8e7f..d3d1320 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -748,9 +748,11 @@ _unselect_part(Part_List *pl)
static void
_unselected_cb(void *data,
Evas_Object *o,
- void *event_info __UNUSED__)
+ void *event_info)
{
Part_List *pl = data;
+ Elm_Object_Item *glit = event_info;
+
assert(pl != NULL);
/* focusing genlist to trigger unfocus callbacks in property */
@@ -758,6 +760,7 @@ _unselected_cb(void *data,
_unselect_internal(pl);
+ _enable_buttons(pl, glit);
evas_object_smart_callback_call(pl->layout,
SIGNAL_GROUP_NAVIGATOR_PART_SELECTED, NULL);
}
--
[EGIT] [tools/eflete] master 01/03: property: silence the debug output
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=c20ae7df900f1a5367c1e12c4cf286be75ffbae9
commit c20ae7df900f1a5367c1e12c4cf286be75ffbae9
Author: Vyacheslav Reutskiy
Date: Fri Apr 21 12:06:26 2017 +0300
property: silence the debug output
@fix
---
src/bin/ui/property/property_textblock.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/bin/ui/property/property_textblock.c
b/src/bin/ui/property/property_textblock.c
index 40a3def..5190fd2 100644
--- a/src/bin/ui/property/property_textblock.c
+++ b/src/bin/ui/property/property_textblock.c
@@ -398,7 +398,6 @@ _update_style()
CRIT_ON_FAIL(editor_style_tag_value_set(ap.project->global_object,
tpd.current_style.st_name,
tpd.current_style.st_tag,
eina_strbuf_string_get(tag)));
-printf("STRING: [%s] \n", eina_strbuf_string_get(tag));
eina_stringshare_del(tpd.current_style.stvalue);
tpd.current_style.stvalue =
eina_stringshare_add(eina_strbuf_string_get(tag));
eina_strbuf_free(tag);
--
[EGIT] [tools/eflete] master 02/03: property: disable label 'Property' is group doesn't selected
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=63aff00d13aaeafcd420d30f2f43f55386bbc519
commit 63aff00d13aaeafcd420d30f2f43f55386bbc519
Author: Vyacheslav Reutskiy
Date: Fri Apr 21 15:13:00 2017 +0300
property: disable label 'Property' is group doesn't selected
Fixes T5396
@fix
---
src/bin/ui/main_window.c | 1 +
src/bin/ui/property/property_group.c | 7 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c
index b1992fc..e00e0d1 100644
--- a/src/bin/ui/main_window.c
+++ b/src/bin/ui/main_window.c
@@ -236,6 +236,7 @@ ui_main_window_add(void)
elm_object_part_content_set(ap.panes.right, "left", tabs);
ap.property.group = property_add(ap.win, PROPERTY_MODE_GROUP);
+ elm_object_disabled_set(ap.property.group, true);
ap.property.image_manager = property_add(ap.win, PROPERTY_MODE_IMAGE);
ap.property.sound_manager = property_add(ap.win, PROPERTY_MODE_SOUND);
ap.property.style_manager = property_add(ap.win, PROPERTY_MODE_STYLE);
diff --git a/src/bin/ui/property/property_group.c
b/src/bin/ui/property/property_group.c
index fb83ef3..53337c8 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -357,7 +357,12 @@ _on_group_changed(void *data,
GENLIST_FILTER_APPLY(pd->genlist);
- if (!event_info) return;
+ if (!event_info)
+ {
+elm_object_disabled_set(elm_object_part_content_get(ap.panes.right,
"right"), true);
+return;
+ }
+ elm_object_disabled_set(elm_object_part_content_get(ap.panes.right,
"right"), false);
if (!group_pd.group->current_selected) /* group_only */
{
--
[EGIT] [tools/eflete] master 03/03: tabs: disable check 'Widgets' in import edj tab after import
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=e8b4d5bab990799612311aaba985e11d8dacbe4a
commit e8b4d5bab990799612311aaba985e11d8dacbe4a
Author: Vyacheslav Reutskiy
Date: Fri Apr 21 15:20:08 2017 +0300
tabs: disable check 'Widgets' in import edj tab after import
Fixes T5407
@fix
---
src/bin/ui/tab_home_import_edj.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/ui/tab_home_import_edj.c b/src/bin/ui/tab_home_import_edj.c
index d06efca..e7389a7 100644
--- a/src/bin/ui/tab_home_import_edj.c
+++ b/src/bin/ui/tab_home_import_edj.c
@@ -439,6 +439,7 @@ static Eina_Bool
_teardown_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__)
{
ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, false);
+ elm_check_state_set(tab_edj.ch_all, false);
return true;
}
--
[EGIT] [tools/eflete] master 03/04: configure: update the efl version dependency
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=243ce6d418b3d4f64d82945d152905e6d98531f2 commit 243ce6d418b3d4f64d82945d152905e6d98531f2 Author: Vyacheslav Reutskiy Date: Tue Apr 18 11:45:14 2017 +0300 configure: update the efl version dependency Prepare to release eflete-1.19 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 99df09a..f9ce9f0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFLETE_VERSION([1], [18], [99], [dev]) +EFLETE_VERSION([1], [19], [0], [release]) AC_INIT([eflete], [eflete_version], [enlightenment-devel@lists.sourceforge.net], [eflete]) AC_PREREQ([2.60]) @@ -13,7 +13,7 @@ AM_INIT_AUTOMAKE([1.13 dist-xz subdir-objects color-tests foreign]) LT_INIT([win32-dll disable-static pic-only]) dnl m4_define([package], "EFL\ Edje\ Theme\ Editor") -m4_define([efl_version], [1.19.0-beta3]) +m4_define([efl_version], [1.19.0]) m4_define([efl_version_max], [1.19.]) m4_define([enventor_version], [0.5.0]) --
[EGIT] [tools/eflete] master 04/04: theme: fix the broken view for path entry in fileselector
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=8154922c7ebb2007d580c9f490db825b751e23e7
commit 8154922c7ebb2007d580c9f490db825b751e23e7
Author: Vyacheslav Reutskiy
Date: Tue Apr 18 15:51:25 2017 +0300
theme: fix the broken view for path entry in fileselector
For future: if you change one layout of widget, for exaple create new
view, you *MUST* to add layouts or alias for other layouts with simular
name. Previously was added base layout for fileselected which name
"extened" for add new functionality - buttons for switch mode
(list/grid). This new layout broke all child, because elementary tried
to find styles "fileselector/extended" for each child, but not found,
because these layouts was not add.
@fix
---
data/themes/default/widgets/entry.edc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/themes/default/widgets/entry.edc
b/data/themes/default/widgets/entry.edc
index e96f872..e6c14d4 100644
--- a/data/themes/default/widgets/entry.edc
+++ b/data/themes/default/widgets/entry.edc
@@ -1195,6 +1195,7 @@ group { name: "elm/scroller/entry_single/default";
group { name: "elm/scroller/entry_single/fileselector/default";
inherit: "elm/scroller/entry_single/default";
+ alias: "elm/scroller/entry_single/fileselector/extended";
parts {
part { name: "elm.swallow.content";
description { state: "default" 0.0;
@@ -1299,6 +1300,7 @@ group { name: "elm/entry/path/separator/default";
}
group { name: "elm/entry/base-single/fileselector/default";
inherit: "elm/entry/base-single/default";
+ alias: "elm/entry/base-single/fileselector/extended";
data.item: "path_separator" "";
parts {
part { name: "elm.text";
--
[EGIT] [tools/eflete] master 01/04: theme: fix label overlay
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=35b40535b140c9b64eefb0cbc741cec81abd26aa
commit 35b40535b140c9b64eefb0cbc741cec81abd26aa
Author: Vyacheslav Reutskiy
Date: Tue Apr 18 10:57:12 2017 +0300
theme: fix label overlay
@fix
---
data/themes/default/widgets/slider.edc | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/data/themes/default/widgets/slider.edc
b/data/themes/default/widgets/slider.edc
index 43b5ddd..cf18a32 100644
--- a/data/themes/default/widgets/slider.edc
+++ b/data/themes/default/widgets/slider.edc
@@ -258,7 +258,7 @@ group { name: "elm/slider/horizontal/default";
rel2 {
relative: 0.0 1.0;
offset: -4 -1;
- to_x: "limits";
+ to_x: "elm.units";
}
}
}
@@ -394,12 +394,14 @@ group { name: "elm/slider/horizontal/default";
color_class: "slider_text";
rel1 {
to_x: "limits";
+ to_y: "base";
}
rel2 {
to_x: "limits";
+ to_y: "base";
+ offset: -1 -2;
}
text {
- text: "elm.text";
font: FN;
size: 10;
min: 1 1;
@@ -413,12 +415,15 @@ group { name: "elm/slider/horizontal/default";
color_class: "slider_text";
rel1 {
to_x: "limits";
+ to_y: "base";
}
rel2 {
to_x: "limits";
+ to_y: "base";
+ offset: -1 -2;
}
text {
- text: "";
+ font: FN;
size: 10;
min: 1 1;
align: 1.0 0.5;
--
[EGIT] [tools/eflete] master 02/04: theme: update style for gengrid item
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=7508462fadb4dc196c1e607e99e587da053452a0
commit 7508462fadb4dc196c1e607e99e587da053452a0
Author: Vyacheslav Reutskiy
Date: Tue Apr 18 11:41:23 2017 +0300
theme: update style for gengrid item
@fix
---
data/themes/default/widgets/gengrid.edc | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/data/themes/default/widgets/gengrid.edc
b/data/themes/default/widgets/gengrid.edc
index 0a2a300..615a940 100644
--- a/data/themes/default/widgets/gengrid.edc
+++ b/data/themes/default/widgets/gengrid.edc
@@ -39,6 +39,7 @@
color_class: "select";
rel1 {
to: "elm.text";
+ offset: -2 0;
}
rel2 {
to: "elm.text";
@@ -48,6 +49,7 @@
color_class: "select";
rel1 {
to: "elm.text";
+ offset: -2 0;
}
rel2 {
to: "elm.text";
@@ -72,6 +74,8 @@
part { name: "icon_border";
type: IMAGE;
description { state: "default" 0.0;
+ aspect: 1.00 1.00;
+ aspect_preference: VERTICAL;
rel1 {
offset: 3 3;
}
@@ -128,12 +132,10 @@
align: 0.5 1.0;
color_class: "main";
rel1 {
- offset: 1 0;
- to_x: "icon_border";
+ offset: 5 3;
}
rel2 {
- offset: -2 -4;
- to_x: "icon_border";
+ offset: -4 -4;
}
text {
font: FN;
--
[EGIT] [tools/eflete] master 01/01: theme: fix not 'fixed' part for entry style
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=4cc43f7cd96de22a59b3a3dddace378fd2a95a59
commit 4cc43f7cd96de22a59b3a3dddace378fd2a95a59
Author: Vyacheslav Reutskiy
Date: Thu Apr 13 14:42:37 2017 +0300
theme: fix not 'fixed' part for entry style
---
data/themes/default/widgets/entry.edc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/themes/default/widgets/entry.edc
b/data/themes/default/widgets/entry.edc
index 5a19b93..e96f872 100644
--- a/data/themes/default/widgets/entry.edc
+++ b/data/themes/default/widgets/entry.edc
@@ -600,9 +600,9 @@ group { name: "elm/scroller/entry/default";
type: SWALLOW;
description { state: "default" 0.0;
align: 1.0 0.0;
-fixed: 1 1;
-max: 24 24;
min: 24 24;
+max: 24 24;
+fixed: 1 1;
rel1 {
offset: 0 -2;
}
@@ -1065,7 +1065,7 @@ group { name: "elm/scroller/entry_single/default";
description { state: "default" 0.0;
align: 1.0 0.5;
max: 19 -1;
-fixed: 1 0;
+fixed: 1 1;
rel1 {
relative: 1.0 0.0;
offset: 0 1;
--
[EGIT] [core/efl] master 01/01: elm_filselector: don't force the icon size
rimmed pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c4e7d611d635c79fdc4d32a33b5bc1292ed8dd33
commit c4e7d611d635c79fdc4d32a33b5bc1292ed8dd33
Author: Vyacheslav Reutskiy
Date: Tue Apr 18 11:29:29 2017 +0300
elm_filselector: don't force the icon size
A icon in the files view, mode grid, should not apply size bigger then
swallow for it. This commit additional fix for
52ddf9331a6eceac4b11fade920a7c6e85fe8a38
---
src/lib/elementary/elc_fileselector.c | 18 +++---
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/lib/elementary/elc_fileselector.c
b/src/lib/elementary/elc_fileselector.c
index 9d59c62..bcafeb5 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -312,13 +312,10 @@ _itc_icon_folder_get(void *data EINA_UNUSED,
Evas_Object *obj,
const char *source)
{
- Evas_Object *ic, *grid, *f;
+ Evas_Object *ic, *grid;
if (strcmp(source, "elm.swallow.icon")) return NULL;
- f = evas_object_data_get(obj, "parent");
- ELM_FILESELECTOR_DATA_GET(f, sd);
-
ic = elm_icon_add(obj);
elm_icon_standard_set(ic, "folder");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
@@ -327,7 +324,6 @@ _itc_icon_folder_get(void *data EINA_UNUSED,
grid = elm_grid_add(obj);
elm_grid_size_set(grid, 1, 1);
elm_grid_pack(grid, ic, 0, 0, 1, 1);
- evas_object_size_hint_min_set(grid, sd->thumbnail_size.w,
sd->thumbnail_size.h);
evas_object_show(grid);
return grid;
@@ -339,13 +335,10 @@ _itc_icon_image_get(void *data,
const char *source)
{
Elm_Fileselector_Item_Data *it_data = data;
- Evas_Object *ic, *grid, *f;
+ Evas_Object *ic, *grid;
if (strcmp(source, "elm.swallow.icon")) return NULL;
- f = evas_object_data_get(obj, "parent");
- ELM_FILESELECTOR_DATA_GET(f, sd);
-
ic = elm_icon_add(obj);
elm_icon_standard_set(ic, "image");
// FIXME: maybe use Efl.Model.connect
@@ -356,7 +349,6 @@ _itc_icon_image_get(void *data,
grid = elm_grid_add(obj);
elm_grid_size_set(grid, 1, 1);
elm_grid_pack(grid, ic, 0, 0, 1, 1);
- evas_object_size_hint_min_set(grid, sd->thumbnail_size.w,
sd->thumbnail_size.h);
evas_object_show(grid);
return grid;
@@ -367,13 +359,10 @@ _itc_icon_file_get(void *data EINA_UNUSED,
Evas_Object *obj,
const char *source)
{
- Evas_Object *ic, *grid, *f;
+ Evas_Object *ic, *grid;
if (strcmp(source, "elm.swallow.icon")) return NULL;
- f = evas_object_data_get(obj, "parent");
- ELM_FILESELECTOR_DATA_GET(f, sd);
-
ic = elm_icon_add(obj);
elm_icon_standard_set(ic, "file");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
@@ -382,7 +371,6 @@ _itc_icon_file_get(void *data EINA_UNUSED,
grid = elm_grid_add(obj);
elm_grid_size_set(grid, 1, 1);
elm_grid_pack(grid, ic, 0, 0, 1, 1);
- evas_object_size_hint_min_set(grid, sd->thumbnail_size.w,
sd->thumbnail_size.h);
evas_object_show(grid);
return grid;
--
[EGIT] [core/efl] master 02/02: elm_fileselector: fix thumbnail size for other themes bisides default
rimmed pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=52ddf9331a6eceac4b11fade920a7c6e85fe8a38
commit 52ddf9331a6eceac4b11fade920a7c6e85fe8a38
Author: Vyacheslav Reutskiy
Date: Tue Apr 18 09:25:51 2017 +0300
elm_fileselector: fix thumbnail size for other themes bisides default
Elm_fileselector has the hardcoded value for calculate the item size
with thumbail, this size was 16, it's looks like thumbnail size plus
labal text height, but hardcoded value haven't effect to scale. Other
problem with items without labels. As a result we have correct
thumbnail size only with default theme and with scale 1.0.
This commit made the item size accordingly to size what user set. It's
made more clearly this API behavior.
@fix
---
src/lib/elementary/elc_fileselector.c | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/lib/elementary/elc_fileselector.c
b/src/lib/elementary/elc_fileselector.c
index 5224659..9d59c62 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -25,7 +25,7 @@
#define MY_CLASS_NAME_LEGACY "elm_fileselector"
/* FIXME: need a way to find a gap between the size of item and thumbnail */
-#define GENGRID_PADDING 16
+#define ITEM_SIZE_DEFAULT 16
typedef struct _Legacy_Event_Path_Then_Data
{
@@ -1636,7 +1636,7 @@ _files_grid_add(Evas_Object *obj)
evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_gengrid_item_size_set(grid, sd->thumbnail_size.w + GENGRID_PADDING,
sd->thumbnail_size.h + GENGRID_PADDING);
+ elm_gengrid_item_size_set(grid, sd->thumbnail_size.w, sd->thumbnail_size.h);
elm_gengrid_align_set(grid, 0.0, 0.0);
@@ -1952,9 +1952,8 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj,
Elm_Fileselector_Data *pri
elm_object_style_set(priv->spinner, "wheel");
elm_object_part_content_set(obj, "elm.swallow.spinner", priv->spinner);
- // XXX: will fail for dynamic finger size changing
- priv->thumbnail_size.w = elm_config_finger_size_get() * 2 - GENGRID_PADDING;
- priv->thumbnail_size.h = priv->thumbnail_size.w;
+ priv->thumbnail_size.w = ITEM_SIZE_DEFAULT;
+ priv->thumbnail_size.h = ITEM_SIZE_DEFAULT;
priv->sort_type = ELM_FILESELECTOR_SORT_BY_FILENAME_ASC;
priv->sort_method = _filename_cmp;
@@ -2968,13 +2967,13 @@
_elm_fileselector_elm_interface_fileselector_thumbnail_size_set(Eo *obj EINA_UNU
if (sd->thumbnail_size.w == w && sd->thumbnail_size.h == h) return;
if (!w || !h)
- w = h = elm_config_finger_size_get() * 2 - GENGRID_PADDING;
+ w = h = ITEM_SIZE_DEFAULT;
sd->thumbnail_size.w = w;
sd->thumbnail_size.h = h;
if (sd->mode == ELM_FILESELECTOR_GRID)
- elm_gengrid_item_size_set(sd->files_view, w + GENGRID_PADDING, h +
GENGRID_PADDING);
+ elm_gengrid_item_size_set(sd->files_view, w, h);
if (sd->model)
{
--
[EGIT] [core/efl] master 01/02: fileselector: apply style for files view
rimmed pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0ecf3c6906599ef8f9104dbf45afb143f67a420e
commit 0ecf3c6906599ef8f9104dbf45afb143f67a420e
Author: Vyacheslav Reutskiy
Date: Fri Apr 14 11:23:47 2017 +0300
fileselector: apply style for files view
By some reason style does not applyed to genlist/gengrid in
fileselector. Also fixed issue with applyed style for files view on
change mode. Now this problem is fixed.
@fix
---
src/lib/elementary/elc_fileselector.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/lib/elementary/elc_fileselector.c
b/src/lib/elementary/elc_fileselector.c
index 524ca80..5224659 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -227,6 +227,8 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj,
Elm_Fileselector_Data *sd)
elm_widget_style_set(sd->home_button, buf);
elm_widget_style_set(sd->spinner, "wheel");
+ elm_widget_style_set(sd->files_view, buf);
+
elm_widget_style_set(sd->path_entry, buf);
elm_widget_style_set(sd->name_entry, buf);
elm_widget_style_set(sd->search_entry, buf);
@@ -2388,6 +2390,7 @@ _elm_fileselector_elm_interface_fileselector_mode_set(Eo
*obj, Elm_Fileselector_
sd->mode = mode;
+ elm_obj_widget_theme_apply(obj);
if (sd->model)
{
_schedule_populate(obj, sd, sd->model, NULL);
--
[EGIT] [tools/eflete] master 01/01: configure: efl 1.19.0-beta3 is now, fix deps version
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=995e7d72e97dab25828f869fbc298abf30c1b50c commit 995e7d72e97dab25828f869fbc298abf30c1b50c Author: Vyacheslav Reutskiy Date: Tue Mar 21 11:28:05 2017 +0200 configure: efl 1.19.0-beta3 is now, fix deps version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 88822ea..99df09a 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ AM_INIT_AUTOMAKE([1.13 dist-xz subdir-objects color-tests foreign]) LT_INIT([win32-dll disable-static pic-only]) dnl m4_define([package], "EFL\ Edje\ Theme\ Editor") -m4_define([efl_version], [1.19.0-alpha3]) +m4_define([efl_version], [1.19.0-beta3]) m4_define([efl_version_max], [1.19.]) m4_define([enventor_version], [0.5.0]) --
[EGIT] [tools/eflete] master 02/02: configure: update minimal version for efl deps to 1.19.0-alpha3
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=fe50a401838da966d8e050a911bdd42e45009007 commit fe50a401838da966d8e050a911bdd42e45009007 Author: Vyacheslav Reutskiy Date: Tue Mar 21 10:08:51 2017 +0200 configure: update minimal version for efl deps to 1.19.0-alpha3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76f6b39..88822ea 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ AM_INIT_AUTOMAKE([1.13 dist-xz subdir-objects color-tests foreign]) LT_INIT([win32-dll disable-static pic-only]) dnl m4_define([package], "EFL\ Edje\ Theme\ Editor") -m4_define([efl_version], [1.19.0-alpha1]) +m4_define([efl_version], [1.19.0-alpha3]) m4_define([efl_version_max], [1.19.]) m4_define([enventor_version], [0.5.0]) --
[EGIT] [core/efl] master 01/01: gengrid: avoid call select callback twice in mode ELM_OBJECT_MULTI_SELECT_MODE_WITH_CONTROL
rimmed pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6723c3b1c3cde31d4ce70606074cac5b91d8974b commit 6723c3b1c3cde31d4ce70606074cac5b91d8974b Author: Vyacheslav Reutskiy Date: Fri Mar 17 08:59:26 2017 +0200 gengrid: avoid call select callback twice in mode ELM_OBJECT_MULTI_SELECT_MODE_WITH_CONTROL If multi select mode is ELM_OBJECT_MULTI_SELECT_MODE_WITH_CONTROL and user code try unselect a item and select another part which not realized select callback calls twice in this case. For avoid this no needs focus newly selected item. @fix --- src/lib/elementary/elm_gengrid.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 7bedd5d..6501025 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -4405,7 +4405,6 @@ _item_select(Elm_Gen_Item *it) it->walking++; sd->walking++; - elm_object_item_focus_set(eo_it, EINA_TRUE); sd->last_selected_item = eo_it; if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it); --
[EGIT] [tools/eflete] master 05/05: fileselector: add mode switcher between list and grid
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=41f0e771e0bdeffbc998ffbbb6fcb15fcb03f22c
commit 41f0e771e0bdeffbc998ffbbb6fcb15fcb03f22c
Author: Vyacheslav Reutskiy
Date: Tue Mar 14 14:07:46 2017 +0200
fileselector: add mode switcher between list and grid
Fixes T4590
@feature
---
data/themes/default/images/icon_grid.png | Bin 0 -> 266 bytes
data/themes/default/images/icon_list.png | Bin 0 -> 208 bytes
data/themes/default/widgets/fileselector.edc | 213 +++
data/themes/default/widgets/radio.edc| 208 ++
src/bin/ui/popup.c | 34 +
src/bin/ui/tab_home_open.c | 34 +
6 files changed, 489 insertions(+)
diff --git a/data/themes/default/images/icon_grid.png
b/data/themes/default/images/icon_grid.png
new file mode 100644
index 000..65575ea
Binary files /dev/null and b/data/themes/default/images/icon_grid.png differ
diff --git a/data/themes/default/images/icon_list.png
b/data/themes/default/images/icon_list.png
new file mode 100644
index 000..4ecd332
Binary files /dev/null and b/data/themes/default/images/icon_list.png differ
diff --git a/data/themes/default/widgets/fileselector.edc
b/data/themes/default/widgets/fileselector.edc
index fad4d2c..a9b4447 100644
--- a/data/themes/default/widgets/fileselector.edc
+++ b/data/themes/default/widgets/fileselector.edc
@@ -188,6 +188,219 @@ group { name: "elm/fileselector/base/default";
}
}
}
+ programs {
+ program { name: "program_0x1e19fa0";
+signal: "elm,action,spinner,show";
+source: "elm";
+action: STATE_SET "visible" 0.00;
+transition: LINEAR 0.2;
+target: "elm.spinner.clip";
+ }
+ program { name: "program_0x1e1a2d0";
+signal: "elm,action,spinner,hide";
+source: "elm";
+action: STATE_SET "default" 0.00;
+transition: LINEAR 0.5 CURRENT;
+target: "elm.spinner.clip";
+ }
+ }
+ }
+}
+
+group { name: "elm/fileselector/base/extended";
+ data {
+ item: "path_separator" "";
+ }
+ parts {
+ part { name: "elm.swallow.up";
+ type: SWALLOW;
+ description { state: "default" 0.00;
+align: 0.00 0.00;
+fixed: 1 1;
+min: 5 5;
+rel2.relative: 0.00 0.00;
+ }
+ }
+ part { name: "elm.swallow.home";
+ type: SWALLOW;
+ description { state: "default" 0.00;
+align: 0.00 0.00;
+fixed: 1 1;
+min: 5 5;
+rel1 {
+ relative: 1.00 0.00;
+ offset: 6 0;
+ to: "elm.swallow.up";
+}
+rel2 {
+ offset: 3 -1;
+ to: "elm.swallow.up";
+}
+ }
+ }
+ part { name: "elm.swallow.search";
+ type: SWALLOW;
+ description { state: "default" 0.00;
+align: 0.00 0.50;
+fixed: 1 1;
+max: 350 -1;
+rel1 {
+ relative: 1.00 0.00;
+ offset: 6 0;
+ to: "elm.swallow.home";
+}
+rel2 {
+ relative: 0.00 1.00;
+ offset: -7 -1;
+ to_x: "elm.swallow.btn_list";
+ to_y: "elm.swallow.home";
+}
+ }
+ }
+ part { name: "elm.spinner.clip";
+ type: RECT;
+ description { state: "default" 0.00;
+color: 255 255 255 0;
+rel1.to: "elm.swallow.spinner";
+rel2.to: "elm.swallow.spinner";
+ }
+ description { state: "visible" 0.00;
+inherit: "default" 0.00;
+color: 255 255 255 255;
+ }
+ }
+ part { name: "elm.swallow.files";
+ type: SWALLOW;
+ description { state: "default" 0.00;
+align: 1.00 0.00;
+min: 10 10;
+rel1 {
+ relative: 0.00 1.00;
+ offset: 0 6;
+ to_y: "elm.swallow.home";
+}
+rel2 {
+ relative: 1.00 0.00;
+ offset: -1 -7;
+ to_y: "elm.swallow.path";
+}
+ }
+ }
+ part { name: "elm.swallow.path";
+ type: SWALLOW;
+ description { state: "default" 0.00;
+align: 0.50 1.00;
+fixed: 1 1;
+rel1 {
+ offset: 0 -4;
[EGIT] [tools/eflete] master 01/01: update README
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=22c4c4df172368af8e28c0eafe8a2c75a7db6e76 commit 22c4c4df172368af8e28c0eafe8a2c75a7db6e76 Author: Vyacheslav Reutskiy Date: Mon Mar 13 12:52:09 2017 +0200 update README --- README | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/README b/README index 4e419b9..c2d2d24 100644 --- a/README +++ b/README @@ -1,7 +1,15 @@ EFL Edje Theme Editor (eflete) -This is a EFL theme editor with some convenient functions. Eflete oriented -towards theme editor and UI design, and not GUI over the edc syntax. +Efl Edje Theme Editor is a rich graphical tool, that provide UI for edc markup. +It is aimed to simplify creation and editing widgets styles. No one, for sure, +want to learn EDC syntax. Eflete was designed with mind, that target users are +not just programmers but also designers. Besides styles Eflete is also able to +create and edit custom layouts. This is useful feature for developers which +creates applications layouts. + +Note: +For comfortable work with Eflete it should have the HD (1366x768) resolution, +if resolution is less not all UI componenets is displayed. Requirements: - --
[EGIT] [tools/eflete] master 02/02: tabs: fix the wrong size calc for tabs content
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=cd6b3c03e7aa59d19e22b660b9c3991ea66d4a2e
commit cd6b3c03e7aa59d19e22b660b9c3991ea66d4a2e
Author: Vyacheslav Reutskiy
Date: Mon Mar 13 11:19:36 2017 +0200
tabs: fix the wrong size calc for tabs content
Fixes: T5248
---
data/themes/default/widgets/layouts/tabs.edc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/themes/default/widgets/layouts/tabs.edc
b/data/themes/default/widgets/layouts/tabs.edc
index 6f968af..eeadd66 100644
--- a/data/themes/default/widgets/layouts/tabs.edc
+++ b/data/themes/default/widgets/layouts/tabs.edc
@@ -33,8 +33,8 @@ group { name: "elm/layout/tabs/default";
part { name: "bg_logo";
type: IMAGE;
description { state: "default" 0.00;
-min: 738 458;
-max: 738 458;
+aspect_preference: BOTH;
+aspect: 1.61 1.61;
image.normal: "bg_logo.png";
rel1.to: "bg_content";
rel2.to: "bg_content";
--
[EGIT] [tools/eflete] master 01/02: white theme: add icons for program play button
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=0f865a7972c64ef771d62b22fd0774a6a9f85403
commit 0f865a7972c64ef771d62b22fd0774a6a9f85403
Author: Vyacheslav Reutskiy
Date: Tue Mar 7 08:27:31 2017 +0200
white theme: add icons for program play button
Fixes T5028
@fix
---
data/themes/tizen/default.edc| 2 +-
data/themes/tizen/images/Icons/navi_play.png | Bin 0 -> 154 bytes
data/themes/tizen/images/Icons/navi_stop.png | Bin 0 -> 113 bytes
data/themes/tizen/widgets/icon.edc | 133 ++-
4 files changed, 70 insertions(+), 65 deletions(-)
diff --git a/data/themes/tizen/default.edc b/data/themes/tizen/default.edc
index 3883b96..89e00e0 100644
--- a/data/themes/tizen/default.edc
+++ b/data/themes/tizen/default.edc
@@ -28,7 +28,7 @@ collections {
#include "widgets/cursor.edc"
#include "widgets/layout.edc"
#include "widgets/image.edc"
- //#include "widgets/icon.edc"
+ #include "widgets/icon.edc"
#include "widgets/colorselector.edc"
#include "widgets/win.edc"
#include "widgets/fileselector.edc"
diff --git a/data/themes/tizen/images/Icons/navi_play.png
b/data/themes/tizen/images/Icons/navi_play.png
new file mode 100644
index 000..bc0ccce
Binary files /dev/null and b/data/themes/tizen/images/Icons/navi_play.png differ
diff --git a/data/themes/tizen/images/Icons/navi_stop.png
b/data/themes/tizen/images/Icons/navi_stop.png
new file mode 100644
index 000..acbc0d4
Binary files /dev/null and b/data/themes/tizen/images/Icons/navi_stop.png differ
diff --git a/data/themes/tizen/widgets/icon.edc
b/data/themes/tizen/widgets/icon.edc
index 71d6c83..3034f79 100644
--- a/data/themes/tizen/widgets/icon.edc
+++ b/data/themes/tizen/widgets/icon.edc
@@ -1,59 +1,64 @@
+images {
+ image: "Icons/navi_play.png" COMP;
+ image: "Icons/navi_stop.png" COMP;
+}
+
#define IC(Name, Alias1, Alias2, File, Min, Max) \
group { name: "elm/icon/"##Name##"/default"; min: Min Min; max: Max Max; \
alias: "elm/icon/"##Alias1##"/default"; alias:
"elm/icon/"##Alias2##"/default"; \
images.image: File COMP; parts { part { name: "base"; \
description { aspect: 1.0 1.0; aspect_preference: BOTH; \
image.normal: File; } } } }
-IC("go-up", "toolbar/go-up","menu/go-up",
"icon_arrow_up.png", 14, 0);
-IC("go-down", "toolbar/go-down", "menu/go-down",
"icon_arrow_down.png", 14, 0);
-IC("go-previous", "toolbar/go-previous", "menu/go-previous",
"icon_arrow_left.png", 14, 0);
-IC("go-next", "toolbar/go-next", "menu/go-next",
"icon_arrow_right.png",14, 0);
-IC("go-home", "toolbar/go-home", "menu/go-home",
"icon_home.png", 14, 0);
-IC("image2","toolbar/image2", "menu/image2",
"icon_image2.png", 14, 0);
-IC("sound2","toolbar/sound2", "menu/sound2",
"icon_sound2.png", 14, 0);
-IC("text2", "toolbar/text2","menu/text2",
"icon_text2.png", 14, 0);
-IC("close", "toolbar/close","menu/close",
"icon_close.png", 14, 0);
-IC("apps", "toolbar/apps", "menu/apps",
"icon_apps.png", 14, 0);
-IC("chat", "toolbar/chat", "menu/chat",
"icon_chat.png", 14, 0);
-IC("clock", "toolbar/clock","menu/clock",
"icon_clock.png", 14, 0);
-IC("delete","toolbar/delete", "menu/delete",
"icon_delete.png", 14, 0);
-IC("edit", "toolbar/edit", "menu/edit",
"icon_edit.png", 14, 0);
-IC("refresh", "toolbar/refresh", "menu/refresh",
"icon_refresh.png",14, 0);
-IC("folder","toolbar/folder", "menu/folder",
"icon_folder.png", 14, 0);
-IC("folder1",
[EGIT] [tools/eflete] master 03/03: eflete: add script for prepare release
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=d232d1513be3e651e2b014b132a44ac8b59a2c5f
commit d232d1513be3e651e2b014b132a44ac8b59a2c5f
Author: Vyacheslav Reutskiy
Date: Tue Feb 28 08:42:22 2017 +0200
eflete: add script for prepare release
This script will check the build and UTC result, update NEWS and
version in configure.ac, next will create tarballs and md5 for tarballs.
---
release_prepare.sh | 189 +
1 file changed, 189 insertions(+)
diff --git a/release_prepare.sh b/release_prepare.sh
new file mode 100755
index 000..1041abb
--- /dev/null
+++ b/release_prepare.sh
@@ -0,0 +1,189 @@
+#!/bin/bash
+
+NEWS_FILE=NEWS.new
+CONFIGURE=configure.ac
+
+function line_print {
+ eval "printf '%.0s$2' {1..$1}"
+}
+
+function list_print {
+ oldIFS="$IFS"
+ IFS=$'\n'
+ for string in $1
+ do
+ echo -e "$2$string"
+ done
+ IFS="$oldIFS"
+}
+
+function update_news {
+ echo -e ">>> Update NEWS file"
+ #exec 3>&1 4>&2
+ #exec 1>$NEWS_FILE 2>&1
+
+ #get the last release version
+ tmp=(`sed -n 2p NEWS`)
+ last_version=${tmp[1]}
+
+ #make header
+ title="Eflete $1"
+ tlen=${#title}
+ line=$(line_print $tlen '=')
+ header="$line\n$title\n$line"
+ echo -e $header > $NEWS_FILE
+ echo -e "" >> $NEWS_FILE
+ since="Changes since $last_version"
+ echo -e $since >> $NEWS_FILE
+ echo -e "$(line_print ${#since} '-')" >> $NEWS_FILE
+
+ #get the features list
+ features=`git log --since="$last_version" --grep="@feature" --format=%s`
+ if [ -n "$features" ]; then
+ echo -e "" >> $NEWS_FILE
+ echo -e "Features:" >> $NEWS_FILE
+ list_print "$features" " * " >> $NEWS_FILE
+ fi
+
+ #get the fixes list
+ fixes=`git log --since="$last_version" --grep="@fix" --format=%s`
+ if [ -n "$fixes" ]; then
+ echo -e "" >> $NEWS_FILE
+ echo -e "Fixes:" >> $NEWS_FILE
+ list_print "$fixes" " * " >> $NEWS_FILE
+ fi
+
+ #print to user latest changes
+ cat $NEWS_FILE
+ #get the previos change history and to result file
+ echo -e "" >> $NEWS_FILE
+ sed -n '5,$p' NEWS >> $NEWS_FILE
+
+ #trap 'exec 2>&4 1>&3' 0 1 2 3
+
+ echo -e ""
+ read -p "Do you want to edit NEWS? [Y/n] " choice
+ case "$choice" in
+ y|Y ) vim $NEWS_FILE ;;
+ * ) ;;
+ esac
+
+ mv $NEWS_FILE NEWS
+
+ read -p "Do you want to commit the updated NEWS? [Y/n] " choice
+ case "$choice" in
+ y|Y ) commit_NEWS $1 ;;
+ * ) ;;
+ esac
+}
+
+function commit_NEWS {
+ git add NEWS
+ git commit -m "Update NEWS for version $1"
+ echo -e ""
+ git log -1
+}
+
+function commit_VERSION {
+ git add $CONFIGURE
+ git commit -m "Update configure for version $1"
+ echo -e ""
+ git log -1
+}
+
+function spinner {
+ PID="$1"
+ i=1
+ sp_chars="-\|/"
+ echo -n " "
+ while [ -d /proc/$PID ]; do
+ printf "\b${sp:i++%${#sp}:1}"
+ done
+}
+
+function check_build {
+ git clean -dxf > /tmp/git_clean.log
+ ./autogen.sh
+ make
+ if [ $? -ne 0 ]; then
+ echo -e ""
+ echo -e "ERROR: Build is failsed."
+ exit 1;
+ fi
+
+ echo -e ">>> Build success"
+}
+
+function check_UTC {
+ make check
+ if [ $? -ne 0 ]; then
+ echo -e ""
+ echo -e "ERROR: Build is failsed."
+ exit 1;
+ fi
+
+ echo -e ">>> UTC success"
+}
+
+function update_version {
+ echo -e ""
+ echo -e ">>> Update version in configure file"
+ oldIFS="$IFS"
+ IFS='.'
+ array=( $1 )
+ major="${array[0]}"
+ minor="${array[1]}"
+ micra="${array[*]:2}"
+ IFS="$oldIFS"
+
+ sed "1s/.*/EFLETE_VERSION([$major], [$minor], [$micra], [release])/g"
$CONFIGURE > "$CONFIGURE.new"
+ m
[EGIT] [tools/eflete] master 02/03: update gitignore, add *xz files
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=76a0ad8c94d1331dd8742195c0bbc8bd16a005a8 commit 76a0ad8c94d1331dd8742195c0bbc8bd16a005a8 Author: Vyacheslav Reutskiy Date: Tue Feb 28 10:43:24 2017 +0200 update gitignore, add *xz files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index aadfed8..04627e6 100644 --- a/.gitignore +++ b/.gitignore @@ -144,6 +144,8 @@ libtool #tarballs *.tar.gz *.tar.bz2 +*.tar.xz + #localization *.gmo --
[EGIT] [tools/eflete] master 01/03: NEWS: fix indent
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=af3aacaef2e528b49256e91344ef7eb09cc00461 commit af3aacaef2e528b49256e91344ef7eb09cc00461 Author: Vyacheslav Reutskiy Date: Wed Mar 1 13:00:46 2017 +0200 NEWS: fix indent --- NEWS | 124 +-- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/NEWS b/NEWS index 25b49b0..c8e2829 100644 --- a/NEWS +++ b/NEWS @@ -114,76 +114,76 @@ Fixes: Changes since 0.5.0 --- Features: -* new project navigator: use tree to navigate within groups -* tabs: move the managers to tabs -* tabs: edit several groups at one time -* history: support all group arrtibutes -* group navigator: merge the parts, states and programs lists -* demo: additional options for swallowed object -* navigator: posible to add new group, copy or make alias of existing one -* Eflete: add option for import edj file from command line -* Property: make possible to rename layouts and styles + * new project navigator: use tree to navigate within groups + * tabs: move the managers to tabs + * tabs: edit several groups at one time + * history: support all group arrtibutes + * group navigator: merge the parts, states and programs lists + * demo: additional options for swallowed object + * navigator: posible to add new group, copy or make alias of existing one + * Eflete: add option for import edj file from command line + * Property: make possible to rename layouts and styles Fixes: -* navigator: fix group deletion -* image_manager: disable del button after deletion -* property_group: fix doubling rename change -* tabs: avoid double tab clicking -* live_gengrid: fix SIGSEV on item text load -* shortcuts: delete extra assert -* image_editor: disable del button when no image is selected -* popup: disallow empty group addition when popup just showed -* property_group: better logic with filter -* property: select program back if it was selected after tab change -* property_sound: fix the close Eflete after a sound play end -* property_macros: set None for targets and afters when NULL is selected -* tabs: clear property so when loaded again it won't show last property -* property_group: unset Program Property after program deletion -* project_manager: fix import edc, set correct edje_cc params -* Config: fix set projects dir path. -* Main window: hide History block controls. -* Property: unset and hide any previous content. -* workspace: fix segfault after closing tab -* project_navigator: set the corrent string to entry -* project_navigator: fix group add -* popup: get the selected path from fs on 'done' -* property: fix bug with property over history -* Popup: do not delete list of selected files returned by fileselector while multi -* style_editor: fix abort while 'open,close,open' routine -* sound_editor: fix abort after sound editor close -* Shortcuts: Hot key now work after export project as edc -* Styles: fix the single line entry size calculation -* History: fix the wrong property update on undo -* History: disacart changes only if it exist -* Styles: do not change the bg state if button disabled -* Wizards: disable button 'Apply' if project name is invalid -* History: fix part restack -* Widget List: Nesting level does not match indentation -* Part dialog: free validator before close the dialog -* Connect: don't try unselect the deleted part -* Property: set the correct name for image fill start and end points. -* Groupedit: discard set text to part two times -* Groupedit: discard the double object calculation -* Colorsel: fix colorsel in property that changes it's size while moving window -* History: update live view on all other redo/undo changes -* Connector: rename part gets more and more laggy with every change -* Live View Property: change parent for Check -* Property: multiplier min value should be 0 -* Property: don't unset the color_class on part color set + * navigator: fix group deletion + * image_manager: disable del button after deletion + * property_group: fix doubling rename change + * tabs: avoid double tab clicking + * live_gengrid: fix SIGSEV on item text load + * shortcuts: delete extra assert + * image_editor: disable del button when no image is selected + * popup: disallow empty group addition when popup just showed + * property_group: better logic with filter + * property: select program back if it was selected after tab change + * property_sound: fix the close Eflete after a sound play end + * property_macros: set None for targets and afters when NULL is selected + * tabs: clear property so when loaded again it won't show last property + * property_group: unset Program Property after program deletion + * project_manager: fix import edc, set correct edje_cc params + * Config: fix set projects dir path. + * Main window: hide His
[EGIT] [tools/eflete] master 01/02: update authors
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=d7c460849957f75ba1bcea7907bbc00fe88d2bf6 commit d7c460849957f75ba1bcea7907bbc00fe88d2bf6 Author: Vyacheslav Reutskiy Date: Thu Feb 23 11:52:49 2017 +0200 update authors Change-Id: I52ad9c9688e5e7d0f3a3032cb2a5722e456941ff --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 4c7bfb5..4df26f2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,6 +8,7 @@ Andrii Kroitor (an.kroi...@samsung.com) Kateryna Fesyna (fesy...@gmail.com) Maksym Volodin (mac9...@gmail.com) Igor Gala (igor.gal...@gmail.com) +Tetiana Naumenko (t.naume...@samsung.com) Olga Kolesnik (o.koles...@samsung.com) --
[EGIT] [tools/eflete] master 02/02: Update README
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=4b729f668d4b5995cd4a076e332c4a71377b89d3 commit 4b729f668d4b5995cd4a076e332c4a71377b89d3 Author: Vyacheslav Reutskiy Date: Thu Feb 23 13:20:13 2017 +0200 Update README --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 9a42900..4e419b9 100644 --- a/README +++ b/README @@ -6,10 +6,10 @@ towards theme editor and UI design, and not GUI over the edc syntax. Requirements: - - * efl (>= 1.17.0 && < 1.17.) + * efl (>= 1.19.0 && < 1.19.) Please note that some features may not quite function correctly or -completely on EFL 1.17.0 +completely on EFL 1.19.0 Please see http://www.enlightenment.org for information on these. @@ -26,7 +26,7 @@ To install program to specified directory use --prefix option on configure step: ./autogen.sh --prefix=/full/path/to/some/dir -Apllying themes: +Applying themes: To apply created theme to elementary you should place exported .edj-file to --
[EGIT] [tools/eflete] eflete-1.18 02/31: project_navigator: do not add groups and folders twicely
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=c16056751e685d6122639536d14d26880837ae04
commit c16056751e685d6122639536d14d26880837ae04
Author: Vyacheslav Reutskiy
Date: Wed Feb 22 13:08:11 2017 +0200
project_navigator: do not add groups and folders twicely
@fix
Changes to be committed:
modified: src/bin/ui/project_navigator.c
---
src/bin/ui/project_navigator.c | 25 -
1 file changed, 25 deletions(-)
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 86fcfaa..2d6533f 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -800,8 +800,6 @@ void
project_navigator_project_set(void)
{
Eina_List *folders = NULL, *groups = NULL;
- Eina_Stringshare *prefix;
- Group *group;
elm_object_text_set(project_navigator.layout, ap.project->name);
widget_tree_items_get(ap.project->groups, "", &folders, &groups);
@@ -814,29 +812,6 @@ project_navigator_project_set(void)
NULL,
NULL);
elm_genlist_item_expanded_set(project_navigator.item_top, true);
-
-
- EINA_LIST_FREE(folders, prefix)
- {
-elm_genlist_item_append(project_navigator.genlist,
-project_navigator.itc_folder,
-prefix,
-project_navigator.item_top,
-ELM_GENLIST_ITEM_TREE,
-NULL,
-NULL);
- }
- EINA_LIST_FREE(groups, group)
- {
-elm_genlist_item_append(project_navigator.genlist,
-project_navigator.itc_group,
-group,
-project_navigator.item_top,
-ELM_GENLIST_ITEM_NONE,
-NULL,
-NULL);
- }
-
elm_object_disabled_set(project_navigator.layout, false);
}
--
[EGIT] [tools/eflete] eflete-1.18 29/31: manangers: hide menu by Esc
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=29ef58481aa75924a03e6af442d356bfe22595da
commit 29ef58481aa75924a03e6af442d356bfe22595da
Author: Vyacheslav Reutskiy
Date: Mon Feb 20 18:40:00 2017 +0200
manangers: hide menu by Esc
@fix
Change-Id: Id5b87080b1ef63285f45bc79b66a50f783476def
Conflicts:
src/bin/ui/image_manager.c
---
src/bin/ui/sound_manager.c | 7 ++-
src/bin/ui/style_manager.c | 9 +++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index 4232759..187ce87 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -319,9 +319,11 @@ _tone_add(void)
static void
_sample_add_cb(void *data,
- Evas_Object *obj __UNUSED__,
+ Evas_Object *obj,
void *event_info __UNUSED__)
{
+ shortcuts_object_check_pop(obj);
+
popup_fileselector_sound_helper(_("Choose a sound"), NULL, NULL,
_add_sample_done, data, false, false);
}
@@ -437,6 +439,9 @@ _tone_add_cb(void *data __UNUSED__,
void *event_info __UNUSED__)
{
Evas_Object *popup;
+
+ shortcuts_object_check_pop(obj);
+
mng.tone_validator = resource_name_validator_new(NAME_REGEX, NULL);
resource_name_validator_list_set(mng.tone_validator, &ap.project->tones,
true);
mng.frq_validator = elm_validator_regexp_new(FREQUENCY_REGEX, NULL);
diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c
index dab8058..161b897 100644
--- a/src/bin/ui/style_manager.c
+++ b/src/bin/ui/style_manager.c
@@ -223,10 +223,13 @@ close:
static void
_style_add_cb(void *data __UNUSED__,
- Evas_Object *obj __UNUSED__,
+ Evas_Object *obj,
void *event_info __UNUSED__)
{
Evas_Object *popup;
+
+ shortcuts_object_check_pop(obj);
+
mng.popup.validator = resource_name_validator_new(NAME_REGEX, NULL);
resource_name_validator_list_set(mng.popup.validator, &ap.project->styles,
true);
@@ -315,7 +318,7 @@ close:
}
static void
_tag_add_cb(void *data __UNUSED__,
-Evas_Object *obj __UNUSED__,
+Evas_Object *obj,
void *event_info __UNUSED__)
{
Resource *res;
@@ -324,6 +327,8 @@ _tag_add_cb(void *data __UNUSED__,
Evas_Object *popup;
Tag_Popup_Data * tpd = mem_calloc(1, sizeof(Tag_Popup_Data));
+ shortcuts_object_check_pop(obj);
+
tpd->glit = elm_genlist_selected_item_get(mng.genlist);
tpd->glit_parent = elm_genlist_item_parent_get(tpd->glit);
--
[EGIT] [tools/eflete] eflete-1.18 26/31: image_manager: apply min size for property on first start
rimmed pushed a commit to branch eflete-1.18. http://git.enlightenment.org/tools/eflete.git/commit/?id=2f697e4e2c9c99040bcdf175a97db734bdb22d93 commit 2f697e4e2c9c99040bcdf175a97db734bdb22d93 Author: Vyacheslav Reutskiy Date: Fri Feb 17 09:00:36 2017 +0200 image_manager: apply min size for property on first start @fix Change-Id: I155cb6031950f30130dcbc71ebf48c9f9a890b36 --- src/bin/ui/image_manager.c | 4 1 file changed, 4 insertions(+) diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c index 68943cd..238e895 100644 --- a/src/bin/ui/image_manager.c +++ b/src/bin/ui/image_manager.c @@ -562,6 +562,8 @@ image_manager_add(void) elm_layout_theme_set(mng.layout, "layout", "image_manager", "default"); mng.panes = elm_panes_add(mng.win); elm_object_part_content_set(mng.panes, "left", mng.layout); + elm_panes_content_right_size_set(mng.panes, 0); + elm_panes_content_right_min_size_set(mng.panes, 400); mng.property_panes = elm_panes_add(mng.win); elm_panes_horizontal_set(mng.property_panes, true); elm_object_part_content_set(mng.panes, "right", mng.property_panes); @@ -569,6 +571,8 @@ image_manager_add(void) evas_object_show(mng.image); elm_object_part_content_set(mng.property_panes, "left", mng.image); elm_object_part_content_set(mng.property_panes, "right", ap.property.image_manager); + elm_panes_content_left_size_set(mng.property_panes, 0); + elm_panes_content_left_min_size_set(mng.property_panes, 400); #endif if (!gic) --
[EGIT] [tools/eflete] eflete-1.18 20/31: project_navigator: rework group delete for work with names like '/////'
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=56672ef2877b1cc80600f2040687d8cee2513c45
commit 56672ef2877b1cc80600f2040687d8cee2513c45
Author: Vyacheslav Reutskiy
Date: Fri Feb 10 08:54:38 2017 +0200
project_navigator: rework group delete for work with names like '/'
@fix
Change-Id: Ib0a6dc880302d247d0e5697970a58033d6322bd6
Conflicts:
src/bin/ui/project_navigator.c
---
src/bin/ui/project_navigator.c | 120 +
1 file changed, 50 insertions(+), 70 deletions(-)
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 93594ce..d02ba7b 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -530,55 +530,51 @@ _btn_add_group_cb(void *data __UNUSED__,
}
static void
-_folder_del(const char *prefix)
+_folder_del(Elm_Object_Item *item)
{
- Eina_List *folders = NULL, *groups = NULL;
+ Elm_Object_Item *itm, *parent;
+ const Eina_List *items;
+ Eina_List *l;
Eina_Stringshare *tmp, *msg;
- Group *group, *alias;
-
- widget_tree_items_get(ap.project->groups, prefix, &folders, &groups);
- EINA_LIST_FREE(folders, tmp)
- {
- _folder_del(tmp);
- }
+ Group *group;
+ const Elm_Genlist_Item_Class *itc;
- EINA_LIST_FREE(groups, group)
+ items = elm_genlist_item_subitems_get(item);
+ EINA_LIST_FOREACH((Eina_List *)items, l, itm)
{
-if (group->main_group) continue;
-EINA_LIST_FREE(group->aliases, alias)
+itc = elm_genlist_item_item_class_get(itm);
+if (itc == project_navigator.itc_folder)
{
- tmp = eina_stringshare_add(alias->name);
- if (editor_group_del(ap.project->global_object, tmp))
- gm_group_del(ap.project, alias);
- else
+ // recursion for del folder
+ _folder_del(itm);
+ }
+else if (itc == project_navigator.itc_group)
+ {
+ group = elm_object_item_data_get(itm);
+ tmp = eina_stringshare_add(group->name);
+ if (!editor_group_del(ap.project->global_object, tmp))
{
- msg = eina_stringshare_printf(_("Can't delete alias layout
\"%s\""), alias->name);
+ msg = eina_stringshare_printf(_("Can't delete layout \"%s\".
"
+ "Please close a tab with
given group."),
+group->name);
TODO("Check if it's correct to ignore error");
popup_add(_("Error"), msg, BTN_OK, NULL, NULL);
eina_stringshare_del(msg);
}
eina_stringshare_del(tmp);
}
-
-tmp = eina_stringshare_add(group->name);
-if (editor_group_del(ap.project->global_object, tmp))
- gm_group_del(ap.project, group);
-else
- {
- msg = eina_stringshare_printf(_("Can't delete layout \"%s\". "
-"Please close a tab with given
group."), group->name);
- TODO("Check if it's correct to ignore error");
- popup_add(_("Error"), msg, BTN_OK, NULL, NULL);
- eina_stringshare_del(msg);
- }
-eina_stringshare_del(tmp);
+elm_object_item_del(itm);
}
-}
-static int
-group_cmp(Resource *res1, const char *name)
-{
- return strncmp(res1->name, name, strlen(name));
+ parent = elm_genlist_item_parent_get(item);
+ elm_object_item_del(item);
+ while ((parent != project_navigator.item_top) &&
+ (elm_genlist_item_subitems_count(parent) == 0 ))
+ {
+item = parent;
+parent = elm_genlist_item_parent_get(item);
+elm_object_item_del(item);
+ }
}
static void
@@ -587,47 +583,31 @@ _group_del(void *data __UNUSED__,
void *event_info)
{
Eina_Stringshare *group_name;
- Elm_Object_Item *item;
- char **arr;
- unsigned int depth, i;
- Eina_List *stack = NULL, *l;
- Eina_Strbuf *buf;
+ Elm_Object_Item *item, *parent;
+ Group *group;
- buf = eina_strbuf_new();
group_name = (Eina_Stringshare *)event_info;
- item = elm_genlist_first_item_get(project_navigator.genlist);
- arr = eina_str_split_full(group_name, "/", 0, &depth);
- for (i = 0; i < depth; i++)
+
+ item = elm_genlist_selected_item_get(project_navigator.genlist);
+ group = elm_object_item_data_get(item);
+ if ((group->name == group_name) || !strcmp(group->name, group_name))
{
-item =_find_item(item, arr[i]);
-eina_strbuf_append_printf(buf, "%s", arr[i]);
-if (!item)
[EGIT] [tools/eflete] eflete-1.18 03/31: project navigator: don't set text to entry is seleted top item
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=0d3356232b5d76bfcd53ed33d76d04bb4c97242c
commit 0d3356232b5d76bfcd53ed33d76d04bb4c97242c
Author: Vyacheslav Reutskiy
Date: Wed Nov 30 09:20:07 2016 +0200
project navigator: don't set text to entry is seleted top item
Change-Id: I1b83fa9c54b29b2ea45841439cfd796f10f1
---
src/bin/ui/project_navigator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 2d6533f..21d92a2 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -415,7 +415,7 @@ _add_group_content_get(void *data __UNUSED__, Evas_Object
*popup, Evas_Object **
elm_layout_content_set(item, NULL, layout_p.entry);
elm_box_pack_end(layout_p.box, item);
glit = elm_genlist_selected_item_get(project_navigator.genlist);
- if (glit && (elm_genlist_item_item_class_get(glit) ==
project_navigator.itc_folder))
+ if (glit && (glit != project_navigator.item_top) &&
(elm_genlist_item_item_class_get(glit) == project_navigator.itc_folder))
elm_entry_entry_set(layout_p.entry, elm_object_item_data_get(glit));
/* copy: combobox */
LAYOUT_PROP_ADD(layout_p.box, _("Copy of"), "popup", "1swallow")
--
[EGIT] [tools/eflete] eflete-1.18 30/31: property_group: fix build warnings
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3a58d0aec7e119d3af3ec6117c1d26d707574ad2
commit 3a58d0aec7e119d3af3ec6117c1d26d707574ad2
Author: Vyacheslav Reutskiy
Date: Thu Feb 23 09:39:11 2017 +0200
property_group: fix build warnings
---
src/bin/ui/property/property_group.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/ui/property/property_group.c
b/src/bin/ui/property/property_group.c
index bce35e8..f68113b 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -205,6 +205,7 @@ static const char *image_border_fill_strings[] = { STR_NONE,
"Default",
"Solid",
NULL};
+static inline void
_spinner_value_set(Evas_Object *obj, double val)
{
#ifdef HAVE_TIZEN
--
[EGIT] [tools/eflete] eflete-1.18 18/31: project_navigator: update comporator for sorted insert
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=cb9ce736469f0a1faa930172c91279fba507feb1
commit cb9ce736469f0a1faa930172c91279fba507feb1
Author: Vyacheslav Reutskiy
Date: Wed Nov 9 10:34:36 2016 +0200
project_navigator: update comporator for sorted insert
Fixes T4802
Change-Id: I7d21e1307b1f891014e422c2b34f9bdbf46de062
Conflicts:
src/bin/ui/project_navigator.c
---
src/bin/ui/project_navigator.c | 33 ++---
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index b8af9f1..6afdffd 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -280,22 +280,33 @@ _items_compare(const void *data1, const void *data2)
const char *str2;
const Elm_Object_Item *it1 = data1;
const Elm_Object_Item *it2 = data2;
+ const Elm_Genlist_Item_Class *it1_class;
+ const Elm_Genlist_Item_Class *it2_class;
- /* add group */
- if (elm_genlist_item_item_class_get(it1) == project_navigator.itc_group)
+ it1_class = elm_genlist_item_item_class_get(it1);
+ it2_class = elm_genlist_item_item_class_get(it2);
+
+ if ((it1_class == project_navigator.itc_group) &&
+ (it2_class == project_navigator.itc_folder))
{
-if (elm_genlist_item_item_class_get(it2) !=
project_navigator.itc_folder)
- str2 = ((Group *)elm_object_item_data_get(it2))->name;
-else return 1;
-str1 = ((Group *)elm_object_item_data_get(it1))->name;
+return 1;
}
- else /* add folder */
+ else if ((it1_class == project_navigator.itc_folder) &&
+(it2_class == project_navigator.itc_group))
{
-if (elm_genlist_item_item_class_get(it2) ==
project_navigator.itc_group)
- str2 = elm_object_item_data_get(it2);
-else return -1;
-str1 = elm_object_item_data_get(it1);
+return -1;
}
+
+ if (it1_class == project_navigator.itc_group)
+ str1 = ((Group *)elm_object_item_data_get(it1))->name;
+ else
+ str1 = elm_object_item_data_get(it1);
+
+ if (it2_class == project_navigator.itc_group)
+ str2 = ((Group *)elm_object_item_data_get(it2))->name;
+ else
+ str2 = elm_object_item_data_get(it2);
+
return strcmp(str1, str2);
}
--
[EGIT] [tools/eflete] eflete-1.18 06/31: popup: return the correct value if export process is start
rimmed pushed a commit to branch eflete-1.18. http://git.enlightenment.org/tools/eflete.git/commit/?id=cfb0da145718d2633ba42ad4482f93555a438ef4 commit cfb0da145718d2633ba42ad4482f93555a438ef4 Author: Vyacheslav Reutskiy Date: Thu Jan 26 09:26:03 2017 +0200 popup: return the correct value if export process is start @fix Change-Id: I7bf43c8308ef6062e09a4d590103eea728a342be --- src/bin/ui/project_export.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/ui/project_export.c b/src/bin/ui/project_export.c index 5c9e184..d9ef237 100644 --- a/src/bin/ui/project_export.c +++ b/src/bin/ui/project_export.c @@ -81,7 +81,7 @@ _export_dev(void *data __UNUSED__, _after_export_dev_check, (void *)eina_stringshare_add(path)); eina_strbuf_free(buf); - return false; + return true; } void @@ -159,7 +159,7 @@ _export_release(void *data __UNUSED__, _after_export_release_check, (void *)eina_stringshare_add(path)); eina_strbuf_free(buf); - return false; + return true; } void --
[EGIT] [tools/eflete] eflete-1.18 16/31: project_navigator: don't try to add items if top item collaped
rimmed pushed a commit to branch eflete-1.18. http://git.enlightenment.org/tools/eflete.git/commit/?id=b9596b495927e86e3f23c5f28310231af3241b14 commit b9596b495927e86e3f23c5f28310231af3241b14 Author: Vyacheslav Reutskiy Date: Mon Feb 6 10:46:32 2017 +0200 project_navigator: don't try to add items if top item collaped @fix Change-Id: I8fc5f04de8ce8d39b28cf147c136f1de53789c76 --- src/bin/ui/project_navigator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c index 21d92a2..47b2c04 100644 --- a/src/bin/ui/project_navigator.c +++ b/src/bin/ui/project_navigator.c @@ -309,6 +309,7 @@ _group_add(void *data __UNUSED__, group = (Group *)event_info; item = elm_genlist_first_item_get(project_navigator.genlist); + if (!elm_genlist_item_expanded_get(item)) return; arr = eina_str_split_full(group->name, "/", 0, &count); if (count > 1) --
[EGIT] [tools/eflete] eflete-1.18 21/31: sound_editor: make preview for sound in the player
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=36d0bb4a397a33ec6245d2acd4c8633842d0e188
commit 36d0bb4a397a33ec6245d2acd4c8633842d0e188
Author: Vyacheslav Reutskiy
Date: Mon Feb 13 09:46:09 2017 +0200
sound_editor: make preview for sound in the player
Fixes T5152
@fix
Change-Id: Ibb9f6751ca2137e78e50998185fac89678df57ff
---
data/themes/default/widgets/layout.edc | 33 +++--
src/bin/ui/sound_manager.c | 6 ++
2 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/data/themes/default/widgets/layout.edc
b/data/themes/default/widgets/layout.edc
index acf910c..8413081 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -939,16 +939,37 @@ group { name: "elm/layout/image_manager/usage_info";
group { name: "elm/layout/sound_editor/player";
parts {
- part { name: "eflete.swallow.teg";
- type: SWALLOW;
- description { state: "default" 0.0;
-fixed: 1 1;
+ part { name: "eflete.sound.type";
+ type: TEXT;
+ description { state: "default" 0.00;
+align: 0.00 0.00;
+color_class: "main";
+text {
+ font: "PT";
+ size: 10;
+ min: 0 1;
+ max: 0 1;
+}
+rel1.offset: 3 3;
+rel2.offset: -4 -1;
+ }
+ }
+ part { name: "eflete.sound.value";
+ type: TEXT;
+ description { state: "default" 0.00;
+color_class: "select";
+text {
+ font: "PT:style=Bold";
+ size: 42;
+}
rel1 {
+ relative: 0.00 1.00;
offset: 3 3;
+ to_y: "eflete.sound.type";
}
rel2 {
- relative: 1.0 0.0;
- offset: -4 -7;
+ relative: 1.00 0.00;
+ offset: -4 -4;
to_y: "eflete.swallow.fast";
}
}
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index edf793a..e5018e0 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -141,13 +141,16 @@ _grid_sel_cb(void *data __UNUSED__,
request.name = snd->name;
request.resource_type = RESOURCE_TYPE_SOUND;
res = (External_Resource *)resource_get(ap.project->sounds, &request);
+ elm_layout_text_set(mng.player, "eflete.sound.type", _("sample"));
break;
case SOUND_TYPE_TONE:
request.name = snd->name;
request.resource_type = RESOURCE_TYPE_TONE;
res = (External_Resource *)resource_get(ap.project->tones, &request);
+ elm_layout_text_set(mng.player, "eflete.sound.type", _("tone"));
break;
}
+ elm_layout_text_set(mng.player, "eflete.sound.value", snd->type_label);
assert(res != NULL);
@@ -527,6 +530,9 @@ _mw_cancel_cb(void *data __UNUSED__,
{
Evas_Object *content;
+ elm_layout_text_set(mng.player, "eflete.sound.value", NULL);
+ elm_layout_text_set(mng.player, "eflete.sound.type", NULL);
+
/* unset and hide the image property */
content = elm_object_content_unset(mng.win);
evas_object_hide(content);
--
[EGIT] [tools/eflete] eflete-1.18 23/31: property: update outline and shadow color only if state have selected
rimmed pushed a commit to branch eflete-1.18. http://git.enlightenment.org/tools/eflete.git/commit/?id=3bfecd2df5c4a047f0181fb8f189be63963c5471 commit 3bfecd2df5c4a047f0181fb8f189be63963c5471 Author: Vyacheslav Reutskiy Date: Mon Feb 13 10:22:32 2017 +0200 property: update outline and shadow color only if state have selected @fix Change-Id: Ic18a067acd3670e33299740ab415ed9612c16a98 --- src/bin/ui/property/property_group.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/ui/property/property_group.c b/src/bin/ui/property/property_group.c index c17ff74..3244f4a 100644 --- a/src/bin/ui/property/property_group.c +++ b/src/bin/ui/property/property_group.c @@ -2280,6 +2280,7 @@ _update_cb(Property_Attribute *pa, Property_Action *action) property_color_control_color_set(action->control, int_val1, int_val2, int_val3, int_val4); return editor_state_color_default_is(EDIT_OBJ, STATE_ARGS); case ATTRIBUTE_STATE_OUTLINE_COLOR: + if (_state_name_get() == NULL) break; edje_edit_state_outline_color_get(EDIT_OBJ, STATE_ARGS, &int_val1, &int_val2, &int_val3, &int_val4); property_color_control_color_set(action->control, int_val1, int_val2, int_val3, int_val4); effect = edje_edit_part_text_effect_get(EDIT_OBJ, PART_ARGS); @@ -2292,6 +2293,7 @@ _update_cb(Property_Attribute *pa, Property_Action *action) elm_object_disabled_set(action->control, true); return editor_state_outline_color_default_is(EDIT_OBJ, STATE_ARGS); case ATTRIBUTE_STATE_SHADOW_COLOR: + if (_state_name_get() == NULL) break; edje_edit_state_shadow_color_get(EDIT_OBJ, STATE_ARGS, &int_val1, &int_val2, &int_val3, &int_val4); property_color_control_color_set(action->control, int_val1, int_val2, int_val3, int_val4); effect = edje_edit_part_text_effect_get(EDIT_OBJ, PART_ARGS); --
[EGIT] [tools/eflete] eflete-1.18 28/31: workspace: fix bad looks zoom spinner value for white theme (tizen)
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=306f3eaa192f2176cccb8ec10cd58a1b5ba55211
commit 306f3eaa192f2176cccb8ec10cd58a1b5ba55211
Author: Vyacheslav Reutskiy
Date: Fri Feb 17 09:53:57 2017 +0200
workspace: fix bad looks zoom spinner value for white theme (tizen)
@fix
Change-Id: Ia16e21392c35431e58817affdbd0549dfbf5035a
---
src/bin/ui/workspace/workspace.c | 12
1 file changed, 12 insertions(+)
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index f2862c2..6c30e7f 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -350,7 +350,11 @@ _slider_zoom_cb(void *data,
wd->zoom_factor = elm_slider_value_get(wd->toolbar.zoom.slider) / 100;
elm_spinner_value_set(wd->toolbar.zoom.cmb_zoom, (int)(wd->zoom_factor *
100));
+#ifdef HAVE_TIZEN
+ text = eina_stringshare_printf("%d", (int)(wd->zoom_factor * 100));
+#else
text = eina_stringshare_printf("%d%%", (int)(wd->zoom_factor * 100));
+#endif /* HAVE_TIZEN */
elm_object_text_set(wd->toolbar.zoom.cmb_zoom, text);
eina_stringshare_del(text);
_members_zoom_set(wd);
@@ -514,7 +518,11 @@ _zoom_controls_add(Workspace_Data *wd)
wd->toolbar.zoom.itc->func.text_get = _combobox_text_get;
wd->toolbar.zoom.itc->func.del = _combobox_item_del;
evas_object_size_hint_min_set(wd->toolbar.zoom.cmb_zoom, 70, 0);
+#ifdef HAVE_TIZEN
+ elm_object_text_set(wd->toolbar.zoom.cmb_zoom, _("100"));
+#else
elm_object_text_set(wd->toolbar.zoom.cmb_zoom, _("100%"));
+#endif /* HAVE_TIZEN */
evas_object_smart_callback_add(wd->toolbar.zoom.cmb_zoom,
signals.elm.combobox.item_pressed, _zoom_selected_cb, wd);
while (zoom_values[i])
{
@@ -2115,7 +2123,11 @@ workspace_zoom_factor_set(Evas_Object *obj, double
factor)
{
wd->zoom_factor = factor;
elm_slider_value_set(wd->toolbar.zoom.slider, factor * 100);
+#ifdef HAVE_TIZEN
+text = eina_stringshare_printf("%d", (int)(wd->zoom_factor * 100));
+#else
text = eina_stringshare_printf("%d%%", (int)(wd->zoom_factor * 100));
+#endif /* HAVE_TIZEN */
elm_object_text_set(wd->toolbar.zoom.cmb_zoom, text);
eina_stringshare_del(text);
TODO("Fix elementary callbacks on changing value from code");
--
[EGIT] [tools/eflete] eflete-1.18 07/31: popup: dismiss popup on 1 (first) mouse button click
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=24639197b6637db4d09fc6a9cc13e8125873e700
commit 24639197b6637db4d09fc6a9cc13e8125873e700
Author: Vyacheslav Reutskiy
Date: Thu Jan 26 10:09:23 2017 +0200
popup: dismiss popup on 1 (first) mouse button click
Make popups behavior is homogeneous for all popup helpers
@fix
Change-Id: I5d155140802d32a26c3613e39415c051d7e334af
---
data/themes/default/widgets/layout.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/themes/default/widgets/layout.edc
b/data/themes/default/widgets/layout.edc
index 068150f..acf910c 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -203,7 +203,7 @@ group { name: "elm/layout/popup/hint_title";
}
programs {
program { name: "dismiss";
- signal: "mouse,up,*";
+ signal: "mouse,up,1";
source: "event";
action: SIGNAL_EMIT "hint,dismiss" "eflete";
}
--
[EGIT] [tools/eflete] eflete-1.18 12/31: property_group: disable the color controls accordingly to effect val
rimmed pushed a commit to branch eflete-1.18. http://git.enlightenment.org/tools/eflete.git/commit/?id=25d6172cd22d8877682c3ad3b556bb5b9f0adbcd commit 25d6172cd22d8877682c3ad3b556bb5b9f0adbcd Author: Vyacheslav Reutskiy Date: Fri Feb 3 14:49:07 2017 +0200 property_group: disable the color controls accordingly to effect val @fix Change-Id: Ia96995c3f01605bc3c6439e7904661dd4f1d07a1 --- src/bin/ui/property/property_group.c | 20 1 file changed, 20 insertions(+) diff --git a/src/bin/ui/property/property_group.c b/src/bin/ui/property/property_group.c index 3609367..c17ff74 100644 --- a/src/bin/ui/property/property_group.c +++ b/src/bin/ui/property/property_group.c @@ -1727,6 +1727,7 @@ _update_cb(Property_Attribute *pa, Property_Action *action) Eina_Stringshare *str_val1, *str_val2; Eina_List *images_list, *l; char *code; + Edje_Text_Effect effect; assert(pa != NULL); assert(action != NULL); @@ -1858,6 +1859,8 @@ _update_cb(Property_Attribute *pa, Property_Action *action) return editor_state_fill_type_default_is(EDIT_OBJ, STATE_ARGS); case ATTRIBUTE_PART_TEXT_EFFECT: elm_object_text_set(action->control, text_effect_strings[(int) edje_edit_part_text_effect_get(EDIT_OBJ, PART_ARGS)]); + property_item_update(&group_pd.items[PROPERTY_GROUP_ITEM_STATE_COLORS_OUTLINE_COLOR]); + property_item_update(&group_pd.items[PROPERTY_GROUP_ITEM_STATE_COLORS_SHADOWCOLOR]); return editor_part_text_effect_default_is(EDIT_OBJ, PART_ARGS); case ATTRIBUTE_PART_TEXT_SHADOW_DIRECTION: /* shodow directions are shifted by 4 in enum */ @@ -2279,10 +2282,27 @@ _update_cb(Property_Attribute *pa, Property_Action *action) case ATTRIBUTE_STATE_OUTLINE_COLOR: edje_edit_state_outline_color_get(EDIT_OBJ, STATE_ARGS, &int_val1, &int_val2, &int_val3, &int_val4); property_color_control_color_set(action->control, int_val1, int_val2, int_val3, int_val4); + effect = edje_edit_part_text_effect_get(EDIT_OBJ, PART_ARGS); + if ((EDJE_TEXT_EFFECT_OUTLINE == effect) || + (EDJE_TEXT_EFFECT_SOFT_OUTLINE == effect) || + (EDJE_TEXT_EFFECT_OUTLINE_SHADOW == effect) || + (EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW == effect)) + elm_object_disabled_set(action->control, false); + else + elm_object_disabled_set(action->control, true); return editor_state_outline_color_default_is(EDIT_OBJ, STATE_ARGS); case ATTRIBUTE_STATE_SHADOW_COLOR: edje_edit_state_shadow_color_get(EDIT_OBJ, STATE_ARGS, &int_val1, &int_val2, &int_val3, &int_val4); property_color_control_color_set(action->control, int_val1, int_val2, int_val3, int_val4); + effect = edje_edit_part_text_effect_get(EDIT_OBJ, PART_ARGS); + if ((EDJE_TEXT_EFFECT_SHADOW == effect) || + (EDJE_TEXT_EFFECT_SOFT_SHADOW == effect) || + (EDJE_TEXT_EFFECT_OUTLINE_SHADOW == effect) || + (EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW == effect)) + elm_object_disabled_set(action->control, false); + else + elm_object_disabled_set(action->control, true); + return editor_state_shadow_color_default_is(EDIT_OBJ, STATE_ARGS); case ATTRIBUTE_STATE_COLOR_CLASS: elm_genlist_clear(action->control); --
[EGIT] [tools/eflete] eflete-1.18 25/31: property: update a text control on change of text source value
rimmed pushed a commit to branch eflete-1.18. http://git.enlightenment.org/tools/eflete.git/commit/?id=83e7f3282ca47a0d5f358b325917cade898c8e07 commit 83e7f3282ca47a0d5f358b325917cade898c8e07 Author: Vyacheslav Reutskiy Date: Wed Feb 15 11:25:24 2017 +0200 property: update a text control on change of text source value Fixes T4881 @fix Change-Id: Id3369f036887fe681ce3277148dfb4749b929dba --- src/bin/ui/property/property_group.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/ui/property/property_group.c b/src/bin/ui/property/property_group.c index 3244f4a..bce35e8 100644 --- a/src/bin/ui/property/property_group.c +++ b/src/bin/ui/property/property_group.c @@ -3745,6 +3745,7 @@ _change_cb(Property_Attribute *pa, Property_Action *action) CRIT_ON_FAIL(editor_state_text_text_source_set(EDIT_OBJ, CHANGE_NO_MERGE, STATE_ARGS, str_val1)); eina_stringshare_del(group_pd.history.new.str_val1); group_pd.history.new.str_val1 = str_val1; + property_item_update(&group_pd.items[PROPERTY_GROUP_ITEM_STATE_TEXT_COMMON_TEXT]); break; case ATTRIBUTE_STATE_TEXT_STYLE: assert(cb_item_combo != NULL); --
[EGIT] [tools/eflete] eflete-1.18 24/31: menu: add react to ESC for menu
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=de2bcf79e636553befbe8326ec9e350a94510504
commit de2bcf79e636553befbe8326ec9e350a94510504
Author: Vyacheslav Reutskiy
Date: Mon Feb 13 12:40:26 2017 +0200
menu: add react to ESC for menu
This is make posible to hide menu by Esc
Fixes T5155
@fix
Change-Id: Ie06f361e30b70cba1e7400643ce870f94c55a298
Conflicts:
src/bin/ui/image_manager.c
---
src/bin/ui/sound_manager.c | 21 +
src/bin/ui/style_manager.c | 21 +
2 files changed, 42 insertions(+)
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index e5018e0..4232759 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -26,6 +26,7 @@
#include "config.h"
#include "validator.h"
#include "sound_player.h"
+#include "shortcuts.h"
#ifndef HAVE_TIZEN
#define ITEM_WIDTH 100
@@ -325,6 +326,23 @@ _sample_add_cb(void *data,
}
static void
+_menu_dismissed_cb(void *data __UNUSED__,
+ Evas_Object *obj,
+ void *event_info __UNUSED__)
+{
+ shortcuts_object_check_pop(obj);
+}
+
+static void
+_menu_dismiss_cb(void *data __UNUSED__,
+ Evas_Object *obj,
+ void *event_info __UNUSED__)
+{
+ elm_menu_close(obj);
+ shortcuts_object_check_pop(obj);
+}
+
+static void
_validation(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
@@ -441,6 +459,7 @@ _sound_add_cb(void *data __UNUSED__,
elm_menu_move(mng.menu, x, y + h);
evas_object_show(mng.menu);
+ shortcuts_object_push(mng.menu);
}
static void
@@ -653,6 +672,8 @@ sound_manager_add(void)
mng.menu = elm_menu_add(ap.win);
elm_menu_item_add(mng.menu, NULL, "sound_sample", _("Sample"),
_sample_add_cb, NULL);
elm_menu_item_add(mng.menu, NULL, "sound_tone", _("Tone"), _tone_add_cb,
NULL);
+ evas_object_smart_callback_add(mng.menu, "dismissed", _menu_dismissed_cb,
NULL);
+ evas_object_smart_callback_add(mng.menu, signals.shortcut.popup.cancel,
_menu_dismiss_cb, NULL);
ENTRY_ADD(mng.layout, search_entry, true);
elm_object_part_text_set(search_entry, "guide", _("Search"));
diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c
index c882354..dab8058 100644
--- a/src/bin/ui/style_manager.c
+++ b/src/bin/ui/style_manager.c
@@ -24,6 +24,7 @@
#include "project_manager.h"
#include "validator.h"
#include "modal_window.h"
+#include "shortcuts.h"
#define STYLE_DEFAULT "DEFAULT"
#define STYLE_DEFAULT_VALUE "align=middle font=Sans font_size=24 color=#00
"
@@ -251,6 +252,23 @@ _add_tag_content_get(void *data __UNUSED__, Evas_Object
*popup, Evas_Object **to
return item;
}
+static void
+_menu_dismissed_cb(void *data __UNUSED__,
+ Evas_Object *obj,
+ void *event_info __UNUSED__)
+{
+ shortcuts_object_check_pop(obj);
+}
+
+static void
+_menu_dismiss_cb(void *data __UNUSED__,
+ Evas_Object *obj,
+ void *event_info __UNUSED__)
+{
+ elm_menu_close(obj);
+ shortcuts_object_check_pop(obj);
+}
+
typedef struct {
Eina_Stringshare *style_name, *tag_name;
Elm_Object_Item *glit, *glit_parent;
@@ -679,6 +697,7 @@ _btn_add_cb(void *data __UNUSED__,
evas_object_geometry_get(obj, &x, &y, NULL, &h);
elm_menu_move(mng.menu, x, y + h);
evas_object_show(mng.menu);
+ shortcuts_object_push(mng.menu);
if (elm_genlist_selected_item_get(mng.genlist))
elm_object_item_disabled_set(mng.menu_tag, false);
@@ -901,6 +920,8 @@ style_manager_add()
mng.menu = elm_menu_add(ap.win);
elm_menu_item_add(mng.menu, NULL, "text_style", _("Style"), _style_add_cb,
NULL);
mng.menu_tag = elm_menu_item_add(mng.menu, NULL, "text_style_tag",
_("Tag"), _tag_add_cb, NULL);
+ evas_object_smart_callback_add(mng.menu, "dismissed", _menu_dismissed_cb,
NULL);
+ evas_object_smart_callback_add(mng.menu, signals.shortcut.popup.cancel,
_menu_dismiss_cb, NULL);
button_add = elm_button_add(ap.win);
elm_object_style_set(button_add, "plus_managers");
--
[EGIT] [tools/eflete] eflete-1.18 31/31: project_navigator: disable button '-' if top item 'Groups' is selected
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=8aca80a07434f1fbcb7a2b6732ec80d84a19d828
commit 8aca80a07434f1fbcb7a2b6732ec80d84a19d828
Author: Vyacheslav Reutskiy
Date: Thu Feb 23 09:51:58 2017 +0200
project_navigator: disable button '-' if top item 'Groups' is selected
@fix
Change-Id: Icc0f0e8133d75e72a203421c39c8adefc2dd2d49
---
src/bin/ui/project_navigator.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index d02ba7b..df6ed99 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -692,8 +692,11 @@ _btn_del_group_cb(void *data __UNUSED__,
static void
_selected_cb(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
- void *event_info __UNUSED__)
+ void *event_info)
{
+ const Elm_Object_Item *it = event_info;
+
+ if (it == project_navigator.item_top) return;
elm_object_disabled_set(project_navigator.btn_del, false);
}
--
[EGIT] [tools/eflete] eflete-1.18 17/31: project_navigator: made correct display groups like '////'
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=e626e1fd90aa9501450d49c8d035941cabbe708e
commit e626e1fd90aa9501450d49c8d035941cabbe708e
Author: Vyacheslav Reutskiy
Date: Mon Feb 6 13:06:22 2017 +0200
project_navigator: made correct display groups like ''
Fixes T4674
@fix
Change-Id: Ic6d726b8a166da017b01994f1eb8cd51ddbfefce
---
src/bin/common/widget_list.c | 22 +-
src/bin/project_manager/resource_manager.h | 4
src/bin/ui/project_navigator.c | 3 +++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/src/bin/common/widget_list.c b/src/bin/common/widget_list.c
index b29018a..460a7bc 100644
--- a/src/bin/common/widget_list.c
+++ b/src/bin/common/widget_list.c
@@ -310,6 +310,7 @@ widget_tree_items_get(Eina_List *groups,
Eina_Stringshare *group_prefix;
int group_prefix_len;
Eina_List *l, *lnext;
+ Eina_Bool broken_tree;
assert(prefix != NULL);
assert(folders_out != NULL);
@@ -323,6 +324,8 @@ widget_tree_items_get(Eina_List *groups,
EINA_LIST_FOREACH(groups, l, group)
{
+group->display_name = NULL;
+broken_tree = false;
cmp = strncmp(group->name, prefix, prefix_len);
/* skipping all groups with different prefix */
if (cmp < 0)
@@ -338,9 +341,24 @@ widget_tree_items_get(Eina_List *groups,
}
group_prefix = widget_prefix_get(group->name, level,
&group_prefix_len);
+
+/* chech the item to correctness before to add to the tree */
if (group_prefix)
{
- *folders_out= eina_list_append(*folders_out,
eina_stringshare_ref(group_prefix));
+ /* if prefix '/' - it's posible only if groups name starts from
+ * symbol '/' */
+ if ((group_prefix_len == 1) && (group_prefix[0] == '/'))
+ broken_tree = true;
+
+ /* case if group name have successaively two and more '/' symbols
*/
+ if ((group_prefix[group_prefix_len - 1] == '/') &&
+ (group_prefix[group_prefix_len - 2] == '/'))
+ broken_tree = true;
+ }
+
+if (group_prefix && !broken_tree)
+ {
+ *folders_out= eina_list_append(*folders_out,
eina_stringshare_add(group_prefix));
/* skipping other groups from the same "folder" */
lnext = l;
@@ -355,6 +373,8 @@ widget_tree_items_get(Eina_List *groups,
}
else
{
+ if (broken_tree)
+ group->display_name = group->name + group_prefix_len - 1;
*groups_out = eina_list_append(*groups_out, group);
}
eina_stringshare_del(group_prefix);
diff --git a/src/bin/project_manager/resource_manager.h
b/src/bin/project_manager/resource_manager.h
index 38cb4e4..c847104 100644
--- a/src/bin/project_manager/resource_manager.h
+++ b/src/bin/project_manager/resource_manager.h
@@ -125,6 +125,10 @@ struct _Group
Evas_Object *edit_object; /**< object needed to access group with
edje_edit functions. Should be NULL if group is not open */
Resource *current_selected;
+ const char *display_name; /**< display name for project navi. @note don't
+ free this member, because it's a slice of
+ full group name (common.name) **/
+
History *history; /**< history of changes in the group */
};
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 47b2c04..b8af9f1 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -66,6 +66,9 @@ _group_item_label_get(void *data,
const char *pos;
Group *group = data;
+ if (group->display_name)
+ return strdup(group->display_name);
+
pos = strrchr(group->name, '/');
if (pos) return strdup(pos + 1);
else return strdup(group->name);
--
[EGIT] [tools/eflete] eflete-1.18 22/31: tabs: make check workspace on attribute changes not aggressive
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=ecd7df8da245ead4a0e9eb6ae99c50b56ec7d38f
commit ecd7df8da245ead4a0e9eb6ae99c50b56ec7d38f
Author: Vyacheslav Reutskiy
Date: Wed Feb 22 16:29:09 2017 +0200
tabs: make check workspace on attribute changes not aggressive
@fix
---
src/bin/ui/tabs.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index c224343..1e15509 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -212,7 +212,9 @@ _property_attribute_changed(void *data __UNUSED__,
{
Attribute *attr = event_info;
- assert(tabs.current_workspace != NULL);
+ /* for example when image is deleted from image manager */
+ if (!tabs.current_workspace)
+ return;
switch ((int)*attr)
{
--
[EGIT] [tools/eflete] eflete-1.18 09/31: image_manager: fix wrong API usage
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=b1eb14b24132c26e07d4804303daf27d1d905716
commit b1eb14b24132c26e07d4804303daf27d1d905716
Author: Vyacheslav Reutskiy
Date: Thu Feb 2 17:39:52 2017 +0200
image_manager: fix wrong API usage
I think this was a copy/past mistake. The image preview is elm_image,
but the images in the grid are thumnails.
So for preview need use elm_image* for image in grid elm_thumb APIs
@fix
Change-Id: Id0886efb078fb4b764b3d0cf5ef67be087796a96
---
src/bin/ui/image_manager.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c
index f202f4b..68d6427 100644
--- a/src/bin/ui/image_manager.c
+++ b/src/bin/ui/image_manager.c
@@ -88,13 +88,13 @@ _image_manager_image_setup(Evas_Object *image,
if (it->comp_type == EDJE_EDIT_IMAGE_COMP_USER)
{
if (ecore_file_exists(it->source))
- elm_thumb_file_set(image, it->source, NULL);
+ elm_image_file_set(image, it->source, NULL);
else
- elm_thumb_file_set(image, ap.path.theme_edj,
"elm/image/icon/attention");
+ elm_image_file_set(image, ap.path.theme_edj,
"elm/image/icon/attention");
}
else
{
-elm_thumb_file_set(image, it->source, NULL);
+elm_image_file_set(image, it->source, NULL);
}
}
--
[EGIT] [tools/eflete] eflete-1.18 27/31: color class manager: fix popup style usage
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=96b5a432bd5c47865a92ddb75cba5be1730b8b66
commit 96b5a432bd5c47865a92ddb75cba5be1730b8b66
Author: Vyacheslav Reutskiy
Date: Fri Feb 17 09:31:37 2017 +0200
color class manager: fix popup style usage
@fix
Change-Id: Ib80f6adc6d0f29ec9be1b6bbcefb1c20e77dc38c
---
src/bin/ui/colorclass_manager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index 9d82c05..a1401db 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -84,7 +84,7 @@ _add_colorclass_content_get(void *data __UNUSED__,
Evas_Object *popup, Evas_Obje
{
Evas_Object *item = NULL;
- LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "property", "1swallow")
+ LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "popup", "1swallow")
ENTRY_ADD(item, mng.entry, true);
eo_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, mng.name_validator);
evas_object_smart_callback_add(mng.entry, signals.elm.entry.changed,
_validation, popup);
--
[EGIT] [tools/eflete] eflete-1.18 01/31: project_navigator: add top item 'Groups'
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=e2800ccd5df5f22f8c4be5ed10f3810e11e5c4cb
commit e2800ccd5df5f22f8c4be5ed10f3810e11e5c4cb
Author: Vyacheslav Reutskiy
Date: Wed Feb 22 12:02:16 2017 +0200
project_navigator: add top item 'Groups'
This item is a preparetion for extend list of data in project navigator.
Now project navi does not show 'data' items, top level data. For
feature implement new functional, need to separate groups from other
data in project navi.
Change-Id: I12a7a38a87f6ee72ecb5bf086079dd0d59bd111d
---
src/bin/ui/project_navigator.c | 59 --
1 file changed, 39 insertions(+), 20 deletions(-)
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 4eeb91a..86fcfaa 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -40,6 +40,7 @@ typedef struct
Evas_Object *btn_del;
Elm_Genlist_Item_Class *itc_group;
Elm_Genlist_Item_Class *itc_folder;
+ Elm_Object_Item *item_top;
} Project_Navigator;
typedef struct
@@ -196,7 +197,11 @@ _expanded_cb(void *data __UNUSED__,
Elm_Object_Item *glit = event_info;
Eina_Stringshare *prefix = elm_object_item_data_get(glit);
- widget_tree_items_get(ap.project->groups, prefix, &folders, &groups);
+ if (glit == project_navigator.item_top)
+ widget_tree_items_get(ap.project->groups, "", &folders, &groups);
+ else
+ widget_tree_items_get(ap.project->groups, prefix, &folders, &groups);
+
EINA_LIST_FREE(folders, prefix)
{
elm_genlist_item_append(project_navigator.genlist,
@@ -299,34 +304,38 @@ _group_add(void *data __UNUSED__,
Group *group;
Elm_Object_Item *item, *parent = NULL;
char **arr;
- unsigned int count, i;
+ unsigned int count, i = 0;
Eina_Stringshare *prefix;
group = (Group *)event_info;
item = elm_genlist_first_item_get(project_navigator.genlist);
arr = eina_str_split_full(group->name, "/", 0, &count);
- for (i = 0; i < count; i++)
+ if (count > 1)
{
-parent = elm_genlist_item_parent_get(item);
-item = _find_item(item, arr[i]);
-if (!item) break;
-if (elm_genlist_item_item_class_get(item) !=
project_navigator.itc_folder) break;
-if (!elm_genlist_item_expanded_get(item)) goto exit;
-item = eina_list_data_get(elm_genlist_item_subitems_get(item));
+for (i = 0; i < count; i++)
+ {
+ parent = elm_genlist_item_parent_get(item);
+ item = _find_item(item, arr[i]);
+ if (!item) break;
+ if (elm_genlist_item_item_class_get(item) !=
project_navigator.itc_folder) break;
+ if (!elm_genlist_item_expanded_get(item)) goto exit;
+ item = eina_list_data_get(elm_genlist_item_subitems_get(item));
+ }
}
+ if (!parent) parent = project_navigator.item_top;
- if (i != count - 1)
+ if ((count > 1) && (i != count - 1))
{
prefix = widget_prefix_get(group->name, i, NULL);
-elm_genlist_item_sorted_insert(project_navigator.genlist,
- project_navigator.itc_folder,
- prefix,
- parent,
- ELM_GENLIST_ITEM_TREE,
- _items_compare,
- NULL,
- NULL);
+item = elm_genlist_item_sorted_insert(project_navigator.genlist,
+ project_navigator.itc_folder,
+ prefix,
+ parent,
+ ELM_GENLIST_ITEM_TREE,
+ _items_compare,
+ NULL,
+ NULL);
}
else
elm_genlist_item_sorted_insert(project_navigator.genlist,
@@ -797,12 +806,22 @@ project_navigator_project_set(void)
elm_object_text_set(project_navigator.layout, ap.project->name);
widget_tree_items_get(ap.project->groups, "", &folders, &groups);
+ project_navigator.item_top =
elm_genlist_item_append(project_navigator.genlist,
+
project_navigator.itc_folder,
+
eina_stringshare_add("Groups"),
+NULL,
+ELM_GENLIST_ITEM_TREE,
+NULL,
+
