[EGIT] [core/efl] master 06/07: win: Move pointer "xy" and "inside" to input interface
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e61b7139ffba55504b653e14801d956eac180a63
commit e61b7139ffba55504b653e14801d956eac180a63
Author: Jean-Philippe Andre
Date: Wed Aug 31 14:24:14 2016 +0900
win: Move pointer "xy" and "inside" to input interface
Those two properties aren't related to a "drawing" canvas
but to the current state of input.
Note: both Efl.Input.Pointer (pointer input event data) and
Efl.Input.Interface (common interface for input handling objects)
expose a pointer position API. Not sure what to do about that.
---
src/lib/efl/interfaces/efl_canvas.eo | 41 ++
src/lib/elementary/efl_ui_win.c| 4 +--
src/lib/elementary/efl_ui_win.eo | 4 +--
src/lib/evas/canvas/efl_input_interface.eo | 36 ++
src/lib/evas/canvas/efl_input_pointer.eo | 2 +-
src/lib/evas/canvas/efl_input_state.eo | 1 -
6 files changed, 43 insertions(+), 45 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_canvas.eo
b/src/lib/efl/interfaces/efl_canvas.eo
index afcd77f..7df573f 100644
--- a/src/lib/efl/interfaces/efl_canvas.eo
+++ b/src/lib/efl/interfaces/efl_canvas.eo
@@ -2,43 +2,6 @@ interface Efl.Canvas ()
{
[[Common interface for Window and some internal classes in EFL.]]
methods {
- @property pointer_canvas_xy {
- get {
-[[This function returns the current known pointer coordinates
-
- This function returns the current known canvas unit
- coordinates of the mouse pointer and sets the contents of
- the Evas_Coords pointed to by $x and $y to contain these
- coordinates. If $e is not a valid canvas the results of
- this function are undefined.
-]]
- }
- values {
-x: int; [[The pointer to hold the return value of pointer's x
position.]]
-y: int; [[The pointer to hold the return value of pointer's y
position.]]
- }
- }
- @property pointer_inside {
- get {
-[[Returns whether the mouse pointer is logically inside the
- canvas.
-
- When this function is called it will return a value of either
- $false or $true, depending on if event_feed_mouse_in or
- event_feed_mouse_out have been called to feed in a mouse
- enter event into the canvas.
-
- A return value of $true indicates the mouse is logically
- inside the canvas, and $false implies it is logically
- outside the canvas.
-
- A canvas begins with the mouse being assumed outside ($false).
-
- If $e is not a valid canvas, the return value is undefined.
-]]
-return: bool @warn_unused;
- }
- }
@property image_max_size {
get {
[[Get the maximum image size evas can possibly handle.
@@ -187,8 +150,8 @@ interface Efl.Canvas ()
events {
focus,in;
focus,out;
- object,focus,in: Efl.Gfx;
- object,focus,out: Efl.Gfx;
+ object,focus,in: Efl.Canvas.Object;
+ object,focus,out: Efl.Canvas.Object;
render,pre;
render,post;
device,changed: Efl.Input.Device;
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index c31b3f3..90f16ab 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2146,13 +2146,13 @@ _efl_ui_win_efl_canvas_group_group_hide(Eo *obj,
Efl_Ui_Win_Data *sd)
}
EOLIAN static void
-_efl_ui_win_efl_canvas_pointer_canvas_xy_get(Eo *obj EINA_UNUSED,
Efl_Ui_Win_Data *sd, int *x, int *y)
+_efl_ui_win_efl_input_interface_pointer_xy_get(Eo *obj EINA_UNUSED,
Efl_Ui_Win_Data *sd, int *x, int *y)
{
evas_pointer_canvas_xy_get(sd->evas, x, y);
}
EOLIAN static Eina_Bool
-_efl_ui_win_efl_canvas_pointer_inside_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data
*sd)
+_efl_ui_win_efl_input_interface_pointer_inside_get(Eo *obj EINA_UNUSED,
Efl_Ui_Win_Data *sd)
{
return evas_pointer_inside_get(sd->evas);
}
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 6ee123f..425cbfe 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -844,8 +844,8 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas,
Elm.Interface.Atspi.Window,
Efl.Gfx.Size.Hint.hint_aspect.get;
Efl.Text.text.set;
Efl.Text.text.get;
- Efl.Canvas.pointer_canvas_xy.get;
- Efl.Canvas.pointer_inside.get;
+ Efl.Input.Interface.pointer_xy.get;
+ Efl.Input.Interface.pointer_inside.get;
Efl.Canvas.image_max_size.get;
Efl.Canvas.smart_objects_calculate;
Efl.Canvas.objects_at_xy_get;
diff --git a/src/lib/evas/canvas/efl_input_interface.eo
b/src/lib/evas/canvas/efl_input_interface.eo
index 609fbb1..754dd62 100644
--- a/src/lib/evas/canvas/
[EGIT] [core/efl] master 01/07: cxx: Fix compilation (Efl_Event)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ff0952abda496ec0376da4e3fed114917fd870c8
commit ff0952abda496ec0376da4e3fed114917fd870c8
Author: Jean-Philippe Andre
Date: Wed Aug 31 17:07:04 2016 +0900
cxx: Fix compilation (Efl_Event)
---
src/bindings/cxx/eo_cxx/eo_event.hh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bindings/cxx/eo_cxx/eo_event.hh
b/src/bindings/cxx/eo_cxx/eo_event.hh
index 7c527dd..96e4f6b 100644
--- a/src/bindings/cxx/eo_cxx/eo_event.hh
+++ b/src/bindings/cxx/eo_cxx/eo_event.hh
@@ -135,7 +135,7 @@ void really_call_event(T& wrapper, F& f, void *info,
std::false_type)
}
template
-void event_callback(void *data, ::Eo_Event const* event)
+void event_callback(void *data, ::Efl_Event const* event)
{
T wrapper(::efl_ref(event->object));
F *f = static_cast(data);
--
[EGIT] [core/efl] master 07/07: win: Add EO API to query state of multi touch points
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b3993b684e30bf20fca66cf25308f627420a199d
commit b3993b684e30bf20fca66cf25308f627420a199d
Author: Jean-Philippe Andre
Date: Wed Aug 31 15:41:12 2016 +0900
win: Add EO API to query state of multi touch points
This combines evas canvas functions to list and query
touch points into a single iterator:
- evas_touch_point_list_count
- evas_touch_point_list_nth_xy_get
- evas_touch_point_list_nth_id_get
- evas_touch_point_list_nth_state_get
This also fixes a number of issues related to feeding fake
input events.
Note: I wanted to add delta x,y information as well but it's
in fact not really possible outside the event callback itself,
as the previous x,y position will not be updated unless there's
an event.
@feature
---
src/lib/efl/interfaces/efl_input_types.eot | 3 +-
src/lib/elementary/efl_ui_win.c| 223 -
src/lib/elementary/efl_ui_win.eo | 1 +
src/lib/evas/canvas/efl_input_interface.eo | 22 +++
src/lib/evas/canvas/efl_input_pointer.c| 13 +-
src/lib/evas/canvas/evas_canvas.eo | 55 +--
src/lib/evas/canvas/evas_events.c | 4 +
src/lib/evas/canvas/evas_touch_point.c | 13 +-
src/lib/evas/include/evas_private.h| 7 +-
src/tests/elementary/elm_test_win.c| 198 +
10 files changed, 442 insertions(+), 97 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_input_types.eot
b/src/lib/efl/interfaces/efl_input_types.eot
index 8a9211e..fdd9df2 100644
--- a/src/lib/efl/interfaces/efl_input_types.eot
+++ b/src/lib/efl/interfaces/efl_input_types.eot
@@ -4,7 +4,8 @@ enum Efl.Pointer.Action
@since 1.19
]]
- none, [[Not a valid event.]]
+ none, [[Not a valid event, or nothing new happened (eg. when querying
+ current state of touch points).]]
move, [[Mouse or equivalent pointer moved.]]
down, [[Mouse button or equivalent pointer pressed down.
Always followed by up or cancel.]]
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 90f16ab..7751ee8 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4,7 +4,7 @@
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
-#define ELM_WIN_PROTECTED
+#define EFL_INPUT_EVENT_PROTECTED
#include
#include
@@ -89,6 +89,7 @@ static const Elm_Win_Trap *trap = NULL;
typedef struct _Efl_Ui_Win_Data Efl_Ui_Win_Data;
typedef struct _Box_Item_Iterator Box_Item_Iterator;
+typedef struct _Input_Pointer_Iterator Input_Pointer_Iterator;
struct _Efl_Ui_Win_Data
{
@@ -223,6 +224,9 @@ struct _Efl_Ui_Win_Data
short pointer_out;
short pointer_cancel;
short pointer_wheel;
+ short finger_move;
+ short finger_down;
+ short finger_up;
short key_down;
short key_up;
short render_pre;
@@ -261,6 +265,14 @@ struct _Box_Item_Iterator
Eo*object;
};
+struct _Input_Pointer_Iterator
+{
+ Eina_Iterator iterator;
+ Eina_List *list;
+ Eina_Iterator *real_iterator;
+ const Eo *object;
+};
+
static const char SIG_DELETE_REQUEST[] = "delete,request";
static const char SIG_FOCUS_OUT[] = "focus,out"; // deprecated. use
"unfocused" instead.
static const char SIG_FOCUS_IN[] = "focus,in"; // deprecated. use "focused"
instead.
@@ -1678,7 +1690,7 @@ _evas_event_key_cb(void *data, const Efl_Event *ev)
if (evas_focus_get(evas_object_evas_get(win)) == win)
return;
- efl_event_callback_legacy_call(win, ev->desc, evt);
+ efl_event_callback_call(win, ev->desc, evt);
}
static void
@@ -1692,7 +1704,7 @@ _evas_event_pointer_cb(void *data, const Efl_Event *ev)
if (!evdata || evdata->win_fed)
return;
- efl_event_callback_legacy_call(win, ev->desc, evt);
+ efl_event_callback_call(win, ev->desc, evt);
}
/* feed events from the window to evas - for fake inputs */
@@ -1711,7 +1723,7 @@ _evas_event_key_feed_fake_cb(void *data, const Efl_Event
*ev)
return;
evdata->win_fed = EINA_TRUE;
- efl_event_callback_legacy_call(evas, ev->desc, evt);
+ efl_event_callback_call(evas, ev->desc, evt);
evdata->win_fed = EINA_FALSE;
evdata->evas_done = EINA_FALSE;
}
@@ -1731,7 +1743,7 @@ _evas_event_pointer_feed_fake_cb(void *data, const
Efl_Event *ev)
return;
evdata->win_fed = EINA_TRUE;
- efl_event_callback_legacy_call(evas, ev->desc, evt);
+ efl_event_callback_call(evas, ev->desc, evt);
evdata->win_fed = EINA_FALSE;
evdata->evas_done = EINA_FALSE;
}
@@ -1744,6 +1756,9 @@
EFL_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks,
{ EFL_EVENT_POINTER_OUT, _evas_event_pointer_feed_fake_cb },
{ EFL_EVENT_POINTER_CANCEL, _evas_event_pointer_feed_fake_c
[EGIT] [core/efl] master 02/07: js: Switch to Efl_Event
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b4e20fd6329ef76163343baab6a7c867ea4e9105
commit b4e20fd6329ef76163343baab6a7c867ea4e9105
Author: Jean-Philippe Andre
Date: Wed Aug 31 17:08:00 2016 +0900
js: Switch to Efl_Event
I haven't tested the compilation... but I guess this can't hurt.
---
src/bindings/js/eo_js/eo_js_event.hh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bindings/js/eo_js/eo_js_event.hh
b/src/bindings/js/eo_js/eo_js_event.hh
index 617df60..283b018 100644
--- a/src/bindings/js/eo_js/eo_js_event.hh
+++ b/src/bindings/js/eo_js/eo_js_event.hh
@@ -17,8 +17,8 @@ namespace efl { namespace eo { namespace js {
struct event_information
{
eina::js::global_ref* constructor;
- Eo_Event_Description const* event;
- Eo_Event_Cb event_callback;
+ Efl_Event_Description const* event;
+ Efl_Event_Cb event_callback;
const char* class_name;
};
@@ -54,7 +54,7 @@ inline v8::Local get_event_info(void*,
v8::Isolate* isolate, co
}
template
-inline Eina_Bool event_callback(void* data, Eo_Event const* eo_event)
+inline Eina_Bool event_callback(void* data, Efl_Event const* eo_event)
{
v8::Isolate* isolate = v8::Isolate::GetCurrent();
v8::HandleScope handle_scope(isolate);
--
[EGIT] [core/efl] master 03/07: ecore_poller: Fix unlikely crash if eo data is null
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ed9413c1c1aac610137a3c10fb8ccb4ab909f9ce commit ed9413c1c1aac610137a3c10fb8ccb4ab909f9ce Author: Jean-Philippe Andre Date: Thu Sep 1 11:16:12 2016 +0900 ecore_poller: Fix unlikely crash if eo data is null This happened to me when running elm_suite manually. --- src/lib/ecore/ecore_poller.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c index d1c645a..320b427 100644 --- a/src/lib/ecore/ecore_poller.c +++ b/src/lib/ecore/ecore_poller.c @@ -338,6 +338,7 @@ ecore_poller_del(Ecore_Poller *obj) if (!obj) return NULL; EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); Ecore_Poller_Data *poller = efl_data_scope_get(obj, MY_CLASS); + if (!poller) return NULL; /* we are walking the poller list - a bad idea to remove from it while * walking it, so just flag it as delete_me and come back to it after * the loop has finished */ --
[EGIT] [core/efl] master 04/07: evas: Fix unlikely crash with image cache
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=caf237abdf52422497d3cb4a6af123fbb4ce2e85
commit caf237abdf52422497d3cb4a6af123fbb4ce2e85
Author: Jean-Philippe Andre
Date: Thu Sep 1 11:17:08 2016 +0900
evas: Fix unlikely crash with image cache
This happened to me when running elm_suite manually, during
elm_shutdown. At this point, cache shouldn't be null, but better
be safe anyway.
---
src/lib/evas/cache/evas_cache_image.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/lib/evas/cache/evas_cache_image.c
b/src/lib/evas/cache/evas_cache_image.c
index 21edc94..a0c6a65 100644
--- a/src/lib/evas/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -250,6 +250,12 @@ _evas_cache_image_entry_new(Evas_Cache_Image *cache,
{
Image_Entry *ie;
+ if (!cache)
+ {
+*error = EVAS_LOAD_ERROR_GENERIC;
+return NULL;
+ }
+
ie = cache->func.alloc();
if (!ie)
{
--
[EGIT] [core/efl] master 05/07: evas events: Fix axis input values
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b675571bd8247f5ce34bd28eb2339897c98e8591
commit b675571bd8247f5ce34bd28eb2339897c98e8591
Author: Jean-Philippe Andre
Date: Wed Aug 31 13:35:15 2016 +0900
evas events: Fix axis input values
This adds support for distance, pressure, tilt and twist.
Not entirely sure if normalized & raw (x,y) should be exposed
in the eo interface. Also not sure what to do with tilt_x/y
(as used by libinput) or touch/tool width "major/minor" vs.
radius x/y.
Add debug logs in the example, including the distance.
I can't test most of these values due to a lack of compatible
hardware, but the most basic features seem to work :)
---
src/examples/evas/evas-multi-touch.c | 5 ++-
src/lib/ecore_evas/ecore_evas.c | 26 +--
src/lib/efl/interfaces/efl_common_internal.h | 6 ++--
src/lib/evas/canvas/evas_events.c| 26 +--
src/lib/evas/canvas/evas_events_legacy.c | 49 +---
5 files changed, 99 insertions(+), 13 deletions(-)
diff --git a/src/examples/evas/evas-multi-touch.c
b/src/examples/evas/evas-multi-touch.c
index f1d344c..083e3cb 100644
--- a/src/examples/evas/evas-multi-touch.c
+++ b/src/examples/evas/evas-multi-touch.c
@@ -262,7 +262,7 @@ _axis_update_cb(void *data EINA_UNUSED, Evas *e
EINA_UNUSED, Evas_Object *obj EI
{
Evas_Event_Axis_Update *ev = event_info;
float twist = 0, azimuth = 0, tilt = 0;
- float pressure = 1;
+ float pressure = 1, distance = 0;
int i;
for (i = 0; i < ev->naxis; i++)
@@ -274,10 +274,13 @@ _axis_update_cb(void *data EINA_UNUSED, Evas *e
EINA_UNUSED, Evas_Object *obj EI
case EVAS_AXIS_LABEL_TWIST:twist= val; break;
case EVAS_AXIS_LABEL_AZIMUTH: azimuth = val; break;
case EVAS_AXIS_LABEL_TILT: tilt = val; break;
+ case EVAS_AXIS_LABEL_DISTANCE: distance = val; break;
default: break;
}
}
+printf("distance %.2f, pressure %.2f, twist %.2f, azimuth %.2f, tilt
%.2f\n",
+distance, pressure, twist, azimuth, tilt);
_mouse_update_handle(ev->toolid, azimuth, tilt, twist, pressure);
}
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 7543cbf..769855d 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -4568,6 +4568,8 @@ _direct_axis_update_cb(Ecore_Evas *ee, const
Ecore_Event_Axis_Update *info)
_efl_input_value_mark(ev, EFL_INPUT_VALUE_X);
x = axis->value;
}
+ ev->raw.x = axis->value;
+ ev->has_raw = EINA_TRUE;
break;
case EVAS_AXIS_LABEL_Y:
@@ -4576,14 +4578,18 @@ _direct_axis_update_cb(Ecore_Evas *ee, const
Ecore_Event_Axis_Update *info)
_efl_input_value_mark(ev, EFL_INPUT_VALUE_Y);
y = axis->value;
}
+ ev->raw.y = axis->value;
+ ev->has_raw = EINA_TRUE;
break;
case EVAS_AXIS_LABEL_NORMAL_X:
- ev->raw.x = axis->value;
+ ev->norm.x = axis->value;
+ ev->has_norm = EINA_TRUE;
break;
case EVAS_AXIS_LABEL_NORMAL_Y:
- ev->raw.y = axis->value;
+ ev->norm.y = axis->value;
+ ev->has_norm = EINA_TRUE;
break;
case EVAS_AXIS_LABEL_PRESSURE:
@@ -4592,10 +4598,24 @@ _direct_axis_update_cb(Ecore_Evas *ee, const
Ecore_Event_Axis_Update *info)
break;
case EVAS_AXIS_LABEL_DISTANCE:
+ _efl_input_value_mark(ev, EFL_INPUT_VALUE_DISTANCE);
+ ev->distance = axis->value;
+ break;
+
case EVAS_AXIS_LABEL_AZIMUTH:
+ _efl_input_value_mark(ev, EFL_INPUT_VALUE_AZIMUTH);
+ ev->azimuth = axis->value;
+ break;
+
case EVAS_AXIS_LABEL_TILT:
+ _efl_input_value_mark(ev, EFL_INPUT_VALUE_TILT);
+ ev->tilt = axis->value;
+ break;
+
case EVAS_AXIS_LABEL_TWIST:
- // TODO
+ _efl_input_value_mark(ev, EFL_INPUT_VALUE_TWIST);
+ ev->twist = axis->value;
+ break;
case EVAS_AXIS_LABEL_UNKNOWN:
case EVAS_AXIS_LABEL_TOUCH_WIDTH_MAJOR:
diff --git a/src/lib/efl/interfaces/efl_common_internal.h
b/src/lib/efl/interfaces/efl_common_internal.h
index d6c51de..4af02c1 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -31,9 +31,9 @@ struct _Efl_Input_Pointer_Data
unsigned intpressed_buttons;
int tool; /* finger or tool ID */
double radius, radius_x, radius_y;
- double pressure;
+ double pressure, distance, azimuth, tilt, twist;
double
[EGIT] [tools/eflete] master 01/01: export-edc: add the command option to set the export-edc path.
jaehwan pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=55d19e1e8cf9a07e9e1c0464284b82fe52b43b5f
commit 55d19e1e8cf9a07e9e1c0464284b82fe52b43b5f
Author: Jaehwan Kim
Date: Thu Sep 1 14:15:33 2016 +0900
export-edc: add the command option to set the export-edc path.
It should set PATH/FOLDER/FILE. If this option is enabled the file
browser is not shown and the edc file is exported in the previously
set path.
@feature
---
src/bin/eflete.c | 8 +++
src/bin/eflete.h | 5
src/bin/main.c | 28 +-
.../project_manager/project_manager_export_edc.c | 11 +++--
src/bin/ui/menu.c | 5 +++-
src/bin/ui/project_export.c| 21
6 files changed, 70 insertions(+), 8 deletions(-)
diff --git a/src/bin/eflete.c b/src/bin/eflete.c
index fab8db6..9f79e76 100644
--- a/src/bin/eflete.c
+++ b/src/bin/eflete.c
@@ -132,6 +132,14 @@ app_shutdown()
eina_stringshare_del(ap.path.edj_path);
if (ap.path.image_path)
eina_stringshare_del(ap.path.image_path);
+ if (ap.path.export_edj)
+ eina_stringshare_del(ap.path.export_edj);
+ if (ap.path.export_edc.path)
+ eina_stringshare_del(ap.path.export_edc.path);
+ if (ap.path.export_edc.folder)
+ eina_stringshare_del(ap.path.export_edc.folder);
+ if (ap.path.export_edc.file)
+ eina_stringshare_del(ap.path.export_edc.file);
config_shutdown();
elm_theme_free(ap.theme);
diff --git a/src/bin/eflete.h b/src/bin/eflete.h
index dcaea44..6ada2be 100644
--- a/src/bin/eflete.h
+++ b/src/bin/eflete.h
@@ -135,6 +135,11 @@ struct _App_Data
Eina_Stringshare *image_path;
Eina_Stringshare *sound_path;
Eina_Stringshare *export_edj;
+ struct {
+ Eina_Stringshare *path;
+ Eina_Stringshare *folder;
+ Eina_Stringshare *file;
+ } export_edc;
} path;
Project *project;
Shortcut_Module *shortcuts; /**< Structure with data from shortcuts module
*/
diff --git a/src/bin/main.c b/src/bin/main.c
index 479cd17..c176219 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -32,6 +32,7 @@ static char *file = NULL;
static char *pro_name = NULL;
static char *pro_path = NULL;
static char *export_edj = NULL;
+static char *export_edc = NULL;
static Eina_List *img_dirs = NULL;
static Eina_List *snd_dirs = NULL;
static Eina_List *fnt_dirs = NULL;
@@ -62,7 +63,8 @@ static const Ecore_Getopt options = {
{
ECORE_GETOPT_STORE_STR(0, "name", N_("Name for new project")),
ECORE_GETOPT_STORE_STR(0, "path", N_("Path to project directory")),
- ECORE_GETOPT_STORE_STR(0, "export-edj", N_("Export file path")),
+ ECORE_GETOPT_STORE_STR(0, "export-edj", N_("Export edj file path")),
+ ECORE_GETOPT_STORE_STR(0, "export-edc", N_("Export edc file path. This
should include the path, folder and edc file name.(PATH/FOLDER/FILE)")),
ECORE_GETOPT_APPEND_METAVAR('i', "id", "Add image directory for edc
compilation", "DIR_NAME", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND_METAVAR('s', "sd", "Add sound directory for edc
compilation", "DIR_NAME", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND_METAVAR('f', "fd", "Add font directory for edc
compilation", "DIR_NAME", ECORE_GETOPT_TYPE_STR),
@@ -171,6 +173,28 @@ _new_project(void *data __UNUSED__)
tabs_home_tab_add(TAB_HOME_NEW_PROJECT);
}
+static void
+_export_edc_path_set(char *export_edc)
+{
+ char tmp[256];
+ int len = 0, rlen = 0;
+
+ strcpy(tmp, export_edc);
+ len = strlen(tmp);
+ rlen = strlen(strrchr(tmp, '/'));
+ if (!rlen) return;
+ ap.path.export_edc.file = eina_stringshare_add(tmp + (len - rlen + 1));
+ tmp[len - rlen] = '\0';
+
+ len = strlen(tmp);
+ rlen = strlen(strrchr(tmp, '/'));
+ if (!rlen) return;
+ ap.path.export_edc.folder = eina_stringshare_add(tmp + (len - rlen + 1));
+ tmp[len - rlen] = '\0';
+
+ ap.path.export_edc.path = eina_stringshare_add(tmp);
+}
+
EAPI_MAIN int
elm_main(int argc, char **argv)
{
@@ -183,6 +207,7 @@ elm_main(int argc, char **argv)
ECORE_GETOPT_VALUE_STR(pro_name),
ECORE_GETOPT_VALUE_STR(pro_path),
ECORE_GETOPT_VALUE_STR(export_edj),
+ ECORE_GETOPT_VALUE_STR(export_edc),
ECORE_GETOPT_VALUE_LIST(img_dirs),
ECORE_GETOPT_VALUE_LIST(snd_dirs),
ECORE_GETOPT_VALUE_LIST(fnt_dirs),
@@ -324,6 +349,7 @@ elm_main(int argc, char **argv)
run:
ap.path.export_edj = export_edj;
+_export_edc_path_set(export_edc);
if (!ui_main_window_add())
{
app_shutdown();
diff --git a/src/bin/project_manager/project_manager_export_edc.c
b/src/bin/project_manager/project_manager_export_edc.c
index 7a9d831..7a2c29d 100644
--- a/src/bin/project_manager/project_manager_export_edc.c
+++ b/src/bin/project_manager/project_
[EGIT] [core/efl] master 01/01: elementary: remove unused SMART_NAME strings
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9f7ce792f06018f34355af231ed83bac8f26fe75 commit 9f7ce792f06018f34355af231ed83bac8f26fe75 Author: Jee-Yong Um Date: Thu Sep 1 11:33:04 2016 +0900 elementary: remove unused SMART_NAME strings Summary: Smart name strings are not used any more. Reviewers: Hermet, cedric, jpeg Differential Revision: https://phab.enlightenment.org/D4261 --- src/lib/elementary/elc_ctxpopup.c | 2 -- src/lib/elementary/elc_fileselector_entry.c | 2 -- src/lib/elementary/elm_gengrid.c| 3 --- 3 files changed, 7 deletions(-) diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 05a62b0..218ffe0 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -21,8 +21,6 @@ #define MY_CLASS_NAME "Elm_Ctxpopup" #define MY_CLASS_NAME_LEGACY "elm_ctxpopup" -EAPI const char ELM_CTXPOPUP_SMART_NAME[] = "elm_ctxpopup"; - #define ELM_PRIV_CTXPOPUP_SIGNALS(cmd) \ cmd(SIG_DISMISSED, "dismissed", "") \ cmd(SIG_GEOMETRY_UPDATE, "geometry,update", "") \ diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index aff611d..509f1b3 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -18,8 +18,6 @@ #define MY_CLASS_NAME "Elm_Fileselector_Entry" #define MY_CLASS_NAME_LEGACY "elm_fileselector_entry" -EAPI const char ELM_FILESELECTOR_ENTRY_SMART_NAME[] = "elm_fileselector_entry"; - #define ELM_PRIV_FILESELECTOR_ENTRY_SIGNALS(cmd) \ cmd(SIG_CHANGED, "changed", "") \ cmd(SIG_ACTIVATED, "activated", "") \ diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 802b506..3ad9f40 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -36,9 +36,6 @@ #define CACHE_MAX 40 -EAPI const char ELM_GENGRID_SMART_NAME[] = "elm_gengrid"; -EAPI const char ELM_GENGRID_PAN_SMART_NAME[] = "elm_gengrid_pan"; - #define ELM_PRIV_GENGRID_SIGNALS(cmd) \ cmd(SIG_ACTIVATED, "activated", "") \ cmd(SIG_CLICKED_DOUBLE, "clicked,double", "") \ --
Re: [E-devel] [EGIT] [website/planet] master 01/01: MINOR: config: Remove raster dead blog
On Thu, 1 Sep 2016 11:32:50 +1000 onefang Rejected said: > On Thu, 1 Sep 2016 07:42:13 +0900 Carsten Haitzler (The Rasterman) > wrote: > > > On Wed, 31 Aug 2016 13:18:01 +1000 David Seikel > > said: > > > > > On Wed, 31 Aug 2016 12:10:10 +0900 Carsten Haitzler (The Rasterman) > > > wrote: > > > > > > > On Wed, 31 Aug 2016 10:22:46 +1000 David Seikel > > > > said: > > > > > > > > > On Wed, 31 Aug 2016 09:13:30 +0900 Carsten Haitzler (The > > > > > Rasterman) wrote: > > > > > > > > > > > On Sun, 28 Aug 2016 09:13:46 -0700 Bertrand Jacquin > > > > > > said: > > > > > > > > > > > > > beber pushed a commit to branch master. > > > > > > > > > > > > > > http://git.enlightenment.org/website/planet.git/commit/?id=6f0e0476ac73b19c57dcca2d4e589730585dddcb > > > > > > > > > > > > > > commit 6f0e0476ac73b19c57dcca2d4e589730585dddcb > > > > > > > Author: Bertrand Jacquin > > > > > > > Date: Sun Aug 28 17:11:48 2016 +0100 > > > > > > > > > > > > > > MINOR: config: Remove raster dead blog > > > > > > > > > > > > it's not actually dead. it just has no content atm. i fixed > > > > > > the url to be right it just is a 0 byte return atm as i > > > > > > installed a cms but still have work to do on the site and > > > > > > haven't filled it with content yet :) > > > > > > > > > > But but butt, it's at least a few days old already, it should be > > > > > bursting at the seams, full of great content, and excessive > > > > > bling by now! :-P > > > > > > > > i wish it were... have so many things to do. :) > > > > > > So maybe now you might understand why my SledjHamr site isn't as > > > pretty and full of great content as YOU want? Building an entire > > > world takes time, they tend to be full of lots and lots and lots of > > > fiddly little details. :-P > > > > i'm not telling people to read my site though... :) difference. :) > > it's not meant to be an informational resource i'm saying people > > should read... at this point. it's a work in progress i have to get > > to. > > Both are works in progress, the only differences are mine will take > years to get anywhere useful, and yours has no content. I only told > you to read mine coz you where bitching about my shit, and my site at > least tries to describe my shit. :-P tries sure. not very effectively. :) > I'm not actually advertising my site yet, otherwise the URL would be in > my email .sig. Search engines have found it though, zero SEO on my > part, but no problems if people stumble on it. At least someone, or > something, is not ignoring me. lol but people who are busy aren't going to spend the time unless you smooth the path with nice easy to follow docs of how to download, get started and get working with a fairly minimal amount of effort. my personal website isn't even trying to do anything of the kind - not even close. and i don't much care about its state atm until a bunch of things are fixed and working. i have a mountain of old content to put back in etc. -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [website/planet] master 01/01: MINOR: config: Remove raster dead blog
On Thu, 1 Sep 2016 07:42:13 +0900 Carsten Haitzler (The Rasterman) wrote: > On Wed, 31 Aug 2016 13:18:01 +1000 David Seikel > said: > > > On Wed, 31 Aug 2016 12:10:10 +0900 Carsten Haitzler (The Rasterman) > > wrote: > > > > > On Wed, 31 Aug 2016 10:22:46 +1000 David Seikel > > > said: > > > > > > > On Wed, 31 Aug 2016 09:13:30 +0900 Carsten Haitzler (The > > > > Rasterman) wrote: > > > > > > > > > On Sun, 28 Aug 2016 09:13:46 -0700 Bertrand Jacquin > > > > > said: > > > > > > > > > > > beber pushed a commit to branch master. > > > > > > > > > > > > http://git.enlightenment.org/website/planet.git/commit/?id=6f0e0476ac73b19c57dcca2d4e589730585dddcb > > > > > > > > > > > > commit 6f0e0476ac73b19c57dcca2d4e589730585dddcb > > > > > > Author: Bertrand Jacquin > > > > > > Date: Sun Aug 28 17:11:48 2016 +0100 > > > > > > > > > > > > MINOR: config: Remove raster dead blog > > > > > > > > > > it's not actually dead. it just has no content atm. i fixed > > > > > the url to be right it just is a 0 byte return atm as i > > > > > installed a cms but still have work to do on the site and > > > > > haven't filled it with content yet :) > > > > > > > > But but butt, it's at least a few days old already, it should be > > > > bursting at the seams, full of great content, and excessive > > > > bling by now! :-P > > > > > > i wish it were... have so many things to do. :) > > > > So maybe now you might understand why my SledjHamr site isn't as > > pretty and full of great content as YOU want? Building an entire > > world takes time, they tend to be full of lots and lots and lots of > > fiddly little details. :-P > > i'm not telling people to read my site though... :) difference. :) > it's not meant to be an informational resource i'm saying people > should read... at this point. it's a work in progress i have to get > to. Both are works in progress, the only differences are mine will take years to get anywhere useful, and yours has no content. I only told you to read mine coz you where bitching about my shit, and my site at least tries to describe my shit. :-P I'm not actually advertising my site yet, otherwise the URL would be in my email .sig. Search engines have found it though, zero SEO on my part, but no problems if people stumble on it. At least someone, or something, is not ignoring me. lol -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. signature.asc Description: PGP signature -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [website/planet] master 01/01: MINOR: config: Remove raster dead blog
On 31/08/2016 01:13, Carsten Haitzler wrote: > On Sun, 28 Aug 2016 09:13:46 -0700 Bertrand Jacquin > said: > >> beber pushed a commit to branch master. >> >> http://git.enlightenment.org/website/planet.git/commit/?id=6f0e0476ac73b19c57dcca2d4e589730585dddcb >> >> commit 6f0e0476ac73b19c57dcca2d4e589730585dddcb >> Author: Bertrand Jacquin >> Date: Sun Aug 28 17:11:48 2016 +0100 >> >> MINOR: config: Remove raster dead blog > > it's not actually dead. it just has no content atm. i fixed the url to > be right > it just is a 0 byte return atm as i installed a cms but still have work > to do > on the site and haven't filled it with content yet :) Sure, then feel free to revert the change when there will be content as far now it's throwing me bunch of crontab errors. Cheers, -- Bertrand -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [website/planet] master 01/01: MINOR: config: Remove raster dead blog
On Wed, 31 Aug 2016 13:18:01 +1000 David Seikel said: > On Wed, 31 Aug 2016 12:10:10 +0900 Carsten Haitzler (The Rasterman) > wrote: > > > On Wed, 31 Aug 2016 10:22:46 +1000 David Seikel > > said: > > > > > On Wed, 31 Aug 2016 09:13:30 +0900 Carsten Haitzler (The Rasterman) > > > wrote: > > > > > > > On Sun, 28 Aug 2016 09:13:46 -0700 Bertrand Jacquin > > > > said: > > > > > > > > > beber pushed a commit to branch master. > > > > > > > > > > http://git.enlightenment.org/website/planet.git/commit/?id=6f0e0476ac73b19c57dcca2d4e589730585dddcb > > > > > > > > > > commit 6f0e0476ac73b19c57dcca2d4e589730585dddcb > > > > > Author: Bertrand Jacquin > > > > > Date: Sun Aug 28 17:11:48 2016 +0100 > > > > > > > > > > MINOR: config: Remove raster dead blog > > > > > > > > it's not actually dead. it just has no content atm. i fixed the > > > > url to be right it just is a 0 byte return atm as i installed a > > > > cms but still have work to do on the site and haven't filled it > > > > with content yet :) > > > > > > But but butt, it's at least a few days old already, it should be > > > bursting at the seams, full of great content, and excessive bling by > > > now! :-P > > > > i wish it were... have so many things to do. :) > > So maybe now you might understand why my SledjHamr site isn't as pretty > and full of great content as YOU want? Building an entire world takes > time, they tend to be full of lots and lots and lots of fiddly little > details. :-P i'm not telling people to read my site though... :) difference. :) it's not meant to be an informational resource i'm saying people should read... at this point. it's a work in progress i have to get to. -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: ecore_cocoa: fix wrong key assignment
jayji pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8118829225869bbcd48fc2ff24a249fbbd4fb057
commit 8118829225869bbcd48fc2ff24a249fbbd4fb057
Author: Jean Guyomarc'h
Date: Tue Aug 30 16:12:47 2016 +0200
ecore_cocoa: fix wrong key assignment
---
src/lib/ecore_cocoa/ecore_cocoa.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ecore_cocoa/ecore_cocoa.m
b/src/lib/ecore_cocoa/ecore_cocoa.m
index 43501c1..ee1188d 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa.m
@@ -277,7 +277,7 @@ _ecore_cocoa_feed_events(void *anEvent)
if (evUp->key)
{
-evUp->keyname = evDown->key;
+evUp->keyname = evUp->key;
evUp->timestamp = time;
evUp->string = NULL;
ecore_event_add(ECORE_EVENT_KEY_UP, evUp, NULL, NULL);
--
[EGIT] [tools/eflete] master 01/01: Popup: apply serch icon for tizen theme.
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=c67054bbb8c912256bdac3177e1b64f91d34e81b
commit c67054bbb8c912256bdac3177e1b64f91d34e81b
Author: Mykyta Biliavskyi
Date: Wed Aug 31 17:48:20 2016 +0300
Popup: apply serch icon for tizen theme.
---
src/bin/ui/popup.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/bin/ui/popup.c b/src/bin/ui/popup.c
index 0c413b7..0f10492 100644
--- a/src/bin/ui/popup.c
+++ b/src/bin/ui/popup.c
@@ -849,8 +849,13 @@ popup_gengrid_image_helper(const char *title, Evas_Object
*follow_up,
ENTRY_ADD(fs, entry, true);
elm_object_part_text_set(entry, "guide", _("Search"));
+#if !HAVE_TIZEN
ICON_STANDARD_ADD(entry, icon, true, "search");
elm_object_part_content_set(entry, "elm.swallow.end", icon);
+#else
+ elm_object_style_set(entry, "search");
+#endif
+
elm_object_part_content_set(fs, "eflete.swallow.search_line", entry);
evas_object_smart_callback_add(entry, "changed",
_on_images_search_entry_changed_cb,
helper_data);
--
[EGIT] [core/efl] master 01/01: docs: add editable section writing to writer
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1bdc5a008bb902957a9fa0ea776a8d1c2afff9c6
commit 1bdc5a008bb902957a9fa0ea776a8d1c2afff9c6
Author: Daniel Kolesa
Date: Wed Aug 31 16:17:25 2016 +0100
docs: add editable section writing to writer
---
src/scripts/elua/apps/docgen/writer.lua | 13 -
src/scripts/elua/apps/gendoc.lua| 6 +-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/scripts/elua/apps/docgen/writer.lua
b/src/scripts/elua/apps/docgen/writer.lua
index 10f5d66..cfd7a4e 100644
--- a/src/scripts/elua/apps/docgen/writer.lua
+++ b/src/scripts/elua/apps/docgen/writer.lua
@@ -113,7 +113,7 @@ M.Writer = util.Object:clone {
end
flags.section = nil
local flstr = {}
-for k, v in ipairs(flags) do
+for k, v in pairs(flags) do
local allow = allowed_incflags[k]
if allow ~= nil then
if type(allow) == "boolean" then
@@ -161,6 +161,17 @@ M.Writer = util.Object:clone {
return self
end,
+write_editable = function(self, ns, name)
+ns[#ns + 1] = name
+ns[#ns + 1] = false
+self:write_include(self.INCLUDE_PAGE, ns, {
+date = false, user = false, link = false
+})
+-- restore the table for later reuse
+ns[#ns] = nil
+ns[#ns] = nil
+end,
+
write_fmt = function(self, fmt1, fmt2, ...)
self:write_raw(fmt1, ...)
self:write_raw(fmt2)
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index 320435c..8b2de94 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -708,11 +708,7 @@ local build_class = function(cl)
f:write_raw(cl:doc_get():full_get(nil, true))
f:write_nl(2)
-cln[#cln + 1] = "description"
-cln[#cln + 1] = false
-f:write_include(f.INCLUDE_PAGE, cln, {
-date = false, user = false, link = false
-})
+f:write_editable(cln, "description")
f:write_nl()
build_functable(f, "Methods", "Method name", cl, dtree.Function.METHOD)
--
[EGIT] [core/efl] master 01/01: docs: hide date/user/link in included editable sections
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8e5d46f6906ac56ff67a9ab2f19c001a41876e51
commit 8e5d46f6906ac56ff67a9ab2f19c001a41876e51
Author: Daniel Kolesa
Date: Wed Aug 31 16:10:04 2016 +0100
docs: hide date/user/link in included editable sections
---
src/scripts/elua/apps/gendoc.lua | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index 58d4c2c..320435c 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -710,7 +710,9 @@ local build_class = function(cl)
cln[#cln + 1] = "description"
cln[#cln + 1] = false
-f:write_include(f.INCLUDE_PAGE, cln)
+f:write_include(f.INCLUDE_PAGE, cln, {
+date = false, user = false, link = false
+})
f:write_nl()
build_functable(f, "Methods", "Method name", cl, dtree.Function.METHOD)
--
[EGIT] [core/efl] master 01/01: docs: initial test for user editable sections
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=036a1df57ff50654d074b2e88ddfe260e486dbd6 commit 036a1df57ff50654d074b2e88ddfe260e486dbd6 Author: Daniel Kolesa Date: Wed Aug 31 16:01:53 2016 +0100 docs: initial test for user editable sections --- src/scripts/elua/apps/gendoc.lua | 5 + 1 file changed, 5 insertions(+) diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua index 9854c76..58d4c2c 100644 --- a/src/scripts/elua/apps/gendoc.lua +++ b/src/scripts/elua/apps/gendoc.lua @@ -708,6 +708,11 @@ local build_class = function(cl) f:write_raw(cl:doc_get():full_get(nil, true)) f:write_nl(2) +cln[#cln + 1] = "description" +cln[#cln + 1] = false +f:write_include(f.INCLUDE_PAGE, cln) +f:write_nl() + build_functable(f, "Methods", "Method name", cl, dtree.Function.METHOD) build_functable(f, "Properties", "Property name", cl, dtree.Function.PROPERTY) --
[EGIT] [tools/eflete] master 04/05: Tizen theme: update font size for property items text.
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=bfa5a7a49e2fa0761c463230cbeb26eee9233a78
commit bfa5a7a49e2fa0761c463230cbeb26eee9233a78
Author: Mykyta Biliavskyi
Date: Wed Aug 31 16:37:57 2016 +0300
Tizen theme: update font size for property items text.
---
data/themes/tizen/widgets/genlist.edc | 256 +
data/themes/tizen/widgets/genlist_property.edc | 18 +-
2 files changed, 14 insertions(+), 260 deletions(-)
diff --git a/data/themes/tizen/widgets/genlist.edc
b/data/themes/tizen/widgets/genlist.edc
index e0e2675..4d6deb6 100644
--- a/data/themes/tizen/widgets/genlist.edc
+++ b/data/themes/tizen/widgets/genlist.edc
@@ -2846,7 +2846,7 @@ group { name: "elm/genlist/tree/caption/default";
color_class: "genlist_text_tree";
text {
font: FN_B;
- size: 12;
+ size: 13;
max: 1 0;
align: 0.0 0.5;
}
@@ -2874,7 +2874,7 @@ group { name: "elm/genlist/tree/caption/default";
text {
text_source: "elm.text";
font: FN_B;
- size: 12;
+ size: 13;
max: 1 0;
align: 0.0 0.5;
}
@@ -3067,7 +3067,7 @@ group { name: "elm/genlist/tree/caption/default";
}
-/*
+
group { name: "elm/genlist/tree/navigator/default";
inherit: "elm/genlist/tree/default/default";
parts {
@@ -3106,7 +3106,8 @@ group { name: "elm/genlist/tree/navigator/default";
}
}
}
-*/
+
+
group { name: "elm/genlist/item/navigator/default";
inherit: "elm/genlist/item/default/default";
@@ -3149,253 +3150,6 @@ group { name: "elm/genlist/item/navigator/default";
}
}
-
-group { name: "elm/genlist/item/message/default";
- data {
- item: "texts" "elm.text elm.title.1 elm.title.2";
- item: "treesize" "20";
- item: "stacking" "above";
- item: "selectraise" "on";
- }
- parts {
- part { name: "bg";
- type: RECT;
- description { state: "default" 0.0;
-color: 0 0 0 0;
-rel2 {
- offset: -1 -2;
-}
- }
- description { state: "selected" 0.0;
-color: 58 110 155 255;
-rel2 {
- offset: -1 -2;
-}
- }
- description { state: "reorder" 0.0;
-color: 58 110 155 255;
-rel2 {
- offset: -1 -2;
-}
- }
- }
- part { name: "separator";
- type: RECT;
- description { state: "default" 0.0;
-align: 0.5 1.0;
-min: 0 1;
-max: -1 1;
-color: 68 68 68 255;
- }
- }
- part { name: "elm.swallow.pad";
- type: SWALLOW;
- description { state: "default" 0.0;
-align: 0.0 0.5;
-fixed: 1 0;
-rel1 {
- offset: 6 0;
-}
-rel2 {
- relative: 0.0 1.0;
-}
- }
- }
- part { name: "elm.text";
- type: TEXT;
- repeat_events: 1;
- description { state: "default" 0.0;
-min: 0 38;
-color: 214 214 214 255;
-rel1 {
- relative: 1.0 0.0;
- to_x: "elm.swallow.pad";
-}
-rel2 {
- relative: 0.7 1.0;
- offset: -25 -1;
-}
-text {
- font: FN;
- size: 12;
- align: 0.0 0.5;
-}
- }
- }
- part { name: "elm.title.1";
- type: TEXT;
- repeat_events: 1;
- description { state: "default" 0.0;
-color: 176 176 176 255;
-rel1 {
- relative: 0.7 0.0;
-}
-rel2 {
- relative: 1.0 0.5;
- offset: -7 -1;
-}
-text {
- font: FN;
- size: 10;
- align: 1.0 0.5;
-}
- }
- }
- part { name: "elm.title.2";
- type: TEXT;
- repeat_events: 1;
- description { state: "default" 0.0;
-color: 176 176 176 255;
-rel1 {
- relative: 0.7 0.5;
-}
-rel2 {
- offset: -7 -1;
-}
-text {
- font: FN;
- size: 10;
- align: 1.0 0.5;
-}
- }
- }
- part { name: "disclip";
- type: RECT;
- repeat_events: 1;
- description { state: "default" 0.0;
-color: 255 255 255 0;
- }
- }
- }
- programs {
- program { name: "selected";
- signal: "elm,state,selected";
- source: "elm";
- action: STATE_SET "selected" 0.00;
- target: "bg";
- }
- program { name: "unselected";
-
[EGIT] [tools/eflete] master 03/05: project manager: avoid call NULL func
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=e598cb22312a4fff44c75f42bd3102dc6a708ff7
commit e598cb22312a4fff44c75f42bd3102dc6a708ff7
Author: Vyacheslav Reutskiy
Date: Wed Aug 31 17:00:50 2016 +0300
project manager: avoid call NULL func
Change-Id: I6ddd35a77c18967af418796eff27020484863ccf
---
src/bin/project_manager/project_manager_import_edj.c | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/bin/project_manager/project_manager_import_edj.c
b/src/bin/project_manager/project_manager_import_edj.c
index 439a298..98e3a81 100644
--- a/src/bin/project_manager/project_manager_import_edj.c
+++ b/src/bin/project_manager/project_manager_import_edj.c
@@ -99,13 +99,15 @@ _data_from_edje_pick_cb(void *data,
Edje_Exe_Data *edje_pick_data = (Edje_Exe_Data *)data;
assert(edje_pick_data != NULL);
Project_Thread *ptd = (Project_Thread *)edje_pick_data->data;
- assert(ptd->func_progress != NULL);
Ecore_Exe_Event_Data *edje_pick_msg = (Ecore_Exe_Event_Data *)event_info;
if (!edje_pick_msg) return ECORE_CALLBACK_DONE;
- for (i = 0; edje_pick_msg->lines[i].line != NULL; i++)
- ptd->func_progress(NULL, edje_pick_msg->lines[i].line);
+ if (ptd->func_progress)
+ {
+for (i = 0; edje_pick_msg->lines[i].line != NULL; i++)
+ ptd->func_progress(NULL, edje_pick_msg->lines[i].line);
+ }
return ECORE_CALLBACK_DONE;
}
@@ -118,7 +120,6 @@ _edje_pick_end_cb(void *data,
Edje_Exe_Data *edje_pick_data = (Edje_Exe_Data *)data;
assert(edje_pick_data != NULL);
Project_Thread *ptd = (Project_Thread *)edje_pick_data->data;
- assert(ptd->func_progress != NULL);
Ecore_Exe_Event_Del *edje_pick_exit = (Ecore_Exe_Event_Del *)event_info;
eina_stringshare_del(edje_pick_data->cmd);
@@ -156,7 +157,7 @@ _project_import_edj(void *data)
Edje_Exe_Data *edje_pick_data;
Eina_Stringshare *msg = eina_stringshare_printf(_("Start import '%s' file
as new project"), ptd->edj);
- ptd->func_progress(NULL, msg);
+ if (ptd->func_progress) ptd->func_progress(NULL, msg);
eina_stringshare_del(msg);
/* Replace void with ptd */
@@ -177,7 +178,7 @@ _project_import_edj(void *data)
if (ptd->widgets && (eina_list_count(groups) !=
eina_list_count(ptd->widgets)))
{
msg = eina_stringshare_printf(_("Merging groups from choosen file"));
-ptd->func_progress(NULL, msg);
+if (ptd->func_progress) ptd->func_progress(NULL, msg);
eina_stringshare_del(msg);
eina_file_mkdtemp("eflete_build_XX", &ptd->tmp_dirname);
@@ -247,7 +248,7 @@ _project_import_edj(void *data)
else
{
msg = eina_stringshare_printf(_("Import processing"));
-ptd->func_progress(NULL, msg);
+if (ptd->func_progress) ptd->func_progress(NULL, msg);
eina_stringshare_del(msg);
_project_edj_file_copy(ptd);
@@ -258,7 +259,7 @@ _project_import_edj(void *data)
_project_open_internal(ptd);
msg = eina_stringshare_printf(_("Import finished. Project '%s'
created"), ptd->project->name);
-ptd->func_progress(NULL, msg);
+if (ptd->func_progress) ptd->func_progress(NULL, msg);
eina_stringshare_del(msg);
}
--
[EGIT] [tools/eflete] master 01/05: Revert "UTC: disable tests for project manager"
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=40b944755a00075fe8c6973359443f426432e686
commit 40b944755a00075fe8c6973359443f426432e686
Author: Vyacheslav Reutskiy
Date: Wed Aug 31 15:11:13 2016 +0300
Revert "UTC: disable tests for project manager"
This reverts commit 5cb9ce0cf99203e4b7e3576ba235fa2f62b5631a.
---
tests/Makefile.am | 28 +++-
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6adecef..9378994 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,6 +11,7 @@ diff_test \
change_test \
history_test \
logger_test \
+project_manager_test \
config_test \
cursor_test
@@ -57,6 +58,7 @@ include_HEADERS = \
../tests/test_change/test_change.h \
../tests/test_history/test_history.h \
../tests/test_logger/test_logger.h \
+ ../tests/test_project_manager/test_project_manager.h \
../tests/test_config/test_config.h \
../tests/test_cursor/test_cursor.h \
../tests/test_live_widget/test_live_widget.h
@@ -149,19 +151,19 @@ logger_test_SOURCES = \
logger_test_CFLAGS = ${FLAGS}
logger_test_LDADD = ${LD}
-#project_manager_test_SOURCES = \
-#../tests/test_project_manager/test_project_manager.c \
-#../tests/test_project_manager/pm_project_import_edj.c \
-#../tests/test_project_manager/pm_project_import_edc.c \
-#../tests/test_project_manager/pm_project_thread_cancel.c \
-#../tests/test_project_manager/pm_project_thread_free.c \
-#../tests/test_project_manager/pm_project_open.c \
-#../tests/test_project_manager/pm_project_save.c \
-#../tests/test_project_manager/pm_project_close.c \
-#../tests/test_project_manager/pm_project_meta_data_set.c \
-#../tests/test_project_manager/pm_project_meta_data_get.c
-#project_manager_test_CFLAGS = ${FLAGS}
-#project_manager_test_LDADD = ${LD}
+project_manager_test_SOURCES = \
+../tests/test_project_manager/test_project_manager.c \
+../tests/test_project_manager/pm_project_import_edj.c \
+../tests/test_project_manager/pm_project_import_edc.c \
+../tests/test_project_manager/pm_project_thread_cancel.c \
+../tests/test_project_manager/pm_project_thread_free.c \
+../tests/test_project_manager/pm_project_open.c \
+../tests/test_project_manager/pm_project_save.c \
+../tests/test_project_manager/pm_project_close.c \
+../tests/test_project_manager/pm_project_meta_data_set.c \
+../tests/test_project_manager/pm_project_meta_data_get.c
+project_manager_test_CFLAGS = ${FLAGS}
+project_manager_test_LDADD = ${LD}
config_test_SOURCES = \
../tests/test_config/test_config.c \
--
[EGIT] [tools/eflete] master 05/05: Tizen theme: update resources.
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=f3ca2acb2cee58e13a5d3cd8c5d930f9b7009054
commit f3ca2acb2cee58e13a5d3cd8c5d930f9b7009054
Author: Mykyta Biliavskyi
Date: Wed Aug 31 17:44:03 2016 +0300
Tizen theme: update resources.
---
.../tizen/images/Group navigator/tool_loop_dim.png | Bin 0 -> 1229 bytes
.../tizen/images/Group navigator/tool_loop_mv.png | Bin 0 -> 1229 bytes
.../tizen/images/Group navigator/tool_loop_nor.png | Bin 0 -> 1228 bytes
.../tizen/images/Group navigator/tool_loop_sel.png | Bin 0 -> 1231 bytes
.../{Tizen general => POP UP}/color_pin_mv.png | Bin
.../{Tizen general => POP UP}/color_pin_nor.png| Bin
.../{Tizen general => POP UP}/color_pin_sel.png| Bin
.../colorbar_btn_l_mv.png | Bin
.../colorbar_btn_l_nor.png | Bin 2855 -> 2870 bytes
.../colorbar_btn_l_sel.png | Bin
.../colorbar_btn_r_mv.png | Bin
.../colorbar_btn_r_nor.png | Bin 2857 -> 2873 bytes
.../colorbar_btn_r_sel.png | Bin
.../tizen/images/Scroll/scroll_down_icon_nor.png | Bin 2843 -> 971 bytes
.../tizen/images/Scroll/scroll_left_icon_dim.png | Bin 177 -> 14573 bytes
.../tizen/images/Scroll/scroll_left_icon_mv.png| Bin 175 -> 17292 bytes
.../tizen/images/Scroll/scroll_left_icon_nor.png | Bin 174 -> 14953 bytes
.../tizen/images/Scroll/scroll_left_icon_sel.png | Bin 175 -> 14954 bytes
.../tizen/images/Scroll/scroll_right_icon_dim.png | Bin 179 -> 14575 bytes
.../tizen/images/Scroll/scroll_right_icon_mv.png | Bin 179 -> 17294 bytes
.../tizen/images/Scroll/scroll_right_icon_nor.png | Bin 178 -> 14955 bytes
.../tizen/images/Scroll/scroll_right_icon_sel.png | Bin 179 -> 14956 bytes
.../tizen/images/Scroll/scroll_up_icon_nor.png | Bin 2838 -> 960 bytes
.../themes/tizen/images/Splash/loading_seq_s_2.gif | Bin 14058 -> 12687 bytes
data/themes/tizen/images/WYSIWG/tool_loop_dim.png | Bin 1331 -> 0 bytes
data/themes/tizen/images/WYSIWG/tool_loop_mv.png | Bin 1358 -> 0 bytes
data/themes/tizen/images/WYSIWG/tool_loop_nor.png | Bin 1357 -> 0 bytes
data/themes/tizen/images/WYSIWG/tool_loop_sel.png | Bin 1364 -> 0 bytes
data/themes/tizen/widgets/colorselector.edc| 36 ++---
data/themes/tizen/widgets/image.edc| 8 ++---
30 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/data/themes/tizen/images/Group navigator/tool_loop_dim.png
b/data/themes/tizen/images/Group navigator/tool_loop_dim.png
new file mode 100644
index 000..e468faf
Binary files /dev/null and b/data/themes/tizen/images/Group
navigator/tool_loop_dim.png differ
diff --git a/data/themes/tizen/images/Group navigator/tool_loop_mv.png
b/data/themes/tizen/images/Group navigator/tool_loop_mv.png
new file mode 100644
index 000..c3ab3e6
Binary files /dev/null and b/data/themes/tizen/images/Group
navigator/tool_loop_mv.png differ
diff --git a/data/themes/tizen/images/Group navigator/tool_loop_nor.png
b/data/themes/tizen/images/Group navigator/tool_loop_nor.png
new file mode 100644
index 000..06a941e
Binary files /dev/null and b/data/themes/tizen/images/Group
navigator/tool_loop_nor.png differ
diff --git a/data/themes/tizen/images/Group navigator/tool_loop_sel.png
b/data/themes/tizen/images/Group navigator/tool_loop_sel.png
new file mode 100644
index 000..7c47608
Binary files /dev/null and b/data/themes/tizen/images/Group
navigator/tool_loop_sel.png differ
diff --git a/data/themes/tizen/images/Tizen general/color_pin_mv.png
b/data/themes/tizen/images/POP UP/color_pin_mv.png
similarity index 100%
rename from data/themes/tizen/images/Tizen general/color_pin_mv.png
rename to data/themes/tizen/images/POP UP/color_pin_mv.png
diff --git a/data/themes/tizen/images/Tizen general/color_pin_nor.png
b/data/themes/tizen/images/POP UP/color_pin_nor.png
similarity index 100%
rename from data/themes/tizen/images/Tizen general/color_pin_nor.png
rename to data/themes/tizen/images/POP UP/color_pin_nor.png
diff --git a/data/themes/tizen/images/Tizen general/color_pin_sel.png
b/data/themes/tizen/images/POP UP/color_pin_sel.png
similarity index 100%
rename from data/themes/tizen/images/Tizen general/color_pin_sel.png
rename to data/themes/tizen/images/POP UP/color_pin_sel.png
diff --git a/data/themes/tizen/images/Tizen general/colorbar_btn_l_mv.png
b/data/themes/tizen/images/POP UP/colorbar_btn_l_mv.png
similarity index 100%
rename from data/themes/tizen/images/Tizen general/colorbar_btn_l_mv.png
rename to data/themes/tizen/images/POP UP/colorbar_btn_l_mv.png
diff --git a/data/themes/tizen/images/Tizen general/colorbar_btn_l_nor.png
b/data/themes/tizen/images/POP UP/colorbar_btn_l_nor.png
similarity index 95%
rename from data/themes/tizen/images/Tizen general/colorbar_btn_l_nor.png
rename to data/themes/tizen/images/POP UP/colorbar_btn_l_nor.png
index 0710be7
[EGIT] [tools/eflete] master 02/05: UTC: make project manager test builded again
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=9b51dcaa5dadc08b40532ccf7b6bc6f6f2dc
commit 9b51dcaa5dadc08b40532ccf7b6bc6f6f2dc
Author: Vyacheslav Reutskiy
Date: Wed Aug 31 16:37:05 2016 +0300
UTC: make project manager test builded again
Change-Id: I83537c0c7942e8c48225494c8291231dee602e27
---
tests/Makefile.am | 1 -
tests/test_common.h| 2 ++
tests/test_project_manager/pm_project_close.c | 10
tests/test_project_manager/pm_project_import_edc.c | 27 +++---
tests/test_project_manager/pm_project_import_edj.c | 25 +++-
.../pm_project_meta_data_get.c | 11 +
.../pm_project_meta_data_set.c | 12 ++
tests/test_project_manager/pm_project_open.c | 12 ++
tests/test_project_manager/pm_project_save.c | 14 +--
.../pm_project_thread_cancel.c | 2 +-
.../test_project_manager/pm_project_thread_free.c | 10 +---
tests/test_project_manager/test_project_manager.c | 2 --
tests/test_project_manager/test_project_manager.h | 2 --
13 files changed, 69 insertions(+), 61 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9378994..e8a6303 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -156,7 +156,6 @@ project_manager_test_SOURCES = \
../tests/test_project_manager/pm_project_import_edj.c \
../tests/test_project_manager/pm_project_import_edc.c \
../tests/test_project_manager/pm_project_thread_cancel.c \
-../tests/test_project_manager/pm_project_thread_free.c \
../tests/test_project_manager/pm_project_open.c \
../tests/test_project_manager/pm_project_save.c \
../tests/test_project_manager/pm_project_close.c \
diff --git a/tests/test_common.h b/tests/test_common.h
index 7c25668..ddfd865 100644
--- a/tests/test_common.h
+++ b/tests/test_common.h
@@ -42,9 +42,11 @@ setup(const char *name)
NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
+ /*
pro = pm_project_thread_project_get();
if (!pro)
ck_abort_msg("Setup is failed! Project not imported");
+ */
pm_project_thread_free();
return pro;
diff --git a/tests/test_project_manager/pm_project_close.c
b/tests/test_project_manager/pm_project_close.c
index 4c69597..c7e6fbe 100644
--- a/tests/test_project_manager/pm_project_close.c
+++ b/tests/test_project_manager/pm_project_close.c
@@ -52,17 +52,19 @@
*
* @}
*/
+static Project *pro = NULL;
+
static void
_test_end_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_close_test_p)
{
- Project *pro;
Eina_Bool res;
elm_init(0,0);
@@ -73,9 +75,7 @@ EFLETE_TEST (pm_project_close_test_p)
NULL, NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
- if (!pro)
- ck_abort_msg("Project not created!");
+ ck_assert_msg(!pro, "Project not created!");
res = pm_project_close(pro);
ck_assert_msg(res, "Project is not closed!");
diff --git a/tests/test_project_manager/pm_project_import_edc.c
b/tests/test_project_manager/pm_project_import_edc.c
index b68b02d..2b853e9 100644
--- a/tests/test_project_manager/pm_project_import_edc.c
+++ b/tests/test_project_manager/pm_project_import_edc.c
@@ -30,6 +30,7 @@
*/
Eina_Bool res;
+static Project *pro;
/**
* @addtogroup pm_project_import_edc
@@ -57,25 +58,26 @@ Eina_Bool res;
static void
_test_end_p1_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
-Eina_List *widgets __UNUSED__)
+Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_import_edc_test_p1)
{
- Project *pro;
-
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
pm_project_import_edc("UTC", ".", "./edj_build/radio.edc",
"-id ./edj_build -fd ./edj_build -sd ./edj_build",
NULL, _test_end_p1_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
+ ck_assert_msg(!pro, "Project not imported");
pm_project_close(pro);
ecore_file_recursive_rm("./UTC");
@@ -110,21 +112,20 @@ END_TEST
static void
_test_end_p2_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
-Eina_List *widgets __UNUSED__)
+Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_import_edc_test_p2)
{
- Project *pro;
- //Eina_Bool files_is = EINA_FALSE;
- //Eet_File *ef;
-
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NU
[EGIT] [core/efl] master 01/01: docs: allow false root in namespace tables
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9ecae0ed28ef989f3bb8fcb88200efd0e457b0ac
commit 9ecae0ed28ef989f3bb8fcb88200efd0e457b0ac
Author: Daniel Kolesa
Date: Wed Aug 31 15:53:39 2016 +0100
docs: allow false root in namespace tables
---
src/scripts/elua/apps/docgen/doctree.lua | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/scripts/elua/apps/docgen/doctree.lua
b/src/scripts/elua/apps/docgen/doctree.lua
index 17bac7c..c8996c2 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -28,8 +28,8 @@ M.Node = util.Object:clone {
end
table.insert(tbl, 1, subn)
tbl[#tbl + 1] = self:name_get():lower()
-if root then
-tbl[#tbl + 1] = true
+if root ~= nil then
+tbl[#tbl + 1] = not not root
end
return tbl
end
@@ -400,8 +400,8 @@ M.Function = Node:clone {
local tbl = cl:nspaces_get()
tbl[#tbl + 1] = self:type_str_get()
tbl[#tbl + 1] = self:name_get():lower()
-if root then
-tbl[#tbl + 1] = true
+if root ~= nil then
+tbl[#tbl + 1] = not not root
end
return tbl
end
@@ -517,8 +517,8 @@ M.Event = Node:clone {
local tbl = cl:nspaces_get()
tbl[#tbl + 1] = "event"
tbl[#tbl + 1] = self:name_get():lower():gsub(",", "_")
-if root then
-tbl[#tbl + 1] = true
+if root ~= nil then
+tbl[#tbl + 1] = not not root
end
return tbl
end
@@ -1237,7 +1237,7 @@ M.ref_get = function(str, root)
for tok in str:gmatch("[^%.]+") do
t[#t + 1] = tok:lower()
end
-if root then t[#t + 1] = true end
+if root ~= nil then t[#t + 1] = not not root end
return t
end
@@ -1292,7 +1292,7 @@ M.ref_get = function(str, root)
local ret = M.ref_get(bstr)
ret[#ret + 1] = fn:type_str_get()
ret[#ret + 1] = fn:name_get():lower()
-if root then ret[#ret + 1] = true end
+if root ~= nil then ret[#ret + 1] = not not root end
return ret
end
--
[EGIT] [core/efl] master 01/01: docs: separate auto/user from root namespace
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=800dbda6a670f71ace1f4ebf06d36e895a403ce8
commit 800dbda6a670f71ace1f4ebf06d36e895a403ce8
Author: Daniel Kolesa
Date: Wed Aug 31 15:50:31 2016 +0100
docs: separate auto/user from root namespace
---
src/scripts/elua/apps/docgen/keyref.lua | 2 +-
src/scripts/elua/apps/docgen/util.lua | 6 +++---
src/scripts/elua/apps/docgen/writer.lua | 12 ++--
src/scripts/elua/apps/gendoc.lua| 2 +-
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/scripts/elua/apps/docgen/keyref.lua
b/src/scripts/elua/apps/docgen/keyref.lua
index 6a22ed0..832f00a 100644
--- a/src/scripts/elua/apps/docgen/keyref.lua
+++ b/src/scripts/elua/apps/docgen/keyref.lua
@@ -29,7 +29,7 @@ M.build = function()
f:finish()
local lf = writer.Writer({ "ref", lang, "keyword-link" })
lf:write_raw("/", dutil.path_join(
-dutil.nspace_to_path(dutil.get_root_ns()),
+dutil.nspace_to_path(dutil.get_root_ns()), "auto",
"ref", lang, "key", "{FNAME}"
))
lf:write_nl()
diff --git a/src/scripts/elua/apps/docgen/util.lua
b/src/scripts/elua/apps/docgen/util.lua
index b23afbc..b8a0aa2 100644
--- a/src/scripts/elua/apps/docgen/util.lua
+++ b/src/scripts/elua/apps/docgen/util.lua
@@ -23,7 +23,7 @@ M.nspace_to_path = function(ns)
end
M.make_page = function(path)
-return M.path_join(doc_root, path .. ".txt")
+return M.path_join(doc_root, "auto", path .. ".txt")
end
M.get_root_ns = function()
@@ -31,7 +31,7 @@ M.get_root_ns = function()
end
M.mkdir_r = function(dirn)
-assert(cutil.file_mkpath(dirn and M.path_join(doc_root, dirn) or doc_root))
+assert(cutil.file_mkpath(M.path_join(doc_root, "auto", dirn)))
end
M.mkdir_p = function(path)
@@ -39,7 +39,7 @@ M.mkdir_p = function(path)
end
M.rm_root = function()
-cutil.file_rmrf(doc_root)
+cutil.file_rmrf(M.path_join(doc_root, "auto"))
end
M.str_split = function(str, delim)
diff --git a/src/scripts/elua/apps/docgen/writer.lua
b/src/scripts/elua/apps/docgen/writer.lua
index 91d683e..10f5d66 100644
--- a/src/scripts/elua/apps/docgen/writer.lua
+++ b/src/scripts/elua/apps/docgen/writer.lua
@@ -96,7 +96,11 @@ M.Writer = util.Object:clone {
if type(name) == "table" then
if name[#name] == true then
name[#name] = nil
-name = ":" .. root_nspace .. ":"
+name = ":" .. root_nspace .. ":auto:"
+ .. table.concat(name, ":")
+elseif name[#name] == false then
+name[#name] = nil
+name = ":" .. root_nspace .. ":user:"
.. table.concat(name, ":")
else
name = table.concat(name, ":")
@@ -222,7 +226,11 @@ M.Writer = util.Object:clone {
if type(target) == "table" then
if target[#target] == true then
target[#target] = nil
-target = ":" .. root_nspace .. ":"
+target = ":" .. root_nspace .. ":auto:"
+ .. table.concat(target, ":")
+elseif target[#target] == false then
+target[#target] = nil
+target = ":" .. root_nspace .. ":user:"
.. table.concat(target, ":")
else
target = table.concat(target, ":")
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index 75b6aad..9854c76 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -1076,7 +1076,7 @@ getopt.parse {
set_theme(opts["graph-theme"])
end
local rootns = (not opts["n"] or opts["n"] == "")
-and "docs:efl:auto" or opts["n"]
+and "docs:efl" or opts["n"]
local dr
if not opts["r"] or opts["r"] == "" then
dr = "dokuwiki/data/pages"
--
Re: [E-devel] [EGIT] [core/efl] master 01/01: efreet - fix mime file path messing with short paths like /
On 31/08/16 00:35, Carsten Haitzler (The Rasterman) wrote:
> On Tue, 30 Aug 2016 13:37:34 +0100 Tom Hacohen said:
>
>> Has this been reverted already? (The unrelated changes)
>>
>> Or should I do it?
>
> well the changes there don't hurt anything if you look at them. they would
> avoid crashes if null params were passed in so i see removing them as worse
> than doing nothing. i have no idea how they got there. i hadn't touched any gl
> engine stuff in the few days i was working on this mime stuff.
Ah great, so should be kept. Was just making sure we're not missing on this.
--
Tom.
>
>> On 27/08/16 01:48, Carsten Haitzler (The Rasterman) wrote:
>>> On Fri, 26 Aug 2016 14:15:46 + Mike Blumenkrantz
>>> said:
>>>
I just noticed this while doing some bisecting...was it intentional that
you included undocumented evas engine changes in your efreet commit?
>>>
>>> wtf? i... what? i haven't even opened evas_gl_cocoa_main.m in like...
>>> months and months - i think i edited then once before 1.18 release to fix a
>>> bug... wtf? how? i didn't touch these! i haven't been looking at anything
>>> in evas engines for a while... certainly not int he last week or 2.
>>>
>>> WTH?
>>>
On Tue, Jul 5, 2016 at 3:29 AM Carsten Haitzler
wrote:
> raster pushed a commit to branch master.
>
>
> http://git.enlightenment.org/core/efl.git/commit/?id=2ca5075193e27dbc30f26e478019719a5360cc84
>
> commit 2ca5075193e27dbc30f26e478019719a5360cc84
> Author: Carsten Haitzler (Rasterman)
> Date: Tue Jul 5 15:56:43 2016 +0900
>
> efreet - fix mime file path messing with short paths like /
>
> this fixes T4015
>
> @fix
> ---
> src/lib/efreet/efreet_mime.c | 7 +--
> src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m | 1 +
> src/modules/evas/engines/gl_x11/evas_x_main.c | 2 ++
> src/modules/evas/engines/wayland_egl/evas_wl_main.c| 1 +
> 4 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/src/lib/efreet/efreet_mime.c b/src/lib/efreet/efreet_mime.c
> index adfa790..87ca8ef 100644
> --- a/src/lib/efreet/efreet_mime.c
> +++ b/src/lib/efreet/efreet_mime.c
> @@ -711,10 +711,13 @@ efreet_mime_special_check(const char *file)
> parent[PATH_MAX - 1] = '\0';
>
> /* Kill any trailing slash */
> - parent[--path_len] = '\0';
> + if (parent[path_len - 1] == '/')
> + parent[--path_len] = '\0';
>
> /* Truncate to last slash */
> - while (parent[--path_len] != '/') parent[path_len] = '\0';
> + while ((path_len > 0) &&
> + (parent[--path_len] != '/'))
> + parent[path_len] = '\0';
>
> #ifdef _WIN32
> if (!stat(file, &s2))
> diff --git a/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
> b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
> index 15dc218..7df919f 100644
> --- a/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
> +++ b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
> @@ -120,6 +120,7 @@ eng_window_free(Evas_GL_Cocoa_Window *gw)
> void
> eng_window_use(Evas_GL_Cocoa_Window *gw)
> {
> + if ((gw) && (!gw->gl_context)) return;
> if (_evas_gl_cocoa_window != gw)
> {
> [[(NSOpenGLView*)gw->view openGLContext] makeCurrentContext];
> diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c
> b/src/modules/evas/engines/gl_x11/evas_x_main.c
> index 59361e1..f5e2edf 100644
> --- a/src/modules/evas/engines/gl_x11/evas_x_main.c
> +++ b/src/modules/evas/engines/gl_x11/evas_x_main.c
> @@ -676,6 +676,8 @@ eng_window_use(Outbuf *gw)
> xwin = _tls_outbuf_get();
>
> glsym_evas_gl_preload_render_lock(eng_window_make_current, gw);
> + if ((gw) && (!gw->gl_context)) return;
> +
> #ifdef GL_GLES
> if (xwin)
> {
> diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
> b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
> index 489a475..14e13ff 100644
> --- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
> +++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
> @@ -233,6 +233,7 @@ eng_window_use(Outbuf *gw)
> Eina_Bool force = EINA_FALSE;
>
> glsym_evas_gl_preload_render_lock(eng_preload_make_current, gw);
> + if ((gw) && (!gw->gl_context)) return;
>
> if (_evas_gl_wl_window)
> {
>
> --
>
>
>
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.n
[EGIT] [core/efl] master 01/01: docs: generate within the docs:efl:auto namespace (for future editable blocks)
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b193a9f840bd0418e07307775afe7e384ad2ca5a
commit b193a9f840bd0418e07307775afe7e384ad2ca5a
Author: Daniel Kolesa
Date: Wed Aug 31 15:18:10 2016 +0100
docs: generate within the docs:efl:auto namespace (for future editable
blocks)
---
src/scripts/elua/apps/gendoc.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index cf50b86..75b6aad 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -1076,7 +1076,7 @@ getopt.parse {
set_theme(opts["graph-theme"])
end
local rootns = (not opts["n"] or opts["n"] == "")
-and "efl" or opts["n"]
+and "docs:efl:auto" or opts["n"]
local dr
if not opts["r"] or opts["r"] == "" then
dr = "dokuwiki/data/pages"
--
[EGIT] [tools/eflete] master 01/01: Tizen theme: update style and sizes for colorselector.
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=5e46473196df648815079c6ffe48c5027ea264e6
commit 5e46473196df648815079c6ffe48c5027ea264e6
Author: Mykyta Biliavskyi
Date: Wed Aug 31 15:04:29 2016 +0300
Tizen theme: update style and sizes for colorselector.
Added dirty hack to resize color picker.
---
data/themes/tizen/widgets/colorselector.edc | 69 +
src/bin/ui/popup.c | 9
src/bin/ui/property/property_common.c | 10 -
3 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/data/themes/tizen/widgets/colorselector.edc
b/data/themes/tizen/widgets/colorselector.edc
index 27d4ae7..6d118f6 100644
--- a/data/themes/tizen/widgets/colorselector.edc
+++ b/data/themes/tizen/widgets/colorselector.edc
@@ -12,8 +12,8 @@ group { name: "elm/layout/popup/colorselector";
part { name: "border";
type: RECT;
description { state: "default" 0.0;
-min: 404 263;
-max: 404 263;
+min: 351 258;
+max: 351 258;
color_class: "popup_helper_border";
rel1.offset: -1 -1;
rel2.offset: 0 0;
@@ -552,23 +552,24 @@ group { name: "elm/colorselector/picker/default";
}
}
}
+
group { name: "elm/colorselector/palette/default";
data {
- item: "vertical_pad" "8";
- item: "horizontal_pad" "8";
+ item: "vertical_pad" "0";
+ item: "horizontal_pad" "7";
}
parts {
part { name: "bg_border";
type: RECT;
- description { state: "default" 0.0;
-min: 402 261;
-max: 402 261;
+ description { state: "default" 0.00;
+min: 349 256;
+max: 349 256;
color_class: "colorselector_border_bg";
}
}
part { name: "bg";
type: RECT;
- description { state: "default" 0.0;
+ description { state: "default" 0.00;
color_class: "colorselector_bg";
rel1 {
offset: 5 5;
@@ -582,13 +583,13 @@ group { name: "elm/colorselector/palette/default";
}
part { name: "elm.picker";
type: SWALLOW;
- description { state: "default" 0.0;
-align: 0.0 0.0;
+ description { state: "default" 0.00;
+align: 0.00 0.00;
fixed: 1 1;
min: 96 169;
max: 96 169;
rel1 {
- relative: 1.0 0.0;
+ relative: 1.00 0.00;
offset: 16 25;
to_x: "elm.selector";
to_y: "bg_border";
@@ -601,13 +602,13 @@ group { name: "elm/colorselector/palette/default";
}
part { name: "elm.palette";
type: SWALLOW;
- description { state: "default" 0.0;
-align: 0.5 0.0;
+ description { state: "default" 0.00;
+align: 0.50 0.00;
fixed: 1 1;
-min: 0 32;
-max: -1 32;
+min: 0 27;
+max: -1 27;
rel1 {
- relative: 0.0 1.0;
+ relative: 0.00 1.00;
offset: 0 10;
to: "elm.selector";
}
@@ -617,19 +618,19 @@ group { name: "elm/colorselector/palette/default";
to_y: "elm.selector";
}
}
- description { state: "off" 0.0;
-align: 0.5 0.0;
-rel1.relative: 0.0 1.0;
-rel2.relative: 1.0 0.0;
+ description { state: "off" 0.00;
+align: 0.50 0.00;
+rel1.relative: 0.00 1.00;
+rel2.relative: 1.00 0.00;
}
}
part { name: "elm.selector";
type: SWALLOW;
- description { state: "default" 0.0;
-align: 0.0 0.0;
+ description { state: "default" 0.00;
+align: 0.00 0.00;
fixed: 1 1;
-min: 240 159;
-max: 240 159;
+min: 188 159;
+max: 188 159;
rel1 {
offset: 25 34;
to: "bg_border";
@@ -922,29 +923,19 @@ group { name: "elm/colorselector/picker/base/default";
}
group { name: "elm/colorselector/item/default";
parts {
- part { name: "base";
- type: RECT;
- description { state: "default" 0.0;
-visible: 0;
-min: 27 28;
-max: 27 28;
- }
- }
- part { name: "bg";
+ part { name: "bg";
type: RECT;
description { state: "default" 0.0;
-min: 32 32;
-max: 32 32;
-align: 0.0 0.5;
-color: 0 0 0 0;
+min: 27 27;
+max: 27 27;
}
}
part { name: "color_obj";
type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
-min: 32 32;
-max: 32 32;
+min: 27 27;
+
[EGIT] [core/efl] master 01/01: Canvas text: fix ellipsis RTL handling
herdsman pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2d44738fae55f87c6f787c2b02e63b8a24fd270d
commit 2d44738fae55f87c6f787c2b02e63b8a24fd270d
Author: Daniel Hirt
Date: Mon Aug 1 15:52:18 2016 +0300
Canvas text: fix ellipsis RTL handling
First, fixing ellipsis text positions: ellipsis items should be assigned the
text positions of the omitted text (while maintaining the formatting of the
last visual item). In the case where an entire item was rejected, it
will be assigned that item's text position. If an item was split, it will be
assigned the text position of the split portion.
The BiDi reorder code relies on properly-assigned text positions.
Second, fixing ellipsis handling: the width calc was only considering the
ellipsis item's width. However, if the ellipsis is placed as e.g. the first
visual item (such as in RTL cases), its advance value should've be
considered,
instead.
Thanks Youngbok Shin for the test case and information.
@fix
---
src/lib/evas/canvas/evas_object_textblock.c | 29 ++---
src/tests/evas/evas_test_textblock.c| 23 +++
2 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index 6d5e28e..890498d 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -4869,14 +4869,25 @@ static inline void
_layout_handle_ellipsis(Ctxt *c, Evas_Object_Textblock_Item *it, Eina_List *i)
{
Evas_Object_Textblock_Text_Item *ti, *ellip_ti;
- Evas_Object_Textblock_Item *last_it;
- Evas_Coord save_cx;
+ Evas_Object_Textblock_Item *last_it, *prev_it;
+ Evas_Coord save_cx, save_cw, ellip_w;
int wrap;
ellip_ti = _layout_ellipsis_item_new(c, it);
- last_it = it;
+ prev_it = last_it = it;
save_cx = c->x;
- c->w -= ellip_ti->parent.w;
+ save_cw = c->w;
+ ellip_w = ellip_ti->parent.w;
+#ifdef BIDI_SUPPORT
+ // XXX: with RTL considerations in mind, we need to take max(adv, w) as the
+ // line may be reordered in a way that the item placement will cause the
+ // formatted width to exceed the width constraints.
+ if (ellip_ti->parent.adv > ellip_ti->parent.w)
+ {
+ellip_w = ellip_ti->parent.adv;
+ }
+#endif
+ c->w -= ellip_w;
/* If there is no enough space for ellipsis item, remove all of items */
if (c->w <= 0)
@@ -4901,6 +4912,7 @@ _layout_handle_ellipsis(Ctxt *c,
Evas_Object_Textblock_Item *it, Eina_List *i)
if ((wrap > 0) && !IS_AT_END(ti, (size_t) wrap))
{
+ Evas_Object_Textblock_Text_Item *new_ti;
Eina_List *l = i;
while (l)
@@ -4909,12 +4921,14 @@ _layout_handle_ellipsis(Ctxt *c,
Evas_Object_Textblock_Item *it, Eina_List *i)
if (iit == _ITEM(ti)) break;
l = eina_list_prev(l);
}
-
- _layout_item_text_split_strip_white(c, ti, l, wrap);
+ new_ti = _layout_item_text_split_strip_white(c, ti, l, wrap);
+ ellip_ti->parent.text_pos = new_ti->parent.text_pos;
break;
}
else if (wrap < 0)
{
+ // Removal of the previous item left enough space.
+ ellip_ti->parent.text_pos = prev_it->text_pos;
break;
}
}
@@ -4936,6 +4950,7 @@ _layout_handle_ellipsis(Ctxt *c,
Evas_Object_Textblock_Item *it, Eina_List *i)
EINA_INLIST_GET(last_it)));
}
+prev_it = last_it;
last_it = (c->ln->items) ? _ITEM(EINA_INLIST_GET(c->ln->items)->last)
: NULL;
if (last_it)
@@ -4954,7 +4969,7 @@ _layout_handle_ellipsis(Ctxt *c,
Evas_Object_Textblock_Item *it, Eina_List *i)
}
c->x = save_cx;
- c->w += ellip_ti->parent.w;
+ c->w = save_cw;
/* If we should add this item, do it */
if (last_it == it)
{
diff --git a/src/tests/evas/evas_test_textblock.c
b/src/tests/evas/evas_test_textblock.c
index efee1ef..b92c61a 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -2259,6 +2259,29 @@ START_TEST(evas_textblock_wrapping)
evas_object_textblock_size_formatted_get(tb, &w, NULL);
ck_assert_int_eq(bw, w);
+#ifdef HAVE_FRIBIDI
+ /* Check the ellipsis is placed at proper place
+* in RTL text with formats */
+ evas_object_textblock_text_markup_set(tb, ")");
+ evas_object_textblock_size_native_get(tb, &bw, NULL);
+ bw++;
+
+ /* Expect to see: "...)ي" */
+ evas_object_textblock_text_markup_set(tb, "ي(ي)");
+ evas_textblock_cursor_format_prepend(cur, "+ ellipsis=1.0");
+ evas_object_textblock_size_native_get(tb, &nw, &nh);
+ evas_object_resize(tb, nw - bw, nh);
+ e
[EGIT] [core/efl] master 01/01: eina: module - Add macros for adding module informations
ami pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d88f08f7e92a06ce114466da41886463be58c8d8
commit d88f08f7e92a06ce114466da41886463be58c8d8
Author: Amitesh Singh
Date: Wed Aug 31 16:17:52 2016 +0530
eina: module - Add macros for adding module informations
Summary:
These macros allow you to define module informations like
author/description/version/license
e.g.
// Use "Name " or just "Name"
EINA_MODULE_AUTHOR("Enlightenment Community");
// Mention license
EINA_MODULE_LICENSE("GPL v2");
// What your module does
EINA_MODULE_DESCRIPTION("This is what this module does");
// Module version
EINA_MODULE_VERSION("0.1");
Now eina_modinfo can show these informations to users
$ eina_modinfo module.so
version: 0.1
description: Entry test
license: GPLv2
author: Enlightenment Community
@feature
Reviewers: cedric, tasn, raster, jpeg
Subscribers: seoz
Differential Revision: https://phab.enlightenment.org/D4257
---
src/Makefile_Eina.am| 14 +-
src/bin/eina/.gitignore | 1 +
src/bin/eina/eina_modinfo.c | 57
src/lib/eina/eina_inline_modinfo.x | 77 +
src/lib/eina/eina_module.h | 1 +
src/modules/elementary/test_entry/mod.c | 5 +++
6 files changed, 154 insertions(+), 1 deletion(-)
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index f2a5762..020052a 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -101,7 +101,8 @@ lib/eina/eina_bezier.h \
lib/eina/eina_safepointer.h \
lib/eina/eina_inline_safepointer.x \
lib/eina/eina_slice.h \
-lib/eina/eina_inline_slice.x
+lib/eina/eina_inline_slice.x \
+lib/eina/eina_inline_modinfo.x
lib_eina_libeina_la_SOURCES = \
lib/eina/eina_abi.c \
@@ -268,6 +269,17 @@ bin_eina_eina_btlog_CPPFLAGS =
-I$(top_builddir)/src/lib/efl \
bin_eina_eina_btlog_LDADD = @USE_EINA_LIBS@
bin_eina_eina_btlog_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+bin_PROGRAMS += bin/eina/eina_modinfo
+
+bin_eina_eina_modinfo_SOURCES = bin/eina/eina_modinfo.c
+bin_eina_eina_modinfo_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \
+@EINA_CFLAGS@
+
+bin_eina_eina_modinfo_LDADD = @USE_EINA_LIBS@
+
### Script
bin_SCRIPTS += scripts/eina/eina-bench-cmp
diff --git a/src/bin/eina/.gitignore b/src/bin/eina/.gitignore
index ec4ebaa..a35f69e 100644
--- a/src/bin/eina/.gitignore
+++ b/src/bin/eina/.gitignore
@@ -1 +1,2 @@
eina_btlog
+eina_modinfo
diff --git a/src/bin/eina/eina_modinfo.c b/src/bin/eina/eina_modinfo.c
new file mode 100644
index 000..943c92b
--- /dev/null
+++ b/src/bin/eina/eina_modinfo.c
@@ -0,0 +1,57 @@
+/* EINA - EFL data type library
+ * Copyright (C) 2016 Amitesh Singh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see
[EGIT] [tools/eflete] master 01/01: Project manager: move usage edje_edit_image API into main thread.
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=80a1c43c159de791cf5c9e10e5a47666bb266a7e
commit 80a1c43c159de791cf5c9e10e5a47666bb266a7e
Author: Mykyta Biliavskyi
Date: Wed Aug 31 12:29:58 2016 +0300
Project manager: move usage edje_edit_image API into main thread.
edje_edit_image API's calls inside Ecore_Thread causes undefined
behaviour.
---
.../project_manager_export_resources.c | 60 +-
1 file changed, 48 insertions(+), 12 deletions(-)
diff --git a/src/bin/project_manager/project_manager_export_resources.c
b/src/bin/project_manager/project_manager_export_resources.c
index 8ef3509..8b75e64 100644
--- a/src/bin/project_manager/project_manager_export_resources.c
+++ b/src/bin/project_manager/project_manager_export_resources.c
@@ -68,9 +68,13 @@ typedef struct
{
Evas *e;
Evas_Object *im;
- const char *id;
+ Evas_Object *edit_object;
+ int id;
+ const char *id_path;
const char *dev;
const char *source;
+ const char *image_name;
+ const char *message;
Eina_Lock mutex;
} Image_Data_Save;
@@ -79,15 +83,36 @@ _image_save_routine(void *data)
{
Image_Data_Save *ids = (Image_Data_Save *)data;
eina_lock_take(&ids->mutex);
-
+ ids->id_path = eina_stringshare_printf("edje/images/%i", ids->id);
ids->im = evas_object_image_add(ids->e);
- evas_object_image_file_set(ids->im, ids->dev, ids->id);
+ evas_object_image_file_set(ids->im, ids->dev, ids->id_path);
evas_object_image_save(ids->im, ids->source, NULL, NULL);
evas_object_del(ids->im);
eina_lock_release(&ids->mutex);
return NULL;
}
+typedef struct
+{
+ Evas_Object *edit_object;
+ const char *name;
+ Edje_Edit_Image_Comp comp;
+ int id;
+ Eina_Lock mutex;
+} Image_Data_Get;
+
+static void*
+_image_data_get_routine(void *data)
+{
+ Image_Data_Get *idg = (Image_Data_Get *)data;
+ eina_lock_take(&idg->mutex);
+ idg->comp = edje_edit_image_compression_type_get(idg->edit_object,
idg->name);
+ idg->id = edje_edit_image_id_get(idg->edit_object, idg->name);
+ eina_lock_release(&idg->mutex);
+ return NULL;
+}
+
+
void
_image_resources_feedback_job(void *data, Ecore_Thread *th)
{
@@ -103,7 +128,7 @@ _image_resources_feedback_job(void *data, Ecore_Thread *th)
External_Resource *res;
Eina_List *images;
Eina_Stringshare *resource_folder;
- Eina_Stringshare *image_name, *source_file;
+ Eina_Stringshare *image_name;
Eina_List *l;
Evas *e;
int id;
@@ -137,8 +162,14 @@ _image_resources_feedback_job(void *data, Ecore_Thread *th)
Image_Data_Save *ids = mem_calloc(1, sizeof(Image_Data_Save));
ids->e = e;
ids->dev = project->dev;
+ ids->edit_object = project->global_object;
eina_lock_new(&ids->mutex);
eina_lock_take(&ids->mutex);
+
+ Image_Data_Get *idg = mem_calloc(1, sizeof(Image_Data_Get));
+ idg->edit_object = project->global_object;
+ eina_lock_new(&idg->mutex);
+ eina_lock_take(&idg->mutex);
EINA_LIST_FOREACH(images, l, image_name)
{
/* for supporting old themes, which were compilled
@@ -151,10 +182,14 @@ _image_resources_feedback_job(void *data, Ecore_Thread
*th)
ecore_thread_feedback(th, message);
res = (External_Resource *) resource_add(image_name,
RESOURCE_TYPE_IMAGE);
-comp_type =
edje_edit_image_compression_type_get(project->global_object,
- res->name);
-
res->source = eina_stringshare_add(image_name);
+idg->name = image_name;
+eina_lock_release(&idg->mutex);
+ecore_main_loop_thread_safe_call_sync(_image_data_get_routine, idg);
+eina_lock_take(&idg->mutex);
+
+comp_type = idg->comp;
+
if (comp_type == EDJE_EDIT_IMAGE_COMP_USER)
res->path = eina_stringshare_add(res->source);
else
@@ -166,7 +201,7 @@ _image_resources_feedback_job(void *data, Ecore_Thread *th)
file_dir = ecore_file_dir_get(res->path);
ecore_file_mkpath(file_dir);
free(file_dir);
- id = edje_edit_image_id_get(project->global_object, image_name);
+ id = idg->id;
if (id < 0)
{
message = eina_stringshare_printf(_("Image %s coudn't be
exported"), image_name);
@@ -175,20 +210,21 @@ _image_resources_feedback_job(void *data, Ecore_Thread
*th)
sleep(2);
continue;
}
- source_file = eina_stringshare_printf("edje/images/%i", id);
- ids->id = source_file;
+ ids->id = id;
ids->im = NULL;
ids->source = res->path;
eina_lock_release(&ids->mutex);
ecore_main_loop_thread_safe_call_sync(_image_save_routine, ids);
- eina_lock_take(&ids->mutex);
- eina_stringshare_del(source_file);
}
}
eina_
Re: [E-devel] Enventor 1.0 Release
Hello Hermet, Congratulations with that release. Multi-file edit feature is awesome. Is it possible add support vim-like navigation inside text editor? On Wed, 2016-08-31 at 16:46 +0900, Hermet Park wrote: > Hello everyone, > > I'm glad to announce Enventor 1.0 release. > > Please see and enjoy it. :) > > Demo Video: > https://youtu.be/lTLfr6knXrA > > And fyi, Enventor has an official about page that helps you about its > usage. > See https://www.enlightenment.org/about-enventor > > Thank you. > > > Changes since Enventor 0.9.0: > - > > Additions: > * Tooltips: Newly supported. > * Wireframe: Newly introduced. > * File Tab: Newly introduced. > * Reference Popup: Newly introduced. > * A lot of Enventor APIs are changed. > > Improvements: > * EDC Editor: Rearrange searched part to be placed in center. > * EDC Editor: Support to jump to the part define. > * File Borwser: Set current directory as a workspace in default. > * File Browser: add a function to set a main edc file with a > marker. > * File Browser: Display sorted file list based on file type. > * File Browser: Skip files if their names were started with dot. > * Template: Add various samples. > * New File: Sort template list in alphabetical order. > * Help: Update overall content. > * Setting: Apply layze style to syntax color template code. > * Setting: Add the main EDC file path. > * Live Edit: support base_scale values. > * Console: Apply syntax color for error messages:. > * EDC Parser: Identify whole macro functions to have syntax color. > * Support vector type part. > * Update overall GUIs & Shortcut keys. > * Support individual group view size and view scale. > * Limit to an single Enventor instance. > * Update Syntax color keywords. > * Allow multi-file editor. > > Fixes: > * Template: Fix Map template code typo. > * Template: don't localize floats in the relative values. > * Statusbar: Fix an incorrect view size. > * Indentation: Fix a incorrect indentation in a corner case. > * Live Edit: Fix incorrect stacking. > * Live Edit: Fix an added object to have min size properly. > * Live Edit: Dismiss ctxpopup when view position is changed. > * Goto: Fix window closing issue. > * Setting: Fix to not abuse user Elementary configuration file. > * Setting: Reset font style properly. > * EDC Editor: Show images on cursor "images.image". > * EDC Editor: Fix to remove focus highlight on template seletion > button. > * Fix many crash scenarios. > * Fix a dummy swallow/spacer selection bug. > * Fix Undo's indiscriminate red alert. > * Fix build break on Win32. > --- > --- > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/eflete] master 01/01: group navi: reset copied part index
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=1b01a027c00e0a1487db4cfeb2483e35d91b39f7
commit 1b01a027c00e0a1487db4cfeb2483e35d91b39f7
Author: Vyacheslav Reutskiy
Date: Wed Aug 31 11:32:10 2016 +0300
group navi: reset copied part index
---
src/bin/ui/workspace/group_navigator.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/ui/workspace/group_navigator.c
b/src/bin/ui/workspace/group_navigator.c
index cec04c8..4865c98 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -920,6 +920,7 @@ _popup_add_part_ok_clicked(void *data,
msg = eina_stringshare_printf(_("copied new part \"%s\" from \"%s\""),
name, copy_name);
change = change_add(msg);
CRIT_ON_FAIL(editor_part_copy(pl->group->edit_object, change, false,
true, name, copy_name));
+pl->popup.copy_part = 0;
}
else
{
--
[EGIT] [tools/eflete] eflete-1.18 01/01: group navi: reset copied part index
rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=96ed81712b9c0dc2037c4b04e03647da7ec361ae
commit 96ed81712b9c0dc2037c4b04e03647da7ec361ae
Author: Vyacheslav Reutskiy
Date: Wed Aug 31 11:32:10 2016 +0300
group navi: reset copied part index
---
src/bin/ui/workspace/group_navigator.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/ui/workspace/group_navigator.c
b/src/bin/ui/workspace/group_navigator.c
index a6e9fff..1375d89 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -920,6 +920,7 @@ _popup_add_part_ok_clicked(void *data,
msg = eina_stringshare_printf(_("copied new part \"%s\" from \"%s\""),
name, copy_name);
change = change_add(msg);
CRIT_ON_FAIL(editor_part_copy(pl->group->edit_object, change, false,
true, name, copy_name));
+pl->popup.copy_part = 0;
}
else
{
--
[EGIT] [website/www-content] master 01/01: Wiki page news-enventor changed with summary [created] by Hermet Park
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=ec9f309d8f4a38c77da3a570d79942d7c8c9f24a
commit ec9f309d8f4a38c77da3a570d79942d7c8c9f24a
Author: Hermet Park
Date: Wed Aug 31 01:09:29 2016 -0700
Wiki page news-enventor changed with summary [created] by Hermet Park
---
pages/news/news-enventor.txt | 65
1 file changed, 65 insertions(+)
diff --git a/pages/news/news-enventor.txt b/pages/news/news-enventor.txt
new file mode 100644
index 000..968f40c
--- /dev/null
+++ b/pages/news/news-enventor.txt
@@ -0,0 +1,65 @@
+=== Enventor v1.0 Release ===
+ * //2016-08-31 - by Hermet Park//
+
+New version of Enventor released!
+
+== Demo Video ==
+ https://youtu.be/lTLfr6knXrA
+
+== Changes since Enventor 0.9.0: ==
+
+Additions:
+ * Tooltips: Newly supported.
+ * Wireframe: Newly introduced.
+ * File Tab: Newly introduced.
+ * Reference Popup: Newly introduced.
+ * A lot of Enventor APIs are changed.
+
+Improvements:
+ * EDC Editor: Rearrange searched part to be placed in center.
+ * EDC Editor: Support to jump to the part define.
+ * File Borwser: Set current directory as a workspace in default.
+ * File Browser: add a function to set a main edc file with a marker.
+ * File Browser: Display sorted file list based on file type.
+ * File Browser: Skip files if their names were started with dot.
+ * Template: Add various samples.
+ * New File: Sort template list in alphabetical order.
+ * Help: Update overall content.
+ * Setting: Apply layze style to syntax color template code.
+ * Setting: Add the main EDC file path.
+ * Live Edit: support base_scale values.
+ * Console: Apply syntax color for error messages:.
+ * EDC Parser: Identify whole macro functions to have syntax color.
+ * Support vector type part.
+ * Update overall GUIs & Shortcut keys.
+ * Support individual group view size and view scale.
+ * Limit to an single Enventor instance.
+ * Update Syntax color keywords.
+ * Allow multi-file editor.
+
+Fixes:
+ * Template: Fix Map template code typo.
+ * Template: don't localize floats in the relative values.
+ * Statusbar: Fix an incorrect view size.
+ * Indentation: Fix a incorrect indentation in a corner case.
+ * Live Edit: Fix incorrect stacking.
+ * Live Edit: Fix an added object to have min size properly.
+ * Live Edit: Dismiss ctxpopup when view position is changed.
+ * Goto: Fix window closing issue.
+ * Setting: Fix to not abuse user Elementary configuration file.
+ * Setting: Reset font style properly.
+ * EDC Editor: Show images on cursor "images.image".
+ * EDC Editor: Fix to remove focus highlight on template seletion button.
+ * Fix many crash scenarios.
+ * Fix a dummy swallow/spacer selection bug.
+ * Fix Undo's indiscriminate red alert.
+ * Fix build break on Win32.
+
+== Download ==
+^ ** LINK ** ^ ** SHA256 ** ^
+| [[ http://download.enlightenment.org/rel/apps/enventor/enventor-1.0.0.tar.gz
| Enventor 1.0.0 GZIP]]|
c4a9511ed707f6849dcc6d4c8f260095fb54cba2e5baa977d54d32bdee187abb |
+| [[ http://download.enlightenment.org/rel/apps/enventor/enventor-1.0.0.tar.xz
| Enventor 1.0.0 XZ]] |
3e066cd10f370b8de127cb31c0ab72723950d323449c7d3a88e32882b31bd19d |
+
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
+
--
[E-devel] Enventor 1.0 Release
Hello everyone, I'm glad to announce Enventor 1.0 release. Please see and enjoy it. :) Demo Video: https://youtu.be/lTLfr6knXrA And fyi, Enventor has an official about page that helps you about its usage. See https://www.enlightenment.org/about-enventor Thank you. Changes since Enventor 0.9.0: - Additions: * Tooltips: Newly supported. * Wireframe: Newly introduced. * File Tab: Newly introduced. * Reference Popup: Newly introduced. * A lot of Enventor APIs are changed. Improvements: * EDC Editor: Rearrange searched part to be placed in center. * EDC Editor: Support to jump to the part define. * File Borwser: Set current directory as a workspace in default. * File Browser: add a function to set a main edc file with a marker. * File Browser: Display sorted file list based on file type. * File Browser: Skip files if their names were started with dot. * Template: Add various samples. * New File: Sort template list in alphabetical order. * Help: Update overall content. * Setting: Apply layze style to syntax color template code. * Setting: Add the main EDC file path. * Live Edit: support base_scale values. * Console: Apply syntax color for error messages:. * EDC Parser: Identify whole macro functions to have syntax color. * Support vector type part. * Update overall GUIs & Shortcut keys. * Support individual group view size and view scale. * Limit to an single Enventor instance. * Update Syntax color keywords. * Allow multi-file editor. Fixes: * Template: Fix Map template code typo. * Template: don't localize floats in the relative values. * Statusbar: Fix an incorrect view size. * Indentation: Fix a incorrect indentation in a corner case. * Live Edit: Fix incorrect stacking. * Live Edit: Fix an added object to have min size properly. * Live Edit: Dismiss ctxpopup when view position is changed. * Goto: Fix window closing issue. * Setting: Fix to not abuse user Elementary configuration file. * Setting: Reset font style properly. * EDC Editor: Show images on cursor "images.image". * EDC Editor: Fix to remove focus highlight on template seletion button. * Fix many crash scenarios. * Fix a dummy swallow/spacer selection bug. * Fix Undo's indiscriminate red alert. * Fix build break on Win32. -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [website/www-content] master 01/01: about enventor: updated youtube link.
hermet pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=2b2c1ceb37979bfd0a8d8c0cd4b0a45357dcee73
commit 2b2c1ceb37979bfd0a8d8c0cd4b0a45357dcee73
Author: Hermet Park
Date: Wed Aug 31 16:38:57 2016 +0900
about enventor: updated youtube link.
---
pages/about-enventor.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/about-enventor.txt b/pages/about-enventor.txt
index 6b6aa53..bb6f9b3 100644
--- a/pages/about-enventor.txt
+++ b/pages/about-enventor.txt
@@ -11,7 +11,7 @@ Enventor, which is also known as a dynamic EDC (Edje Data
Collections) Editor, i
{{ :enventor-main.png?&300|}}
-When your application requires real-time changeable layouts like animated
ones, you can write the layout design using EDC script, compile it into EDJ
format file, and import it into your application using a UI layout component.
You can also write design layouts from simple to complex ones using the EDC
script with Enventor. Enventor helps you write EDC script code eaiser and
finish your work faster. If you are not familiar with EDC programming, see
[[https://www.enlightenment.org/program [...]
+When your application requires real-time changeable layouts like animated
ones, you can write the layout design using EDC script, compile it into EDJ
format file, and import it into your application using a UI layout component.
You can also write design layouts from simple to complex ones using the EDC
script with Enventor. Enventor helps you write EDC script code easier and
finish your work faster. If you are not familiar with EDC programming, see
[[https://www.enlightenment.org/program [...]
Basically, Enventor view is divided into live view and text view. The live
view on the left pane previews images corresponding to part objects of the EDC
source code. The text view on the right pane contains the EDC source code.
Because of its real-time update mechanism, Enventor updates the preview
real-time while you modify the source code. Enventor also provides useful
functions for you to develop your GUI. Before using Enventor, familiarize
yourself with the following functionalities.
@@ -320,4 +320,4 @@ Examples of Enventor command line usage:
===Demo Video===
-{{youtube>-DQVSspuoak?large}}
+{{youtube>lTLfr6knXrA?large}}
--
Re: [E-devel] [RFC] Efl.Net.Dialer.Websocket
> > I see... well, the WebSocket's primitives aren't that many, I suppose > you're code is mostly focused on text of binary messages, so it's one > method and one event. Some #ifdef would do? > > Naa it's not that easy ;) > I know the feeling of "not willing to touch something that it's > working", but if you want to help... :-) > > > > >> Also: do you use some plublic web service? Which one? I may add another > >> example and using something more real than a echo server would be nice. > >> > > Except for the echo public server, not really. > > hum... ok, so you use calaos as both server and client in this scope? > Is this expected to go over the internet or just local networking... > IOW: why did you pick WebSocket? > We use websocket because we have multiple type of client connecting to the server: - web app using angularjs and websocket - mobile app, qt with websocket - desktop UI websocket also allows us to easily pass all kind of proxy/firewall as well as putting a ssl layer on top of it. > > -- > Gustavo Sverzut Barbieri > -- > Mobile: +55 (16) 99354-9890 > > > -- > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/eflete] master 01/01: Replace Eo_Event by Efl_Event.
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=0991cf4050c42c37848dcbc770102faba903b197
commit 0991cf4050c42c37848dcbc770102faba903b197
Author: Mykyta Biliavskyi
Date: Tue Aug 30 18:28:57 2016 +0300
Replace Eo_Event by Efl_Event.
fix build on latest EFL
---
src/bin/common/validator.c | 2 +-
src/bin/common/validator.h | 2 +-
src/bin/ui/sound_player/sound_player.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/common/validator.c b/src/bin/common/validator.c
index eae52b9..441a350 100644
--- a/src/bin/common/validator.c
+++ b/src/bin/common/validator.c
@@ -81,7 +81,7 @@ resource_name_validator_status_get(Resource_Name_Validator
*validator)
}
void
-resource_name_validator_helper(void *data, const Eo_Event *event)
+resource_name_validator_helper(void *data, const Efl_Event *event)
{
Resource *res = NULL;
Resource request;
diff --git a/src/bin/common/validator.h b/src/bin/common/validator.h
index 520dab7..bbad74b 100644
--- a/src/bin/common/validator.h
+++ b/src/bin/common/validator.h
@@ -35,6 +35,6 @@ resource_name_validator_free(Resource_Name_Validator
*validator);
Elm_Regexp_Status
resource_name_validator_status_get(Resource_Name_Validator *validator);
void
-resource_name_validator_helper(void *data, const Eo_Event *event);
+resource_name_validator_helper(void *data, const Efl_Event *event);
#endif /* VALIDATOR_H */
diff --git a/src/bin/ui/sound_player/sound_player.c
b/src/bin/ui/sound_player/sound_player.c
index b50d306..f00ba06 100644
--- a/src/bin/ui/sound_player/sound_player.c
+++ b/src/bin/ui/sound_player/sound_player.c
@@ -110,7 +110,7 @@ _player_units_free(char *str)
evas_object_show(ITEM);
static void
-_play_finished_cb(void *data __UNUSED__, const Eo_Event *event __UNUSED__)
+_play_finished_cb(void *data __UNUSED__, const Efl_Event *event __UNUSED__)
{
efl_unref(in);
in = NULL;
@@ -119,7 +119,7 @@ _play_finished_cb(void *data __UNUSED__, const Eo_Event
*event __UNUSED__)
}
static void
-_out_fail(void *data __UNUSED__, const Eo_Event *event)
+_out_fail(void *data __UNUSED__, const Efl_Event *event)
{
efl_unref(event->object);
}
--
