[EGIT] [core/efl] master 01/01: eolian/generator: fix turning values into @return when generating docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9b0cd29268e73a9d7b8d1a81dfa63f4f6d0586ea
commit 9b0cd29268e73a9d7b8d1a81dfa63f4f6d0586ea
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Mon Aug 10 16:25:55 2015 +0100
eolian/generator: fix turning values into @return when generating docs
@fix
---
src/bin/eolian/docs_generator.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bin/eolian/docs_generator.c b/src/bin/eolian/docs_generator.c
index 2404127..ec04bd0 100644
--- a/src/bin/eolian/docs_generator.c
+++ b/src/bin/eolian/docs_generator.c
@@ -371,7 +371,7 @@ docs_generate_function(const Eolian_Function *fid,
Eolian_Function_Type ftype,
}
}
- if (!itr || !eina_iterator_next(itr, (void**)par))
+ if (itr !eina_iterator_next(itr, (void**)par))
{
eina_iterator_free(itr);
itr = NULL;
@@ -380,11 +380,12 @@ docs_generate_function(const Eolian_Function *fid,
Eolian_Function_Type ftype,
/* when return is not set on getter, value becomes return instead of param
*/
if (ftype == EOLIAN_PROP_GET !eolian_function_return_type_get(fid,
ftype))
{
+const Eolian_Function_Parameter *rvpar = vpar;
if (!eina_iterator_next(vitr, (void**)vpar))
{
/* one value - not out param */
eina_iterator_free(vitr);
- rdoc = eolian_parameter_documentation_get(vpar);
+ rdoc = rvpar ? eolian_parameter_documentation_get(rvpar) : NULL;
vitr = NULL;
vpar = NULL;
}
--
[EGIT] [apps/ephoto] master 01/01: Ephoto: Start working on allowing translation again. Translators: UPDATE!
okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=ba04557967e41651f7c2241a695c68cc5b957695 commit ba04557967e41651f7c2241a695c68cc5b957695 Author: Stephen Houston smhousto...@gmail.com Date: Mon Aug 10 11:38:23 2015 -0500 Ephoto: Start working on allowing translation again. Translators: UPDATE! --- src/bin/ephoto.h| 1 + src/bin/ephoto_config.c | 11 +++--- src/bin/ephoto_single_browser.c | 75 +++-- src/bin/ephoto_thumb_browser.c | 26 +++--- 4 files changed, 63 insertions(+), 50 deletions(-) diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h index 818957c..0b7994a 100644 --- a/src/bin/ephoto.h +++ b/src/bin/ephoto.h @@ -21,6 +21,7 @@ #include stdlib.h #include string.h #include dirent.h +#include gettext.h typedef struct _Ephoto_Config Ephoto_Config; typedef struct _Ephoto Ephoto; diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c index 44ce11d..4fd821f 100644 --- a/src/bin/ephoto_config.c +++ b/src/bin/ephoto_config.c @@ -145,7 +145,7 @@ _add_slideshow_config(Evas_Object *parent, Ephoto *ephoto) ephoto-config-slide_time = spinner; label = elm_label_add(table); - elm_object_text_set(label, bSlide Transition: /b); + elm_object_text_set(label, bSlide Transition:/b); evas_object_size_hint_align_set(label, 1.0, EVAS_HINT_FILL); elm_table_pack(table, label, 0, 2, 1, 1); evas_object_show(label); @@ -170,22 +170,24 @@ _add_slideshow_config(Evas_Object *parent, Ephoto *ephoto) evas_object_show(hbox); ic = elm_icon_add(hbox); + elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_standard_set(ic, document-save); button = elm_button_add(hbox); - elm_object_text_set(button, Save); + elm_object_text_set(button, _(Save)); elm_object_part_content_set(button, icon, ic); evas_object_smart_callback_add(button, clicked, _save, ephoto); elm_box_pack_end(hbox, button); evas_object_show(button); ic = elm_icon_add(hbox); + elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_standard_set(ic, window-close); button = elm_button_add(hbox); - elm_object_text_set(button, Cancel); + elm_object_text_set(button, _(Cancel)); elm_object_part_content_set(button, icon, ic); evas_object_smart_callback_add(button, clicked, _close, ephoto); elm_box_pack_end(hbox, button); @@ -268,11 +270,12 @@ _add_about_config(Evas_Object *parent, Ephoto *ephoto) evas_object_show(label); ic = elm_icon_add(box); + elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_standard_set(ic, window-close); button = elm_button_add(box); - elm_object_text_set(button, Close); + elm_object_text_set(button, _(Close)); elm_object_part_content_set(button, icon, ic); evas_object_smart_callback_add(button, clicked, _close, ephoto); elm_box_pack_end(box, button); diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c index c90f1da..d8f5a2d 100644 --- a/src/bin/ephoto_single_browser.c +++ b/src/bin/ephoto_single_browser.c @@ -588,20 +588,22 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb) evas_object_show(sb-botbox); ic = elm_icon_add(sb-botbox); + elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_standard_set(ic, document-save); button = elm_button_add(sb-botbox); - elm_object_text_set(button, Apply); + elm_object_text_set(button, _(Apply)); elm_object_part_content_set(button, icon, ic); evas_object_smart_callback_add(button, clicked, _apply_crop, sb); elm_box_pack_end(sb-botbox, button); evas_object_show(button); ic = elm_icon_add(sb-botbox); + elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_standard_set(ic, window-close); button = elm_button_add(sb-botbox); - elm_object_text_set(button, Cancel); + elm_object_text_set(button, _(Cancel)); elm_object_part_content_set(button, icon, ic); evas_object_smart_callback_add(button, clicked, _cancel_crop, sb); elm_box_pack_end(sb-botbox, button); @@ -813,7 +815,7 @@ _reset_image(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
[EGIT] [core/elementary] master 01/01: Image: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e319d4a5908a60fe9f6a4c7b7e26cf5e33a02082
commit e319d4a5908a60fe9f6a4c7b7e26cf5e33a02082
Author: Tom Hacohen t...@stosb.com
Date: Mon Aug 10 18:37:13 2015 +0100
Image: migrate docs.
---
src/lib/elm_image.eo | 392 +++
1 file changed, 112 insertions(+), 280 deletions(-)
diff --git a/src/lib/elm_image.eo b/src/lib/elm_image.eo
index c17b26b..0040e2f 100644
--- a/src/lib/elm_image.eo
+++ b/src/lib/elm_image.eo
@@ -6,430 +6,262 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image,
Evas.Clickable_Interface,
eo_prefix: elm_obj_image;
methods {
@property editable {
- set {
-/*@
-Make the image 'editable'.
-
-This means the image is a valid drag target for drag and drop, and
can be
-cut or pasted too.
+ [[Contrtol if thhe image is 'editable'.
-@ingroup Image */
+ This means the image is a valid drag target for drag and drop, and
can be
+ cut or pasted too.]]
+ set {
}
get {
-/*@
-Check if the image is 'editable'.
-
-@return Editability.
-
-A return value of true means the image is a valid drag target
-for drag and drop, and can be cut or pasted too.
-
-@ingroup Image */
}
values {
-set: bool; /*@ Turn on or off editability. Default is $false. */
+set: bool; [[Turn on or off editability. Default is $false.]]
}
}
@property resize_down {
- set {
-/*@
- Set whether the object's image can be resized to a size smaller
than the original one.
+ [[Control whether the object's image can be resized to a size smaller
than the original one.
- @ingroup Image
- @since 1.7
- */
+ @since 1.7]]
+ set {
legacy: null;
}
get {
-/*@
- Get whether the object's image can be resized to a size smaller
than the original one.
-
- @ingroup Image
- @since 1.7
- */
legacy: null;
}
values {
-resize_down: bool; /*@ whether resizing down is allowed */
+resize_down: bool; [[whether resizing down is allowed]]
}
}
@property resize_up {
- set {
-/*@
- Set whether the object's image can be resized to a size larget
than the original one.
+ [[Control whether the object's image can be resized to a size larget
than the original one.
- @ingroup Image
- @since 1.7
- */
+ @since 1.7]]
+ set {
legacy: null;
}
get {
-/*@
- Get whether the object's image can be resized to a size larget
than the original one.
-
- @ingroup Image
- @since 1.7
- */
legacy: null;
}
values {
-resize_up: bool; /*@ whether resizing up is allowed */
+resize_up: bool; [[whether resizing up is allowed]]
}
}
@property smooth {
- set {
-/*@
-Set the smooth effect for an image.
-
-Set the scaling algorithm to be used when scaling the image. Smooth
-scaling provides a better resulting image, but is slower.
-
-The smooth scaling should be disabled when making animations that
change
-the image size, since it will be faster. Animations that don't
require
-resizing of the image can keep the smooth scaling enabled (even if
the
-image is already scaled, since the scaled image will be cached).
+ [[Control the smooth effect for an image.
-@see elm_image_smooth_get()
+ Set the scaling algorithm to be used when scaling the image. Smooth
+ scaling provides a better resulting image, but is slower.
-@ingroup Image */
+ The smooth scaling should be disabled when making animations that
change
+ the image size, since it will be faster. Animations that don't
require
+ resizing of the image can keep the smooth scaling enabled (even if
the
+ image is already scaled, since the scaled image will be cached).]]
+ set {
}
get {
-/*@
-Get the smooth effect for an image.
-
-@return $true if smooth scaling is enabled, $false otherwise.
-
-@see elm_image_smooth_set()
-
-@ingroup Image */
}
values {
-smooth: bool; /*@ $true if smooth scaling should be used, $false
-otherwise. Default is $true. */
+
[EGIT] [core/enlightenment] master 01/01: Merge branch 'devs/bu5hm4n/mixer'
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c61320ce72e67ca66fba1d652e1a7da44d8ab67e commit c61320ce72e67ca66fba1d652e1a7da44d8ab67e Merge: 23a164e 5675ed2 Author: Marcel Hollerbach marcel-hollerb...@t-online.de Date: Mon Aug 10 19:48:10 2015 +0200 Merge branch 'devs/bu5hm4n/mixer' This merge fixes problems which where discovered by the mail [e-users] alsa NOT mixer? src/modules/mixer/e_mod_main.c | 15 ++- src/modules/mixer/lib/backends/alsa/alsa.c | 14 +++--- 2 files changed, 21 insertions(+), 8 deletions(-) --
[EGIT] [core/efl] master 01/01: ecore-x: provide property state in Ecore_X_Event_Window_Property
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5032cf0df39641fd778d770413f6d3a5aef18694 commit 5032cf0df39641fd778d770413f6d3a5aef18694 Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Mon Aug 10 13:17:33 2015 -0400 ecore-x: provide property state in Ecore_X_Event_Window_Property this event is not very useful without the state member. @feature --- src/lib/ecore_x/Ecore_X.h | 1 + src/lib/ecore_x/xcb/ecore_xcb_events.c | 1 + src/lib/ecore_x/xlib/ecore_x_events.c | 1 + 3 files changed, 3 insertions(+) diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h index 99bc281..f5c2da4 100644 --- a/src/lib/ecore_x/Ecore_X.h +++ b/src/lib/ecore_x/Ecore_X.h @@ -680,6 +680,7 @@ struct _Ecore_X_Event_Window_Property Ecore_X_Window win; Ecore_X_Atom atom; Ecore_X_Time time; + Eina_Bool state; /** @since 1.16 If @c EINA_TRUE, property was deleted */ }; struct _Ecore_X_Event_Window_Colormap diff --git a/src/lib/ecore_x/xcb/ecore_xcb_events.c b/src/lib/ecore_x/xcb/ecore_xcb_events.c index a1a3a9c..1d837d8 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_events.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_events.c @@ -1235,6 +1235,7 @@ _ecore_xcb_event_handle_property_notify(xcb_generic_event_t *event) e-win = ev-window; e-atom = ev-atom; e-time = ev-time; + e-state = !!ev-state; _ecore_xcb_event_last_time = e-time; ecore_event_add(ECORE_X_EVENT_WINDOW_PROPERTY, e, NULL, NULL); diff --git a/src/lib/ecore_x/xlib/ecore_x_events.c b/src/lib/ecore_x/xlib/ecore_x_events.c index 2586875..c8cd012 100644 --- a/src/lib/ecore_x/xlib/ecore_x_events.c +++ b/src/lib/ecore_x/xlib/ecore_x_events.c @@ -1351,6 +1351,7 @@ _ecore_x_event_handle_property_notify(XEvent *xevent) e-win = xevent-xproperty.window; e-atom = xevent-xproperty.atom; e-time = xevent-xproperty.time; + e-state = !!xevent-xproperty.state; _ecore_x_event_last_time = e-time; ecore_event_add(ECORE_X_EVENT_WINDOW_PROPERTY, e, NULL, NULL); } --
[EGIT] [apps/ephoto] master 01/01: Ephoto: Include gettext.h
okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=87f4c655ea05f8b46a6bf89a486a50ef0ca774bd commit 87f4c655ea05f8b46a6bf89a486a50ef0ca774bd Author: Stephen Houston smhousto...@gmail.com Date: Mon Aug 10 13:53:15 2015 -0500 Ephoto: Include gettext.h --- src/bin/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index bde2f99..fbd6f27 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -22,5 +22,5 @@ ephoto_SOURCES = \ ephoto_slideshow.c \ ephoto_cropper.c -noinst_HEADERS = ephoto.h -EXTRA_DIST = ephoto.h +noinst_HEADERS = ephoto.h gettext.h +EXTRA_DIST = ephoto.h gettext.h --
[EGIT] [core/enlightenment] master 01/01: README.Wayland: Update to latest configure options and mention xwayland
stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=23a164e753a7db5043c59c2ae4696d1fc8012000 commit 23a164e753a7db5043c59c2ae4696d1fc8012000 Author: Stefan Schmidt ste...@osg.samsung.com Date: Mon Aug 10 17:00:25 2015 +0200 README.Wayland: Update to latest configure options and mention xwayland Many of them have been out of date. Remove what is no longer needed and mention XWayland. --- README.wayland | 19 ++- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/README.wayland b/README.wayland index b210a52..0ff7269 100644 --- a/README.wayland +++ b/README.wayland @@ -61,23 +61,16 @@ This can be done by passing: Now, on to the magic bits ;) -In order for Enlightenment to be compiled without X11, using Wayland -only, you will need to pass a few more options to the configure stage -of Enlightenment: +In order for Enlightenment to be compiled as Wayland compositor you will need to +pass a few more options to the configure stage of Enlightenment: - --enable-wayland-only - --enable-wl-drm + --enable-wayland -Since this is all still a work-in-progress, there are a few -Enlightenment modules that have not been fixed to work without X11 -yet. Those will need to be disabled if you enabled the wayland-only -option: - --disable-shot - --disable-xkbswitch - --disable-conf-randr - --disable-wl-x11 +If you also want support for running X applications under Wayland you might want +to try out XWayland support: + --enable-xwayland At this stage, you should have EFL properly built, and Enlightenment properly built. Let's move on to running it... --
[EGIT] [apps/ephoto] master 01/01: Ephoto: Lookup FDO icons first.
okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=3e3a4308b488b9dda5ea4d3a58b254a4f6053660 commit 3e3a4308b488b9dda5ea4d3a58b254a4f6053660 Author: Stephen Houston smhousto...@gmail.com Date: Mon Aug 10 10:42:02 2015 -0500 Ephoto: Lookup FDO icons first. --- src/bin/ephoto_config.c | 1 + src/bin/ephoto_single_browser.c | 1 + src/bin/ephoto_thumb_browser.c | 7 +++ 3 files changed, 9 insertions(+) diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c index 97ae33d..44ce11d 100644 --- a/src/bin/ephoto_config.c +++ b/src/bin/ephoto_config.c @@ -311,6 +311,7 @@ ephoto_config_window(Ephoto *ephoto) elm_toolbar_homogeneous_set(toolbar, EINA_TRUE); elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_SCROLL); elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_NONE); + elm_toolbar_icon_order_lookup_set(toolbar, ELM_ICON_LOOKUP_FDO_THEME); evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(box, toolbar); diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c index 7c7ae72..c90f1da 100644 --- a/src/bin/ephoto_single_browser.c +++ b/src/bin/ephoto_single_browser.c @@ -1480,6 +1480,7 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent) elm_toolbar_homogeneous_set(sb-bar, EINA_TRUE); elm_toolbar_shrink_mode_set(sb-bar, ELM_TOOLBAR_SHRINK_SCROLL); elm_toolbar_select_mode_set(sb-bar, ELM_OBJECT_SELECT_MODE_NONE); + elm_toolbar_icon_order_lookup_set(sb-bar, ELM_ICON_LOOKUP_FDO_THEME); evas_object_size_hint_weight_set(sb-bar, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(sb-bar, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c index 8547980..485711b 100644 --- a/src/bin/ephoto_thumb_browser.c +++ b/src/bin/ephoto_thumb_browser.c @@ -89,6 +89,7 @@ _ephoto_dir_item_icon_get(void *data EINA_UNUSED, Evas_Object *obj, const char * if (!strcmp(part, elm.swallow.end)) return NULL; Evas_Object *ic = elm_icon_add(obj); + elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME); elm_icon_standard_set(ic, folder); return ic; } @@ -382,6 +383,7 @@ _ephoto_dir_hide_folders(void *data, Evas_Object *obj EINA_UNUSED, void *event_i elm_toolbar_homogeneous_set(tb-vbar, EINA_TRUE); elm_toolbar_shrink_mode_set(tb-vbar, ELM_TOOLBAR_SHRINK_NONE); elm_toolbar_select_mode_set(tb-vbar, ELM_OBJECT_SELECT_MODE_NONE); + elm_toolbar_icon_order_lookup_set(tb-vbar, ELM_ICON_LOOKUP_FDO_THEME); elm_toolbar_align_set(tb-vbar, 0.0); evas_object_size_hint_weight_set(tb-vbar, 0.0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(tb-vbar, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -399,6 +401,7 @@ _ephoto_dir_hide_folders(void *data, Evas_Object *obj EINA_UNUSED, void *event_i evas_object_show(tb-vbar); ic = elm_icon_add(tb-bleftbox); + elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME); elm_icon_standard_set(ic, go-next); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); but = elm_button_add(tb-bleftbox); @@ -795,6 +798,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) elm_toolbar_homogeneous_set(tb-bar, EINA_TRUE); elm_toolbar_shrink_mode_set(tb-bar, ELM_TOOLBAR_SHRINK_NONE); elm_toolbar_select_mode_set(tb-bar, ELM_OBJECT_SELECT_MODE_NONE); + elm_toolbar_icon_order_lookup_set(tb-bar, ELM_ICON_LOOKUP_FDO_THEME); evas_object_size_hint_weight_set(tb-bar, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(tb-bar, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -827,6 +831,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) evas_object_show(hbox); ic = elm_icon_add(hbox); + elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME); elm_icon_standard_set(ic, go-up); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); but = elm_button_add(hbox); @@ -839,6 +844,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) evas_object_show(but); ic = elm_icon_add(hbox); + elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME); elm_icon_standard_set(ic, go-home); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); but = elm_button_add(hbox); @@ -859,6 +865,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) evas_object_show(tb-fsel); ic = elm_icon_add(hbox); + elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME); elm_icon_standard_set(ic, go-previous); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); but = elm_button_add(hbox); --
[EGIT] [apps/ephoto] master 01/01: Adding italian translation
maxerba pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=03a4be0992b97580f0ccf20424b40cc9cb99f435 commit 03a4be0992b97580f0ccf20424b40cc9cb99f435 Author: maxerba maiur...@gmail.com Date: Mon Aug 10 21:19:08 2015 +0200 Adding italian translation --- po/LINGUAS | 1 + po/it.po | 159 + 2 files changed, 160 insertions(+) diff --git a/po/LINGUAS b/po/LINGUAS index e69de29..7d5856f 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -0,0 +1 @@ +it diff --git a/po/it.po b/po/it.po new file mode 100644 index 000..ab3540f --- /dev/null +++ b/po/it.po @@ -0,0 +1,159 @@ +# Italian translation for Ephoto. +# Copyright (C) YEAR Stephen okra Houston +# This file is distributed under the same license as the PACKAGE package. +# Massimo Maiurana maiur...@gmail.com, 2015. +# +msgid +msgstr +Project-Id-Version: ephoto 0.1.1\n +Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n +POT-Creation-Date: 2015-08-10 20:25+0200\n +PO-Revision-Date: 2015-08-10 21:10+0200\n +Last-Translator: Massimo Maiurana maiur...@gmail.com\n +Language-Team: none\n +Language: it\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n + +#: src/bin/ephoto_config.c:178 src/bin/ephoto_single_browser.c:1503 +msgid Save +msgstr Salva + +#: src/bin/ephoto_config.c:190 src/bin/ephoto_single_browser.c:606 +msgid Cancel +msgstr Annulla + +#: src/bin/ephoto_config.c:278 +msgid Close +msgstr Chiudi + +#: src/bin/ephoto_thumb_browser.c:391 src/bin/ephoto_thumb_browser.c:805 +#: src/bin/ephoto_single_browser.c:1521 +msgid Zoom In +msgstr Zoom avanti + +#: src/bin/ephoto_thumb_browser.c:393 src/bin/ephoto_thumb_browser.c:807 +#: src/bin/ephoto_single_browser.c:1522 +msgid Zoom Out +msgstr Zoom indietro + +#: src/bin/ephoto_thumb_browser.c:397 src/bin/ephoto_thumb_browser.c:811 +#: src/bin/ephoto_single_browser.c:1528 +msgid Slideshow +msgstr Presentazione + +#: src/bin/ephoto_thumb_browser.c:398 src/bin/ephoto_thumb_browser.c:812 +#: src/bin/ephoto_single_browser.c:1529 +msgid Settings +msgstr Impostazioni + +#: src/bin/ephoto_thumb_browser.c:409 +msgid Show the file selector +msgstr Mostra selettore file + +#: src/bin/ephoto_thumb_browser.c:677 +msgid There are no images in this directory +msgstr Non ci sono immagini in questa directory + +#: src/bin/ephoto_thumb_browser.c:839 +msgid Up +msgstr Su + +#: src/bin/ephoto_thumb_browser.c:852 +msgid Home +msgstr Home + +#: src/bin/ephoto_thumb_browser.c:873 +msgid Hide the file selector +msgstr Nascondi selettore file + +#: src/bin/ephoto_single_browser.c:595 +msgid Apply +msgstr Applica + +#: src/bin/ephoto_single_browser.c:818 +msgid Are you sure you want to reset your changes? +msgstr Siete sicuri di voler annullare i cambiamenti? + +#: src/bin/ephoto_single_browser.c:837 src/bin/ephoto_single_browser.c:970 +#: src/bin/ephoto_single_browser.c:1076 +msgid Yes +msgstr Sì + +#: src/bin/ephoto_single_browser.c:849 src/bin/ephoto_single_browser.c:982 +#: src/bin/ephoto_single_browser.c:1088 +msgid No +msgstr No + +#: src/bin/ephoto_single_browser.c:875 +msgid Error: Image could not be saved here! +msgstr Errore: l'imagine non può essere salvata qui! + +#: src/bin/ephoto_single_browser.c:887 +msgid OK +msgstr OK + +#: src/bin/ephoto_single_browser.c:951 src/bin/ephoto_single_browser.c:1057 +msgid Are you sure you want to overwrite this image? +msgstr Siete sicuri di voler sovrascrivere questa immagine? + +#: src/bin/ephoto_single_browser.c:1496 +msgid Back +msgstr Indietro + +#: src/bin/ephoto_single_browser.c:1497 +msgid Edit +msgstr Modifica + +#: src/bin/ephoto_single_browser.c:1502 +msgid Reset +msgstr Reimposta + +#: src/bin/ephoto_single_browser.c:1504 +msgid Save As +msgstr Salva con nome + +#: src/bin/ephoto_single_browser.c:1505 +msgid Crop +msgstr Ritaglia + +#: src/bin/ephoto_single_browser.c:1506 +msgid Rotate Left +msgstr Ruota a sinistra + +#: src/bin/ephoto_single_browser.c:1507 +msgid Rotate Right +msgstr Ruota a destra + +#: src/bin/ephoto_single_browser.c:1508 +msgid Flip Horizontal +msgstr Sfoglia orizzontalmente + +#: src/bin/ephoto_single_browser.c:1509 +msgid Flip Vertical +msgstr Sfoglia verticalmente + +#: src/bin/ephoto_single_browser.c:1514 +msgid First +msgstr Prima + +#: src/bin/ephoto_single_browser.c:1515 +msgid Previous +msgstr Precedente + +#: src/bin/ephoto_single_browser.c:1516 +msgid Next +msgstr Successiva + +#: src/bin/ephoto_single_browser.c:1517 +msgid Last +msgstr Ultima + +#: src/bin/ephoto_single_browser.c:1523 +msgid Zoom Fit +msgstr Adatta zoom + +#: src/bin/ephoto_single_browser.c:1524 +msgid Zoom 1:1 +msgstr Zoom 1:1 --
[EGIT] [apps/terminology] master 01/01: only use beacon when it seems efficient
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=fe58cd058b8ea4de70f519e608f40aef3ea09605
commit fe58cd058b8ea4de70f519e608f40aef3ea09605
Author: Boris Faure bill...@gmail.com
Date: Mon Aug 10 21:44:05 2015 +0200
only use beacon when it seems efficient
---
src/bin/termpty.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 50b86ab..66752da 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -792,6 +792,12 @@ _termpty_cellrow_from_beacon_get(Termpty *ty, int
requested_y, ssize_t *wret)
requested_y = -requested_y;
+ /* check if going from 0,0 is faster than using the beacon */
+ if (screen_y - requested_y requested_y)
+ {
+backlog_y = 1;
+screen_y = 1;
+ }
while (42) {
Termsave *ts;
int nb_lines;
--
[EGIT] [apps/ephoto] master 01/01: Ephoto: Use B instead of bytes and don't include a space between the number and acronym
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=d4a477db415dae8af55efef47628470aa2b04c59
commit d4a477db415dae8af55efef47628470aa2b04c59
Author: Stephen Houston smhousto...@gmail.com
Date: Mon Aug 10 16:20:30 2015 -0500
Ephoto: Use B instead of bytes and don't include a space between the number
and acronym
---
src/bin/ephoto_single_browser.c | 10 +-
src/bin/ephoto_thumb_browser.c | 10 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index fc6ebbd..42d8bf4 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -515,23 +515,23 @@ _ephoto_get_file_size(const char *path)
size_t size = eina_file_size_get(f);
eina_file_close(f);
double dsize = (double)size;
- if (dsize 1024.0) snprintf(isize, sizeof(isize), %'.0f %s, dsize,
_(bytes));
+ if (dsize 1024.0) snprintf(isize, sizeof(isize), %'.0f%s, dsize,
_(B));
else
{
dsize /= 1024.0;
-if (dsize 1024) snprintf(isize, sizeof(isize), %'.0f %s, dsize,
_(KB));
+if (dsize 1024) snprintf(isize, sizeof(isize), %'.0f%s, dsize,
_(KB));
else
{
dsize /= 1024.0;
- if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f %s,
dsize, _(MB));
+ if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f%s,
dsize, _(MB));
else
{
dsize /= 1024.0;
- if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f %s,
dsize, _(GB));
+ if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f%s,
dsize, _(GB));
else
{
dsize /= 1024.0;
- snprintf(isize, sizeof(isize), %'.1f %s, dsize,
_(TB));
+ snprintf(isize, sizeof(isize), %'.1f%s, dsize,
_(TB));
}
}
}
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index 74759c2..bebc00b 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -713,23 +713,23 @@ _ephoto_thumb_populate_end(void *data, int type
EINA_UNUSED, void *event EINA_UN
char isize[PATH_MAX];
char image_info[PATH_MAX];
-if (tb-totsize 1024.0) snprintf(isize, sizeof(isize), %'.0f %s,
tb-totsize, _(bytes));
+if (tb-totsize 1024.0) snprintf(isize, sizeof(isize), %'.0f%s,
tb-totsize, _(B));
else
{
tb-totsize /= 1024.0;
- if (tb-totsize 1024) snprintf(isize, sizeof(isize), %'.0f
%s, tb-totsize, _(KB));
+ if (tb-totsize 1024) snprintf(isize, sizeof(isize), %'.0f%s,
tb-totsize, _(KB));
else
{
tb-totsize /= 1024.0;
- if (tb-totsize 1024) snprintf(isize, sizeof(isize),
%'.1f %s, tb-totsize, _(MB));
+ if (tb-totsize 1024) snprintf(isize, sizeof(isize),
%'.1f%s, tb-totsize, _(MB));
else
{
tb-totsize /= 1024.0;
- if (tb-totsize 1024) snprintf(isize, sizeof(isize),
%'.1f %s, tb-totsize, _(GB));
+ if (tb-totsize 1024) snprintf(isize, sizeof(isize),
%'.1f%s, tb-totsize, _(GB));
else
{
tb-totsize /= 1024.0;
-snprintf(isize, sizeof(isize), %'.1f %s,
tb-totsize, _(TB));
+snprintf(isize, sizeof(isize), %'.1f%s,
tb-totsize, _(TB));
}
}
}
--
[EGIT] [apps/ephoto] master 01/01: EPhoto: Add plural translating
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=de374892ee778d163fb6ba6f42fdf31426d2044b
commit de374892ee778d163fb6ba6f42fdf31426d2044b
Author: Stephen Houston smhousto...@gmail.com
Date: Mon Aug 10 16:46:35 2015 -0500
EPhoto: Add plural translating
---
src/bin/ephoto_config.c | 8 +---
src/bin/ephoto_single_browser.c | 10 +-
src/bin/ephoto_thumb_browser.c | 14 +++---
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 83cce2a..4b1b57f 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -140,7 +140,9 @@ _add_slideshow_config(Evas_Object *parent, Ephoto *ephoto)
spinner = elm_spinner_add(table);
elm_spinner_editable_set(spinner, EINA_TRUE);
- elm_spinner_label_format_set(spinner, %1.0f seconds);
+ memset(buf, 0, PATH_MAX);
+ snprintf(buf, PATH_MAX, %%1.0f %s, _(seconds));
+ elm_spinner_label_format_set(spinner, buf);
elm_spinner_step_set(spinner, 1);
elm_spinner_value_set(spinner, ephoto-config-slideshow_timeout);
elm_spinner_min_max_set(spinner, 1, 60);
@@ -223,14 +225,14 @@ _add_about_config(Evas_Object *parent, Ephoto *ephoto)
label = elm_label_add(scroller);
evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
- eina_strbuf_append_printf(sbuf, bAbout Ephoto/bbr/
+ eina_strbuf_append_printf(sbuf, _(bAbout Ephoto/bbr/
Ephoto is a comprehensive image viewer based on the EFL.br/
For more information, please visit the Ephoto project page on the
Enlightenment wiki:br/
https://phab.enlightenment.org/w/projects/ephotobr/
Ephoto's source can be found through Enlightenment's git:br/
http://git.enlightenment.org/apps/ephoto.gitbr/
br/
- bAuthors:/bbr/);
+ bAuthors:/bbr/));
f = fopen(PACKAGE_DATA_DIR /AUTHORS, r);
if (f)
{
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 42d8bf4..ee7c491 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -515,23 +515,23 @@ _ephoto_get_file_size(const char *path)
size_t size = eina_file_size_get(f);
eina_file_close(f);
double dsize = (double)size;
- if (dsize 1024.0) snprintf(isize, sizeof(isize), %'.0f%s, dsize,
_(B));
+ if (dsize 1024.0) snprintf(isize, sizeof(isize), %'.0f%s, dsize,
ngettext(B, Bs, dsize));
else
{
dsize /= 1024.0;
-if (dsize 1024) snprintf(isize, sizeof(isize), %'.0f%s, dsize,
_(KB));
+if (dsize 1024) snprintf(isize, sizeof(isize), %'.0f%s, dsize,
ngettext(KB, KBs, dsize));
else
{
dsize /= 1024.0;
- if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f%s,
dsize, _(MB));
+ if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f%s,
dsize, ngettext(MB, MBs, dsize));
else
{
dsize /= 1024.0;
- if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f%s,
dsize, _(GB));
+ if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f%s,
dsize, ngettext(GB, GBs, dsize));
else
{
dsize /= 1024.0;
- snprintf(isize, sizeof(isize), %'.1f%s, dsize,
_(TB));
+ snprintf(isize, sizeof(isize), %'.1f%s, dsize,
ngettext(TB, TBs, dsize));
}
}
}
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index bebc00b..59ed238 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -698,7 +698,7 @@ _ephoto_thumb_populate_end(void *data, int type
EINA_UNUSED, void *event EINA_UN
evas_object_size_hint_align_set(tb-nolabel, EVAS_HINT_FILL,
EVAS_HINT_FILL);
elm_table_pack(tb-table, tb-nolabel, 0, 0, 4, 1);
evas_object_show(tb-nolabel);
- snprintf(buf, PATH_MAX, b%s:/b 0 %sb%s:/b 0 %s,
_(Total), _(images), _(Size), _(bytes));
+ snprintf(buf, PATH_MAX, b%s:/b 0 %sb%s:/b 0%s,
_(Total), ngettext(image, images, 0), _(Size), ngettext(B, Bs, 0));
elm_object_text_set(tb-infolabel, buf);
}
}
@@ -713,29 +713,29 @@ _ephoto_thumb_populate_end(void *data, int type
EINA_UNUSED, void *event EINA_UN
char isize[PATH_MAX];
char image_info[PATH_MAX];
-if (tb-totsize 1024.0) snprintf(isize, sizeof(isize), %'.0f%s,
tb-totsize, _(B));
+if (tb-totsize 1024.0) snprintf(isize, sizeof(isize), %'.0f%s,
tb-totsize, ngettext(B, Bs, tb-totsize));
else
{
tb-totsize /= 1024.0;
- if (tb-totsize 1024) snprintf(isize, sizeof(isize), %'.0f%s,
tb-totsize, _(KB));
+ if (tb-totsize 1024)
[EGIT] [apps/ephoto] master 01/01: Ephoto: Remove plural s for English.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=89bd893b4ca8a7d98fdc8a5a63fb3c82953db889
commit 89bd893b4ca8a7d98fdc8a5a63fb3c82953db889
Author: Stephen Houston smhousto...@gmail.com
Date: Mon Aug 10 16:51:37 2015 -0500
Ephoto: Remove plural s for English.
---
src/bin/ephoto_single_browser.c | 10 +-
src/bin/ephoto_thumb_browser.c | 12 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index ee7c491..dc83825 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -515,23 +515,23 @@ _ephoto_get_file_size(const char *path)
size_t size = eina_file_size_get(f);
eina_file_close(f);
double dsize = (double)size;
- if (dsize 1024.0) snprintf(isize, sizeof(isize), %'.0f%s, dsize,
ngettext(B, Bs, dsize));
+ if (dsize 1024.0) snprintf(isize, sizeof(isize), %'.0f%s, dsize,
ngettext(B, B, dsize));
else
{
dsize /= 1024.0;
-if (dsize 1024) snprintf(isize, sizeof(isize), %'.0f%s, dsize,
ngettext(KB, KBs, dsize));
+if (dsize 1024) snprintf(isize, sizeof(isize), %'.0f%s, dsize,
ngettext(KB, KB, dsize));
else
{
dsize /= 1024.0;
- if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f%s,
dsize, ngettext(MB, MBs, dsize));
+ if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f%s,
dsize, ngettext(MB, MB, dsize));
else
{
dsize /= 1024.0;
- if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f%s,
dsize, ngettext(GB, GBs, dsize));
+ if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f%s,
dsize, ngettext(GB, GB, dsize));
else
{
dsize /= 1024.0;
- snprintf(isize, sizeof(isize), %'.1f%s, dsize,
ngettext(TB, TBs, dsize));
+ snprintf(isize, sizeof(isize), %'.1f%s, dsize,
ngettext(TB, TB, dsize));
}
}
}
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index 59ed238..bc0f761 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -698,7 +698,7 @@ _ephoto_thumb_populate_end(void *data, int type
EINA_UNUSED, void *event EINA_UN
evas_object_size_hint_align_set(tb-nolabel, EVAS_HINT_FILL,
EVAS_HINT_FILL);
elm_table_pack(tb-table, tb-nolabel, 0, 0, 4, 1);
evas_object_show(tb-nolabel);
- snprintf(buf, PATH_MAX, b%s:/b 0 %sb%s:/b 0%s,
_(Total), ngettext(image, images, 0), _(Size), ngettext(B, Bs, 0));
+ snprintf(buf, PATH_MAX, b%s:/b 0 %sb%s:/b 0%s,
_(Total), ngettext(image, images, 0), _(Size), ngettext(B, B, 0));
elm_object_text_set(tb-infolabel, buf);
}
}
@@ -713,23 +713,23 @@ _ephoto_thumb_populate_end(void *data, int type
EINA_UNUSED, void *event EINA_UN
char isize[PATH_MAX];
char image_info[PATH_MAX];
-if (tb-totsize 1024.0) snprintf(isize, sizeof(isize), %'.0f%s,
tb-totsize, ngettext(B, Bs, tb-totsize));
+if (tb-totsize 1024.0) snprintf(isize, sizeof(isize), %'.0f%s,
tb-totsize, ngettext(B, B, tb-totsize));
else
{
tb-totsize /= 1024.0;
- if (tb-totsize 1024) snprintf(isize, sizeof(isize), %'.0f%s,
tb-totsize, ngettext(KB, KBs, tb-totsize));
+ if (tb-totsize 1024) snprintf(isize, sizeof(isize), %'.0f%s,
tb-totsize, ngettext(KB, KB, tb-totsize));
else
{
tb-totsize /= 1024.0;
- if (tb-totsize 1024) snprintf(isize, sizeof(isize),
%'.1f%s, tb-totsize, ngettext(MB, MBs, tb-totsize));
+ if (tb-totsize 1024) snprintf(isize, sizeof(isize),
%'.1f%s, tb-totsize, ngettext(MB, MB, tb-totsize));
else
{
tb-totsize /= 1024.0;
- if (tb-totsize 1024) snprintf(isize, sizeof(isize),
%'.1f%s, tb-totsize, ngettext(GB, GBs, tb-totsize));
+ if (tb-totsize 1024) snprintf(isize, sizeof(isize),
%'.1f%s, tb-totsize, ngettext(GB, GB, tb-totsize));
else
{
tb-totsize /= 1024.0;
-snprintf(isize, sizeof(isize), %'.1f%s,
tb-totsize, ngettext(TB, TBs, tb-totsize));
+snprintf(isize, sizeof(isize), %'.1f%s,
tb-totsize, ngettext(TB, TB, tb-totsize));
}
}
}
--
[EGIT] [apps/ephoto] master 01/01: Ephoto: Make directory entry work.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=d87aae7612bf9dd807415530b65c31ae35753be6
commit d87aae7612bf9dd807415530b65c31ae35753be6
Author: Stephen Houston smhousto...@gmail.com
Date: Mon Aug 10 16:05:35 2015 -0500
Ephoto: Make directory entry work.
---
src/bin/ephoto_thumb_browser.c | 15 +++
1 file changed, 15 insertions(+)
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index a21c1b6..74759c2 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -283,6 +283,20 @@ _ephoto_dir_go_up(void *data, Evas_Object *obj
EINA_UNUSED, void *event_info EIN
}
static void
+_ephoto_direntry_go(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+ const char *dir;
+ Ephoto_Thumb_Browser *tb = data;
+
+ dir = elm_object_text_get(tb-direntry);
+ if (ecore_file_is_dir(dir))
+ {
+ephoto_directory_set(tb-ephoto, dir);
+ephoto_title_set(tb-ephoto, tb-ephoto-config-directory);
+ }
+}
+
+static void
_ephoto_thumb_selected(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info)
{
Ephoto_Thumb_Browser *tb = data;
@@ -837,6 +851,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object
*parent)
evas_object_size_hint_align_set(tb-direntry, EVAS_HINT_FILL,
EVAS_HINT_FILL);
elm_object_text_set(tb-direntry, tb-ephoto-config-directory);
elm_box_pack_end(tb-leftbox, tb-direntry);
+ evas_object_smart_callback_add(tb-direntry, activated,
_ephoto_direntry_go, tb);
evas_object_show(tb-direntry);
hbox = elm_box_add(tb-leftbox);
--
[EGIT] [apps/ephoto] master 01/01: updated Czech translation
q66 pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=9948e11d8fe9171c55a79e8054871b0fd948dadb commit 9948e11d8fe9171c55a79e8054871b0fd948dadb Author: q66 dan...@octaforge.org Date: Mon Aug 10 22:06:46 2015 +0100 updated Czech translation --- po/LINGUAS | 2 +- po/cs.po | 137 ++--- 2 files changed, 113 insertions(+), 26 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS index 2058fea..7bd249c 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,3 +1,3 @@ +cs de it -cs diff --git a/po/cs.po b/po/cs.po index 4b7e9b3..dbe8ea8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,70 +7,128 @@ msgid msgstr Project-Id-Version: ephoto 0.1.1\n Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n -POT-Creation-Date: 2015-08-10 20:32+0100\n -PO-Revision-Date: 2015-08-10 20:45+0100\n +POT-Creation-Date: 2015-08-10 22:00+0100\n +PO-Revision-Date: 2015-08-10 22:07+0100\n Last-Translator: Daniel Kolesa dan...@octaforge.org\n Language-Team: none\n -Language: it\n +Language: cs\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -#: src/bin/ephoto_config.c:178 +#: src/bin/ephoto_config.c:128 +msgid Slideshow Options +msgstr Možnosti prezentace + +#: src/bin/ephoto_config.c:135 +msgid Show Each Slide For +msgstr Zobrazit každý obrázek + +#: src/bin/ephoto_config.c:153 +msgid Slide Transition +msgstr Přechod obrázků + +#: src/bin/ephoto_config.c:184 #: src/bin/ephoto_single_browser.c:1503 msgid Save msgstr Uložit -#: src/bin/ephoto_config.c:190 +#: src/bin/ephoto_config.c:196 #: src/bin/ephoto_single_browser.c:606 msgid Cancel msgstr Zrušit -#: src/bin/ephoto_config.c:278 +#: src/bin/ephoto_config.c:284 msgid Close msgstr Zavřít -#: src/bin/ephoto_thumb_browser.c:391 -#: src/bin/ephoto_thumb_browser.c:805 +#: src/bin/ephoto_config.c:341 +#: src/bin/ephoto_thumb_browser.c:401 +#: src/bin/ephoto_thumb_browser.c:817 +#: src/bin/ephoto_single_browser.c:1528 +msgid Slideshow +msgstr Prezentace + +#: src/bin/ephoto_config.c:346 +msgid About +msgstr O programu + +#: src/bin/ephoto_thumb_browser.c:395 +#: src/bin/ephoto_thumb_browser.c:811 #: src/bin/ephoto_single_browser.c:1521 msgid Zoom In msgstr Přiblížit -#: src/bin/ephoto_thumb_browser.c:393 -#: src/bin/ephoto_thumb_browser.c:807 +#: src/bin/ephoto_thumb_browser.c:397 +#: src/bin/ephoto_thumb_browser.c:813 #: src/bin/ephoto_single_browser.c:1522 msgid Zoom Out msgstr Oddálit -#: src/bin/ephoto_thumb_browser.c:397 -#: src/bin/ephoto_thumb_browser.c:811 -#: src/bin/ephoto_single_browser.c:1528 -msgid Slideshow -msgstr Prezentace - -#: src/bin/ephoto_thumb_browser.c:398 -#: src/bin/ephoto_thumb_browser.c:812 +#: src/bin/ephoto_thumb_browser.c:402 +#: src/bin/ephoto_thumb_browser.c:818 #: src/bin/ephoto_single_browser.c:1529 msgid Settings msgstr Nastavení -#: src/bin/ephoto_thumb_browser.c:409 +#: src/bin/ephoto_thumb_browser.c:413 msgid Show the file selector msgstr Zobrazit výběr souborů -#: src/bin/ephoto_thumb_browser.c:677 +#: src/bin/ephoto_thumb_browser.c:682 msgid There are no images in this directory msgstr V tomto adresáři nejsou žádné obrázky -#: src/bin/ephoto_thumb_browser.c:839 +#: src/bin/ephoto_thumb_browser.c:687 +#: src/bin/ephoto_thumb_browser.c:724 +msgid Total +msgstr Celkem + +#: src/bin/ephoto_thumb_browser.c:687 +#: src/bin/ephoto_thumb_browser.c:724 +msgid images +msgstr Obrázky + +#: src/bin/ephoto_thumb_browser.c:687 +#: src/bin/ephoto_thumb_browser.c:724 +msgid Size +msgstr Velikost + +#: src/bin/ephoto_thumb_browser.c:687 +#: src/bin/ephoto_thumb_browser.c:702 +#: src/bin/ephoto_single_browser.c:518 +msgid bytes +msgstr bajtů + +#: src/bin/ephoto_thumb_browser.c:706 +#: src/bin/ephoto_single_browser.c:522 +msgid KB +msgstr KB + +#: src/bin/ephoto_thumb_browser.c:710 +#: src/bin/ephoto_single_browser.c:526 +msgid MB +msgstr MB + +#: src/bin/ephoto_thumb_browser.c:714 +#: src/bin/ephoto_single_browser.c:530 +msgid GB +msgstr GB + +#: src/bin/ephoto_thumb_browser.c:718 +#: src/bin/ephoto_single_browser.c:534 +msgid TB +msgstr TB + +#: src/bin/ephoto_thumb_browser.c:855 msgid Up msgstr Nahoru -#: src/bin/ephoto_thumb_browser.c:852 +#: src/bin/ephoto_thumb_browser.c:868 msgid Home msgstr Domů -#: src/bin/ephoto_thumb_browser.c:873 +#: src/bin/ephoto_thumb_browser.c:889 msgid Hide the file selector msgstr Skrýt výběr souborů @@ -78,6 +136,29 @@ msgstr Skrýt výběr souborů msgid Apply msgstr Použít +#: src/bin/ephoto_single_browser.c:617 +#: src/bin/ephoto_single_browser.c:1217 +msgid Type +msgstr Typ + +#: src/bin/ephoto_single_browser.c:617 +#: src/bin/ephoto_single_browser.c:1217 +msgid Resolution +msgstr Rozlišení + +#: src/bin/ephoto_single_browser.c:618 +#: src/bin/ephoto_single_browser.c:1218 +msgid File Size +msgstr Velikost souboru + +#: src/bin/ephoto_single_browser.c:642 +msgid This image does not exist or is corrupted! +msgstr
[EGIT] [apps/ephoto] master 01/01: Ephoto: More localization! Translators: Update your translations and add new ones!
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=2cdf0d81269301aaf6786bd6a56e60f17e868a90
commit 2cdf0d81269301aaf6786bd6a56e60f17e868a90
Author: Stephen Houston smhousto...@gmail.com
Date: Mon Aug 10 15:58:16 2015 -0500
Ephoto: More localization! Translators: Update your translations and add
new ones!
---
src/bin/ephoto.c| 3 +--
src/bin/ephoto.h| 7 +++
src/bin/ephoto_config.c | 16 +++-
src/bin/ephoto_single_browser.c | 26 +-
src/bin/ephoto_thumb_browser.c | 18 ++
5 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/src/bin/ephoto.c b/src/bin/ephoto.c
index e8c3c73..add5ec6 100644
--- a/src/bin/ephoto.c
+++ b/src/bin/ephoto.c
@@ -1,5 +1,3 @@
-#include Elementary.h
-#include config.h
#include ephoto.h
static void _ephoto_display_usage(void);
@@ -19,6 +17,7 @@ elm_main(int argc, char **argv)
#if HAVE_GETTEXT ENABLE_NLS
elm_app_compile_locale_set(LOCALEDIR);
bindtextdomain(PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE, UTF-8);
textdomain(PACKAGE);
#endif
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 0b7994a..169ce3d 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -21,7 +21,14 @@
#include stdlib.h
#include string.h
#include dirent.h
+
+#ifdef HAVE_PO
+#include locale.h
+#endif
+
+#ifdef HAVE_GETTEXT
#include gettext.h
+#endif
typedef struct _Ephoto_Config Ephoto_Config;
typedef struct _Ephoto Ephoto;
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 4fd821f..83cce2a 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -106,6 +106,7 @@ _add_slideshow_config(Evas_Object *parent, Ephoto *ephoto)
Evas_Object *box, *scroller, *table, *label, *spinner, *hoversel, *hbox,
*ic, *button;
const Eina_List *l;
const char *transition;
+ char buf[PATH_MAX];
box = elm_box_add(parent);
elm_box_horizontal_set(box, EINA_FALSE);
@@ -124,12 +125,15 @@ _add_slideshow_config(Evas_Object *parent, Ephoto *ephoto)
evas_object_show(table);
label = elm_label_add(table);
- elm_object_text_set(label, bSlideshow Options:/b);
+ snprintf(buf, PATH_MAX, b%s/b, _(Slideshow Options));
+ elm_object_text_set(label, buf);
elm_table_pack(table, label, 0, 0, 2, 1);
evas_object_show(label);
label = elm_label_add(table);
- elm_object_text_set(label, bShow Each Slide For: /b);
+ memset(buf, 0, PATH_MAX);
+ snprintf(buf, PATH_MAX, b%s:/b, _(Show Each Slide For));
+ elm_object_text_set(label, buf);
evas_object_size_hint_align_set(label, 1.0, EVAS_HINT_FILL);
elm_table_pack(table, label, 0, 1, 1, 1);
evas_object_show(label);
@@ -145,7 +149,9 @@ _add_slideshow_config(Evas_Object *parent, Ephoto *ephoto)
ephoto-config-slide_time = spinner;
label = elm_label_add(table);
- elm_object_text_set(label, bSlide Transition:/b);
+ memset(buf, 0, PATH_MAX);
+ snprintf(buf, PATH_MAX, b%s:/b, _(Slide Transition));
+ elm_object_text_set(label, buf);
evas_object_size_hint_align_set(label, 1.0, EVAS_HINT_FILL);
elm_table_pack(table, label, 0, 2, 1, 1);
evas_object_show(label);
@@ -332,12 +338,12 @@ ephoto_config_window(Ephoto *ephoto)
slideshow = _add_slideshow_config(pager, ephoto);
sit = elm_naviframe_item_push(pager, NULL, NULL, NULL, slideshow,
overlap);
elm_naviframe_item_title_enabled_set(sit, EINA_FALSE, EINA_FALSE);
- elm_toolbar_item_append(toolbar, media-playback-start, Slideshow,
_show_page, sit);
+ elm_toolbar_item_append(toolbar, media-playback-start, _(Slideshow),
_show_page, sit);
about = _add_about_config(pager, ephoto);
ait = elm_naviframe_item_insert_after(pager, sit, NULL, NULL, NULL, about,
overlap);
elm_naviframe_item_title_enabled_set(ait, EINA_FALSE, EINA_FALSE);
- elm_toolbar_item_append(toolbar, help-about, About, _show_page, ait);
+ elm_toolbar_item_append(toolbar, help-about, _(About), _show_page, ait);
elm_naviframe_item_promote(sit);
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 69cb0c2..fc6ebbd 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -515,23 +515,23 @@ _ephoto_get_file_size(const char *path)
size_t size = eina_file_size_get(f);
eina_file_close(f);
double dsize = (double)size;
- if (dsize 1024.0) snprintf(isize, sizeof(isize), %'.0f bytes, dsize);
+ if (dsize 1024.0) snprintf(isize, sizeof(isize), %'.0f %s, dsize,
_(bytes));
else
{
dsize /= 1024.0;
-if (dsize 1024) snprintf(isize, sizeof(isize), %'.0f KB, dsize);
+if (dsize 1024) snprintf(isize, sizeof(isize), %'.0f %s, dsize,
_(KB));
else
{
dsize /= 1024.0;
- if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f MB,
dsize);
+ if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f
[EGIT] [core/enlightenment] master 06/10: don't crash in wl compositor when data resource is destroyed in multiple listeners
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0a690c7d174b579d88dc88f0adb3419c11c17841
commit 0a690c7d174b579d88dc88f0adb3419c11c17841
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Aug 10 18:49:04 2015 -0400
don't crash in wl compositor when data resource is destroyed in multiple
listeners
---
src/bin/e_comp_wl_data.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index 3dc4a1b..a97bd06 100644
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -146,7 +146,7 @@ static void
_e_comp_wl_data_device_destroy_selection_data_source(struct wl_listener
*listener EINA_UNUSED, void *data)
{
E_Comp_Wl_Data_Source *source;
- struct wl_resource *data_device_res, *focus = NULL;
+ struct wl_resource *data_device_res = NULL, *focus = NULL;
DBG(Data Device Destroy Selection Source);
if (!(source = (E_Comp_Wl_Data_Source*)data))
@@ -159,8 +159,9 @@ _e_comp_wl_data_device_destroy_selection_data_source(struct
wl_listener *listene
if (focus)
{
-data_device_res =
-
e_comp_wl_data_find_for_client(wl_resource_get_client(source-resource));
+if (source-resource)
+ data_device_res =
+
e_comp_wl_data_find_for_client(wl_resource_get_client(source-resource));
if (data_device_res)
wl_data_device_send_selection(data_device_res, NULL);
--
[EGIT] [core/enlightenment] master 03/10: use current ecore-x time when setting selection owner for xwl dnd operations
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2e000a45dc7bbe7ec1a9eede0a3ff4cc6ebfde3f
commit 2e000a45dc7bbe7ec1a9eede0a3ff4cc6ebfde3f
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Aug 10 16:25:04 2015 -0400
use current ecore-x time when setting selection owner for xwl dnd operations
according to icccm spec, it is not recommented to use currenttime here
---
src/bin/e_comp_wl_data.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index 3de9920..7042a7d 100644
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -307,7 +307,7 @@ _e_comp_wl_data_device_drag_finished(E_Drag *drag, int
dropped)
#ifndef HAVE_WAYLAND_ONLY
if ((e_comp-comp_type != E_PIXMAP_TYPE_X) e_comp_util_has_x())
{
- ecore_x_selection_owner_set(0, ECORE_X_ATOM_SELECTION_XDND,
0);
+ ecore_x_selection_owner_set(0, ECORE_X_ATOM_SELECTION_XDND,
ecore_x_current_time_get());
ecore_x_window_hide(e_comp-cm_selection);
}
#endif
@@ -368,7 +368,7 @@ _e_comp_wl_data_device_cb_drag_start(struct wl_client
*client, struct wl_resourc
if ((e_comp-comp_type != E_PIXMAP_TYPE_X) e_comp_util_has_x())
{
ecore_x_window_show(e_comp-cm_selection);
-ecore_x_selection_owner_set(e_comp-cm_selection,
ECORE_X_ATOM_SELECTION_XDND, 0);
+ecore_x_selection_owner_set(e_comp-cm_selection,
ECORE_X_ATOM_SELECTION_XDND, ecore_x_current_time_get());
}
#endif
if (e_comp-wl_comp_data-ptr.ec)
--
[EGIT] [core/enlightenment] master 10/10: finish off x11-wl clipboard support
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=335f9c43241444d5f73e7acdbafb59b09ba0797f
commit 335f9c43241444d5f73e7acdbafb59b09ba0797f
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Aug 10 18:52:22 2015 -0400
finish off x11-wl clipboard support
a lot of this functionality is reused from dnd. basic selection owner
management in x11 and slapping bytes down a pipe to the wl client;
a bit laggy when pasting to wl clients sometimes, need to spend more time
debugging that...
#Kansas
---
src/bin/e_comp_wl_data.c | 19 +-
src/modules/xwayland/dnd.c | 63 --
2 files changed, 73 insertions(+), 9 deletions(-)
diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index ea01be0..f483abd 100644
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -764,12 +764,29 @@ e_comp_wl_data_device_keyboard_focus_set(void)
ERR(No focused resource);
return;
}
+ source =
(E_Comp_Wl_Data_Source*)e_comp-wl_comp_data-selection.data_source;
+#ifndef HAVE_WAYLAND_ONLY
+ do
+ {
+if (!e_comp_util_has_xwayland()) break;
+if (e_comp-wl_comp_data-clipboard.xwl_owner)
+ {
+ if (e_client_has_xwindow(e_client_focused_get())) return;
+ break;
+ }
+else if (source e_client_has_xwindow(e_client_focused_get()))
+ {
+ /* wl - x11 */
+ ecore_x_selection_owner_set(e_comp-cm_selection,
ECORE_X_ATOM_SELECTION_CLIPBOARD, ecore_x_current_time_get());
+ return;
+ }
+ } while (0);
+#endif
data_device_res =
e_comp_wl_data_find_for_client(wl_resource_get_client(focus));
if (!data_device_res) return;
- source =
(E_Comp_Wl_Data_Source*)e_comp-wl_comp_data-selection.data_source;
if (source)
offer_res = _e_comp_wl_data_device_data_offer_create(source,
data_device_res);
wl_data_device_send_selection(data_device_res, offer_res);
diff --git a/src/modules/xwayland/dnd.c b/src/modules/xwayland/dnd.c
index ca8fb7d..5cc6f24 100644
--- a/src/modules/xwayland/dnd.c
+++ b/src/modules/xwayland/dnd.c
@@ -107,11 +107,15 @@ _xwayland_target_send(E_Comp_Wl_Data_Source *source,
uint32_t serial EINA_UNUSED
static void
_xwayland_send_send(E_Comp_Wl_Data_Source *source, const char* mime_type,
int32_t fd)
{
- Ecore_X_Atom type;
+ Ecore_X_Atom type, sel = ECORE_X_ATOM_SELECTION_CLIPBOARD;
DBG(XWL Data Source Source Send);
- _xdnd_finish(0);
+ if (e_comp-wl_comp_data-drag_client)
+ {
+_xdnd_finish(0);
+sel = ECORE_X_ATOM_SELECTION_XDND;
+ }
if (eina_streq(mime_type, WL_TEXT_STR))
type = string_atom;
@@ -119,7 +123,7 @@ _xwayland_send_send(E_Comp_Wl_Data_Source *source, const
char* mime_type, int32_
type = ecore_x_atom_get(mime_type);
cur_fd = fd;
- xconvertselection(ecore_x_display_get(), ECORE_X_ATOM_SELECTION_XDND, type,
xwl_dnd_atom, e_comp-cm_selection, 0);
+ xconvertselection(ecore_x_display_get(), sel, type, xwl_dnd_atom,
e_comp-cm_selection, 0);
}
static void
@@ -208,7 +212,17 @@ _xwl_fixes_selection_notify(void *d EINA_UNUSED, int t
EINA_UNUSED, Ecore_X_Even
}
if (ev-atom == ECORE_X_ATOM_SELECTION_CLIPBOARD)
{
-e_comp-wl_comp_data-clipboard.xwl_owner = ev-owner ?
e_pixmap_find_client(E_PIXMAP_TYPE_X, ev-owner) : NULL;
+if (ev-owner)
+ {
+ if (e_comp-wl_comp_data-clipboard.source)
+
e_comp_wl_clipboard_source_unref(e_comp-wl_comp_data-clipboard.source);
+ e_comp-wl_comp_data-clipboard.source = NULL;
+ e_comp-wl_comp_data-clipboard.xwl_owner = ev-owner ?
e_pixmap_find_client(E_PIXMAP_TYPE_X, ev-owner) : NULL;
+ xconvertselection(ecore_x_display_get(),
ECORE_X_ATOM_SELECTION_CLIPBOARD,
+ ECORE_X_ATOM_SELECTION_TARGETS, xwl_dnd_atom,
e_comp-cm_selection, 0);
+ }
+else
+ e_comp-wl_comp_data-clipboard.xwl_owner = NULL;
}
return ECORE_CALLBACK_RENEW;
}
@@ -220,11 +234,38 @@ _xwl_selection_notify(void *d EINA_UNUSED, int t
EINA_UNUSED, Ecore_X_Event_Sele
int wrote = 0;
DBG(XWL SELECTION NOTIFY);
- if ((ev-selection != ECORE_X_SELECTION_XDND) (ev-selection ==
ECORE_X_SELECTION_CLIPBOARD))
+ if ((ev-selection != ECORE_X_SELECTION_XDND) (ev-selection !=
ECORE_X_SELECTION_CLIPBOARD))
{
e_object_del(E_OBJECT(e_comp-wl_comp_data-drag));
return ECORE_CALLBACK_RENEW;
}
+ if (ev-selection == ECORE_X_SELECTION_CLIPBOARD)
+ {
+if (eina_streq(ev-target, TARGETS))
+ {
+ Ecore_X_Selection_Data_Targets *tgs = ev-data;
+ E_Comp_Wl_Clipboard_Source *source;
+ E_Comp_Wl_Data_Source *dsource;
+ int i, p[2];
+
+ if (pipe2(p, O_CLOEXEC) == -1)
+
[EGIT] [core/enlightenment] master 08/10: make e_comp_wl_data_device_keyboard_focus_set() external
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0ee67a1e52e75a720340d35c246e2f6236ec1619
commit 0ee67a1e52e75a720340d35c246e2f6236ec1619
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Aug 10 18:50:56 2015 -0400
make e_comp_wl_data_device_keyboard_focus_set() external
---
src/bin/e_comp_wl_data.c | 3 +--
src/bin/e_comp_wl_data.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index 1821282..ea01be0 100644
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -747,13 +747,12 @@ e_comp_wl_data_device_send_offer(E_Client *ec)
return offer_res;
}
-EINTERN void
+E_API void
e_comp_wl_data_device_keyboard_focus_set(void)
{
struct wl_resource *data_device_res, *offer_res = NULL, *focus;
E_Comp_Wl_Data_Source *source;
-
if (!e_comp-wl_comp_data-kbd.enabled)
{
ERR(Keyboard not enabled);
diff --git a/src/bin/e_comp_wl_data.h b/src/bin/e_comp_wl_data.h
index 53bd70b..c31fa62 100644
--- a/src/bin/e_comp_wl_data.h
+++ b/src/bin/e_comp_wl_data.h
@@ -53,7 +53,7 @@ struct _E_Comp_Wl_Clipboard_Offer
E_API void e_comp_wl_data_device_send_enter(E_Client *ec);
E_API void e_comp_wl_data_device_send_leave(E_Client *ec);
EINTERN void *e_comp_wl_data_device_send_offer(E_Client *ec);
-EINTERN void e_comp_wl_data_device_keyboard_focus_set(void);
+E_API void e_comp_wl_data_device_keyboard_focus_set(void);
EINTERN Eina_Bool e_comp_wl_data_manager_init(void);
EINTERN void e_comp_wl_data_manager_shutdown(void);
E_API struct wl_resource *e_comp_wl_data_find_for_client(struct wl_client
*client);
--
[EGIT] [core/enlightenment] master 02/10: add comp util function for determining whether xwayland is active
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5c14b4a17b5f16685fa4c0bcdd68bfebbb28e230
commit 5c14b4a17b5f16685fa4c0bcdd68bfebbb28e230
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Aug 10 15:15:54 2015 -0400
add comp util function for determining whether xwayland is active
---
src/bin/e_comp.h | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index 5aceb01..74f3932 100644
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -233,5 +233,11 @@ e_comp_util_has_x(void)
return !!e_comp-root;
}
+static inline Eina_Bool
+e_comp_util_has_xwayland(void)
+{
+ return (e_comp-comp_type != E_PIXMAP_TYPE_X) e_comp_util_has_x();
+}
+
#endif
#endif
--
[EGIT] [core/enlightenment] master 01/10: account for state in xwl property change handler
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1ca8c9eb36b58bc3f9eb9934f44ebbb596d4f7fb
commit 1ca8c9eb36b58bc3f9eb9934f44ebbb596d4f7fb
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Aug 10 13:20:35 2015 -0400
account for state in xwl property change handler
we only care about events where the property was deleted here
---
src/modules/xwayland/dnd.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/modules/xwayland/dnd.c b/src/modules/xwayland/dnd.c
index 6256e96..269bbc4 100644
--- a/src/modules/xwayland/dnd.c
+++ b/src/modules/xwayland/dnd.c
@@ -343,6 +343,9 @@ _xwl_property(void *d EINA_UNUSED, int t EINA_UNUSED,
Ecore_X_Event_Window_Prope
{
Pipe *p;
+#if (EFL_VERSION_MAJOR 1) || (EFL_VERSION_MINOR = 16)
+ if (!ev-state) return ECORE_CALLBACK_RENEW;
+#endif
p = eina_hash_find(pipes, ev-win);
if (!p) return ECORE_CALLBACK_RENEW;
/* FIXME: WHO FORGOT THE FUCKING STATE FLAG */
--
[EGIT] [core/enlightenment] master 05/10: only update wl dnd surface client if a wl drag is active
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=263794f42f213fe40b6060153dca9bf880d7d898
commit 263794f42f213fe40b6060153dca9bf880d7d898
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Aug 10 16:40:56 2015 -0400
only update wl dnd surface client if a wl drag is active
---
src/bin/e_comp_wl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index fbf4723..63697ad 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1108,7 +1108,8 @@ _e_comp_wl_surface_state_commit(E_Client *ec,
E_Comp_Wl_Surface_State *state)
ecore_evas_pointer_xy_get(e_comp-ee, ec-mouse.current.mx,
ec-mouse.current.my);
ec-netwm.sync.send_time = ecore_loop_time_get();
}
- if (e_comp-wl_comp_data-drag_client
(e_comp-wl_comp_data-drag_client == ec))
+ if (e_comp-wl_comp_data-drag
e_comp-wl_comp_data-drag_client
+ (e_comp-wl_comp_data-drag_client == ec))
{
e_comp-wl_comp_data-drag-dx -= state-sx;
e_comp-wl_comp_data-drag-dy -= state-sy;
--
[EGIT] [core/enlightenment] master 07/10: make wl clipboard source create/unref external
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=495a14ea174b2331652213d7cc4e9f068f02bd27
commit 495a14ea174b2331652213d7cc4e9f068f02bd27
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Aug 10 18:50:31 2015 -0400
make wl clipboard source create/unref external
---
src/bin/e_comp_wl_data.c | 119 +++
src/bin/e_comp_wl_data.h | 2 +
2 files changed, 61 insertions(+), 60 deletions(-)
diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index a97bd06..1821282 100644
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -469,28 +469,6 @@ _e_comp_wl_data_cb_bind_manager(struct wl_client *client,
void *data EINA_UNUSED
e_comp-wl_comp_data, NULL);
}
-static void
-_e_comp_wl_clipboard_source_unref(E_Comp_Wl_Clipboard_Source *source)
-{
- char* t;
-
- source-ref --;
- if (source-ref 0) return;
-
- if (source-fd_handler)
- {
-ecore_main_fd_handler_del(source-fd_handler);
-close(source-fd);
- }
-
- EINA_LIST_FREE(source-data_source.mime_types, t)
- eina_stringshare_del(t);
-
- wl_signal_emit(source-data_source.destroy_signal, source-data_source);
- wl_array_release(source-contents);
- free(source);
-}
-
static Eina_Bool
_e_comp_wl_clipboard_offer_load(void *data, Ecore_Fd_Handler *handler)
{
@@ -514,7 +492,7 @@ _e_comp_wl_clipboard_offer_load(void *data,
Ecore_Fd_Handler *handler)
{
close(fd);
ecore_main_fd_handler_del(handler);
-_e_comp_wl_clipboard_source_unref(offer-source);
+e_comp_wl_clipboard_source_unref(offer-source);
free(offer);
}
@@ -567,7 +545,7 @@ _e_comp_wl_clipboard_source_save(void *data EINA_UNUSED,
Ecore_Fd_Handler *handl
}
else if (len 0)
{
-_e_comp_wl_clipboard_source_unref(source);
+e_comp_wl_clipboard_source_unref(source);
e_comp-wl_comp_data-clipboard.source = NULL;
}
else
@@ -604,40 +582,6 @@
_e_comp_wl_clipboard_source_cancelled_send(E_Comp_Wl_Data_Source *source EINA_UN
{
}
-static E_Comp_Wl_Clipboard_Source*
-_e_comp_wl_clipboard_source_create(const char *mime_type, uint32_t serial, int
fd)
-{
- E_Comp_Wl_Clipboard_Source *source;
-
- source = E_NEW(E_Comp_Wl_Clipboard_Source, 1);
- if (!source) return NULL;
-
- source-data_source.resource = NULL;
- source-data_source.target = _e_comp_wl_clipboard_source_target_send;
- source-data_source.send = _e_comp_wl_clipboard_source_send_send;
- source-data_source.cancelled = _e_comp_wl_clipboard_source_cancelled_send;
-
- wl_array_init(source-contents);
- wl_signal_init(source-data_source.destroy_signal);
-
- source-ref = 1;
- source-serial = serial;
-
- source-data_source.mime_types =
- eina_list_append(source-data_source.mime_types,
- eina_stringshare_add(mime_type));
-
- source-fd_handler =
- ecore_main_fd_handler_add(fd, ECORE_FD_READ,
-_e_comp_wl_clipboard_source_save,
-e_comp-wl_comp_data, NULL, NULL);
- if (!source-fd_handler) return NULL;
-
- source-fd = fd;
-
- return source;
-}
-
static void
_e_comp_wl_clipboard_selection_set(struct wl_listener *listener EINA_UNUSED,
void *data EINA_UNUSED)
{
@@ -661,7 +605,7 @@ _e_comp_wl_clipboard_selection_set(struct wl_listener
*listener EINA_UNUSED, voi
return;
if (clip_source)
- _e_comp_wl_clipboard_source_unref(clip_source);
+ e_comp_wl_clipboard_source_unref(clip_source);
e_comp-wl_comp_data-clipboard.source = NULL;
mime_type = eina_list_nth(sel_source-mime_types, 0);
@@ -672,7 +616,7 @@ _e_comp_wl_clipboard_selection_set(struct wl_listener
*listener EINA_UNUSED, voi
sel_source-send(sel_source, mime_type, p[1]);
e_comp-wl_comp_data-clipboard.source =
- _e_comp_wl_clipboard_source_create(mime_type,
+ e_comp_wl_clipboard_source_create(mime_type,
e_comp-wl_comp_data-selection.serial, p[0]);
if (!e_comp-wl_comp_data-clipboard.source)
@@ -904,3 +848,58 @@ e_comp_wl_data_manager_source_create(struct wl_client
*client, struct wl_resourc
_e_comp_wl_data_source_cb_resource_destroy);
return source;
}
+
+E_API E_Comp_Wl_Clipboard_Source *
+e_comp_wl_clipboard_source_create(const char *mime_type, uint32_t serial, int
fd)
+{
+ E_Comp_Wl_Clipboard_Source *source;
+
+ source = E_NEW(E_Comp_Wl_Clipboard_Source, 1);
+ if (!source) return NULL;
+
+ source-data_source.resource = NULL;
+ source-data_source.target = _e_comp_wl_clipboard_source_target_send;
+ source-data_source.send = _e_comp_wl_clipboard_source_send_send;
+ source-data_source.cancelled = _e_comp_wl_clipboard_source_cancelled_send;
+
+ wl_array_init(source-contents);
+ wl_signal_init(source-data_source.destroy_signal);
[EGIT] [bindings/cxx/eflxx] master 01/01: problem reported from Toan Pham tpham3...@gmail.com
andreas pushed a commit to branch master. http://git.enlightenment.org/bindings/cxx/eflxx.git/commit/?id=1607d78babce2a26ac05a4481383aae9adf842cd commit 1607d78babce2a26ac05a4481383aae9adf842cd Author: Andreas Volz li...@brachttal.net Date: Mon Aug 10 21:18:28 2015 +0200 problem reported from Toan Pham tpham3...@gmail.com --- ecorexx/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecorexx/configure.ac b/ecorexx/configure.ac index d0516e1..bbc8889 100644 --- a/ecorexx/configure.ac +++ b/ecorexx/configure.ac @@ -25,7 +25,7 @@ AM_PROG_LIBTOOL -PKG_CHECK_MODULES(EFL, eflxx evasxx ecore ecore-x ecore-evas) +PKG_CHECK_MODULES(EFL, eflxx evasxx ecore ecore-x ecore-evas ecore-ipc ecore-con) AC_OUTPUT([ Makefile include/Makefile --
[EGIT] [apps/terminology] master 01/01: backlog: update beacon while browsing
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=d0bedb9a8ab87e488559d1a51fd7fd66058356e8 commit d0bedb9a8ab87e488559d1a51fd7fd66058356e8 Author: Boris Faure bill...@gmail.com Date: Mon Aug 10 21:31:24 2015 +0200 backlog: update beacon while browsing --- src/bin/termpty.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/termpty.c b/src/bin/termpty.c index 4422e82..50b86ab 100644 --- a/src/bin/termpty.c +++ b/src/bin/termpty.c @@ -810,6 +810,8 @@ _termpty_cellrow_from_beacon_get(Termpty *ty, int requested_y, ssize_t *wret) *wret = ts-w - delta * ty-w; if (*wret ts-w) *wret = ts-w; + ty-backlog_beacon.screen_y = screen_y; + ty-backlog_beacon.backlog_y = backlog_y; return ts-cells[delta * ty-w]; } --
[EGIT] [apps/ephoto] master 01/01: added Czech translation
q66 pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=9c34a9038b57471a365e796ccb4c917cb0c5bd59 commit 9c34a9038b57471a365e796ccb4c917cb0c5bd59 Author: q66 dan...@octaforge.org Date: Mon Aug 10 20:49:12 2015 +0100 added Czech translation --- po/LINGUAS | 1 + po/cs.po | 169 + 2 files changed, 170 insertions(+) diff --git a/po/LINGUAS b/po/LINGUAS index 7d5856f..b1c8fad 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1,2 @@ it +cs diff --git a/po/cs.po b/po/cs.po new file mode 100644 index 000..4b7e9b3 --- /dev/null +++ b/po/cs.po @@ -0,0 +1,169 @@ +# Czech translation for Ephoto. +# Copyright (C) 2015 Stephen okra Houston +# This file is distributed under the same license as the ephoto package. +# Daniel Kolesa dan...@octaforge.org, 2015. +# +msgid +msgstr +Project-Id-Version: ephoto 0.1.1\n +Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n +POT-Creation-Date: 2015-08-10 20:32+0100\n +PO-Revision-Date: 2015-08-10 20:45+0100\n +Last-Translator: Daniel Kolesa dan...@octaforge.org\n +Language-Team: none\n +Language: it\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n + +#: src/bin/ephoto_config.c:178 +#: src/bin/ephoto_single_browser.c:1503 +msgid Save +msgstr Uložit + +#: src/bin/ephoto_config.c:190 +#: src/bin/ephoto_single_browser.c:606 +msgid Cancel +msgstr Zrušit + +#: src/bin/ephoto_config.c:278 +msgid Close +msgstr Zavřít + +#: src/bin/ephoto_thumb_browser.c:391 +#: src/bin/ephoto_thumb_browser.c:805 +#: src/bin/ephoto_single_browser.c:1521 +msgid Zoom In +msgstr Přiblížit + +#: src/bin/ephoto_thumb_browser.c:393 +#: src/bin/ephoto_thumb_browser.c:807 +#: src/bin/ephoto_single_browser.c:1522 +msgid Zoom Out +msgstr Oddálit + +#: src/bin/ephoto_thumb_browser.c:397 +#: src/bin/ephoto_thumb_browser.c:811 +#: src/bin/ephoto_single_browser.c:1528 +msgid Slideshow +msgstr Prezentace + +#: src/bin/ephoto_thumb_browser.c:398 +#: src/bin/ephoto_thumb_browser.c:812 +#: src/bin/ephoto_single_browser.c:1529 +msgid Settings +msgstr Nastavení + +#: src/bin/ephoto_thumb_browser.c:409 +msgid Show the file selector +msgstr Zobrazit výběr souborů + +#: src/bin/ephoto_thumb_browser.c:677 +msgid There are no images in this directory +msgstr V tomto adresáři nejsou žádné obrázky + +#: src/bin/ephoto_thumb_browser.c:839 +msgid Up +msgstr Nahoru + +#: src/bin/ephoto_thumb_browser.c:852 +msgid Home +msgstr Domů + +#: src/bin/ephoto_thumb_browser.c:873 +msgid Hide the file selector +msgstr Skrýt výběr souborů + +#: src/bin/ephoto_single_browser.c:595 +msgid Apply +msgstr Použít + +#: src/bin/ephoto_single_browser.c:818 +msgid Are you sure you want to reset your changes? +msgstr Opravdu chcete resetovat změny? + +#: src/bin/ephoto_single_browser.c:837 +#: src/bin/ephoto_single_browser.c:970 +#: src/bin/ephoto_single_browser.c:1076 +msgid Yes +msgstr Ano + +#: src/bin/ephoto_single_browser.c:849 +#: src/bin/ephoto_single_browser.c:982 +#: src/bin/ephoto_single_browser.c:1088 +msgid No +msgstr Ne + +#: src/bin/ephoto_single_browser.c:875 +msgid Error: Image could not be saved here! +msgstr Chyba: obrázek zde nemůže být uložen! + +#: src/bin/ephoto_single_browser.c:887 +msgid OK +msgstr OK + +#: src/bin/ephoto_single_browser.c:951 +#: src/bin/ephoto_single_browser.c:1057 +msgid Are you sure you want to overwrite this image? +msgstr Opravdu chcete přepsat tento obrázek? + +#: src/bin/ephoto_single_browser.c:1496 +msgid Back +msgstr Zpět + +#: src/bin/ephoto_single_browser.c:1497 +msgid Edit +msgstr Upravit + +#: src/bin/ephoto_single_browser.c:1502 +msgid Reset +msgstr Resetovat + +#: src/bin/ephoto_single_browser.c:1504 +msgid Save As +msgstr Uložit jako + +#: src/bin/ephoto_single_browser.c:1505 +msgid Crop +msgstr Oříznout + +#: src/bin/ephoto_single_browser.c:1506 +msgid Rotate Left +msgstr Otočit doleva + +#: src/bin/ephoto_single_browser.c:1507 +msgid Rotate Right +msgstr Otočit doprava + +#: src/bin/ephoto_single_browser.c:1508 +msgid Flip Horizontal +msgstr Překlopit vodorovně + +#: src/bin/ephoto_single_browser.c:1509 +msgid Flip Vertical +msgstr Překlopit svisle + +#: src/bin/ephoto_single_browser.c:1514 +msgid First +msgstr První + +#: src/bin/ephoto_single_browser.c:1515 +msgid Previous +msgstr Předchozí + +#: src/bin/ephoto_single_browser.c:1516 +msgid Next +msgstr Další + +#: src/bin/ephoto_single_browser.c:1517 +msgid Last +msgstr Poslední + +#: src/bin/ephoto_single_browser.c:1523 +msgid Zoom Fit +msgstr Vměstnat do okna + +#: src/bin/ephoto_single_browser.c:1524 +msgid Zoom 1:1 +msgstr Zoom 1:1 + --
[EGIT] [apps/terminology] master 01/01: terminology themes - use theme in home dir over system one always
raster pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=4b25721a1d5b1a895ca1cf7831e566c67a44894c commit 4b25721a1d5b1a895ca1cf7831e566c67a44894c Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Tue Aug 11 13:15:16 2015 +0900 terminology themes - use theme in home dir over system one always checking modified time between user and system themes is just not a good idea - we never do this anywhere in e. user installed theme alwasy overrides system one. modified time is not relevant. --- src/bin/utils.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/bin/utils.c b/src/bin/utils.c index e45a699..e66299d 100644 --- a/src/bin/utils.c +++ b/src/bin/utils.c @@ -14,18 +14,15 @@ theme_path_get(const char *name) static char path2[PATH_MAX] = ; /* use the newer file */ - struct stat s1, s2; + struct stat s2; - snprintf(path1, sizeof(path1) - 1, %s/themes/%s, -elm_app_data_dir_get(), name); snprintf(path2, sizeof(path2) - 1, %s/terminology/themes/%s, efreet_config_home_get(), name); - if (stat(path1, s1) 0) return path2; - if (stat(path2, s2) 0) return path1; - - if (s1.st_mtime s2.st_mtime) return path1; - return path2; + if (stat(path2, s2) == 0) return path2; + snprintf(path1, sizeof(path1) - 1, %s/themes/%s, +elm_app_data_dir_get(), name); + return path1; } Eina_Bool --
[EGIT] [tools/enventor] master 01/01: Build: marks line, that contain error in edc_editor.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=9c66f6fcf00258cd347b0ce17f5e74da3da9564a
commit 9c66f6fcf00258cd347b0ce17f5e74da3da9564a
Author: Mykyta Biliavskyi m.biliavs...@samsung.com
Date: Tue Aug 11 13:18:07 2015 +0900
Build: marks line, that contain error in edc_editor.
Summary:
parse error messages from edje_cc, and marked
by underline the mistaken line. In cases for messages
that does not contain line numbers, trying to parse
name of wrong parameter. Trying to searching the parsed name
in edc code, and highlight the first entity.
Reviewers: Hermet
Differential Revision: https://phab.enlightenment.org/D2791
---
data/themes/default/theme_ext.edc | 2 ++
src/lib/edc_editor.c | 51 +--
src/lib/enventor_private.h| 1 +
src/lib/enventor_smart.c | 41 ---
4 files changed, 89 insertions(+), 6 deletions(-)
diff --git a/data/themes/default/theme_ext.edc
b/data/themes/default/theme_ext.edc
index 78be780..5173170 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -14,6 +14,7 @@
#define ENABLED_TEXTBLOCK_TAGS \
tag: em + font_style=Oblique; \
tag: hilight + font_weight=Bold style=glow glow_color=#3399ff80;\
+ tag: error + underline=single underline_color=#ff
underline2_color=#ff; \
tag: link + color=#3399ff underline=on underline_color=#3399ff; \
tag: preedit + underline=on underline_color=#3399ff;\
tag: preedit_sel + backing=on backing_color=#00 color=#ff; \
@@ -47,6 +48,7 @@
#define DISABLED_TEXTBLOCK_TAGS\
tag: em + font_style=Oblique; \
tag: hilight + font_weight=Bold style=glow glow_color=#3399ff20;\
+ tag: error + underline=double underline_color=#ff
underline2_color=#ff; \
tag: link + color=#101820 shadow_color=#66aaff28 underline=on
underline_color=#101820; \
tag: preedit + underline=on underline_color=#3399ff88; \
tag: preedit_sel + backing=on backing_color=#00 color=#88; \
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index ea5367d..e2db0e6 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -36,6 +36,7 @@ struct editor_s
int cur_line;
int line_max;
+ int error_line;
int syntax_color_lock;
Evas_Coord scroller_h;
@@ -49,6 +50,7 @@ struct editor_s
double font_scale;
const char *font_name;
const char *font_style;
+ const char *error_target;
Eina_Bool edit_changed : 1;
Eina_Bool linenumber : 1;
@@ -137,6 +139,39 @@ edit_font_apply(edit_data *ed, const char *font_name,
const char *font_style)
}
static void
+error_highlight(edit_data *ed, Evas_Object *tb)
+{
+ Evas_Textblock_Cursor *cur1 = evas_object_textblock_cursor_new(tb);
+ if (ed-error_line)
+ {
+evas_textblock_cursor_line_set(cur1, ed-error_line);
+evas_textblock_cursor_line_char_first(cur1);
+while(evas_textblock_cursor_content_get(cur1)[0] == ' ')
+ evas_textblock_cursor_char_next(cur1);
+evas_object_textblock_text_markup_prepend(cur1, error);
+evas_textblock_cursor_line_char_last(cur1);
+evas_object_textblock_text_markup_prepend(cur1, /error);
+ }
+ else if (ed-error_target)
+ {
+const char *ptr = NULL;
+const char *par = NULL;
+while (evas_textblock_cursor_paragraph_next(cur1))
+ {
+ par = evas_textblock_cursor_paragraph_text_get(cur1);
+ if (par (ptr = strstr(par, ed-error_target)))
+break;
+ }
+evas_textblock_cursor_paragraph_char_first(cur1);
+while(evas_textblock_cursor_content_get(cur1)[0] == ' ')
+ evas_textblock_cursor_char_next(cur1);
+evas_object_textblock_text_markup_prepend(cur1, error);
+evas_textblock_cursor_paragraph_char_last(cur1);
+evas_object_textblock_text_markup_prepend(cur1, /error);
+ }
+ evas_textblock_cursor_free(cur1);
+}
+static void
syntax_color_apply(edit_data *ed, Eina_Bool partial)
{
Evas_Object *tb = elm_entry_textblock_get(ed-en_edit);
@@ -162,7 +197,7 @@ syntax_color_apply(edit_data *ed, Eina_Bool partial)
But it can avoid entry_object_text_escaped_set() in Edje.
Logically that's unnecessary in this case. */
evas_object_textblock_text_markup_set(tb, translated);
-
+ error_highlight(ed, tb);
entry_recover(ed, pos);
}
@@ -213,7 +248,7 @@ syntax_color_thread_end_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
But it can avoid entry_object_text_escaped_set() in Edje.
Logically that's unnecessary in this case. */
evas_object_textblock_text_markup_set(tb,
[EGIT] [apps/terminology] master 01/01: fix splitting when no term focused. oops
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=69cffca8b028c20e2c87944dfc5e36eaae77baec commit 69cffca8b028c20e2c87944dfc5e36eaae77baec Author: Boris Faure bill...@gmail.com Date: Mon Aug 10 20:57:10 2015 +0200 fix splitting when no term focused. oops --- src/bin/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/win.c b/src/bin/win.c index 8bd625e..dc79fbf 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -951,7 +951,7 @@ _win_split(Term_Container *tc, Term_Container *child, const char *cmd, Evas_Object *o; tm = tc-focused_term_get(tc); -if (termio_cwd_get(tm-termio, buf, sizeof(buf))) +if (tm termio_cwd_get(tm-termio, buf, sizeof(buf))) wdir = buf; tm_new = term_new(wn, wn-config, cmd, wn-config-login_shell, wdir, @@ -1429,7 +1429,7 @@ _split_split(Term_Container *tc, Term_Container *child, Evas_Object *obj_split; tm = child-focused_term_get(child); -if (termio_cwd_get(tm-termio, buf, sizeof(buf))) +if (tm termio_cwd_get(tm-termio, buf, sizeof(buf))) wdir = buf; tm_new = term_new(wn, wn-config, cmd, wn-config-login_shell, wdir, --
[EGIT] [apps/ephoto] master 02/02: Merge branch 'master' of git+ssh://git.enlightenment.org/apps/ephoto
okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=ddcc5e08a58cba42d8d5fbe76f6196dc4d7a0b74 commit ddcc5e08a58cba42d8d5fbe76f6196dc4d7a0b74 Merge: 90e819b 03a4be0 Author: Stephen Houston smhousto...@gmail.com Date: Mon Aug 10 14:33:59 2015 -0500 Merge branch 'master' of git+ssh://git.enlightenment.org/apps/ephoto po/LINGUAS | 1 + po/it.po | 159 + 2 files changed, 160 insertions(+) --
[EGIT] [editors/vim-configs] master 01/01: EDC: update syntax
hermet pushed a commit to branch master. http://git.enlightenment.org/editors/vim-configs.git/commit/?id=1d2dc7f4bdeabd4713fc41b96a6f37b7b7e90c8d commit 1d2dc7f4bdeabd4713fc41b96a6f37b7b7e90c8d Author: ChunEon Park chuneon.p...@samsung.com Date: Tue Aug 11 11:55:00 2015 +0900 EDC: update syntax --- syntax/edc.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax/edc.vim b/syntax/edc.vim index ab1ef39..106a4ed 100644 --- a/syntax/edc.vim +++ b/syntax/edc.vim @@ -13,7 +13,7 @@ endif A bunch of useful keywords syn keywordedcBlockimages data fonts collections group contained -syn keywordedcBlockpart parts dragable description contained +syn keywordedcBlockpart parts dragable description sounds sample contained syn keywordedcBlocktext font fill origin size image proxy contained syn keywordedcBlockprograms program styles style contained syn keywordedcBlockgradient spectra spectrum contained @@ -73,7 +73,7 @@ syn keyword edcConstant ACCEL_FAC DECEL_FAC SIN_FAC DIVISOR_INTERP syn keywordedcConstant ACCELERATE_FACTOR DECELERATE_FACTOR syn keywordedcConstant VERTICAL HORIZONTAL BOTH BOX TABLE syn keywordedcConstant EDITABLE PASSWORD default -syn keywordedcConstant DEFAULT EXPLICIT +syn keywordedcConstant DEFAULT EXPLICIT PLAY_SAMPLE syn keywordedcConstant SOLID syn keywordedcConstant WIDTH HEIGHT --
[EGIT] [tools/enventor] master 01/01: add base_scale to templates.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=281c9e667e72ef60fd81cd0cf50ebf7992df687e
commit 281c9e667e72ef60fd81cd0cf50ebf7992df687e
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Aug 11 11:56:01 2015 +0900
add base_scale to templates.
---
data/templates/basic.edc | 1 +
data/templates/clip.edc | 1 +
data/templates/group.edc | 1 +
data/templates/image.edc | 1 +
data/templates/map.edc | 1 +
data/templates/minimum.edc | 1 +
data/templates/proxy.edc | 1 +
data/templates/rect.edc | 1 +
data/templates/rotation+zoom.edc | 1 +
data/templates/sound.edc | 1 +
data/templates/spacer.edc| 1 +
data/templates/text.edc | 1 +
data/templates/textblock.edc | 1 +
data/templates/transition.edc| 1 +
data/templates/tween.edc | 1 +
15 files changed, 15 insertions(+)
diff --git a/data/templates/basic.edc b/data/templates/basic.edc
index 8bf7138..9d98e7b 100644
--- a/data/templates/basic.edc
+++ b/data/templates/basic.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
images {
image: logo.png COMP;
}
diff --git a/data/templates/clip.edc b/data/templates/clip.edc
index f31faa2..6f8930c 100644
--- a/data/templates/clip.edc
+++ b/data/templates/clip.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
images {
image: logo.png COMP;
}
diff --git a/data/templates/group.edc b/data/templates/group.edc
index 858e97e..d2279aa 100644
--- a/data/templates/group.edc
+++ b/data/templates/group.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
group { main;
parts {
rect { rect;
diff --git a/data/templates/image.edc b/data/templates/image.edc
index fa74c9d..db81108 100644
--- a/data/templates/image.edc
+++ b/data/templates/image.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
images {
image: logo.png COMP;
}
diff --git a/data/templates/map.edc b/data/templates/map.edc
index 5dc6734..c1a4fe3 100644
--- a/data/templates/map.edc
+++ b/data/templates/map.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
images {
image: logo.png COMP;
}
diff --git a/data/templates/minimum.edc b/data/templates/minimum.edc
index b9a5eea..912f184 100644
--- a/data/templates/minimum.edc
+++ b/data/templates/minimum.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
group { main;
parts {
}
diff --git a/data/templates/proxy.edc b/data/templates/proxy.edc
index 33200cb..f6bcdec 100644
--- a/data/templates/proxy.edc
+++ b/data/templates/proxy.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
images {
image: logo.png COMP;
}
diff --git a/data/templates/rect.edc b/data/templates/rect.edc
index df7ea1d..abfc071 100644
--- a/data/templates/rect.edc
+++ b/data/templates/rect.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
group { main;
parts {
rect { rect;
diff --git a/data/templates/rotation+zoom.edc b/data/templates/rotation+zoom.edc
index 710db17..82e0cbf 100644
--- a/data/templates/rotation+zoom.edc
+++ b/data/templates/rotation+zoom.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
images {
image: logo.png COMP;
}
diff --git a/data/templates/sound.edc b/data/templates/sound.edc
index ed808e5..af30411 100644
--- a/data/templates/sound.edc
+++ b/data/templates/sound.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
sounds {
sample { name: sound LOSSY 64;
source: kbd-tap.wav;
diff --git a/data/templates/spacer.edc b/data/templates/spacer.edc
index efb15a3..fde1293 100644
--- a/data/templates/spacer.edc
+++ b/data/templates/spacer.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
group { main;
parts {
spacer { spacer1;
diff --git a/data/templates/text.edc b/data/templates/text.edc
index eb1b13c..168948a 100644
--- a/data/templates/text.edc
+++ b/data/templates/text.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
group { main;
parts {
text { text;
diff --git a/data/templates/textblock.edc b/data/templates/textblock.edc
index bf234b4..db2f6a1 100644
--- a/data/templates/textblock.edc
+++ b/data/templates/textblock.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
styles {
style { text_style;
base: font=Sans font_size=30 text_class=entry color=#0088AA
style=shadow,bottom shadow_color=#0080 valign=0.5 ellipsis=1.0 wrap=none
align=center;
diff --git a/data/templates/transition.edc b/data/templates/transition.edc
index 364bb02..868c00f 100644
--- a/data/templates/transition.edc
+++ b/data/templates/transition.edc
@@ -1,4 +1,5 @@
collections {
+ base_scale: 1.0;
group { main;
parts {
rect { rect;
diff --git a/data/templates/tween.edc b/data/templates/tween.edc
index ed8ed36..1f331cd 100644
--- a/data/templates/tween.edc
+++ b/data/templates/tween.edc
@@ -1,4
[EGIT] [core/elementary] master 01/01: build: Exclude some more files from coverage as they are not in the correct path
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=098917f3220352d5c4f7b0fd2d0ad9566d9645af commit 098917f3220352d5c4f7b0fd2d0ad9566d9645af Author: Stefan Schmidt ste...@osg.samsung.com Date: Mon Aug 10 12:55:09 2015 +0200 build: Exclude some more files from coverage as they are not in the correct path These files come from some modules in src/modules while we set out base dir to src/lib. In result these files are search for in src/lib and not found. In the long term we want to find out how to collect them as well but for now a working coverage is already good. Overall coverage rate: lines..: 18.1% (12596 of 69412 lines) functions..: 18.6% (1766 of 9500 functions) Will work on getting these run by jenkins once it is back. --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 72a2d35..3cb5d0a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -138,7 +138,8 @@ lcov-report: lcov --remove $(top_builddir)/coverage/coverage.cleaned.info '*/elm_test_*' --output-file $(top_builddir)/coverage/coverage.cleaned2.info lcov --remove $(top_builddir)/coverage/coverage.cleaned2.info '*/elm_suite.c' --output-file $(top_builddir)/coverage/coverage.cleaned3.info lcov --remove $(top_builddir)/coverage/coverage.cleaned3.info '*NONE*' --output-file $(top_builddir)/coverage/coverage.cleaned4.info - genhtml --branch-coverage -t $(PACKAGE_STRING) -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned4.info + lcov --remove $(top_builddir)/coverage/coverage.cleaned4.info '*/datetime_input_ctxpopup.c' '*/elm_horizontal_box.c' '*/elm_vertical_frame.c' '*/elm_vertical_box.c' '*/elm_horizontal_frame.c' '*/prefs_iface.c' '*/elm_swallow.c' --output-file $(top_builddir)/coverage/coverage.cleaned5.info + genhtml --branch-coverage -t $(PACKAGE_STRING) -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned5.info @echo Coverage Report at $(top_builddir)/coverage/html endif --
[EGIT] [core/elementary] master 01/01: Spinner: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=261388288366296029a991f52e17b802961c109d
commit 261388288366296029a991f52e17b802961c109d
Author: Tom Hacohen t...@stosb.com
Date: Mon Aug 10 14:17:49 2015 +0100
Spinner: migrate docs.
---
src/lib/elm_spinner.eo | 363 +++--
1 file changed, 111 insertions(+), 252 deletions(-)
diff --git a/src/lib/elm_spinner.eo b/src/lib/elm_spinner.eo
index c5088b5..cd8b400 100644
--- a/src/lib/elm_spinner.eo
+++ b/src/lib/elm_spinner.eo
@@ -3,338 +3,204 @@ class Elm.Spinner (Elm.Layout, Elm_Interface_Atspi_Value,
Elm_Interface_Atspi_Wi
eo_prefix: elm_obj_spinner;
methods {
@property min_max {
- set {
-/*@
-Set the minimum and maximum values for the spinner.
-
-Define the allowed range of values to be selected by the user.
-
-If actual value is less than $min, it will be updated to $min. If
it
-is bigger then $max, will be updated to $max. Actual value can be
-get with elm_spinner_value_get().
+ [[Control the minimum and maximum values for the spinner.
-By default, min is equal to 0, and max is equal to 100.
+ Define the allowed range of values to be selected by the user.
-@warning Maximum must be greater than minimum.
+ If actual value is less than $min, it will be updated to $min. If it
+ is bigger then $max, will be updated to $max. Actual value can be
+ get with @.value.get.
-@see elm_spinner_min_max_get()
+ By default, min is equal to 0, and max is equal to 100.
-@ingroup Spinner */
+ Warning: Maximum must be greater than minimum.]]
+ set {
}
get {
-/*@
-Get the minimum and maximum values of the spinner.
-
-@note If only one value is needed, the other pointer can be passed
-as $NULL.
-
-@see elm_spinner_min_max_set() for details.
-
-@ingroup Spinner */
}
values {
-min: double; /*@ The minimum value. */
-max: double; /*@ The maximum value. */
+min: double; [[The minimum value.]]
+max: double; [[The maximum value.]]
}
}
@property step {
- set {
-/*@
-Set the step used to increment or decrement the spinner value.
-
-This value will be incremented or decremented to the displayed
value.
-It will be incremented while the user keep right or top arrow
pressed,
-and will be decremented while the user keep left or bottom arrow
pressed.
+ [[Control the step used to increment or decrement the spinner value.
-The interval to increment / decrement can be set with
-elm_spinner_interval_set().
+ This value will be incremented or decremented to the displayed
value.
+ It will be incremented while the user keep right or top arrow
pressed,
+ and will be decremented while the user keep left or bottom arrow
pressed.
-By default step value is equal to 1.
+ The interval to increment / decrement can be set with
@.interval.set.
-@see elm_spinner_step_get()
-
-@ingroup Spinner */
+ By default step value is equal to 1.]]
+ set {
}
get {
-/*@
-Get the step used to increment or decrement the spinner value.
-
-@return The step value.
-
-@see elm_spinner_step_get() for more details.
-
-@ingroup Spinner */
}
values {
-step: double; /*@ The step value. */
+step: double; [[The step value.]]
}
}
@property wrap {
+ [[Control whether the spinner should wrap when it reaches its minimum
or maximum value.
+
+ Disabled by default. If disabled, when the user tries to increment
the
+ value,
+ but displayed value plus step value is bigger than maximum value,
+ the new value will be the maximum value.
+ The same happens when the user tries to decrement it,
+ but the value less step is less than minimum value. In this case,
+ the new displayed value will be the minimum value.
+
+ When wrap is enabled, when the user tries to increment the value,
+ but displayed value plus step value is bigger than maximum value,
+ the new value will be the minimum value. When the the user tries to
+ decrement it, but the value less step is less than minimum value,
+ the new displayed value will be the maximum value.
+
+ E.g.:
+ $min = 10
+ $max = 50
+ $step = 20
+ $displayed = 20
+
+ When
[EGIT] [core/efl] efl-1.14 01/01: release: Update NEWS and bump version for 1.14.3 release
stefan pushed a commit to branch efl-1.14. http://git.enlightenment.org/core/efl.git/commit/?id=a0dae78e012f170e2ca572e3a6fe4a6f7c7985c7 commit a0dae78e012f170e2ca572e3a6fe4a6f7c7985c7 Author: Stefan Schmidt ste...@datenfreihafen.org Date: Mon Aug 10 13:05:50 2015 +0200 release: Update NEWS and bump version for 1.14.3 release --- NEWS | 9 - configure.ac | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 731eb02..7da1db1 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,14 @@ == -EFL 1.14.2 +EFL 1.14.3 == +Changes since 1.14.2: +- + +Fixes: + + * Evas masking: Fix crash in async rendering + Changes since 1.14.1: - diff --git a/configure.ac b/configure.ac index 96afa3f..ab1253a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([1], [14], [2], [release]) +EFL_VERSION([1], [14], [3], [release]) AC_INIT([efl], [efl_version], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ([2.60]) --
[EGIT] [core/elementary] elementary-1.14 01/01: release: Update NEWS and bump version for 1.14.3 release
stefan pushed a commit to branch elementary-1.14. http://git.enlightenment.org/core/elementary.git/commit/?id=b70edf3e6995b2a1bb5db88b3d7df24725704dde commit b70edf3e6995b2a1bb5db88b3d7df24725704dde Author: Stefan Schmidt ste...@datenfreihafen.org Date: Mon Aug 10 13:29:24 2015 +0200 release: Update NEWS and bump version for 1.14.3 release --- NEWS | 10 +- configure.ac | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 8bbc367..9e142f3 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,15 @@ = -Elementary 1.14.2 +Elementary 1.14.3 = +Changes since 1.14.2: +- + +Fixes: + + * elm_datetime: Fix datetime ctxpopup resize issue + * Elm_Interface_Scrollable: Improvement in looping behavior + Changes since 1.14.1: - diff --git a/configure.ac b/configure.ac index e87d7f9..680b356 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([1], [14], [2], [release]) +EFL_VERSION([1], [14], [3], [release]) AC_INIT([elementary], [efl_version], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ(2.63) --
[EGIT] [core/elementary] master 01/01: Gengrid item: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8668af596024a23c64343f56234b339c351cc16c
commit 8668af596024a23c64343f56234b339c351cc16c
Author: Tom Hacohen t...@stosb.com
Date: Mon Aug 10 12:51:00 2015 +0100
Gengrid item: migrate docs.
---
src/lib/elm_gengrid_item.eo | 240 +++-
1 file changed, 81 insertions(+), 159 deletions(-)
diff --git a/src/lib/elm_gengrid_item.eo b/src/lib/elm_gengrid_item.eo
index d634717..95a079c 100644
--- a/src/lib/elm_gengrid_item.eo
+++ b/src/lib/elm_gengrid_item.eo
@@ -29,154 +29,102 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
methods {
@property prev {
get {
- /*@
- Get the @b previous item in a gengrid widget's internal
list of items,
- given a handle to one of those items.
+ [[Get the previous item in a gengrid widget's internal
list of items, given a handle to one of those items.
- This returns the item placed before the $item, on the
container
- gengrid.
-
- @see elm_gengrid_item_next_get()
-
- @ingroup Gengrid
- */
+ This returns the item placed before the $item, on the
container
+ gengrid.]]
}
values {
- item: Elm.Widget_Item *; /*@ @return The item before
$item, or $NULL if there's none (and on errors) */
+ item: Elm.Widget_Item *; [[The item before $item, or
$NULL if there's none (and on errors)]]
}
}
@property next {
get {
- /*@
- Get the @b next item in a gengrid widget's internal list
of items,
- given a handle to one of those items.
-
- This returns the item placed after the $item, on the
container
- gengrid.
-
- @see elm_gengrid_item_prev_get()
+ [[Get the next item in a gengrid widget's internal list
of items,
+ given a handle to one of those items.
- @ingroup Gengrid
- */
+ This returns the item placed after the $item, on the
container
+ gengrid.]]
}
values {
- item: Elm.Widget_Item *; /*@ @return The item after
$item, or $NULL if there's none (and on errors) */
+ item: Elm.Widget_Item *; [[The item after $item, or $NULL
if there's none (and on errors)]]
}
}
@property selected {
-get {
- /*@
- Get whether a given gengrid item is selected or not
-
- This API returns true for all the items selected in
multi-select mode as well.
+[[Control whether a given gengrid item is selected or not
- @see elm_gengrid_item_selected_set() for more details
+ This API returns true for all the items selected in
multi-select mode as well.
- @ingroup Gengrid
- */
+ This sets the selected state of an item. If multi-selection
is
+ not enabled on the containing gengrid and $selected is
+ true, any other previously selected items will get
+ unselected in favor of this new one.]]
+get {
}
set {
- /*@
- Set whether a given gengrid item is selected or not
-
- This sets the selected state of an item. If
multi-selection is
- not enabled on the containing gengrid and $selected is @c
- true, any other previously selected items will get
- unselected in favor of this new one.
-
- @see elm_gengrid_item_selected_get()
-
- @ingroup Gengrid
- */
}
values {
- selected: bool; /*@ the selected state ($true selected,
$false not selected) */
+ selected: bool; [[the selected state ($true selected,
$false not selected)]]
}
}
@property item_class {
get {
- /*@
- Get the Gengrid Item class for the given Gengrid Item.
+ [[Get the Gengrid Item class for the given Gengrid Item.
- This returns the Gengrid_Item_Class for the given item.
It can be used to examine
- the function pointers and item_style.
-
-
[EGIT] [core/elementary] master 01/01: Genlist: migrate one missing doc string.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=69b768e6e85d2a768b5a98249ae1c6314381cfde
commit 69b768e6e85d2a768b5a98249ae1c6314381cfde
Author: Tom Hacohen t...@stosb.com
Date: Mon Aug 10 12:51:51 2015 +0100
Genlist: migrate one missing doc string.
---
src/lib/elm_genlist.eo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index a26f8d0..5ea446a 100644
--- a/src/lib/elm_genlist.eo
+++ b/src/lib/elm_genlist.eo
@@ -157,7 +157,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable,
Evas.Clickable_Interfac
]]
}
values {
-mode:
Elm.Object.Multi_Select_Mode(Elm.Object.Multi_Select_Mode.max); /*@ The multi
select mode */
+mode:
Elm.Object.Multi_Select_Mode(Elm.Object.Multi_Select_Mode.max); [[The multi
select mode]]
}
}
@property block_count {
--
[EGIT] [core/elementary] master 01/01: Prefs: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=3816942bf7830bd2fb431b1498b53f9ed5946c77
commit 3816942bf7830bd2fb431b1498b53f9ed5946c77
Author: Tom Hacohen t...@stosb.com
Date: Mon Aug 10 15:00:27 2015 +0100
Prefs: migrate docs.
---
src/lib/elm_prefs.eo | 323 +--
1 file changed, 109 insertions(+), 214 deletions(-)
diff --git a/src/lib/elm_prefs.eo b/src/lib/elm_prefs.eo
index 1a2f4ba..fa507a9 100644
--- a/src/lib/elm_prefs.eo
+++ b/src/lib/elm_prefs.eo
@@ -3,309 +3,204 @@ class Elm.Prefs (Elm.Widget, Efl.File)
eo_prefix: elm_obj_prefs;
methods {
@property data {
+ [[Set user data for a given prefs widget
+
+ Once a prefs widget is created, after elm_prefs_file_set() is
+ issued on it, all of its UI elements will get default values, when
+ declared on that file. To fetch an user's own, personal set of
+ those values, one gets to pair a prefs data handle to the
+ prefs widget. This is what this call is intended for.
+
+ Prefs data values from $prefs_data with keys matching the ones
+ present on the file passed on elm_prefs_file_set() to $obj will
+ have their values applied to the respective UI elements of the
+ widget.
+
+ When $obj dies, the values of the elements declared on its
+ .epb file (the one set on elm_prefs_file_set()) marked as permanent
+ will be written back to prefs_data, if it is writable.
+ One is also able to make this writing event to take place
+ automatically after each UI element modification by using
+ elm_prefs_autosave_set().
+
+ Note: $obj will keep a reference of its own for $prefs_data,
+ but you should still unreference it by yourself, after the widget
+ is gone.
+
+ @since 1.8]]
set {
-/*@
-Set user data for a given prefs widget
-
-@return $true, on success, $false otherwise
-
-Once a prefs widget is created, after elm_prefs_file_set() is
-issued on it, all of its UI elements will get default values, when
-declared on that file. To fetch an user's own, personal set of
-those values, one gets to pair a bprefs data/b handle to the
-prefs widget. This is what this call is intended for.
-
-Prefs data values from @a prefs_data with keys matching the ones
-present on the file passed on elm_prefs_file_set() to @a obj will
-have their values applied to the respective UI elements of the
-widget.
-
-When @a obj dies, the values of the elements declared on its @b
-.epb file (the one set on elm_prefs_file_set()) marked as permanent
-bwill be written back/b to @a prefs_data, if it is writable.
-One is also able to make this writing event to take place
-automatically after each UI element modification by using
-elm_prefs_autosave_set().
-
-@note @a obj will keep a reference of its own for @a prefs_data,
-but you should still unreference it by yourself, after the widget
-is gone.
-
-@see elm_prefs_data_get()
-
-@since 1.8 */
-return: bool;
+return: bool; [[$true, on success, $false otherwise]]
}
get {
-/*@
-Get user data for a given prefs widget
-
-@return A pointer to the user data of a given prefs widget on
success.
-$NULL otherwise.
-
-@see elm_prefs_data_set() for more details
-
-@since 1.8 */
}
values {
-data: Elm_Prefs_Data * @nullable; /*@ A valid prefs_data handle */
+data: Elm_Prefs_Data * @nullable; [[A valid prefs_data handle]]
}
}
@property autosave {
+ [[Control whether a given prefs widget should save its values back (on
+ the user data file, if set) automatically on every UI element
+ changes.
+
+ If $autosave is $true, every call to
+ elm_prefs_item_value_set(), every
+ Elm_Prefs_Data_Event_Type.ELM_PREFS_DATA_EVENT_ITEM_CHANGED event
+ coming for its prefs data and every UI element direct value
+ changing will implicitly make the prefs values to be flushed back
+ to it prefs data. If a prefs data handle with no writing
+ permissions or no prefs data is set on $prefs, naturally nothing
+ will happen.
+
+ @since 1.8]]
set {
-/*@
-Set whether a given prefs widget should save its values back (on
-the user data file, if set) automatically on every UI element
-changes.
-
-If @a autosave is $true, every call to
-
