summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2015-11-24 14:21:27 +0200
committerDaniel Zaoui <daniel.zaoui@samsung.com>2015-11-24 14:21:54 +0200
commit4e7398be22e90ed8000bb6df20cb2238d4c52572 (patch)
tree09d4870fc53796b71bca1c2cf550719830203f72
parentdef505d39df80c8dea6f9c5a23175fbdc1cad6ae (diff)
Add first snippet inside factory
-rw-r--r--data/layouts/factory.json36
-rw-r--r--src/bin/gui/egui_layout.json57
-rw-r--r--src/bin/gui/egui_logic.c2
3 files changed, 94 insertions, 1 deletions
diff --git a/data/layouts/factory.json b/data/layouts/factory.json
index 25ce811..96434bc 100644
--- a/data/layouts/factory.json
+++ b/data/layouts/factory.json
@@ -602,6 +602,42 @@
602 "Efl.Gfx.Base.visible":[true], 602 "Efl.Gfx.Base.visible":[true],
603 "Evas.Image.filled":[true] 603 "Evas.Image.filled":[true]
604 } 604 }
605 },
606 "Snippet_Win":
607 {
608 "Desc":
609 {
610 "class":"Elm.Win"
611 },
612 "Properties":
613 {
614 "Elm.Win.title":["elm_win1"],
615 "Evas.Object.size_hint_weight":[1, 1],
616 "Efl.Gfx.Base.visible":[true],
617 "Elm.Win.type":["ELM_WIN_BASIC"],
618 "Elm.Win.autodel":[true],
619 "Elm.Win.conformant":[true],
620 "Efl.Gfx.Base.size":[382, 570]
621 },
622 "Contains":["Snippet_Conformant"]
623 },
624 "Snippet_Conformant":
625 {
626 "Desc":
627 {
628 "parent":"Snippet_Win",
629 "class":"Elm.Conformant"
630 },
631 "Properties":
632 {
633 "Evas.Object.size_hint_weight":[1, 1],
634 "Efl.Gfx.Base.visible":[true]
635 },
636 "Contains":
637 {
638 "Bg":["elm.swallow.bg"],
639 "Naviframe":["elm.swallow.content"]
640 }
605 } 641 }
606 } 642 }
607} 643}
diff --git a/src/bin/gui/egui_layout.json b/src/bin/gui/egui_layout.json
index bacbc4e..9d229de 100644
--- a/src/bin/gui/egui_layout.json
+++ b/src/bin/gui/egui_layout.json
@@ -1172,7 +1172,7 @@
1172 "Evas.Object.size_hint_align":[-1, 0], 1172 "Evas.Object.size_hint_align":[-1, 0],
1173 "Efl.Gfx.Base.visible":[true] 1173 "Efl.Gfx.Base.visible":[true]
1174 }, 1174 },
1175 "Contains":["fctr_table_sep_0", "fctr_table_label_1", "fctr_table_sep_1", "fctr_table", "fctr_table_sep_2", "fctr_table_label_2", "fctr_table_sep_3", "fctr_table_containers", "fctr_table_sep_4", "fctr_table_label_3", "fctr_table_sep_5", "fctr_table_item_widgets", "fctr_table_sep_6", "fctr_table_label_4", "fctr_table_sep_7", "fctr_table_evas"] 1175 "Contains":["fctr_table_sep_0", "fctr_table_label_5", "fctr_table_sep_8", "fctr_table_snippets", "fctr_table_sep_9", "fctr_table_label_1", "fctr_table_sep_1", "fctr_table", "fctr_table_sep_2", "fctr_table_label_2", "fctr_table_sep_3", "fctr_table_containers", "fctr_table_sep_4", "fctr_table_label_3", "fctr_table_sep_5", "fctr_table_item_widgets", "fctr_table_sep_6", "fctr_table_label_4", "fctr_table_sep_7", "fctr_table_evas"]
1176 }, 1176 },
1177 "fctr_table_sep_0": 1177 "fctr_table_sep_0":
1178 { 1178 {
@@ -1187,6 +1187,61 @@
1187 "Efl.Gfx.Base.visible":[true] 1187 "Efl.Gfx.Base.visible":[true]
1188 } 1188 }
1189 }, 1189 },
1190 "fctr_table_label_5":
1191 {
1192 "Desc":
1193 {
1194 "parent":"fctr_scroll_box",
1195 "class":"Elm.Label"
1196 },
1197 "Properties":
1198 {
1199 "Evas.Object.size_hint_align":[0.05, 0],
1200 "Elm.Widget.part_text":[null, "Snippets"],
1201 "Efl.Gfx.Base.visible":[true]
1202 }
1203 },
1204 "fctr_table_sep_8":
1205 {
1206 "Desc":
1207 {
1208 "parent":"fctr_scroll_box",
1209 "class":"Elm.Separator"
1210 },
1211 "Properties":
1212 {
1213 "Elm.Separator.horizontal":[true],
1214 "Efl.Gfx.Base.visible":[true]
1215 }
1216 },
1217 "fctr_table_snippets":
1218 {
1219 "Desc":
1220 {
1221 "parent":"fctr_scroll_box",
1222 "class":"Elm.Table",
1223 "public":true
1224 },
1225 "Properties":
1226 {
1227 "Evas.Object.size_hint_align":[0.05, -1],
1228 "Elm.Table.padding":[2, 2],
1229 "Efl.Gfx.Base.visible":[true]
1230 }
1231 },
1232 "fctr_table_sep_9":
1233 {
1234 "Desc":
1235 {
1236 "parent":"fctr_scroll_box",
1237 "class":"Elm.Separator"
1238 },
1239 "Properties":
1240 {
1241 "Elm.Separator.horizontal":[true],
1242 "Efl.Gfx.Base.visible":[true]
1243 }
1244 },
1190 "fctr_table_label_1": 1245 "fctr_table_label_1":
1191 { 1246 {
1192 "Desc": 1247 "Desc":
diff --git a/src/bin/gui/egui_logic.c b/src/bin/gui/egui_logic.c
index 412d190..78bcfcf 100644
--- a/src/bin/gui/egui_logic.c
+++ b/src/bin/gui/egui_logic.c
@@ -1086,6 +1086,8 @@ egui_start(const char *filename)
1086 } 1086 }
1087 1087
1088 gui_parser_json_file_read((Gui_Context *)global_context_get(), PACKAGE_DATA_DIR"/layouts/factory.json"); 1088 gui_parser_json_file_read((Gui_Context *)global_context_get(), PACKAGE_DATA_DIR"/layouts/factory.json");
1089 FACTORY_IMG_CREATE(Snippet_Win, "factory_layout.png", fctr_table_snippets, 0, 0, 1, 1);
1090
1089 FACTORY_IMG_CREATE(Win, "factory_layout.png", fctr_table, 0, 0, 1, 1); 1091 FACTORY_IMG_CREATE(Win, "factory_layout.png", fctr_table, 0, 0, 1, 1);
1090 FACTORY_IMG_CREATE(Bg, "factory_bg.png", fctr_table, 1, 0, 1, 1); 1092 FACTORY_IMG_CREATE(Bg, "factory_bg.png", fctr_table, 1, 0, 1, 1);
1091 FACTORY_CREATE(Button, fctr_table, 2, 0, 1, 1); 1093 FACTORY_CREATE(Button, fctr_table, 2, 0, 1, 1);