hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=c62b19e9c797f14f195d83b27788cfe36f39ff37
commit c62b19e9c797f14f195d83b27788cfe36f39ff37
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Thu Oct 23 10:50:37 2014 +0900
auto_comp: Support auto_comp and color for keyword box, table, item, items,
layout, and padding.
Summary: auto_comp: Support auto_comp and color for keyword box, table,
item, items, layout, and padding.
Reviewers: Hermet
Differential Revision: https://phab.enlightenment.org/D1564
Conflicts:
src/lib/auto_comp_code.h
---
data/color/color.src | 7 ++++++-
src/lib/auto_comp.c | 6 ++++++
src/lib/auto_comp_code.h | 46 +++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/data/color/color.src b/data/color/color.src
index 2f8f088..8ec8715 100644
--- a/data/color/color.src
+++ b/data/color/color.src
@@ -26,6 +26,7 @@ group "syntax_color_group" struct {
group "color" struct {
value "val" string: "2070D0";
group "keys" list {
+ value "key" string: "box";
value "key" string: "collections";
value "key" string: "data";
value "key" string: "description";
@@ -35,6 +36,8 @@ group "syntax_color_group" struct {
value "key" string: "images";
value "key" string: "image ";
value "key" string: "image.";
+ value "key" string: "items";
+ value "key" string: "item";
value "key" string: "map";
value "key" string: "origin";
value "key" string: "parts";
@@ -51,6 +54,7 @@ group "syntax_color_group" struct {
value "key" string: "sounds";
value "key" string: "styles";
value "key" string: "size ";
+ value "key" string: "table";
value "key" string: "text ";
value "key" string: "text.";
}
@@ -89,7 +93,7 @@ group "syntax_color_group" struct {
value "key" string: "insert_after";
value "key" string: "insert_before";
value "key" string: "in";
- value "key" string: "item";
+ value "key" string: "layout";
value "key" string: "max";
value "key" string: "middle";
value "key" string: "min";
@@ -99,6 +103,7 @@ group "syntax_color_group" struct {
value "key" string: "normal";
value "key" string: "offset";
value "key" string: "on";
+ value "key" string: "padding:";
value "key" string: "perspective:";
value "key" string: "perspective_on";
value "key" string: "relative";
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 2dc24e7..44530e6 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -112,6 +112,12 @@ init_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
COMPDATA_SET(ad, "fixed", AUTOCOMP_FIXED, 1, 0);
COMPDATA_SET(ad, "clip_to", AUTOCOMP_CLIP_TO, 2, 0);
COMPDATA_SET(ad, "tween", AUTOCOMP_TWEEN, 2, 0);
+ COMPDATA_SET(ad, "box",AUTOCOMP_BOX, 2, 1);
+ COMPDATA_SET(ad, "table",AUTOCOMP_TABLE, 2, 1);
+ COMPDATA_SET(ad, "item",AUTOCOMP_ITEM, 2, 1);
+ COMPDATA_SET(ad, "items",AUTOCOMP_ITEMS, 2, 1);
+ COMPDATA_SET(ad, "layout",AUTOCOMP_LAYOUT, 2, 0);
+ COMPDATA_SET(ad, "padding",AUTOCOMP_PADDING, 1, 0);
}
static void
diff --git a/src/lib/auto_comp_code.h b/src/lib/auto_comp_code.h
index 1bae1bb..ee0d777 100644
--- a/src/lib/auto_comp_code.h
+++ b/src/lib/auto_comp_code.h
@@ -339,4 +339,48 @@ const char *AUTOCOMP_SET[AUTOCOMP_SET_LINE_CNT] =
"}"
};
-#define COMPSET_CNT 52
+#define AUTOCOMP_BOX_LINE_CNT 3
+const char *AUTOCOMP_BOX[AUTOCOMP_BOX_LINE_CNT] =
+{
+ "box {<br/>",
+ " <br/>",
+ "}"
+};
+
+#define AUTOCOMP_TABLE_LINE_CNT 3
+const char *AUTOCOMP_TABLE[AUTOCOMP_TABLE_LINE_CNT] =
+{
+ "table {<br/>",
+ " <br/>",
+ "}"
+};
+
+#define AUTOCOMP_ITEM_LINE_CNT 3
+const char *AUTOCOMP_ITEM[AUTOCOMP_ITEM_LINE_CNT] =
+{
+ "item {<br/>",
+ " <br/>",
+ "}"
+};
+
+#define AUTOCOMP_ITEMS_LINE_CNT 3
+const char *AUTOCOMP_ITEMS[AUTOCOMP_ITEMS_LINE_CNT] =
+{
+ "items {<br/>",
+ " <br/>",
+ "}"
+};
+
+#define AUTOCOMP_LAYOUT_LINE_CNT 1
+const char *AUTOCOMP_LAYOUT[AUTOCOMP_LAYOUT_LINE_CNT] =
+{
+ "layout: \"\";",
+};
+
+#define AUTOCOMP_PADDING_LINE_CNT 1
+const char *AUTOCOMP_PADDING[AUTOCOMP_PADDING_LINE_CNT] =
+{
+ "padding: ;",
+};
+
+#define COMPSET_CNT 58
--
