summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-09-02 14:10:31 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-09-02 14:10:31 +0000
commita24f4ba16decc0f5e27c88996f73973cef4d0cae (patch)
tree7b8d102f2d5c818a8a434e234e3160a0654902ee /src
parent2809210fabeb8c3e3a323f874c20a93c6b896c68 (diff)
split options inot more swallows in the terminology theme because this
is eventually how it needs to work as i wanted wallpaper and theme stuff to totally see the terminology txt/bg like wp2 in e17. :) SVN revision: 75941
Diffstat (limited to 'src')
-rw-r--r--src/bin/options.c67
-rw-r--r--src/bin/options_behavior.c11
-rw-r--r--src/bin/options_font.c19
-rw-r--r--src/bin/options_helpers.c21
-rw-r--r--src/bin/options_video.c33
5 files changed, 108 insertions, 43 deletions
diff --git a/src/bin/options.c b/src/bin/options.c
index 1515bfd..89df426 100644
--- a/src/bin/options.c
+++ b/src/bin/options.c
@@ -25,66 +25,56 @@ static void
25_cb_op_font(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 25_cb_op_font(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
26{ 26{
27 if (mode == 1) return; 27 if (mode == 1) return;
28 elm_box_clear(op_opbox);
29 options_font(op_opbox, data);
30 mode = 1; 28 mode = 1;
29 edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
31} 30}
32 31
33static void 32static void
34_cb_op_theme(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 33_cb_op_theme(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
35{ 34{
36 if (mode == 2) return; 35 if (mode == 2) return;
37 elm_box_clear(op_opbox);
38 options_theme(op_opbox, data);
39 // XXX: not done yet
40 mode = 2; 36 mode = 2;
37 edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
41} 38}
42 39
43static void 40static void
44_cb_op_wallpaper(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 41_cb_op_wallpaper(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
45{ 42{
46 if (mode == 3) return; 43 if (mode == 3) return;
47 elm_box_clear(op_opbox);
48 options_wallpaper(op_opbox, data);
49 // XXX: not done yet
50 mode = 3; 44 mode = 3;
45 edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
51} 46}
52 47
53static void 48static void
54_cb_op_colors(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 49_cb_op_colors(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
55{ 50{
56 if (mode == 4) return; 51 if (mode == 4) return;
57 elm_box_clear(op_opbox);
58 options_colors(op_opbox, data);
59 // XXX: not done yet
60 mode = 4; 52 mode = 4;
53 edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
61} 54}
62 55
63static void 56static void
64_cb_op_video(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 57_cb_op_video(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
65{ 58{
66 if (mode == 5) return; 59 if (mode == 5) return;
67 elm_box_clear(op_opbox);
68 options_video(op_opbox, data);
69 mode = 5; 60 mode = 5;
61 edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
70} 62}
71 63
72static void 64static void
73_cb_op_behavior(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 65_cb_op_behavior(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
74{ 66{
75 if (mode == 6) return; 67 if (mode == 6) return;
76 elm_box_clear(op_opbox);
77 options_behavior(op_opbox, data);
78 mode = 6; 68 mode = 6;
69 edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
79} 70}
80 71
81static void 72static void
82_cb_op_helpers(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 73_cb_op_helpers(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
83{ 74{
84 if (mode == 7) return; 75 if (mode == 7) return;
85 elm_box_clear(op_opbox);
86 options_helpers(op_opbox, data);
87 mode = 7; 76 mode = 7;
77 edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
88} 78}
89 79
90static void 80static void
@@ -97,8 +87,10 @@ _cb_op_tmp_chg(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
97static Eina_Bool 87static Eina_Bool
98_cb_op_del_delay(void *data __UNUSED__) 88_cb_op_del_delay(void *data __UNUSED__)
99{ 89{
90 evas_object_del(op_opbox);
100 evas_object_del(op_frame); 91 evas_object_del(op_frame);
101 options_font_clear(); 92 options_font_clear();
93 op_opbox = NULL;
102 op_frame = NULL; 94 op_frame = NULL;
103 op_del_timer = NULL; 95 op_del_timer = NULL;
104 elm_cache_all_flush(); 96 elm_cache_all_flush();
@@ -111,6 +103,24 @@ _cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
111 options_toggle(saved_win, saved_bg, data); 103 options_toggle(saved_win, saved_bg, data);
112} 104}
113 105
106static void
107_cb_opdt_hide_done(void *data, Evas_Object *obj __UNUSED__, const char *sig, const char *src)
108{
109 elm_box_clear(op_opbox);
110 switch (mode)
111 {
112 case 1: options_font(op_opbox, data); break;
113 case 2: options_theme(op_opbox, data); break;
114 case 3: options_wallpaper(op_opbox, data); break;
115 case 4: options_colors(op_opbox, data); break;
116 case 5: options_video(op_opbox, data); break;
117 case 6: options_behavior(op_opbox, data); break;
118 case 7: options_helpers(op_opbox, data); break;
119 default: break;
120 }
121 edje_object_signal_emit(saved_bg, "optdetails,show", "terminology");
122}
123
114void 124void
115options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term) 125options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
116{ 126{
@@ -124,6 +134,12 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
124 Elm_Object_Item *it_fn; 134 Elm_Object_Item *it_fn;
125 Config *config = termio_config_get(term); 135 Config *config = termio_config_get(term);
126 136
137 op_opbox = o = elm_box_add(win);
138 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
139 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
140 edje_object_part_swallow(bg, "terminology.optdetails", o);
141 evas_object_show(o);
142
127 op_frame = o = elm_frame_add(win); 143 op_frame = o = elm_frame_add(win);
128 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 144 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
129 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 145 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -134,12 +150,6 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
134 elm_object_content_set(op_frame, o); 150 elm_object_content_set(op_frame, o);
135 evas_object_show(o); 151 evas_object_show(o);
136 152
137 op_opbox = o = elm_box_add(win);
138 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
139 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
140 elm_box_pack_end(op_box, o);
141 evas_object_show(o);
142
143 op_tbox = o = elm_box_add(win); 153 op_tbox = o = elm_box_add(win);
144 evas_object_size_hint_weight_set(o, 0.0, EVAS_HINT_EXPAND); 154 evas_object_size_hint_weight_set(o, 0.0, EVAS_HINT_EXPAND);
145 evas_object_size_hint_align_set(o, 1.0, EVAS_HINT_FILL); 155 evas_object_size_hint_align_set(o, 1.0, EVAS_HINT_FILL);
@@ -183,8 +193,14 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
183 edje_object_part_swallow(bg, "terminology.options", op_frame); 193 edje_object_part_swallow(bg, "terminology.options", op_frame);
184 evas_object_show(op_frame); 194 evas_object_show(op_frame);
185 } 195 }
196 else if ((op_opbox) && (!op_out))
197 edje_object_signal_emit(bg, "optdetails,show", "terminology");
198
186 if (!op_out) 199 if (!op_out)
187 { 200 {
201 edje_object_signal_callback_add(bg, "optdetails,hide,done",
202 "terminology",
203 _cb_opdt_hide_done, term);
188 op_over = o = evas_object_rectangle_add(evas_object_evas_get(win)); 204 op_over = o = evas_object_rectangle_add(evas_object_evas_get(win));
189 evas_object_color_set(o, 0, 0, 0, 0); 205 evas_object_color_set(o, 0, 0, 0, 0);
190 edje_object_part_swallow(bg, "terminology.dismiss", o); 206 edje_object_part_swallow(bg, "terminology.dismiss", o);
@@ -203,10 +219,13 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
203 } 219 }
204 else 220 else
205 { 221 {
222 edje_object_signal_callback_del(bg, "optdetails,hide,done",
223 "terminology",
224 _cb_opdt_hide_done);
206 evas_object_del(op_over); 225 evas_object_del(op_over);
207 op_over = NULL; 226 op_over = NULL;
208
209 edje_object_signal_emit(bg, "options,hide", "terminology"); 227 edje_object_signal_emit(bg, "options,hide", "terminology");
228 edje_object_signal_emit(bg, "optdetails,hide", "terminology");
210 op_out = EINA_FALSE; 229 op_out = EINA_FALSE;
211 elm_object_focus_set(op_frame, EINA_FALSE); 230 elm_object_focus_set(op_frame, EINA_FALSE);
212 elm_object_focus_set(term, EINA_TRUE); 231 elm_object_focus_set(term, EINA_TRUE);
diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c
index 78ddcf6..74f350a 100644
--- a/src/bin/options_behavior.c
+++ b/src/bin/options_behavior.c
@@ -104,14 +104,21 @@ void
104options_behavior(Evas_Object *opbox, Evas_Object *term) 104options_behavior(Evas_Object *opbox, Evas_Object *term)
105{ 105{
106 Config *config = termio_config_get(term); 106 Config *config = termio_config_get(term);
107 Evas_Object *o, *bx, *sc; 107 Evas_Object *o, *bx, *sc, *fr;
108 char *txt; 108 char *txt;
109 109
110 fr = o = elm_frame_add(opbox);
111 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
112 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
113 elm_object_text_set(o, "Behavior");
114 elm_box_pack_end(opbox, o);
115 evas_object_show(o);
116
110 sc = o = elm_scroller_add(opbox); 117 sc = o = elm_scroller_add(opbox);
111 elm_scroller_content_min_limit(sc, EINA_TRUE, EINA_FALSE); 118 elm_scroller_content_min_limit(sc, EINA_TRUE, EINA_FALSE);
112 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 119 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
113 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 120 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
114 elm_box_pack_end(opbox, o); 121 elm_object_content_set(fr, o);
115 evas_object_show(o); 122 evas_object_show(o);
116 123
117 bx = o = elm_box_add(opbox); 124 bx = o = elm_box_add(opbox);
diff --git a/src/bin/options_font.c b/src/bin/options_font.c
index 18bc0e6..dc97e24 100644
--- a/src/bin/options_font.c
+++ b/src/bin/options_font.c
@@ -215,7 +215,7 @@ options_font_clear(void)
215void 215void
216options_font(Evas_Object *opbox, Evas_Object *term) 216options_font(Evas_Object *opbox, Evas_Object *term)
217{ 217{
218 Evas_Object *o, *bx; 218 Evas_Object *o, *bx, *fr, *bx0;
219 char buf[4096], *file, *fname, *s; 219 char buf[4096], *file, *fname, *s;
220 Eina_List *files, *fontlist, *l; 220 Eina_List *files, *fontlist, *l;
221 Font *f; 221 Font *f;
@@ -225,6 +225,19 @@ options_font(Evas_Object *opbox, Evas_Object *term)
225 225
226 options_font_clear(); 226 options_font_clear();
227 227
228 fr = o = elm_frame_add(opbox);
229 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
230 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
231 elm_object_text_set(o, "Font");
232 elm_box_pack_end(opbox, o);
233 evas_object_show(o);
234
235 bx0 = o = elm_box_add(opbox);
236 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
237 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
238 elm_object_content_set(fr, o);
239 evas_object_show(o);
240
228 bx = o = elm_box_add(opbox); 241 bx = o = elm_box_add(opbox);
229 elm_box_horizontal_set(o, EINA_TRUE); 242 elm_box_horizontal_set(o, EINA_TRUE);
230 243
@@ -252,7 +265,7 @@ options_font(Evas_Object *opbox, Evas_Object *term)
252 elm_box_pack_end(bx, o); 265 elm_box_pack_end(bx, o);
253 evas_object_show(o); 266 evas_object_show(o);
254 267
255 elm_box_pack_end(opbox, bx); 268 elm_box_pack_end(bx0, bx);
256 evas_object_show(bx); 269 evas_object_show(bx);
257 270
258 it_class = elm_genlist_item_class_new(); 271 it_class = elm_genlist_item_class_new();
@@ -351,7 +364,7 @@ options_font(Evas_Object *opbox, Evas_Object *term)
351 elm_genlist_item_class_free(it_class); 364 elm_genlist_item_class_free(it_class);
352 elm_genlist_item_class_free(it_group); 365 elm_genlist_item_class_free(it_group);
353 366
354 elm_box_pack_end(opbox, o); 367 elm_box_pack_end(bx0, o);
355 evas_object_size_hint_weight_set(opbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 368 evas_object_size_hint_weight_set(opbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
356 evas_object_size_hint_align_set(opbox, EVAS_HINT_FILL, EVAS_HINT_FILL); 369 evas_object_size_hint_align_set(opbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
357 evas_object_show(o); 370 evas_object_show(o);
diff --git a/src/bin/options_helpers.c b/src/bin/options_helpers.c
index 9990b5d..bdfc887 100644
--- a/src/bin/options_helpers.c
+++ b/src/bin/options_helpers.c
@@ -167,15 +167,28 @@ void
167options_helpers(Evas_Object *opbox, Evas_Object *term) 167options_helpers(Evas_Object *opbox, Evas_Object *term)
168{ 168{
169 Config *config = termio_config_get(term); 169 Config *config = termio_config_get(term);
170 Evas_Object *o, *bx, *sc; 170 Evas_Object *o, *bx, *sc, *fr, *bx0;
171 char *txt; 171 char *txt;
172 172
173 fr = o = elm_frame_add(opbox);
174 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
175 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
176 elm_object_text_set(o, "Helpers");
177 elm_box_pack_end(opbox, o);
178 evas_object_show(o);
179
180 bx0 = o = elm_box_add(opbox);
181 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
182 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
183 elm_object_content_set(fr, o);
184 evas_object_show(o);
185
173 o = elm_check_add(opbox); 186 o = elm_check_add(opbox);
174 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); 187 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
175 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); 188 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
176 elm_object_text_set(o, "Inline if possible"); 189 elm_object_text_set(o, "Inline if possible");
177 elm_check_state_set(o, config->helper.inline_please); 190 elm_check_state_set(o, config->helper.inline_please);
178 elm_box_pack_end(opbox, o); 191 elm_box_pack_end(bx0, o);
179 evas_object_show(o); 192 evas_object_show(o);
180 evas_object_smart_callback_add(o, "changed", 193 evas_object_smart_callback_add(o, "changed",
181 _cb_op_helper_inline_chg, term); 194 _cb_op_helper_inline_chg, term);
@@ -184,14 +197,14 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
184 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); 197 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
185 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); 198 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
186 elm_separator_horizontal_set(o, EINA_TRUE); 199 elm_separator_horizontal_set(o, EINA_TRUE);
187 elm_box_pack_end(opbox, o); 200 elm_box_pack_end(bx0, o);
188 evas_object_show(o); 201 evas_object_show(o);
189 202
190 sc = o = elm_scroller_add(opbox); 203 sc = o = elm_scroller_add(opbox);
191 elm_scroller_content_min_limit(sc, EINA_TRUE, EINA_FALSE); 204 elm_scroller_content_min_limit(sc, EINA_TRUE, EINA_FALSE);
192 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 205 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
193 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 206 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
194 elm_box_pack_end(opbox, o); 207 elm_box_pack_end(bx0, o);
195 evas_object_show(o); 208 evas_object_show(o);
196 209
197 bx = o = elm_box_add(opbox); 210 bx = o = elm_box_add(opbox);
diff --git a/src/bin/options_video.c b/src/bin/options_video.c
index c25eaf5..a7eda87 100644
--- a/src/bin/options_video.c
+++ b/src/bin/options_video.c
@@ -44,15 +44,28 @@ _cb_op_video_vidmod_chg(void *data, Evas_Object *obj, void *event __UNUSED__)
44void 44void
45options_video(Evas_Object *opbox, Evas_Object *term) 45options_video(Evas_Object *opbox, Evas_Object *term)
46{ 46{
47 Evas_Object *o; 47 Evas_Object *o, *fr, *bx0;
48 Config *config = termio_config_get(term); 48 Config *config = termio_config_get(term);
49 49
50 fr = o = elm_frame_add(opbox);
51 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
52 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
53 elm_object_text_set(o, "Video");
54 elm_box_pack_end(opbox, o);
55 evas_object_show(o);
56
57 bx0 = o = elm_box_add(opbox);
58 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
59 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
60 elm_object_content_set(fr, o);
61 evas_object_show(o);
62
50 op_trans = o = elm_check_add(opbox); 63 op_trans = o = elm_check_add(opbox);
51 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); 64 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
52 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); 65 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
53 elm_object_text_set(o, "Translucent"); 66 elm_object_text_set(o, "Translucent");
54 elm_check_state_set(o, config->translucent); 67 elm_check_state_set(o, config->translucent);
55 elm_box_pack_end(opbox, o); 68 elm_box_pack_end(bx0, o);
56 evas_object_show(o); 69 evas_object_show(o);
57 evas_object_smart_callback_add(o, "changed", 70 evas_object_smart_callback_add(o, "changed",
58 _cb_op_video_trans_chg, term); 71 _cb_op_video_trans_chg, term);
@@ -61,7 +74,7 @@ options_video(Evas_Object *opbox, Evas_Object *term)
61 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); 74 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
62 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); 75 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
63 elm_separator_horizontal_set(o, EINA_TRUE); 76 elm_separator_horizontal_set(o, EINA_TRUE);
64 elm_box_pack_end(opbox, o); 77 elm_box_pack_end(bx0, o);
65 evas_object_show(o); 78 evas_object_show(o);
66 79
67 op_mute = o = elm_check_add(opbox); 80 op_mute = o = elm_check_add(opbox);
@@ -69,7 +82,7 @@ options_video(Evas_Object *opbox, Evas_Object *term)
69 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); 82 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
70 elm_object_text_set(o, "Audio muted"); 83 elm_object_text_set(o, "Audio muted");
71 elm_check_state_set(o, config->mute); 84 elm_check_state_set(o, config->mute);
72 elm_box_pack_end(opbox, o); 85 elm_box_pack_end(bx0, o);
73 evas_object_show(o); 86 evas_object_show(o);
74 evas_object_smart_callback_add(o, "changed", 87 evas_object_smart_callback_add(o, "changed",
75 _cb_op_video_mute_chg, term); 88 _cb_op_video_mute_chg, term);
@@ -77,14 +90,14 @@ options_video(Evas_Object *opbox, Evas_Object *term)
77 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); 90 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
78 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); 91 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
79 elm_separator_horizontal_set(o, EINA_TRUE); 92 elm_separator_horizontal_set(o, EINA_TRUE);
80 elm_box_pack_end(opbox, o); 93 elm_box_pack_end(bx0, o);
81 evas_object_show(o); 94 evas_object_show(o);
82 95
83 o = elm_label_add(opbox); 96 o = elm_label_add(opbox);
84 evas_object_size_hint_weight_set(o, 0.0, 0.0); 97 evas_object_size_hint_weight_set(o, 0.0, 0.0);
85 evas_object_size_hint_align_set(o, 0.0, 0.5); 98 evas_object_size_hint_align_set(o, 0.0, 0.5);
86 elm_object_text_set(o, "Video Engine:"); 99 elm_object_text_set(o, "Video Engine:");
87 elm_box_pack_end(opbox, o); 100 elm_box_pack_end(bx0, o);
88 evas_object_show(o); 101 evas_object_show(o);
89 102
90 op_vidmod = o = elm_radio_add(opbox); 103 op_vidmod = o = elm_radio_add(opbox);
@@ -92,7 +105,7 @@ options_video(Evas_Object *opbox, Evas_Object *term)
92 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); 105 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
93 elm_object_text_set(o, "Automatic"); 106 elm_object_text_set(o, "Automatic");
94 elm_radio_state_value_set(o, 0); 107 elm_radio_state_value_set(o, 0);
95 elm_box_pack_end(opbox, o); 108 elm_box_pack_end(bx0, o);
96 evas_object_show(o); 109 evas_object_show(o);
97 evas_object_smart_callback_add(o, "changed", 110 evas_object_smart_callback_add(o, "changed",
98 _cb_op_video_vidmod_chg, term); 111 _cb_op_video_vidmod_chg, term);
@@ -103,7 +116,7 @@ options_video(Evas_Object *opbox, Evas_Object *term)
103 elm_object_text_set(o, "Gstreamer"); 116 elm_object_text_set(o, "Gstreamer");
104 elm_radio_state_value_set(o, 1); 117 elm_radio_state_value_set(o, 1);
105 elm_radio_group_add(o, op_vidmod); 118 elm_radio_group_add(o, op_vidmod);
106 elm_box_pack_end(opbox, o); 119 elm_box_pack_end(bx0, o);
107 evas_object_show(o); 120 evas_object_show(o);
108 evas_object_smart_callback_add(o, "changed", 121 evas_object_smart_callback_add(o, "changed",
109 _cb_op_video_vidmod_chg, term); 122 _cb_op_video_vidmod_chg, term);
@@ -114,7 +127,7 @@ options_video(Evas_Object *opbox, Evas_Object *term)
114 elm_object_text_set(o, "Xine"); 127 elm_object_text_set(o, "Xine");
115 elm_radio_state_value_set(o, 2); 128 elm_radio_state_value_set(o, 2);
116 elm_radio_group_add(o, op_vidmod); 129 elm_radio_group_add(o, op_vidmod);
117 elm_box_pack_end(opbox, o); 130 elm_box_pack_end(bx0, o);
118 evas_object_show(o); 131 evas_object_show(o);
119 evas_object_smart_callback_add(o, "changed", 132 evas_object_smart_callback_add(o, "changed",
120 _cb_op_video_vidmod_chg, term); 133 _cb_op_video_vidmod_chg, term);
@@ -125,7 +138,7 @@ options_video(Evas_Object *opbox, Evas_Object *term)
125 elm_object_text_set(o, "Generic (VLC)"); 138 elm_object_text_set(o, "Generic (VLC)");
126 elm_radio_state_value_set(o, 3); 139 elm_radio_state_value_set(o, 3);
127 elm_radio_group_add(o, op_vidmod); 140 elm_radio_group_add(o, op_vidmod);
128 elm_box_pack_end(opbox, o); 141 elm_box_pack_end(bx0, o);
129 evas_object_show(o); 142 evas_object_show(o);
130 evas_object_smart_callback_add(o, "changed", 143 evas_object_smart_callback_add(o, "changed",
131 _cb_op_video_vidmod_chg, term); 144 _cb_op_video_vidmod_chg, term);