[EGIT] [core/efl] master 02/02: Update my name in more places
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3989f11f113aac0e9081dc5ed985476425603a20 commit 3989f11f113aac0e9081dc5ed985476425603a20 Author: Andy Williams <a...@andywilliams.me> Date: Thu Nov 2 10:34:05 2017 + Update my name in more places --- AUTHORS | 2 +- doc/main.dox | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 8633377ce8..894fd3a798 100644 --- a/AUTHORS +++ b/AUTHORS @@ -183,7 +183,7 @@ Yuri <da2...@hotmail.ru> Nicholas Curran <qua...@bigblue.net.au> Howell Tam <pig...@pigeond.net> Nathan Ingersoll <rbdp...@users.sourceforge.net> -Andrew Elcock <a...@elcock.org> +Andrew Williams <a...@eandywilliams.me> Kim Woelders <k...@woelders.dk> Sebastian Dransfeld <s...@tango.flipp.net> Simon Poole <simon.armli...@themalago.net> diff --git a/doc/main.dox b/doc/main.dox index a65ef1a580..be73dbb9b7 100644 --- a/doc/main.dox +++ b/doc/main.dox @@ -36,7 +36,7 @@ * @author Aharon Hillel <a.hillel@@samsung.com> * @author Albin "Lutin" Tonnerre <albin.tonnerre@@gmail.com> * @author Andre Dieb <andre.dieb@@gmail.com> - * @author Andrew Elcock <andy@@elcock.org> + * @author Andrew Williams <andy@@andywilliams.me> * @author Arnaud de Turckheim 'quarium' <quarium@@gmail.com> * @author Bernhard Nemec <Bernhard.Nemec@@viasyshc.com> * @author billiob (Boris Faure) <billiob@@gmail.com> --
[EGIT] [core/efl] master 01/02: Update auto API doc styling to match main website
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=55b86087283437787f921b9a790d951fccbfd41e
commit 55b86087283437787f921b9a790d951fccbfd41e
Author: Andy Williams <a...@andywilliams.me>
Date: Thu Nov 2 10:27:05 2017 +
Update auto API doc styling to match main website
Not perfect, but it's a good start
---
doc/e.css | 91 ++-
1 file changed, 32 insertions(+), 59 deletions(-)
diff --git a/doc/e.css b/doc/e.css
index 3e9dffce57..5ef60be835 100644
--- a/doc/e.css
+++ b/doc/e.css
@@ -1,11 +1,12 @@
body, table, div, p, dl {
- font-family: sans-serif;
- font-size: 9pt;
+ font-family: "Open Sans", sans-serif;
+ font-size: 14px;
+ line-height: 1.5;
}
body {
- background-color: #404040;
- color: black;
+ background-color: #303030 ;
+ color: #88;
margin: 0;
}
@@ -99,13 +100,14 @@ div.navtab {
}
a {
- color: #3399ff;
+ color: #44aaff;
font-weight: normal;
text-decoration: none;
+ text-shadow: 0px 0px 10px rgba(51, 153, 255, 0.5);
}
.contents a:visited {
- color: #2277aa;
+ color: #2288ee;
}
a:hover {
@@ -150,7 +152,13 @@ dl.el {
font-family: monospace, mono, fixed;
font-size: 9pt;
white-space: pre;
- padding-top: 10px;
+ border: 0;
+
+ color: #bb;
+ background-color: #202020;
+ padding: 4px 6px;
+ margin: 4px 8px 4px 2px;
+ overflow: auto;
}
.line {
@@ -163,15 +171,6 @@ li .line:first-child {
margin-top: 10px;
}
-pre.fragment {
- border: 1px solid #cc;
- background-color: #ee;
- padding: 4px 6px;
- margin: 4px 8px 4px 2px;
- overflow: auto;
- font-size: 9pt;
-}
-
div.ah {
background-color: #00;
font-weight: bold;
@@ -246,11 +245,11 @@ img.footer {
}
span.keyword {
- color: #008000
+ color: #4488cc
}
span.keywordtype {
- color: #604020
+ color: #4488cc
}
span.keywordflow {
@@ -258,19 +257,19 @@ span.keywordflow {
}
span.comment {
- color: #80
+ color: #3355bb
}
span.preprocessor {
- color: #806020
+ color: #66ff55
}
span.stringliteral {
- color: #002080
+ color: #ff8877
}
span.charliteral {
- color: #008080
+ color: #aa9922
}
span.vhdldigit {
@@ -341,7 +340,7 @@ table.memberdecls {
.mdescLeft, .mdescRight,
.memItemLeft, .memItemRight,
.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
- background-color: #ee;
+ background-color: #202020;
border: none;
margin: 4px;
padding: 1px 0 0 8px;
@@ -353,7 +352,7 @@ table.memberdecls {
}
.memItemLeft, .memItemRight, .memTemplParams {
- border-top: 1px solid #dd;
+ border-top: 1px solid #404040;
}
.memItemLeft, .memTemplItemLeft {
@@ -397,35 +396,22 @@ table.memberdecls {
.memname {
white-space: nowrap;
- font-weight: bold;
margin-left: 6px;
}
.memproto, dl.reflist dt {
- border-top: 1px solid #aa;
- border-left: 1px solid #aa;
- border-right: 1px solid #aa;
padding: 6px 0px 6px 0px;
- color: #202020;
- font-weight: bold;
- text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.5);
- box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
- -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
- -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
- background-color: #ee;
+ background-color: #404040;
+ color: #ff;
}
.memdoc, dl.reflist dd {
- border-bottom: 1px solid #aa;
- border-left: 1px solid #aa;
- border-right: 1px solid #aa;
padding: 2px 5px;
- background-color: #ee;
- border-top-width: 0;
+ background-color: #202020;
+ border-top: 1px solid #404040;
box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
- background-color: #ff;
}
dl.reflist dt {
@@ -446,7 +432,7 @@ dl.reflist dd {
}
.paramname {
- color: #602020;
+ color: #bb;
white-space: nowrap;
}
.paramname em {
@@ -709,11 +695,12 @@ div.ingroups a {
}
.title {
- font-size: 150%;
+ font-size: 24px;
font-weight: bold;
margin: 20px 2px;
- text-shadow: 0px 0px 5px #3399ff;
color: #ff;
+ font-family: "Open Sans", sans-serif;
+ font-weight: 500;
}
div.header, div.footer {
@@ -725,6 +712,7 @@ div.header, div.footer {
div.footer {
font-size: 10px;
text-align: center;
+ border-top: 1px solid #404040;
}
div.footer span.copyright {
@@ -732,25 +720,10 @@ div.footer span.copyright {
padding-left: 50px;
}
-div.footer a {
- color: black;
-}
-
-div.headertitle {
- background-color: #606060;
- padding: 5px 0px 5px 0px;
- text-align: center;
- box-shadow: 0px 3px 5px #00;
- margin-bottom:8px;
-}
-
div.contents {
- box-shadow: 0px 3px 10px #00;
margin-left: auto;
margin-right: auto;
width: 940px;
- background-color: white;
- padding: 10px 20px;
}
#projectlogo {
--
[EGIT] [core/efl] master 01/01: elm_code: Trying some markdown syntax, this is complex
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=624b960155a1b02dd7dbef7df0d1a2221be93d4e
commit 624b960155a1b02dd7dbef7df0d1a2221be93d4e
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Nov 3 21:05:08 2017 +
elm_code: Trying some markdown syntax, this is complex
---
src/lib/elementary/elm_code_syntax.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elementary/elm_code_syntax.c
b/src/lib/elementary/elm_code_syntax.c
index 4f403be279..e6542f7aac 100644
--- a/src/lib/elementary/elm_code_syntax.c
+++ b/src/lib/elementary/elm_code_syntax.c
@@ -82,7 +82,7 @@ static Elm_Code_Syntax _elm_code_syntax_eo =
static Elm_Code_Syntax _elm_code_syntax_md =
{
- "()[]*+-_=#.>!:\\`",
+ "()[]*+-_=#.>!:\\`~|",
"",
NULL,
NULL,
--
[EGIT] [core/efl] master 01/01: elm_code: Trying some markdown syntax, this is complex
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2b3e462858b84a34d37497fb3cc0a9de588c6c84
commit 2b3e462858b84a34d37497fb3cc0a9de588c6c84
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Nov 3 21:03:58 2017 +
elm_code: Trying some markdown syntax, this is complex
---
src/lib/elementary/elm_code_syntax.c | 12
1 file changed, 12 insertions(+)
diff --git a/src/lib/elementary/elm_code_syntax.c
b/src/lib/elementary/elm_code_syntax.c
index 23f4d464de..4f403be279 100644
--- a/src/lib/elementary/elm_code_syntax.c
+++ b/src/lib/elementary/elm_code_syntax.c
@@ -80,6 +80,16 @@ static Elm_Code_Syntax _elm_code_syntax_eo =
"implements", "constructors", "get", "set", "keys", "values", "true",
"false", "null"}
};
+static Elm_Code_Syntax _elm_code_syntax_md =
+{
+ "()[]*+-_=#.>!:\\`",
+ "",
+ NULL,
+ NULL,
+ "",
+ {}
+};
EAPI Elm_Code_Syntax *
elm_code_syntax_for_mime_get(const char *mime)
@@ -94,6 +104,8 @@ elm_code_syntax_for_mime_get(const char *mime)
return &_elm_code_syntax_py;
if (!strcmp("text/x-eolian", mime))
return &_elm_code_syntax_eo;
+ if (!strcmp("text/markdown", mime))
+ return &_elm_code_syntax_md;
return NULL;
}
--
[EGIT] [tools/examples] master 01/01: eo-classes: Add an example using eolian to define a class heirarchy
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=c2fd813ea64c270f2dc58beb72d070e8c9a0c5a8
commit c2fd813ea64c270f2dc58beb72d070e8c9a0c5a8
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Nov 7 17:35:34 2017 +
eo-classes: Add an example using eolian to define a class heirarchy
---
c-eo-classes/meson.build | 14
c-eo-classes/src/eo_classes_main.c| 57 +++
c-eo-classes/src/example_rectangle.c | 51
c-eo-classes/src/example_rectangle.eo | 31 +
c-eo-classes/src/example_shape.c | 5 +++
c-eo-classes/src/example_shape.eo | 24 +
c-eo-classes/src/example_square.c | 64 +++
c-eo-classes/src/example_square.eo| 23 +
c-eo-classes/src/meson.build | 32 ++
9 files changed, 301 insertions(+)
diff --git a/c-eo-classes/meson.build b/c-eo-classes/meson.build
new file mode 100644
index 000..a84c7ba
--- /dev/null
+++ b/c-eo-classes/meson.build
@@ -0,0 +1,14 @@
+project(
+ 'efl-example-eo-classes', 'c',
+ version : '0.0.1',
+ default_options: [ 'c_std=gnu99', 'warning_level=2' ],
+ meson_version : '>= 0.38.0')
+
+eina = dependency('eina', version : '>=1.20.99')
+efl = dependency('efl', version : '>=1.20.99')
+elm = dependency('elementary', version : '>=1.20.99')
+eolian = dependency('eolian', version : '>=1.20.99')
+
+inc = include_directories('.')
+subdir('src')
+
diff --git a/c-eo-classes/src/eo_classes_main.c
b/c-eo-classes/src/eo_classes_main.c
new file mode 100644
index 000..aaf3a0c
--- /dev/null
+++ b/c-eo-classes/src/eo_classes_main.c
@@ -0,0 +1,57 @@
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
+
+#include
+#include
+#include
+
+#include "example_shape.eo.h"
+#include "example_rectangle.eo.h"
+#include "example_square.eo.h"
+
+Example_Shape *
+_rect_create()
+{
+ Example_Rectangle *rectangle;
+
+ rectangle = efl_add(EXAMPLE_RECTANGLE_CLASS, NULL,
+ efl_name_set(efl_added, "Rectangle"),
+ example_rectangle_width_set(efl_added, 5),
+ example_rectangle_height_set(efl_added, 10));
+
+ return rectangle;
+}
+
+Example_Shape *
+_square_create()
+{
+ Example_Square *square;
+
+ square = efl_add(EXAMPLE_SQUARE_CLASS, NULL,
+efl_name_set(efl_added, "Square"),
+example_square_side_set(efl_added, 7));
+
+ return square;
+}
+
+void
+_shape_print(Example_Shape *shape)
+{
+ printf("Shape named %s has area %d\n", efl_name_get(shape),
example_shape_area(shape));
+}
+
+EAPI_MAIN void
+efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
+{
+ Eo *shape;
+
+ shape = _rect_create();
+ _shape_print(shape);
+
+ shape = _square_create();
+ _shape_print(shape);
+
+ efl_exit(0);
+}
+EFL_MAIN()
+
diff --git a/c-eo-classes/src/example_rectangle.c
b/c-eo-classes/src/example_rectangle.c
new file mode 100644
index 000..c268bc1
--- /dev/null
+++ b/c-eo-classes/src/example_rectangle.c
@@ -0,0 +1,51 @@
+#define EFL_BETA_API_SUPPORT
+#include
+#include "example_rectangle.eo.h"
+#include "example_shape.eo.h"
+
+typedef struct
+{
+ int width, height;
+} Example_Rectangle_Data;
+
+EOLIAN static void
+_example_rectangle_width_set(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd,
int width)
+{
+ pd->width = width;
+}
+
+EOLIAN static int
+_example_rectangle_width_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
+{
+ return pd->width;
+}
+
+EOLIAN static void
+_example_rectangle_height_set(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd,
int height)
+{
+ pd->height = height;
+}
+
+EOLIAN static int
+_example_rectangle_height_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
+{
+ return pd->height;
+}
+
+EOLIAN static int
+_example_rectangle_example_shape_area(Eo *obj EINA_UNUSED,
Example_Rectangle_Data *pd)
+{
+ return pd->width * pd->height;
+}
+
+EOLIAN static void
+_example_rectangle_class_constructor(Efl_Class *klass EINA_UNUSED)
+{
+}
+
+EOLIAN static void
+_example_rectangle_class_destructor(Efl_Class *klass EINA_UNUSED)
+{
+}
+
+#include "example_rectangle.eo.c"
diff --git a/c-eo-classes/src/example_rectangle.eo
b/c-eo-classes/src/example_rectangle.eo
new file mode 100644
index 000..35ce9fc
--- /dev/null
+++ b/c-eo-classes/src/example_rectangle.eo
@@ -0,0 +1,31 @@
+class Example.Rectangle (Efl.Object, Example.Shape) {
+ [[A rectangle shape object]]
+ eo_prefix: example_rectangle;
+ methods {
+ @property width {
+ [[The width of this rectangle]]
+ set {
+ }
+ get {
+ }
+ values {
+width: int; [[Rectangle width]]
+ }
+ }
+ @property height {
+ [[T
[EGIT] [core/efl] master 02/02: elm_code: Update background handling to work with transparency better
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bdcd034af546313f496cf30188539e77915488ff
commit bdcd034af546313f496cf30188539e77915488ff
Author: Andy Williams <a...@andywilliams.me>
Date: Thu Dec 7 23:36:46 2017 +
elm_code: Update background handling to work with transparency better
---
src/bin/elementary/test_code.c | 8 +---
src/lib/elementary/elm_code_widget.c | 16 ++--
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c
index 81b68812a8..ab7c8d346f 100644
--- a/src/bin/elementary/test_code.c
+++ b/src/bin/elementary/test_code.c
@@ -5,12 +5,15 @@
static Evas_Object *_test_code_win_create(const char *id, const char *name)
{
- Evas_Object *win;
+ Evas_Object *win, *bg;
win = elm_win_add(NULL, id, ELM_WIN_BASIC);
elm_win_title_set(win, name);
elm_win_autodel_set(win, EINA_TRUE);
- elm_win_alpha_set(win, EINA_TRUE);
+
+ bg = elm_bg_add(win);
+ elm_win_resize_object_add(win, bg);
+ evas_object_show(bg);
evas_object_resize(win, 360 * elm_config_scale_get(), 220 *
elm_config_scale_get());
return win;
@@ -96,7 +99,6 @@ _elm_code_test_editor_setup(Evas_Object *parent, Eina_Bool
log)
elm_obj_code_widget_editable_set(widget, EINA_TRUE);
elm_obj_code_widget_show_whitespace_set(widget, EINA_TRUE);
elm_obj_code_widget_line_numbers_set(widget, EINA_TRUE);
- elm_obj_code_widget_alpha_set(widget, 200);
if (!log)
{
diff --git a/src/lib/elementary/elm_code_widget.c
b/src/lib/elementary/elm_code_widget.c
index 927ebc9941..658d975024 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -2203,19 +2203,13 @@ _elm_code_widget_elm_widget_theme_apply(Eo *obj,
Elm_Code_Widget_Data *pd)
int r, g, b, a;
double fade;
unsigned int i;
- Evas_Object *grid, *background;
+ Evas_Object *grid;
edje = elm_layout_edje_get(obj);
edje_object_color_class_get(edje, "elm/code/status/default", , , , ,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
fade = (double) pd->alpha / 255;
- background = elm_object_part_content_get(pd->scroller,
"elm.swallow.background");
- evas_object_color_set(background, r * fade, g * fade, b * fade, a * fade);
-
- if (fade < 1.0)
- evas_object_color_set(obj, 1, 1, 1, 1); // setting 0 alpha is not working
-
for (i = 0; i < eina_list_count(pd->grids); i++)
{
grid = eina_list_nth(pd->grids, i);
@@ -2242,7 +2236,7 @@ _elm_code_widget_alpha_set(Eo *obj, Elm_Code_Widget_Data
*pd, int alpha)
EOLIAN static void
_elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd)
{
- Evas_Object *background, *gridrows, *scroller;
+ Evas_Object *gridrows, *scroller;
const char *fontname, *fontsize;
efl_canvas_group_add(efl_super(obj, ELM_CODE_WIDGET_CLASS));
@@ -2260,12 +2254,6 @@ _elm_code_widget_efl_canvas_group_group_add(Eo *obj,
Elm_Code_Widget_Data *pd)
elm_object_focus_allow_set(scroller, EINA_FALSE);
pd->scroller = scroller;
- background = elm_bg_add(scroller);
- evas_object_size_hint_weight_set(background, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(background, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_show(background);
- elm_object_part_content_set(scroller, "elm.swallow.background", background);
-
fontname = edje_object_data_get(elm_layout_edje_get(obj), "font.name");
fontsize = edje_object_data_get(elm_layout_edje_get(obj), "font.size");
if (fontname && fontsize)
--
[EGIT] [tools/examples] master 01/01: core: Add a logging example
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=4aa1b33ff2d265a5dfdd45b3ea4d89f6269dd2a9
commit 4aa1b33ff2d265a5dfdd45b3ea4d89f6269dd2a9
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Dec 5 16:38:06 2017 +
core: Add a logging example
---
reference/c/core/src/core_log.c | 83
reference/c/core/src/meson.build | 7
2 files changed, 90 insertions(+)
diff --git a/reference/c/core/src/core_log.c b/reference/c/core/src/core_log.c
new file mode 100644
index 000..01f9dac
--- /dev/null
+++ b/reference/c/core/src/core_log.c
@@ -0,0 +1,83 @@
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
+
+#include
+
+#include
+#include
+
+/*
+ * Efl Core Log examples.
+ *
+ * This demo shows how to log at various levels and to change what log is
shown.
+ * You can also use a custom log printer in your app as shown in _log_custom.
+ */
+
+static double
+_divide(int num, int denom)
+{
+ if (denom == 0)
+ EINA_LOG_CRIT("Attempt to divide by 0\n");
+ else
+ {
+if (denom < 0)
+ EINA_LOG_WARN("Possible undesirable effect, divide by negative
number");
+
+double ret = ((double) num / denom);
+EINA_LOG_INFO("%d / %d = %f\n", num, denom, ret);
+return ret;
+ }
+
+ return -1;
+}
+
+static void
+_divides()
+{
+ _divide(5, 1);
+ _divide(5, -1);
+ _divide(5, 0);
+}
+
+static void
+_log_levels()
+{
+ printf("Executing with default logging\n");
+ _divides();
+
+ eina_log_level_set(EINA_LOG_LEVEL_WARN);
+ printf("Executing with WARN level\n"); // same as EINA_LOG_LEVEL = 2
+ _divides();
+
+ eina_log_level_set(EINA_LOG_LEVEL_INFO);
+ printf("Executing with INFO on\n"); // same as EINA_LOG_LEVEL = 3
+ _divides();
+}
+
+void _print_cb(const Eina_Log_Domain *domain EINA_UNUSED, Eina_Log_Level level,
+ const char *file, const char *fnc, int line,
+ const char *fmt, void *data EINA_UNUSED, va_list args)
+{
+ fprintf(stdout, "LOG %d <%s (%s:%d)> ", level, fnc, file, line);
+ vfprintf(stdout, fmt, args);
+ putc('\n', stdout);
+}
+
+static void
+_log_custom()
+{
+ printf("Executing with custom log printer\n");
+ eina_log_print_cb_set(_print_cb, NULL);
+ _divides();
+}
+
+EAPI_MAIN void
+efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
+{
+ _log_levels();
+ _log_custom();
+
+ efl_exit(0);
+}
+EFL_MAIN()
+
diff --git a/reference/c/core/src/meson.build b/reference/c/core/src/meson.build
index 26085f6..67214f5 100644
--- a/reference/c/core/src/meson.build
+++ b/reference/c/core/src/meson.build
@@ -35,3 +35,10 @@ executable('efl_reference_core_poll',
install : true
)
+executable('efl_reference_core_log',
+ files(['core_log.c']),
+ dependencies : deps,
+ include_directories : inc,
+ install : true
+)
+
--
[EGIT] [tools/examples] master 01/01: Move core_log to eina_log
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=557f42bf311bcb9166c90dd74aad5002d34368d0
commit 557f42bf311bcb9166c90dd74aad5002d34368d0
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Dec 5 16:52:49 2017 +
Move core_log to eina_log
---
reference/c/core/src/meson.build | 7 ---
reference/c/{core/src/core_log.c => eina/src/eina_log.c} | 0
reference/c/eina/src/meson.build | 7 +++
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/reference/c/core/src/meson.build b/reference/c/core/src/meson.build
index 67214f5..26085f6 100644
--- a/reference/c/core/src/meson.build
+++ b/reference/c/core/src/meson.build
@@ -35,10 +35,3 @@ executable('efl_reference_core_poll',
install : true
)
-executable('efl_reference_core_log',
- files(['core_log.c']),
- dependencies : deps,
- include_directories : inc,
- install : true
-)
-
diff --git a/reference/c/core/src/core_log.c b/reference/c/eina/src/eina_log.c
similarity index 100%
rename from reference/c/core/src/core_log.c
rename to reference/c/eina/src/eina_log.c
diff --git a/reference/c/eina/src/meson.build b/reference/c/eina/src/meson.build
index 74e0156..04d998b 100644
--- a/reference/c/eina/src/meson.build
+++ b/reference/c/eina/src/meson.build
@@ -48,3 +48,10 @@ executable('efl_reference_eina_value_custom',
include_directories : inc,
install : true
)
+
+executable('efl_reference_eina_log',
+ files(['eina_log.c']),
+ dependencies : deps,
+ include_directories : inc,
+ install : true
+)
--
[EGIT] [core/efl] master 01/01: eo: Update header for readability
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b6b0fac978750eaf814c8ab9ea35abfbcecc0b5c
commit b6b0fac978750eaf814c8ab9ea35abfbcecc0b5c
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Dec 5 17:04:19 2017 +
eo: Update header for readability
Author: Nate Drake
Reviewer: Andy Williams
---
src/lib/eo/Eo.h | 414
1 file changed, 205 insertions(+), 209 deletions(-)
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index e7e4bc3c96..99d61b0d82 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -10,7 +10,7 @@
#define EOLIAN
-/* When used, it indicates that the function is an Eo API. */
+/* When used, this indicates that the function is an Eo API. */
#define EOAPI EAPI EAPI_WEAK
#ifdef _WIN32
@@ -54,12 +54,12 @@ extern "C" {
*
* @section eo_main_intro Introduction
*
- * The Eo generic object system. It was designed to be the base object
+ * The Eo generic object system. It's designed to be the base object
* system for the EFL.
* @section eo_main_compiling How to compile
*
- * Eo is a library your application links to. The procedure for this is
+ * Eo is a library to which your application can link. The procedure for this
is
* very simple. You simply have to compile your application with the
* appropriate compiler flags that the @c pkg-config script outputs. For
* example:
@@ -80,8 +80,8 @@ extern "C" {
*
* @section eo_main_next_steps Next Steps
*
- * After you understood what Eo is and installed it in your system
- * you should proceed understanding the programming interface.
+ * After you've understood and installed Eo,
+ * you can then learn more about the programming interface.
*
* Recommended reading:
*
@@ -93,13 +93,13 @@ extern "C" {
* @section eo_lifecycle_debug Debug Object Lifecycle
*
* When dealing with objects it's important to investigate the object
- * lifecycle: when it was created, when it was deleted. This is not
+ * lifecycle: in other words when they were created and deleted. This is not
* that trivial since objects can have extra references added with
* efl_ref() as well as removed with efl_unref(), efl_parent_set() to
* NULL or efl_del().
*
- * To aid development process and debug memory leaks and invalid
- * access, we provide eo_debug script helper that will preload
+ * To aid development process as well as debug memory leaks and invalid
+ * access, you can use the eo_debug script helper to preload
* libeo_dbg.so, run as:
*
* @verbatim
@@ -109,10 +109,10 @@ extern "C" {
* @endverbatim
*
* This will print out all the objects that were created and deleted,
- * as well as keep the stack trace that originated those, if a double
+ * as well as keep the stack trace that originated those. If a double
* free or user-after-free occurs it will print out the backtrace
* where the object was created and where it was deleted. If only
- * errors should be displayed, decrease the log level to 2:
+ * errors should be displayed decrease the log level to 2:
*
* @verbatim
export EO_LIFECYCLE_DEBUG=1
@@ -122,14 +122,14 @@ extern "C" {
*
* Keep in mind that the log will consume memory for all objects and
* that main loop primitives such as timers, jobs, promises and
- * futures are all objects, being created in large numbers, thus
- * consuming lots of memory.
- *
- * To address that log pollution and memory consumption, one can
- * select just handful classes to be logged using @c
- * EO_LIFECYCLE_DEBUG with a list of comma-separated class names. If
- * @c EO_LIFECYCLE_DEBUG=1 or @c EO_LIFECYCLE_DEBUG=*, then all
- * classes are logged, otherwise just the classes listed will be
+ * futures are all objects. If created in large numbers, they will
+ * consume large amounts of of memory.
+ *
+ * To address log pollution and memory consumption, you can
+ * select just a handful classes to be logged using @c
+ * EO_LIFECYCLE_DEBUG with a list of comma-separated class names. Use
+ * @c EO_LIFECYCLE_DEBUG=1 or @c EO_LIFECYCLE_DEBUG=* to log all
+ * classes, otherwise just the classes listed will be
* (whitelist).
*
* @verbatim
@@ -139,8 +139,8 @@ extern "C" {
eo_debug my_app
* @endverbatim
*
- * Another approach is to log all but few classes, also known as
- * blacklist. This is done with another environment variable @c
+ * Another approach is to log all but a few classes, also known as
+ * a blacklist. This is done with another environment variable @c
* EO_LIFECYCLE_NO_DEBUG=class1,class2.
*
* @verbatim
@@ -170,7 +170,7 @@ typedef struct _Eo_Opaque Eo;
/**
* @typedef Efl_Class
- * The basic class type - should be removed, just for compat.
+ * The basic class type - should be removed, for compatibility reasons.
*/
typedef Eo Efl_Class;
#define _EFL_CLASS_EO_CLASS_TYPE
@@ -184,7 +184,7 @@ typedef
[EGIT] [core/efl] master 02/03: docs: Attach the google analytics code to our docs pages too
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7b5551c5485afa4191e9e6af6dc1fa1b3f4272cd
commit 7b5551c5485afa4191e9e6af6dc1fa1b3f4272cd
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Dec 8 11:00:15 2017 +
docs: Attach the google analytics code to our docs pages too
---
doc/head.html | 11 +++
1 file changed, 11 insertions(+)
diff --git a/doc/head.html b/doc/head.html
index 7b94f0f794..cd743b2fd1 100644
--- a/doc/head.html
+++ b/doc/head.html
@@ -3,6 +3,17 @@
$title
+
+
+ https://www.googletagmanager.com/gtag/js?id=UA-110876574-1"</a>;>
+
+window.dataLayer = window.dataLayer || [];
+function gtag(){dataLayer.push(arguments);}
+gtag('js', new Date());
+
+gtag('config', 'UA-110876574-1');
+
+
--
[EGIT] [core/efl] master 03/03: gendoc: Allow script to be run from other directories
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=dc821546ad6e4b4c90be6854410e39038648b00d commit dc821546ad6e4b4c90be6854410e39038648b00d Author: Andy Williams <a...@andywilliams.me> Date: Fri Dec 8 11:00:40 2017 + gendoc: Allow script to be run from other directories --- src/scripts/elua/apps/gendoc.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/elua/apps/gendoc.sh b/src/scripts/elua/apps/gendoc.sh index 73618c2125..f14fcfda6e 100755 --- a/src/scripts/elua/apps/gendoc.sh +++ b/src/scripts/elua/apps/gendoc.sh @@ -1,5 +1,6 @@ #!/bin/sh # a parallel doc generation script +cd "$(dirname "$(realpath "$0")")"; # exit on failure set -e --
[EGIT] [core/efl] master 03/03: docs: Strip class type from URLs, avoid user confusion
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3cccf56795dad728de328f92e5bfac13d7a37031
commit 3cccf56795dad728de328f92e5bfac13d7a37031
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Dec 8 16:19:10 2017 +
docs: Strip class type from URLs, avoid user confusion
---
src/scripts/elua/apps/docgen/doctree.lua | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/scripts/elua/apps/docgen/doctree.lua
b/src/scripts/elua/apps/docgen/doctree.lua
index df1e50e123..bbc1e50da7 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -29,7 +29,7 @@ M.Node = util.Object:clone {
PROTECTED = eolian.object_scope.PROTECTED
},
-nspaces_get = function(self, subn, root)
+nspaces_get = function(self, root)
local tbl = self:namespaces_get()
-- temporary workaround
if type(tbl) ~= "table" then
@@ -38,7 +38,7 @@ M.Node = util.Object:clone {
for i = 1, #tbl do
tbl[i] = tbl[i]:lower()
end
-table.insert(tbl, 1, subn)
+
tbl[#tbl + 1] = self:name_get():lower()
if root ~= nil then
tbl[#tbl + 1] = not not root
@@ -279,7 +279,7 @@ M.Class = Node:clone {
end,
nspaces_get = function(self, root)
-return M.Node.nspaces_get(self, self:type_str_get(), root)
+return M.Node.nspaces_get(self, root)
end,
is_same = function(self, other)
@@ -923,7 +923,7 @@ M.Typedecl = Node:clone {
end,
nspaces_get = function(self, root)
-return M.Node.nspaces_get(self, self:type_str_get(), root)
+return M.Node.nspaces_get(self, root)
end,
-- static getters
@@ -1215,7 +1215,7 @@ M.Variable = Node:clone {
end,
nspaces_get = function(self, root)
-return M.Node.nspaces_get(self, self:type_str_get(), root)
+return M.Node.nspaces_get(self, root)
end,
serialize = function(self)
--
[EGIT] [core/efl] master 02/03: docs: Don't confuse with dokuwiki user namespace
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=da29942989dd67575b0a44642a744c9cebcc0ddb
commit da29942989dd67575b0a44642a744c9cebcc0ddb
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Dec 8 16:18:16 2017 +
docs: Don't confuse with dokuwiki user namespace
---
src/scripts/elua/apps/docgen/writer.lua | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/scripts/elua/apps/docgen/writer.lua
b/src/scripts/elua/apps/docgen/writer.lua
index d195619247..648aa54465 100644
--- a/src/scripts/elua/apps/docgen/writer.lua
+++ b/src/scripts/elua/apps/docgen/writer.lua
@@ -77,7 +77,7 @@ local write_include = function(self, tp, name, flags)
.. table.concat(name, ":")
elseif name[#name] == false then
name[#name] = nil
-name = ":" .. root_nspace .. ":user:"
+name = ":" .. root_nspace .. "-include:"
.. table.concat(name, ":")
else
name = table.concat(name, ":")
@@ -276,7 +276,7 @@ writers["dokuwiki"] = util.Object:clone {
.. table.concat(target, ":")
elseif target[#target] == false then
target[#target] = nil
-target = ":" .. root_nspace .. ":user:"
+target = ":" .. root_nspace .. "-include:"
.. table.concat(target, ":")
else
target = table.concat(target, ":")
--
[EGIT] [core/efl] master 02/02: docs: remove resolved FIXMEs
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b8b183bfcb9e0feb7a680a41b70ed09b1c411e57
commit b8b183bfcb9e0feb7a680a41b70ed09b1c411e57
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Dec 8 18:23:06 2017 +
docs: remove resolved FIXMEs
---
src/scripts/elua/apps/docgen/doctree.lua | 25 +
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/src/scripts/elua/apps/docgen/doctree.lua
b/src/scripts/elua/apps/docgen/doctree.lua
index bbc1e50da7..0a031d2656 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -294,7 +294,6 @@ M.Class = Node:clone {
if ret then
return ret
end
--- FIXME: unit
local v = eolian.class_get_by_name(eos:unit_get(), name)
if not v then
return nil
@@ -310,7 +309,6 @@ M.Class = Node:clone {
if ret then
return ret
end
--- FIXME: unit
local v = eolian.class_get_by_file(eos:unit_get(), name)
if not v then
return nil
@@ -323,7 +321,6 @@ M.Class = Node:clone {
all_get = function()
local ret, had = get_cache(M.Class, "_cache_all")
if not had then
--- FIXME: unit
for cl in eolian.all_classes_get(eos:unit_get()) do
ret[#ret + 1] = M.Class(cl)
end
@@ -714,7 +711,6 @@ M.Type = Node:clone {
end,
class_get = function(self)
--- FIXME: unit
return self.type:class_get(eos:unit_get())
end,
@@ -894,7 +890,6 @@ M.Typedecl = Node:clone {
end,
c_type_get = function(self)
--- FIXME: unit
return self.typedecl:c_type_get(eos:unit_get())
end,
@@ -930,7 +925,6 @@ M.Typedecl = Node:clone {
all_aliases_get = function()
local ret = {}
--- FIXME: unit
for tp in eolian.typedecl_all_aliases_get(eos:unit_get()) do
ret[#ret + 1] = M.Typedecl(tp)
end
@@ -939,7 +933,6 @@ M.Typedecl = Node:clone {
all_structs_get = function()
local ret = {}
--- FIXME: unit
for tp in eolian.typedecl_all_structs_get(eos:unit_get()) do
ret[#ret + 1] = M.Typedecl(tp)
end
@@ -948,7 +941,6 @@ M.Typedecl = Node:clone {
all_enums_get = function()
local ret = {}
--- FIXME: unit
for tp in eolian.typedecl_all_enums_get(eos:unit_get()) do
ret[#ret + 1] = M.Typedecl(tp)
end
@@ -957,7 +949,6 @@ M.Typedecl = Node:clone {
aliases_by_file_get = function(fn)
local ret = {}
--- FIXME: unit
for tp in eolian.typedecl_aliases_get_by_file(eos:unit_get(), fn) do
ret[#ret + 1] = M.Typedecl(tp)
end
@@ -966,7 +957,6 @@ M.Typedecl = Node:clone {
structs_by_file_get = function(fn)
local ret = {}
--- FIXME: unit
for tp in eolian.typedecl_structs_get_by_file(eos:unit_get(), fn) do
ret[#ret + 1] = M.Typedecl(tp)
end
@@ -975,7 +965,6 @@ M.Typedecl = Node:clone {
enums_by_file_get = function(fn)
local ret = {}
--- FIXME: unit
for tp in eolian.typedecl_enums_get_by_file(eos:unit_get(), fn) do
ret[#ret + 1] = M.Typedecl(tp)
end
@@ -983,7 +972,6 @@ M.Typedecl = Node:clone {
end,
alias_by_name_get = function(tn)
--- FIXME: unit
local v = eolian.typedecl_alias_get_by_name(eos:unit_get(), tn)
if not v then
return nil
@@ -992,7 +980,6 @@ M.Typedecl = Node:clone {
end,
struct_by_name_get = function(tn)
--- FIXME: unit
local v = eolian.typedecl_struct_get_by_name(eos:unit_get(), tn)
if not v then
return nil
@@ -1001,7 +988,6 @@ M.Typedecl = Node:clone {
end,
enum_by_name_get = function(tn)
--- FIXME: unit
local v = eolian.typedecl_enum_get_by_name(eos:unit_get(), tn)
if not v then
return nil
@@ -1284,7 +1270,6 @@ M.Variable = Node:clone {
all_globals_get = function()
local ret = {}
--- FIXME: unit
for v in eolian.variable_all_globals_get(eos:unit_get()) do
ret[#ret + 1] = M.Variable(v)
end
@@ -1293,7 +1278,6 @@ M.Variable = Node:clone {
all_constants_get = function()
local ret = {}
--- FIXME: unit
for v in eolian.variable_all_constants_get(eos:unit_get()) do
ret[#ret + 1] = M.Variable(v)
end
@@ -1302,7 +1286,6 @@ M.Variable = Node:clone {
globals_by_file_get = function(fn)
local ret = {}
--- FIXME: unit
for v in eolian.variable_globals_get_by_file(eos:unit_get(), fn) do
ret[#ret + 1] = M.Variable(v)
end
@@ -1311,7 +1294,6 @@ M.Variable = Node:clone {
constants_by_file_get = function(fn
[EGIT] [core/efl] master 01/02: docs: Complete removal of object type from API URLs
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=42368d16e8b373a523d8d9301158c7512f2656e6
commit 42368d16e8b373a523d8d9301158c7512f2656e6
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Dec 8 18:16:51 2017 +
docs: Complete removal of object type from API URLs
We still have the subtypes for now, that is less
likely to cause user confusion as they are unlikely to browse
method names in the address bar.
---
src/scripts/elua/apps/docgen/writer.lua | 10 --
src/scripts/elua/apps/gendoc.lua| 8
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/scripts/elua/apps/docgen/writer.lua
b/src/scripts/elua/apps/docgen/writer.lua
index 648aa54465..9042c8481c 100644
--- a/src/scripts/elua/apps/docgen/writer.lua
+++ b/src/scripts/elua/apps/docgen/writer.lua
@@ -270,16 +270,14 @@ writers["dokuwiki"] = util.Object:clone {
write_link = function(self, target, title)
if type(target) == "table" then
-if target[#target] == true then
-target[#target] = nil
-target = ":" .. root_nspace .. ":"
- .. table.concat(target, ":")
-elseif target[#target] == false then
+if target[#target] == false then
target[#target] = nil
target = ":" .. root_nspace .. "-include:"
.. table.concat(target, ":")
else
-target = table.concat(target, ":")
+target[#target] = nil
+target = ":" .. root_nspace .. ":"
+ .. table.concat(target, ":")
end
end
if not title then
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index f950d5bd81..04c0764475 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -315,7 +315,7 @@ local build_reftable = function(f, title, ctitle, ctype, t,
iscl)
nt[#nt + 1] = {
writer.Buffer():write_link(
iscl and v:nspaces_get(true)
- or dtree.Node.nspaces_get(v, ctype, true),
+ or dtree.Node.nspaces_get(v, true),
v:full_name_get()
):finish(),
v:doc_get():brief_get()
@@ -1026,7 +1026,7 @@ local write_tsigs = function(f, tp, ns)
end
local build_alias = function(tp)
-local ns = dtree.Node.nspaces_get(tp, "alias")
+local ns = dtree.Node.nspaces_get(tp)
local fulln = tp:full_name_get()
local f = writer.Writer(ns, fulln)
printgen("Generating alias: " .. fulln)
@@ -1044,7 +1044,7 @@ local build_alias = function(tp)
end
local build_struct = function(tp)
-local ns = dtree.Node.nspaces_get(tp, "struct")
+local ns = dtree.Node.nspaces_get(tp)
local fulln = tp:full_name_get()
local f = writer.Writer(ns, fulln)
printgen("Generating struct: " .. fulln)
@@ -1077,7 +1077,7 @@ local build_struct = function(tp)
end
local build_enum = function(tp)
-local ns = dtree.Node.nspaces_get(tp, "enum")
+local ns = dtree.Node.nspaces_get(tp)
local fulln = tp:full_name_get()
local f = writer.Writer(ns, fulln)
printgen("Generating enum: " .. fulln)
--
[EGIT] [tools/examples] master 01/01: Let's use the window callback to avoid elm_policy needs
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=c99595e00a0f99f1cd1b6fab91e4b913059c647f
commit c99595e00a0f99f1cd1b6fab91e4b913059c647f
Author: Andy Williams <a...@andywilliams.me>
Date: Thu Dec 7 12:39:59 2017 +
Let's use the window callback to avoid elm_policy needs
---
apps/c/life/src/life_main.c | 16
apps/c/texteditor/src/texteditor_main.c | 10 +-
tutorial/c/hello-gui/src/gui_main.c | 10 +-
3 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/apps/c/life/src/life_main.c b/apps/c/life/src/life_main.c
index 63f97f8..ba0b465 100644
--- a/apps/c/life/src/life_main.c
+++ b/apps/c/life/src/life_main.c
@@ -15,6 +15,13 @@ _life_win_resize(void *data EINA_UNUSED, const Efl_Event
*event)
}
static void
+_life_win_quit(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
+{
+ // quit the mainloop
+ efl_exit(0);
+}
+
+static void
_life_win_touch(void *data EINA_UNUSED, const Efl_Event *event)
{
int cellx, celly, i;
@@ -59,10 +66,11 @@ _life_win_setup(void)
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
if (!win) return NULL;
- // TODO
- elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- w = 10 * LIFE_BOARD_WIDTH * efl_ui_scale_get(win);
- h = 10 * LIFE_BOARD_HEIGHT * efl_ui_scale_get(win);
+ // when the user clicks "close" on a window there is a request to delete
+ efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST,
_life_win_quit, NULL);
+
+ w = 10 * LIFE_BOARD_WIDTH * efl_gfx_scale_get(win);
+ h = 10 * LIFE_BOARD_HEIGHT * efl_gfx_scale_get(win);
life_board_init();
life_render_init(win);
diff --git a/apps/c/texteditor/src/texteditor_main.c
b/apps/c/texteditor/src/texteditor_main.c
index d0b0f5e..0029455 100644
--- a/apps/c/texteditor/src/texteditor_main.c
+++ b/apps/c/texteditor/src/texteditor_main.c
@@ -14,7 +14,7 @@ _gui_new_clicked_cb(void *data EINA_UNUSED, const Efl_Event
*event EINA_UNUSED)
}
static void
-_gui_quit_clicked_cb(void *data EINA_UNUSED, const Efl_Event *event
EINA_UNUSED)
+_gui_quit_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
{
efl_exit(0);
}
@@ -52,7 +52,7 @@ _gui_toolbar_setup(Efl_Ui_Box *parent)
efl_add(EFL_UI_BOX_CLASS, parent,
efl_pack(bar, efl_added),
efl_gfx_size_hint_weight_set(efl_added, 10, 0));
- _gui_toolbar_button_add(bar, "Quit", "application-exit",
_gui_quit_clicked_cb);
+ _gui_toolbar_button_add(bar, "Quit", "application-exit", _gui_quit_cb);
}
static void
@@ -65,6 +65,9 @@ _gui_setup()
efl_text_set(efl_added, "Text Editor"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
+ // when the user clicks "close" on a window there is a request to delete
+ efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _gui_quit_cb,
NULL);
+
box = efl_add(EFL_UI_BOX_CLASS, win,
efl_content_set(win, efl_added),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(360, 240)));
@@ -83,9 +86,6 @@ _gui_setup()
EAPI_MAIN void
efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
{
- // TODO this to a efl_ui_policy method
- elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
-
_gui_setup();
}
EFL_MAIN()
diff --git a/tutorial/c/hello-gui/src/gui_main.c
b/tutorial/c/hello-gui/src/gui_main.c
index a95e9d8..69b8b07 100644
--- a/tutorial/c/hello-gui/src/gui_main.c
+++ b/tutorial/c/hello-gui/src/gui_main.c
@@ -6,7 +6,7 @@
#include
static void
-_gui_quit_clicked_cb(void *data EINA_UNUSED, const Efl_Event *event
EINA_UNUSED)
+_gui_quit_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
{
efl_exit(0);
}
@@ -21,6 +21,9 @@ _gui_setup()
efl_text_set(efl_added, "Hello World"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
+ // when the user clicks "close" on a window there is a request to delete
+ efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _gui_quit_cb,
NULL);
+
box = efl_add(EFL_UI_BOX_CLASS, win,
efl_content_set(win, efl_added),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(360, 240)));
@@ -37,15 +40,12 @@ _gui_setup()
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.1),
efl_pack(box, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
- _gui_quit_clicked_cb, efl_added));
+ _gui_quit_cb, efl_added));
}
EAPI_MAIN void
efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
{
- // TODO this to a efl_ui_policy method
- elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
-
_gui_setup();
}
EFL_MAIN()
--
[EGIT] [website/www] master 01/01: Analytics: Add GA so we can get a view of what's popular on the site
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=1a0421839374f00ded5fe2e5604f7e9065a164b7
commit 1a0421839374f00ded5fe2e5604f7e9065a164b7
Author: Andy Williams <a...@andywilliams.me>
Date: Thu Dec 7 14:45:11 2017 +
Analytics: Add GA so we can get a view of what's popular on the site
---
public_html/lib/plugins/googleanalytics/README | 28 +++
public_html/lib/plugins/googleanalytics/action.php | 96 ++
.../lib/plugins/googleanalytics/conf/default.php | 9 ++
.../lib/plugins/googleanalytics/conf/metadata.php | 9 ++
.../plugins/googleanalytics/lang/en/settings.php | 9 ++
.../plugins/googleanalytics/lang/ja/settings.php | 4 +
.../plugins/googleanalytics/lang/pl/settings.php | 4 +
.../plugins/googleanalytics/lang/se/settings.php | 4 +
.../plugins/googleanalytics/lang/zh/settings.php | 4 +
.../lib/plugins/googleanalytics/plugin.info.txt| 7 ++
public_html/lib/plugins/googleanalytics/script.js | 52
11 files changed, 226 insertions(+)
diff --git a/public_html/lib/plugins/googleanalytics/README
b/public_html/lib/plugins/googleanalytics/README
new file mode 100644
index ..03bbc47f
--- /dev/null
+++ b/public_html/lib/plugins/googleanalytics/README
@@ -0,0 +1,28 @@
+googleanalytics Plugin for DokuWiki
+
+Plugin to embed your Google Analytics code for your site, which
+allows you to track your visitors.
+
+All documentation for this plugin can be found at
+https://www.dokuwiki.org/plugin:googleanalytics
+
+If you install this plugin manually, make sure it is installed in
+lib/plugins/googleanalytics/ - if the folder is called different it
+will not work!
+
+Please refer to http://www.dokuwiki.org/plugins for additional info
+on how to install plugins in DokuWiki.
+
+
+Copyright (C) Terence J. Grant <tjgr...@tatewake.com> et al.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License
+
+This program 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 General Public License for more details.
+
+See the COPYING file in your DokuWiki folder for details
diff --git a/public_html/lib/plugins/googleanalytics/action.php
b/public_html/lib/plugins/googleanalytics/action.php
new file mode 100644
index ..f255dc59
--- /dev/null
+++ b/public_html/lib/plugins/googleanalytics/action.php
@@ -0,0 +1,96 @@
+register_hook('DOKUWIKI_STARTED', 'AFTER', $this,
'gaConfig');
+}
+
+/**
+ * Initialize the Google Analytics config
+ *
+ * @param Doku_Event $event
+ * @param array $param
+ */
+public function gaConfig(Doku_Event $event, $param) {
+global $JSINFO;
+global $INFO;
+global $ACT;
+
+if(!$this->gaEnabled) return;
+$trackingId = $this->getConf('GAID');
+if(!$trackingId) return;
+if($this->getConf('dont_count_admin') && $INFO['isadmin']) return;
+if($this->getConf('dont_count_users') && $_SERVER['REMOTE_USER'])
return;
+act_clean($ACT);
+
+$options = array();
+if($this->getConf('track_users') && $_SERVER['REMOTE_USER']) {
+$options['userId'] = md5(auth_cookiesalt() . 'googleanalytics' .
$_SERVER['REMOTE_USER']);
+}
+if($this->getConf('domainName')) {
+$options['cookieDomain'] = $this->getConf('domainName');
+$options['legacyCookieDomain'] = $this->getConf('domainName');
+}
+
+$JSINFO['ga'] = array(
+'trackingId' => $trackingId,
+'anonymizeIp' => (bool) $this->getConf('anonymize'),
+'action' => $ACT,
+'trackOutboundLinks' => (bool) $this->getConf('track_links'),
+'options' => $options,
+'pageview' => $this->getPageView(),
+);
+}
+
+/**
+ * normalize the pageview
+ *
+ * @return string
+ */
+protected function getPageView() {
+global $QUERY;
+global $ID;
+global $INPUT;
+global $ACT;
+
+// clean up parameters to log
+$params = $_GET;
+if(isset($params['do'])) unset($params['do']);
+if(isset($params['id'])) unset($params['id']);
+
+// decide on virtual views
+if($ACT == 'search') {
+$view = '~search/';
+$params['q'] = $QUERY;
+} elseif($ACT == 'admin') {
+$page = $INPUT->str('page');
+$view = '~admin';
+if($page) $view .= '/' . $page;
+if(isset($params['page'])) unset($params['page']);
+} else {
+$view = str_replace(':', '/', $ID); // slashes needed fo
[EGIT] [core/efl] master 01/01: eina: Update header for readability
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9d09d722b96dc6ff49236249de10380080330df4 commit 9d09d722b96dc6ff49236249de10380080330df4 Author: Andy Williams <a...@andywilliams.me> Date: Thu Dec 7 16:21:11 2017 + eina: Update header for readability Author Nate Drake Reviewer: Andy Williams --- src/lib/eina/Eina.h | 54 ++--- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/lib/eina/Eina.h b/src/lib/eina/Eina.h index 7ed03e6673..256de025bc 100644 --- a/src/lib/eina/Eina.h +++ b/src/lib/eina/Eina.h @@ -57,15 +57,15 @@ * * @section eina_main_intro Introduction * - * The Eina library is a library that implements an API for data types + * The Eina library is a library which implements an API for data types * in an efficient way. It also provides some useful tools like - * opening shared libraries, errors management, type conversion, - * time accounting and memory pool. + * opening shared libraries, error management, type conversion, + * time accounting and memory pools. * * This library is cross-platform and can be compiled and used on - * Linux, BSD, Opensolaris and Windows (XP and CE). + * Linux, BSD, and Windows. * - * The data types that are available are (see @ref Eina_Data_Types_Group): + * The data types available are (see @ref Eina_Data_Types_Group): * @li @ref Eina_Fp_Group standard floating point numbers. * @li @ref Eina_Inline_Array_Group standard array of inlined members. * @li @ref Eina_Array_Group standard array of @c void* data. @@ -82,7 +82,7 @@ * @li @ref Eina_Trash_Group container of unused but allocated data. * @li @ref Eina_Value_Group container for generic value storage and access. * - * The tools that are available are (see @ref Eina_Tools_Group): + * The tools available are (see @ref Eina_Tools_Group): * @li @ref Eina_Benchmark_Group helper to write benchmarks. * @li @ref Eina_Convert_Group faster conversion from strings to integers, double, etc. * @li @ref Eina_Counter_Group measures number of calls and their time. @@ -100,9 +100,9 @@ * * @section eina_main_compiling How to compile * - * Eina is a library your application links to. The procedure for this is + * Eina is a library to which your app can link. The procedure for this is * very simple. You simply have to compile your application with the - * appropriate compiler flags that the @c pkg-config script outputs. For + * appropriate compiler flags as outputted by the @c pkg-config script. For * example: * * Compiling C or C++ files into object files: @@ -121,8 +121,8 @@ * * @section eina_main_next_steps Next Steps * - * After you understood what Eina is and installed it in your system - * you should proceed understanding the programming interface. + * After you've understood what Eina is and installed it, + * you can now learn more about the the programming interface. * * Recommended reading: * @@ -163,37 +163,37 @@ * * The choice of which container to use in each situation is very important in * achieving good performance and readable code. The most common container types - * to be used are: + * used are: * @li List * @li Inline list * @li Array * @li Inline array * @li Hash * - * All types have virtues and vices. The following considerations are good + * All types have pros and cons. The following considerations are good * starting point in deciding which container to use: - * @li Hashes are appropriate for datasets which will be searched often; - * @li arrays are good when accessing members by position; - * @li lists provide good versatility for adding elements in any position with - * minimal overhead; - * @li inline arrays use very little memory and don't cause fragmentation and - * therefore are a good option in memory constrained systems; - * @li inline lists are the appropriate type to use when the flexibility of a - * list is required but the overhead of pointer indirection is not acceptable. - * @warning These are general considerations, every situation is different, - * don't follow these recommendations blindly. + * @li Hashes are appropriate for datasets which will be searched often. + * @li Arrays are good when accessing members by position; + * @li Lists provide good versatility for adding elements in any position with + * minimal overhead. + * @li Inline arrays use very little memory and don't cause fragmentation so + * are a good option in memory constrained systems. + * @li Inline lists are the best type to use when list flexibility is + * required but no pointer indirection overhead can be allowed. + * @warning These are general considerations. Every situation is different. + * Don't follow these recommendations blindly. * * @section eina_main_Creation Creating custom container types * - * @note Before creating a custom container check if one of the existing ones - * doesn't sui
[EGIT] [core/efl] master 03/03: docs: Remove the details for inherited members and events
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6757fd504e8395f754fb004232fa5f091c7aeaea
commit 6757fd504e8395f754fb004232fa5f091c7aeaea
Author: Andy Williams <a...@andywilliams.me>
Date: Mon Dec 11 16:45:54 2017 +
docs: Remove the details for inherited members and events
Also fix the headings so "Members" and "Events" is always visible
as it makes for a better Table of Contents.
Layout could be improved, just playing with the minimal
information presentation for now.
---
src/scripts/elua/apps/gendoc.lua | 84 ++--
1 file changed, 47 insertions(+), 37 deletions(-)
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index 2d8d9bbe45..2dd863c5d2 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -701,11 +701,10 @@ find_parent_briefdoc = function(fulln, cl)
return pdoc:brief_get(pdocf)
end
-local build_functable = function(f, title, tcl, tbl, newm)
+local build_functable = function(f, tcl, tbl, newm)
if #tbl == 0 then
return
end
-f:write_h(title, newm and 2 or 3)
local nt = {}
for i, implt in ipairs(tbl) do
local lbuf = writer.Buffer()
@@ -757,29 +756,31 @@ local build_functable = function(f, title, tcl, tbl, newm)
-- overridde info (or empty)
wt[#wt + 1] = lbuf:finish()
-local doc = impl:doc_get(func.METHOD, true)
-local docf = impl:fallback_doc_get(true)
-local bdoc
-if over and (not doc:exists() and (not docf or not docf:exists())) then
-bdoc = find_parent_briefdoc(impl:full_name_get(), cl)
-else
-bdoc = doc:brief_get(docf)
-end
-
-lbuf:write_nl()
-local codes = {}
-if func:type_get() ~= dtree.Function.PROPERTY then
-codes[#codes + 1] = gen_func_csig(func, func:type_get())
-else
-codes[#codes + 1] = gen_func_csig(func, dtree.Function.PROP_GET)
-codes[#codes + 1] = gen_func_csig(func, dtree.Function.PROP_SET)
-end
-lbuf:write_code(table.concat(codes, "\n"), "c")
+if newm then
+local doc = impl:doc_get(func.METHOD, true)
+local docf = impl:fallback_doc_get(true)
+local bdoc
+if over and (not doc:exists() and (not docf or not docf:exists()))
then
+bdoc = find_parent_briefdoc(impl:full_name_get(), cl)
+else
+bdoc = doc:brief_get(docf)
+end
-if bdoc ~= "No description supplied." then
lbuf:write_nl()
-lbuf:write_raw(bdoc)
-lbuf:write_br()
+local codes = {}
+if func:type_get() ~= dtree.Function.PROPERTY then
+codes[#codes + 1] = gen_func_csig(func, func:type_get())
+else
+codes[#codes + 1] = gen_func_csig(func,
dtree.Function.PROP_GET)
+codes[#codes + 1] = gen_func_csig(func,
dtree.Function.PROP_SET)
+end
+lbuf:write_code(table.concat(codes, "\n"), "c")
+
+if bdoc ~= "No description supplied." then
+lbuf:write_nl()
+lbuf:write_raw(bdoc)
+lbuf:write_br()
+end
end
-- sigs and description
@@ -908,11 +909,10 @@ local build_evcsig = function(ev)
return table.concat(csbuf)
end
-local build_evtable = function(f, title, tcl, tbl, newm)
+local build_evtable = function(f, tcl, tbl, newm)
if #tbl == 0 then
return
end
-f:write_h(title, newm and 2 or 3)
local nt = {}
for i, evt in ipairs(tbl) do
local lbuf = writer.Buffer()
@@ -938,16 +938,18 @@ local build_evtable = function(f, title, tcl, tbl, newm)
-- name info
wt[1] = lbuf:finish()
-lbuf:write_nl()
-lbuf:write_code(build_evcsig(ev), "c");
-
-local bdoc = ev:doc_get():brief_get()
-if bdoc ~= "No description supplied." then
+if newm then
lbuf:write_nl()
-lbuf:write_raw(bdoc)
-lbuf:write_br()
-end
+lbuf:write_code(build_evcsig(ev), "c");
+local bdoc = ev:doc_get():brief_get()
+if bdoc ~= "No description supplied." then
+lbuf:write_nl()
+lbuf:write_raw(bdoc)
+lbuf:write_br()
+end
+
+end
-- description
wt[#wt + 1] = lbuf:finish()
nt[#nt + 1] = wt
@@ -1027,11 +1029,19 @@ local build_class = function(cl)
end
find_callables(cl, omeths, ievs, written)
-build_functable(f, "Members", cl, meths, true)
-build_functable(f, "Inherited Members", cl, omeths,
[EGIT] [core/efl] master 02/02: docs: We no longer have class type in URLs
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5ce17ae60ad7284711f6a074ccea735286856ff3
commit 5ce17ae60ad7284711f6a074ccea735286856ff3
Author: Andy Williams <a...@andywilliams.me>
Date: Mon Dec 11 17:25:50 2017 +
docs: We no longer have class type in URLs
---
src/scripts/elua/apps/docgen/doctree.lua | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/scripts/elua/apps/docgen/doctree.lua
b/src/scripts/elua/apps/docgen/doctree.lua
index 9a41e12495..187c50e494 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -1462,23 +1462,18 @@ M.DocTokenizer = Node:clone {
ref_get = function(self, root)
local tp, d1, d2 = self.tok:ref_get(eos:unit_get())
local reft = eolian.doc_ref_type
-local ret
+local ret = {}
if tp == reft.CLASS or tp == reft.FUNC or tp == reft.EVENT then
-ret = { class_type_str[d1:type_get()] }
-if not ret[1] then
+if not class_type_str[d1:type_get()] then
error("unknown class type for class '"
.. d1:full_name_get() .. "'")
end
elseif tp == reft.ALIAS then
-ret = { "alias" }
elseif tp == reft.STRUCT or tp == reft.STRUCT_FIELD then
-- TODO: point to field
-ret = { "struct" }
elseif tp == reft.ENUM or tp == reft.ENUM_FIELD then
-- TODO: point to field
-ret = { "enum" }
elseif tp == reft.VAR then
-ret = { "var" }
else
error("invalid reference '" .. self:text_get() .. "'")
end
--
[EGIT] [core/efl] master 02/03: docs: Compact and lay out the header of API docs
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5b6d3bb5384f9512d2fb51a9cd50035fb8f58a6a
commit 5b6d3bb5384f9512d2fb51a9cd50035fb8f58a6a
Author: Andy Williams <a...@andywilliams.me>
Date: Mon Dec 11 16:43:47 2017 +
docs: Compact and lay out the header of API docs
Add an inheritance summary (following the primary class heirarchy).
Move the full heirarchy to a folded section.
Put the description at the top where it belongs.
---
src/scripts/elua/apps/gendoc.lua | 57 +---
1 file changed, 42 insertions(+), 15 deletions(-)
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index 04c0764475..2d8d9bbe45 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -375,19 +375,36 @@ build_inherits = function(cl, t, lvl)
t = t or {}
lvl = lvl or 0
local lbuf = writer.Buffer()
-lbuf:write_link(cl:nspaces_get(true), cl:full_name_get())
-lbuf:write_raw(" ")
-lbuf:write_i("(" .. cl:type_str_get() .. ")")
-if lvl == 0 then
-lbuf:write_b(lbuf:finish())
+if lvl > 0 then
+lbuf:write_link(cl:nspaces_get(true), cl:full_name_get())
+lbuf:write_raw(" ")
+lbuf:write_i("(" .. cl:type_str_get() .. ")")
+
+t[#t + 1] = { lvl - 1, lbuf:finish() }
end
-t[#t + 1] = { lvl, lbuf:finish() }
+
for i, acl in ipairs(cl:inherits_get()) do
build_inherits(acl, t, lvl + 1)
end
return t
end
+local build_inherit_summary
+build_inherit_summary = function(cl, buf)
+buf = buf or writer.Buffer()
+buf:write_raw(" => ")
+
+buf:write_link(cl:nspaces_get(true), cl:full_name_get())
+buf:write_raw(" ")
+buf:write_i("(" .. cl:type_str_get() .. ")")
+
+local inherits = cl:inherits_get()
+if #inherits ~= 0 then
+build_inherit_summary(inherits[1], buf)
+end
+return buf
+end
+
local default_theme_light = {
classes = {
regular = {
@@ -968,6 +985,22 @@ local build_class = function(cl)
local f = writer.Writer(cln, fulln)
printgen("Generating class: " .. fulln)
+f:write_h(cl:full_name_get() .. " (" .. cl:type_str_get() .. ")", 1)
+
+f:write_h("Description", 2)
+f:write_raw(cl:doc_get():full_get(nil, true))
+f:write_nl(2)
+
+f:write_editable(cln, "description")
+f:write_nl()
+
+f:write_h("Inheritance", 2)
+local inherits = cl:inherits_get()
+if #inherits ~= 0 then
+f:write_raw(build_inherit_summary(inherits[1]):finish())
+end
+f:write_nl()
+
f:write_folded("Inheritance graph", function()
f:write_graph(build_igraph(cl))
end)
@@ -975,15 +1008,9 @@ local build_class = function(cl)
f:write_nl(2)
end
-f:write_h("Inheritance hierarchy", 2)
-f:write_list(build_inherits(cl))
-f:write_nl()
-
-f:write_h("Description", 2)
-f:write_raw(cl:doc_get():full_get(nil, true))
-f:write_nl(2)
-
-f:write_editable(cln, "description")
+f:write_folded("Full hierarchy", function()
+f:write_list(build_inherits(cl))
+end)
f:write_nl()
local written = {}
--
[EGIT] [tools/examples] master 01/01: hello-gui: Reduce to a minimal Efl.Ui app
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=36b64dfca1803dbf1468c279b6c0cec10943cf52
commit 36b64dfca1803dbf1468c279b6c0cec10943cf52
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Dec 6 13:12:07 2017 +
hello-gui: Reduce to a minimal Efl.Ui app
---
tutorial/c/hello-gui/src/gui_main.c | 29 -
1 file changed, 4 insertions(+), 25 deletions(-)
diff --git a/tutorial/c/hello-gui/src/gui_main.c
b/tutorial/c/hello-gui/src/gui_main.c
index a53d6b7..a95e9d8 100644
--- a/tutorial/c/hello-gui/src/gui_main.c
+++ b/tutorial/c/hello-gui/src/gui_main.c
@@ -6,14 +6,6 @@
#include
static void
-_gui_editor_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
-{
- Eo *editor = data;
-
- printf("Change recorded: %s\n", efl_text_get(editor));
-}
-
-static void
_gui_quit_clicked_cb(void *data EINA_UNUSED, const Efl_Event *event
EINA_UNUSED)
{
efl_exit(0);
@@ -22,7 +14,7 @@ _gui_quit_clicked_cb(void *data EINA_UNUSED, const Efl_Event
*event EINA_UNUSED)
static void
_gui_setup()
{
- Eo *win, *box, *editor;
+ Eo *win, *box;
win = efl_add(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
@@ -33,25 +25,12 @@ _gui_setup()
efl_content_set(win, efl_added),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(360, 240)));
-// TODO make this a single label with anewline in it
efl_add(EFL_UI_TEXT_CLASS, box,
- efl_text_set(efl_added, "Hello World."),
- efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.1),
+ efl_text_markup_set(efl_added, "Hello World.This is an
Efl.Ui application!"),
+ efl_ui_text_interactive_selection_allowed_set(efl_added,
EINA_FALSE),
+ efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.9),
efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5),
efl_pack(box, efl_added));
- efl_add(EFL_UI_TEXT_CLASS, box,
- efl_text_set(efl_added, "You can edit the text below to generate
change events..."),
- efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.1),
- efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5),
- efl_pack(box, efl_added));
-
- editor = efl_add(EFL_UI_TEXT_CLASS, box,
-efl_text_set(efl_added, "Edit me"),
-efl_ui_text_interactive_editable_set(efl_added, EINA_TRUE),
-efl_ui_text_scrollable_set(efl_added, EINA_TRUE),
-efl_pack(box, efl_added));
- efl_event_callback_add(editor, EFL_UI_TEXT_EVENT_CHANGED_USER,
- _gui_editor_changed_cb, editor);
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Quit"),
--
[EGIT] [tools/examples] master 01/01: ui: Add starter of a translation reference example
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=95c0ffad658aa57eb7d4ddeda4b444faeb051daa
commit 95c0ffad658aa57eb7d4ddeda4b444faeb051daa
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Dec 6 12:46:15 2017 +
ui: Add starter of a translation reference example
---
.gitignore | 2 ++
reference/c/ui/meson.build | 1 +
reference/c/ui/po/LINGUAS | 0
reference/c/ui/po/POTFILES | 1 +
reference/c/ui/po/meson.build | 4 +++
reference/c/ui/src/meson.build | 8 ++
reference/c/ui/src/ui_translation.c | 54 +
7 files changed, 70 insertions(+)
diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index 378eac2..74c3478
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
build
+*.pot
+
diff --git a/reference/c/ui/meson.build b/reference/c/ui/meson.build
index 2100252..b42fa20 100644
--- a/reference/c/ui/meson.build
+++ b/reference/c/ui/meson.build
@@ -9,4 +9,5 @@ efl = dependency('efl-ui', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')
+subdir('po')
diff --git a/reference/c/ui/po/LINGUAS b/reference/c/ui/po/LINGUAS
new file mode 100644
index 000..e69de29
diff --git a/reference/c/ui/po/POTFILES b/reference/c/ui/po/POTFILES
new file mode 100644
index 000..2d2079f
--- /dev/null
+++ b/reference/c/ui/po/POTFILES
@@ -0,0 +1 @@
+src/ui_translation.c
diff --git a/reference/c/ui/po/meson.build b/reference/c/ui/po/meson.build
new file mode 100644
index 000..0f35612
--- /dev/null
+++ b/reference/c/ui/po/meson.build
@@ -0,0 +1,4 @@
+i18n = import('i18n')
+i18n.gettext('example_translation',
+ args : '--keyword=efl_ui_translatable_text_set:2')
+
diff --git a/reference/c/ui/src/meson.build b/reference/c/ui/src/meson.build
index 82793b4..07ff9fc 100644
--- a/reference/c/ui/src/meson.build
+++ b/reference/c/ui/src/meson.build
@@ -13,3 +13,11 @@ executable('efl_reference_ui_container',
include_directories : inc,
install : true
)
+
+executable('efl_reference_ui_translation',
+ files(['ui_translation.c']),
+ dependencies : deps,
+ include_directories : inc,
+ install : true
+)
+
diff --git a/reference/c/ui/src/ui_translation.c
b/reference/c/ui/src/ui_translation.c
new file mode 100644
index 000..70f383c
--- /dev/null
+++ b/reference/c/ui/src/ui_translation.c
@@ -0,0 +1,54 @@
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
+
+#include
+
+#include
+#include
+#include
+
+/*
+ * Efl.Ui translation exmaples.
+ *
+ * Efl.Ui contains a way to manage translations provided by gettext or
+ * other translation provider. This example shows how to set it up and to
+ * extract strings for translation. (see src/meson.build).
+ *
+ * The gettext extraction command is:
+ * "xgettext --keyword=efl_ui_translatable_text_set:2 --from-code=utf-8
--foreign-user"
+ *
+ * In this project you can go to build/ and execute "ninja
example_translation-pot"
+ */
+#define _TEXT_DOMAIN "example_translation"
+
+EAPI_MAIN void
+efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
+{
+ Efl_Ui_Win *win, *box;
+
+ win = efl_add(EFL_UI_WIN_CLASS, NULL,
+ efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
+ efl_ui_translatable_text_set(efl_added, "Translations",
+ _TEXT_DOMAIN),
+ efl_ui_win_autodel_set(efl_added, EINA_TRUE));
+
+ box = efl_add(EFL_UI_BOX_CLASS, win,
+ efl_content_set(win, efl_added));
+
+ efl_add(EFL_UI_BUTTON_CLASS, win,
+ efl_ui_translatable_text_set(efl_added, "Translations",
_TEXT_DOMAIN),
+ efl_pack_end(box, efl_added));
+
+ efl_add(EFL_UI_BUTTON_CLASS, win,
+ efl_ui_translatable_text_set(efl_added, "Help", _TEXT_DOMAIN),
+ efl_pack_end(box, efl_added));
+
+ efl_add(EFL_UI_BUTTON_CLASS, win,
+ efl_ui_translatable_text_set(efl_added, "Quit", _TEXT_DOMAIN),
+ efl_pack_end(box, efl_added),
+ efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 100)));
+
+ efl_gfx_size_set(win, EINA_SIZE2D(320, 320));
+}
+EFL_MAIN()
+
--
[EGIT] [core/efl] master 01/01: docs: Strip duplicate inherited events
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=dc13197895a6bf8ba13e218b637454ec7c0fbd01 commit dc13197895a6bf8ba13e218b637454ec7c0fbd01 Author: Andy Williams <a...@andywilliams.me> Date: Mon Dec 11 22:30:21 2017 + docs: Strip duplicate inherited events --- 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 2dd863c5d2..4e3971a0cf 100644 --- a/src/scripts/elua/apps/gendoc.lua +++ b/src/scripts/elua/apps/gendoc.lua @@ -959,6 +959,11 @@ local build_evtable = function(f, tcl, tbl, newm) end end table.sort(nt, function(v1, v2) return v1[1] < v2[1] end) +for i = #nt, 1, -1 do +if i ~= 1 and nt[i][1] == nt[i - 1][1] then +table.remove(nt, i) +end +end for i, item in ipairs(nt) do -- name f:write_raw(item[1]) --
[EGIT] [tools/examples] master 02/02: Merge branch 'devs/xartigas/tutorials'
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/examples.git/commit/?id=0a95fa88b2fac45cd1ff8db019e4ab7676fd6e9c commit 0a95fa88b2fac45cd1ff8db019e4ab7676fd6e9c Merge: 9cbbb37 37a5123 Author: Andy Williams <a...@andywilliams.me> Date: Tue Dec 12 11:00:47 2017 + Merge branch 'devs/xartigas/tutorials' tutorial/c/lifecycle/src/lifecycle_main.c | 58 ++- 1 file changed, 26 insertions(+), 32 deletions(-) --
[EGIT] [tools/examples] master 01/02: lifecycle_ui: Add almost-working lifecycle gui demo
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=9cbbb377505f746c93c530793d7dadba8058c3e3
commit 9cbbb377505f746c93c530793d7dadba8058c3e3
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Dec 12 10:56:17 2017 +
lifecycle_ui: Add almost-working lifecycle gui demo
This is pending some Elm fixes to function correctly
---
tutorial/c/lifecycle_ui/meson.build | 13 +++
tutorial/c/lifecycle_ui/src/lifecycle_main.c | 57
tutorial/c/lifecycle_ui/src/meson.build | 12 ++
3 files changed, 82 insertions(+)
diff --git a/tutorial/c/lifecycle_ui/meson.build
b/tutorial/c/lifecycle_ui/meson.build
new file mode 100644
index 000..4603117
--- /dev/null
+++ b/tutorial/c/lifecycle_ui/meson.build
@@ -0,0 +1,13 @@
+project(
+ 'efl-example-lifecycle-ui', 'c',
+ version : '0.0.1',
+ default_options: [ 'c_std=gnu99', 'warning_level=2' ],
+ meson_version : '>= 0.38.0')
+
+eina = dependency('eina', version : '>=1.20.99')
+efl = dependency('efl-ui', version : '>=1.20.99')
+elm = dependency('elementary', version : '>=1.20.99')
+
+inc = include_directories('.')
+subdir('src')
+
diff --git a/tutorial/c/lifecycle_ui/src/lifecycle_main.c
b/tutorial/c/lifecycle_ui/src/lifecycle_main.c
new file mode 100644
index 000..711686f
--- /dev/null
+++ b/tutorial/c/lifecycle_ui/src/lifecycle_main.c
@@ -0,0 +1,57 @@
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
+
+#include
+#include
+#include
+
+static void
+_gui_quit_clicked_cb(void *data EINA_UNUSED, const Efl_Event *event
EINA_UNUSED)
+{
+ efl_exit(0);
+}
+
+static void
+_gui_setup()
+{
+ Eo *win;
+
+ win = efl_add(EFL_UI_WIN_CLASS, NULL,
+ efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
+ efl_ui_win_name_set(efl_added, "Lifecycle Example"),
+ efl_text_set(efl_added, "Hello World"),
+ efl_ui_win_autodel_set(efl_added, EINA_TRUE));
+ efl_add(EFL_UI_BUTTON_CLASS, win,
+ efl_text_set(efl_added, "Quit"),
+ efl_content_set(win, efl_added),
+ efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ _gui_quit_clicked_cb, efl_added));
+}
+
+EAPI_MAIN void
+efl_pause(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
+{
+ printf("Lifecycle: paused\n");
+}
+
+EAPI_MAIN void
+efl_resume(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
+{
+ printf("Lifecycle: resumed\n");
+}
+
+EAPI_MAIN void
+efl_terminate(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
+{
+ printf("Lifecycle: terminated\n");
+}
+
+EAPI_MAIN void
+efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
+{
+ printf("Lifecycle: launched\n");
+
+ _gui_setup();
+}
+EFL_MAIN_EX()
+
diff --git a/tutorial/c/lifecycle_ui/src/meson.build
b/tutorial/c/lifecycle_ui/src/meson.build
new file mode 100644
index 000..1c574e4
--- /dev/null
+++ b/tutorial/c/lifecycle_ui/src/meson.build
@@ -0,0 +1,12 @@
+src = files([
+ 'lifecycle_main.c',
+])
+
+deps = [eina, efl, elm]
+
+executable('efl_example_lifecycle_ui', src,
+ dependencies : deps,
+ include_directories : inc,
+ install : true
+)
+
--
[EGIT] [core/efl] master 01/01: Revert "elm_code: Call parent theme_apply when we're applying"
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=756964c49368b23b1655cf5383dd3ce3fde5d18c commit 756964c49368b23b1655cf5383dd3ce3fde5d18c Author: Andy Williams <a...@andywilliams.me> Date: Fri Dec 1 16:44:34 2017 + Revert "elm_code: Call parent theme_apply when we're applying" This reverts commit 3e5e9943601fe84b7a3ebb1d4a0c9a10bb49bf27. This crashes within Edi. The partial solution is not good enough. --- src/lib/elementary/elm_code_widget.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index f7fa879127..eb4a83800e 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -2202,8 +2202,6 @@ _elm_code_widget_elm_widget_theme_apply(Eo *obj, Elm_Code_Widget_Data *pd) unsigned int i; Evas_Object *grid, *background; - efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); - edje = elm_layout_edje_get(obj); edje_object_color_class_get(edje, "elm/code/status/default", , , , , NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); --
[EGIT] [tools/examples] master 01/01: apps: Add first pass Game of Life :)
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=fc7503113a18ff5da384fce24214dde7c17c7941
commit fc7503113a18ff5da384fce24214dde7c17c7941
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Dec 1 22:27:35 2017 +
apps: Add first pass Game of Life :)
---
apps/c/life/meson.build| 13
apps/c/life/src/life_board.c | 162 +
apps/c/life/src/life_main.c| 90 +++
apps/c/life/src/life_private.h | 25 +++
apps/c/life/src/life_render.c | 93 +++
apps/c/life/src/meson.build| 14
6 files changed, 397 insertions(+)
diff --git a/apps/c/life/meson.build b/apps/c/life/meson.build
new file mode 100644
index 000..06c1dc7
--- /dev/null
+++ b/apps/c/life/meson.build
@@ -0,0 +1,13 @@
+project(
+ 'efl-example-life', 'c',
+ version : '0.0.1',
+ default_options: [ 'c_std=gnu99', 'warning_level=2' ],
+ meson_version : '>= 0.38.0')
+
+eina = dependency('eina', version : '>=1.20.99')
+efl = dependency('efl-ui', version : '>=1.20.99')
+elm = dependency('elementary', version : '>=1.20.99')
+
+inc = include_directories('.')
+subdir('src')
+
diff --git a/apps/c/life/src/life_board.c b/apps/c/life/src/life_board.c
new file mode 100644
index 000..40884d4
--- /dev/null
+++ b/apps/c/life/src/life_board.c
@@ -0,0 +1,162 @@
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
+
+#include
+#include
+
+#include "life_private.h"
+
+static int gen = 0;
+
+int *life_board, *life_board_prev;
+static int *_life_board_1, *_life_board_2;
+static Efl_Loop_Timer *_life_timer;
+
+static void
+_life_tick(void *data, const Efl_Event *event EINA_UNUSED)
+{
+ Efl_Ui_Win *win = data;
+
+ life_board_nextgen();
+ life_render_refresh(win);
+}
+
+static void
+_life_cell_on(int x, int y)
+{
+ _life_board_1[life_render_index_for_position(x, y)] = 1;
+}
+
+static void
+_life_board_setup()
+{
+ // glide
+ _life_cell_on(16, 1);
+ _life_cell_on(17, 2);
+ _life_cell_on(18, 2);
+ _life_cell_on(16, 3);
+ _life_cell_on(17, 3);
+
+ // oscilate
+ _life_cell_on(22, 15);
+ _life_cell_on(23, 15);
+ _life_cell_on(24, 15);
+
+ // block
+ _life_cell_on(32, 15);
+ _life_cell_on(33, 15);
+ _life_cell_on(32, 16);
+ _life_cell_on(33, 16);
+}
+
+void
+life_board_init()
+{
+ _life_board_1 = calloc(1, sizeof(int) * LIFE_BOARD_WIDTH *
LIFE_BOARD_HEIGHT);
+ _life_board_2 = calloc(1, sizeof(int) * LIFE_BOARD_WIDTH *
LIFE_BOARD_HEIGHT);
+
+ _life_board_setup();
+
+ life_board = _life_board_1;
+ life_board_prev = _life_board_2;
+}
+
+void
+life_board_run(Efl_Ui_Win *win)
+{
+ _life_timer = efl_add(EFL_LOOP_TIMER_CLASS, NULL,
+ efl_loop_timer_interval_set(efl_added, 0.1));
+
+ efl_event_callback_add(_life_timer, EFL_LOOP_TIMER_EVENT_TICK, _life_tick,
win);
+}
+
+int
+life_board_sum_around(int x, int y)
+{
+ int sum = 0;
+ int i, max;
+
+ max = LIFE_BOARD_WIDTH * LIFE_BOARD_HEIGHT;
+
+ i = life_render_index_for_position(x - 1, (y - 1));
+ if (i >= 0)
+ sum += life_board[i];
+ i++;
+ if (i >= 0)
+ sum += life_board[i];
+ i++;
+ if (i >= 0)
+ sum += life_board[i];
+
+ i = life_render_index_for_position(x - 1, y);
+ if (i >= 0)
+ sum += life_board[i];
+ i += 2;
+ if (i < max)
+ sum += life_board[i];
+
+ i = life_render_index_for_position(x - 1, (y + 1));
+ if (i < max)
+ sum += life_board[i];
+ i++;
+ if (i < max)
+ sum += life_board[i];
+ i++;
+ if (i < max)
+ sum += life_board[i];
+
+ return sum;
+}
+
+void
+life_board_nextgen()
+{
+ int *work;
+ int x, y, i, n;
+ gen++;
+
+ if (life_board == _life_board_1)
+ work = _life_board_2;
+ else
+ work = _life_board_1;
+
+ for (y = 0; y < LIFE_BOARD_HEIGHT; y++)
+ for (x = 0; x < LIFE_BOARD_WIDTH; x++)
+ {
+ i = life_render_index_for_position(x, y);
+
+ n = life_board_sum_around(x, y);
+ if (life_board[i])
+{
+ if (n > 3 || n < 2)
+ work[i] = 0;
+ else
+ work[i] = 1;
+}
+ else
+{
+ if (n == 3)
+ work[i] = 1;
+ else
+ work[i] = 0;
+}
+ }
+
+ life_board_prev = life_board;
+ life_board = work;
+}
+
+void
+life_board_pause_toggle(Efl_Ui_Win *win)
+{
+ if (_life_timer)
+ {
+efl_del(_life_timer);
+_life_timer = NULL;
+ }
+ else
+ {
+life_board_run(win);
+ }
+}
+
diff --git a/apps/c/life/src/life_main.c b/apps/c/life/src/life_main.c
new file mode 100644
index 000..63f97f8
--- /dev/null
+++ b/apps/c/life/src/life_main.c
@@ -0,0 +1,90 @@
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
+
+#include
+#include
+
+#include "life_priv
[EGIT] [tools/examples] master 01/01: core: Add an events reference example
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=9ef1398bfc7a681575e9c42835a4ca4f7631b39e
commit 9ef1398bfc7a681575e9c42835a4ca4f7631b39e
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Dec 5 15:07:32 2017 +
core: Add an events reference example
---
reference/c/core/src/core_event.c | 156 ++
reference/c/core/src/meson.build | 7 ++
2 files changed, 163 insertions(+)
diff --git a/reference/c/core/src/core_event.c
b/reference/c/core/src/core_event.c
new file mode 100644
index 000..3ddebbc
--- /dev/null
+++ b/reference/c/core/src/core_event.c
@@ -0,0 +1,156 @@
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
+
+#include
+
+#include
+#include
+
+/*
+ * Efl Core Event examples.
+ *
+ * This example shows the various ways of adding callbacks for standard events.
+ * It also demonstrates the creation of a custom event and how to freeze and
+ * thaw events on an object.
+ */
+
+Efl_Event_Description *_CUSTOM_EVENT;
+
+static void
+_add_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
+{
+ printf(" Add\n");
+}
+
+static void
+_del_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
+{
+ printf(" Delete Callback\n");
+}
+
+static void
+_del_obj_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
+{
+ printf(" Delete Object\n");
+}
+
+static void
+_custom_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
+{
+ printf(" Custom\n");
+}
+
+static void
+_poll_cb(void *data, const Efl_Event *event EINA_UNUSED)
+{
+ Efl_Loop *mainloop;
+
+ mainloop = (Efl_Loop *)data;
+ printf(" Poll\n");
+
+ efl_event_callback_del(mainloop, _CUSTOM_EVENT, _custom_cb, NULL);
+}
+
+static void
+_fast_cb(void *data, const Efl_Event *event EINA_UNUSED)
+{
+ Efl_Loop *mainloop;
+
+ mainloop = (Efl_Loop *)data;
+ printf(" Running\n");
+}
+
+static void
+_freezethaw_cb(void *data, const Efl_Event *event EINA_UNUSED)
+{
+ Efl_Loop *polled;
+ static int called = 0;
+
+ polled = data;
+ switch (called)
+ {
+case 0:
+ printf(" Freeze\n");
+ efl_event_freeze(polled);
+ break;
+case 1:
+ printf(" Thaw\n");
+ efl_event_thaw(polled);
+ break;
+default:
+ efl_exit(0);
+ }
+
+ called++;
+}
+
+static void
+_events_freeze(Efl_Loop *mainloop)
+{
+ Efl_Loop *polled;
+
+ printf("Test 2:\n");
+
+ polled = efl_add(EFL_LOOP_CLASS, mainloop);
+ efl_event_callback_add(polled, EFL_LOOP_EVENT_POLL_HIGH, _fast_cb, NULL);
+
+ efl_add(EFL_LOOP_TIMER_CLASS, mainloop,
+ efl_loop_timer_interval_set(efl_added, .1),
+ efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK,
_freezethaw_cb, polled));
+}
+
+static void
+_timer_cb(void *data EINA_UNUSED, const Efl_Event *event)
+{
+ Efl_Loop *mainloop;
+
+ mainloop = (Efl_Loop *)data;
+ _events_freeze(mainloop);
+
+ // cancel this timer
+ efl_del(event->object);
+}
+
+EFL_CALLBACKS_ARRAY_DEFINE(_callback_array,
+{ EFL_LOOP_EVENT_POLL_MEDIUM, _poll_cb },
+{ EFL_EVENT_CALLBACK_DEL, _del_cb },
+{ EFL_EVENT_DEL, _del_obj_cb })
+
+static void
+_events_demo(Efl_Loop *mainloop)
+{
+ // this is a definition of a custom event, for our app
+ Efl_Event_Description desc = EFL_EVENT_DESCRIPTION("custom-event");
+
+ _CUSTOM_EVENT =
+ printf("Test 1:\n");
+
+ // add a singe callback that monitors for new callbacks added
+ efl_event_callback_add(mainloop, EFL_EVENT_CALLBACK_ADD, _add_cb, NULL);
+
+ // add an array of callbacks (defined above)
+ // this is more efficient if you have multiple callbacks to add
+ efl_event_callback_array_add(mainloop, _callback_array(), mainloop);
+
+ // here we add a custom callback and call it immediately
+ efl_event_callback_add(mainloop, _CUSTOM_EVENT, _custom_cb, NULL);
+ efl_event_callback_call(mainloop, _CUSTOM_EVENT, NULL);
+
+ // we will exit from this timer
+ efl_add(EFL_LOOP_TIMER_CLASS, mainloop,
+ efl_loop_timer_interval_set(efl_added, 10),
+ efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK,
_timer_cb, mainloop));
+
+ printf(" Waiting for timer to call back (10 seconds)...\n");
+}
+
+EAPI_MAIN void
+efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
+{
+ Efl_Loop *mainloop;
+
+ mainloop = ev->object;
+ _events_demo(mainloop);
+}
+EFL_MAIN()
+
diff --git a/reference/c/core/src/meson.build b/reference/c/core/src/meson.build
index 6906e53..26085f6 100644
--- a/reference/c/core/src/meson.build
+++ b/reference/c/core/src/meson.build
@@ -7,6 +7,13 @@ executable('efl_reference_core_loop',
install : true
)
+executable('efl_reference_core_event',
+ files(['core_event.c']),
+ dependencies : deps,
+ include_directories : inc,
+ install : true
+)
+
executable('efl_reference_core_io',
files(['core_io.c']),
dependencies : deps,
--
[EGIT] [website/www] master 01/02: Revert "WIKI CUSTOM - geshi - add custom code hilighter extensions"
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=a34d54426e40537d4fa5e3080f62286075d7c025
commit a34d54426e40537d4fa5e3080f62286075d7c025
Author: Andy Williams <a...@andywilliams.me>
Date: Mon Oct 30 13:40:40 2017 +
Revert "WIKI CUSTOM - geshi - add custom code hilighter extensions"
This reverts commit c55c1d32bb61536b57e171867d96719ce19f4b57.
---
public_html/inc/geshi.php | 21 -
public_html/inc/parserutils.php | 20 ++--
2 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/public_html/inc/geshi.php b/public_html/inc/geshi.php
index e4b142b8..c6ff9ef7 100644
--- a/public_html/inc/geshi.php
+++ b/public_html/inc/geshi.php
@@ -594,8 +594,7 @@ class GeSHi {
* {@link GeSHi->set_language_path()}
* @since 1.0.0
*/
-function GeSHi($source = '', $language = '', $path = '', $extndir = '') {
-$this->extndir = $extndir;
+function GeSHi($source = '', $language = '', $path = '') {
if (!empty($source)) {
$this->set_source($source);
}
@@ -690,10 +689,6 @@ class GeSHi {
// this language is already loaded!
return;
}
-if (!empty($this->extndir)) {
-$file_extn_link = $this->extndir . '/' . $language .
'/keyword-link.txt';
-$file_extn_list = $this->extndir . '/' . $language .
'/keyword-list.txt';
-}
$this->language = $language;
@@ -707,7 +702,7 @@ class GeSHi {
}
// Load the language for parsing
-$this->load_language($file_name, $file_extn_link, $file_extn_list);
+$this->load_language($file_name);
}
/**
@@ -3745,7 +3740,7 @@ class GeSHi {
* @access private
* @todo Needs to load keys for lexic permissions for keywords, regexps etc
*/
-function load_language($file_name, $file_extn_link, $file_extn_list) {
+function load_language($file_name) {
if ($file_name == $this->loaded_language) {
// this file is already loaded!
return;
@@ -3760,14 +3755,6 @@ class GeSHi {
//Load the language file
require $file_name;
-if (!empty($file_extn_link) && !empty($file_extn_list) &&
-file_exists($file_extn_link) && file_exists($file_extn_list)) {
-$link_array = file($file_extn_link, FILE_IGNORE_NEW_LINES |
FILE_SKIP_EMPTY_LINES);
-$keys_array = file($file_extn_list, FILE_IGNORE_NEW_LINES |
FILE_SKIP_EMPTY_LINES);
-$language_data['URLS'][5] = $link_array[0];
-$language_data['KEYWORDS'][5] = $keys_array;
-}
-
// Perhaps some checking might be added here later to check that
// $language data is a valid thing but maybe not
$this->language_data = $language_data;
@@ -4785,4 +4772,4 @@ if (!function_exists('geshi_highlight')) {
}
}
-?>
+?>
\ No newline at end of file
diff --git a/public_html/inc/parserutils.php b/public_html/inc/parserutils.php
index d17580ed..17c331ef 100644
--- a/public_html/inc/parserutils.php
+++ b/public_html/inc/parserutils.php
@@ -743,33 +743,17 @@ function p_xhtml_cached_geshi($code, $language,
$wrapper='pre') {
// remove any leading or trailing blank lines
$code = preg_replace('/^\s*?\n|\s*?\n$/','',$code);
-$extn_dir = $conf['datadir'] . '/' . $conf['code_extn'];
-if (!file_exists($extn_dir)) {
-$extn_dir = '';
-}
-else {
-$extn_link = $extn_dir . '/' . $language . '/keyword-link.txt';
-$extn_list = $extn_dir . '/' . $language . '/keyword-list.txt';
-if (!file_exists($extn_link) || !file_exists($extn_list)) {
-$extn_link = '';
-$extn_list = '';
-}
-}
-
$cache = getCacheName($language.$code,".code");
$ctime = @filemtime($cache);
if($ctime && !$INPUT->bool('purge') &&
-((!empty($extn_link) &&
- (($ctime > filemtime($extn_link)) &&
- ($ctime > filemtime($extn_list ||
- (empty($extn_link))) &&
$ctime > filemtime(DOKU_INC.'inc/geshi.php') && //
geshi changed
$ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') && //
language syntax definition changed
$ctime > filemtime(reset($config_cascade['main']['default']))){ //
dokuwiki changed
$highlighted_code = io_readFile($cache, false);
} else {
-$geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi',
$conf['datadir'] . '/' . $conf['code_extn']);
+
+$geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
$geshi->set_encoding('utf-8');
$geshi->enable_classes();
$geshi->set_header_type(GESHI_HEADER_PRE);
--
[EGIT] [website/www] master 02/02: codelink: Actually render with a massive list of symbols
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=be6cc2017ab8f34378f8c36f70e08335c87309d5
commit be6cc2017ab8f34378f8c36f70e08335c87309d5
Author: Andy Williams <a...@andywilliams.me>
Date: Mon Oct 30 16:16:54 2017 +
codelink: Actually render with a massive list of symbols
Also look up the language list dynamically :)
---
public_html/lib/plugins/codelink/syntax.php | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/public_html/lib/plugins/codelink/syntax.php
b/public_html/lib/plugins/codelink/syntax.php
index 8505b0fb..476f01e4 100644
--- a/public_html/lib/plugins/codelink/syntax.php
+++ b/public_html/lib/plugins/codelink/syntax.php
@@ -32,10 +32,6 @@ class syntax_plugin_codelink extends DokuWiki_Syntax_Plugin {
$keys_array = file($extn_list, FILE_IGNORE_NEW_LINES |
FILE_SKIP_EMPTY_LINES);
$this->keydata[$language]['link'] = $link_array[0];
$this->keydata[$language]['keys'] = $keys_array;
-foreach ($keys_array as $k) {
-$this->Lexer->addSpecialPattern($k . '()', 'base',
'plugin_codelink');
-$this->Lexer->addSpecialPattern($k, 'base',
'plugin_codelink');
-}
}
}
}
@@ -64,13 +60,19 @@ class syntax_plugin_codelink extends DokuWiki_Syntax_Plugin
{
* @param string $mode Parser mode
*/
public function connectTo($mode) {
-// FIXME: make this cleaner
-// languages supported here (languages supported list)
-$langs = array('c');
-foreach($langs as $l) {
+global $conf;
+$langs = opendir($conf['datadir'] . '/' . $conf['code_extn']);
+while (false !== ($l = readdir($langs))) {
+if ($l == "." || $l == "..") {
+continue;
+}
+
$this->Lexer->addSpecialPattern('~~CODE-' . $l . '~~', $mode,
'plugin_codelink');
$this->load_lang_data($l);
}
+
+$this->Lexer->addSpecialPattern('[\w-]+\(?\)?', $mode,
'plugin_codelink');
+closedir($langs);
}
/**
@@ -96,6 +98,11 @@ class syntax_plugin_codelink extends DokuWiki_Syntax_Plugin {
$this->keylanguage = $language;
} else {
$symbol = str_replace("()", "", $match);
+if (!in_array($symbol,
$this->keydata[$this->keylanguage]['keys'])) {
+$data[0] = $match;
+return $data;
+}
+
$data[0] = '
[EGIT] [website/www] master 02/02: codelink: safety for bad configurations
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=741c5098a728180e2d43f602eb6ff569f9efcc33
commit 741c5098a728180e2d43f602eb6ff569f9efcc33
Author: Andy Williams <a...@andywilliams.me>
Date: Mon Oct 30 16:35:42 2017 +
codelink: safety for bad configurations
---
public_html/lib/plugins/codelink/syntax.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/public_html/lib/plugins/codelink/syntax.php
b/public_html/lib/plugins/codelink/syntax.php
index 476f01e4..5f772d8e 100644
--- a/public_html/lib/plugins/codelink/syntax.php
+++ b/public_html/lib/plugins/codelink/syntax.php
@@ -62,6 +62,9 @@ class syntax_plugin_codelink extends DokuWiki_Syntax_Plugin {
public function connectTo($mode) {
global $conf;
$langs = opendir($conf['datadir'] . '/' . $conf['code_extn']);
+if ($langs === false)
+return;
+
while (false !== ($l = readdir($langs))) {
if ($l == "." || $l == "..") {
continue;
--
[EGIT] [website/www] master 01/02: Revert "Revert "WIKI CUSTOM - geshi - add custom code hilighter extensions""
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=419fa515f24e97926733a1628ee3ffc876c2ab7d
commit 419fa515f24e97926733a1628ee3ffc876c2ab7d
Author: Andy Williams <a...@andywilliams.me>
Date: Mon Oct 30 16:21:24 2017 +
Revert "Revert "WIKI CUSTOM - geshi - add custom code hilighter extensions""
This reverts commit a34d54426e40537d4fa5e3080f62286075d7c025.
---
public_html/inc/geshi.php | 21 +
public_html/inc/parserutils.php | 20 ++--
2 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/public_html/inc/geshi.php b/public_html/inc/geshi.php
index c6ff9ef7..e4b142b8 100644
--- a/public_html/inc/geshi.php
+++ b/public_html/inc/geshi.php
@@ -594,7 +594,8 @@ class GeSHi {
* {@link GeSHi->set_language_path()}
* @since 1.0.0
*/
-function GeSHi($source = '', $language = '', $path = '') {
+function GeSHi($source = '', $language = '', $path = '', $extndir = '') {
+$this->extndir = $extndir;
if (!empty($source)) {
$this->set_source($source);
}
@@ -689,6 +690,10 @@ class GeSHi {
// this language is already loaded!
return;
}
+if (!empty($this->extndir)) {
+$file_extn_link = $this->extndir . '/' . $language .
'/keyword-link.txt';
+$file_extn_list = $this->extndir . '/' . $language .
'/keyword-list.txt';
+}
$this->language = $language;
@@ -702,7 +707,7 @@ class GeSHi {
}
// Load the language for parsing
-$this->load_language($file_name);
+$this->load_language($file_name, $file_extn_link, $file_extn_list);
}
/**
@@ -3740,7 +3745,7 @@ class GeSHi {
* @access private
* @todo Needs to load keys for lexic permissions for keywords, regexps etc
*/
-function load_language($file_name) {
+function load_language($file_name, $file_extn_link, $file_extn_list) {
if ($file_name == $this->loaded_language) {
// this file is already loaded!
return;
@@ -3755,6 +3760,14 @@ class GeSHi {
//Load the language file
require $file_name;
+if (!empty($file_extn_link) && !empty($file_extn_list) &&
+file_exists($file_extn_link) && file_exists($file_extn_list)) {
+$link_array = file($file_extn_link, FILE_IGNORE_NEW_LINES |
FILE_SKIP_EMPTY_LINES);
+$keys_array = file($file_extn_list, FILE_IGNORE_NEW_LINES |
FILE_SKIP_EMPTY_LINES);
+$language_data['URLS'][5] = $link_array[0];
+$language_data['KEYWORDS'][5] = $keys_array;
+}
+
// Perhaps some checking might be added here later to check that
// $language data is a valid thing but maybe not
$this->language_data = $language_data;
@@ -4772,4 +4785,4 @@ if (!function_exists('geshi_highlight')) {
}
}
-?>
\ No newline at end of file
+?>
diff --git a/public_html/inc/parserutils.php b/public_html/inc/parserutils.php
index 17c331ef..d17580ed 100644
--- a/public_html/inc/parserutils.php
+++ b/public_html/inc/parserutils.php
@@ -743,17 +743,33 @@ function p_xhtml_cached_geshi($code, $language,
$wrapper='pre') {
// remove any leading or trailing blank lines
$code = preg_replace('/^\s*?\n|\s*?\n$/','',$code);
+$extn_dir = $conf['datadir'] . '/' . $conf['code_extn'];
+if (!file_exists($extn_dir)) {
+$extn_dir = '';
+}
+else {
+$extn_link = $extn_dir . '/' . $language . '/keyword-link.txt';
+$extn_list = $extn_dir . '/' . $language . '/keyword-list.txt';
+if (!file_exists($extn_link) || !file_exists($extn_list)) {
+$extn_link = '';
+$extn_list = '';
+}
+}
+
$cache = getCacheName($language.$code,".code");
$ctime = @filemtime($cache);
if($ctime && !$INPUT->bool('purge') &&
+((!empty($extn_link) &&
+ (($ctime > filemtime($extn_link)) &&
+ ($ctime > filemtime($extn_list ||
+ (empty($extn_link))) &&
$ctime > filemtime(DOKU_INC.'inc/geshi.php') && //
geshi changed
$ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') && //
language syntax definition changed
$ctime > filemtime(reset($config_cascade['main']['default']))){ //
dokuwiki changed
$highlighted_code = io_readFile($cache, false);
} else {
-
-$geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
+$geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi',
$conf['datadir'] . '/' . $conf['code_extn']);
$geshi->set_encoding('utf-8');
$geshi->enable_classes();
$geshi->set_header_type(GESHI_HEADER_PRE);
--
[EGIT] [website/www] master 01/02: Revert "Attempt upgrade to gitbacked plugin for ignorePath feature"
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=60a6cb96c6f4c9cff84002a60b68f61a8b63a7e6
commit 60a6cb96c6f4c9cff84002a60b68f61a8b63a7e6
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Oct 25 13:14:15 2017 +0100
Revert "Attempt upgrade to gitbacked plugin for ignorePath feature"
This reverts commit b763c1067892dc83260b7431b1d5d198a347c9ea.
---
.../lib/plugins/gitbacked/{README.md => README}| 7 +--
.../lib/plugins/gitbacked/action/editcommit.php| 43 -
public_html/lib/plugins/gitbacked/conf/default.php | 27 ++--
.../lib/plugins/gitbacked/conf/metadata.php| 3 +-
.../lib/plugins/gitbacked/lang/en/settings.php | 2 -
public_html/lib/plugins/gitbacked/lib/Git.php | 71 ++
public_html/lib/plugins/gitbacked/plugin.info.txt | 6 +-
7 files changed, 59 insertions(+), 100 deletions(-)
diff --git a/public_html/lib/plugins/gitbacked/README.md
b/public_html/lib/plugins/gitbacked/README
similarity index 89%
rename from public_html/lib/plugins/gitbacked/README.md
rename to public_html/lib/plugins/gitbacked/README
index 9b1e9b2b..6ef56bbe 100644
--- a/public_html/lib/plugins/gitbacked/README.md
+++ b/public_html/lib/plugins/gitbacked/README
@@ -1,4 +1,4 @@
-# gitbacked Plugin for DokuWiki
+gitbacked Plugin for DokuWiki
Store/Sync pages and media files in a git repository
@@ -6,14 +6,13 @@ All documentation for this plugin can be found at
http://www.dokuwiki.org/plugin:gitbacked
If you install this plugin manually, make sure it is installed in
-`lib/plugins/gitbacked/` - if the folder is called different it
+lib/plugins/gitbacked/ - if the folder is called different it
will not work!
Please refer to http://www.dokuwiki.org/plugins for additional info
on how to install plugins in DokuWiki.
-## License
-
+
Copyright (C) Wolfgang Gassler <wolfg...@gassler.org>
This program is free software; you can redistribute it and/or modify
diff --git a/public_html/lib/plugins/gitbacked/action/editcommit.php
b/public_html/lib/plugins/gitbacked/action/editcommit.php
index 311c6ef9..a888e95e 100644
--- a/public_html/lib/plugins/gitbacked/action/editcommit.php
+++ b/public_html/lib/plugins/gitbacked/action/editcommit.php
@@ -24,7 +24,7 @@ class action_plugin_gitbacked_editcommit extends
DokuWiki_Action_Plugin {
io_mkdir_p($this->temp_dir);
}
-public function register(Doku_Event_Handler $controller) {
+public function register(Doku_Event_Handler &$controller) {
$controller->register_hook('IO_WIKIPAGE_WRITE', 'AFTER', $this,
'handle_io_wikipage_write');
$controller->register_hook('MEDIA_UPLOAD_FINISH', 'AFTER', $this,
'handle_media_upload');
@@ -39,56 +39,35 @@ class action_plugin_gitbacked_editcommit extends
DokuWiki_Action_Plugin {
} else {
$repoPath = DOKU_INC.$this->getConf('repoPath');
}
-//set the path to the git binary
-$gitPath = trim($this->getConf('gitPath'));
-if ($gitPath !== '') {
-Git::set_bin($gitPath);
-}
//init the repo and create a new one if it is not present
io_mkdir_p($repoPath);
$repo = new GitRepo($repoPath, true, true);
//set git working directory (by default DokuWiki's savedir)
$repoWorkDir = DOKU_INC.$this->getConf('repoWorkDir');
-Git::set_bin(Git::get_bin().' --work-tree
'.escapeshellarg($repoWorkDir));
+$repo->git_path .= ' --work-tree '.escapeshellarg($repoWorkDir);
$params = str_replace(
array('%mail%','%user%'),
array($this->getAuthorMail(),$this->getAuthor()),
$this->getConf('addParams'));
if ($params) {
-Git::set_bin(Git::get_bin().' '.$params);
+$repo->git_path .= ' '.$params;
}
return $repo;
}
- private function isIgnored($filePath) {
- $ignore = false;
- $ignorePaths = trim($this->getConf('ignorePaths'));
- if ($ignorePaths !== '') {
- $paths = explode(',',$ignorePaths);
- foreach($paths as $path) {
- if (strstr($filePath,$path)) {
- $ignore = true;
- }
- }
- }
- return $ignore;
- }
-
private function commitFile($filePath,$message) {
- if (!$this->isIgnored($filePath)) {
- $repo = $this->initRepo();
+$repo = $this->initRepo();
- //add the changed file and set the commit message
- $repo->add($filePath);
- $repo->commit($message);
+//add the changed file and set th
[EGIT] [website/www] master 02/02: Add ignorePaths feature to gitbacked via patch until we can get upgrade working
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=459fdf601a363c102e3e63d3e38ebbf84b5a7d0d
commit 459fdf601a363c102e3e63d3e38ebbf84b5a7d0d
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Oct 25 13:19:19 2017 +0100
Add ignorePaths feature to gitbacked via patch until we can get upgrade
working
---
.../lib/plugins/gitbacked/action/editcommit.php| 32 --
public_html/lib/plugins/gitbacked/conf/default.php | 1 +
.../lib/plugins/gitbacked/conf/metadata.php| 1 +
.../lib/plugins/gitbacked/lang/en/settings.php | 1 +
4 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/public_html/lib/plugins/gitbacked/action/editcommit.php
b/public_html/lib/plugins/gitbacked/action/editcommit.php
index a888e95e..0094bf4e 100644
--- a/public_html/lib/plugins/gitbacked/action/editcommit.php
+++ b/public_html/lib/plugins/gitbacked/action/editcommit.php
@@ -56,18 +56,34 @@ class action_plugin_gitbacked_editcommit extends
DokuWiki_Action_Plugin {
return $repo;
}
+ private function isIgnored($filePath) {
+ $ignore = false;
+ $ignorePaths = trim($this->getConf('ignorePaths'));
+ if ($ignorePaths !== '') {
+ $paths = explode(',',$ignorePaths);
+ foreach($paths as $path) {
+ if (strstr($filePath,$path)) {
+ $ignore = true;
+ }
+ }
+ }
+ return $ignore;
+ }
+
private function commitFile($filePath,$message) {
-$repo = $this->initRepo();
+ if (!$this->isIgnored($filePath)) {
+ $repo = $this->initRepo();
-//add the changed file and set the commit message
-$repo->add($filePath);
-$repo->commit($message);
+ //add the changed file and set the commit message
+ $repo->add($filePath);
+ $repo->commit($message);
-//if the push after Commit option is set we push the active branch to
origin
-if ($this->getConf('pushAfterCommit')) {
-$repo->push('origin',$repo->active_branch());
-}
+ //if the push after Commit option is set we push the
active branch to origin
+ if ($this->getConf('pushAfterCommit')) {
+ $repo->push('origin',$repo->active_branch());
+ }
+ }
}
diff --git a/public_html/lib/plugins/gitbacked/conf/default.php
b/public_html/lib/plugins/gitbacked/conf/default.php
index 319a31e3..b40bc6c8 100644
--- a/public_html/lib/plugins/gitbacked/conf/default.php
+++ b/public_html/lib/plugins/gitbacked/conf/default.php
@@ -15,6 +15,7 @@ $conf['commitMediaMsgDel']= 'Wiki media %media% deleted
by %user%';
$conf['repoPath'] = $GLOBALS['conf']['savedir'];
$conf['repoWorkDir'] = $GLOBALS['conf']['savedir'];
$conf['addParams'] = '';
+$conf['ignorePaths'] = '';
/* plugin/gitbacked: Define a nice author (until addParams is fixed)
* MUST NOT be defined in conf/local.php as $GLOBALS['USERINFO'] does not yet
exist there
diff --git a/public_html/lib/plugins/gitbacked/conf/metadata.php
b/public_html/lib/plugins/gitbacked/conf/metadata.php
index d3bce744..05f53bf3 100644
--- a/public_html/lib/plugins/gitbacked/conf/metadata.php
+++ b/public_html/lib/plugins/gitbacked/conf/metadata.php
@@ -15,4 +15,5 @@ $meta['commitMediaMsgDel'] = array('string');
$meta['repoPath'] = array('string');
$meta['repoWorkDir'] = array('string');
$meta['addParams'] = array('string');
+$meta['ignorePaths'] = array('string');
diff --git a/public_html/lib/plugins/gitbacked/lang/en/settings.php
b/public_html/lib/plugins/gitbacked/lang/en/settings.php
index c5ff0080..b5b7ce00 100644
--- a/public_html/lib/plugins/gitbacked/lang/en/settings.php
+++ b/public_html/lib/plugins/gitbacked/lang/en/settings.php
@@ -16,3 +16,4 @@ $lang['commitMediaMsgDel']= 'Commit message for deleted
media files (%user%,%me
$lang['repoPath'] = 'Path of the git repo (e.g. the savedir
'.$GLOBALS['conf']['savedir'].')';
$lang['repoWorkDir'] = 'Path of the git working tree, must contain "pages"
and "media" directories (e.g. the savedir '.$GLOBALS['conf']['savedir'].')';
$lang['addParams'] = 'Additional git parameters (added to the git execution
command) (%user% and %mail% are replaced by the corresponding values)';
+$lang['ignorePaths'] = 'Paths/files which are ignored and not added to git
(comma-separated)';
\ No newline at end of file
--
[EGIT] [website/www-content] master 01/01: Ignore pages in the playground
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=c102a712de3a3b7e11ed09430b3a3ff0748b6e3c commit c102a712de3a3b7e11ed09430b3a3ff0748b6e3c Author: Andy Williams <a...@andywilliams.me> Date: Wed Oct 25 12:01:18 2017 +0100 Ignore pages in the playground --- .gitignore | 3 + pages/playground/playground.md.txt | 113 - 2 files changed, 3 insertions(+), 113 deletions(-) diff --git a/.gitignore b/.gitignore index 83a3390f..7c1ebdad 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ *swp *swo Session.vim + +pages/playground/ + diff --git a/pages/playground/playground.md.txt b/pages/playground/playground.md.txt deleted file mode 100644 index 2f2f7326.. --- a/pages/playground/playground.md.txt +++ /dev/null @@ -1,113 +0,0 @@ -~~Title: Playing~~ - -# title of the first subsection # - -Is this [a link](#title_2) ? - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -## title 2 ## - -Text of the second subsection. - -Want to [go up](#title_of_the_first_subsection) --
[EGIT] [website/www] master 01/01: Attempt upgrade to gitbacked plugin for ignorePath feature
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=b763c1067892dc83260b7431b1d5d198a347c9ea
commit b763c1067892dc83260b7431b1d5d198a347c9ea
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Oct 25 13:05:20 2017 +0100
Attempt upgrade to gitbacked plugin for ignorePath feature
---
.../lib/plugins/gitbacked/{README => README.md}| 7 ++-
.../lib/plugins/gitbacked/action/editcommit.php| 43 +
public_html/lib/plugins/gitbacked/conf/default.php | 27 ++--
.../lib/plugins/gitbacked/conf/metadata.php| 3 +-
.../lib/plugins/gitbacked/lang/en/settings.php | 2 +
public_html/lib/plugins/gitbacked/lib/Git.php | 71 --
public_html/lib/plugins/gitbacked/plugin.info.txt | 6 +-
7 files changed, 100 insertions(+), 59 deletions(-)
diff --git a/public_html/lib/plugins/gitbacked/README
b/public_html/lib/plugins/gitbacked/README.md
similarity index 89%
rename from public_html/lib/plugins/gitbacked/README
rename to public_html/lib/plugins/gitbacked/README.md
index 6ef56bbe..9b1e9b2b 100644
--- a/public_html/lib/plugins/gitbacked/README
+++ b/public_html/lib/plugins/gitbacked/README.md
@@ -1,4 +1,4 @@
-gitbacked Plugin for DokuWiki
+# gitbacked Plugin for DokuWiki
Store/Sync pages and media files in a git repository
@@ -6,13 +6,14 @@ All documentation for this plugin can be found at
http://www.dokuwiki.org/plugin:gitbacked
If you install this plugin manually, make sure it is installed in
-lib/plugins/gitbacked/ - if the folder is called different it
+`lib/plugins/gitbacked/` - if the folder is called different it
will not work!
Please refer to http://www.dokuwiki.org/plugins for additional info
on how to install plugins in DokuWiki.
-
+## License
+
Copyright (C) Wolfgang Gassler <wolfg...@gassler.org>
This program is free software; you can redistribute it and/or modify
diff --git a/public_html/lib/plugins/gitbacked/action/editcommit.php
b/public_html/lib/plugins/gitbacked/action/editcommit.php
index a888e95e..311c6ef9 100644
--- a/public_html/lib/plugins/gitbacked/action/editcommit.php
+++ b/public_html/lib/plugins/gitbacked/action/editcommit.php
@@ -24,7 +24,7 @@ class action_plugin_gitbacked_editcommit extends
DokuWiki_Action_Plugin {
io_mkdir_p($this->temp_dir);
}
-public function register(Doku_Event_Handler &$controller) {
+public function register(Doku_Event_Handler $controller) {
$controller->register_hook('IO_WIKIPAGE_WRITE', 'AFTER', $this,
'handle_io_wikipage_write');
$controller->register_hook('MEDIA_UPLOAD_FINISH', 'AFTER', $this,
'handle_media_upload');
@@ -39,35 +39,56 @@ class action_plugin_gitbacked_editcommit extends
DokuWiki_Action_Plugin {
} else {
$repoPath = DOKU_INC.$this->getConf('repoPath');
}
+//set the path to the git binary
+$gitPath = trim($this->getConf('gitPath'));
+if ($gitPath !== '') {
+Git::set_bin($gitPath);
+}
//init the repo and create a new one if it is not present
io_mkdir_p($repoPath);
$repo = new GitRepo($repoPath, true, true);
//set git working directory (by default DokuWiki's savedir)
$repoWorkDir = DOKU_INC.$this->getConf('repoWorkDir');
-$repo->git_path .= ' --work-tree '.escapeshellarg($repoWorkDir);
+Git::set_bin(Git::get_bin().' --work-tree
'.escapeshellarg($repoWorkDir));
$params = str_replace(
array('%mail%','%user%'),
array($this->getAuthorMail(),$this->getAuthor()),
$this->getConf('addParams'));
if ($params) {
-$repo->git_path .= ' '.$params;
+Git::set_bin(Git::get_bin().' '.$params);
}
return $repo;
}
+ private function isIgnored($filePath) {
+ $ignore = false;
+ $ignorePaths = trim($this->getConf('ignorePaths'));
+ if ($ignorePaths !== '') {
+ $paths = explode(',',$ignorePaths);
+ foreach($paths as $path) {
+ if (strstr($filePath,$path)) {
+ $ignore = true;
+ }
+ }
+ }
+ return $ignore;
+ }
+
private function commitFile($filePath,$message) {
-$repo = $this->initRepo();
+ if (!$this->isIgnored($filePath)) {
+ $repo = $this->initRepo();
-//add the changed file and set the commit message
-$repo->add($filePath);
-$repo->commit($message);
+ //add the changed file and set the commit message
+ $repo->add($filePath);
+ $repo->commit($message);
-//if the push after Commit op
[EGIT] [website/www] master 01/01: redirect from old page specific API entry URL
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=1f987d423bddab09be3c935a76a421bfe02d34cd commit 1f987d423bddab09be3c935a76a421bfe02d34cd Author: Andy Williams <a...@andywilliams.me> Date: Wed Oct 25 18:22:03 2017 +0100 redirect from old page specific API entry URL --- public_html/.htaccess | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public_html/.htaccess b/public_html/.htaccess index 95815e51..70943a75 100644 --- a/public_html/.htaccess +++ b/public_html/.htaccess @@ -42,6 +42,8 @@ RewriteRule ^distros/archlinux-start /docs/distros/archlinux-start [R,L] RewriteRule ^distros/debian-start /docs/distros/debian-start [R,L] RewriteRule ^distros/fedora-start /docs/distros/fedora-start [R,L] +RewriteRule ^docs/efl/auto/reference /develop/api/ [R,L] + RewriteRule ^docs/efl/auto/(.*)$ /develop/api/$1 [R,L] RewriteRule ^api/javascript/(.*)$ /develop/legacy/api/javascript/$1 [R,L] --
[EGIT] [website/www] master 01/01: final api docs location
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=6fe3f7a7fd942c44d4301edef3b9fd98ea978f65 commit 6fe3f7a7fd942c44d4301edef3b9fd98ea978f65 Author: Andy Williams <a...@andywilliams.me> Date: Wed Oct 25 18:06:00 2017 +0100 final api docs location --- public_html/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/.htaccess b/public_html/.htaccess index 961e1325..95815e51 100644 --- a/public_html/.htaccess +++ b/public_html/.htaccess @@ -42,7 +42,7 @@ RewriteRule ^distros/archlinux-start /docs/distros/archlinux-start [R,L] RewriteRule ^distros/debian-start /docs/distros/debian-start [R,L] RewriteRule ^distros/fedora-start /docs/distros/fedora-start [R,L] -RewriteRule ^docs/efl/auto/(.*)$ /develop/efl/auto/$1[R,L] +RewriteRule ^docs/efl/auto/(.*)$ /develop/api/$1 [R,L] RewriteRule ^api/javascript/(.*)$ /develop/legacy/api/javascript/$1 [R,L] RewriteRule ^api/javascript/develop/legacy/api/javascript/start [R,L] --
[EGIT] [core/efl] master 01/01: Generate docs into /develop/api/*
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a7bb770e699ca1dadb958832b2d2131a9c63216f
commit a7bb770e699ca1dadb958832b2d2131a9c63216f
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Oct 25 18:17:17 2017 +0100
Generate docs into /develop/api/*
Also move root doc to start.txt for a better entry point
---
src/scripts/elua/apps/docgen/keyref.lua | 2 +-
src/scripts/elua/apps/docgen/util.lua | 6 +++---
src/scripts/elua/apps/docgen/writer.lua | 4 ++--
src/scripts/elua/apps/gendoc.lua| 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/scripts/elua/apps/docgen/keyref.lua
b/src/scripts/elua/apps/docgen/keyref.lua
index a28e6125b4..56311d9742 100644
--- a/src/scripts/elua/apps/docgen/keyref.lua
+++ b/src/scripts/elua/apps/docgen/keyref.lua
@@ -30,7 +30,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()), "auto",
+dutil.nspace_to_path(dutil.get_root_ns()),
"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 48e375da95..65968ac3e7 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, ext)
-return M.path_join(doc_root, "auto", path .. "." .. ext)
+return M.path_join(doc_root, path .. "." .. ext)
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(M.path_join(doc_root, "auto", dirn)))
+assert(cutil.file_mkpath(M.path_join(doc_root, dirn)))
end
M.mkdir_p = function(path)
@@ -39,7 +39,7 @@ M.mkdir_p = function(path)
end
M.rm_root = function()
-cutil.file_rmrf(M.path_join(doc_root, "auto"))
+cutil.file_rmrf(doc_root)
end
M.init = function(root, rns)
diff --git a/src/scripts/elua/apps/docgen/writer.lua
b/src/scripts/elua/apps/docgen/writer.lua
index 67b6765596..4690ed7c91 100644
--- a/src/scripts/elua/apps/docgen/writer.lua
+++ b/src/scripts/elua/apps/docgen/writer.lua
@@ -73,7 +73,7 @@ local write_include = function(self, tp, name, flags)
if type(name) == "table" then
if name[#name] == true then
name[#name] = nil
-name = ":" .. root_nspace .. ":auto:"
+name = ":" .. root_nspace .. ":"
.. table.concat(name, ":")
elseif name[#name] == false then
name[#name] = nil
@@ -272,7 +272,7 @@ writers["dokuwiki"] = util.Object:clone {
if type(target) == "table" then
if target[#target] == true then
target[#target] = nil
-target = ":" .. root_nspace .. ":auto:"
+target = ":" .. root_nspace .. ":"
.. table.concat(target, ":")
elseif target[#target] == false then
target[#target] = nil
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index 63ad69bf36..97c9715a40 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -327,7 +327,7 @@ local build_reftable = function(f, title, ctitle, ctype, t,
iscl)
end
local build_ref = function()
-local f = writer.Writer("reference", "EFL Reference")
+local f = writer.Writer("start", "EFL Reference")
printgen("Generating reference...")
f:write_editable({ "reference" }, "general")
@@ -1601,7 +1601,7 @@ getopt.parse {
set_theme(opts["graph-theme"])
end
local rootns = (not opts["n"] or opts["n"] == "")
-and "develop:efl" or opts["n"]
+and "develop:api" or opts["n"]
local dr
if not opts["r"] or opts["r"] == "" then
dr = "dokuwiki/data/pages"
--
[EGIT] [website/www-content] master 01/01: Move efl build snippets to /incl and fix links
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=1c2551455c43320e816d15574fc1c9fbdc4b5ab4
commit 1c2551455c43320e816d15574fc1c9fbdc4b5ab4
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Oct 25 21:04:22 2017 +0100
Move efl build snippets to /incl and fix links
---
pages/docs/distros/debian-start.txt| 2 +-
pages/docs/distros/start.txt | 10 +-
pages/download.txt | 6 +++---
pages/{docs-efl-buildenv.txt => incl/efl-buildenv.txt} | 0
pages/{docs-efl-buildorder.txt => incl/efl-buildorder.txt} | 0
pages/{docs-efl-deps-git.txt => incl/efl-deps-git.txt} | 0
pages/{docs-efl-deps-src.txt => incl/efl-deps-src.txt} | 0
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pages/docs/distros/debian-start.txt
b/pages/docs/distros/debian-start.txt
index f3dc3e68..a602d430 100644
--- a/pages/docs/distros/debian-start.txt
+++ b/pages/docs/distros/debian-start.txt
@@ -9,7 +9,7 @@ To start Enlightenment, see the run-time requirements below.
Install from the sources
-In this part, the installation for Debian is done from sources like in the
[[/docs-efl-start|Get EFL installed]] tutorial.
+In this part, the installation for Debian is done from sources like in the
[[/docs/distros/|Get EFL installed]] tutorial.
The following part provides a script and shows how to install Enlightenment
and Terminology with their dependencies on Debian. The script below can be
easily adapted for Elementary.
diff --git a/pages/docs/distros/start.txt b/pages/docs/distros/start.txt
index 1bac30b5..8768ed36 100644
--- a/pages/docs/distros/start.txt
+++ b/pages/docs/distros/start.txt
@@ -11,7 +11,7 @@ Our source code is developed collaboratively in a pretty
typical open source man
Before you start you will want basic build tools installed such as:
-{{page>docs-efl-deps-git}}
+{{page>incl:efl-deps-git}}
Get The Source
@@ -31,17 +31,17 @@ git clone https://git.enlightenment.org/apps/rage.git
Dependencies
-{{page>docs-efl-deps-src}}
+{{page>incl:efl-deps-src}}
Build Environment
-{{page>docs-efl-buildenv}}
+{{page>incl:efl-buildenv}}
Build Order
For libraries (build these before applications), build them in order:
-{{page>docs-efl-buildorder}}
+{{page>incl:efl-buildorder}}
Compilation
@@ -82,4 +82,4 @@ instead of
git clone https://
-~~DISCUSSIONS~~
\ No newline at end of file
+~~DISCUSSIONS~~
diff --git a/pages/download.txt b/pages/download.txt
index 059ffa00..ee922501 100644
--- a/pages/download.txt
+++ b/pages/download.txt
@@ -18,15 +18,15 @@ We provide original source code "tarballs" as the canonical
release of what we m
When compiling from source, build in this order:
-{{page>docs-efl-buildorder}}
+{{page>incl:efl-buildorder}}
Dependencies
-{{page>docs-efl-deps-src}}
+{{page>incl:efl-deps-src}}
Build Environment
-{{page>docs-efl-buildenv}}
+{{page>incl:efl-buildenv}}
Compilation
diff --git a/pages/docs-efl-buildenv.txt b/pages/incl/efl-buildenv.txt
similarity index 100%
rename from pages/docs-efl-buildenv.txt
rename to pages/incl/efl-buildenv.txt
diff --git a/pages/docs-efl-buildorder.txt b/pages/incl/efl-buildorder.txt
similarity index 100%
rename from pages/docs-efl-buildorder.txt
rename to pages/incl/efl-buildorder.txt
diff --git a/pages/docs-efl-deps-git.txt b/pages/incl/efl-deps-git.txt
similarity index 100%
rename from pages/docs-efl-deps-git.txt
rename to pages/incl/efl-deps-git.txt
diff --git a/pages/docs-efl-deps-src.txt b/pages/incl/efl-deps-src.txt
similarity index 100%
rename from pages/docs-efl-deps-src.txt
rename to pages/incl/efl-deps-src.txt
--
[EGIT] [website/www] master 01/01: oops, margin on wrong side
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=f9b3903f37d67034f868f2d4fcfb04f9bf1f731f commit f9b3903f37d67034f868f2d4fcfb04f9bf1f731f Author: Andy Williams <a...@andywilliams.me> Date: Tue Oct 24 13:59:52 2017 +0100 oops, margin on wrong side --- public_html/lib/tpl/e/css/modifications.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 072ad17e..632e406a 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -96,7 +96,7 @@ h1, h2, h3, h4, h5, h6, background-color: #282828; padding-left: 10px; padding-right: 10px; - margin-right: 15px; + margin-left: 15px; min-width: 250px; } --
[EGIT] [website/www] master 01/01: don't lose sidebars on mobile
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=4d7ca42918c85347d0d4f1ad806b1a7dcd62b3ad
commit 4d7ca42918c85347d0d4f1ad806b1a7dcd62b3ad
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Oct 24 16:48:24 2017 +0100
don't lose sidebars on mobile
---
public_html/lib/tpl/e/css/modifications.css | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/public_html/lib/tpl/e/css/modifications.css
b/public_html/lib/tpl/e/css/modifications.css
index 632e406a..7804ac08 100644
--- a/public_html/lib/tpl/e/css/modifications.css
+++ b/public_html/lib/tpl/e/css/modifications.css
@@ -84,9 +84,17 @@ h1, h2, h3, h4, h5, h6,
display: block;
}
-@media screen and (max-width: 993px) {
+@media (min-width: 768px) and (max-width: 993px) {
.bs-sidebar {
- display: none;
+ margin-top: 50px;
+ }
+}
+
+@media screen and (max-width: 768px) {
+ .bs-sidebar {
+ width: 100%;
+ margin: 15px 0;
+ padding: 0;
}
}
--
[EGIT] [website/www-content] master 01/01: Fix links broken by last refactor
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=dcf7634cfa92a3d597c27afe2cddb71e25f38973
commit dcf7634cfa92a3d597c27afe2cddb71e25f38973
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Oct 24 17:41:30 2017 +0100
Fix links broken by last refactor
---
pages/develop/efl/advanced/eflgfxfilter/blend.txt | 4 +-
pages/develop/efl/advanced/eflgfxfilter/blur.txt | 4 +-
pages/develop/efl/advanced/eflgfxfilter/buffer.txt | 6 +--
pages/develop/efl/advanced/eflgfxfilter/bump.txt | 2 +-
pages/develop/efl/advanced/eflgfxfilter/colors.txt | 4 +-
pages/develop/efl/advanced/eflgfxfilter/curve.txt | 2 +-
.../develop/efl/advanced/eflgfxfilter/displace.txt | 4 +-
pages/develop/efl/advanced/eflgfxfilter/fill.txt | 4 +-
.../efl/advanced/eflgfxfilter/fillmodes.txt| 6 +--
pages/develop/efl/advanced/eflgfxfilter/grow.txt | 4 +-
pages/develop/efl/advanced/eflgfxfilter/mask.txt | 4 +-
.../develop/efl/advanced/eflgfxfilter/padding.txt | 4 +-
pages/develop/efl/advanced/eflgfxfilter/state.txt | 4 +-
.../efl/advanced/eflgfxfilter/transform.txt| 4 +-
pages/develop/efl/advanced/eflgfxfilters.txt | 50 +++---
pages/program_guide/widgets/basics.txt | 2 +-
pages/tutorial/basic/button.txt| 2 +-
pages/tutorial/basic_tutorial.txt | 2 +-
pages/tutorial/javascript_tutorial.txt | 4 +-
pages/wiki/syntax.txt | 4 +-
20 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/pages/develop/efl/advanced/eflgfxfilter/blend.txt
b/pages/develop/efl/advanced/eflgfxfilter/blend.txt
index bceb379c..3eb07121 100644
--- a/pages/develop/efl/advanced/eflgfxfilter/blend.txt
+++ b/pages/develop/efl/advanced/eflgfxfilter/blend.txt
@@ -1,4 +1,4 @@
-Go back to [[:docs:efl:advanced:eflgfxfilters|Efl.Gfx.Filter]].
+Go back to [[:develop:efl:advanced:eflgfxfilters|Efl.Gfx.Filter]].
Blend
@@ -21,4 +21,4 @@ blend ({ src = input, dst = output, ox = 0, oy = 0, color =
'white', fillmode =
blend ({ color = '#fff8' })
-{{:docs:efl:advanced:filter-blend.png|}}
\ No newline at end of file
+{{:docs:efl:advanced:filter-blend.png|}}
diff --git a/pages/develop/efl/advanced/eflgfxfilter/blur.txt
b/pages/develop/efl/advanced/eflgfxfilter/blur.txt
index f9503bbe..41653f9a 100644
--- a/pages/develop/efl/advanced/eflgfxfilter/blur.txt
+++ b/pages/develop/efl/advanced/eflgfxfilter/blur.txt
@@ -1,4 +1,4 @@
-Go back to [[:docs:efl:advanced:eflgfxfilters|Efl.Gfx.Filter]].
+Go back to [[:develop:efl:advanced:eflgfxfilters|Efl.Gfx.Filter]].
Blur
@@ -43,4 +43,4 @@ blur { 15 }
blur { 10, ox = 5, oy = 5, color = 'black' }
blend {}
-{{:docs:efl:advanced:filter-dropshadow.png|}}
\ No newline at end of file
+{{:docs:efl:advanced:filter-dropshadow.png|}}
diff --git a/pages/develop/efl/advanced/eflgfxfilter/buffer.txt
b/pages/develop/efl/advanced/eflgfxfilter/buffer.txt
index 1bad6d4d..75ec4024 100644
--- a/pages/develop/efl/advanced/eflgfxfilter/buffer.txt
+++ b/pages/develop/efl/advanced/eflgfxfilter/buffer.txt
@@ -1,4 +1,4 @@
-Go back to [[:docs:efl:advanced:eflgfxfilters|Efl.Gfx.Filter]].
+Go back to [[:develop:efl:advanced:eflgfxfilters|Efl.Gfx.Filter]].
Buffer
@@ -8,7 +8,7 @@ All buffers have the same size unless they come from an
external source, in whic
Buffers are either Alpha surfaces (8 bit, values in the range 0-255) or full
RGBA bitmaps (32 bits).
-Various buffers can be combined together with commands such as
[[:docs:efl:advanced:eflgfxfilter:blend|blend]],
[[:docs:efl:advanced:eflgfxfilter:blur|blur]],
[[:docs:efl:advanced:eflgfxfilter:mask|mask]], etc...
+Various buffers can be combined together with commands such as
[[:develop:efl:advanced:eflgfxfilter:blend|blend]],
[[:develop:efl:advanced:eflgfxfilter:blur|blur]],
[[:develop:efl:advanced:eflgfxfilter:mask|mask]], etc...
== Syntax ==
@@ -47,4 +47,4 @@ name5 = buffer({ src = "partname" })
Some commands might require the creation of internal buffers, which the script
can not use directly, and that serve only as intermediate image processing
surfaces.
-This means that the memory usage of a filter operation might be larger than
just that of the ''input'' and ''output'' buffers.
\ No newline at end of file
+This means that the memory usage of a filter operation might be larger than
just that of the ''input'' and ''output'' buffers.
diff --git a/pages/develop/efl/advanced/eflgfxfilter/bump.txt
b/pages/develop/efl/advanced/eflgfxfilter/bump.txt
index 8c749373..b9da266a 100644
--- a/pages/develop/efl/advanced/eflgfxfilter/bump.txt
+++ b/pages/develop/efl/advanced/eflgfxfilter/bump.txt
@@ -1,4 +1,4 @@
-Go back to [[:docs:efl:advanced:eflgfxfilters|Efl.Gfx.Filter]].
+Go back to [[:develop:efl:advanced:eflgfxfilters|Efl.Gfx.Filter]].
Bump mapping
diff --git a/pages/deve
[EGIT] [website/www] master 01/02: Update to latest markdown plugin
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=cb5e7a34145f3e78765638e8d20e55c9e7d517bd
commit cb5e7a34145f3e78765638e8d20e55c9e7d517bd
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Oct 25 11:34:20 2017 +0100
Update to latest markdown plugin
---
public_html/lib/plugins/markdownextra/action.php | 10 +-
.../lib/meltdown-tweaks/meltdown-tweaks.css| 12 +-
.../lib/meltdown-tweaks/meltdown-tweaks.js | 14 +-
.../plugins/markdownextra/lib/meltdown/README.md | 131 +-
.../markdownextra/lib/meltdown/css/meltdown.css| 340 +++--
.../lib/meltdown/fonts/meltdown.dev.svg|0
.../markdownextra/lib/meltdown/fonts/meltdown.eot | Bin
.../markdownextra/lib/meltdown/fonts/meltdown.svg |0
.../markdownextra/lib/meltdown/fonts/meltdown.ttf | Bin
.../markdownextra/lib/meltdown/fonts/meltdown.woff | Bin
.../lib/meltdown/js/jquery.meltdown.js | 1371 ++--
.../meltdown/js/lib/element_resize_detection.js| 81 ++
.../lib/meltdown/js/lib/js-markdown-extra.js |0
13 files changed, 1451 insertions(+), 508 deletions(-)
diff --git a/public_html/lib/plugins/markdownextra/action.php
b/public_html/lib/plugins/markdownextra/action.php
index 28a8d20c..3e84a548 100644
--- a/public_html/lib/plugins/markdownextra/action.php
+++ b/public_html/lib/plugins/markdownextra/action.php
@@ -63,11 +63,11 @@ class action_plugin_markdownextra extends
DokuWiki_Action_Plugin {
$event->data['script'][] = array(
'type'=> 'text/javascript',
'_data' => '',
-'src' => $meltdownBase.'js/jquery.meltdown.js');
+'src' => $meltdownBase.'js/lib/js-markdown-extra.js');
$event->data['script'][] = array(
'type'=> 'text/javascript',
'_data' => '',
-'src' => $meltdownBase.'js/lib/js-markdown-extra.js');
+'src' =>
$meltdownBase.'js/lib/element_resize_detection.js');
$event->data['script'][] = array(
'type'=> 'text/javascript',
'_data' => '',
@@ -75,7 +75,11 @@ class action_plugin_markdownextra extends
DokuWiki_Action_Plugin {
$event->data['script'][] = array(
'type'=> 'text/javascript',
'_data' => '',
+'src' => $meltdownBase.'js/jquery.meltdown.js');
+ $event->data['script'][] = array(
+'type'=> 'text/javascript',
+'_data' => '',
'src' => $meltdownTweaksBase.'meltdown-tweaks.js');
}
}
-}
\ No newline at end of file
+}
diff --git
a/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.css
b/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.css
index 95989956..795c7cb2 100644
---
a/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.css
+++
b/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.css
@@ -21,4 +21,14 @@
/* For CSS3 browsers: allow user to resize the preview: */
.meltdown_preview { resize: vertical; }
/* Cosmetic fixes due to editor and preview being reversed: */
-.meltdown_wrap textarea { margin-bottom: 5px !important; }
+.meltdown_wrap {
+ width: 100% !important;
+}
+
+.meltdown_wrap textarea {
+ padding: 0;
+}
+
+.meltdown_bar, .meltdown_bar .meltdown_control span {
+ box-sizing: content-box;
+}
diff --git
a/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.js
b/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.js
index aba910fc..f81ecc85 100644
---
a/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.js
+++
b/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.js
@@ -1,18 +1,12 @@
jQuery(document).ready(function($) {
- // Disabling default DukuWiki toolbar (but allow users to renable it if
needed):
-
$("#tool__bar").addClass("markdownextra_disabledtools").append($("<div\>", {
- id: "markdownextra_tool__bar_overlay",
- "class": "markdownextra_disabledtools_overlay",
- text: "[ Activate DukuWiki toolbar ]",
- click: function() {
- $(this).fadeOut(200);
- }}));
+ // Disabling default DukuWiki toolbar
+ $("#tool__bar").hide();
// Activate Meltdown on the textarea:
$("#wiki__text").meltdown();
-
+
// Put preview after the editor:
$(".meltdown_wrap").append($(".meltdown_preview-wrap"));
// Open the pr
[EGIT] [core/efl] master 01/01: Docs location moved
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=549f16700242841a9f212e3a209b579920c3240c
commit 549f16700242841a9f212e3a209b579920c3240c
Author: Andy Williams <a...@andywilliams.me>
Date: Sat Oct 21 16:38:57 2017 +0100
Docs location moved
---
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 a715a8d591..63ad69bf36 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -1601,7 +1601,7 @@ getopt.parse {
set_theme(opts["graph-theme"])
end
local rootns = (not opts["n"] or opts["n"] == "")
-and "docs:efl" or opts["n"]
+and "develop:efl" or opts["n"]
local dr
if not opts["r"] or opts["r"] == "" then
dr = "dokuwiki/data/pages"
--
[EGIT] [website/www-content] master 01/01: Move EFL reference lookups
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=200bce61940ab4087aa6efdeca6cfdf79bc56b44
commit 200bce61940ab4087aa6efdeca6cfdf79bc56b44
Author: Andy Williams <a...@andywilliams.me>
Date: Sat Oct 21 16:41:05 2017 +0100
Move EFL reference lookups
---
pages/{docs => develop}/efl/ref/c/key/evas_object_del.txt | 0
pages/{docs => develop}/efl/ref/c/key/evas_object_ref.txt | 0
pages/{docs => develop}/efl/ref/c/keyword-link.txt| 0
pages/{docs => develop}/efl/ref/c/keyword-list.txt| 0
4 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/pages/docs/efl/ref/c/key/evas_object_del.txt
b/pages/develop/efl/ref/c/key/evas_object_del.txt
similarity index 100%
rename from pages/docs/efl/ref/c/key/evas_object_del.txt
rename to pages/develop/efl/ref/c/key/evas_object_del.txt
diff --git a/pages/docs/efl/ref/c/key/evas_object_ref.txt
b/pages/develop/efl/ref/c/key/evas_object_ref.txt
similarity index 100%
rename from pages/docs/efl/ref/c/key/evas_object_ref.txt
rename to pages/develop/efl/ref/c/key/evas_object_ref.txt
diff --git a/pages/docs/efl/ref/c/keyword-link.txt
b/pages/develop/efl/ref/c/keyword-link.txt
similarity index 100%
rename from pages/docs/efl/ref/c/keyword-link.txt
rename to pages/develop/efl/ref/c/keyword-link.txt
diff --git a/pages/docs/efl/ref/c/keyword-list.txt
b/pages/develop/efl/ref/c/keyword-list.txt
similarity index 100%
rename from pages/docs/efl/ref/c/keyword-list.txt
rename to pages/develop/efl/ref/c/keyword-list.txt
--
[EGIT] [tools/edi] master 01/01: Remove old autotools build files - meson only now
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=1d2cf4af88c8bc3a4e9a3eca4b9914f6709650c5 commit 1d2cf4af88c8bc3a4e9a3eca4b9914f6709650c5 Author: Andy Williams <a...@andywilliams.me> Date: Sat Oct 21 22:37:31 2017 +0100 Remove old autotools build files - meson only now --- INSTALL | 376 --- Makefile.am | 108 --- Makefile_Edje_Helper.am | 9 - Makefile_Eolian_Helper.am| 24 --- README | 36 README.md| 19 +- autogen.sh | 15 -- configure.ac | 219 --- data/Makefile.am | 4 - data/desktop/Makefile.am | 9 - data/extra/Makefile.am | 4 - data/extra/templates/Makefile.am | 28 --- data/images/Makefile.am | 8 - data/themes/Makefile.am | 4 - data/themes/default/Makefile.am | 22 --- doc/Makefile.am | 38 m4/efl.m4| 123 - m4/efl_binary.m4 | 79 m4/efl_compiler_flag.m4 | 57 -- m4/efl_doxygen.m4| 98 -- m4/efl_path_max.m4 | 36 m4/efl_tests.m4 | 65 --- packaging/Makefile.am| 4 - packaging/pkgbuild/Makefile.am | 3 - src/Makefile.am | 4 - src/bin/Makefile.am | 81 - src/lib/Makefile.am | 41 - src/tests/Makefile.am| 35 28 files changed, 46 insertions(+), 1503 deletions(-) diff --git a/INSTALL b/INSTALL index 007e939..3cbfe67 100644 --- a/INSTALL +++ b/INSTALL @@ -1,370 +1,60 @@ -Installation Instructions -* +** COMPILING and INSTALLING ** +-- -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. +Meson is the build system used for this project. For more information please +see: - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. +http://mesonbuild.com -Basic Installation -== + - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. +Normal compilation in /usr/local: - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +meson . build +ninja -C build +sudo ninja -C build install - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. +For meson build generic options: - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. +meson --help - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. +For a list of project specific options supported: - The simplest way to compile this package is: +cat meson_options.txt - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. +To set 1 or more project specific options: - Running `configure' might take a while. While running, it prints - some messages telling which features it is ch
[EGIT] [website/www] master 01/01: redirect external links into legacy
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=19f3abdc0f446882fdd8f63fe4376a68c18f46aa
commit 19f3abdc0f446882fdd8f63fe4376a68c18f46aa
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Oct 31 14:10:33 2017 +
redirect external links into legacy
---
public_html/.htaccess | 4
1 file changed, 4 insertions(+)
diff --git a/public_html/.htaccess b/public_html/.htaccess
index 70943a75..6574e2a6 100644
--- a/public_html/.htaccess
+++ b/public_html/.htaccess
@@ -49,6 +49,10 @@ RewriteRule ^docs/efl/auto/(.*)$ /develop/api/$1
[R,L]
RewriteRule ^api/javascript/(.*)$ /develop/legacy/api/javascript/$1
[R,L]
RewriteRule ^api/javascript/develop/legacy/api/javascript/start
[R,L]
+RewriteRule ^samples/elm_min_size_control
/develop/legacy/samples/elm_min_size_control[R,L]
+RewriteRule ^tutorials/(.*)$ /develop/legacy/tutorials/$1
[R,L]
+RewriteRule ^program_guide/(.*)$ /develop/legacy/program_guide/$1
[R,L]
+
#end refactoring rules
RewriteCond %{HTTP_HOST} =enlightenment.org [NC]
--
[EGIT] [website/www-content] master 01/02: Move samples (1) to develop/legacy
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=742ad8edb43e938f73fedc968e534a4de4fa35b9
commit 742ad8edb43e938f73fedc968e534a4de4fa35b9
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Oct 31 12:30:33 2017 +
Move samples (1) to develop/legacy
---
pages/{ => develop/legacy}/samples/elm_min_size_control.txt | 0
pages/docs.txt | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/samples/elm_min_size_control.txt
b/pages/develop/legacy/samples/elm_min_size_control.txt
similarity index 100%
rename from pages/samples/elm_min_size_control.txt
rename to pages/develop/legacy/samples/elm_min_size_control.txt
diff --git a/pages/docs.txt b/pages/docs.txt
index c8a32109..bfbcc9bc 100755
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -142,7 +142,7 @@ Be sure to [[contact]] to show what youve built!
=== Samples ===
- * [[samples/elm_min_size_control|Controlling Minimum Size of Widgets]]
+ * [[develop/legacy/samples/elm_min_size_control|Controlling Minimum Size of
Widgets]]
--
[EGIT] [website/www-content] master 02/02: Fix another heading
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=3d60e607c72e15ed8f233f2c24c212d8aea6e585
commit 3d60e607c72e15ed8f233f2c24c212d8aea6e585
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Oct 31 12:34:57 2017 +
Fix another heading
---
pages/tutorial/naviframe_tutorial.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/tutorial/naviframe_tutorial.txt
b/pages/tutorial/naviframe_tutorial.txt
index e3cbc68e..194e9125 100644
--- a/pages/tutorial/naviframe_tutorial.txt
+++ b/pages/tutorial/naviframe_tutorial.txt
@@ -6,7 +6,7 @@ screens having a previous/next relationship.
{{ :naviframe.png?direct1100x439 |list}}
-//**__The whole code__ : **//{{/code_c/tutorial/naviframe/naviframe.c}}
+**__//The whole code://__** {{/code_c/tutorial/naviframe/naviframe.c}}
=== Creating Naviframes ===
--
[EGIT] [website/www-content] master 01/01: Move program_guide to develop/legacy
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=d2aa0b52b0869a88cff98bc94671e5c044a79a65
commit d2aa0b52b0869a88cff98bc94671e5c044a79a65
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Oct 31 12:53:54 2017 +
Move program_guide to develop/legacy
---
pages/about-enventor.txt | 4 +--
.../basic_application_structure_pg.txt | 0
.../basic_usage_of_ecore_con_client.txt| 0
.../basic_usage_of_ecore_con_server.txt| 0
.../connectivity/basic_usage_of_ecore_con_url.txt | 0
.../connectivity/ecore_con_ssl_usage.txt | 0
.../legacy}/program_guide/connectivity/index.txt | 0
.../program_guide/connectivity/init_ecore_con.txt | 0
.../legacy}/program_guide/connectivity_pg.txt | 0
.../legacy}/program_guide/containers/box.txt | 0
.../program_guide/containers/conformant.txt| 0
.../legacy}/program_guide/containers/gengrid.txt | 0
.../legacy}/program_guide/containers/genlist.txt | 0
.../legacy}/program_guide/containers/grid.txt | 0
.../legacy}/program_guide/containers/index.txt | 0
.../legacy}/program_guide/containers/layout.txt| 0
.../legacy}/program_guide/containers/mapbuf.txt| 0
.../legacy}/program_guide/containers/naviframe.txt | 0
.../legacy}/program_guide/containers/panes.txt | 0
.../legacy}/program_guide/containers/scroller.txt | 0
.../legacy}/program_guide/containers/table.txt | 0
.../legacy}/program_guide/containers_pg.txt| 0
.../legacy}/program_guide/customizing_ui_pg.txt| 0
.../legacy}/program_guide/edje/basic_concepts.txt | 0
.../legacy}/program_guide/edje/edc_reference.txt | 0
.../legacy}/program_guide/edje/edje_blocks.txt | 0
.../legacy}/program_guide/edje/edje_swallow.txt| 0
.../legacy}/program_guide/edje/elm_layout.txt | 0
.../legacy}/program_guide/edje/group_block.txt | 0
.../legacy}/program_guide/edje/index.txt | 0
.../legacy}/program_guide/edje/part_block.txt | 0
.../legacy}/program_guide/edje/program.txt | 0
.../legacy}/program_guide/edje/scaling_objects.txt | 0
.../{ => develop/legacy}/program_guide/edje_pg.txt | 0
.../legacy}/program_guide/eina/arrays.txt | 0
.../legacy}/program_guide/eina/generic_value.txt | 0
.../legacy}/program_guide/eina/hash_tables.txt | 0
.../legacy}/program_guide/eina/index.txt | 0
.../program_guide/eina/iterator_functions.txt | 0
.../legacy}/program_guide/eina/lists.txt | 0
.../program_guide/eina/memory_pool_tools.txt | 0
.../program_guide/eina/safety_checks_tools.txt | 0
.../legacy}/program_guide/eina/string_tools.txt| 0
.../legacy}/program_guide/eina/strings.txt | 0
.../{ => develop/legacy}/program_guide/eina_pg.txt | 0
.../program_guide/evas/clipping_objects.txt| 0
.../program_guide/evas/evas_engines_concept.txt| 0
.../legacy}/program_guide/evas/evas_object.txt | 0
.../legacy}/program_guide/evas/image_objects.txt | 0
.../legacy}/program_guide/evas/index.txt | 0
.../legacy}/program_guide/evas/mapping_objects.txt | 0
.../evas/rendering_concept_and_method_in_evas.txt | 0
.../program_guide/evas/textblock_objects.txt | 0
.../program_guide/evas/ui_rendering_mode.txt | 0
.../{ => develop/legacy}/program_guide/evas_pg.txt | 0
.../legacy}/program_guide/evasgl_pg.txt| 0
.../program_guide/event_effect/ecore_animators.txt | 0
.../program_guide/event_effect/ecore_events.txt| 0
.../program_guide/event_effect/edje_animations.txt | 0
.../program_guide/event_effect/edje_events.txt | 0
.../event_effect/elementary_transitions.txt| 0
.../program_guide/event_effect/evas_events.txt | 0
.../event_effect/evas_map_animations.txt | 0
.../event_effect/evas_object_events.txt| 0
.../event_effect/evas_smart_events.txt | 0
.../legacy}/program_guide/event_effect/index.txt | 0
.../legacy}/program_guide/event_effect_pg.txt | 0
.../legacy}/program_guide/focus_ui_pg.txt | 0
pages/{ => develop/legacy}/program_guide/index.txt | 0
.../legacy}/program_guide/main_loop/animators.txt | 0
.../program_guide/main_loop/file_descriptors.txt | 0
.../legacy}/program_guide/main_loop/idlers.txt | 0
.../legacy}/program_guide/main_loop/index.txt | 0
.../legacy}/program_guide/main_loop/threads.txt| 0
.../legacy}/program_guide/main_loop/timers.txt | 0
.../legacy}/program_guide/main_loop_pg.txt | 0
.../legacy}/program_guide/multilingual_pg.txt | 0
.../program_guide/scalability/aspect_ratio.txt | 0
.../legacy}/program_guide/scalability/index.txt| 0
.../program_guide/scalability/key_concepts.txt | 0
.../scalability/scalability_using_edj
[EGIT] [website/www-content] master 01/01: Fix the tutorial relative links too
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=e338ee8c4cdaf29174efb012c49b7aea96b1b504
commit e338ee8c4cdaf29174efb012c49b7aea96b1b504
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Oct 31 13:25:30 2017 +
Fix the tutorial relative links too
---
pages/develop/legacy/tutorial/basic/button.txt | 2 +-
pages/develop/legacy/tutorial/basic/label.txt | 2 +-
pages/develop/legacy/tutorial/basic_tutorial.txt | 12
.../effects/ecore_animator/3d_rotation.txt | 4 +--
.../effects/ecore_animator/drop_bounce.txt | 2 +-
.../tutorial/effects/ecore_animator/rotation.txt | 4 +--
.../tutorial/effects/ecore_animator/setting_up.txt | 2 +-
.../tutorial/effects/ecore_animator/zoom.txt | 4 +--
.../tutorial/effects/edje_animation/on_click.txt | 2 +-
.../tutorial/effects/edje_animation/start_up.txt | 2 +-
.../effects/elementary_animations/blend.txt| 4 +--
.../effects/elementary_animations/fade.txt | 4 +--
.../effects/elementary_animations/flip.txt | 4 +--
.../effects/elementary_animations/flipy.txt| 4 +--
.../effects/elementary_animations/rotation.txt | 4 +--
.../effects/elementary_animations/setting_up.txt | 2 +-
.../effects/elementary_animations/transit.txt | 2 +-
.../effects/elementary_animations/wipe.txt | 4 +--
.../effects/elementary_animations/zoom.txt | 4 +--
pages/develop/legacy/tutorial/effects_tutorial.txt | 32 +++---
pages/develop/legacy/tutorial/form_tutorial.txt| 2 +-
.../legacy/tutorial/genlist/modifications.txt | 2 +-
pages/develop/legacy/tutorial/genlist/set-up.txt | 2 +-
pages/develop/legacy/tutorial/genlist_tutorial.txt | 4 +--
.../legacy/tutorial/gl2d/animating_cube.txt| 4 +--
.../legacy/tutorial/gl2d/basic_application.txt | 2 +-
.../develop/legacy/tutorial/gl2d/creating_cube.txt | 4 +--
.../develop/legacy/tutorial/gl2d/drawing_cube.txt | 4 +--
pages/develop/legacy/tutorial/gl2d/effects.txt | 2 +-
.../legacy/tutorial/gl2d/rendering_cube.txt| 4 +--
.../legacy/tutorial/gl2d/widget_interaction.txt| 4 +--
pages/develop/legacy/tutorial/gl_2d_tutorial.txt | 14 +-
pages/develop/legacy/tutorial/menu/basic_ui.txt| 4 +--
pages/develop/legacy/tutorial/menu/hidden_menu.txt | 2 +-
pages/develop/legacy/tutorial/menu/structure.txt | 2 +-
pages/develop/legacy/tutorial/menu/theme.txt | 4 +--
pages/develop/legacy/tutorial/menu_tutorial.txt| 8 +++---
pages/develop/legacy/tutorial/preference/code.txt | 2 +-
.../legacy/tutorial/preference/description.txt | 2 +-
.../legacy/tutorial/preference_tutorial.txt| 4 +--
40 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/pages/develop/legacy/tutorial/basic/button.txt
b/pages/develop/legacy/tutorial/basic/button.txt
index 3129296c..a12c90c6 100644
--- a/pages/develop/legacy/tutorial/basic/button.txt
+++ b/pages/develop/legacy/tutorial/basic/button.txt
@@ -191,4 +191,4 @@ _button_unfocused_cb(void * data, Evas_Object *button, void
*event_info){
Next Part
-//**__[[/tutorial/basic/label]]__**//
+//**__[[/develop/legacy/tutorial/basic/label]]__**//
diff --git a/pages/develop/legacy/tutorial/basic/label.txt
b/pages/develop/legacy/tutorial/basic/label.txt
index b8f06a31..73a1cb3c 100644
--- a/pages/develop/legacy/tutorial/basic/label.txt
+++ b/pages/develop/legacy/tutorial/basic/label.txt
@@ -72,4 +72,4 @@ elm_object_text_set(label, "This text is bold.");
Next Part
-//**__[[/tutorial/basic/list| Simple List Tutorial]]__**//
+//**__[[/develop/legacy/tutorial/basic/list| Simple List Tutorial]]__**//
diff --git a/pages/develop/legacy/tutorial/basic_tutorial.txt
b/pages/develop/legacy/tutorial/basic_tutorial.txt
index 97d4309a..cad5a2e8 100644
--- a/pages/develop/legacy/tutorial/basic_tutorial.txt
+++ b/pages/develop/legacy/tutorial/basic_tutorial.txt
@@ -34,8 +34,8 @@ ELM_MAIN()
Basic Button
-**__[[/tutorial/basic/button|Basic Button Tutorial]]:__**
-//{{code_c/tutorial/basic/button.c}}//[[/tutorial/basic/button|{{
:basic_button.png?direct|button}}]]
+**__[[/develop/legacy/tutorial/basic/button|Basic Button Tutorial]]:__**
+//{{code_c/tutorial/basic/button.c}}//[[/develop/legacy/tutorial/basic/button|{{
:basic_button.png?direct|button}}]]
\\
\\
\\
@@ -54,8 +54,8 @@ ELM_MAIN()
\\
--
Basic Label
-**__[[/tutorial/basic/label|Simple Text Tutorial]]:__**//
- {{code_c/tutorial/basic/label.c}}//[[/tutorial/basic/label|{{
:basic_label.png?direct|label}}]]
+**__[[/develop/legacy/tutorial/basic/label|Simple Text Tutorial]]:__**//
+ {{code_c/tutorial/basic/label.c}}//[[/develop/legacy/tutorial/basic/label|{{
:basic_label.png?direct|label}}]]
\\
\\
\\
@@ -66,6 +66,6 @@ ELM_MAIN()
\\
--
Basic List
-**__[[tutorial/basic/list|Simp
[EGIT] [website/www-content] master 01/01: Move tutorial to develop/legacy
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=738ea33110a04bbb3b141b9acb53d8e0da63e248
commit 738ea33110a04bbb3b141b9acb53d8e0da63e248
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Oct 31 12:41:57 2017 +
Move tutorial to develop/legacy
---
.../{ => develop/legacy}/tutorial/basic/button.txt | 0
.../{ => develop/legacy}/tutorial/basic/label.txt | 0
pages/{ => develop/legacy}/tutorial/basic/list.txt | 0
.../legacy}/tutorial/basic_tutorial.txt| 0
.../effects/ecore_animator/3d_rotation.txt | 0
.../effects/ecore_animator/drop_bounce.txt | 0
.../tutorial/effects/ecore_animator/rotation.txt | 0
.../tutorial/effects/ecore_animator/setting_up.txt | 0
.../tutorial/effects/ecore_animator/zoom.txt | 0
.../tutorial/effects/edje_animation/on_click.txt | 0
.../tutorial/effects/edje_animation/start_up.txt | 0
.../effects/elementary_animations/blend.txt| 0
.../effects/elementary_animations/fade.txt | 0
.../effects/elementary_animations/flip.txt | 0
.../effects/elementary_animations/flipy.txt| 0
.../effects/elementary_animations/rotation.txt | 0
.../effects/elementary_animations/setting_up.txt | 0
.../effects/elementary_animations/transit.txt | 0
.../effects/elementary_animations/wipe.txt | 0
.../effects/elementary_animations/zoom.txt | 0
.../legacy}/tutorial/effects_tutorial.txt | 0
.../legacy}/tutorial/form_tutorial.txt | 0
.../legacy}/tutorial/genlist/modifications.txt | 0
.../legacy}/tutorial/genlist/set-up.txt| 0
.../legacy}/tutorial/genlist_tutorial.txt | 0
.../legacy}/tutorial/gl2d/animating_cube.txt | 0
.../legacy}/tutorial/gl2d/basic_application.txt| 0
.../legacy}/tutorial/gl2d/creating_cube.txt| 0
.../legacy}/tutorial/gl2d/drawing_cube.txt | 0
.../{ => develop/legacy}/tutorial/gl2d/effects.txt | 0
.../legacy}/tutorial/gl2d/rendering_cube.txt | 0
.../legacy}/tutorial/gl2d/widget_interaction.txt | 0
.../legacy}/tutorial/gl_2d_tutorial.txt| 0
.../legacy}/tutorial/javascript_tutorial.txt | 0
.../legacy}/tutorial/menu/basic_ui.txt | 0
.../legacy}/tutorial/menu/hidden_menu.txt | 0
.../legacy}/tutorial/menu/structure.txt| 0
pages/{ => develop/legacy}/tutorial/menu/theme.txt | 0
.../legacy}/tutorial/menu_tutorial.txt | 0
.../legacy}/tutorial/multimedia_tutorial.txt | 0
.../legacy}/tutorial/naviframe_tutorial.txt| 0
.../legacy}/tutorial/panes_tutorial.txt| 0
.../legacy}/tutorial/popup_tutorial.txt| 0
.../legacy}/tutorial/preference/code.txt | 0
.../legacy}/tutorial/preference/description.txt| 0
.../legacy}/tutorial/preference_tutorial.txt | 0
pages/docs.txt | 24 +++---
pages/program_guide/containers/genlist.txt | 2 +-
pages/program_guide/containers/panes.txt | 2 +-
pages/program_guide/evasgl_pg.txt | 2 +-
.../program_guide/event_effect/ecore_animators.txt | 2 +-
.../event_effect/elementary_transitions.txt| 2 +-
pages/program_guide/widgets/button.txt | 2 +-
pages/program_guide/widgets/label.txt | 2 +-
pages/program_guide/widgets/list.txt | 2 +-
pages/program_guide/widgets/popup.txt | 2 +-
56 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/pages/tutorial/basic/button.txt
b/pages/develop/legacy/tutorial/basic/button.txt
similarity index 100%
rename from pages/tutorial/basic/button.txt
rename to pages/develop/legacy/tutorial/basic/button.txt
diff --git a/pages/tutorial/basic/label.txt
b/pages/develop/legacy/tutorial/basic/label.txt
similarity index 100%
rename from pages/tutorial/basic/label.txt
rename to pages/develop/legacy/tutorial/basic/label.txt
diff --git a/pages/tutorial/basic/list.txt
b/pages/develop/legacy/tutorial/basic/list.txt
similarity index 100%
rename from pages/tutorial/basic/list.txt
rename to pages/develop/legacy/tutorial/basic/list.txt
diff --git a/pages/tutorial/basic_tutorial.txt
b/pages/develop/legacy/tutorial/basic_tutorial.txt
similarity index 100%
rename from pages/tutorial/basic_tutorial.txt
rename to pages/develop/legacy/tutorial/basic_tutorial.txt
diff --git a/pages/tutorial/effects/ecore_animator/3d_rotation.txt
b/pages/develop/legacy/tutorial/effects/ecore_animator/3d_rotation.txt
similarity index 100%
rename from pages/tutorial/effects/ecore_animator/3d_rotation.txt
rename to pages/develop/legacy/tutorial/effects/ecore_animator/3d_rotation.txt
diff --git a/pages/tutorial/effects/ecore_animator/drop_bounce.txt
b/pages/develop/legacy/tutorial/effects/ecore_animator/drop_bounce.txt
similarity index 100%
rename from p
[EGIT] [website/www-content] master 01/01: fix indexes from refactor
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=297645effad9fc1670bff350b3dabcac93d98ba8 commit 297645effad9fc1670bff350b3dabcac93d98ba8 Author: Andy Williams <a...@andywilliams.me> Date: Tue Oct 31 13:01:47 2017 + fix indexes from refactor --- .../legacy/program_guide/connectivity/index.txt| 4 +-- .../legacy/program_guide/containers/index.txt | 24 - pages/develop/legacy/program_guide/edje/index.txt | 6 ++--- pages/develop/legacy/program_guide/eina/index.txt | 6 ++--- pages/develop/legacy/program_guide/evas/index.txt | 6 ++--- .../legacy/program_guide/event_effect/index.txt| 6 ++--- pages/develop/legacy/program_guide/index.txt | 30 +++--- .../legacy/program_guide/main_loop/index.txt | 4 +-- .../legacy/program_guide/scalability/index.txt | 4 +-- .../legacy/program_guide/threading/index.txt | 4 +-- 10 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pages/develop/legacy/program_guide/connectivity/index.txt b/pages/develop/legacy/program_guide/connectivity/index.txt index 28b02125..bded3eab 100644 --- a/pages/develop/legacy/program_guide/connectivity/index.txt +++ b/pages/develop/legacy/program_guide/connectivity/index.txt @@ -1,4 +1,4 @@ Connectivity Menu| -^ [[/program_guide/connectivity_pg|Connectivity PG]] ^ -| [[/program_guide/connectivity/init_ecore_con|Init Ecore_Con]] | [[/program_guide/connectivity/basic_usage_of_ecore_con_url|Basic usage of Ecore_con_url]] | [[/program_guide/connectivity/basic_usage_of_ecore_con_server|Basic usage of Ecore_con_server]] | [[/program_guide/connectivity/basic_usage_of_ecore_con_client|Basic usage of Ecore_con_client]]| [[/program_guide/connectivity/ecore_con_ssl usage|Ecore_con_ssl Usage]] | +^ [[/develop/legacy/program_guide/connectivity_pg|Connectivity PG]] ^ +| [[/develop/legacy/program_guide/connectivity/init_ecore_con|Init Ecore_Con]] | [[/develop/legacy/program_guide/connectivity/basic_usage_of_ecore_con_url|Basic usage of Ecore_con_url]] | [[/develop/legacy/program_guide/connectivity/basic_usage_of_ecore_con_server|Basic usage of Ecore_con_server]] | [[/develop/legacy/program_guide/connectivity/basic_usage_of_ecore_con_client|Basic usage of Ecore_con_client]]| [[/develop/legacy/program_guide/connectivity/ecore_con_s [...] diff --git a/pages/develop/legacy/program_guide/containers/index.txt b/pages/develop/legacy/program_guide/containers/index.txt index 96c4037f..622e38fc 100644 --- a/pages/develop/legacy/program_guide/containers/index.txt +++ b/pages/develop/legacy/program_guide/containers/index.txt @@ -1,14 +1,14 @@ Container Menu| -[[/program_guide/containers_pg|Container Programming Guide]]: -* [[/program_guide/containers/box|Box]] (//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Box.html|API]]//) -* [[/program_guide/containers/conformant|Conformant]] (//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Conformant.html|API]]//) -* [[/program_guide/containers/gengrid|Gengrid]](//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Gengrid.html|API]]//) -* [[/program_guide/containers/genlist|Genlist]](//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Genlist.html|API]]//) -* [[/program_guide/containers/grid|Grid]] (//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Grid.html|API]]//) -* [[/program_guide/containers/layout|Layout]] (//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Layout.html|API]]//) -* [[/program_guide/containers/mapbuf|Mapbuf]] (//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Mapbuf.html|API]]//) -* [[/program_guide/containers/naviframe|Naviframe]] (//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Naviframe.html|API]]//) -* [[/program_guide/containers/panes|Panes]] (//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Panes.html|API]]//) -* [[/program_guide/containers/scroller|Scroller]] (//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Scroller.html|API]]//) -* [[/program_guide/containers/table|Table]] (//[[https://build.enlightenment.org/job/nightly_elm_gcc_x86_64/lastSuccessfulBuild/artifact/doc/html/group__Table.html|API]]//) +[[/develop/legacy/program_guide/containers_pg|Container Programming Guide]]: +* [[/develop/legacy/program
[EGIT] [website/www-content] master 01/01: Update program_guide internal links
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=2353f5bb6d92c2431d01bfc3e6cc7e735c3afd12 commit 2353f5bb6d92c2431d01bfc3e6cc7e735c3afd12 Author: Andy Williams <a...@andywilliams.me> Date: Tue Oct 31 13:14:32 2017 + Update program_guide internal links --- .../basic_application_structure_pg.txt | 14 +-- .../legacy/program_guide/connectivity_pg.txt | 10 +- .../legacy/program_guide/containers/conformant.txt | 6 +- .../legacy/program_guide/containers/gengrid.txt| 2 +- .../legacy/program_guide/containers/layout.txt | 2 +- .../legacy/program_guide/containers/mapbuf.txt | 8 +- .../legacy/program_guide/containers/naviframe.txt | 8 +- .../legacy/program_guide/containers/panes.txt | 8 +- .../legacy/program_guide/containers/scroller.txt | 12 +-- .../legacy/program_guide/containers/table.txt | 8 +- .../develop/legacy/program_guide/containers_pg.txt | 118 ++--- .../legacy/program_guide/customizing_ui_pg.txt | 6 +- .../legacy/program_guide/edje/edje_swallow.txt | 2 +- .../legacy/program_guide/edje/elm_layout.txt | 4 +- pages/develop/legacy/program_guide/edje_pg.txt | 74 ++--- pages/develop/legacy/program_guide/eina_pg.txt | 42 .../legacy/program_guide/evas/evas_object.txt | 14 +-- pages/develop/legacy/program_guide/evas/index.txt | 4 +- .../evas/rendering_concept_and_method_in_evas.txt | 2 +- pages/develop/legacy/program_guide/evas_pg.txt | 40 +++ .../program_guide/event_effect/edje_events.txt | 6 +- .../legacy/program_guide/event_effect_pg.txt | 36 +++ .../develop/legacy/program_guide/main_loop_pg.txt | 82 +++--- .../legacy/program_guide/scalability_pg.txt| 38 +++ .../program_guide/threading/thread_safety.txt | 2 +- .../program_guide/threading/thread_use_example.txt | 2 +- .../develop/legacy/program_guide/threading_pg.txt | 10 +- .../legacy/program_guide/widgets/basics.txt| 6 +- .../legacy/program_guide/widgets/config.txt| 6 +- .../legacy/program_guide/widgets/widgets_index.txt | 2 +- .../legacy/program_guide/widgets/widgets_menu.txt | 10 +- pages/develop/legacy/program_guide/widgets_pg.txt | 6 +- 32 files changed, 295 insertions(+), 295 deletions(-) diff --git a/pages/develop/legacy/program_guide/basic_application_structure_pg.txt b/pages/develop/legacy/program_guide/basic_application_structure_pg.txt index 83f0365f..808f8939 100644 --- a/pages/develop/legacy/program_guide/basic_application_structure_pg.txt +++ b/pages/develop/legacy/program_guide/basic_application_structure_pg.txt @@ -30,11 +30,11 @@ The EFL are a set of layered libraries, as shown in the following diagram: When you create a basic EFL application, you use the following main libraries as a basis: - * **Elementary** is the top-most library with which you create your EFL application. It provides all the functions you need to create a window, create simple and complex layouts, manage the life cycle of a view, and add widgets. Go to [[/program_guide/widgets_pg|Widgets program guide]] - * **Edje** is the library used by Elementary to provide a powerful theme. You can also use Edje to create your own objects and use them in your application. You may also want to extend the default theme. You will find more information about Edje and the EDC format in [[/program_guide/edje_pg|Edje]] and [[/program_guide/customizing_ui_pg|Customizing Widgets]]. - * **Ecore** is the library which manages the main loop of your application. The main loop is one of the most important concepts you need to know about to develop an application. The main loop is where events are handled, and where you interact with the user through the callback mechanism. The main loop mechanisms are explained in the [[/program_guide/main_loop_pg|Main Loop guide]]. - * **Evas** is the canvas engine. Evas is responsible for managing the drawing of your content. All graphical objects that you create are Evas objects. Evas handles the entire state of the window by filling the canvas with objects and manipulating their states. In contrast to other canvas libraries, such as Cairo, OpenGL, and XRender, Evas is not a drawing library but a scene graph library that retains the state of all objects. The Evas concept is explained in [[/program_guide/evas/ren [...] - * **Eina** is the basis of all the EFL libraries. Eina is a toolbox that implements an API for data types in an efficient way. It contains all the functions needed to create lists and hashes, manage shared strings, open shared libraries, and manage errors and memory pools. Eina concepts are explained in [[/program_guide/eina_pg|Using Data Types]]. + * **Elementary** is the top-most library with which you create your EFL application. It provides all the functions you need to
[EGIT] [website/www] master 01/01: attempting to fix broken edit sessions
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=b28f244003d6c3cd0140d775795d4e673dd98a05 commit b28f244003d6c3cd0140d775795d4e673dd98a05 Author: Andy Williams <a...@andywilliams.me> Date: Tue Oct 31 15:27:30 2017 + attempting to fix broken edit sessions --- public_html/.htaccess | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public_html/.htaccess b/public_html/.htaccess index 6574e2a6..015100aa 100644 --- a/public_html/.htaccess +++ b/public_html/.htaccess @@ -77,3 +77,5 @@ AddType video/ogg ogv AddType application/mp4 mp4 AddType video/mp4 mp4 +php_flag session.use_cookies on + --
[EGIT] [website/www] master 01/02: Work on pages without languages set
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=890e491406ca70393ab58d5051e1ac96d85b9fcf
commit 890e491406ca70393ab58d5051e1ac96d85b9fcf
Author: Andy Williams <a...@andywilliams.me>
Date: Tue Oct 31 10:30:53 2017 +
Work on pages without languages set
---
public_html/lib/plugins/codelink/syntax.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/public_html/lib/plugins/codelink/syntax.php
b/public_html/lib/plugins/codelink/syntax.php
index 5f772d8e..0d6ac1ba 100644
--- a/public_html/lib/plugins/codelink/syntax.php
+++ b/public_html/lib/plugins/codelink/syntax.php
@@ -101,7 +101,8 @@ class syntax_plugin_codelink extends DokuWiki_Syntax_Plugin
{
$this->keylanguage = $language;
} else {
$symbol = str_replace("()", "", $match);
-if (!in_array($symbol,
$this->keydata[$this->keylanguage]['keys'])) {
+if (!$this->keydata[$this->keylanguage]['keys'] ||
+!in_array($symbol,
$this->keydata[$this->keylanguage]['keys'])) {
$data[0] = $match;
return $data;
}
--
[EGIT] [website/www] master 02/02: Add playground gitignore in default config
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=be232610619f4a2b9eac6e17c7e570e4f22cd59e commit be232610619f4a2b9eac6e17c7e570e4f22cd59e Author: Andy Williams <a...@andywilliams.me> Date: Tue Oct 31 10:31:35 2017 + Add playground gitignore in default config --- local.php.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/local.php.sample b/local.php.sample index 1bfbcf56..ff6925ed 100644 --- a/local.php.sample +++ b/local.php.sample @@ -56,6 +56,7 @@ $conf['plugin']['gitbacked']['periodicPull'] = 0; $conf['plugin']['gitbacked']['periodicMinutes'] = 0; $conf['plugin']['gitbacked']['repoPath'] = 'data/www-content'; $conf['plugin']['gitbacked']['repoWorkDir'] = 'data/www-content/tmp'; +$conf['plugin']['gitbacked']['ignorePaths'] = 'pages/playground/'; $conf['tpl']['dokui']['hide-entry-title'] = '1'; $conf['datadir'] = 'data/www-content/pages'; $conf['mediadir'] = 'data/www-content/media'; --
[EGIT] [website/www] master 01/01: Update example config since refactor
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=19b66d28b5f607ec349899a25e7b2ec68086cd4b commit 19b66d28b5f607ec349899a25e7b2ec68086cd4b Author: Andy Williams <a...@andywilliams.me> Date: Mon Oct 30 19:01:11 2017 + Update example config since refactor --- local.php.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local.php.sample b/local.php.sample index 4aaa05ac..1bfbcf56 100644 --- a/local.php.sample +++ b/local.php.sample @@ -87,7 +87,7 @@ $conf['mediadir'] = 'data/www-content/media'; * much like what doxygen does, but in dokuwiki. right now it only works * inside code blocks syntax hilighted by geshi */ -$conf['code_extn'] = 'docs/efl/ref'; +$conf['code_extn'] = 'develop/api/ref'; /* max cache time for a wiki pagee - this is so that code keyword * hilighting works even if a page doesn't have a * ~~NOCACHE~~ directive in it. if it has this in it, then code keyword --
[EGIT] [website/www] master 01/01: WIKI CUSTOM - geshi - fix keyword lookup for our huge keyword list
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=1455060650faea3657656688a06472f77928efeb
commit 1455060650faea3657656688a06472f77928efeb
Author: Andy Williams <a...@andywilliams.me>
Date: Mon Oct 30 17:59:10 2017 +
WIKI CUSTOM - geshi - fix keyword lookup for our huge keyword list
---
public_html/inc/geshi.php | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/public_html/inc/geshi.php b/public_html/inc/geshi.php
index e4b142b8..29d15f26 100644
--- a/public_html/inc/geshi.php
+++ b/public_html/inc/geshi.php
@@ -3260,6 +3260,8 @@ class GeSHi {
$before = '';
$after = '';
+if (!$keyword_match)
+return $match[0];
if ($this->keyword_links) {
// Keyword links have been ebabled
@@ -3760,18 +3762,18 @@ class GeSHi {
//Load the language file
require $file_name;
+// Perhaps some checking might be added here later to check that
+// $language data is a valid thing but maybe not
+$this->language_data = $language_data;
+
if (!empty($file_extn_link) && !empty($file_extn_list) &&
file_exists($file_extn_link) && file_exists($file_extn_list)) {
$link_array = file($file_extn_link, FILE_IGNORE_NEW_LINES |
FILE_SKIP_EMPTY_LINES);
$keys_array = file($file_extn_list, FILE_IGNORE_NEW_LINES |
FILE_SKIP_EMPTY_LINES);
-$language_data['URLS'][5] = $link_array[0];
-$language_data['KEYWORDS'][5] = $keys_array;
+$this->language_data['URLS'][5] = $link_array[0];
+$this->add_keyword_group(5, null, null, $keys_array);
}
-// Perhaps some checking might be added here later to check that
-// $language data is a valid thing but maybe not
-$this->language_data = $language_data;
-
// Set strict mode if should be set
$this->strict_mode = $this->language_data['STRICT_MODE_APPLIES'];
--
[EGIT] [core/efl] master 01/02: docs: Correct sig for eolian lua calls
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2a0e0774164a608bf4746e9cd459ca60a9bd3780
commit 2a0e0774164a608bf4746e9cd459ca60a9bd3780
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Dec 20 14:31:56 2017 +
docs: Correct sig for eolian lua calls
---
src/scripts/elua/apps/docgen/doctree.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/scripts/elua/apps/docgen/doctree.lua
b/src/scripts/elua/apps/docgen/doctree.lua
index cd24b0aad9..479303bdd1 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -745,7 +745,7 @@ M.Type = Node:clone {
end,
c_type_get = function(self)
-return self.type:c_type_get(eolian.c_type_type.DEFAULT)
+return self.type:c_type_get(eos:unit_get(), eolian.c_type_type.DEFAULT)
end,
name_get = function(self)
--
[EGIT] [core/efl] master 02/02: docs: Note class scope for method listings
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4202dca0029e4035b4f3f432d9ab935d6c02618c
commit 4202dca0029e4035b4f3f432d9ab935d6c02618c
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Dec 20 14:33:54 2017 +
docs: Note class scope for method listings
---
src/scripts/elua/apps/gendoc.lua | 4
1 file changed, 4 insertions(+)
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index c0543bd8ef..51febf6c2e 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -737,6 +737,10 @@ local write_scope = function(f, func)
[func.scope.PROTECTED] = "protected",
[func.scope.PRIVATE] = "private"
}
+if func:is_class() then
+f:write_raw(" ")
+f:write_m("class")
+end
if func:type_get() == func.PROPERTY then
local ft1, ft2 = ftt[func:scope_get(func.PROP_GET)],
ftt[func:scope_get(func.PROP_SET)]
--
[EGIT] [tools/examples] master 01/01: ui: Update for API grid->table
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=5ddb82e0da0aa579aa765c5cf490982910953fd7
commit 5ddb82e0da0aa579aa765c5cf490982910953fd7
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Dec 20 14:50:08 2017 +
ui: Update for API grid->table
---
reference/c/ui/src/ui_container.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/reference/c/ui/src/ui_container.c
b/reference/c/ui/src/ui_container.c
index 17e5332..b18d10d 100644
--- a/reference/c/ui/src/ui_container.c
+++ b/reference/c/ui/src/ui_container.c
@@ -27,30 +27,30 @@ _gui_quit_cb(void *data EINA_UNUSED, const Efl_Event *event
EINA_UNUSED)
efl_exit(0);
}
-// Load a simple grid layout into the window
-static Efl_Ui_Grid *
-_ui_grid_setup(Efl_Ui_Win *win)
+// Load a simple table layout into the window
+static Efl_Ui_Table *
+_ui_table_setup(Efl_Ui_Win *win)
{
- Efl_Ui_Grid *grid;
+ Efl_Ui_Table *table;
int i;
- grid = efl_add(EFL_UI_GRID_CLASS, win);
+ table = efl_add(EFL_UI_TABLE_CLASS, win);
- efl_pack_grid_columns_set(grid, 2);
- efl_pack_grid_direction_set(grid, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN);
+ efl_pack_table_columns_set(table, 2);
+ efl_pack_table_direction_set(table, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN);
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Long Button"),
- efl_pack_grid(grid, efl_added, 0, 2, 2, 1));
+ efl_pack_table(table, efl_added, 0, 2, 2, 1));
for (i = 1; i <= 4; i++)
{
efl_add(EFL_UI_BUTTON_CLASS, win,
-efl_text_set(efl_added, eina_slstr_printf("Grid %d", i)),
-efl_pack(grid, efl_added));
+efl_text_set(efl_added, eina_slstr_printf("Table %d", i)),
+efl_pack(table, efl_added));
}
- return grid;
+ return table;
}
// Load some boxes - a horizontal one for the window layout and a vertical
@@ -92,7 +92,7 @@ _ui_panes_setup(Efl_Ui_Win *win)
efl_content_set(efl_part(split, "second"), efl_added),
efl_ui_direction_set(efl_added,
EFL_UI_DIR_HORIZONTAL),
efl_ui_panes_split_ratio_set(efl_added, 0.85));
- efl_content_set(efl_part(horiz_split, "first"), _ui_grid_setup(win));
+ efl_content_set(efl_part(horiz_split, "first"), _ui_table_setup(win));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Quit"),
--
[EGIT] [website/www-content] master 01/01: api: Updated for class method parameter
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=54d049834c7646a8db43c1466b02f90c23a9f50c commit 54d049834c7646a8db43c1466b02f90c23a9f50c Author: Andy Williams <a...@andywilliams.me> Date: Wed Dec 20 15:01:57 2017 + api: Updated for class method parameter --- pages/develop/api/efl/access.txt | 8 pages/develop/api/efl/access/method/event_emit.txt| 2 +- pages/develop/api/efl/access/method/event_handler_add.txt | 2 +- pages/develop/api/efl/access/method/event_handler_del.txt | 2 +- pages/develop/api/efl/access/property/root.txt| 2 +- pages/develop/api/efl/loop.txt| 4 ++-- pages/develop/api/efl/loop/method/message_handler_get.txt | 2 +- pages/develop/api/efl/loop/property/main.txt | 2 +- pages/develop/api/efl/net/dialer/http.txt | 4 ++-- pages/develop/api/efl/net/dialer/http/method/date_parse.txt | 2 +- pages/develop/api/efl/net/dialer/http/method/date_serialize.txt | 2 +- pages/develop/api/efl/net/ip_address.txt | 8 pages/develop/api/efl/net/ip_address/method/create.txt| 2 +- pages/develop/api/efl/net/ip_address/method/create_sockaddr.txt | 2 +- pages/develop/api/efl/net/ip_address/method/parse.txt | 2 +- pages/develop/api/efl/net/ip_address/method/resolve.txt | 2 +- pages/develop/api/efl/net/ssl/context.txt | 2 +- pages/develop/api/efl/net/ssl/context/property/default_dialer.txt | 2 +- pages/develop/api/efl/object.txt | 6 +++--- pages/develop/api/efl/object/method/event_global_freeze.txt | 2 +- pages/develop/api/efl/object/method/event_global_thaw.txt | 2 +- .../develop/api/efl/object/property/event_global_freeze_count.txt | 2 +- pages/develop/api/efl/text/markup_util.txt| 4 ++-- pages/develop/api/efl/text/markup_util/method/markup_to_text.txt | 2 +- pages/develop/api/efl/text/markup_util/method/text_to_markup.txt | 2 +- pages/develop/api/efl/ui/focus/util.txt | 2 +- pages/develop/api/efl/ui/focus/util/method/focus.txt | 2 +- pages/develop/api/efl/vpath/core.txt | 2 +- pages/develop/api/efl/vpath/core/method/core_get.txt | 2 +- pages/develop/api/efl/vpath/manager.txt | 6 +++--- pages/develop/api/efl/vpath/manager/method/fetch.txt | 2 +- pages/develop/api/efl/vpath/manager/method/register.txt | 2 +- pages/develop/api/efl/vpath/manager/method/unregister.txt | 2 +- 33 files changed, 46 insertions(+), 46 deletions(-) diff --git a/pages/develop/api/efl/access.txt b/pages/develop/api/efl/access.txt index 57a1ac113..2ffdcb924 100644 --- a/pages/develop/api/efl/access.txt +++ b/pages/develop/api/efl/access.txt @@ -86,7 +86,7 @@ void efl_access_role_set(Eo *obj, Efl_Access_Role role); **[[:develop:api:efl:access:property:root|root]]** //**(get)**// ''class''\\ > %%Get root object of accessible object hierarchy%% -Efl_Object *efl_access_root_get(const Eo *obj); +Efl_Object *efl_access_root_get(const Efl_Class *klass); \\ **[[:develop:api:efl:access:property:translation_domain|translation_domain]]** //**(get, set)**//\\ @@ -118,19 +118,19 @@ Eina_List *efl_access_children_get(const Eo *obj); **[[:develop:api:efl:access:method:event_emit|event_emit]]** ''class'' ''protected''\\ > %%Emit event%% -void efl_access_event_emit(const Eo *obj, Efl_Access *accessible, const Efl_Event_Description *event, void *event_info); +void efl_access_event_emit(const Efl_Class *klass, Efl_Access *accessible, const Efl_Event_Description *event, void *event_info); \\ **[[:develop:api:efl:access:method:event_handler_add|event_handler_add]]** ''class'' ''protected''\\ > %%Register accessibility event listener%% -Efl_Access_Event_Handler *efl_access_event_handler_add(const Eo *obj, Efl_Event_Cb cb, void *data); +Efl_Access_Event_Handler *efl_access_event_handler_add(const Efl_Class *klass, Efl_Event_Cb cb, void *data); \\ **[[:develop:api:efl:access:method:event_handler_del|event_handler_del]]** ''class'' ''protected''\\ > %%Deregister accessibility event listener%% -void efl_access_event_handler_del(const Eo *obj, Efl_Access_Event_Handler *handler); +void efl_access_event_handler_del(const Efl_Class *klass, Efl_Access_Event_Handler *handler); \\ **[[:develop:api:efl:access:property:index_in_parent|index_in_parent]]** //**(get)**// ''protected''\\ diff --git a/pages/develop/api/efl/access/method/event_emit.txt b/pages/develop/api/efl/access/method/event_emit.txt index 1fc372871..66cc35471 100644 --- a/pages/develop/api/efl/access/method/event_emit.txt +++ b/pages/develop/api/efl/access/met
[EGIT] [core/efl] master 01/01: docs: Output correct signature for class method first parameter
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=99f9789902d93bb4e8ba255c05cc02c8af0320ed commit 99f9789902d93bb4e8ba255c05cc02c8af0320ed Author: Andy Williams <a...@andywilliams.me> Date: Wed Dec 20 15:00:18 2017 + docs: Output correct signature for class method first parameter --- 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 51febf6c2e..842df515d8 100644 --- a/src/scripts/elua/apps/gendoc.lua +++ b/src/scripts/elua/apps/gendoc.lua @@ -41,7 +41,9 @@ local gen_func_csig = function(f, ftype) local rtype = f:return_type_get(ftype) local fparam = "Eo *obj" -if f:is_const() or f:is_class() or ftype == f.PROP_GET then +if f:is_class() then +fparam = "Efl_Class *klass" +elseif f:is_const() or ftype == f.PROP_GET then fparam = "const Eo *obj" end --
[EGIT] [core/efl] master 01/01: docs: Update ecore_con eo files for grammar and readability
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b9401d7e0a550af0c2b8a8c78a9da9ca04a2718d
commit b9401d7e0a550af0c2b8a8c78a9da9ca04a2718d
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Dec 20 17:30:29 2017 +
docs: Update ecore_con eo files for grammar and readability
Author: Nate Drake
---
src/lib/ecore_con/efl_net_control.eo | 64 +--
src/lib/ecore_con/efl_net_control_access_point.eo | 130 +++---
src/lib/ecore_con/efl_net_control_technology.eo | 30 ++---
src/lib/ecore_con/efl_net_dialer.eo | 24 ++--
src/lib/ecore_con/efl_net_dialer_http.eo | 70 ++--
src/lib/ecore_con/efl_net_dialer_simple.eo| 22 ++--
src/lib/ecore_con/efl_net_dialer_websocket.eo | 36 +++---
src/lib/ecore_con/efl_net_ip_address.eo | 26 ++---
src/lib/ecore_con/efl_net_server.eo | 28 ++---
src/lib/ecore_con/efl_net_server_fd.eo| 32 +++---
src/lib/ecore_con/efl_net_server_simple.eo| 10 +-
src/lib/ecore_con/efl_net_server_udp.eo | 4 +-
src/lib/ecore_con/efl_net_server_udp_client.eo| 4 +-
src/lib/ecore_con/efl_net_server_unix.eo | 10 +-
src/lib/ecore_con/efl_net_server_windows.eo | 6 +-
src/lib/ecore_con/efl_net_session.eo | 26 ++---
src/lib/ecore_con/efl_net_socket.eo | 14 +--
src/lib/ecore_con/efl_net_socket_simple.eo| 16 +--
src/lib/ecore_con/efl_net_socket_ssl.eo | 6 +-
src/lib/ecore_con/efl_net_socket_udp.eo | 10 +-
20 files changed, 284 insertions(+), 284 deletions(-)
diff --git a/src/lib/ecore_con/efl_net_control.eo
b/src/lib/ecore_con/efl_net_control.eo
index 1f9810522d..ad500615cd 100644
--- a/src/lib/ecore_con/efl_net_control.eo
+++ b/src/lib/ecore_con/efl_net_control.eo
@@ -5,14 +5,14 @@ import efl_net_control_technology;
enum Efl.Net.Control.State {
[[Provides the global network connectivity state.
- For fine grained details, use @Efl.Net.Control access points and
- their state property.
+ For more details, use @Efl.Net.Control access points and
+ their property state.
@since 1.19
]]
-offline, [[No access point is connected]]
-local, [[At least one access point was connected and the internet
connectio wasn't verified]]
-online, [[At least one access point was connected and the internet was
verified]]
+offline, [[No access point is connected.]]
+local, [[At least one access point is connected and the internet
connection hasn't been verified.]]
+online, [[At least one access point is connected and the internet has been
verified]]
}
enum Efl.Net.Control.Agent_Request_Input.Field {
@@ -20,7 +20,7 @@ enum Efl.Net.Control.Agent_Request_Input.Field {
@since 1.19
]]
-name = (1 << 0), [[Used for hidden WiFi access points. If ssid is present,
this is an alternative to that.]]
+name = (1 << 0), [[Used for hidden WiFi access points. If SSID is present,
this is an alternative to that.]]
ssid = (1 << 1), [[Used for hidden WiFi access points. If name is present,
this is an alternative to that.]]
username = (1 << 2), [[Identity or username requested]]
passphrase = (1 << 3), [[Password or passphrase requested]]
@@ -41,9 +41,9 @@ struct Efl.Net.Control.Agent_Request_Input {
@since 1.19
]]
-access_point: Efl.Net.Control.Access_Point; [[The access point that
triggered this request.]]
+access_point: Efl.Net.Control.Access_Point; [[The access point which
triggered this request.]]
fields: Efl.Net.Control.Agent_Request_Input.Field; [[Bitwise OR of fields
present in this request.]]
-passphrase_type: string; [[Extra detail on the meaning for the passphrase
field, such as wep, psk, response (IEEE802.X GTC/OTP), string...]]
+passphrase_type: string; [[Extra detail for the passphrase field, such as
wep, psk, response (IEEE802.X GTC/OTP), string...]]
informational: list<ptr(Efl.Net.Control.Agent_Request_Input.Information)>;
[[Such as the previous passphrase, VPN host]]
}
@@ -57,7 +57,7 @@ struct Efl.Net.Control.Agent_Error {
}
struct Efl.Net.Control.Agent_Browser_Url {
-[[Reports to agent that it should open a browser at given URL.
+[[Reports to agent that it should open a browser at a given URL.
@since 1.19
]]
@@ -68,50 +68,50 @@ struct Efl.Net.Control.Agent_Browser_Url {
class Efl.Net.Control (Efl.Loop.Consumer) {
[[Controls network connectivity.
- This class and its children objects are only useful to implement
- control of the network connectivity. If your application is only
- interested in requesting access to the network, use the
+ This class and its child objects are only useful to implement
+ control of the network connectivity. If your application only
+ n
[EGIT] [tools/examples] master 01/01: core: Update to loop rename Efl.Loop_User -> Efl.Loop.Consumer
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=24b7f14c1423f910492e18f7c9f986755229b1e7
commit 24b7f14c1423f910492e18f7c9f986755229b1e7
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Dec 20 17:59:11 2017 +
core: Update to loop rename Efl.Loop_User -> Efl.Loop.Consumer
---
reference/c/core/src/core_loop.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/reference/c/core/src/core_loop.c b/reference/c/core/src/core_loop.c
index 6858df0..52d6538 100644
--- a/reference/c/core/src/core_loop.c
+++ b/reference/c/core/src/core_loop.c
@@ -127,8 +127,8 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
loop = efl_loop_main_get(loop);
_print_loop(loop, "Application Main");
- loop = efl_add(EFL_LOOP_USER_CLASS, loop,
- efl_name_set(efl_added, "User Loop"));
+ loop = efl_add(EFL_LOOP_CONSUMER_CLASS, loop,
+ efl_name_set(efl_added, "Loop Consumer"));
_print_loop(loop, "Child");
efl_del(loop);
printf("\n");
--
[EGIT] [core/efl] master 02/02: remove potential double free
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=114873c5454804c137c93119ec4be02f862db3e2
commit 114873c5454804c137c93119ec4be02f862db3e2
Author: Andy Williams <a...@andywilliams.me>
Date: Tue May 15 14:47:36 2018 +0100
remove potential double free
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 44de09f50a..124738e762 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -3562,7 +3562,6 @@ _ecore_evas_x_screen_dpi_get(const Ecore_Evas *ee, int
*xdpi, int *ydpi)
if (!out)
{
norandr:
-if (out) free(out);
scdpi = ecore_x_dpi_get();
if (xdpi) *xdpi = scdpi;
if (ydpi) *ydpi = scdpi;
--
[EGIT] [core/efl] master 01/02: Add missing continue keyword from Go definition
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=767c211e70e35b769fb7b402280b439b1bbb4fd7
commit 767c211e70e35b769fb7b402280b439b1bbb4fd7
Author: Andy Williams <a...@andywilliams.me>
Date: Tue May 15 14:45:55 2018 +0100
Add missing continue keyword from Go definition
---
src/lib/elementary/elm_code_syntax.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elementary/elm_code_syntax.c
b/src/lib/elementary/elm_code_syntax.c
index 39046a194a..e1bd46f902 100644
--- a/src/lib/elementary/elm_code_syntax.c
+++ b/src/lib/elementary/elm_code_syntax.c
@@ -114,7 +114,7 @@ static Elm_Code_Syntax _elm_code_syntax_go =
"/*",
"*/",
_elm_code_syntax_scope_change_braces,
- { "break", "case", "chan", "const", "default", "defer", "else",
"fallthrough", "for", "func", "go", "goto", \
+ { "break", "case", "chan", "const", "continue", "default", "defer", "else",
"fallthrough", "for", "func", "go", "goto", \
"if", "import", "interface", "map", "package", "range", "return",
"select", "struct", "switch", "type", "var", \
"true", "false", "iota", "nil", \
"int", "int8", "int16", "int32", "int64", "uint", "uint8", "uint16",
"uint32", "uint64", "uintptr", "float32", \
--
[EGIT] [core/efl] efl-1.20 01/02: Add missing continue keyword from Go definition
ajwillia-ms pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=58f154bcf3f3fecdc5cd30b9aacdc7af6528d6dd
commit 58f154bcf3f3fecdc5cd30b9aacdc7af6528d6dd
Author: Andy Williams <a...@andywilliams.me>
Date: Tue May 15 14:45:55 2018 +0100
Add missing continue keyword from Go definition
---
src/lib/elementary/elm_code_syntax.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elementary/elm_code_syntax.c
b/src/lib/elementary/elm_code_syntax.c
index 1a567fc250..bc7cfa8fbb 100644
--- a/src/lib/elementary/elm_code_syntax.c
+++ b/src/lib/elementary/elm_code_syntax.c
@@ -88,7 +88,7 @@ static Elm_Code_Syntax _elm_code_syntax_go =
"//",
"/*",
"*/",
- { "break", "case", "chan", "const", "default", "defer", "else",
"fallthrough", "for", "func", "go", "goto", \
+ { "break", "case", "chan", "const", "continue", "default", "defer", "else",
"fallthrough", "for", "func", "go", "goto", \
"if", "import", "interface", "map", "package", "range", "return",
"select", "struct", "switch", "type", "var", \
"true", "false", "iota", "nil", \
"int", "int8", "int16", "int32", "int64", "uint", "uint8", "uint16",
"uint32", "uint64", "uintptr", "float32", \
--
[EGIT] [core/efl] efl-1.20 02/02: remove potential double free
ajwillia-ms pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=f06bd09ac8cb7764f05bf91fe77d98c8ff4bee2a
commit f06bd09ac8cb7764f05bf91fe77d98c8ff4bee2a
Author: Andy Williams <a...@andywilliams.me>
Date: Tue May 15 14:47:36 2018 +0100
remove potential double free
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 88779a2a7c..52484c2798 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -3562,7 +3562,6 @@ _ecore_evas_x_screen_dpi_get(const Ecore_Evas *ee, int
*xdpi, int *ydpi)
if (!out)
{
norandr:
-if (out) free(out);
scdpi = ecore_x_dpi_get();
if (xdpi) *xdpi = scdpi;
if (ydpi) *ydpi = scdpi;
--
[EGIT] [website/www-content] master 01/02: Move docs about contributing to new /contrib namespace
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=3ffe6fe95f790926c63487825327e716f9e16a33
commit 3ffe6fe95f790926c63487825327e716f9e16a33
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 12:12:52 2017 +0100
Move docs about contributing to new /contrib namespace
---
pages/contact.txt| 2 +-
pages/{contact/arcanist.txt => contrib/patching.txt} | 0
pages/{debugging => contrib}/report_bugs.txt | 0
pages/{contribute.txt => contrib/start.txt} | 0
pages/debugging/apps_efl_debugging.txt | 4 ++--
pages/docs.txt | 6 +++---
pages/start.txt | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pages/contact.txt b/pages/contact.txt
index d44ca77e..dd12d34f 100644
--- a/pages/contact.txt
+++ b/pages/contact.txt
@@ -126,6 +126,6 @@ wiki here is newer, replacing static web pages.
Patches
-On [[https://phab.enlightenment.org|Phabricator]] the
[[https://phab.enlightenment.org/differential|Differential]] tool is used for
patch submission and review. You will need an account to submit patches. You
will also need to use the [[contact:arcanist|Arcanist]] tool to do this. Please
see the [[contact:arcanist|Arcanist documentation]] as to how to do this.
+On [[https://phab.enlightenment.org|Phabricator]] the
[[https://phab.enlightenment.org/differential|Differential]] tool is used for
patch submission and review. You will need an account to submit patches. You
will also need to use the Arcanist tool to do this - please see the
[[contrib/patching|Arcanist documentation]] about how to do this.
While the above is the preferred method, you can also send patches using
Phabricator directly. If you are unable to use Phabricator for whatever reason,
please resort to sending a patch to the mailing list, or contacting the
developers on IRC.
diff --git a/pages/contact/arcanist.txt b/pages/contrib/patching.txt
similarity index 100%
rename from pages/contact/arcanist.txt
rename to pages/contrib/patching.txt
diff --git a/pages/debugging/report_bugs.txt b/pages/contrib/report_bugs.txt
similarity index 100%
rename from pages/debugging/report_bugs.txt
rename to pages/contrib/report_bugs.txt
diff --git a/pages/contribute.txt b/pages/contrib/start.txt
similarity index 100%
rename from pages/contribute.txt
rename to pages/contrib/start.txt
diff --git a/pages/debugging/apps_efl_debugging.txt
b/pages/debugging/apps_efl_debugging.txt
index c1a84c17..1bc4cb7d 100644
--- a/pages/debugging/apps_efl_debugging.txt
+++ b/pages/debugging/apps_efl_debugging.txt
@@ -7,7 +7,7 @@
This tutorial's goal is to help you debug your EFL applications with several
use cases that you can reproduce. It gives you approaches to know if the bug
comes from your application or from the EFL libraries.
-Then, if you are sure the bug does not come from your application, you can
[[/debugging/report_bugs|report a bug]].
+Then, if you are sure the bug does not come from your application, you can
[[/contrib/report_bugs|report a bug]].
In this tutorial we'll cover log levels and tracing the sources of bugs:
@@ -485,4 +485,4 @@ In the result below, you see that all the objects are
visible and you see that w
For example in yellow, it is the Elm_box which is an Evas_box composed of an
Evas_rectangle, an Elm_Label and an Elm_Button.
-A Button widget is an Edje_Object which is composed of 4 Evas_rectangle, one
Evas_image and 2 Evas_text.
\ No newline at end of file
+A Button widget is an Edje_Object which is composed of 4 Evas_rectangle, one
Evas_image and 2 Evas_text.
diff --git a/pages/docs.txt b/pages/docs.txt
index ce86fb6e..5cbc155b 100755
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -72,13 +72,13 @@ We are really excited that you would like to get involved
in EFL and
Enlightenment development! If you followed the instructions in
"Getting Started" then you are most of the way to being part of the team.
To start with it's easiest to see which area you would like to work on and
-get involved in bug reporting or fixing. From there you can get to know the
+get involved in bug reporting, fixing or other types of
[[contrib/|contributing]]. From there you can get to know the
team, how we work, and earn a place on the team as a core developer :)
=== Feedback ===
- * [[debugging/report_bugs|Report bugs on Phabricator]]
- * [[contact/arcanist|Submit patch on Phabricator]]
+ * [[contrib/report_bugs|Report bugs on Phabricator]]
+ * [[contrib/patching|Submit patch on Phabricator]]
=== Debugging ===
diff --git a/pages/start.txt b/pages/start.txt
index 1b1b17ca..5b7a6d94 100644
--- a/pages/start.txt
+++ b/pages/start.txt
@@ -10,7 +10,7 @@
{{ :shot-enlightenment.png?nolink&320}}
-[[:about-enlightenment|Enlightenment]] started as a project to bu
[EGIT] [website/www-content] master 01/01: More link fixes
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=57b4e79160fcb960b54ccd38bf56ec5ae32ce52d commit 57b4e79160fcb960b54ccd38bf56ec5ae32ce52d Author: Andy Williams <a...@andywilliams.me> Date: Fri Oct 20 12:40:44 2017 +0100 More link fixes --- pages/contrib/efl-debug.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/contrib/efl-debug.txt b/pages/contrib/efl-debug.txt index 322ea149..56fcde5a 100644 --- a/pages/contrib/efl-debug.txt +++ b/pages/contrib/efl-debug.txt @@ -1,12 +1,12 @@ ~~Title: Debugging~~ -//Please also see [[debugging/enlightenment_debugging]] and [[debugging/apps_efl_debugging]]. This should probably be merged with these pages.// +//Please also see [[/debugging/enlightenment_debugging]] and [[/debugging/apps_efl_debugging]]. This should probably be merged with these pages.// Compilation -Remember to build EFL, Enlightenment etc. with debugging compile flags. [[docs-efl-start]] has a section on this for your build environment. Remember to have ''-g'' as a ''CFLAGS'' option to ensure binaries and libraries have all the debug information they need. If you didn't build with debugging, simply build again with these flags correctly set and debugging can begin. +Remember to build EFL, Enlightenment etc. with debugging compile flags. [[/docs-efl-start]] has a section on this for your build environment. Remember to have ''-g'' as a ''CFLAGS'' option to ensure binaries and libraries have all the debug information they need. If you didn't build with debugging, simply build again with these flags correctly set and debugging can begin. @@ -634,4 +634,4 @@ You can combine options like above. See the manual page for Strace for more deta Reporting bugs -Use the [[https://phab.enlightenment.org/maniphest/|Maniphest]] on Phabricator to report bugs. Don't send bug reports and patches to the Enlightenment mailing list as it strips most patches. Bug reports get lost if they're only discussed on the mailing list. If there is more discussion needed add a bug report to the discussion on the mailing list. Always test again to make sure there really is a reproducible bug before you make a ticket. Make sure you haven't changed a setting somewhere, [...] \ No newline at end of file +Use the [[https://phab.enlightenment.org/maniphest/|Maniphest]] on Phabricator to report bugs. Don't send bug reports and patches to the Enlightenment mailing list as it strips most patches. Bug reports get lost if they're only discussed on the mailing list. If there is more discussion needed add a bug report to the discussion on the mailing list. Always test again to make sure there really is a reproducible bug before you make a ticket. Make sure you haven't changed a setting somewhere, [...] --
[EGIT] [website/www-content] master 01/01: Fix relative links after move
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=cdde0ec802c047e767c6062c8209ab638b240112
commit cdde0ec802c047e767c6062c8209ab638b240112
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 12:38:44 2017 +0100
Fix relative links after move
---
pages/contrib/start.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pages/contrib/start.txt b/pages/contrib/start.txt
index 268da94a..052f93a1 100644
--- a/pages/contrib/start.txt
+++ b/pages/contrib/start.txt
@@ -6,8 +6,8 @@
If you have free time, help is welcome in different areas:
- * Developers: See the [[docs|documentation]], subscribe to the
[[contact|mailing lists]], create a [[http://phab.enlightenment.org|phab
-account]], have a look at the opened tasks, join [[contact|IRC channel]] to
get help on how to start coding
+ * Developers: See the [[/docs|documentation]], subscribe to the
[[/contact|mailing lists]], create a [[http://phab.enlightenment.org|phab
+account]], have a look at the opened tasks, join [[/contact|IRC channel]] to
get help on how to start coding
* Writers: to help improve the documentation
* Translators: to translate Enlightenment, Terminology, Edi, ..
* Designers: to help to get edje themes of all applications better
@@ -24,4 +24,4 @@ Enlightenment Association is a non-profit organisation, under
French law. Enligh
Donate to Enlightenment via Bitcoin, PayPal or Flattr. There is no minimal
amount for your donation.
-{{page>donation-buttons}}
+{{page>:donation-buttons}}
--
[EGIT] [website/www-content] master 01/01: Update references to other debugging pages. No need for the TODOs now as we know what the pages are for
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=ada7efe9ea64121260f798d7c122377d7b88be74 commit ada7efe9ea64121260f798d7c122377d7b88be74 Author: Andy Williams <a...@andywilliams.me> Date: Fri Oct 20 12:49:09 2017 +0100 Update references to other debugging pages. No need for the TODOs now as we know what the pages are for --- pages/contrib/efl-debug.txt| 2 +- pages/debugging/apps_efl_debugging.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/contrib/efl-debug.txt b/pages/contrib/efl-debug.txt index 56fcde5a..42429e56 100644 --- a/pages/contrib/efl-debug.txt +++ b/pages/contrib/efl-debug.txt @@ -1,7 +1,7 @@ ~~Title: Debugging~~ -//Please also see [[/debugging/enlightenment_debugging]] and [[/debugging/apps_efl_debugging]]. This should probably be merged with these pages.// +//Please also see [[/debugging/enlightenment_debugging]] for specific tips on debugging the window manager.// Compilation diff --git a/pages/debugging/apps_efl_debugging.txt b/pages/debugging/apps_efl_debugging.txt index 1bc4cb7d..3ae081a2 100644 --- a/pages/debugging/apps_efl_debugging.txt +++ b/pages/debugging/apps_efl_debugging.txt @@ -2,7 +2,7 @@ EFL application debugging -//Please also see [[/docs-efl-debug]]. This should probably be merged with this page.// +//Please also see [[/contrib/efl-debug|EFL Debugging]] if you want to learn more about debugging our libraries.// This tutorial's goal is to help you debug your EFL applications with several use cases that you can reproduce. It gives you approaches to know if the bug comes from your application or from the EFL libraries. --
[EGIT] [website/www-content] master 01/01: We have a whole page about reporting bugs
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=2bb1b7035124ad8e92991241cb0ad9ccd7b2fdbb commit 2bb1b7035124ad8e92991241cb0ad9ccd7b2fdbb Author: Andy Williams <a...@andywilliams.me> Date: Fri Oct 20 12:58:06 2017 +0100 We have a whole page about reporting bugs --- pages/contrib/efl-debug.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pages/contrib/efl-debug.txt b/pages/contrib/efl-debug.txt index 42429e56..6182cef5 100644 --- a/pages/contrib/efl-debug.txt +++ b/pages/contrib/efl-debug.txt @@ -634,4 +634,6 @@ You can combine options like above. See the manual page for Strace for more deta Reporting bugs -Use the [[https://phab.enlightenment.org/maniphest/|Maniphest]] on Phabricator to report bugs. Don't send bug reports and patches to the Enlightenment mailing list as it strips most patches. Bug reports get lost if they're only discussed on the mailing list. If there is more discussion needed add a bug report to the discussion on the mailing list. Always test again to make sure there really is a reproducible bug before you make a ticket. Make sure you haven't changed a setting somewhere, [...] +If you have encountered a bug and would like to help by reporting it please +follow our [[/contrib/report_bugs|Reporting Bugs]] page. + --
[EGIT] [website/www-content] master 02/02: remove debugging top level namespace, move todevelop
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=048be585c0ddf45d8cf94207affc35bb185ed219
commit 048be585c0ddf45d8cf94207affc35bb185ed219
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 14:13:44 2017 +0100
remove debugging top level namespace, move todevelop
---
pages/contrib/report_bugs.txt | 2 +-
pages/{debugging => develop}/apps_efl_debugging.txt | 0
pages/{debugging => develop}/remote_debugging.txt | 0
pages/docs.txt | 4 ++--
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pages/contrib/report_bugs.txt b/pages/contrib/report_bugs.txt
index 91f8c0be..883b932f 100644
--- a/pages/contrib/report_bugs.txt
+++ b/pages/contrib/report_bugs.txt
@@ -27,7 +27,7 @@
//**__Are there a lot of traces of Valgrind, GDB, etc. for your bug?__**//
-> If there is a ton of output traces, please attach them as file uploads. And
go check in [[/debugging/apps_efl_debugging|Application EFL Debugging]] and
[[/debugging/enlightenment_debugging|Enlightenment Debugging]] sections to get
information.
+> If there is a ton of output traces, please attach them as file uploads. And
go check in [[/develop/apps_efl_debugging|Application EFL Debugging]] and
[[enlightenment_debugging|Enlightenment Debugging]] sections to get information.
=== Reporting bugs ===
diff --git a/pages/debugging/apps_efl_debugging.txt
b/pages/develop/apps_efl_debugging.txt
similarity index 100%
rename from pages/debugging/apps_efl_debugging.txt
rename to pages/develop/apps_efl_debugging.txt
diff --git a/pages/debugging/remote_debugging.txt
b/pages/develop/remote_debugging.txt
similarity index 100%
rename from pages/debugging/remote_debugging.txt
rename to pages/develop/remote_debugging.txt
diff --git a/pages/docs.txt b/pages/docs.txt
index d41dbfae..91ab63ee 100755
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -53,8 +53,8 @@ For now we recommend using the stable API and it's Bindings.
* [[develop/efl/start|Get started with EFL]]
* [[develop/efl/advanced/start|Advanced EFL Topics]]
- * [[debugging/apps_efl_debugging|Application Debugging]]
- * [[debugging/remote_debugging|Remote Debugging]]
+ * [[develop/apps_efl_debugging|Application Debugging]]
+ * [[develop/remote_debugging|Remote Debugging]]
=== Stable API ===
--
[EGIT] [website/www-content] master 01/02: Move docs/efl to develop/efl
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=f7895cbb86008e34b61748307ab60c8ac235c0ae
commit f7895cbb86008e34b61748307ab60c8ac235c0ae
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 14:07:35 2017 +0100
Move docs/efl to develop/efl
---
media/{docs => develop}/efl/advanced/dnd-1.png | Bin
media/{docs => develop}/efl/advanced/dnd-2.png | Bin
media/{docs => develop}/efl/advanced/dnd-3.png | Bin
media/{docs => develop}/efl/advanced/dnd-4.png | Bin
media/{docs => develop}/efl/advanced/dnd-5.png | Bin
media/{docs => develop}/efl/advanced/filter-bg-full.png | Bin
media/{docs => develop}/efl/advanced/filter-bg.png | Bin
media/{docs => develop}/efl/advanced/filter-blend.png | Bin
media/{docs => develop}/efl/advanced/filter-blur.png| Bin
media/{docs => develop}/efl/advanced/filter-blur6.png | Bin
media/{docs => develop}/efl/advanced/filter-bump.png| Bin
media/{docs => develop}/efl/advanced/filter-bumpmap.png | Bin
media/{docs => develop}/efl/advanced/filter-color-black.png | Bin
media/{docs => develop}/efl/advanced/filter-color-blue.png | Bin
media/{docs => develop}/efl/advanced/filter-color-brown.png | Bin
media/{docs => develop}/efl/advanced/filter-color-cyan.png | Bin
.../efl/advanced/filter-color-darkblue.png | Bin
media/{docs => develop}/efl/advanced/filter-color-gray.png | Bin
media/{docs => develop}/efl/advanced/filter-color-green.png | Bin
.../efl/advanced/filter-color-invisible.png | Bin
media/{docs => develop}/efl/advanced/filter-color-lime.png | Bin
.../{docs => develop}/efl/advanced/filter-color-magenta.png | Bin
.../{docs => develop}/efl/advanced/filter-color-maroon.png | Bin
media/{docs => develop}/efl/advanced/filter-color-olive.png | Bin
.../{docs => develop}/efl/advanced/filter-color-orange.png | Bin
.../{docs => develop}/efl/advanced/filter-color-purple.png | Bin
media/{docs => develop}/efl/advanced/filter-color-red.png | Bin
.../{docs => develop}/efl/advanced/filter-color-silver.png | Bin
media/{docs => develop}/efl/advanced/filter-color-white.png | Bin
.../{docs => develop}/efl/advanced/filter-color-yellow.png | Bin
media/{docs => develop}/efl/advanced/filter-colorcurve.png | Bin
media/{docs => develop}/efl/advanced/filter-colorcurve2.png | Bin
media/{docs => develop}/efl/advanced/filter-curve-1.png | Bin
media/{docs => develop}/efl/advanced/filter-curve-2.png | Bin
media/{docs => develop}/efl/advanced/filter-curve-3.png | Bin
media/{docs => develop}/efl/advanced/filter-curve.png | Bin
media/{docs => develop}/efl/advanced/filter-displace.png| Bin
media/{docs => develop}/efl/advanced/filter-dropshadow.png | Bin
media/{docs => develop}/efl/advanced/filter-fill.png| Bin
.../{docs => develop}/efl/advanced/filter-fillmode-none.png | Bin
media/{docs => develop}/efl/advanced/filter-fillmode-rx.png | Bin
.../{docs => develop}/efl/advanced/filter-fillmode-rxsy.png | Bin
.../{docs => develop}/efl/advanced/filter-fillmode-rxy.png | Bin
media/{docs => develop}/efl/advanced/filter-fillmode-ry.png | Bin
media/{docs => develop}/efl/advanced/filter-fillmode-sx.png | Bin
.../{docs => develop}/efl/advanced/filter-fillmode-sxry.png | Bin
.../{docs => develop}/efl/advanced/filter-fillmode-sxy.png | Bin
media/{docs => develop}/efl/advanced/filter-fillmode-sy.png | Bin
media/{docs => develop}/efl/advanced/filter-fillpad.png | Bin
media/{docs => develop}/efl/advanced/filter-grow.png| Bin
media/{docs => develop}/efl/advanced/filter-innershadow.png | Bin
media/{docs => develop}/efl/advanced/filter-input-bg.png| Bin
media/{docs => develop}/efl/advanced/filter-input.png | Bin
media/{docs => develop}/efl/advanced/filter-mask.png| Bin
media/{docs => develop}/efl/advanced/filter-mirror.png | Bin
media/{docs => develop}/efl/advanced/filter-padding.png | Bin
media/{docs => develop}/efl/advanced/filter-shrink.png | Bin
media/{docs => develop}/efl/advanced/filter-texture.png | Bin
media/{docs => develop}/efl/advanced/filter-transform.png | Bin
media/{docs => develop}/efl/advanced/filter1-1.png | Bin
media/{docs => develop}/efl/advanced/filter1-2.png | Bin
media/{docs => develop}/efl/advanced/filter1.png| Bin
media/{docs => develop}/efl/advanced/filter2-3.png | Bin
media/{docs => develop}/efl/advanced/filter2-a.png | Bin
media/{docs => develop}/efl/advanced/filter2.png| Bin
media/{docs => develop}/efl/mainloop.png| Bin
media/{docs => develop}/efl/mainloop.svg
[EGIT] [website/www-content] master 02/09: Revert "remove debugging top level namespace, move todevelop"
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=94a70443460c7fd5133799793507c2f627391487
commit 94a70443460c7fd5133799793507c2f627391487
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 16:18:35 2017 +0100
Revert "remove debugging top level namespace, move todevelop"
This reverts commit 048be585c0ddf45d8cf94207affc35bb185ed219.
---
pages/contrib/report_bugs.txt | 2 +-
pages/{develop => debugging}/apps_efl_debugging.txt | 0
pages/{develop => debugging}/remote_debugging.txt | 0
pages/docs.txt | 4 ++--
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pages/contrib/report_bugs.txt b/pages/contrib/report_bugs.txt
index 883b932f..91f8c0be 100644
--- a/pages/contrib/report_bugs.txt
+++ b/pages/contrib/report_bugs.txt
@@ -27,7 +27,7 @@
//**__Are there a lot of traces of Valgrind, GDB, etc. for your bug?__**//
-> If there is a ton of output traces, please attach them as file uploads. And
go check in [[/develop/apps_efl_debugging|Application EFL Debugging]] and
[[enlightenment_debugging|Enlightenment Debugging]] sections to get information.
+> If there is a ton of output traces, please attach them as file uploads. And
go check in [[/debugging/apps_efl_debugging|Application EFL Debugging]] and
[[/debugging/enlightenment_debugging|Enlightenment Debugging]] sections to get
information.
=== Reporting bugs ===
diff --git a/pages/develop/apps_efl_debugging.txt
b/pages/debugging/apps_efl_debugging.txt
similarity index 100%
rename from pages/develop/apps_efl_debugging.txt
rename to pages/debugging/apps_efl_debugging.txt
diff --git a/pages/develop/remote_debugging.txt
b/pages/debugging/remote_debugging.txt
similarity index 100%
rename from pages/develop/remote_debugging.txt
rename to pages/debugging/remote_debugging.txt
diff --git a/pages/docs.txt b/pages/docs.txt
index 91ab63ee..d41dbfae 100755
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -53,8 +53,8 @@ For now we recommend using the stable API and it's Bindings.
* [[develop/efl/start|Get started with EFL]]
* [[develop/efl/advanced/start|Advanced EFL Topics]]
- * [[develop/apps_efl_debugging|Application Debugging]]
- * [[develop/remote_debugging|Remote Debugging]]
+ * [[debugging/apps_efl_debugging|Application Debugging]]
+ * [[debugging/remote_debugging|Remote Debugging]]
=== Stable API ===
--
[EGIT] [website/www-content] master 07/09: Revert "Fix relative links after move"
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=046c1f76e4386bbd135fd1ec5caf5e4e31d12070
commit 046c1f76e4386bbd135fd1ec5caf5e4e31d12070
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 16:19:54 2017 +0100
Revert "Fix relative links after move"
This reverts commit cdde0ec802c047e767c6062c8209ab638b240112.
---
pages/contrib/start.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pages/contrib/start.txt b/pages/contrib/start.txt
index 052f93a1..268da94a 100644
--- a/pages/contrib/start.txt
+++ b/pages/contrib/start.txt
@@ -6,8 +6,8 @@
If you have free time, help is welcome in different areas:
- * Developers: See the [[/docs|documentation]], subscribe to the
[[/contact|mailing lists]], create a [[http://phab.enlightenment.org|phab
-account]], have a look at the opened tasks, join [[/contact|IRC channel]] to
get help on how to start coding
+ * Developers: See the [[docs|documentation]], subscribe to the
[[contact|mailing lists]], create a [[http://phab.enlightenment.org|phab
+account]], have a look at the opened tasks, join [[contact|IRC channel]] to
get help on how to start coding
* Writers: to help improve the documentation
* Translators: to translate Enlightenment, Terminology, Edi, ..
* Designers: to help to get edje themes of all applications better
@@ -24,4 +24,4 @@ Enlightenment Association is a non-profit organisation, under
French law. Enligh
Donate to Enlightenment via Bitcoin, PayPal or Flattr. There is no minimal
amount for your donation.
-{{page>:donation-buttons}}
+{{page>donation-buttons}}
--
[EGIT] [website/www] master 01/01: Add page move plusin
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=4fc514aa25898fec8cdededaaffe5282f18e6f2e
commit 4fc514aa25898fec8cdededaaffe5282f18e6f2e
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 16:23:12 2017 +0100
Add page move plusin
---
public_html/lib/plugins/editx/action.php | 414 +
public_html/lib/plugins/editx/conf/default.php | 9 +
public_html/lib/plugins/editx/conf/metadata.php| 8 +
public_html/lib/plugins/editx/lang/de/intro.txt| 3 +
public_html/lib/plugins/editx/lang/de/lang.php | 44 +++
public_html/lib/plugins/editx/lang/de/settings.php | 12 +
public_html/lib/plugins/editx/lang/en/intro.txt| 3 +
public_html/lib/plugins/editx/lang/en/lang.php | 50 +++
public_html/lib/plugins/editx/lang/en/settings.php | 11 +
public_html/lib/plugins/editx/lang/es/intro.txt| 3 +
public_html/lib/plugins/editx/lang/es/lang.php | 45 +++
public_html/lib/plugins/editx/lang/es/settings.php | 11 +
public_html/lib/plugins/editx/lang/hr/intro.txt| 3 +
public_html/lib/plugins/editx/lang/hr/lang.php | 50 +++
public_html/lib/plugins/editx/lang/hr/settings.php | 11 +
public_html/lib/plugins/editx/lang/nl/intro.txt| 3 +
public_html/lib/plugins/editx/lang/nl/lang.php | 51 +++
public_html/lib/plugins/editx/lang/pl/intro.txt| 3 +
public_html/lib/plugins/editx/lang/pl/lang.php | 43 +++
public_html/lib/plugins/editx/lang/pl/settings.php | 11 +
public_html/lib/plugins/editx/lang/ru/intro.txt| 3 +
public_html/lib/plugins/editx/lang/ru/lang.php | 45 +++
public_html/lib/plugins/editx/lang/ru/settings.php | 13 +
public_html/lib/plugins/editx/lang/zh-tw/intro.txt | 3 +
public_html/lib/plugins/editx/lang/zh-tw/lang.php | 50 +++
.../lib/plugins/editx/lang/zh-tw/settings.php | 11 +
public_html/lib/plugins/editx/plugin.info.txt | 7 +
27 files changed, 920 insertions(+)
diff --git a/public_html/lib/plugins/editx/action.php
b/public_html/lib/plugins/editx/action.php
new file mode 100644
index ..20c097ef
--- /dev/null
+++ b/public_html/lib/plugins/editx/action.php
@@ -0,0 +1,414 @@
+http://www.gnu.org/licenses/gpl.html)
+ * @author Danny Lin <danny.0...@gmail.com>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
+require_once (DOKU_PLUGIN . 'action.php');
+require_once(DOKU_INC.'inc/fulltext.php');
+
+class action_plugin_editx extends DokuWiki_Action_Plugin {
+
+/**
+ * register the eventhandlers
+ */
+function register(Doku_Event_Handler $contr) {
+$contr->register_hook('TPL_ACT_RENDER', 'AFTER', $this,
'_append_to_edit', array());
+$contr->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this,
'_handle_act', array());
+$contr->register_hook('TPL_ACT_UNKNOWN', 'BEFORE', $this,
'_handle_tpl_act', array());
+}
+
+/**
+ * main hooks
+ */
+function _append_to_edit(&$event, $param) {
+global $ID;
+if ($event->data != 'edit') return;
+if (!$this->_auth_check_all($ID)) return;
+$link = sprintf('%s', wl($ID,'do=editx'), $this->getLang('pagemanagement'));
+$intro = $this->locale_xhtml('intro');
+$intro = str_replace( '@LINK@', $link, $intro );
+print $intro;
+}
+
+function _handle_act(&$event, $param) {
+if($event->data != 'editx') return;
+$event->preventDefault();
+}
+
+function _handle_tpl_act(&$event, $param) {
+if($event->data != 'editx') return;
+$event->preventDefault();
+
+switch ($_REQUEST['work']) {
+case 'rename':
+$opts['oldpage'] = cleanID($_REQUEST['oldpage']);
+$opts['newpage'] = cleanID($_REQUEST['newpage']);
+$opts['summary'] = $_REQUEST['summary'];
+$opts['rp_nr'] = $_REQUEST['rp_nr'];
+$opts['confirm'] = $_REQUEST['rp_confirm'];
+$this->_rename_page($opts);
+break;
+case 'delete':
+$opts['oldpage'] = cleanID($_REQUEST['oldpage']);
+$opts['summary'] = $_REQUEST['summary'];
+$opts['purge'] = $_REQUEST['dp_purge'];
+$opts['confirm'] = $_REQUEST['dp_confirm'];
+$this->_delete_page($opts);
+break;
+default:
+$this->_print_form();
+break;
+}
+}
+
+/**
+ * helper functions
+ */
+function _auth_check_list($list) {
+global $conf;
+global $USERINFO;
+
+if(!$conf['useacl']) return true; //no ACL - then no checks
+
+$allowed = explode(',',$list);
+$allowed = array_map('trim', $allowed);
+$allowed =
[EGIT] [website/www-content] master 03/09: Revert "Move docs/efl to develop/efl"
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=0d052fe6ca7408f5f768e63395c3c15d2845cc3f
commit 0d052fe6ca7408f5f768e63395c3c15d2845cc3f
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 16:18:59 2017 +0100
Revert "Move docs/efl to develop/efl"
This reverts commit f7895cbb86008e34b61748307ab60c8ac235c0ae.
---
media/{develop => docs}/efl/advanced/dnd-1.png | Bin
media/{develop => docs}/efl/advanced/dnd-2.png | Bin
media/{develop => docs}/efl/advanced/dnd-3.png | Bin
media/{develop => docs}/efl/advanced/dnd-4.png | Bin
media/{develop => docs}/efl/advanced/dnd-5.png | Bin
media/{develop => docs}/efl/advanced/filter-bg-full.png | Bin
media/{develop => docs}/efl/advanced/filter-bg.png | Bin
media/{develop => docs}/efl/advanced/filter-blend.png | Bin
media/{develop => docs}/efl/advanced/filter-blur.png| Bin
media/{develop => docs}/efl/advanced/filter-blur6.png | Bin
media/{develop => docs}/efl/advanced/filter-bump.png| Bin
media/{develop => docs}/efl/advanced/filter-bumpmap.png | Bin
media/{develop => docs}/efl/advanced/filter-color-black.png | Bin
media/{develop => docs}/efl/advanced/filter-color-blue.png | Bin
media/{develop => docs}/efl/advanced/filter-color-brown.png | Bin
media/{develop => docs}/efl/advanced/filter-color-cyan.png | Bin
.../efl/advanced/filter-color-darkblue.png | Bin
media/{develop => docs}/efl/advanced/filter-color-gray.png | Bin
media/{develop => docs}/efl/advanced/filter-color-green.png | Bin
.../efl/advanced/filter-color-invisible.png | Bin
media/{develop => docs}/efl/advanced/filter-color-lime.png | Bin
.../{develop => docs}/efl/advanced/filter-color-magenta.png | Bin
.../{develop => docs}/efl/advanced/filter-color-maroon.png | Bin
media/{develop => docs}/efl/advanced/filter-color-olive.png | Bin
.../{develop => docs}/efl/advanced/filter-color-orange.png | Bin
.../{develop => docs}/efl/advanced/filter-color-purple.png | Bin
media/{develop => docs}/efl/advanced/filter-color-red.png | Bin
.../{develop => docs}/efl/advanced/filter-color-silver.png | Bin
media/{develop => docs}/efl/advanced/filter-color-white.png | Bin
.../{develop => docs}/efl/advanced/filter-color-yellow.png | Bin
media/{develop => docs}/efl/advanced/filter-colorcurve.png | Bin
media/{develop => docs}/efl/advanced/filter-colorcurve2.png | Bin
media/{develop => docs}/efl/advanced/filter-curve-1.png | Bin
media/{develop => docs}/efl/advanced/filter-curve-2.png | Bin
media/{develop => docs}/efl/advanced/filter-curve-3.png | Bin
media/{develop => docs}/efl/advanced/filter-curve.png | Bin
media/{develop => docs}/efl/advanced/filter-displace.png| Bin
media/{develop => docs}/efl/advanced/filter-dropshadow.png | Bin
media/{develop => docs}/efl/advanced/filter-fill.png| Bin
.../{develop => docs}/efl/advanced/filter-fillmode-none.png | Bin
media/{develop => docs}/efl/advanced/filter-fillmode-rx.png | Bin
.../{develop => docs}/efl/advanced/filter-fillmode-rxsy.png | Bin
.../{develop => docs}/efl/advanced/filter-fillmode-rxy.png | Bin
media/{develop => docs}/efl/advanced/filter-fillmode-ry.png | Bin
media/{develop => docs}/efl/advanced/filter-fillmode-sx.png | Bin
.../{develop => docs}/efl/advanced/filter-fillmode-sxry.png | Bin
.../{develop => docs}/efl/advanced/filter-fillmode-sxy.png | Bin
media/{develop => docs}/efl/advanced/filter-fillmode-sy.png | Bin
media/{develop => docs}/efl/advanced/filter-fillpad.png | Bin
media/{develop => docs}/efl/advanced/filter-grow.png| Bin
media/{develop => docs}/efl/advanced/filter-innershadow.png | Bin
media/{develop => docs}/efl/advanced/filter-input-bg.png| Bin
media/{develop => docs}/efl/advanced/filter-input.png | Bin
media/{develop => docs}/efl/advanced/filter-mask.png| Bin
media/{develop => docs}/efl/advanced/filter-mirror.png | Bin
media/{develop => docs}/efl/advanced/filter-padding.png | Bin
media/{develop => docs}/efl/advanced/filter-shrink.png | Bin
media/{develop => docs}/efl/advanced/filter-texture.png | Bin
media/{develop => docs}/efl/advanced/filter-transform.png | Bin
media/{develop => docs}/efl/advanced/filter1-1.png | Bin
media/{develop => docs}/efl/advanced/filter1-2.png | Bin
media/{develop => docs}/efl/advanced/filter1.png| Bin
media/{develop => docs}/efl/advanced/filter2-3.png | Bin
media/{develop => docs}/efl/advanced/filter2-a.png | Bin
media/{develop => docs}/efl/advanced/filter2.png| Bin
media/{develop => docs}/e
[EGIT] [website/www-content] master 01/09: Revert "Move all distro info into /docs/distros/"
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=be431a2fa963af1805c0d4c07aecddcd8689f804
commit be431a2fa963af1805c0d4c07aecddcd8689f804
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 16:17:51 2017 +0100
Revert "Move all distro info into /docs/distros/"
This reverts commit dd8e5cac13f0dbc00ba5e3330b0a47de93ec3a2b.
---
pages/about.txt | 2 +-
pages/contrib/efl-debug.txt | 2 +-
pages/contrib/enlightenment_debugging.txt| 4 ++--
pages/develop/apps_efl_debugging.txt | 2 +-
pages/{docs => }/distros/archlinux-start.txt | 2 +-
pages/{docs => }/distros/debian-start.txt| 2 +-
pages/{docs => }/distros/fedora-start.txt| 2 +-
pages/{docs => }/distros/freebsd-start.txt | 0
pages/{docs => }/distros/opensuse-start.txt | 0
pages/{docs => }/distros/osx-start.txt | 0
pages/{docs => }/distros/ubuntu-start.txt| 2 +-
pages/{docs => }/distros/yocto-start.txt | 0
pages/{docs/distros/start.txt => docs-efl-start.txt} | 4 ++--
pages/docs.txt | 18 +-
pages/download.txt | 4 ++--
15 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/pages/about.txt b/pages/about.txt
index a0de3112..00bc9f77 100644
--- a/pages/about.txt
+++ b/pages/about.txt
@@ -73,7 +73,7 @@ of completeness here. For windows please see our
page, or see
[[http://win-builds.org|Win-Builds]] which ships EFL for
Windows and even uses it for the package updater GUI. For MAC OS X
-information, please refer to the [[docs/distros/osx-start]] page.
+information, please refer to the [[distros/osx-start]] page.
Enlightenment libraries already power millions of systems, from mobile
phones to set top boxes, desktops, laptops, game systems and more. It
diff --git a/pages/contrib/efl-debug.txt b/pages/contrib/efl-debug.txt
index 6a2d5015..6182cef5 100644
--- a/pages/contrib/efl-debug.txt
+++ b/pages/contrib/efl-debug.txt
@@ -6,7 +6,7 @@
Compilation
-Remember to build EFL, Enlightenment etc. with debugging compile flags.
[[/docs/distrs/]] has a section on this for your build environment. Remember to
have ''-g'' as a ''CFLAGS'' option to ensure binaries and libraries have all
the debug information they need. If you didn't build with debugging, simply
build again with these flags correctly set and debugging can begin.
+Remember to build EFL, Enlightenment etc. with debugging compile flags.
[[/docs-efl-start]] has a section on this for your build environment. Remember
to have ''-g'' as a ''CFLAGS'' option to ensure binaries and libraries have all
the debug information they need. If you didn't build with debugging, simply
build again with these flags correctly set and debugging can begin.
diff --git a/pages/contrib/enlightenment_debugging.txt
b/pages/contrib/enlightenment_debugging.txt
index 7520ef73..f68da329 100644
--- a/pages/contrib/enlightenment_debugging.txt
+++ b/pages/contrib/enlightenment_debugging.txt
@@ -10,7 +10,7 @@ This tutorial aims at providing a comprehensive and
reproducible documentation t
* [[#Debugging_Enlightenment_using_GDB|GDB]]
* [[#Valgrind|Valgrind]]
-Before debugging make sure your debug symbols are enabled, if not, go to the
[[/docs/distros/#Enable_debug_symbols_Optional|Enable debug symbols]] section.
+Before debugging make sure your debug symbols are enabled, if not, go to the
[[/docs-efl-start#Enable_debug_symbols_Optional|Enable debug symbols]] section.
=== Debugging Enlightenment using GDB ===
@@ -235,4 +235,4 @@ A black screen should now be displayed, and the interesting
thing for us is that
DISPLAY=:1 enlightenment_start -valgrind
-
+
\ No newline at end of file
diff --git a/pages/develop/apps_efl_debugging.txt
b/pages/develop/apps_efl_debugging.txt
index 510aa011..3ae081a2 100644
--- a/pages/develop/apps_efl_debugging.txt
+++ b/pages/develop/apps_efl_debugging.txt
@@ -17,7 +17,7 @@ In this tutorial we'll cover log levels and tracing the
sources of bugs:
- [[apps_efl_debugging#Memory leak]]
- [[apps_efl_debugging#Clouseau]]
-Before debugging, make sure your debug symbols are enabled. If not, go to the
[[/docs/distros/#Enable_debug_symbols_Optional|Enable debug symbols]] section.
+Before debugging, make sure your debug symbols are enabled. If not, go to the
[[/docs-efl-start#Enable_debug_symbols_Optional|Enable debug symbols]] section.
You can also have a look at the
[[https://phab.enlightenment.org/w/coding_convention/|EFL coding convention]]
if you modify code and want to send patches.
diff --git a/pages/docs/distros/archlinux-start.txt
b/pages/distros/archlinux-start.txt
similarity index 95%
rename from pages/docs/distros/
[EGIT] [website/www-content] master 08/09: Revert "Split debugging docs between contrbutors and developers"
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=f317aa0d226dc93f63d6147f492ce4d14f4327a6
commit f317aa0d226dc93f63d6147f492ce4d14f4327a6
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 16:20:05 2017 +0100
Revert "Split debugging docs between contrbutors and developers"
This reverts commit d7920c8ebba5ea02b89c8b8b0e1f8d2b972edabc.
---
pages/{contrib => debugging}/enlightenment_debugging.txt | 0
pages/{contrib/efl-debug.txt => docs-efl-debug.txt} | 0
pages/docs.txt | 8
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pages/contrib/enlightenment_debugging.txt
b/pages/debugging/enlightenment_debugging.txt
similarity index 100%
rename from pages/contrib/enlightenment_debugging.txt
rename to pages/debugging/enlightenment_debugging.txt
diff --git a/pages/contrib/efl-debug.txt b/pages/docs-efl-debug.txt
similarity index 100%
rename from pages/contrib/efl-debug.txt
rename to pages/docs-efl-debug.txt
diff --git a/pages/docs.txt b/pages/docs.txt
index 874d5a70..5cbc155b 100755
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -53,8 +53,6 @@ For now we recommend using the stable API and it's Bindings.
* [[docs/efl/start|Get started with EFL]]
* [[docs/efl/advanced/start|Advanced EFL Topics]]
- * [[debugging/apps_efl_debugging|Application Debugging]]
- * [[debugging/remote_debugging|Remote Debugging]]
=== Stable API ===
@@ -84,8 +82,10 @@ team, how we work, and earn a place on the team as a core
developer :)
=== Debugging ===
- * [[contrib/efl-debug|Debugging EFL and Enlightenment]]
- * [[contrib/enlightenment_debugging|Enlightenment specific debugging]]
+ * [[docs-efl-debug|Debugging (generic) - EFL and Enlightenment]]
+ * [[debugging/enlightenment_debugging|Enlightenment specific debugging]]
+ * [[debugging/apps_efl_debugging|EFL application debugging]]
+ * [[debugging/remote_debugging|Remote Debugging]]
=== Coding ===
--
[EGIT] [website/www-content] master 09/09: Revert "Move docs about contributing to new /contrib namespace"
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=6b5f70c23fda76fdd531e6cc3dc986f9b8ea0c4f
commit 6b5f70c23fda76fdd531e6cc3dc986f9b8ea0c4f
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 16:20:16 2017 +0100
Revert "Move docs about contributing to new /contrib namespace"
This reverts commit 3ffe6fe95f790926c63487825327e716f9e16a33.
---
pages/contact.txt| 2 +-
pages/{contrib/patching.txt => contact/arcanist.txt} | 0
pages/{contrib/start.txt => contribute.txt} | 0
pages/debugging/apps_efl_debugging.txt | 4 ++--
pages/{contrib => debugging}/report_bugs.txt | 0
pages/docs.txt | 6 +++---
pages/start.txt | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pages/contact.txt b/pages/contact.txt
index dd12d34f..d44ca77e 100644
--- a/pages/contact.txt
+++ b/pages/contact.txt
@@ -126,6 +126,6 @@ wiki here is newer, replacing static web pages.
Patches
-On [[https://phab.enlightenment.org|Phabricator]] the
[[https://phab.enlightenment.org/differential|Differential]] tool is used for
patch submission and review. You will need an account to submit patches. You
will also need to use the Arcanist tool to do this - please see the
[[contrib/patching|Arcanist documentation]] about how to do this.
+On [[https://phab.enlightenment.org|Phabricator]] the
[[https://phab.enlightenment.org/differential|Differential]] tool is used for
patch submission and review. You will need an account to submit patches. You
will also need to use the [[contact:arcanist|Arcanist]] tool to do this. Please
see the [[contact:arcanist|Arcanist documentation]] as to how to do this.
While the above is the preferred method, you can also send patches using
Phabricator directly. If you are unable to use Phabricator for whatever reason,
please resort to sending a patch to the mailing list, or contacting the
developers on IRC.
diff --git a/pages/contrib/patching.txt b/pages/contact/arcanist.txt
similarity index 100%
rename from pages/contrib/patching.txt
rename to pages/contact/arcanist.txt
diff --git a/pages/contrib/start.txt b/pages/contribute.txt
similarity index 100%
rename from pages/contrib/start.txt
rename to pages/contribute.txt
diff --git a/pages/debugging/apps_efl_debugging.txt
b/pages/debugging/apps_efl_debugging.txt
index 1bc4cb7d..c1a84c17 100644
--- a/pages/debugging/apps_efl_debugging.txt
+++ b/pages/debugging/apps_efl_debugging.txt
@@ -7,7 +7,7 @@
This tutorial's goal is to help you debug your EFL applications with several
use cases that you can reproduce. It gives you approaches to know if the bug
comes from your application or from the EFL libraries.
-Then, if you are sure the bug does not come from your application, you can
[[/contrib/report_bugs|report a bug]].
+Then, if you are sure the bug does not come from your application, you can
[[/debugging/report_bugs|report a bug]].
In this tutorial we'll cover log levels and tracing the sources of bugs:
@@ -485,4 +485,4 @@ In the result below, you see that all the objects are
visible and you see that w
For example in yellow, it is the Elm_box which is an Evas_box composed of an
Evas_rectangle, an Elm_Label and an Elm_Button.
-A Button widget is an Edje_Object which is composed of 4 Evas_rectangle, one
Evas_image and 2 Evas_text.
+A Button widget is an Edje_Object which is composed of 4 Evas_rectangle, one
Evas_image and 2 Evas_text.
\ No newline at end of file
diff --git a/pages/contrib/report_bugs.txt b/pages/debugging/report_bugs.txt
similarity index 100%
rename from pages/contrib/report_bugs.txt
rename to pages/debugging/report_bugs.txt
diff --git a/pages/docs.txt b/pages/docs.txt
index 5cbc155b..ce86fb6e 100755
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -72,13 +72,13 @@ We are really excited that you would like to get involved
in EFL and
Enlightenment development! If you followed the instructions in
"Getting Started" then you are most of the way to being part of the team.
To start with it's easiest to see which area you would like to work on and
-get involved in bug reporting, fixing or other types of
[[contrib/|contributing]]. From there you can get to know the
+get involved in bug reporting or fixing. From there you can get to know the
team, how we work, and earn a place on the team as a core developer :)
=== Feedback ===
- * [[contrib/report_bugs|Report bugs on Phabricator]]
- * [[contrib/patching|Submit patch on Phabricator]]
+ * [[debugging/report_bugs|Report bugs on Phabricator]]
+ * [[contact/arcanist|Submit patch on Phabricator]]
=== Debugging ===
diff --git a/pages/start.txt b/pages/start.txt
index 5b7a6d94..1b1b17ca 100644
--- a/pages/start.txt
+++ b/pages/start.txt
@@ -10,7 +10,7 @@
{{ :shot-enlightenment.png?nol
[EGIT] [website/www-content] master 04/09: Revert "We have a whole page about reporting bugs"
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=7ea05528e3bad943f70a786c2a9a8d98d2b475f8 commit 7ea05528e3bad943f70a786c2a9a8d98d2b475f8 Author: Andy Williams <a...@andywilliams.me> Date: Fri Oct 20 16:19:15 2017 +0100 Revert "We have a whole page about reporting bugs" This reverts commit 2bb1b7035124ad8e92991241cb0ad9ccd7b2fdbb. --- pages/contrib/efl-debug.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pages/contrib/efl-debug.txt b/pages/contrib/efl-debug.txt index 6182cef5..42429e56 100644 --- a/pages/contrib/efl-debug.txt +++ b/pages/contrib/efl-debug.txt @@ -634,6 +634,4 @@ You can combine options like above. See the manual page for Strace for more deta Reporting bugs -If you have encountered a bug and would like to help by reporting it please -follow our [[/contrib/report_bugs|Reporting Bugs]] page. - +Use the [[https://phab.enlightenment.org/maniphest/|Maniphest]] on Phabricator to report bugs. Don't send bug reports and patches to the Enlightenment mailing list as it strips most patches. Bug reports get lost if they're only discussed on the mailing list. If there is more discussion needed add a bug report to the discussion on the mailing list. Always test again to make sure there really is a reproducible bug before you make a ticket. Make sure you haven't changed a setting somewhere, [...] --
[EGIT] [website/www-content] master 06/09: Revert "More link fixes"
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=402b677dfe5ef9b26507d7bbe8e8a8f8af89779e commit 402b677dfe5ef9b26507d7bbe8e8a8f8af89779e Author: Andy Williams <a...@andywilliams.me> Date: Fri Oct 20 16:19:42 2017 +0100 Revert "More link fixes" This reverts commit 57b4e79160fcb960b54ccd38bf56ec5ae32ce52d. --- pages/contrib/efl-debug.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/contrib/efl-debug.txt b/pages/contrib/efl-debug.txt index 56fcde5a..322ea149 100644 --- a/pages/contrib/efl-debug.txt +++ b/pages/contrib/efl-debug.txt @@ -1,12 +1,12 @@ ~~Title: Debugging~~ -//Please also see [[/debugging/enlightenment_debugging]] and [[/debugging/apps_efl_debugging]]. This should probably be merged with these pages.// +//Please also see [[debugging/enlightenment_debugging]] and [[debugging/apps_efl_debugging]]. This should probably be merged with these pages.// Compilation -Remember to build EFL, Enlightenment etc. with debugging compile flags. [[/docs-efl-start]] has a section on this for your build environment. Remember to have ''-g'' as a ''CFLAGS'' option to ensure binaries and libraries have all the debug information they need. If you didn't build with debugging, simply build again with these flags correctly set and debugging can begin. +Remember to build EFL, Enlightenment etc. with debugging compile flags. [[docs-efl-start]] has a section on this for your build environment. Remember to have ''-g'' as a ''CFLAGS'' option to ensure binaries and libraries have all the debug information they need. If you didn't build with debugging, simply build again with these flags correctly set and debugging can begin. @@ -634,4 +634,4 @@ You can combine options like above. See the manual page for Strace for more deta Reporting bugs -Use the [[https://phab.enlightenment.org/maniphest/|Maniphest]] on Phabricator to report bugs. Don't send bug reports and patches to the Enlightenment mailing list as it strips most patches. Bug reports get lost if they're only discussed on the mailing list. If there is more discussion needed add a bug report to the discussion on the mailing list. Always test again to make sure there really is a reproducible bug before you make a ticket. Make sure you haven't changed a setting somewhere, [...] +Use the [[https://phab.enlightenment.org/maniphest/|Maniphest]] on Phabricator to report bugs. Don't send bug reports and patches to the Enlightenment mailing list as it strips most patches. Bug reports get lost if they're only discussed on the mailing list. If there is more discussion needed add a bug report to the discussion on the mailing list. Always test again to make sure there really is a reproducible bug before you make a ticket. Make sure you haven't changed a setting somewhere, [...] \ No newline at end of file --
[EGIT] [website/www-content] master 01/01: temporary pages no longer needed
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=0e0a1b3a4875990d7774404b51077c52c0e2661a commit 0e0a1b3a4875990d7774404b51077c52c0e2661a Author: Andy Williams <a...@andywilliams.me> Date: Fri Oct 20 19:36:49 2017 +0100 temporary pages no longer needed --- pages/api/javascript.txt | 1 - pages/api/javascript/ecore.txt | 1 - pages/api/javascript/ecore/animator.txt | 1 - pages/api/javascript/ecore/event.txt | 1 - pages/api/javascript/ecore/file.txt | 1 - pages/api/javascript/ecore/idle.txt | 1 - pages/api/javascript/ecore/job.txt | 1 - pages/api/javascript/ecore/mainloop.txt | 1 - pages/api/javascript/ecore/poller.txt| 1 - pages/api/javascript/ecore/throttle.txt | 1 - pages/api/javascript/ecore/timer.txt | 1 - pages/api/javascript/eina.txt| 1 - pages/api/javascript/eina/containers.txt | 1 - pages/api/javascript/eina/logging.txt| 1 - pages/api/javascript/eina/value.txt | 1 - pages/api/javascript/eio.txt | 1 - pages/api/javascript/ethumb.txt | 1 - 17 files changed, 17 deletions(-) diff --git a/pages/api/javascript.txt b/pages/api/javascript.txt deleted file mode 100644 index 061cc421.. --- a/pages/api/javascript.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:start]]. \ No newline at end of file diff --git a/pages/api/javascript/ecore.txt b/pages/api/javascript/ecore.txt deleted file mode 100644 index 33a20b56.. --- a/pages/api/javascript/ecore.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:start:ecore]]. \ No newline at end of file diff --git a/pages/api/javascript/ecore/animator.txt b/pages/api/javascript/ecore/animator.txt deleted file mode 100644 index 7e88583d.. --- a/pages/api/javascript/ecore/animator.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:ecore:animator]]. \ No newline at end of file diff --git a/pages/api/javascript/ecore/event.txt b/pages/api/javascript/ecore/event.txt deleted file mode 100644 index b87a1106.. --- a/pages/api/javascript/ecore/event.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:ecore:event]]. \ No newline at end of file diff --git a/pages/api/javascript/ecore/file.txt b/pages/api/javascript/ecore/file.txt deleted file mode 100644 index c2dc14c0.. --- a/pages/api/javascript/ecore/file.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:ecore:file]]. \ No newline at end of file diff --git a/pages/api/javascript/ecore/idle.txt b/pages/api/javascript/ecore/idle.txt deleted file mode 100644 index 1371d623.. --- a/pages/api/javascript/ecore/idle.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:ecore:idle]]. \ No newline at end of file diff --git a/pages/api/javascript/ecore/job.txt b/pages/api/javascript/ecore/job.txt deleted file mode 100644 index d1354c42.. --- a/pages/api/javascript/ecore/job.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:ecore:job]]. \ No newline at end of file diff --git a/pages/api/javascript/ecore/mainloop.txt b/pages/api/javascript/ecore/mainloop.txt deleted file mode 100644 index 501a88a5.. --- a/pages/api/javascript/ecore/mainloop.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:ecore:mainloop]]. \ No newline at end of file diff --git a/pages/api/javascript/ecore/poller.txt b/pages/api/javascript/ecore/poller.txt deleted file mode 100644 index cf8fd50d.. --- a/pages/api/javascript/ecore/poller.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:ecore:poller]]. \ No newline at end of file diff --git a/pages/api/javascript/ecore/throttle.txt b/pages/api/javascript/ecore/throttle.txt deleted file mode 100644 index 5b90a436.. --- a/pages/api/javascript/ecore/throttle.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:ecore:throttle]]. \ No newline at end of file diff --git a/pages/api/javascript/ecore/timer.txt b/pages/api/javascript/ecore/timer.txt deleted file mode 100644 index c289145f.. --- a/pages/api/javascript/ecore/timer.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:ecore:timer]]. \ No newline at end of file diff --git a/pages/api/javascript/eina.txt b/pages/api/javascript/eina.txt deleted file mode 100644 index 16064b16.. --- a/pages/api/javascript/eina.txt +++ /dev/null @@ -1 +0,0 @@ -This page is redirected to [[:develop:legacy:api:javascript:eina]]. \ No newline at end of file diff --git a/pages/api/javascript/eina/containers.txt b/pages/api/javascript/eina/containers.txt d
[EGIT] [website/www] master 01/01: Add Apache redirects for all our old pages so we can clear out temporary files
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=71c88d23c48c77c129743c4610c1c01dbf808acf
commit 71c88d23c48c77c129743c4610c1c01dbf808acf
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 18:53:11 2017 +0100
Add Apache redirects for all our old pages so we can clear out temporary
files
---
public_html/.htaccess | 41 +
1 file changed, 41 insertions(+)
diff --git a/public_html/.htaccess b/public_html/.htaccess
index fbc67dce..6550c667 100644
--- a/public_html/.htaccess
+++ b/public_html/.htaccess
@@ -2,6 +2,46 @@ Options FollowSymlinks
RewriteEngine On
+# refactoring of content without the need for redirect files
+RewriteRule ^docs-efl-debug/contrib/efl-debug
[R,L]
+RewriteRule ^debugging/enlightenment_debugging
/contrib/enlightenment_debugging[R,L]
+RewriteRule ^debugging/remote_debugging
/develop/remote_debugging [R,L]
+RewriteRule ^debugging/apps_efl_debugging /develop/apps_efl_debugging
[R,L]
+RewriteRule ^debugging/report_bugs /contrib/reporting_bugs
[R,L]
+RewriteRule ^contribute/contrib/start
[R,L]
+RewriteRule ^contact/arcanist /contrib/patching [R,L]
+
+RewriteRule ^docs/efl/ecore_idlers
/develop/efl/ecore_idlers [R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/colors
/develop/efl/advanced/eflgfxfilter/colors [R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/curve
/develop/efl/advanced/eflgfxfilter/curve[R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/blend
/develop/efl/advanced/eflgfxfilter/blend[R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/buffer
/develop/efl/advanced/eflgfxfilter/buffer [R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/fill
/develop/efl/advanced/eflgfxfilter/fill [R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/mask
/develop/efl/advanced/eflgfxfilter/mask [R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/blur
/develop/efl/advanced/eflgfxfilter/blur [R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/fillmodes
/develop/efl/advanced/eflgfxfilter/fillmodes[R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/padding
/develop/efl/advanced/eflgfxfilter/padding [R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/grow
/develop/efl/advanced/eflgfxfilter/grow [R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/displace
/develop/efl/advanced/eflgfxfilter/displace [R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/state
/develop/efl/advanced/eflgfxfilter/state[R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/bump
/develop/efl/advanced/eflgfxfilter/bump [R,L]
+RewriteRule ^docs/efl/advanced/eflgfxfilter/transform
/develop/efl/advanced/eflgfxfilter/transform[R,L]
+RewriteRule ^docs/efl/advanced/dnd
/develop/efl/advanced/dnd [R,L]
+RewriteRule ^docs/efl/advanced/start
/develop/efl/advanced/start [R,L]
+RewriteRule ^docs/efl/start/develop/efl/start
[R,L]
+
+RewriteRule ^docs-efl-start/docs/distros/start [R,L]
+RewriteRule ^distros/yocto-start /docs/distros/yocto-start [R,L]
+RewriteRule ^distros/freebsd-start /docs/distros/freebsd-start [R,L]
+RewriteRule ^distros/osx-start /docs/distros/osx-start [R,L]
+RewriteRule ^distros/opensuse-start/docs/distros/opensuse-start[R,L]
+RewriteRule ^distros/ubuntu-start /docs/distros/ubuntu-start [R,L]
+RewriteRule ^distros/archlinux-start /docs/distros/archlinux-start [R,L]
+RewriteRule ^distros/debian-start /docs/distros/debian-start [R,L]
+RewriteRule ^distros/fedora-start /docs/distros/fedora-start [R,L]
+
+#end refactoring rules
+
RewriteCond %{HTTP_HOST} =enlightenment.org [NC]
RewriteRule (.*) https://www.enlightenment.org/$1 [R=301,L]
@@ -23,3 +63,4 @@ AddType application/ogg ogv
AddType video/ogg ogv
AddType application/mp4 mp4
AddType video/mp4 mp4
+
--
[EGIT] [website/www-content] master 01/01: Moving C legacy to a namespace
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=8ba33f341569f3e1256edf7d3c098aa8cb03600c
commit 8ba33f341569f3e1256edf7d3c098aa8cb03600c
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 19:11:44 2017 +0100
Moving C legacy to a namespace
---
pages/develop/legacy/api/{c.txt => c/start.txt} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/pages/develop/legacy/api/c.txt
b/pages/develop/legacy/api/c/start.txt
similarity index 100%
rename from pages/develop/legacy/api/c.txt
rename to pages/develop/legacy/api/c/start.txt
--
[EGIT] [website/www-content] master 01/01: Fix relative links in new javascript location
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=9c35c324442a1039a7e600c226a5a4b9c7d6c6ec commit 9c35c324442a1039a7e600c226a5a4b9c7d6c6ec Author: Andy Williams <a...@andywilliams.me> Date: Fri Oct 20 19:25:16 2017 +0100 Fix relative links in new javascript location --- pages/develop/legacy/api/javascript/ecore.txt| 20 ++-- .../develop/legacy/api/javascript/ecore/animator.txt | 4 ++-- pages/develop/legacy/api/javascript/ecore/event.txt | 2 +- pages/develop/legacy/api/javascript/ecore/file.txt | 4 ++-- pages/develop/legacy/api/javascript/ecore/idle.txt | 4 ++-- pages/develop/legacy/api/javascript/ecore/job.txt| 4 ++-- .../develop/legacy/api/javascript/ecore/mainloop.txt | 2 +- pages/develop/legacy/api/javascript/ecore/poller.txt | 4 ++-- .../develop/legacy/api/javascript/ecore/throttle.txt | 4 ++-- pages/develop/legacy/api/javascript/ecore/timer.txt | 4 ++-- pages/develop/legacy/api/javascript/eina.txt | 14 +++--- .../legacy/api/javascript/eina/containers.txt| 4 ++-- pages/develop/legacy/api/javascript/eina/logging.txt | 4 ++-- pages/develop/legacy/api/javascript/eina/value.txt | 4 ++-- pages/develop/legacy/api/javascript/eio.txt | 4 ++-- pages/develop/legacy/api/javascript/ethumb.txt | 4 ++-- pages/develop/legacy/api/javascript/start.txt| 12 ++-- pages/develop/legacy/api/javascript/start/ecore.txt | 1 - 18 files changed, 49 insertions(+), 50 deletions(-) diff --git a/pages/develop/legacy/api/javascript/ecore.txt b/pages/develop/legacy/api/javascript/ecore.txt index 94ce6f45..c45d4eb9 100644 --- a/pages/develop/legacy/api/javascript/ecore.txt +++ b/pages/develop/legacy/api/javascript/ecore.txt @@ -1,25 +1,25 @@ == Javascript binding API - ECore - Operating system abstraction and integration == -[[api:javascript|Back to the JS EFL page]] +[[:develop:legacy:api:javascript:|Back to the JS EFL page]] The ECore library provides tools to enhance the integration between the application and the operating system. = Components = -[[api/javascript/ecore/animator|Animator API reference]] - Simplify the creation of animations. +[[./ecore/animator|Animator API reference]] - Simplify the creation of animations. -[[api/javascript/ecore/event| Event API reference]] - Creation and notification of events. +[[./ecore/event| Event API reference]] - Creation and notification of events. -[[api/javascript/ecore/file| File API reference]] - File and directory handling. +[[./ecore/file| File API reference]] - File and directory handling. -[[api/javascript/ecore/idle| Idle API reference]] - Creation of callbacks to be called when the application is not handling events, timers or file handlers. +[[./ecore/idle| Idle API reference]] - Creation of callbacks to be called when the application is not handling events, timers or file handlers. -[[api/javascript/ecore/job| Job API reference]] - Queuing jobs for later execution. +[[./ecore/job| Job API reference]] - Queuing jobs for later execution. -[[api/javascript/ecore/mainloop| Mainloop API reference]] - Integration with EFL main loop. +[[./ecore/mainloop| Mainloop API reference]] - Integration with EFL main loop. -[[api/javascript/ecore/poller| Poller API reference]] - Provides an infrastructure for creation of pollers. +[[./ecore/poller| Poller API reference]] - Provides an infrastructure for creation of pollers. -[[api/javascript/ecore/throttle| Throttle API reference]] - Sets the "voluntary throlling" by the EFL main loop. +[[./ecore/throttle| Throttle API reference]] - Sets the "voluntary throlling" by the EFL main loop. -[[api/javascript/ecore/timer| Timer API reference]] - Handling of timer callbacks. \ No newline at end of file +[[./ecore/timer| Timer API reference]] - Handling of timer callbacks. diff --git a/pages/develop/legacy/api/javascript/ecore/animator.txt b/pages/develop/legacy/api/javascript/ecore/animator.txt index d6c0a2f1..593e640b 100644 --- a/pages/develop/legacy/api/javascript/ecore/animator.txt +++ b/pages/develop/legacy/api/javascript/ecore/animator.txt @@ -1,6 +1,6 @@ = Javascript binding API - Ecore Animator = -[[api:javascript:ecore|Back to the JS Ecore page]] +[[:develop:legacy:api:javascript:ecore|Back to the JS Ecore page]] **DRAFT*** @@ -274,4 +274,4 @@ Syntax animatorObj.del() -Deletes an animator. \ No newline at end of file +Deletes an animator. diff --git a/pages/develop/legacy/api/javascript/ecore/event.txt b/pages/develop/legacy/api/javascript/ecore/event.txt index 2d202f3a..d4145219 100644 --- a/pages/develop/legacy/api/javascript/ecore/event.txt +++ b/pages/develop/legacy/api/javascript/ecore/event.txt @@ -1,6 +1,6 @@ = Javascript binding API - Ecore Events = -[[api:javascript:ecore|Back to the JS Ecore page]] +[[:develop:legacy:api:javas
[EGIT] [website/www] master 01/01: 302 redirects for javascript to legacy area
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=c84d6445ab56baa7bc7162bbef445f91ef67b947
commit c84d6445ab56baa7bc7162bbef445f91ef67b947
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 19:34:31 2017 +0100
302 redirects for javascript to legacy area
---
public_html/.htaccess | 18 ++
1 file changed, 18 insertions(+)
diff --git a/public_html/.htaccess b/public_html/.htaccess
index 6550c667..7fa57556 100644
--- a/public_html/.htaccess
+++ b/public_html/.htaccess
@@ -40,6 +40,24 @@ RewriteRule ^distros/archlinux-start
/docs/distros/archlinux-start [R,L]
RewriteRule ^distros/debian-start /docs/distros/debian-start [R,L]
RewriteRule ^distros/fedora-start /docs/distros/fedora-start [R,L]
+RewriteRule ^api/javascript/eio
/develop/legacy/api/javascript/eio [R,L]
+RewriteRule ^api/javascript/ecore/file
/develop/legacy/api/javascript/ecore/file [R,L]
+RewriteRule ^api/javascript/ecore/animator
/develop/legacy/api/javascript/ecore/animator [R,L]
+RewriteRule ^api/javascript/ecore/job
/develop/legacy/api/javascript/ecore/job[R,L]
+RewriteRule ^api/javascript/ecore/idle
/develop/legacy/api/javascript/ecore/idle [R,L]
+RewriteRule ^api/javascript/ecore/mainloop
/develop/legacy/api/javascript/ecore/mainloop [R,L]
+RewriteRule ^api/javascript/ecore/event
/develop/legacy/api/javascript/ecore/event [R,L]
+RewriteRule ^api/javascript/ecore/timer
/develop/legacy/api/javascript/ecore/timer [R,L]
+RewriteRule ^api/javascript/ecore/throttle
/develop/legacy/api/javascript/ecore/throttle [R,L]
+RewriteRule ^api/javascript/ecore/poller
/develop/legacy/api/javascript/ecore/poller [R,L]
+RewriteRule ^api/javascript/ethumb
/develop/legacy/api/javascript/ethumb [R,L]
+RewriteRule ^api/javascript/eina
/develop/legacy/api/javascript/eina [R,L]
+RewriteRule ^api/javascript/eina/containers
/develop/legacy/api/javascript/eina/containers [R,L]
+RewriteRule ^api/javascript/eina/logging
/develop/legacy/api/javascript/eina/logging [R,L]
+RewriteRule ^api/javascript/eina/value
/develop/legacy/api/javascript/eina/value [R,L]
+RewriteRule ^api/javascript/ecore
/develop/legacy/api/javascript/ecore[R,L]
+RewriteRule ^api/javascript
/develop/legacy/api/javascript/start[R,L]
+
#end refactoring rules
RewriteCond %{HTTP_HOST} =enlightenment.org [NC]
--
[EGIT] [website/www-content] master 01/01: Move includes into an incl namespace for tidyness
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=85c66fb91056629aceedcbafd18e71543b511e9d
commit 85c66fb91056629aceedcbafd18e71543b511e9d
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 20 20:13:40 2017 +0100
Move includes into an incl namespace for tidyness
---
pages/about.txt | 2 +-
pages/contact.txt | 2 +-
pages/contrib/start.txt | 2 +-
pages/docs.txt| 2 +-
pages/download.txt| 4 ++--
pages/{ => incl}/donation-buttons.txt | 0
pages/{ => incl}/start-release.txt| 0
pages/{ => incl}/start-shortcuts.txt | 0
pages/news.txt| 2 +-
pages/start.txt | 6 +++---
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pages/about.txt b/pages/about.txt
index a0de3112..f9037291 100644
--- a/pages/about.txt
+++ b/pages/about.txt
@@ -1,6 +1,6 @@
~~Title: About~~
-{{page>start-shortcuts}}
+{{page>incl:start-shortcuts}}
More than a Window Manager
diff --git a/pages/contact.txt b/pages/contact.txt
index 22255032..919a4a6e 100644
--- a/pages/contact.txt
+++ b/pages/contact.txt
@@ -1,6 +1,6 @@
~~Title: Contact Us~~
-{{page>start-shortcuts}}
+{{page>incl:start-shortcuts}}
Community and Developer Behavior Guidelines
diff --git a/pages/contrib/start.txt b/pages/contrib/start.txt
index 052f93a1..5ce07682 100644
--- a/pages/contrib/start.txt
+++ b/pages/contrib/start.txt
@@ -24,4 +24,4 @@ Enlightenment Association is a non-profit organisation, under
French law. Enligh
Donate to Enlightenment via Bitcoin, PayPal or Flattr. There is no minimal
amount for your donation.
-{{page>:donation-buttons}}
+{{page>incl:donation-buttons}}
diff --git a/pages/docs.txt b/pages/docs.txt
index a7ee5929..e3182f0c 100755
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -1,6 +1,6 @@
~~Title: Documentation~~
-{{page>start-shortcuts}}
+{{page>incl:start-shortcuts}}
Enlightenment and EFL Developer Documentation
diff --git a/pages/download.txt b/pages/download.txt
index 02a21a84..059ffa00 100644
--- a/pages/download.txt
+++ b/pages/download.txt
@@ -1,6 +1,6 @@
~~Title: Download~~
-{{page>start-shortcuts}}
+{{page>incl:start-shortcuts}}
Download
@@ -57,4 +57,4 @@ All our git repositories are listed on:
{{page>download-e16}}
-~~DISCUSSIONS~~
\ No newline at end of file
+~~DISCUSSIONS~~
diff --git a/pages/donation-buttons.txt b/pages/incl/donation-buttons.txt
similarity index 100%
rename from pages/donation-buttons.txt
rename to pages/incl/donation-buttons.txt
diff --git a/pages/start-release.txt b/pages/incl/start-release.txt
similarity index 100%
rename from pages/start-release.txt
rename to pages/incl/start-release.txt
diff --git a/pages/start-shortcuts.txt b/pages/incl/start-shortcuts.txt
similarity index 100%
rename from pages/start-shortcuts.txt
rename to pages/incl/start-shortcuts.txt
diff --git a/pages/news.txt b/pages/news.txt
index bf6aeaa4..303cd982 100644
--- a/pages/news.txt
+++ b/pages/news.txt
@@ -1,6 +1,6 @@
~~Title: News~~
-{{page>start-shortcuts}}
+{{page>incl:start-shortcuts}}
News
~~NOCACHE~~
diff --git a/pages/start.txt b/pages/start.txt
index 5b7a6d94..bde0d03c 100644
--- a/pages/start.txt
+++ b/pages/start.txt
@@ -1,8 +1,8 @@
~~Title: Enlightenment Main~~
-{{page>start-shortcuts}}
-{{page>start-event}}
-{{page>start-release}}
+{{page>incl:start-shortcuts}}
+{{page>incl:start-event}}
+{{page>incl:start-release}}
{{ :e-logo-title.svg?nolink |}}
--
[EGIT] [website/www] master 01/01: oops, missed filter parent doc
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=ef47ae8c1995a42a383f63fc6c7a169bcdc5b806 commit ef47ae8c1995a42a383f63fc6c7a169bcdc5b806 Author: Andy Williams <a...@andywilliams.me> Date: Fri Oct 20 20:24:14 2017 +0100 oops, missed filter parent doc --- public_html/.htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/public_html/.htaccess b/public_html/.htaccess index 1199b82b..c175b59c 100644 --- a/public_html/.htaccess +++ b/public_html/.htaccess @@ -12,6 +12,7 @@ RewriteRule ^contribute /contrib/start [R,L] RewriteRule ^contact/arcanist /contrib/patching [R,L] RewriteRule ^docs/efl/ecore_idlers /develop/efl/ecore_idlers [R,L] +RewriteRule ^docs/efl/advanced/eflgfxfilters /develop/efl/advanced/eflgfxfilters [R,L] RewriteRule ^docs/efl/advanced/eflgfxfilter/colors /develop/efl/advanced/eflgfxfilter/colors [R,L] RewriteRule ^docs/efl/advanced/eflgfxfilter/curve /develop/efl/advanced/eflgfxfilter/curve[R,L] RewriteRule ^docs/efl/advanced/eflgfxfilter/blend /develop/efl/advanced/eflgfxfilter/blend[R,L] --
[EGIT] [website/www] master 01/01: Don't HTML encode code
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=2f9eb41a1acc625dad24acffe00c00d99c722d30
commit 2f9eb41a1acc625dad24acffe00c00d99c722d30
Author: Andy Williams <a...@andywilliams.me>
Date: Thu Oct 26 13:23:21 2017 +0100
Don't HTML encode code
---
public_html/lib/plugins/markdownextra/markdown.php | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/public_html/lib/plugins/markdownextra/markdown.php
b/public_html/lib/plugins/markdownextra/markdown.php
index cb1ed3aa..79e6260a 100755
--- a/public_html/lib/plugins/markdownextra/markdown.php
+++ b/public_html/lib/plugins/markdownextra/markdown.php
@@ -1133,10 +1133,7 @@ class Markdown_Parser {
return $text;
}
function _doCodeBlocks_callback($matches) {
- $codeblock = $matches[1];
-
- $codeblock = $this->outdent($codeblock);
- $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+ $codeblock = $this->outdent($matches[1]);
# trim leading newlines and trailing newlines
$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
@@ -1150,8 +1147,7 @@ class Markdown_Parser {
#
# Create a code span markup for $code. Called from handleSpanToken.
#
- $code = htmlspecialchars(trim($code), ENT_NOQUOTES);
- return $this->hashPart("$code");
+ return $this->hashPart("".trim($code)."");
}
@@ -2961,7 +2957,6 @@ class MarkdownExtra_Parser extends Markdown_Parser {
$classname =& $matches[2];
$attrs =& $matches[3];
$codeblock = $matches[4];
- $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
$codeblock = preg_replace_callback('/^\n+/',
array(&$this, '_doFencedCodeBlocks_newlines'),
$codeblock);
--
[EGIT] [core/efl] master 01/01: elm_code: Fix usage of basename
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0a068ac549e0dbdc27fec5925a99934ec09d9855 commit 0a068ac549e0dbdc27fec5925a99934ec09d9855 Author: Andy Williams <a...@andywilliams.me> Date: Sun Dec 31 15:28:23 2017 + elm_code: Fix usage of basename --- src/lib/elementary/elm_code_file.c | 2 +- src/tests/elementary/elm_code_file_test_load.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_code_file.c b/src/lib/elementary/elm_code_file.c index 1094929f1a..32b32a3449 100644 --- a/src/lib/elementary/elm_code_file.c +++ b/src/lib/elementary/elm_code_file.c @@ -75,7 +75,7 @@ EAPI const char *elm_code_file_filename_get(Elm_Code_File *file) if (!file->file) return NULL; - return basename((char *)eina_file_filename_get(file->file)); + return ecore_file_file_get(eina_file_filename_get(file->file)); } EAPI const char *elm_code_file_path_get(Elm_Code_File *file) diff --git a/src/tests/elementary/elm_code_file_test_load.c b/src/tests/elementary/elm_code_file_test_load.c index 7e21b235f1..30cd30e534 100644 --- a/src/tests/elementary/elm_code_file_test_load.c +++ b/src/tests/elementary/elm_code_file_test_load.c @@ -19,7 +19,7 @@ START_TEST (elm_code_file_load) file = elm_code_file_open(code, path); realpath(path, real); - ck_assert_str_eq(basename(path), elm_code_file_filename_get(file)); + ck_assert_str_eq(ecore_file_file_get(path), elm_code_file_filename_get(file)); ck_assert_str_eq(real, elm_code_file_path_get(file)); elm_code_file_close(file); elm_code_free(code); --
[EGIT] [core/efl] master 01/01: Fix and simpligy windows behaviour.
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d234458dfcd9202c33f75049da6ebdad7888f4c5
commit d234458dfcd9202c33f75049da6ebdad7888f4c5
Author: Andy Williams <a...@andywilliams.me>
Date: Sun Dec 31 16:08:31 2017 +
Fix and simpligy windows behaviour.
Author: Vincent Torri
---
src/Makefile_Evil.am | 1 +
src/bin/edje/edje_cc_out.c | 1 +
src/lib/ecore_con/ecore_con_local.c| 1 +
src/lib/ecore_con/ecore_con_url.c | 1 +
src/lib/ecore_file/ecore_file.c| 7 +-
src/lib/eio/eio_model.c| 1 +
src/lib/evil/evil_libgen.c | 100 -
src/lib/evil/evil_libgen.h | 89 --
src/tests/elementary/elm_code_file_test_load.c | 2 +
src/tests/evil/evil_suite.c| 1 +
src/tests/evil/evil_suite.h| 1 +
11 files changed, 11 insertions(+), 194 deletions(-)
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index f93b226f9c..39baaef671 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -126,6 +126,7 @@ tests_evil_evil_suite_SOURCES = \
tests/evil/evil_suite.c \
tests/evil/evil_suite.h \
tests/evil/evil_test_dlfcn.c \
+tests/evil/evil_test_libgen.c \
tests/evil/evil_test_main.c \
tests/evil/evil_test_stdio.c \
tests/evil/evil_test_stdlib.c
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index da36943c4c..63d5a61dd8 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
#include
diff --git a/src/lib/ecore_con/ecore_con_local.c
b/src/lib/ecore_con/ecore_con_local.c
index 2e83774ec1..874fd7b2c7 100644
--- a/src/lib/ecore_con/ecore_con_local.c
+++ b/src/lib/ecore_con/ecore_con_local.c
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#ifdef HAVE_SYSTEMD
# include
diff --git a/src/lib/ecore_con/ecore_con_url.c
b/src/lib/ecore_con/ecore_con_url.c
index 39412d7f83..a05866f750 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -17,6 +17,7 @@
#include
#include
#include
+#include
#include "Ecore.h"
#include "ecore_private.h"
diff --git a/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c
index 14c1934853..15d96edb6e 100644
--- a/src/lib/ecore_file/ecore_file.c
+++ b/src/lib/ecore_file/ecore_file.c
@@ -5,11 +5,8 @@
#include
#include
#include
-
-#ifndef _MSC_VER
-# include
-# include
-#endif
+#include
+#include
#ifdef _WIN32
# include
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index e9b6bfb85a..5ab4deb86f 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -3,6 +3,7 @@
#endif
#include
+#include
#include
#include
diff --git a/src/lib/evil/evil_libgen.c b/src/lib/evil/evil_libgen.c
deleted file mode 100644
index d96ba5bae8..00
--- a/src/lib/evil/evil_libgen.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#include
-
-#include "evil_macro.h"
-#include "evil_libgen.h"
-
-char _evil_basename_buf[PATH_MAX];
-char _evil_dirname_buf[PATH_MAX];
-
-char *
-evil_basename(char *path)
-{
- char *p1;
- char *p2;
- size_t length;
-
- /* path must begin by "?:\" or "?:/" */
- if ((!path) || !evil_path_is_absolute(path))
- {
-memcpy(_evil_basename_buf, "C:\\", 4);
-return _evil_basename_buf;
- }
-
- /* '/' --> '\\' */
- length = strlen(path);
- p1 = strdup(path);
- if (!p1)
- {
-memcpy(_evil_basename_buf, "C:\\", 4);
-return _evil_basename_buf;
- }
-
- EVIL_PATH_SEP_UNIX_TO_WIN32(p1);
-
- /* remove trailing backslashes */
- p2 = p1 + (length - 1);
- if (*p2 == '\\')
- {
- while (*p2 == '\\')
- p2--;
- }
- *(p2 + 1) = '\0';
-
- p2 = strrchr(p1, '\\');
- memcpy(_evil_basename_buf, p2 + 1, (p1 + length + 1) - p2);
-
- free(p1);
-
- return _evil_basename_buf;
-}
-
-char *
-evil_dirname(char *path)
-{
- char *p1;
- char *p2;
- size_t length;
-
- /* path must begin by "?:\" or "?:/" */
- if ((!path) || !evil_path_is_absolute(path))
- {
-memcpy(_evil_dirname_buf, "C:\\", 4);
-return _evil_dirname_buf;
- }
-
- /* '/' --> '\\' */
- length = strlen(path);
- p1 = strdup(path);
- if (!p1)
- {
-memcpy(_evil_dirname_buf, "C:\\", 4);
-return _evil_dirname_buf;
- }
- p2 = p1;
- while (*p2)
- {
-if (*p2 == '/') *p2 = '\\';
-p2++;
- }
-
- /* remove trailing backslashes */
- p2 = p1 + (length - 1);
- if (*p2 == '\\')
- {
- while (*p2 == '\\')
- p2--
[EGIT] [tools/examples] master 01/01: Remove efl_loop_main references, we should use our allocated loop
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=e9e0834b26e1970033c24bd24a6d2d0e983f8a42
commit e9e0834b26e1970033c24bd24a6d2d0e983f8a42
Author: Andy Williams <a...@andywilliams.me>
Date: Thu Jan 4 19:28:26 2018 +
Remove efl_loop_main references, we should use our allocated loop
---
reference/c/core/src/core_loop.c | 5 +--
reference/c/eina/src/eina_future.c | 62 ++
reference/c/net/src/net_session.c | 6 ++--
3 files changed, 35 insertions(+), 38 deletions(-)
diff --git a/reference/c/core/src/core_loop.c b/reference/c/core/src/core_loop.c
index 52d6538..35116e8 100644
--- a/reference/c/core/src/core_loop.c
+++ b/reference/c/core/src/core_loop.c
@@ -122,10 +122,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
version = efl_loop_efl_version_get(loop);
printf("Running on EFL version %d.%d.%d [%s]\n\n", version->major,
version->minor,
version->micro,
version->build_id);
- _print_loop(loop, "Current");
-
- loop = efl_loop_main_get(loop);
- _print_loop(loop, "Application Main");
+ _print_loop(loop, "Application");
loop = efl_add(EFL_LOOP_CONSUMER_CLASS, loop,
efl_name_set(efl_added, "Loop Consumer"));
diff --git a/reference/c/eina/src/eina_future.c
b/reference/c/eina/src/eina_future.c
index 55f6ebf..d1b88a7 100644
--- a/reference/c/eina/src/eina_future.c
+++ b/reference/c/eina/src/eina_future.c
@@ -17,10 +17,10 @@
* the promise is resolved, passing a value among them.
*/
-static void _test1_simple_future();
-static void _test2_failed_future();
-static void _test3_cancelled_future();
-static void _test4_chained_future();
+static void _test1_simple_future(Efl_Loop *loop);
+static void _test2_failed_future(Efl_Loop *loop);
+static void _test3_cancelled_future(Efl_Loop *loop);
+static void _test4_chained_future(Efl_Loop *loop);
/* --- Generic helper methods -- */
@@ -28,11 +28,10 @@ static void _test4_chained_future();
* This simple method prints the content of a value and passes it on.
*/
static Eina_Value
-_value_print(void *data, const Eina_Value value)
+_value_print(void *data EINA_UNUSED, const Eina_Value value)
{
- Eina_Promise *promise = (Eina_Promise *)data;
char *str = eina_value_to_string();
- printf(" Success callback: Promise %p resolved to '%s'\n", promise, str);
+ printf(" Success callback: Promise resolved to '%s'\n", str);
free(str);
return value;
@@ -53,8 +52,7 @@ _promise_cancel(void *data EINA_UNUSED, const Eina_Promise
*dead EINA_UNUSED)
static Eina_Value
_error_print(void *data EINA_UNUSED, const Eina_Error error)
{
- Eina_Promise *promise = (Eina_Promise *)data;
- printf(" Error callback: Promise %p encountered error '%s'\n", promise,
+ printf(" Error callback: Promise encountered error '%s'\n",
eina_error_msg_get(error));
return EINA_VALUE_EMPTY;
@@ -75,21 +73,21 @@ _test1_resolve(void *data, const Efl_Event *event)
/* Launches the next test */
static void
-_test1_next_test(void *data EINA_UNUSED, const Eina_Future *dead_future
EINA_UNUSED)
+_test1_next_test(void *data, const Eina_Future *dead_future EINA_UNUSED)
{
+ Efl_Loop *loop = data;
+
printf(" Test 1 finished\n");
- _test2_failed_future();
+ _test2_failed_future(loop);
}
/* TEST 1: Set up a promised future and resolve it from a timer callback */
static void
-_test1_simple_future()
+_test1_simple_future(Efl_Loop *loop)
{
- Efl_Loop *loop;
Eina_Promise *promise;
// Create a promise
- loop = efl_loop_main_get(EFL_LOOP_CLASS);
promise = eina_promise_new(efl_loop_future_scheduler_get(loop),
_promise_cancel, NULL);
printf("Test 1: Waiting for promise %p to be resolved...\n", promise);
@@ -99,7 +97,7 @@ _test1_simple_future()
eina_future_then_easy(eina_future_new(promise),
.success = _value_print,
.free = _test1_next_test,
- .data = promise);
+ .data = loop);
// Set up a regular timer that will trigger after 1s. We use it to
// simulate a delayed promise resolve.
@@ -124,21 +122,21 @@ _test2_reject(void *data, const Efl_Event *event)
/* Launches the next test */
static void
-_test2_next_test(void *data EINA_UNUSED, const Eina_Future *dead_future
EINA_UNUSED)
+_test2_next_test(void *data, const Eina_Future *dead_future EINA_UNUSED)
{
+ Efl_Loop *loop = data;
+
printf(" Test 2 finished\n");
- _test3_cancelled_future();
+ _test3_cancelled_future(loop);
}
/* TEST 2: Set up a promised future and reject it from a timer callback */
static void
-_test2_failed_future()
+_te
[EGIT] [tools/examples] master 01/01: texteditor: Fix bac merge
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/examples.git/commit/?id=5ef0044cca3a65e36b35caef69e1732a788aa6f8 commit 5ef0044cca3a65e36b35caef69e1732a788aa6f8 Author: Andy Williams <a...@andywilliams.me> Date: Sat Jan 6 15:44:43 2018 + texteditor: Fix bac merge --- apps/c/texteditor/src/texteditor_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/c/texteditor/src/texteditor_main.c b/apps/c/texteditor/src/texteditor_main.c index 9600322..3a7e428 100644 --- a/apps/c/texteditor/src/texteditor_main.c +++ b/apps/c/texteditor/src/texteditor_main.c @@ -107,7 +107,7 @@ _gui_setup() efl_text_multiline_set(efl_added, EINA_TRUE), efl_ui_text_interactive_editable_set(efl_added, EINA_TRUE), efl_ui_text_scrollable_set(efl_added, EINA_TRUE), - efl_event_callback_array_add(efl_added, _editor_callbacks(), _editor_changed_cb, NULL), + efl_event_callback_array_add(efl_added, _editor_callbacks(), NULL), efl_pack(box, efl_added)); } --
