[EGIT] [e16/e16] master 02/02: Update po
kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=f6cd99412461bd4ea08ec86b6c20c4beb618334a commit f6cd99412461bd4ea08ec86b6c20c4beb618334a Author: Kim Woelders Date: Sat May 18 07:12:06 2019 +0200 Update po --- po/ar.po| 22 +++--- po/bg.po| 22 +++--- po/bs.po| 22 +++--- po/ca.po| 22 +++--- po/cs.po| 22 +++--- po/csb.po | 22 +++--- po/da.po| 22 +++--- po/de.po| 22 +++--- po/en_US.po | 22 +++--- po/eo.po| 22 +++--- po/es.po| 22 +++--- po/fo.po| 22 +++--- po/fr.po| 22 +++--- po/gl.po| 22 +++--- po/hr.po| 22 +++--- po/hu.po| 22 +++--- po/it.po| 22 +++--- po/ja.po| 22 +++--- po/ko.po| 22 +++--- po/nb.po| 22 +++--- po/nl.po| 22 +++--- po/pl.po| 22 +++--- po/pt.po| 22 +++--- po/pt_BR.po | 22 +++--- po/ru.po| 22 +++--- po/sk.po| 22 +++--- po/sr.po| 22 +++--- po/sv.po| 22 +++--- po/tr.po| 22 +++--- po/uk.po| 22 +++--- po/zh_CN.po | 22 +++--- 31 files changed, 341 insertions(+), 341 deletions(-) diff --git a/po/ar.po b/po/ar.po index b1506beb..f909013f 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: e16\n" "Report-Msgid-Bugs-To: enlightenment-i...@lists.sourceforge.net\n" -"POT-Creation-Date: 2019-04-25 09:03+0200\n" +"POT-Creation-Date: 2019-05-18 07:11+0200\n" "PO-Revision-Date: 2009-09-28 17:09+\n" "Last-Translator: Aron Xu \n" "Language-Team: Arabic \n" @@ -460,7 +460,7 @@ msgstr "عرض اسمءا الأيقونات" msgid "Animation mode:" msgstr "" -#: src/container.c:1668 src/desktops.c:2729 +#: src/container.c:1668 src/desktops.c:2730 msgid "Off" msgstr "لا يعمل" @@ -591,39 +591,39 @@ msgid "" "Settings Dialog" msgstr "" -#: src/desktops.c:2683 +#: src/desktops.c:2684 msgid "Virtual Desktop size:" msgstr "" -#: src/desktops.c:2719 +#: src/desktops.c:2720 msgid "Wrap virtual desktops around" msgstr "" -#: src/desktops.c:2726 +#: src/desktops.c:2727 msgid "Edge Flip Mode:" msgstr "" -#: src/desktops.c:2734 +#: src/desktops.c:2735 msgid "On" msgstr "يعمل" -#: src/desktops.c:2739 +#: src/desktops.c:2740 msgid "Only when moving window" msgstr "" -#: src/desktops.c:2745 +#: src/desktops.c:2746 msgid "Resistance at edge of screen:" msgstr "" -#: src/desktops.c:2757 +#: src/desktops.c:2758 msgid "Areas" msgstr "مناطق" -#: src/desktops.c:2757 +#: src/desktops.c:2758 msgid "Virtual Desktop Settings" msgstr "" -#: src/desktops.c:2761 +#: src/desktops.c:2762 msgid "" "Enlightenment Virtual Desktop\n" "Settings Dialog" diff --git a/po/bg.po b/po/bg.po index 18e7835a..e8b938f2 100644 --- a/po/bg.po +++ b/po/bg.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: e16\n" "Report-Msgid-Bugs-To: enlightenment-i...@lists.sourceforge.net\n" -"POT-Creation-Date: 2019-04-25 09:03+0200\n" +"POT-Creation-Date: 2019-05-18 07:11+0200\n" "PO-Revision-Date: 2010-05-09 01:24+\n" "Last-Translator: Aron Xu \n" "Language-Team: Bulgarian\n" @@ -492,7 +492,7 @@ msgstr " msgid "Animation mode:" msgstr "" -#: src/container.c:1668 src/desktops.c:2729 +#: src/container.c:1668 src/desktops.c:2730 msgid "Off" msgstr "" @@ -646,39 +646,39 @@ msgstr "" "�: � ��� ��\n" "�� �� �" -#: src/desktops.c:2683 +#: src/desktops.c:2684 msgid "Virtual Desktop size:" msgstr "�� �� ��� :" -#: src/desktops.c:2719 +#: src/desktops.c:2720 msgid "Wrap virtual desktops around" msgstr "� ��� ��" -#: src/desktops.c:2726 +#: src/desktops.c:2727 msgid "Edge Flip Mode:" msgstr "" -#: src/desktops.c:2734 +#: src/desktops.c:2735 msgid "On" msgstr "" -#: src/desktops.c:2739 +#: src/desktops.c:2740 msgid "Only when moving window" msgstr "" -#: src/desktops.c:2745 +#: src/desktops.c:2746 msgid "Resistance at edge of screen:" msgstr "\"�\" �� �� ��:" -#: src/desktops.c:2757 +#: src/desktops.c:2758 msgid "Areas" msgstr "" -#: src/desktops.c:2757 +#: src/desktops.c:2758 msgid "Virtual Desktop Settings" msgstr "� �� � ��" -#: src/desktops.c:2761 +#: src/desktops.c:2762 msgid "" "Enlightenment Virtual Desktop\n" "Settings Dialog" diff --git a/po/bs.po b/po/bs.po index 0b6838de..03cc3950 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: e16\n" "Report-Msgid-Bugs-To: enlightenment-i...@lists.sourceforge.net\n"
[EGIT] [e16/e16] master 01/02: Make config dialog edge flip mode changes take effect immediately
kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=d767409ee8981853eb4b48f724aad9ae38a25dba commit d767409ee8981853eb4b48f724aad9ae38a25dba Author: Kim Woelders Date: Sat May 18 07:06:54 2019 +0200 Make config dialog edge flip mode changes take effect immediately Previously it required a restart. --- src/desktops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/desktops.c b/src/desktops.c index ded61ccb..0f5e5655 100644 --- a/src/desktops.c +++ b/src/desktops.c @@ -2613,6 +2613,7 @@ _DlgApplyAreas(Dialog * d, int val __UNUSED__, void *data __UNUSED__) if (dd->edge_resist < 1) dd->edge_resist = 1; Conf.desks.edge_flip_resistance = dd->edge_resist; + EdgeWindowsShow(); autosave(); } --
[EGIT] [apps/terminology] master 01/01: terminology - fix initial size hints to be stepped right
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=40ea16d995b10c288810c14bef4b7b6a4d090259
commit 40ea16d995b10c288810c14bef4b7b6a4d090259
Author: Carsten Haitzler (Rasterman)
Date: Sat May 18 02:41:16 2019 +0100
terminology - fix initial size hints to be stepped right
@fix
---
src/bin/termio.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index dc06126..d8c4c28 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -3006,16 +3006,20 @@ static void
_smart_size(Evas_Object *obj, int w, int h, Eina_Bool force)
{
Termio *sd = evas_object_smart_data_get(obj);
- Eina_Bool first_time;
+ Evas_Coord mw = 0, mh = 0;
+
EINA_SAFETY_ON_NULL_RETURN(sd);
- first_time = (sd->grid.h == 0);
if ((w <= 0) || (h <= 0))
{
w = 80;
h = 24;
}
+ evas_object_size_hint_min_get(obj, , );
+ if ((mw != sd->font.chw) || (mh != sd->font.chh))
+ evas_object_size_hint_min_set(obj, sd->font.chw, sd->font.chh);
+
if (!force)
{
if ((w == sd->grid.w) && (h == sd->grid.h)) return;
@@ -3025,8 +3029,6 @@ _smart_size(Evas_Object *obj, int w, int h, Eina_Bool
force)
evas_event_freeze(evas_object_evas_get(obj));
evas_object_textgrid_size_set(sd->grid.obj, w, h);
evas_object_resize(sd->cursor.obj, sd->font.chw, sd->font.chh);
- if (!first_time)
- evas_object_size_hint_min_set(obj, sd->font.chw, sd->font.chh);
if (!sd->noreqsize)
evas_object_size_hint_request_set(obj,
sd->font.chw * sd->grid.w,
--
[EGIT] [core/efl] master 01/01: bin/ecore_evas: remove useless inclusion of Evil.h
zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1692ff3890875be579dbf953bd0ec2146497eba9 commit 1692ff3890875be579dbf953bd0ec2146497eba9 Author: Vincent Torri Date: Fri May 17 14:02:21 2019 -0400 bin/ecore_evas: remove useless inclusion of Evil.h Test Plan: compilation Reviewers: zmike, raster, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8917 --- src/bin/ecore_evas/ecore_evas_convert.c | 4 1 file changed, 4 deletions(-) diff --git a/src/bin/ecore_evas/ecore_evas_convert.c b/src/bin/ecore_evas/ecore_evas_convert.c index e76888db47..019e42c7ff 100644 --- a/src/bin/ecore_evas/ecore_evas_convert.c +++ b/src/bin/ecore_evas/ecore_evas_convert.c @@ -2,10 +2,6 @@ #include #endif -#ifdef _WIN32 -# include -#endif - #include #include #include --
[EGIT] [core/efl] master 01/01: bin/eet and ecore_con: remove Evil.h when not necessary and include evil_private.h when necessary
zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=092114ecc8ea39e3fdf0f0e7a7f2db9574269531 commit 092114ecc8ea39e3fdf0f0e7a7f2db9574269531 Author: Vincent Torri Date: Fri May 17 13:51:50 2019 -0400 bin/eet and ecore_con: remove Evil.h when not necessary and include evil_private.h when necessary Test Plan: compilation Reviewers: raster, zmike, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8911 --- src/bin/ecore_con/efl_net_proxy_helper.c | 4 src/bin/eet/eet_main.c| 4 src/lib/ecore_con/ecore_con.c | 2 +- src/lib/ecore_con/ecore_con_legacy.c | 4 src/lib/ecore_con/ecore_con_local_win32.c | 1 - src/lib/ecore_con/ecore_con_proxy_helper.c| 4 src/lib/ecore_con/ecore_con_socks.c | 1 - src/lib/ecore_con/efl_net_dialer_ssl.c| 3 --- src/lib/ecore_con/efl_net_dialer_tcp.c| 3 --- src/lib/ecore_con/efl_net_dialer_udp.c| 3 --- src/lib/ecore_con/efl_net_ip_address.c| 4 src/lib/ecore_con/efl_net_server_fd.c | 3 --- src/lib/ecore_con/efl_net_server_ip.c | 3 --- src/lib/ecore_con/efl_net_server_tcp.c| 3 --- src/lib/ecore_con/efl_net_server_udp.c| 3 --- src/lib/ecore_con/efl_net_server_udp_client.c | 3 --- src/lib/ecore_con/efl_net_socket_fd.c | 3 --- src/lib/ecore_con/efl_net_socket_tcp.c| 3 --- src/lib/ecore_con/efl_net_socket_udp.c| 3 --- src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 2 +- 20 files changed, 2 insertions(+), 57 deletions(-) diff --git a/src/bin/ecore_con/efl_net_proxy_helper.c b/src/bin/ecore_con/efl_net_proxy_helper.c index 1a0255bb86..6b2e3678ce 100644 --- a/src/bin/ecore_con/efl_net_proxy_helper.c +++ b/src/bin/ecore_con/efl_net_proxy_helper.c @@ -10,10 +10,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #include "Eina.h" #ifdef ERR diff --git a/src/bin/eet/eet_main.c b/src/bin/eet/eet_main.c index 7967cc791c..7da5cfd4d3 100644 --- a/src/bin/eet/eet_main.c +++ b/src/bin/eet/eet_main.c @@ -7,10 +7,6 @@ #include #include -#ifdef _WIN32 -# include -#endif /* ifdef _WIN32 */ - #include static int _eet_main_log_dom = -1; diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index a781025d7b..75f083ac9f 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -40,7 +40,7 @@ #ifdef _WIN32 # include -# include +# include /* evil_init|shutdown */ #endif #include "Ecore.h" diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c index 1956176604..d1c402e045 100644 --- a/src/lib/ecore_con/ecore_con_legacy.c +++ b/src/lib/ecore_con/ecore_con_legacy.c @@ -10,10 +10,6 @@ # include #endif -#ifdef _WIN32 -# include -#endif - #define EFL_NET_SOCKET_SSL_PROTECTED #include "Ecore.h" diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c index 86593a2ffa..6b68bf07fe 100644 --- a/src/lib/ecore_con/ecore_con_local_win32.c +++ b/src/lib/ecore_con/ecore_con_local_win32.c @@ -4,7 +4,6 @@ #include -#include #include #include "Ecore_Con.h" diff --git a/src/lib/ecore_con/ecore_con_proxy_helper.c b/src/lib/ecore_con/ecore_con_proxy_helper.c index 1b58ab1952..01b90652d8 100644 --- a/src/lib/ecore_con/ecore_con_proxy_helper.c +++ b/src/lib/ecore_con/ecore_con_proxy_helper.c @@ -10,10 +10,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #include "Ecore.h" #include "ecore_private.h" #include "Ecore_Con.h" diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c index 08f5585381..0068b33076 100644 --- a/src/lib/ecore_con/ecore_con_socks.c +++ b/src/lib/ecore_con/ecore_con_socks.c @@ -36,7 +36,6 @@ #ifdef _WIN32 # include -# include #endif #include "Ecore.h" diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c index ffc36a6f58..efc9d8e34c 100644 --- a/src/lib/ecore_con/efl_net_dialer_ssl.c +++ b/src/lib/ecore_con/efl_net_dialer_ssl.c @@ -24,9 +24,6 @@ #ifdef HAVE_ARPA_INET_H # include #endif -#ifdef _WIN32 -# include -#endif #define MY_CLASS EFL_NET_DIALER_SSL_CLASS diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c index ba93fc4c74..50a354126c 100644 --- a/src/lib/ecore_con/efl_net_dialer_tcp.c +++ b/src/lib/ecore_con/efl_net_dialer_tcp.c @@ -24,9 +24,6 @@ #ifdef HAVE_ARPA_INET_H # include #endif -#ifdef _WIN32 -# include -#endif #define MY_CLASS EFL_NET_DIALER_TCP_CLASS diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c index e75ed24fed..e353121f26 100644 --- a/src/lib/ecore_con/efl_net_dialer_udp.c +++ b/src/lib/ecore_con/efl_net_dialer_udp.c @@ -25,9
[EGIT] [core/efl] master 01/01: eolian tests: rename owning.eo.c to clear confusion
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5922bb268f0222764cf14f68365e6e66e1a9789c
commit 5922bb268f0222764cf14f68365e6e66e1a9789c
Author: Daniel Kolesa
Date: Fri May 17 16:08:23 2019 +0200
eolian tests: rename owning.eo.c to clear confusion
---
src/Makefile_Eolian.am | 2 +-
src/tests/eolian/data/{owning.eo.c => owning_ref.c} | 0
src/tests/eolian/eolian_generation.c| 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
index e5a8e49c38..876a2f01ac 100644
--- a/src/Makefile_Eolian.am
+++ b/src/Makefile_Eolian.am
@@ -158,7 +158,7 @@ tests/eolian/data/typedef_ref.h \
tests/eolian/data/typedef_ref_stub.h \
tests/eolian/data/struct_ref.h \
tests/eolian/data/struct_ref_stub.h \
-tests/eolian/data/owning.eo.c \
+tests/eolian/data/owning_ref.c \
tests/eolian/data/class_simple_ref.c \
tests/eolian/data/override_ref.c \
tests/eolian/data/class_simple_ref_eo.h \
diff --git a/src/tests/eolian/data/owning.eo.c
b/src/tests/eolian/data/owning_ref.c
similarity index 100%
rename from src/tests/eolian/data/owning.eo.c
rename to src/tests/eolian/data/owning_ref.c
diff --git a/src/tests/eolian/eolian_generation.c
b/src/tests/eolian/eolian_generation.c
index f5b4c820fb..99e0f69a4b 100644
--- a/src/tests/eolian/eolian_generation.c
+++ b/src/tests/eolian/eolian_generation.c
@@ -226,7 +226,7 @@ EFL_START_TEST(owning)
eina_environment_tmp_get());
_remove_ref(output_filepath, "eo.c");
fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/owning.eo", "-gc",
output_filepath));
- fail_if(!_files_compare(TESTS_SRC_DIR"/data/owning.eo.c", output_filepath,
"eo.c"));
+ fail_if(!_files_compare(TESTS_SRC_DIR"/data/owning_ref.c", output_filepath,
"eo.c"));
}
EFL_END_TEST
--
[EGIT] [tools/examples] master 01/01: Use direction instead of table_direction in table examples
xartigas pushed a commit to branch master. http://git.enlightenment.org/tools/examples.git/commit/?id=af73959386d622d57718f118f02fd17559be36ee commit af73959386d622d57718f118f02fd17559be36ee Author: Xavi Artigas Date: Fri May 17 15:26:02 2019 +0200 Use direction instead of table_direction in table examples Efl.Ui.Direction.direction is simpler to understand than Efl.Pack_table.table_direction. Also, the latter might disappear very soon. --- reference/c/ui/src/ui_container.c | 2 +- reference/csharp/ui/src/ui_container.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/c/ui/src/ui_container.c b/reference/c/ui/src/ui_container.c index e19c2de0..68a48fa9 100644 --- a/reference/c/ui/src/ui_container.c +++ b/reference/c/ui/src/ui_container.c @@ -37,7 +37,7 @@ _ui_table_setup(Efl_Ui_Win *win) table = efl_add(EFL_UI_TABLE_CLASS, win); efl_pack_table_columns_set(table, 2); - efl_pack_table_direction_set(table, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN); + efl_ui_direction_set(table, EFL_UI_DIR_RIGHT); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Long Button"), diff --git a/reference/csharp/ui/src/ui_container.cs b/reference/csharp/ui/src/ui_container.cs index 1ee439ff..3b14bc02 100644 --- a/reference/csharp/ui/src/ui_container.cs +++ b/reference/csharp/ui/src/ui_container.cs @@ -38,7 +38,7 @@ public class Example : Efl.Csharp.Application Efl.Ui.Table table = new Efl.Ui.Table(win); // Table with two columns, that get filled left to right, and then top to bottom table.SetTableColumns(2); -table.SetTableDirection(Efl.Ui.Dir.Right, Efl.Ui.Dir.Down); +table.SetDirection(Efl.Ui.Dir.Right); Efl.Ui.Button button; for (int i = 1; i <= 4; ++i) --
[EGIT] [apps/terminology] master 01/01: theme - fix theme min sizing that is causing a default 81x24 not 80x24
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=396041a7417ee1bfce077b5237dcb245110f1786
commit 396041a7417ee1bfce077b5237dcb245110f1786
Author: Carsten Haitzler (Rasterman)
Date: Fri May 17 13:53:01 2019 +0100
theme - fix theme min sizing that is causing a default 81x24 not 80x24
the bg min size calcs as 8x8 - it shouldnt be. more like 2x2 with no
content (the padding of 1 pixel at the dges).
---
data/themes/default.edc | 16
1 file changed, 16 insertions(+)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 0da6ed1..9323255 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -410,6 +410,7 @@ collections {
part { name: "tabcount_glow_r0";
clip_to: "tabcount_clip";
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.to: "tabcount_r0";
rel2.to: "tabcount_r0";
rel1.offset: -4 -4;
@@ -428,6 +429,7 @@ collections {
part { name: "tabcount_glow_r1";
clip_to: "tabcount_clip";
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.to: "tabcount_r1";
rel2.to: "tabcount_r1";
rel1.offset: -4 -4;
@@ -446,6 +448,7 @@ collections {
part { name: "tabcount_glow_r2";
clip_to: "tabcount_clip";
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.to: "tabcount_r2";
rel2.to: "tabcount_r2";
rel1.offset: -4 -4;
@@ -464,6 +467,7 @@ collections {
part { name: "tabcount_glow_r3";
clip_to: "tabcount_clip";
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.to: "tabcount_r3";
rel2.to: "tabcount_r3";
rel1.offset: -4 -4;
@@ -482,6 +486,7 @@ collections {
part { name: "tabcount_r0"; type: RECT;
clip_to: "tabcount_clip";
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.to: "terminology.tabcount.control";
rel2.to: "terminology.tabcount.control";
rel1.relative: 0.05 0.05;
@@ -496,6 +501,7 @@ collections {
part { name: "tabcount_r1"; type: RECT;
clip_to: "tabcount_clip";
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.to: "terminology.tabcount.control";
rel2.to: "terminology.tabcount.control";
rel1.relative: 0.55 0.05;
@@ -510,6 +516,7 @@ collections {
part { name: "tabcount_r2"; type: RECT;
clip_to: "tabcount_clip";
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.to: "terminology.tabcount.control";
rel2.to: "terminology.tabcount.control";
rel1.relative: 0.05 0.55;
@@ -524,6 +531,7 @@ collections {
part { name: "tabcount_r3"; type: RECT;
clip_to: "tabcount_clip";
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.to: "terminology.tabcount.control";
rel2.to: "terminology.tabcount.control";
rel1.relative: 0.55 0.55;
@@ -683,6 +691,7 @@ collections {
part { name: "sendfile_request_bg"; type: RECT;
clip_to: "sendfile_request_clip";
description { state: "default" 0.0;
+ fixed: 1 1;
color: 64 64 64 255;
rel1.relative: 0.0 -1.0;
rel2.relative: 1.0 0.0;
@@ -697,6 +706,7 @@ collections {
clip_to: "sendfile_request_clip";
scale: 1;
description { state: "default" 0.0;
+ fixed: 1 1;
rel.to: "sendfile_request_bg";
rel1.offset: 4 4;
rel2.offset: -5 -5;
@@ -768,6 +778,7 @@ collections {
clip_to: "sendfile_progress_clip";
scale : 1;
description { state: "default" 0.0;
+ fixed: 1 1;
color: 64 64 64 255;
rel.to: "terminology.sendfile.progress";
rel1.offset: -4 -4;
@@ -781,6 +792,7 @@ collections {
clip_to: "sendfile_progress_clip";
scale : 1;
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.relative: 0.0 0.0;
rel1.offset: 4 -5;
rel2.relative: 1.0 0.0;
@@ -859,6 +871,7 @@ collections {
part { name: "glow";
mouse_events: 0;
description { state: "default" 0.0;
+ fixed: 1 1;
image.normal: "bg_glow_in.png";
image.border: 7 7 7 7;
image.middle: 0;
@@ -877,6 +890,7 @@ collections {
part { name: "bevel";
[EGIT] [core/efl] master 01/01: efl_mono: generate efl_canvas_text.eo.cs
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a55777c9258f6cf0df1bb68377a9edb19a399caf commit a55777c9258f6cf0df1bb68377a9edb19a399caf Author: Jaehyun Cho Date: Fri May 17 17:35:00 2019 +0900 efl_mono: generate efl_canvas_text.eo.cs To use canvas text in efl csharp bindings, it is permitted to generate efl_canvas_text.eo.cs. --- src/Makefile_Efl_Mono.am | 1 - src/bindings/mono/meson.build | 1 - 2 files changed, 2 deletions(-) diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am index cc6e38570c..a5912b5c98 100644 --- a/src/Makefile_Efl_Mono.am +++ b/src/Makefile_Efl_Mono.am @@ -130,7 +130,6 @@ include Makefile_Eolian_Mono_Helper.am ### Efl C Sharp Binding evas_eolian_blacklisted_files = \ -lib/evas/canvas/efl_canvas_text.eo.cs \ lib/evas/canvas/efl_canvas_scene3d.eo.cs \ lib/evas/canvas/evas_canvas3d_camera.eo.cs \ lib/evas/canvas/evas_canvas3d_light.eo.cs \ diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build index c55a8f4e37..69a5f8491f 100644 --- a/src/bindings/mono/meson.build +++ b/src/bindings/mono/meson.build @@ -42,7 +42,6 @@ mono_sublibs = [ blacklisted_files = [ 'efl_class.eo', - 'efl_canvas_text.eo', 'efl_canvas_scene3d.eo', 'evas_canvas3d_camera.eo', 'evas_canvas3d_light.eo', --
[EGIT] [core/efl] master 02/02: Eet: remove useless inclusion of Evil.h
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=40e2f9ba8eaa59ab3fada45e09c6431060d18321 commit 40e2f9ba8eaa59ab3fada45e09c6431060d18321 Author: Vincent Torri Date: Fri May 17 11:52:58 2019 +0100 Eet: remove useless inclusion of Evil.h Test Plan: compilation Reviewers: raster, zmike, cedric Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8909 --- src/lib/eet/eet_node.c | 4 1 file changed, 4 deletions(-) diff --git a/src/lib/eet/eet_node.c b/src/lib/eet/eet_node.c index fa203f2ea8..9fbbf49186 100644 --- a/src/lib/eet/eet_node.c +++ b/src/lib/eet/eet_node.c @@ -5,10 +5,6 @@ #include #include -#ifdef _WIN32 -# include -#endif /* ifdef _WIN32 */ - #include #include "Eet.h" --
[EGIT] [core/efl] master 01/02: bin/efl and ecore: include evil_private.h when appropriate
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=839f22870bccc85384d46b8c735fc2ff3edc7ed8 commit 839f22870bccc85384d46b8c735fc2ff3edc7ed8 Author: Vincent Torri Date: Fri May 17 11:52:41 2019 +0100 bin/efl and ecore: include evil_private.h when appropriate Test Plan: compilation Reviewers: raster, zmike, cedric Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8908 --- src/bin/efl/efl_debugd.c | 3 +++ src/lib/ecore/ecore.c | 2 +- src/lib/ecore/ecore_anim.c| 1 + src/lib/ecore/ecore_app.c | 4 src/lib/ecore/ecore_exe_win32.c | 2 ++ src/lib/ecore/ecore_main.c| 3 +-- src/lib/ecore/ecore_pipe.c| 5 + src/lib/ecore/ecore_thread.c | 4 src/lib/ecore/ecore_time.c| 4 src/lib/ecore/efl_core_proc_env.c | 3 +++ src/lib/ecore/efl_thread.c| 3 +++ 11 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/bin/efl/efl_debugd.c b/src/bin/efl/efl_debugd.c index 3962aa6a80..b23db7544c 100644 --- a/src/bin/efl/efl_debugd.c +++ b/src/bin/efl/efl_debugd.c @@ -25,6 +25,9 @@ #include #include "eina_debug_private.h" +#ifdef _WIN32 +# include /* mkdir */ +#endif #include #include #include diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c index ceb3021019..7aa987b271 100644 --- a/src/lib/ecore/ecore.c +++ b/src/lib/ecore/ecore.c @@ -24,7 +24,7 @@ #endif #ifdef _WIN32 -# include +# include /* evil_init/shutdown */ #endif #include #include diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c index b4810ae441..f2ec2d61c8 100644 --- a/src/lib/ecore/ecore_anim.c +++ b/src/lib/ecore/ecore_anim.c @@ -18,6 +18,7 @@ #ifdef _WIN32 # include +# include /* pipe */ # define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0) # define pipe_read(fd, buffer, size) recv((fd), (char *)(buffer), size, 0) diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c index 006948d46c..a3d5debc71 100644 --- a/src/lib/ecore/ecore_app.c +++ b/src/lib/ecore/ecore_app.c @@ -5,10 +5,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #include "Ecore.h" #include "ecore_private.h" diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c index 69e80dafbf..24159c6eac 100644 --- a/src/lib/ecore/ecore_exe_win32.c +++ b/src/lib/ecore/ecore_exe_win32.c @@ -7,6 +7,8 @@ #undef WIN32_LEAN_AND_MEAN #include +#include /* evil_last_error_get */ + #include "Ecore.h" #include "ecore_private.h" diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index 42d554cf0f..523add2af3 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -44,9 +44,8 @@ #endif #ifdef _WIN32 -# include +# include /* evil_last_error_get */ #endif - #include "Ecore.h" #include "ecore_private.h" diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c index 92127b95d0..d352853c4b 100644 --- a/src/lib/ecore/ecore_pipe.c +++ b/src/lib/ecore/ecore_pipe.c @@ -26,10 +26,6 @@ # endif #endif -#ifdef _WIN32 -# include -#endif - #ifdef HAVE_ESCAPE # include #endif @@ -51,6 +47,7 @@ #ifdef _WIN32 # include +# include /* pipe fcntl */ # define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0) # define pipe_read(fd, buffer, size) recv((fd), (char *)(buffer), size, 0) # define pipe_close(fd) closesocket(fd) diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c index eef9d3d930..a2c6489d3f 100644 --- a/src/lib/ecore/ecore_thread.c +++ b/src/lib/ecore/ecore_thread.c @@ -8,10 +8,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #include "Ecore.h" #include "ecore_private.h" diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c index 303295b796..31ffa717c8 100644 --- a/src/lib/ecore/ecore_time.c +++ b/src/lib/ecore/ecore_time.c @@ -7,10 +7,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #if defined(__APPLE__) && defined(__MACH__) # include #endif diff --git a/src/lib/ecore/efl_core_proc_env.c b/src/lib/ecore/efl_core_proc_env.c index 10ad1f9845..4c02821474 100644 --- a/src/lib/ecore/efl_core_proc_env.c +++ b/src/lib/ecore/efl_core_proc_env.c @@ -2,6 +2,9 @@ # include #endif +#ifdef _WIN32 +# include /* setenv unsetenv */ +#endif #include #ifdef HAVE_CRT_EXTERNS_H # include diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c index c9badf716a..cff9314d1a 100644 --- a/src/lib/ecore/efl_thread.c +++ b/src/lib/ecore/efl_thread.c @@ -6,6 +6,9 @@ #define EFL_IO_WRITER_PROTECTED 1 #define EFL_IO_CLOSER_PROTECTED 1 +#ifdef _WIN32 +# include /* pipe fcntl */ +#endif #include #include "ecore_private.h" --
[EGIT] [core/efl] master 01/01: evas_gesture: fix meson.build to build and install correctly
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=099eb2c315a277bda10f41709d7f936b0ae7fb20 commit 099eb2c315a277bda10f41709d7f936b0ae7fb20 Author: Jaehyun Cho Date: Fri May 17 19:32:24 2019 +0900 evas_gesture: fix meson.build to build and install correctly --- src/lib/evas/gesture/meson.build | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build index 3c7847aeac..04cb753fcd 100644 --- a/src/lib/evas/gesture/meson.build +++ b/src/lib/evas/gesture/meson.build @@ -29,13 +29,15 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'gesture'), -command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, +command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-gchd', '@INPUT@']) endforeach +pub_evas_eo_files += files(pub_eo_files) + pub_eo_types_files = [ 'efl_canvas_gesture_types.eot', ] @@ -51,7 +53,7 @@ foreach eo_file : pub_eo_types_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'gesture'), -command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, +command : eolian_gen + ['-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-ghd', '@INPUT@']) --
