summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-02-28 13:17:26 +0900
committerHermet Park <hermetpark@gmail.com>2019-02-28 13:17:26 +0900
commit5e87363560e15b497e6705a03cf4e698ac6fb909 (patch)
tree4d1fd6dfc03ae2579593b198749bafe40aec6475
parentb60ac86c71ff280fd03a7f8cf0ab9b4b615b88be (diff)
fix build breaks.
Now it's compilable again.
-rw-r--r--data/templates/Watchface2.edc13
-rw-r--r--data/themes/default/theme_ext.edc18
-rw-r--r--src/bin/statusbar.c2
-rw-r--r--src/lib/enventor_object.eo4
-rw-r--r--src/lib/enventor_smart.c21
5 files changed, 18 insertions, 40 deletions
diff --git a/data/templates/Watchface2.edc b/data/templates/Watchface2.edc
index c77c767..f33daae 100644
--- a/data/templates/Watchface2.edc
+++ b/data/templates/Watchface2.edc
@@ -142,19 +142,6 @@ collections {
142 } 142 }
143 } 143 }
144 programs { 144 programs {
145 program { "load";
146 signal: "load";
147 source: "";
148 action: STATE_SET "rotated";
149 target: "bg";
150 transition: LINEAR 30;
151 after: "reset";
152 }
153 program { "reset";
154 action: STATE_SET "default";
155 target: "bg";
156 after: "load";
157 }
158 program { "hour_begin"; 145 program { "hour_begin";
159 signal: "load"; 146 signal: "load";
160 source: ""; 147 source: "";
diff --git a/data/themes/default/theme_ext.edc b/data/themes/default/theme_ext.edc
index 5735153..3cfb2fb 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -160,14 +160,14 @@ group { name: "elm/list/h_item/enventor";
160 color: 64 64 64 255; 160 color: 64 64 64 255;
161 color_class: "list_item_base"; 161 color_class: "list_item_base";
162 } 162 }
163 description { state: "odd" 0.0; 163 description { state: "odd";
164 color: 56 56 56 255; 164 color: 56 56 56 255;
165 color_class: "list_item_base_odd"; 165 color_class: "list_item_base_odd";
166 } 166 }
167 } 167 }
168 program { 168 program {
169 signal: "elm,state,odd"; source: "elm"; 169 signal: "elm,state,odd"; source: "elm";
170 action: STATE_SET "odd" 1.0; 170 action: STATE_SET "odd";
171 target: "base"; 171 target: "base";
172 } 172 }
173 program { 173 program {
@@ -603,7 +603,6 @@ group { name: "elm/scroller/base/enventor";
603 program { 603 program {
604 signal: "mouse,down,1*"; source: "sb_vbar_a1"; 604 signal: "mouse,down,1*"; source: "sb_vbar_a1";
605 action: STATE_SET "clicked" 0.0; 605 action: STATE_SET "clicked" 0.0;
606 target: "sb_vbar_a1";
607 target: "arrow1_vbar"; 606 target: "arrow1_vbar";
608 } 607 }
609 program { 608 program {
@@ -614,13 +613,11 @@ group { name: "elm/scroller/base/enventor";
614 program { 613 program {
615 signal: "mouse,up,1"; source: "sb_vbar_a1"; 614 signal: "mouse,up,1"; source: "sb_vbar_a1";
616 action: STATE_SET "default" 0.0; 615 action: STATE_SET "default" 0.0;
617 target: "sb_vbar_a1";
618 target: "arrow1_vbar"; 616 target: "arrow1_vbar";
619 } 617 }
620 program { 618 program {
621 signal: "mouse,down,1*"; source: "sb_vbar_a2"; 619 signal: "mouse,down,1*"; source: "sb_vbar_a2";
622 action: STATE_SET "clicked" 0.0; 620 action: STATE_SET "clicked" 0.0;
623 target: "sb_vbar_a2";
624 target: "arrow2_vbar"; 621 target: "arrow2_vbar";
625 } 622 }
626 program { 623 program {
@@ -631,7 +628,6 @@ group { name: "elm/scroller/base/enventor";
631 program { 628 program {
632 signal: "mouse,up,1"; source: "sb_vbar_a2"; 629 signal: "mouse,up,1"; source: "sb_vbar_a2";
633 action: STATE_SET "default" 0.0; 630 action: STATE_SET "default" 0.0;
634 target: "sb_vbar_a2";
635 target: "arrow2_vbar"; 631 target: "arrow2_vbar";
636 } 632 }
637 program { 633 program {
@@ -763,7 +759,6 @@ group { name: "elm/scroller/base/enventor";
763 program { 759 program {
764 signal: "mouse,down,1*"; source: "sb_hbar_a1"; 760 signal: "mouse,down,1*"; source: "sb_hbar_a1";
765 action: STATE_SET "clicked" 0.0; 761 action: STATE_SET "clicked" 0.0;
766 target: "sb_hbar_a1";
767 target: "arrow1_hbar"; 762 target: "arrow1_hbar";
768 } 763 }
769 program { 764 program {
@@ -774,13 +769,11 @@ group { name: "elm/scroller/base/enventor";
774 program { 769 program {
775 signal: "mouse,up,1"; source: "sb_hbar_a1"; 770 signal: "mouse,up,1"; source: "sb_hbar_a1";
776 action: STATE_SET "default" 0.0; 771 action: STATE_SET "default" 0.0;
777 target: "sb_hbar_a1";
778 target: "arrow1_hbar"; 772 target: "arrow1_hbar";
779 } 773 }
780 program { 774 program {
781 signal: "mouse,down,1*"; source: "sb_hbar_a2"; 775 signal: "mouse,down,1*"; source: "sb_hbar_a2";
782 action: STATE_SET "clicked" 0.0; 776 action: STATE_SET "clicked" 0.0;
783 target: "sb_hbar_a2";
784 target: "arrow2_hbar"; 777 target: "arrow2_hbar";
785 } 778 }
786 program { 779 program {
@@ -791,7 +784,6 @@ group { name: "elm/scroller/base/enventor";
791 program { 784 program {
792 signal: "mouse,up,1"; source: "sb_hbar_a2"; 785 signal: "mouse,up,1"; source: "sb_hbar_a2";
793 action: STATE_SET "default" 0.0; 786 action: STATE_SET "default" 0.0;
794 target: "sb_hbar_a2";
795 target: "arrow2_hbar"; 787 target: "arrow2_hbar";
796 } 788 }
797 program { 789 program {
@@ -1146,7 +1138,6 @@ group { name: "elm/scroller/base/enventor";
1146 program { 1138 program {
1147 signal: "mouse,down,1*"; source: "elm.dragable.vbar"; 1139 signal: "mouse,down,1*"; source: "elm.dragable.vbar";
1148 action: STATE_SET "clicked" 0.0; 1140 action: STATE_SET "clicked" 0.0;
1149 target: "elm.dragable.vbar";
1150 target: "shadow_vbar"; 1141 target: "shadow_vbar";
1151 target: "glow_vbar"; 1142 target: "glow_vbar";
1152 target: "center_glow_vbar"; 1143 target: "center_glow_vbar";
@@ -1154,7 +1145,6 @@ group { name: "elm/scroller/base/enventor";
1154 program { 1145 program {
1155 signal: "mouse,up,1"; source: "elm.dragable.vbar"; 1146 signal: "mouse,up,1"; source: "elm.dragable.vbar";
1156 action: STATE_SET "default" 0.0; 1147 action: STATE_SET "default" 0.0;
1157 target: "elm.dragable.vbar";
1158 target: "shadow_vbar"; 1148 target: "shadow_vbar";
1159 target: "glow_vbar"; 1149 target: "glow_vbar";
1160 target: "center_glow_vbar"; 1150 target: "center_glow_vbar";
@@ -1162,7 +1152,6 @@ group { name: "elm/scroller/base/enventor";
1162 program { 1152 program {
1163 signal: "mouse,down,1*"; source: "elm.dragable.hbar"; 1153 signal: "mouse,down,1*"; source: "elm.dragable.hbar";
1164 action: STATE_SET "clicked" 0.0; 1154 action: STATE_SET "clicked" 0.0;
1165 target: "elm.dragable.hbar";
1166 target: "shadow_hbar"; 1155 target: "shadow_hbar";
1167 target: "glow_hbar"; 1156 target: "glow_hbar";
1168 target: "center_glow_hbar"; 1157 target: "center_glow_hbar";
@@ -1170,7 +1159,6 @@ group { name: "elm/scroller/base/enventor";
1170 program { 1159 program {
1171 signal: "mouse,up,1"; source: "elm.dragable.hbar"; 1160 signal: "mouse,up,1"; source: "elm.dragable.hbar";
1172 action: STATE_SET "default" 0.0; 1161 action: STATE_SET "default" 0.0;
1173 target: "elm.dragable.hbar";
1174 target: "shadow_hbar"; 1162 target: "shadow_hbar";
1175 target: "glow_hbar"; 1163 target: "glow_hbar";
1176 target: "center_glow_hbar"; 1164 target: "center_glow_hbar";
@@ -1706,14 +1694,12 @@ group { name: "elm/button/base/enventor";
1706 program { 1694 program {
1707 signal: "elm,anim,activate"; source: "elm"; 1695 signal: "elm,anim,activate"; source: "elm";
1708 action: STATE_SET "clicked" 0.0; 1696 action: STATE_SET "clicked" 0.0;
1709 target: "base";
1710 target: "text2"; 1697 target: "text2";
1711 after: "button_unpressed_anim"; 1698 after: "button_unpressed_anim";
1712 } 1699 }
1713 program { name: "button_unpressed_anim"; 1700 program { name: "button_unpressed_anim";
1714 action: STATE_SET "default" 0.0; 1701 action: STATE_SET "default" 0.0;
1715 in: 0.5 0.0; 1702 in: 0.5 0.0;
1716 target: "base";
1717 target: "text2"; 1703 target: "text2";
1718 } 1704 }
1719 program { 1705 program {
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index ba58c12..5ac42a6 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -52,7 +52,7 @@ ctxpopup_dismissed_cb(void *data, Evas_Object *obj,
52 void *event_info EINA_UNUSED) 52 void *event_info EINA_UNUSED)
53{ 53{
54 stats_data *sd = data; 54 stats_data *sd = data;
55 efl_ui_focus_object_focus_set(base_enventor_get(), EINA_TRUE); 55 elm_object_focus_set(base_enventor_get(), EINA_TRUE);
56 evas_object_del(obj); 56 evas_object_del(obj);
57 sd->ctxpopup = NULL; 57 sd->ctxpopup = NULL;
58} 58}
diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo
index 1875b9f..7ea72f4 100644
--- a/src/lib/enventor_object.eo
+++ b/src/lib/enventor_object.eo
@@ -3,7 +3,7 @@ type Enventor_Syntax_Color_Type: __undefined_type;
3type Enventor_Template_Insert_Type: __undefined_type; 3type Enventor_Template_Insert_Type: __undefined_type;
4type Edje_Part_Type: __undefined_type; 4type Edje_Part_Type: __undefined_type;
5 5
6class Enventor.Object (Efl.Ui.Widget, Efl.File, Efl.Ui.Focus.Object) 6class Enventor.Object extends Efl.Ui.Widget implements Efl.File, Efl.Ui.Focus.Object
7{ 7{
8 legacy_prefix: enventor_object; 8 legacy_prefix: enventor_object;
9 eo_prefix: enventor_obj; 9 eo_prefix: enventor_obj;
@@ -209,7 +209,7 @@ class Enventor.Object (Efl.Ui.Widget, Efl.File, Efl.Ui.Focus.Object)
209 Efl.Gfx.Entity.visible { set; } 209 Efl.Gfx.Entity.visible { set; }
210 Efl.Gfx.Entity.position { set; } 210 Efl.Gfx.Entity.position { set; }
211 Efl.Gfx.Entity.size { set; } 211 Efl.Gfx.Entity.size { set; }
212 Efl.Canvas.Object.clip { set; } 212 Efl.Canvas.Object.clipper { set; }
213 Efl.Canvas.Group.group_member_add; 213 Efl.Canvas.Group.group_member_add;
214 Efl.File.file { set; } 214 Efl.File.file { set; }
215 Efl.Ui.Focus.Object.focus { set; get; } 215 Efl.Ui.Focus.Object.focus { set; get; }
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 3c2a6c8..fc19c9f 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -82,6 +82,9 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
82 {NULL, NULL} 82 {NULL, NULL}
83}; 83};
84 84
85static Eina_Error ENVENTOR_FILE_SET_ERROR_NONE;
86static Eina_Error ENVENTOR_FILE_SET_ERROR_GENERIC;
87
85/*****************************************************************************/ 88/*****************************************************************************/
86/* Internal method implementation */ 89/* Internal method implementation */
87/*****************************************************************************/ 90/*****************************************************************************/
@@ -257,6 +260,8 @@ EOLIAN static void
257_enventor_object_class_constructor(Efl_Class *klass) 260_enventor_object_class_constructor(Efl_Class *klass)
258{ 261{
259 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 262 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
263
264 ENVENTOR_FILE_SET_ERROR_GENERIC = eina_error_msg_static_register("Generic load error");
260} 265}
261 266
262EOLIAN static void 267EOLIAN static void
@@ -312,9 +317,9 @@ _enventor_object_efl_gfx_entity_visible_set(Eo *obj EINA_UNUSED, Enventor_Object
312} 317}
313 318
314EOLIAN static void 319EOLIAN static void
315_enventor_object_efl_canvas_object_clip_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip) 320_enventor_object_efl_canvas_object_clipper_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip)
316{ 321{
317 efl_canvas_object_clip_set(efl_super(obj, MY_CLASS), clip); 322 efl_canvas_object_clipper_set(efl_super(obj, MY_CLASS), clip);
318 323
319 Eina_Iterator *it = evas_object_smart_iterator_new(obj); 324 Eina_Iterator *it = evas_object_smart_iterator_new(obj);
320 Evas_Object *o; 325 Evas_Object *o;
@@ -384,11 +389,10 @@ _enventor_object_efl_object_destructor(Eo *obj, Enventor_Object_Data *pd)
384 efl_destructor(efl_super(obj, MY_CLASS)); 389 efl_destructor(efl_super(obj, MY_CLASS));
385} 390}
386 391
387EOLIAN static Eina_Bool 392EOLIAN static Eina_Error
388_enventor_object_efl_file_file_set(Eo *obj EINA_UNUSED, 393_enventor_object_efl_file_file_set(Eo *obj EINA_UNUSED,
389 Enventor_Object_Data *pd, 394 Enventor_Object_Data *pd,
390 const char *file, 395 const char *file)
391 const char *group EINA_UNUSED)
392{ 396{
393 build_edc_path_set(file); 397 build_edc_path_set(file);
394 if (!file) goto err; 398 if (!file) goto err;
@@ -397,11 +401,12 @@ _enventor_object_efl_file_file_set(Eo *obj EINA_UNUSED,
397 build_edc(); 401 build_edc();
398 edit_changed_set(pd->main_it->ed, EINA_FALSE); 402 edit_changed_set(pd->main_it->ed, EINA_FALSE);
399 403
400 return EINA_TRUE; 404 return 0;
401 405
402err: 406err:
407 eina_error_set( ENVENTOR_FILE_SET_ERROR_GENERIC);
403 build_edc_path_set(NULL); 408 build_edc_path_set(NULL);
404 return EINA_FALSE; 409 return 1;
405} 410}
406 411
407EOLIAN static Eina_List * 412EOLIAN static Eina_List *
@@ -899,7 +904,7 @@ enventor_object_main_item_set(Enventor_Object *obj, const char *file)
899 it->ed = edit_init(obj, it); 904 it->ed = edit_init(obj, it);
900 it->pd = pd; 905 it->pd = pd;
901 906
902 if (!efl_file_set(obj, file, NULL)) 907 if (efl_file_set(obj, file))
903 { 908 {
904 edit_term(it->ed); 909 edit_term(it->ed);
905 pd->main_it = NULL; 910 pd->main_it = NULL;