[EGIT] [core/elementary] master 01/01: Gengrid: Modified to handle the focus highlight on unrealized items
jaehwan pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=cb5ca38f15189c02de60e9569591756268ba9976
commit cb5ca38f15189c02de60e9569591756268ba9976
Author: Jaehwan Kim jae.hwan@samsung.com
Date: Mon Mar 30 15:57:36 2015 +0900
Gengrid: Modified to handle the focus highlight on unrealized items
This commit is related to 260cdd6150d567fcee8d1afaf690e4b90cd16a2b.
When unrealized item is focused, edje object is not exist,
so genlist cannot read the focus highlight information from edje object.
Therefore, when the item is realized, check the item is focused or not and
need to update focus highlight.
---
src/lib/elm_gengrid.c | 11 +++
1 file changed, 11 insertions(+)
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 35cb007..b3b7449 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1016,6 +1016,17 @@ _item_realize(Elm_Gen_Item *it)
if (eo_it == sd-focused_item)
{
+const char *focus_raise;
+if (elm_widget_focus_highlight_enabled_get(WIDGET(it)))
+ {
+ edje_object_signal_emit
+(VIEW(it), elm,state,focused, elm);
+ }
+
+focus_raise = edje_object_data_get(VIEW(it), focusraise);
+if ((focus_raise) (!strcmp(focus_raise, on)))
+ evas_object_raise(VIEW(it));
+
_elm_widget_item_highlight_in_theme(WIDGET(it), EO_OBJ(it));
_elm_widget_highlight_in_theme_update(WIDGET(it));
_elm_widget_focus_highlight_start(WIDGET(it));
--
[EGIT] [tools/erigo] master 01/01: Update test data
yakov pushed a commit to branch master. http://git.enlightenment.org/tools/erigo.git/commit/?id=173eed84d25399b769fa8aa446ccdb356d445dda commit 173eed84d25399b769fa8aa446ccdb356d445dda Author: Yakov Goldberg yako...@samsung.com Date: Mon Mar 30 11:28:02 2015 +0300 Update test data --- src/tests/data/demo.c.ref | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/tests/data/demo.c.ref b/src/tests/data/demo.c.ref index e7b7efa..673ca49 100644 --- a/src/tests/data/demo.c.ref +++ b/src/tests/data/demo.c.ref @@ -736,29 +736,29 @@ egui_layout_main_win_create(Eo *__main_parent) eo_do(toolbar, evas_obj_size_hint_weight_set(0.00, 0.00)); eo_do(toolbar, evas_obj_size_hint_align_set(-1.00, 0.00)); eo_do(toolbar, evas_obj_visibility_set(EINA_TRUE)); - toolbar_project_it = eo_do(toolbar, elm_obj_toolbar_item_append(folder-open, Project, NULL, NULL)); + eo_do(toolbar, toolbar_project_it = elm_obj_toolbar_item_append(folder-open, Project, NULL, NULL)); pub_widgets-toolbar_project_it = toolbar_project_it; - toolbar_separator1_it = eo_do(toolbar, elm_obj_toolbar_item_append(NULL, NULL, NULL, NULL)); + eo_do(toolbar, toolbar_separator1_it = elm_obj_toolbar_item_append(NULL, NULL, NULL, NULL)); pub_widgets-toolbar_separator1_it = toolbar_separator1_it; - toolbar_rm_it = eo_do(toolbar, elm_obj_toolbar_item_append(emblem-web, Resource manager, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); + eo_do(toolbar, toolbar_rm_it = elm_obj_toolbar_item_append(emblem-web, Resource manager, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); pub_widgets-toolbar_rm_it = toolbar_rm_it; - toolbar_settings_it = eo_do(toolbar, elm_obj_toolbar_item_append(preferences-system, Settings, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); + eo_do(toolbar, toolbar_settings_it = elm_obj_toolbar_item_append(preferences-system, Settings, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); pub_widgets-toolbar_settings_it = toolbar_settings_it; - toolbar_separator2_it = eo_do(toolbar, elm_obj_toolbar_item_append(NULL, NULL, NULL, NULL)); + eo_do(toolbar, toolbar_separator2_it = elm_obj_toolbar_item_append(NULL, NULL, NULL, NULL)); pub_widgets-toolbar_separator2_it = toolbar_separator2_it; - toolbar_undo_it = eo_do(toolbar, elm_obj_toolbar_item_append(edit-undo, Undo, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); + eo_do(toolbar, toolbar_undo_it = elm_obj_toolbar_item_append(edit-undo, Undo, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); pub_widgets-toolbar_undo_it = toolbar_undo_it; - toolbar_redo_it = eo_do(toolbar, elm_obj_toolbar_item_append(edit-redo, Redo, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); + eo_do(toolbar, toolbar_redo_it = elm_obj_toolbar_item_append(edit-redo, Redo, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); pub_widgets-toolbar_redo_it = toolbar_redo_it; - toolbar_reload_it = eo_do(toolbar, elm_obj_toolbar_item_append(view-refresh, Reload context, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); + eo_do(toolbar, toolbar_reload_it = elm_obj_toolbar_item_append(view-refresh, Reload context, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); pub_widgets-toolbar_reload_it = toolbar_reload_it; - toolbar_delete_it = eo_do(toolbar, elm_obj_toolbar_item_append(edit-delete, Delete widget, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); + eo_do(toolbar, toolbar_delete_it = elm_obj_toolbar_item_append(edit-delete, Delete widget, (Evas_Smart_Cb) _toolbar_item_sel_cb, NULL)); pub_widgets-toolbar_delete_it = toolbar_delete_it; - toolbar_view_it = eo_do(toolbar, elm_obj_toolbar_item_append(view-restore, View, NULL, NULL)); + eo_do(toolbar, toolbar_view_it = elm_obj_toolbar_item_append(view-restore, View, NULL, NULL)); pub_widgets-toolbar_view_it = toolbar_view_it; - toolbar_simulate_it = eo_do(toolbar, elm_obj_toolbar_item_append(system-run, Simulate, NULL, NULL)); + eo_do(toolbar, toolbar_simulate_it = elm_obj_toolbar_item_append(system-run, Simulate, NULL, NULL)); pub_widgets-toolbar_simulate_it = toolbar_simulate_it; - toolbar_graph_it = eo_do(toolbar, elm_obj_toolbar_item_append(media-playlist-repeat, Graph, (Evas_Smart_Cb) _graphviz_button_clicked_cb, NULL)); + eo_do(toolbar, toolbar_graph_it = elm_obj_toolbar_item_append(media-playlist-repeat, Graph, (Evas_Smart_Cb) _graphviz_button_clicked_cb, NULL)); pub_widgets-toolbar_graph_it = toolbar_graph_it; hor_box = eo_add(ELM_BOX_CLASS, main_win); eo_do(hor_box, elm_obj_box_horizontal_set(EINA_TRUE)); @@ -1254,13 +1254,13 @@ egui_layout_main_win_create(Eo *__main_parent) eo_do(propsview_toolbar, evas_obj_size_hint_weight_set(1.00, 0.00)); eo_do(propsview_toolbar, evas_obj_size_hint_align_set(-1.00, 0.00)); eo_do(propsview_toolbar, evas_obj_visibility_set(EINA_TRUE)); - propsview_toolbar_desc_it = eo_do(propsview_toolbar, elm_obj_toolbar_item_append(fonts, Description,
[EGIT] [tools/erigo] master 01/01: Split factory into sections by widget types
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=622e57ff34a316b436203c64efc994d40fac5512
commit 622e57ff34a316b436203c64efc994d40fac5512
Author: Yakov Goldberg yako...@samsung.com
Date: Sun Mar 29 16:54:50 2015 +0300
Split factory into sections by widget types
---
src/bin/egui_gui/egui_layout.json | 358 --
src/bin/egui_gui/egui_logic.c | 196 +++--
src/lib/database.h| 1 +
3 files changed, 411 insertions(+), 144 deletions(-)
diff --git a/src/bin/egui_gui/egui_layout.json
b/src/bin/egui_gui/egui_layout.json
index bb269dc..8692876 100644
--- a/src/bin/egui_gui/egui_layout.json
+++ b/src/bin/egui_gui/egui_layout.json
@@ -1085,7 +1085,47 @@
Evas.Object.size_hint_align:[-1, 0],
Evas.Object.visibility:[true]
},
- Contains:[fctr_table]
+ Contains:[fctr_table_sep_0, fctr_table_label_1,
fctr_table_sep_1, fctr_table, fctr_table_sep_2,fctr_table_label_2,
fctr_table_sep_3, fctr_table_containers, fctr_table_sep_4,
fctr_table_label_3, fctr_table_sep_5,fctr_table_item_widgets,
fctr_table_sep_6, fctr_table_label_4, fctr_table_sep_7, fctr_table_evas]
+},
+fctr_table_sep_0:
+{
+ Desc:
+ {
+parent:fctr_scroll_box,
+class:Elm_Separator
+ },
+ Properties:
+ {
+Elm_Separator.horizontal:[true],
+Evas.Object.visibility:[true]
+ }
+},
+fctr_table_label_1:
+{
+ Desc:
+ {
+parent:fctr_scroll_box,
+class:Elm_Label
+ },
+ Properties:
+ {
+Evas.Object.size_hint_align:[0.05, 0],
+Elm_Widget.part_text:[null, Widgets],
+Evas.Object.visibility:[true]
+ }
+},
+fctr_table_sep_1:
+{
+ Desc:
+ {
+parent:fctr_scroll_box,
+class:Elm_Separator
+ },
+ Properties:
+ {
+Elm_Separator.horizontal:[true],
+Evas.Object.visibility:[true]
+ }
},
fctr_table:
{
@@ -1105,40 +1145,214 @@
{
fctr_win_it:[0, 0, 1, 1],
fctr_bg_it:[0, 1, 1, 1],
-fctr_box_it:[0, 2, 1, 1],
-fctr_button_it:[0, 3, 1, 1],
-fctr_label_it:[0, 4, 1, 1],
-fctr_check_it:[0, 5, 1, 1],
-fctr_radio_it:[0, 6, 1, 1],
-fctr_icon_it:[0, 7, 1, 1],
-fctr_image_it:[0, 8, 1, 1],
-fctr_actionslider_it:[0, 9, 1, 1],
-fctr_clock_it:[0, 10, 1, 1],
-fctr_dayselector_it:[0, 11, 1, 1],
-fctr_calendar_it:[0, 12, 1, 1],
-fctr_bubble_it:[0, 13, 1, 1],
-fctr_colorselector_it:[0, 14, 1, 1],
-fctr_entry_it:[0, 15, 1, 1],
-fctr_flip_it:[0, 16, 1, 1],
-fctr_genlist_it:[0, 17, 1, 1],
-fctr_gengrid_it:[0, 18, 1, 1],
-fctr_table_it:[0, 19, 1, 1],
-fctr_menu_it:[0, 20, 1, 1],
-fctr_diskselector_it:[0, 21, 1, 1],
-fctr_ctxpopup_it:[0, 22, 1, 1],
-fctr_toolbar_it:[0, 23, 1, 1],
-fctr_layout_it:[0, 24, 1, 1],
-fctr_naviframe_it:[0, 25, 1, 1],
-fctr_separator_it:[0, 26, 1, 1],
-fctr_frame_it:[0, 27, 1, 1],
-fctr_evas_image_it:[0, 28, 1, 1],
-fctr_fileselector_it:[0, 29, 1, 1],
-fctr_fileselector_entry_it:[0, 30, 1, 1],
-fctr_fileselector_button_it:[0, 31, 1, 1],
-fctr_slider_it:[0, 32, 1, 1],
-fctr_progressbar_it:[0, 33, 1, 1],
-fctr_panes_it:[0, 34, 1, 1],
-fctr_conformant_it:[0, 35, 1, 1]
+fctr_button_it:[0, 2, 1, 1],
+fctr_label_it:[0, 3, 1, 1],
+fctr_check_it:[0, 4, 1, 1],
+fctr_radio_it:[0, 5, 1, 1],
+fctr_icon_it:[0, 6, 1, 1],
+fctr_image_it:[0, 7, 1, 1],
+fctr_actionslider_it:[0, 8, 1, 1],
+fctr_clock_it:[0, 9, 1, 1],
+fctr_dayselector_it:[0, 10, 1, 1],
+fctr_calendar_it:[0, 11, 1, 1],
+fctr_bubble_it:[0, 12, 1, 1],
+fctr_colorselector_it:[0, 13, 1, 1],
+fctr_entry_it:[0, 14, 1, 1],
+fctr_flip_it:[0, 15, 1, 1],
+fctr_separator_it:[0, 16, 1, 1],
+fctr_frame_it:[0, 17, 1, 1],
+fctr_fileselector_it:[0, 18, 1, 1],
+fctr_fileselector_entry_it:[0, 19, 1, 1],
+fctr_fileselector_button_it:[0, 20, 1, 1],
+fctr_slider_it:[0, 21, 1, 1],
+fctr_progressbar_it:[0, 22, 1, 1]
+ }
+},
+fctr_table_sep_2:
+{
+ Desc:
+ {
+parent:fctr_scroll_box,
+class:Elm_Separator
+ },
+ Properties:
+ {
+Elm_Separator.horizontal:[true],
+Evas.Object.visibility:[true]
+ }
+},
+fctr_table_label_2:
+{
+ Desc:
+ {
+parent:fctr_scroll_box,
+class:Elm_Label
+ },
+ Properties:
+ {
+Evas.Object.size_hint_align:[0.05, 0],
+Elm_Widget.part_text:[null, Containers],
+Evas.Object.visibility:[true]
+ }
+},
+fctr_table_sep_3:
+{
Re: [E-devel] e_comp_wl can't save surface information before e_client is created
I modified some part of patch and submitted path https://phab.enlightenment.org/D2257 On 03/27/2015 05:09 PM, Boram Park wrote: e_client is created when wl_subcompositor.get_subsurface is called. I guess wl_surface is only thing we need to consider. And wl_surface.commit request also need to be accepted before e_client is created. On 03/27/2015 04:41 PM, Boram Park wrote: Hi I'm testing wayland protocol with e. And I found a problem with e_comp_wl. As I mentioned on the subject of this email, all wl_surface and wl_subsurface's requests are ignored until e_client is created. Is it intended behavior or a bug? It looks bug to me. In case of weston, weston_surface surface request data. And, weston_surface is created when wl_compositor.create_surface is called. It makes possible all data is safe. However, because enlightenment creates e_clientat some points after create_surface is called, it loses client's requests. looks e_client is not proper position to save surface request data. Of course, enlightenment is different with weston. But I think losing(ignoring) client request is problem obviously, isn't it? In _e_comp_wl_compositor_cb_surface_create(), enlightenment creates e_pixmap. Can we move surface request data from E_Client(E_Comp_Wl_Client_Data, actually) to E_Pixmap? I'm attaching my patch to help you understand what I am thinking. This patch only considers wl_surface's requests as example. Maybe we need to consider wl_subsurface's requests and more things. And also, to help you understand this problem, you can find a bug by following below steps. 1) run enlightenment as wayland server. 2) run weston-flower 3) move cursor over weston-flower result: no cursor image shown. It disappears. If you move cursor outside of weston-flower and move it over weston-flower again, now you can see cursor. (There is another problem here, cursor doesn't move) Regards Boram -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: ecore_drm: use get_vt instead of parsing the tty attribute
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=94299e2bfd01cd7c0058cd628e9764edffe2ebee
commit 94299e2bfd01cd7c0058cd628e9764edffe2ebee
Author: Marcel Hollerbach marcel-hollerb...@t-online.de
Date: Mon Mar 30 10:31:56 2015 -0400
ecore_drm: use get_vt instead of parsing the tty attribute
Summary: logind has a seperate function to get the vt number.
@fix
Reviewers: devilhorns
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2252
---
src/lib/ecore_drm/ecore_drm_logind.c | 16 ++--
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_logind.c
b/src/lib/ecore_drm/ecore_drm_logind.c
index c590cf1..d45ded7 100644
--- a/src/lib/ecore_drm/ecore_drm_logind.c
+++ b/src/lib/ecore_drm/ecore_drm_logind.c
@@ -12,27 +12,15 @@ static inline Eina_Bool
_ecore_drm_logind_vt_get(Ecore_Drm_Device *dev)
{
int ret;
- char *tty, *p;
- ret = sd_session_get_tty(dev-session, tty);
+ ret = sd_session_get_vt(dev-session, dev-vt);
if (ret 0)
{
ERR(Could not get systemd tty: %m);
return EINA_FALSE;
}
- p = strchr(tty, 't');
- dev-vt = UINT_MAX;
- if (p)
- {
-while (p[0] (!isdigit(p[0])))
- p++;
-if (p[0])
- dev-vt = strtoul(p, NULL, 10);
- }
- free(tty);
-
- return dev-vt != UINT_MAX;
+ return EINA_TRUE;
}
#endif
--
[EGIT] [core/enlightenment] master 01/01: remove useless wl comp code for shape exports
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=73abc46c6161d4808db68e93ac060eb8a3b8b849
commit 73abc46c6161d4808db68e93ac060eb8a3b8b849
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Mar 30 11:07:29 2015 -0400
remove useless wl comp code for shape exports
---
src/bin/e_comp_wl.c | 18 --
1 file changed, 18 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 9be9493..273796f 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2082,22 +2082,6 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED,
E_Client *ec)
}
static void
-_e_comp_wl_client_cb_post_new(void *data EINA_UNUSED, E_Client *ec)
-{
- if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return;
- if (e_object_is_del(E_OBJECT(ec))) return;
-
- ec-need_shape_merge = EINA_FALSE;
-
- if (ec-need_shape_export)
- {
-//ec-shape_changed = EINA_TRUE;
-e_comp_shape_queue();
-ec-need_shape_export = EINA_FALSE;
- }
-}
-
-static void
_e_comp_wl_client_cb_pre_frame(void *data EINA_UNUSED, E_Client *ec)
{
uint64_t parent;
@@ -2559,8 +2543,6 @@ e_comp_wl_init(void)
e_client_hook_add(E_CLIENT_HOOK_NEW_CLIENT, _e_comp_wl_client_cb_new, NULL);
e_client_hook_add(E_CLIENT_HOOK_DEL, _e_comp_wl_client_cb_del, NULL);
- e_client_hook_add(E_CLIENT_HOOK_EVAL_POST_NEW_CLIENT,
- _e_comp_wl_client_cb_post_new, NULL);
/* e_client_hook_add(E_CLIENT_HOOK_EVAL_PRE_FRAME_ASSIGN, */
/* _e_comp_wl_client_cb_pre_frame, NULL); */
--
[EGIT] [core/enlightenment] master 01/01: make only critical notifications display in presentation mode
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=d2d70fc013dbef6c21ffd5e4eb340a6f14bccf1e
commit d2d70fc013dbef6c21ffd5e4eb340a6f14bccf1e
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Mar 30 12:21:14 2015 -0400
make only critical notifications display in presentation mode
ref T2212
---
src/modules/notification/e_mod_popup.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/modules/notification/e_mod_popup.c
b/src/modules/notification/e_mod_popup.c
index db4f899..5eca724 100644
--- a/src/modules/notification/e_mod_popup.c
+++ b/src/modules/notification/e_mod_popup.c
@@ -129,9 +129,11 @@ notification_popup_notify(E_Notification_Notify *n,
{
case E_NOTIFICATION_NOTIFY_URGENCY_LOW:
if (!notification_cfg-show_low) return;
+if (e_config-mode.presentation) return;
break;
case E_NOTIFICATION_NOTIFY_URGENCY_NORMAL:
if (!notification_cfg-show_normal) return;
+if (e_config-mode.presentation) return;
break;
case E_NOTIFICATION_NOTIFY_URGENCY_CRITICAL:
if (!notification_cfg-show_critical) return;
--
[EGIT] [apps/terminology] master 01/01: Revert fix colors and show darkgray. Closes T2245
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=709a55889f03d6da9de7e9310b6148c8996ee0f1
commit 709a55889f03d6da9de7e9310b6148c8996ee0f1
Author: Boris Faure bill...@gmail.com
Date: Mon Mar 30 20:47:35 2015 +0200
Revert fix colors and show darkgray. Closes T2245
This reverts commit 834ee015327d0730de4272210bb5f655912141a6.
---
src/bin/col.c | 18 --
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/bin/col.c b/src/bin/col.c
index 65fc6ca..003847c 100644
--- a/src/bin/col.c
+++ b/src/bin/col.c
@@ -389,7 +389,7 @@ colors_term_init(Evas_Object *textgrid, Evas_Object *bg,
Config *config)
for (c = 0; c (4 * 12); c++)
{
-n = c;
+n = c + (24 * (c / 24));
if (config-colors_use)
{
r = config-colors[c].r;
@@ -421,19 +421,9 @@ colors_term_init(Evas_Object *textgrid, Evas_Object *bg,
Config *config)
r, g, b, a);
/* faint */
-if ((n == 1) (r == 0) (g == 0) (b == 0))
- {
- /* dark gray */
- evas_object_textgrid_palette_set(
-textgrid, EVAS_TEXTGRID_PALETTE_STANDARD, n + 48,
-127, 127, 127, 127);
- }
-else
- {
- evas_object_textgrid_palette_set(
-textgrid, EVAS_TEXTGRID_PALETTE_STANDARD, n + 48,
-r / 2, g / 2, b / 2, a / 2);
- }
+evas_object_textgrid_palette_set(
+ textgrid, EVAS_TEXTGRID_PALETTE_STANDARD, n + 24,
+ r / 2, g / 2, b / 2, a / 2);
}
for (c = 0; c 256; c++)
{
--
[EGIT] [core/elementary] elementary-1.7 01/01: Updating catalan translation
maxerba pushed a commit to branch elementary-1.7. http://git.enlightenment.org/core/elementary.git/commit/?id=2648ffea5d765a7fbc6b8bbf158ace31ab0fe633 commit 2648ffea5d765a7fbc6b8bbf158ace31ab0fe633 Author: maxerba maiur...@gmail.com Date: Mon Mar 30 21:29:28 2015 +0200 Updating catalan translation --- po/ca.po | 369 +-- 1 file changed, 217 insertions(+), 152 deletions(-) diff --git a/po/ca.po b/po/ca.po index 72a1180..d12a1cf 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,253 +6,318 @@ msgid msgstr Project-Id-Version: Elementary\n Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n -POT-Creation-Date: 2014-06-16 11:32+0200\n -PO-Revision-Date: 2014-06-18 10:35+\n +POT-Creation-Date: 2015-03-09 21:02+0100\n +PO-Revision-Date: 2015-03-10 06:34+\n Last-Translator: JoanColl Unknown\n Language-Team: Catalan\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -X-Launchpad-Export-Date: 2014-06-19 06:35+\n -X-Generator: Launchpad (build 17048)\n +X-Launchpad-Export-Date: 2015-03-11 05:42+\n +X-Generator: Launchpad (build 17389)\n Language: ca\n -#: src/lib/elc_fileselector.c:749 +#: src/lib/elc_fileselector.c:1449 msgid Up msgstr Amunt -#: src/lib/elc_fileselector.c:764 +#: src/lib/elc_fileselector.c:1464 msgid Home msgstr Carpeta personal -#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1413 +#: src/lib/elc_fileselector.c:1527 +msgid Search +msgstr Cerca + +#: src/lib/elc_fileselector.c:1693 src/lib/elm_entry.c:1487 +#: src/lib/elm_entry.c:1512 msgid Cancel msgstr Cancel·la -#: src/lib/elc_fileselector.c:1001 +#: src/lib/elc_fileselector.c:1702 msgid OK msgstr Accepta -#: src/lib/elm_button.c:55 +#: src/lib/elc_multibuttonentry.c:578 +msgid multi button entry label +msgstr etiqueta d'entrada múltiple + +#: src/lib/elc_multibuttonentry.c:600 +msgid multi button entry item +msgstr element entrada múltiple + +#: src/lib/elc_multibuttonentry.c:1446 +msgid multi button entry +msgstr entrada múltiple + +#: src/lib/elc_naviframe.c:431 +msgid Title +msgstr Títol + +#: src/lib/elc_naviframe.c:957 src/lib/elc_naviframe.c:1156 +msgid Back +msgstr Enrere + +#: src/lib/elc_naviframe.c:1249 +msgid Next +msgstr Següent + +#: src/lib/elc_popup.c:261 src/lib/elc_popup.c:860 +msgid Popup Title +msgstr Títol finestra emergent + +#: src/lib/elc_popup.c:271 src/lib/elc_popup.c:925 +msgid Popup Body Text +msgstr Text de la finestra emergent + +#: src/lib/elm_bubble.c:194 +msgid Bubble +msgstr Bombolla + +#: src/lib/elm_button.c:66 msgid Clicked msgstr Clicat -#: src/lib/elm_button.c:255 src/lib/elm_check.c:200 src/lib/elm_gengrid.c:618 -#: src/lib/elm_genlist.c:1287 src/lib/elm_list.c:1365 src/lib/elm_radio.c:241 -#: src/lib/elm_spinner.c:499 src/lib/elm_toolbar.c:1253 +#: src/lib/elm_button.c:270 src/lib/elm_check.c:234 src/lib/elm_gengrid.c:816 +#: src/lib/elm_genlist.c:1609 src/lib/elm_list.c:2180 src/lib/elm_radio.c:255 +#: src/lib/elm_segment_control.c:524 src/lib/elm_spinner.c:785 +#: src/lib/elm_toolbar.c:2224 msgid State: Disabled msgstr Estat: desactivat -#: src/lib/elm_button.c:279 +#: src/lib/elm_button.c:295 msgid Button msgstr Botó -#: src/lib/elm_calendar.c:132 +#: src/lib/elm_calendar.c:153 msgid %B %Y msgstr %B %Y -#: src/lib/elm_check.c:47 src/lib/elm_check.c:50 src/lib/elm_check.c:213 -#: src/lib/elm_radio.c:83 src/lib/elm_radio.c:242 +#: src/lib/elm_calendar.c:162 +msgid %B +msgstr %B + +#: src/lib/elm_calendar.c:171 +msgid %Y +msgstr %Y + +#: src/lib/elm_calendar.c:286 +msgid calendar item +msgstr element de calendari + +#: src/lib/elm_calendar.c:312 +msgid calendar decrement month button +msgstr botó decrement de mes + +#: src/lib/elm_calendar.c:317 +msgid calendar decrement year button +msgstr botó decrement d'any + +#: src/lib/elm_calendar.c:322 +msgid calendar increment month button +msgstr botó increment de mes + +#: src/lib/elm_calendar.c:327 +msgid calendar increment year button +msgstr botó increment d'any + +#: src/lib/elm_calendar.c:332 +msgid calendar month +msgstr mes del calendari + +#: src/lib/elm_calendar.c:337 +msgid calendar year +msgstr any del calendari + +#: src/lib/elm_check.c:62 src/lib/elm_check.c:247 src/lib/elm_radio.c:102 +#: src/lib/elm_radio.c:256 msgid State: On msgstr Estat: activat -#: src/lib/elm_check.c:60 src/lib/elm_check.c:63 src/lib/elm_check.c:225 -#: src/lib/elm_radio.c:244 +#: src/lib/elm_check.c:68 src/lib/elm_check.c:259 src/lib/elm_radio.c:258 msgid State: Off msgstr Estat: desactivat -#: src/lib/elm_check.c:209 src/lib/elm_check.c:222 +#: src/lib/elm_check.c:243 src/lib/elm_check.c:256 msgid State msgstr Estat -#: src/lib/elm_check.c:289 +#: src/lib/elm_check.c:334 msgid Check msgstr Comprova -#: src/lib/elm_colorselector.c:895 +#: src/lib/elm_clock.c:303 +msgid clock increment button for am,pm +msgstr botó increment de rellotge per am,pm + +#: src/lib/elm_clock.c:311 +msgid clock
[EGIT] [core/elementary] master 01/01: Update catalan translation
maxerba pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=0d0e460332583c09eafac3326209393c4ea06833 commit 0d0e460332583c09eafac3326209393c4ea06833 Author: maxerba maiur...@gmail.com Date: Mon Mar 30 21:18:10 2015 +0200 Update catalan translation --- po/ca.po | 125 +++ 1 file changed, 78 insertions(+), 47 deletions(-) diff --git a/po/ca.po b/po/ca.po index b518eb5..adc9b52 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2,21 +2,20 @@ # This file is put in the public domain. # Marc Furtià i Puig marc.fur...@gmail.com, 2013. # Joan Coll jco...@gmail.com, 2013. -#: src/lib/elm_config.c:3176 msgid msgstr Project-Id-Version: Elementary\n -Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2015-02-11 10:42+0900\n -PO-Revision-Date: 2014-05-26 21:31+\n -Last-Translator: joancoll Unknown\n +Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n +POT-Creation-Date: 2015-03-09 21:01+0100\n +PO-Revision-Date: 2015-02-10 09:34+\n +Last-Translator: JoanColl Unknown\n Language-Team: Catalan\n -Language: ca\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -X-Launchpad-Export-Date: 2014-05-27 05:40+\n -X-Generator: Launchpad (build 17017)\n +X-Launchpad-Export-Date: 2015-03-11 05:18+\n +X-Generator: Launchpad (build 17389)\n +Language: ca\n #: src/lib/elc_fileselector.c:1449 msgid Up @@ -28,7 +27,7 @@ msgstr Carpeta personal #: src/lib/elc_fileselector.c:1527 msgid Search -msgstr +msgstr Cerca #: src/lib/elc_fileselector.c:1693 src/lib/elm_entry.c:1487 #: src/lib/elm_entry.c:1512 @@ -39,15 +38,15 @@ msgstr Cancel·la msgid OK msgstr Accepta -#: src/lib/elc_multibuttonentry.c:615 +#: src/lib/elc_multibuttonentry.c:578 msgid multi button entry label msgstr etiqueta d'entrada múltiple -#: src/lib/elc_multibuttonentry.c:637 +#: src/lib/elc_multibuttonentry.c:600 msgid multi button entry item msgstr element entrada múltiple -#: src/lib/elc_multibuttonentry.c:1496 +#: src/lib/elc_multibuttonentry.c:1446 msgid multi button entry msgstr entrada múltiple @@ -63,11 +62,11 @@ msgstr Enrere msgid Next msgstr Següent -#: src/lib/elc_popup.c:261 src/lib/elc_popup.c:865 +#: src/lib/elc_popup.c:261 src/lib/elc_popup.c:860 msgid Popup Title msgstr Títol finestra emergent -#: src/lib/elc_popup.c:271 src/lib/elc_popup.c:930 +#: src/lib/elc_popup.c:271 src/lib/elc_popup.c:925 msgid Popup Body Text msgstr Text de la finestra emergent @@ -79,14 +78,14 @@ msgstr Bombolla msgid Clicked msgstr Clicat -#: src/lib/elm_button.c:271 src/lib/elm_check.c:235 src/lib/elm_gengrid.c:814 -#: src/lib/elm_genlist.c:1572 src/lib/elm_list.c:2182 src/lib/elm_radio.c:256 -#: src/lib/elm_segment_control.c:525 src/lib/elm_spinner.c:578 -#: src/lib/elm_toolbar.c:2226 +#: src/lib/elm_button.c:270 src/lib/elm_check.c:234 src/lib/elm_gengrid.c:816 +#: src/lib/elm_genlist.c:1609 src/lib/elm_list.c:2180 src/lib/elm_radio.c:255 +#: src/lib/elm_segment_control.c:524 src/lib/elm_spinner.c:785 +#: src/lib/elm_toolbar.c:2224 msgid State: Disabled msgstr Estat: desactivat -#: src/lib/elm_button.c:296 +#: src/lib/elm_button.c:295 msgid Button msgstr Botó @@ -130,20 +129,20 @@ msgstr mes del calendari msgid calendar year msgstr any del calendari -#: src/lib/elm_check.c:62 src/lib/elm_check.c:248 src/lib/elm_radio.c:102 -#: src/lib/elm_radio.c:257 +#: src/lib/elm_check.c:62 src/lib/elm_check.c:247 src/lib/elm_radio.c:102 +#: src/lib/elm_radio.c:256 msgid State: On msgstr Estat: activat -#: src/lib/elm_check.c:68 src/lib/elm_check.c:260 src/lib/elm_radio.c:259 +#: src/lib/elm_check.c:68 src/lib/elm_check.c:259 src/lib/elm_radio.c:258 msgid State: Off msgstr Estat: desactivat -#: src/lib/elm_check.c:244 src/lib/elm_check.c:257 +#: src/lib/elm_check.c:243 src/lib/elm_check.c:256 msgid State msgstr Estat -#: src/lib/elm_check.c:335 +#: src/lib/elm_check.c:334 msgid Check msgstr Comprova @@ -155,23 +154,43 @@ msgstr botó increment de rellotge per am,pm msgid clock decrement button for am,pm msgstr botó decrement de rellotge per am,pm -#: src/lib/elm_clock.c:649 +#: src/lib/elm_clock.c:647 msgid State: Editable msgstr Estat: Editable -#: src/lib/elm_clock.c:684 +#: src/lib/elm_clock.c:682 msgid Clock msgstr Rellotge -#: src/lib/elm_colorselector.c:1391 +#: src/lib/elm_colorselector.c:696 +msgid Pick a color +msgstr Trieu un color + +#: src/lib/elm_colorselector.c:732 +msgid R: +msgstr R: + +#: src/lib/elm_colorselector.c:734 +msgid G: +msgstr G: + +#: src/lib/elm_colorselector.c:736 +msgid B: +msgstr B: + +#: src/lib/elm_colorselector.c:738 +msgid A: +msgstr A: + +#: src/lib/elm_colorselector.c:1390 msgid color selector palette item msgstr paleta de selecció de color -#: src/lib/elm_config.c:3192 +#: src/lib/elm_config.c:3224 msgid default:LTR msgstr Per defecte: LTR -#:
[EGIT] [core/efl] master 01/02: edje: this desc pointer is actually never set.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=84453585263bd8464ecf847c992a8a3ae673ed7f commit 84453585263bd8464ecf847c992a8a3ae673ed7f Author: Cedric BAIL ced...@osg.samsung.com Date: Mon Mar 30 22:31:10 2015 +0200 edje: this desc pointer is actually never set. --- src/lib/edje/edje_smart.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index 8af4cea..332b958 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -66,7 +66,6 @@ _edje_color_class_free(void *data) Edje_Color_Class *cc = data; if (cc-name) eina_stringshare_del(cc-name); - eina_stringshare_del(cc-desc); free(cc); } --
[EGIT] [apps/terminology] master 01/01: terminology: Use proper event structure for mouse up callback
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=c328ba006ea5efce88534bd0afbef136a7139d07
commit c328ba006ea5efce88534bd0afbef136a7139d07
Author: Chris Michael cp.mich...@samsung.com
Date: Mon Mar 30 15:21:18 2015 -0400
terminology: Use proper event structure for mouse up callback
Summary: When catching evas mouse up callbacks, we should be using the
Evas_Event_Mouse_Up structure for the event
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/bin/media.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/media.c b/src/bin/media.c
index c0ed0d0..dc04450 100644
--- a/src/bin/media.c
+++ b/src/bin/media.c
@@ -1097,7 +1097,7 @@ _mouse_down_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, vo
static void
_mouse_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event)
{
- Evas_Event_Mouse_Down *ev = event;
+ Evas_Event_Mouse_Up *ev = event;
Media *sd = evas_object_smart_data_get(data);
Evas_Coord dx, dy;
if (!sd) return;
--
[EGIT] [e16/e16] master 01/01: Update catalan translation
maxerba pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=1dba79261c8c98205f5e4f7c5ce24a3189c5772f commit 1dba79261c8c98205f5e4f7c5ce24a3189c5772f Author: maxerba maiur...@gmail.com Date: Mon Mar 30 21:25:03 2015 +0200 Update catalan translation --- po/ca.po | 1349 ++ 1 file changed, 737 insertions(+), 612 deletions(-) diff --git a/po/ca.po b/po/ca.po index d86a5df..8e82ac9 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,17 +6,17 @@ msgid msgstr Project-Id-Version: enlightenment\n -Report-Msgid-Bugs-To: enlightenment-i...@lists.sourceforge.net\n -POT-Creation-Date: 2015-02-21 14:54+0100\n -PO-Revision-Date: 2014-06-03 09:11+\n -Last-Translator: joancoll Unknown\n +Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n +POT-Creation-Date: 2014-05-24 09:16+0200\n +PO-Revision-Date: 2015-03-29 14:25+\n +Last-Translator: JoanColl Unknown\n Language-Team: Catalan c...@li.org\n -Language: ca\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -X-Launchpad-Export-Date: 2014-06-04 06:03+\n -X-Generator: Launchpad (build 17031)\n +X-Launchpad-Export-Date: 2015-03-30 05:18+\n +X-Generator: Launchpad (build 17413)\n +Language: ca\n #: src/about.c:35 #, c-format @@ -46,8 +46,8 @@ msgstr Mandrake - mandr...@mandrake.net\n Kim Woelders - k...@woelders.dk\n -#: src/aclass.c:222 src/backgrounds.c:260 src/borders.c:698 src/buttons.c:190 -#: src/cursors.c:139 src/iclass.c:360 src/tclass.c:119 src/tooltips.c:136 +#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:695 src/buttons.c:186 +#: src/cursors.c:141 src/iclass.c:356 src/tclass.c:119 src/tooltips.c:132 #, c-format msgid %u references remain msgstr Resten %u referències @@ -150,36 +150,36 @@ msgstr Hi ha hagut un error executant el programa:\n %s -#: src/alert.c:218 +#: src/alert.c:216 msgid Enlightenment Error msgstr Error d'Enlightenment -#: src/alert.c:571 +#: src/alert.c:569 msgid Enlightenment Message Dialog msgstr Diàleg de missatges Enlightenment -#: src/alert.c:571 +#: src/alert.c:569 msgid Ignore this msgstr Ignora-ho -#: src/alert.c:572 +#: src/alert.c:570 msgid Restart Enlightenment msgstr Reinicia Enlightenment -#: src/alert.c:572 src/setup.c:184 +#: src/alert.c:570 src/setup.c:182 msgid Quit Enlightenment msgstr Surt d'Enlightenment -#: src/alert.c:582 +#: src/alert.c:580 msgid Attention !!! msgstr Atenció !!! -#: src/alert.c:582 src/dialog.c:684 src/dialog.c:1823 src/events.c:102 -#: src/setup.c:163 src/setup.c:176 src/sound.c:309 +#: src/alert.c:580 src/dialog.c:683 src/dialog.c:1822 src/events.c:95 +#: src/setup.c:161 src/setup.c:174 src/sound.c:309 msgid OK msgstr Accepta -#: src/backgrounds.c:1500 +#: src/backgrounds.c:1496 #, c-format msgid Background definition information:\n @@ -190,11 +190,11 @@ msgstr Nom: %s\n Arxiu: %s -#: src/backgrounds.c:1501 +#: src/backgrounds.c:1497 msgid -NONE- msgstr -CAP- -#: src/backgrounds.c:1676 src/backgrounds.c:1678 +#: src/backgrounds.c:1672 src/backgrounds.c:1674 msgid No\n Background @@ -202,40 +202,40 @@ msgstr No\n Fons -#: src/backgrounds.c:1778 src/backgrounds.c:2208 +#: src/backgrounds.c:1774 src/backgrounds.c:2204 #, c-format msgid Unused backgrounds freed after %2i:%02i:%02i msgstr Alliberament de fons no utilitzats després de %2i:%02i:%02i -#: src/backgrounds.c:1997 +#: src/backgrounds.c:1993 msgid Use background image msgstr Utilitza imatge de fons -#: src/backgrounds.c:2001 +#: src/backgrounds.c:1997 msgid Keep aspect on scale msgstr Manté aspecte a l'escalar -#: src/backgrounds.c:2005 +#: src/backgrounds.c:2001 msgid Tile image across background msgstr Mosaic d'imatges en el fons -#: src/backgrounds.c:2014 +#: src/backgrounds.c:2010 msgid Move to Front msgstr Mou cap endavant -#: src/backgrounds.c:2019 +#: src/backgrounds.c:2015 msgid Duplicate msgstr Duplica -#: src/backgrounds.c:2023 +#: src/backgrounds.c:2019 msgid Unlist msgstr No llistat -#: src/backgrounds.c:2028 +#: src/backgrounds.c:2024 msgid Delete File msgstr Suprimeix el fitxer -#: src/backgrounds.c:2039 +#: src/backgrounds.c:2035 msgid Background\n Image\n @@ -249,59 +249,59 @@ msgstr i\n Alineació\n -#: src/backgrounds.c:2093 +#: src/backgrounds.c:2089 msgid BG Colour msgstr Color BG -#: src/backgrounds.c:2098 +#: src/backgrounds.c:2094 msgid Red: msgstr Vermell: -#: src/backgrounds.c:2109 +#: src/backgrounds.c:2105 msgid Green: msgstr Verd: -#: src/backgrounds.c:2120 +#: src/backgrounds.c:2116 msgid Blue: msgstr Blau: -#: src/backgrounds.c:2153 +#: src/backgrounds.c:2149 msgid Pre-scan BG's msgstr Pre-escaneig fons -#: src/backgrounds.c:2161 +#: src/backgrounds.c:2157 msgid Sort by File msgstr Ordena per nom -#: src/backgrounds.c:2166 +#: src/backgrounds.c:2162 msgid Sort by Attr. msgstr Ordena per atribut -#: src/backgrounds.c:2172 +#:
[EGIT] [enlightenment/modules/engage] master 01/01: Update catalan translation
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/engage.git/commit/?id=a7c03126cf12e6fb3bad9931fcc543c9df348f73 commit a7c03126cf12e6fb3bad9931fcc543c9df348f73 Author: maxerba maiur...@gmail.com Date: Mon Mar 30 21:26:10 2015 +0200 Update catalan translation --- po/ca.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/ca.po b/po/ca.po index 245ccd6..ff29dfe 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2,15 +2,15 @@ msgid msgstr Project-Id-Version: Marc Furtià i Puig\\\n Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n -POT-Creation-Date: 2013-08-23 11:50+0200\n -PO-Revision-Date: 2014-05-29 07:06+\n -Last-Translator: joancoll Unknown\n +POT-Creation-Date: 2015-02-11 18:46+0100\n +PO-Revision-Date: 2015-02-20 08:38+\n +Last-Translator: JoanColl Unknown\n Language-Team: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -X-Launchpad-Export-Date: 2014-05-30 05:34+\n -X-Generator: Launchpad (build 17023)\n +X-Launchpad-Export-Date: 2015-02-21 05:12+\n +X-Generator: Launchpad (build 17355)\n Language: ca\n X-Poedit-Bookmarks: -1,-1,1139,-1,-1,-1,-1,-1,-1,-1\n @@ -60,7 +60,7 @@ msgstr Desiconifica #: src/ng_border_menu.c:88 msgid Iconify -msgstr Iconifica +msgstr Minimitza #: src/ng_gadcon.c:260 msgid Gadcon Config @@ -108,8 +108,8 @@ msgid Background Opacity: msgstr Opacitat del fons: #: src/ng_config.c:186 -msgid %1.0f \\% -msgstr %1.0f \\% +msgid %1.0f % +msgstr %1.0f % #: src/ng_config.c:194 msgid Show Background Box --
[EGIT] [core/efl] master 02/02: edje: force NULL initialization of desc pointer.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=431e73eed59332bd27bd953d229d14b9c8e182de commit 431e73eed59332bd27bd953d229d14b9c8e182de Author: Cedric BAIL ced...@osg.samsung.com Date: Mon Mar 30 22:31:34 2015 +0200 edje: force NULL initialization of desc pointer. --- src/lib/edje/edje_util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index 8da4e97..e1818a0 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -702,6 +702,7 @@ _edje_object_color_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *color_cl return EINA_FALSE; } cc-name = color_class; + cc-desc = NULL; eina_hash_direct_add(ed-color_classes, cc-name, cc); update_color_class: cc-r = r; --
[EGIT] [apps/terminology] master 01/01: update catalan translation. Thanks to JoanColl
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=2eafc8af28560cb8ef52e0fd074d286d58c6dd16 commit 2eafc8af28560cb8ef52e0fd074d286d58c6dd16 Author: Boris Faure bill...@gmail.com Date: Mon Mar 30 23:50:37 2015 +0200 update catalan translation. Thanks to JoanColl --- po/ca.po | 422 +-- 1 file changed, 224 insertions(+), 198 deletions(-) diff --git a/po/ca.po b/po/ca.po index 22e8512..81d643b 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,16 +7,16 @@ msgid msgstr Project-Id-Version: enlightenment\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2015-02-15 14:12+0100\n -PO-Revision-Date: 2014-09-28 17:15+\n -Last-Translator: JoanColl Unknown\n +POT-Creation-Date: 2015-03-18 20:00+0100\n +PO-Revision-Date: 2015-03-30 14:48+0100\n +Last-Translator: JoanColl jco...@gmail.com\n Language-Team: Catalan c...@li.org\n Language: ca\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -X-Launchpad-Export-Date: 2014-10-05 12:12+\n -X-Generator: Launchpad (build 17196)\n +X-Launchpad-Export-Date: 2015-03-20 04:46+\n +X-Generator: Poedit 1.5.4\n #: src/bin/controls.c:247 msgid Controls @@ -36,9 +36,9 @@ msgstr Divideix H #: src/bin/controls.c:277 msgid Miniview -msgstr +msgstr Minivista -#: src/bin/controls.c:287 src/bin/termio.c:956 +#: src/bin/controls.c:287 src/bin/termio.c:950 msgid Copy msgstr Còpia @@ -55,9 +55,8 @@ msgid About msgstr Quant a #: src/bin/controls.c:315 -#, fuzzy msgid Close Terminal -msgstr Tanca el terminal que tingui el focus +msgstr Tanca el terminal #: src/bin/about.c:56 #, c-format @@ -68,330 +67,352 @@ msgid it.brbrCopyright © 2012-%d by:brbr%sbrbrDistributed under the 2- clause BSD license detailed below:brbr%s msgstr +bTerminology %s/bbrPer què els termminals han de ser avorrits? +brbrAquest terminal es va escriure per Enlightenment, per utilitzar EFL +i arribar una mica més lluny del que hauria de ser un emulador de terminal +modern. Esperem que el gaudiu!.brbrCopyright © 2012-%d by:brbr +%sbrbrDistribuït sota la clàusula-2 de la llicència BSD detallada a sota: +brbr%s -#: src/bin/keyin.c:530 +#: src/bin/keyin.c:543 msgid Scrolling msgstr Desplaçament -#: src/bin/keyin.c:531 +#: src/bin/keyin.c:544 msgid Scroll one page up msgstr Desplaça una pàgina amunt -#: src/bin/keyin.c:532 +#: src/bin/keyin.c:545 msgid Scroll one page down msgstr Desplaça una pàgina avall -#: src/bin/keyin.c:533 +#: src/bin/keyin.c:546 msgid Scroll one line up msgstr Desplaça una línia amunt -#: src/bin/keyin.c:534 +#: src/bin/keyin.c:547 msgid Scroll one line down msgstr Desplaça una línia avall -#: src/bin/keyin.c:536 +#: src/bin/keyin.c:549 msgid Copy/Paste msgstr Copia/Enganxa -#: src/bin/keyin.c:537 +#: src/bin/keyin.c:550 msgid Copy selection to Primary buffer msgstr Copia la selecció a la memòria intermèdia primària -#: src/bin/keyin.c:538 +#: src/bin/keyin.c:551 msgid Copy selection to Clipboard buffer msgstr Copia la selecció al porta-retalls -#: src/bin/keyin.c:539 +#: src/bin/keyin.c:552 msgid Paste Primary buffer (highlight) msgstr Enganxa la memòria intermèdia primària (ressaltat) -#: src/bin/keyin.c:540 +#: src/bin/keyin.c:553 msgid Paste Clipboard buffer (ctrl+c/v) msgstr Enganxa el porta-retalls (ctrl+c/v) -#: src/bin/keyin.c:542 +#: src/bin/keyin.c:555 msgid Splits/Tabs msgstr Divisions/Pestanyes -#: src/bin/keyin.c:543 +#: src/bin/keyin.c:556 msgid Focus to the previous terminal msgstr Focus al terminal previ -#: src/bin/keyin.c:544 +#: src/bin/keyin.c:557 msgid Focus to the next terminal msgstr Focus al terminal següent -#: src/bin/keyin.c:545 +#: src/bin/keyin.c:558 msgid Split horizontally (new below) msgstr Divideix horitzontalment (nou a sota) -#: src/bin/keyin.c:546 +#: src/bin/keyin.c:559 msgid Split vertically (new on right) msgstr Divideix verticalment (nou a la dreta) -#: src/bin/keyin.c:547 +#: src/bin/keyin.c:560 msgid Create a new \tab\ msgstr Crea una nova \pestanya\ -#: src/bin/keyin.c:548 +#: src/bin/keyin.c:561 msgid Close the focused terminal msgstr Tanca el terminal que tingui el focus -#: src/bin/keyin.c:549 +#: src/bin/keyin.c:562 msgid Bring up \tab\ switcher msgstr Mostra el commutador de \pestanyes\ -#: src/bin/keyin.c:550 +#: src/bin/keyin.c:563 msgid Switch to terminal tab 1 msgstr Commuta al terminal de la pestanya 1 -#: src/bin/keyin.c:551 +#: src/bin/keyin.c:564 msgid Switch to terminal tab 2 msgstr Commuta al terminal de la pestanya 2 -#: src/bin/keyin.c:552 +#: src/bin/keyin.c:565 msgid Switch to terminal tab 3 msgstr Commuta al terminal de la pestanya 3 -#: src/bin/keyin.c:553 +#: src/bin/keyin.c:566 msgid Switch to terminal tab 4 msgstr Commuta al terminal de la pestanya 4 -#: src/bin/keyin.c:554 +#: src/bin/keyin.c:567 msgid
[EGIT] [tools/edi] master 01/01: Summarise the changes that elm_code editor brings
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=ba5d65d617d867b851d617af2e8ccaae10a6ba3c commit ba5d65d617d867b851d617af2e8ccaae10a6ba3c Author: Andy Williams a...@andywilliams.me Date: Mon Mar 30 23:54:24 2015 +0100 Summarise the changes that elm_code editor brings --- NEWS | 22 +++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 8f8ef39..c41be3b 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,22 @@ -= -Edi 0.0.2 -= +=== +Edi 0.1 +=== + +Features: + + * Integrated elm_code editor +- faster code highlighting +- highlighting of error lines +- line width indicator in the editor +- configurable tab stop width + +Bug fixes + + * T2057 Line numbers are not fully visible in new windows + + +0.0.2 +- Features --
[EGIT] [core/efl] master 01/01: Evas 3D: Fix shadow map shader
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4af7a947a6fe1834d3fb5a8af3cd73196d237f74
commit 4af7a947a6fe1834d3fb5a8af3cd73196d237f74
Author: Oleksandr Shcherbina o.shcherb...@samsung.com
Date: Tue Mar 31 08:34:32 2015 +0900
Evas 3D: Fix shadow map shader
Summary:
Silly mistake after this b9b5ced501f4642f03d8bcc8441fd3f7b55a7f52 commit.
Seems uninitialized components of vector gl_FragColor
Reviewers: cedric, Hermet, jpeg
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2258
---
src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x | 2 +-
src/modules/evas/engines/gl_common/shader_3d/shadow_map_frag.shd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
index eaf7ece..2987ff3 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
@@ -1188,7 +1188,7 @@ static const char const shadow_map_frag_glsl[] =
#endif //DIFFUSE_TEXTURE\n
#endif //DIFFUSE_TEXTURE_BLEND\n
#endif //ALPHA_TEST_ENABLED\n
- gl_FragColor.r = gl_FragCoord.z;\n
+ gl_FragColor = vec4(gl_FragCoord.z);\n
}\n;
static const char const color_pick_vert_glsl[] =
diff --git a/src/modules/evas/engines/gl_common/shader_3d/shadow_map_frag.shd
b/src/modules/evas/engines/gl_common/shader_3d/shadow_map_frag.shd
index 66a88ad..babc448 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/shadow_map_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/shadow_map_frag.shd
@@ -36,5 +36,5 @@ void main() {
#endif //ALPHA_TEST_ENABLED
- gl_FragColor.r = gl_FragCoord.z;
+ gl_FragColor = vec4(gl_FragCoord.z);
}
--
[EGIT] [core/efl] master 01/02: edje: make Edje_Color_Class a public structure.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=09f304a33c6ec75a617d0b5a424e42e15eb33add
commit 09f304a33c6ec75a617d0b5a424e42e15eb33add
Author: Cedric BAIL ced...@osg.samsung.com
Date: Tue Mar 31 03:32:35 2015 +0200
edje: make Edje_Color_Class a public structure.
---
src/lib/edje/Edje_Common.h | 15 +++
src/lib/edje/edje_private.h | 10 --
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index a95df33..3b1b8dd 100644
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -16,6 +16,21 @@ typedef struct _Edje_Version
EAPI extern Edje_Version *edje_version;
+/**
+ * @typedef Edje_Color_Class
+ * Type for edje color class
+ */
+typedef struct _Edje_Color_Class Edje_Color_Class;
+
+struct _Edje_Color_Class
+{
+ const char *name;
+ Eina_Stringshare *desc;
+
+ unsigned char r, g, b, a;
+ unsigned char r2, g2, b2, a2;
+ unsigned char r3, g3, b3, a3;
+};
/**
* @defgroup Edje_Object_Communication_Interface_Signal Edje Communication
Interface: Signal
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 03d1709..0128c3f 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -351,7 +351,6 @@ typedef struct _Edje_Calc_Params_Map Edje_Calc_Params_Map;
typedef struct _Edje_Calc_Params_Physics Edje_Calc_Params_Physics;
typedef struct _Edje_Pending_Program Edje_Pending_Program;
typedef struct _Edje_Text_Style Edje_Text_Style;
-typedef struct _Edje_Color_Class Edje_Color_Class;
typedef struct _Edje_Text_Class Edje_Text_Class;
typedef struct _Edje_Var Edje_Var;
typedef struct _Edje_Var_Int Edje_Var_Int;
@@ -1863,15 +1862,6 @@ struct _Edje_Text_Style
} members[32];
};
-struct _Edje_Color_Class
-{
- const char*name;
- unsigned char r, g, b, a;
- unsigned char r2, g2, b2, a2;
- unsigned char r3, g3, b3, a3;
- Eina_Stringshare *desc;
-};
-
struct _Edje_Text_Class
{
const char *name;
--
[EGIT] [core/efl] master 02/02: edje: add edje_color_class_active_iterator_new()
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5906569f7f85954e6fade62ebc1a7c234b126c76
commit 5906569f7f85954e6fade62ebc1a7c234b126c76
Author: Cedric BAIL ced...@osg.samsung.com
Date: Tue Mar 31 04:24:48 2015 +0200
edje: add edje_color_class_active_iterator_new()
This function make it possible to get a list of active Edje_Color_Class
in an application. Think about Enlightenment color class configuration,
but can now be done on any application dynamically.
@feature
---
src/lib/edje/Edje_Common.h | 10 +
src/lib/edje/edje_util.c | 98 ++
2 files changed, 108 insertions(+)
diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index 3b1b8dd..850a9f8 100644
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -1261,6 +1261,16 @@ EAPI void edje_color_class_del(const
char *color_class);
EAPI Eina_List *edje_color_class_list (void);
/**
+ * @brief Iterate over all the active class of an application.
+ *
+ * @return Return an iterator of Edje_Color_Class of the currently active
color class
+ *
+ * This function only iterate over the Edje_Color_Class in use by
+ * an application.
+ */
+EAPI Eina_Iterator *edje_color_class_active_iterator_new(void);
+
+/**
* @}
*/
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index e1818a0..2745970 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -653,6 +653,104 @@ edje_color_class_list(void)
return fdata.list;
}
+typedef struct _Edje_Active_Color_Class_Iterator
Edje_Active_Color_Class_Iterator;
+struct _Edje_Active_Color_Class_Iterator
+{
+ Eina_Iterator iterator;
+
+ Edje_Color_Class cc;
+
+ Eina_Iterator *classes;
+};
+
+static Eina_Bool
+_edje_color_class_active_iterator_next(Eina_Iterator *it, void **data)
+{
+ Edje_Active_Color_Class_Iterator *et = (void*) it;
+ Eina_Hash_Tuple *tuple = NULL;
+ Edje_Refcount *er = NULL;
+ Eina_Iterator *ith;
+ Edje_Color_Class *cc;
+ int r, g, b, a;
+ int r2, g2, b2, a2;
+ int r3, g3, b3, a3;
+
+ if (!eina_iterator_next(et-classes, (void**) tuple)) return EINA_FALSE;
+ if (!tuple) return EINA_FALSE;
+
+ if (!edje_color_class_get(tuple-key,
+ r, g, b, a,
+ r2, g2, b2, a2,
+ r3, g3, b3, a3))
+ return EINA_FALSE;
+
+ /*
+ Any of the Edje object referenced should have a file with a valid
+ description for this color class. Let's bet on that for now.
+ */
+ ith = eina_hash_iterator_data_new(tuple-data);
+ if (!eina_iterator_next(ith, (void**) er)) return EINA_FALSE;
+ cc = eina_hash_find(er-ed-file-color_hash, tuple-key);
+ if (!cc) return EINA_FALSE;
+
+ /*
+ Now set the value of a fake color class with current value as set
+ and description from edc.
+ */
+ et-cc.name = tuple-key;
+ et-cc.desc = cc-desc;
+ et-cc.r = r;
+ et-cc.g = g;
+ et-cc.b = b;
+ et-cc.a = a;
+ et-cc.r2 = r2;
+ et-cc.g2 = g2;
+ et-cc.b2 = b2;
+ et-cc.a2 = a2;
+ et-cc.r3 = r3;
+ et-cc.g3 = g3;
+ et-cc.b3 = b3;
+ et-cc.a3 = a3;
+
+ *data = et-cc;
+ return EINA_TRUE;
+}
+
+static void *
+_edje_color_class_active_iterator_container(Eina_Iterator *it EINA_UNUSED)
+{
+ return NULL;
+}
+
+static void
+_edje_color_class_active_iterator_free(Eina_Iterator *it)
+{
+ Edje_Active_Color_Class_Iterator *et = (void*) it;
+
+ eina_iterator_free(et-classes);
+ EINA_MAGIC_SET(et-iterator, 0);
+ free(et);
+}
+
+EAPI Eina_Iterator *
+edje_color_class_active_iterator_new(void)
+{
+ Edje_Active_Color_Class_Iterator *it;
+
+ it = calloc(1, sizeof (Edje_Active_Color_Class_Iterator));
+ if (!it) return NULL;
+
+ EINA_MAGIC_SET(it-iterator, EINA_MAGIC_ITERATOR);
+ it-classes = eina_hash_iterator_tuple_new(_edje_color_class_member_hash);
+
+ it-iterator.version = EINA_ITERATOR_VERSION;
+ it-iterator.next = _edje_color_class_active_iterator_next;
+ it-iterator.get_container = _edje_color_class_active_iterator_container;
+ it-iterator.free = _edje_color_class_active_iterator_free;
+
+ return it-iterator;
+}
+
static Eina_Bool
_edje_color_class_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void
*key, void *data EINA_UNUSED, void *fdata)
{
--
[EGIT] [core/elementary] master 03/03: doc: Improve build speed, disable doc's widgets build
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=52c8f4fe7ec42efa6889d707e2380697ffe7dbb4 commit 52c8f4fe7ec42efa6889d707e2380697ffe7dbb4 Author: Jean-Philippe Andre jp.an...@samsung.com Date: Tue Mar 31 12:17:23 2015 +0900 doc: Improve build speed, disable doc's widgets build Building the widget_preview_xxx programs takes a while and should be required only when rebuilding the doc. Arguably breaking something in elm may break only the widget-preview build but I believe this is a rare case. This speeds up a regular elm build by 20s on my machine. --- doc/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 953809c..ea03318 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = widgets +#SUBDIRS = widgets MAINTAINERCLEANFILES = Makefile.in @@ -191,7 +191,7 @@ widget-tree-figures: doc doc-clean: rm -rf img/widget html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* -gen-doc: +gen-doc: widget-preview $(efl_doxygen) cp -r $(srcdir)/img/* html/ cp -r $(srcdir)/img/* latex/ --
[EGIT] [core/elementary] master 01/03: elm_test: Fix compilation warnings
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=c8fbe6d87fd053b546aa9a76713064568284 commit c8fbe6d87fd053b546aa9a76713064568284 Author: Jean-Philippe Andre jp.an...@samsung.com Date: Tue Mar 31 11:19:25 2015 +0900 elm_test: Fix compilation warnings --- src/bin/test_naviframe.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/test_naviframe.c b/src/bin/test_naviframe.c index 72f5dd2..0469b08 100644 --- a/src/bin/test_naviframe.c +++ b/src/bin/test_naviframe.c @@ -8,13 +8,13 @@ elm_object_tooltip_text_set((BT), (TEXT)); \ elm_object_tooltip_window_mode_set((BT), EINA_TRUE) -static const char img1[PATH_MAX]; -static const char img2[PATH_MAX]; -static const char img3[PATH_MAX]; -static const char img4[PATH_MAX]; -static const char img5[PATH_MAX]; -static const char img6[PATH_MAX]; -static const char img7[PATH_MAX]; +static char img1[PATH_MAX]; +static char img2[PATH_MAX]; +static char img3[PATH_MAX]; +static char img4[PATH_MAX]; +static char img5[PATH_MAX]; +static char img6[PATH_MAX]; +static char img7[PATH_MAX]; Evas_Object * _content_new(Evas_Object *parent, const char *img) --
[EGIT] [core/elementary] master 02/03: elm_test: Fix image paths
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=eeb55cb6e882a36cfe4da16dbbc7fd0bd2311481 commit eeb55cb6e882a36cfe4da16dbbc7fd0bd2311481 Author: Jean-Philippe Andre jp.an...@samsung.com Date: Tue Mar 31 12:01:52 2015 +0900 elm_test: Fix image paths --- src/bin/test_naviframe_complex.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/test_naviframe_complex.c b/src/bin/test_naviframe_complex.c index 3d975cc..63678bc 100644 --- a/src/bin/test_naviframe_complex.c +++ b/src/bin/test_naviframe_complex.c @@ -132,7 +132,7 @@ _page7(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) Elm_Object_Item *it; char img6[PATH_MAX]; - snprintf(img6, sizeof(img6), %s/images/sky_02.png, elm_app_data_dir_get()); + snprintf(img6, sizeof(img6), %s/images/sky_02.jpg, elm_app_data_dir_get()); bt = elm_button_add(nf); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); BUTTON_TEXT_SET(bt, Page 6); @@ -156,7 +156,7 @@ _page6(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) Elm_Object_Item *it; char img7[PATH_MAX]; - snprintf(img7, sizeof(img7), %s/images/sky_03.png, elm_app_data_dir_get()); + snprintf(img7, sizeof(img7), %s/images/sky_03.jpg, elm_app_data_dir_get()); bt = elm_button_add(nf); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); BUTTON_TEXT_SET(bt, Page 5); @@ -180,7 +180,7 @@ _page5(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) Elm_Object_Item *it; char img5[PATH_MAX]; - snprintf(img5, sizeof(img5), %s/images/sky_01.png, elm_app_data_dir_get()); + snprintf(img5, sizeof(img5), %s/images/sky_01.jpg, elm_app_data_dir_get()); bt = elm_button_add(nf); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); BUTTON_TEXT_SET(bt, Page 4); @@ -210,7 +210,7 @@ _page4(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) char img4[PATH_MAX]; Elm_Object_Item *it; - snprintf(img4, sizeof(img4), %s/images/rock_02.png, elm_app_data_dir_get()); + snprintf(img4, sizeof(img4), %s/images/rock_02.jpg, elm_app_data_dir_get()); ic = elm_icon_add(nf); snprintf(buf, sizeof(buf), %s/images/icon_right_arrow.png, elm_app_data_dir_get()); --
[EGIT] [core/efl] master 01/01: edje: get the color class value by iterating over all possible value provider.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6ee3805cf44435bf7f4e8e382329ea0933a676b9 commit 6ee3805cf44435bf7f4e8e382329ea0933a676b9 Author: Cedric BAIL ced...@osg.samsung.com Date: Tue Mar 31 05:36:38 2015 +0200 edje: get the color class value by iterating over all possible value provider. --- src/lib/edje/edje_util.c | 39 +++ 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index 2745970..a76f922 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -671,46 +671,29 @@ _edje_color_class_active_iterator_next(Eina_Iterator *it, void **data) Edje_Refcount *er = NULL; Eina_Iterator *ith; Edje_Color_Class *cc; - int r, g, b, a; - int r2, g2, b2, a2; - int r3, g3, b3, a3; if (!eina_iterator_next(et-classes, (void**) tuple)) return EINA_FALSE; if (!tuple) return EINA_FALSE; - if (!edje_color_class_get(tuple-key, - r, g, b, a, - r2, g2, b2, a2, - r3, g3, b3, a3)) - return EINA_FALSE; + ith = eina_hash_iterator_data_new(tuple-data); + if (!eina_iterator_next(ith, (void**) er)) return EINA_FALSE; + + /* + We actually need to ask on an object to get the correct value. + It is being assumed that the color key are the same for all object here. + This can some times not be the case, but for now we should be fine. +*/ + cc = _edje_color_class_find(er-ed, tuple-key); + if (!cc) return EINA_FALSE; + et-cc = *cc; /* Any of the Edje object referenced should have a file with a valid description for this color class. Let's bet on that for now. */ - ith = eina_hash_iterator_data_new(tuple-data); - if (!eina_iterator_next(ith, (void**) er)) return EINA_FALSE; cc = eina_hash_find(er-ed-file-color_hash, tuple-key); if (!cc) return EINA_FALSE; - - /* - Now set the value of a fake color class with current value as set - and description from edc. - */ - et-cc.name = tuple-key; et-cc.desc = cc-desc; - et-cc.r = r; - et-cc.g = g; - et-cc.b = b; - et-cc.a = a; - et-cc.r2 = r2; - et-cc.g2 = g2; - et-cc.b2 = b2; - et-cc.a2 = a2; - et-cc.r3 = r3; - et-cc.g3 = g3; - et-cc.b3 = b3; - et-cc.a3 = a3; *data = et-cc; return EINA_TRUE; --
[EGIT] [core/efl] master 01/01: evas/software_x11: Environment can influence the flow when the value is 1 not else.
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=22fafce84d015368ac4838d7fd129f76218df9da
commit 22fafce84d015368ac4838d7fd129f76218df9da
Author: Minkyoung Kim mer@samsung.com
Date: Tue Mar 31 14:13:06 2015 +0900
evas/software_x11: Environment can influence the flow when the value is 1
not else.
Summary: Do not try swapbuf init only if value of env 'EVAS_NO_DRI_SWAPBUF'
is 1.
Reviewers: jpeg
Subscribers: spacegrapher, cedric, wonsik
Differential Revision: https://phab.enlightenment.org/D2259
---
src/modules/evas/engines/software_x11/evas_engine.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c
b/src/modules/evas/engines/software_x11/evas_engine.c
index 65bb4df..91cf336 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -442,10 +442,15 @@ eng_setup(Evas *eo_e, void *in)
if (info-info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB)
{
static int try_swapbuf = -1;
+ char* s;
if (try_swapbuf == -1)
{
- if (getenv(EVAS_NO_DRI_SWAPBUF)) try_swapbuf = 0;
+ if ((s = getenv(EVAS_NO_DRI_SWAPBUF)) != NULL)
+{
+ if (atoi(s) == 1) try_swapbuf = 0;
+ else try_swapbuf = 1;
+}
else try_swapbuf = 1;
}
if (try_swapbuf)
@@ -459,7 +464,7 @@ eng_setup(Evas *eo_e, void *in)
info-info.mask,
info-info.shape_dither,
info-info.destination_alpha);
if (re) re-outbuf_alpha_get =
evas_software_xlib_swapbuf_alpha_get;
- else if (!re)
+ else
{
re = _output_xlib_setup(e-output.w, e-output.h,
info-info.rotation,
info-info.connection,
--
[EGIT] [core/enlightenment] master 01/01: move wl E_Client creation to same place as E_Pixmap creation
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=617c2d96ff39ea8b1dce9f19490f0b61d6faf5be
commit 617c2d96ff39ea8b1dce9f19490f0b61d6faf5be
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Mar 30 12:13:04 2015 -0400
move wl E_Client creation to same place as E_Pixmap creation
ensure that surface manipulation functions will succeed even with no shell
surface
---
src/bin/e_comp_wl.c | 8 -
src/bin/e_comp_wl_input.c | 16 +-
src/modules/wl_desktop_shell/e_mod_main.c | 50 ---
3 files changed, 28 insertions(+), 46 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 273796f..73522d9 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1362,6 +1362,7 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client
*client, struct wl_reso
{
struct wl_resource *res;
E_Pixmap *ep;
+ E_Client *ec;
uint64_t win;
pid_t pid;
@@ -1392,9 +1393,14 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client
*client, struct wl_reso
wl_client_post_no_memory(client);
return;
}
-
DBG(\tUsing Pixmap: %p, ep);
+ ec = e_client_new(ep, 0, 0);
+ ec-new_client = 0;
+ e_comp-new_clients--;
+ ec-client.w = ec-client.h = 1;
+ ec-ignored = 1;
+
/* set reference to pixmap so we can fetch it later */
wl_resource_set_user_data(res, ep);
diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index b58ae57..a0e322e 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -34,6 +34,7 @@ _e_comp_wl_input_pointer_cb_cursor_set(struct wl_client
*client, struct wl_resou
pid_t pid;
E_Client *ec;
uint64_t sid;
+ Eina_List *l;
Eina_Bool got_mouse = EINA_FALSE;
/* get compositor data */
@@ -56,20 +57,19 @@ _e_comp_wl_input_pointer_cb_cursor_set(struct wl_client
*client, struct wl_resou
}
wl_client_get_credentials(client, pid, NULL, NULL);
sid = e_comp_wl_id_get(wl_resource_get_id(surface_resource), pid);
- if (!(ec = e_pixmap_find_client(E_PIXMAP_TYPE_WL, sid)))
+ ec = e_pixmap_find_client(E_PIXMAP_TYPE_WL, sid);
+ if (!ec-re_manage)
{
-Eina_List *l;
+ec-re_manage = 1;
+ec-ignored = 0;
-ec = e_client_new(e_pixmap_new(E_PIXMAP_TYPE_WL, sid), 1, 0);
ec-lock_focus_out = ec-layer_block = ec-visible = ec-override = 1;
-ec-new_client = 0;
-e_comp-new_clients--;
ec-icccm.title = eina_stringshare_add(noshadow);
evas_object_pass_events_set(ec-frame, 1);
-ec-client.w = ec-client.h = 1;
-l = e_client_focus_stack_get();
-e_client_focus_stack_set(eina_list_remove(l, ec));
+e_client_focus_stack_set(eina_list_remove(e_client_focus_stack_get(),
ec));
+EC_CHANGED(ec);
}
+
/* ignore cursor changes during resize/move I guess */
if (e_client_action_get()) return;
e_pointer_object_set(e_comp-pointer, ec-frame, x, y);
diff --git a/src/modules/wl_desktop_shell/e_mod_main.c
b/src/modules/wl_desktop_shell/e_mod_main.c
index 62a770d..2efabae 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -566,16 +566,10 @@ _e_shell_cb_shell_surface_get(struct wl_client *client,
struct wl_resource *reso
/* find the client for this pixmap */
ec = e_pixmap_client_get(ep);
- if (ec (!ec-internal))
- e_pixmap_ref(ec-pixmap);
- else if ((!ec) (!(ec = e_client_new(ep, 0, 0
- {
-wl_resource_post_error(surface_resource,
- WL_DISPLAY_ERROR_INVALID_OBJECT,
- No Client For Pixmap);
-return;
- }
- ec-netwm.ping = EINA_TRUE;
+ EC_CHANGED(ec);
+ ec-new_client = ec-netwm.ping = EINA_TRUE;
+ e_comp-new_clients++;
+ ec-ignored = 0;
/* get the client data */
if (!(cdata = ec-comp_data))
@@ -1008,7 +1002,6 @@ static void
_e_xdg_shell_surface_configure(struct wl_resource *resource, Evas_Coord x,
Evas_Coord y, Evas_Coord w, Evas_Coord h)
{
E_Client *ec;
- Eina_Bool new_client;
/* DBG(XDG_SHELL: Surface Configure: %d \t%d %d %d %d, */
/* wl_resource_get_id(resource), x, y, w, h); */
@@ -1033,11 +1026,7 @@ _e_xdg_shell_surface_configure(struct wl_resource
*resource, Evas_Coord x, Evas_
}
}
- /* ensure resize succeeds */
- new_client = ec-new_client;
- ec-new_client = 0;
e_client_util_move_resize_without_frame(ec, x, y, w, h);
- ec-new_client = new_client;
/* TODO: ack configure ?? */
}
@@ -1141,17 +1130,10 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client,
struct wl_resource *resour
/* find the client for this pixmap */
ec = e_pixmap_client_get(ep);
- if (ec (!ec-internal))
- e_pixmap_ref(ec-pixmap);
- else if ((!ec) (!(ec = e_client_new(ep, 0, 0
- {
-
