On Sun, 2 Sep 2012 12:15:49 -0300 Gustavo Sverzut Barbieri <barbi...@profusion.mobi> said:
> On Sunday, September 2, 2012, Enlightenment SVN wrote: > > > Log: > > 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. :) > > > > > Could u fix mild.edc? This part should be quite similar, u know what and > why u changed so it's easier if u do it. Orherwise next week I can try to > do so done. > > Author: raster > > Date: 2012-09-02 07:10:31 -0700 (Sun, 02 Sep 2012) > > New Revision: 75941 > > Trac: http://trac.enlightenment.org/e/changeset/75941 > > > > Modified: > > trunk/terminology/data/themes/default.edc > > trunk/terminology/src/bin/options.c > > trunk/terminology/src/bin/options_behavior.c > > trunk/terminology/src/bin/options_font.c > > trunk/terminology/src/bin/options_helpers.c > > trunk/terminology/src/bin/options_video.c > > > > Modified: trunk/terminology/data/themes/default.edc > > =================================================================== > > --- trunk/terminology/data/themes/default.edc 2012-09-02 07:37:24 UTC > > (rev 75940) > > +++ trunk/terminology/data/themes/default.edc 2012-09-02 14:10:31 UTC > > (rev 75941) > > @@ -744,7 +744,7 @@ > > > > > > //////////////////////////////////////////////////////////////////// > > // overlayed options and controls > > - part { name: "terminology.options"; type: SWALLOW; > > + part { name: "terminology.optdetails"; type: SWALLOW; > > scale: 1; > > description { state: "default" 0.0; > > fixed: 1 1; > > @@ -767,6 +767,54 @@ > > align: 1.0 0.5; > > rel1 { > > relative: 0.25 0.02; > > + offset: 8 8; > > + } > > + rel2 { > > + to_x: "terminology.options"; > > + relative: 0.0 0.98; > > + offset: -9 -9; > > + } > > + } > > + } > > + program { name: "opdt_show"; > > + signal: "optdetails,show"; > > + source: "terminology"; > > + action: STATE_SET "visible" 0.0; > > + transition: DECELERATE 0.4; > > + target: "terminology.optdetails"; > > + } > > + program { name: "opdt_hide"; > > + signal: "optdetails,hide"; > > + source: "terminology"; > > + action: STATE_SET "default" 0.0; > > + transition: DECELERATE 0.2; > > + target: "terminology.optdetails"; > > + after: "opdt_hide2"; > > + } > > + program { name: "opdt_hide2"; > > + action: SIGNAL_EMIT "optdetails,hide,done" "terminology"; > > + } > > + > > + part { name: "terminology.options"; type: SWALLOW; > > + scale: 1; > > + description { state: "default" 0.0; > > + fixed: 1 1; > > + align: 0.0 0.5; > > + visible: 0; > > + rel1 { > > + relative: 1.0 0.02; > > + offset: 8 8; > > + } > > + rel2 { > > + relative: 1.0 0.98; > > + offset: 8 -9; > > + } > > + } > > + description { state: "visible" 0.0; > > + inherit: "default" 0.0; > > + visible: 1; > > + align: 1.0 0.5; > > + rel1 { > > offset: -9 8; > > } > > rel2 { > > > > Modified: trunk/terminology/src/bin/options.c > > =================================================================== > > --- trunk/terminology/src/bin/options.c 2012-09-02 07:37:24 UTC (rev 75940) > > +++ trunk/terminology/src/bin/options.c 2012-09-02 14:10:31 UTC (rev 75941) > > @@ -25,66 +25,56 @@ > > _cb_op_font(void *data, Evas_Object *obj __UNUSED__, void *event > > __UNUSED__) > > { > > if (mode == 1) return; > > - elm_box_clear(op_opbox); > > - options_font(op_opbox, data); > > mode = 1; > > + edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology"); > > } > > > > static void > > _cb_op_theme(void *data, Evas_Object *obj __UNUSED__, void *event > > __UNUSED__) > > { > > if (mode == 2) return; > > - elm_box_clear(op_opbox); > > - options_theme(op_opbox, data); > > - // XXX: not done yet > > mode = 2; > > + edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology"); > > } > > > > static void > > _cb_op_wallpaper(void *data, Evas_Object *obj __UNUSED__, void *event > > __UNUSED__) > > { > > if (mode == 3) return; > > - elm_box_clear(op_opbox); > > - options_wallpaper(op_opbox, data); > > - // XXX: not done yet > > mode = 3; > > + edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology"); > > } > > > > static void > > _cb_op_colors(void *data, Evas_Object *obj __UNUSED__, void *event > > __UNUSED__) > > { > > if (mode == 4) return; > > - elm_box_clear(op_opbox); > > - options_colors(op_opbox, data); > > - // XXX: not done yet > > mode = 4; > > + edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology"); > > } > > > > static void > > _cb_op_video(void *data, Evas_Object *obj __UNUSED__, void *event > > __UNUSED__) > > { > > if (mode == 5) return; > > - elm_box_clear(op_opbox); > > - options_video(op_opbox, data); > > mode = 5; > > + edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology"); > > } > > > > static void > > _cb_op_behavior(void *data, Evas_Object *obj __UNUSED__, void *event > > __UNUSED__) > > { > > if (mode == 6) return; > > - elm_box_clear(op_opbox); > > - options_behavior(op_opbox, data); > > mode = 6; > > + edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology"); > > } > > > > static void > > _cb_op_helpers(void *data, Evas_Object *obj __UNUSED__, void *event > > __UNUSED__) > > { > > if (mode == 7) return; > > - elm_box_clear(op_opbox); > > - options_helpers(op_opbox, data); > > mode = 7; > > + edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology"); > > } > > > > static void > > @@ -97,8 +87,10 @@ > > static Eina_Bool > > _cb_op_del_delay(void *data __UNUSED__) > > { > > + evas_object_del(op_opbox); > > evas_object_del(op_frame); > > options_font_clear(); > > + op_opbox = NULL; > > op_frame = NULL; > > op_del_timer = NULL; > > elm_cache_all_flush(); > > @@ -111,6 +103,24 @@ > > options_toggle(saved_win, saved_bg, data); > > } > > > > +static void > > +_cb_opdt_hide_done(void *data, Evas_Object *obj __UNUSED__, const char > > *sig, const char *src) > > +{ > > + elm_box_clear(op_opbox); > > + switch (mode) > > + { > > + case 1: options_font(op_opbox, data); break; > > + case 2: options_theme(op_opbox, data); break; > > + case 3: options_wallpaper(op_opbox, data); break; > > + case 4: options_colors(op_opbox, data); break; > > + case 5: options_video(op_opbox, data); break; > > + case 6: options_behavior(op_opbox, data); break; > > + case 7: options_helpers(op_opbox, data); break; > > + default: break; > > + } > > + edje_object_signal_emit(saved_bg, "optdetails,show", "terminology"); > > +} > > + > > void > > options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term) > > { > > @@ -124,6 +134,12 @@ > > Elm_Object_Item *it_fn; > > Config *config = termio_config_get(term); > > > > + op_opbox = o = elm_box_add(win); > > + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, > > EVAS_HINT_EXPAND); > > + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, > > EVAS_HINT_FILL); > > + edje_object_part_swallow(bg, "terminology.optdetails", o); > > + evas_object_show(o); > > + > > op_frame = o = elm_frame_add(win); > > evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, > > EVAS_HINT_EXPAND); > > evas_object_size_hint_align_set(o, EVAS_HINT_FILL, > > EVAS_HINT_FILL); > > @@ -134,12 +150,6 @@ > > elm_object_content_set(op_frame, o); > > evas_object_show(o); > > > > - op_opbox = o = elm_box_add(win); > > - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, > > EVAS_HINT_EXPAND); > > - evas_object_size_hint_align_set(o, EVAS_HINT_FILL, > > EVAS_HINT_FILL); > > - elm_box_pack_end(op_box, o); > > - evas_object_show(o); > > - > > op_tbox = o = elm_box_add(win); > > evas_object_size_hint_weight_set(o, 0.0, EVAS_HINT_EXPAND); > > evas_object_size_hint_align_set(o, 1.0, EVAS_HINT_FILL); > > @@ -183,8 +193,14 @@ > > edje_object_part_swallow(bg, "terminology.options", op_frame); > > evas_object_show(op_frame); > > } > > + else if ((op_opbox) && (!op_out)) > > + edje_object_signal_emit(bg, "optdetails,show", "terminology"); > > + > > if (!op_out) > > { > > + edje_object_signal_callback_add(bg, "optdetails,hide,done", > > + "terminology", > > + _cb_opdt_hide_done, term); > > op_over = o = > > evas_object_rectangle_add(evas_object_evas_get(win)); > > evas_object_color_set(o, 0, 0, 0, 0); > > edje_object_part_swallow(bg, "terminology.dismiss", o); > > @@ -203,10 +219,13 @@ > > } > > else > > { > > + edje_object_signal_callback_del(bg, "optdetails,hide,done", > > + "terminology", > > + _cb_opdt_hide_done); > > evas_object_del(op_over); > > op_over = NULL; > > - > > edje_object_signal_emit(bg, "options,hide", "terminology"); > > + edje_object_signal_emit(bg, "optdetails,hide", "terminology"); > > op_out = EINA_FALSE; > > elm_object_focus_set(op_frame, EINA_FALSE); > > elm_object_focus_set(term, EINA_TRUE); > > > > Modified: trunk/terminology/src/bin/options_behavior.c > > =================================================================== > > --- trunk/terminology/src/bin/options_behavior.c 2012-09-02 > > 07:37:24 UTC (rev 75940) > > +++ trunk/terminology/src/bin/options_behavior.c 2012-09-02 > > 14:10:31 UTC (rev 75941) > > @@ -104,14 +104,21 @@ > > options_behavior(Evas_Object *opbox, Evas_Object *term) > > { > > Config *config = termio_config_get(term); > > - Evas_Object *o, *bx, *sc; > > + Evas_Object *o, *bx, *sc, *fr; > > char *txt; > > > > + fr = o = elm_frame_add(opbox); > > + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, > > EVAS_HINT_EXPAND); > > + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); > > + elm_object_text_set(o, "Behavior"); > > + elm_box_pack_end(opbox, o); > > + evas_object_show(o); > > + > > sc = o = elm_scroller_add(opbox); > > elm_scroller_content_min_limit(sc, EINA_TRUE, EINA_FALSE); > > evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, > > EVAS_HINT_EXPAND); > > evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); > > - elm_box_pack_end(opbox, o); > > + elm_object_content_set(fr, o); > > evas_object_show(o); > > > > bx = o = elm_box_add(opbox); > > > > Modified: trunk/terminology/src/bin/options_font.c > > =================================================================== > > --- trunk/terminology/src/bin/options_font.c 2012-09-02 07:37:24 UTC > > (rev 75940) > > +++ trunk/terminology/src/bin/options_font.c 2012-09-02 14:10:31 UTC > > (rev 75941) > > @@ -215,7 +215,7 @@ > > void > > options_font(Evas_Object *opbox, Evas_Object *term) > > { > > - Evas_Object *o, *bx; > > + Evas_Object *o, *bx, *fr, *bx0; > > char buf[4096], *file, *fname, *s; > > Eina_List *files, *fontlist, *l; > > Font *f; > > @@ -225,6 +225,19 @@ > > > > options_font_clear(); > > > > + fr = o = elm_frame_add(opbox); > > + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, > > EVAS_HINT_EXPAND); > > + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); > > + elm_object_text_set(o, "Font"); > > + elm_box_pack_end(opbox, o); > > + evas_object_show(o); > > + > > + bx0 = o = elm_box_add(opbox); > > + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, > > EVAS_HINT_EXPAND); > > + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); > > + elm_object_content_set(fr, o); > > + evas_object_show(o); > > + > > bx = o = elm_box_add(opbox); > > elm_box_horizontal_set(o, EINA_TRUE); > > > > @@ -252,7 +265,7 @@ > > elm_box_pack_end(bx, o); > > evas_object_show(o); > > > > - elm_box_pack_end(opbox, bx); > > + elm_box_pack_end(bx0, bx); > > evas_object_show(bx); > > > > it_class = elm_genlist_item_class_new(); > > @@ -351,7 +364,7 @@ > > elm_genlist_item_class_free(it_class); > > elm_genlist_item_class_free(it_group); > > > > - elm_box_pack_end(opbox, o); > > + elm_box_pack_end(bx0, o); > > evas_object_size_hint_weight_set(opbox, EVAS_HINT_EXPAND, > > EVAS_HINT_EXPAND); > > evas_object_size_hint_align_set(opbox, EVAS_HINT_FILL, EVAS_HINT_FILL); > > evas_object_show(o); > > > > Modified: trunk/terminology/src/bin/options_helpers.c > > =================================================================== > > --- trunk/terminology/src/bin/options_helpers.c 2012-09-02 07:37:24 UTC > > (rev 75940) > > +++ trunk/terminology/src/bin/options_helpers.c 2012-09-02 14:10:31 UTC > > (rev 75941) > > @@ -167,15 +167,28 @@ > > options_helpers(Evas_Object *opbox, Evas_Object *term) > > { > > Config *config = termio_config_get(term); > > - Evas_Object *o, *bx, *sc; > > + Evas_Object *o, *bx, *sc, *fr, *bx0; > > char *txt; > > > > + fr = o = elm_frame_add(opbox); > > + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, > > EVAS_HINT_EXPAND); > > + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); > > + elm_object_text_set(o, "Helpers"); > > + elm_box_pack_end(opbox, o); > > + evas_object_show(o); > > + > > + bx0 = o = elm_box_add(opbox); > > + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, > > EVAS_HINT_EXPAND); > > + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL) > > > > -- > Gustavo Sverzut Barbieri > http://profusion.mobi embedded systems > -------------------------------------- > MSN: barbi...@gmail.com > Skype: gsbarbieri > Mobile: +55 (19) 9225-2202 > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) ras...@rasterman.com ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
