From: Enlightenment S. <no-...@en...> - 2010-10-20 16:51:20
|
Log: Re-indenting and taking off trailing whitespaces. Author: glima Date: 2010-10-20 09:51:13 -0700 (Wed, 20 Oct 2010) New Revision: 53679 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-10-20 16:42:45 UTC (rev 53678) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-10-20 16:51:13 UTC (rev 53679) @@ -36,7 +36,7 @@ { double val = elm_slider_value_get(obj); double v; - + v = ((double)((int)(val * 10.0))) / 10.0; if (v != val) elm_slider_value_set(obj, v); } @@ -46,7 +46,7 @@ { double scale = elm_scale_get(); double val = elm_slider_value_get(obj); - + if (scale == val) return; elm_scale_all_set(val); } @@ -56,7 +56,7 @@ { double val = elm_slider_value_get(obj); double v; - + v = ((double)((int)(val * 5.0))) / 5.0; if (v != val) elm_slider_value_set(obj, v); } @@ -66,7 +66,7 @@ { double scale = elm_scale_get(); double val = elm_slider_value_get(obj); - + if (scale == val) return; elm_finger_size_all_set(val); } @@ -75,13 +75,13 @@ _status_basic(Evas_Object *win, Evas_Object *bx0) { Evas_Object *lb, *fr; - + fr = elm_frame_add(win); evas_object_size_hint_weight_set(fr, 1.0, 1.0); elm_frame_label_set(fr, "Information"); elm_box_pack_end(bx0, fr); evas_object_show(fr); - + lb = elm_label_add(win); elm_label_label_set(lb, "Applying configuration change" @@ -94,32 +94,32 @@ _status_config(Evas_Object *win, Evas_Object *bx0) { Evas_Object *lb, *pd, *bx2, *fr, *sl, *sp; - + fr = elm_frame_add(win); evas_object_size_hint_weight_set(fr, 1.0, 1.0); evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_frame_label_set(fr, "Sizing"); elm_box_pack_end(bx0, fr); evas_object_show(fr); - + bx2 = elm_box_add(win); evas_object_size_hint_weight_set(bx2, 1.0, 0.0); evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, 0.5); - + pd = elm_frame_add(win); evas_object_size_hint_weight_set(pd, 1.0, 0.0); evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5); elm_object_style_set(pd, "pad_medium"); elm_box_pack_end(bx2, pd); evas_object_show(pd); - + lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, 1.0, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); elm_label_label_set(lb,"<hilight>Scale</>"); elm_frame_content_set(pd, lb); evas_object_show(lb); - + sl = elm_slider_add(win); evas_object_size_hint_weight_set(sl, 1.0, 0.0); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -130,31 +130,31 @@ elm_slider_value_set(sl, elm_scale_get()); elm_box_pack_end(bx2, sl); evas_object_show(sl); - + evas_object_smart_callback_add(sl, "changed", sc_round, NULL); evas_object_smart_callback_add(sl, "delay,changed", sc_change, NULL); - + sp = elm_separator_add(win); elm_separator_horizontal_set(sp, 1); evas_object_size_hint_weight_set(sp, 1.0, 0.0); evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx2, sp); evas_object_show(sp); - + pd = elm_frame_add(win); evas_object_size_hint_weight_set(pd, 1.0, 0.0); evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5); elm_object_style_set(pd, "pad_medium"); elm_box_pack_end(bx2, pd); evas_object_show(pd); - + lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, 1.0, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); elm_label_label_set(lb, "<hilight>Finger Size</><br>"); elm_frame_content_set(pd, lb); evas_object_show(lb); - + sl = elm_slider_add(win); evas_object_size_hint_weight_set(sl, 1.0, 0.0); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -165,14 +165,14 @@ elm_slider_value_set(sl, elm_finger_size_get()); elm_box_pack_end(bx2, sl); evas_object_show(sl); - + evas_object_smart_callback_add(sl, "changed", fs_round, NULL); evas_object_smart_callback_add(sl, "delay,changed", fs_change, NULL); - + // FIXME: add theme selector (basic mode and advanced for fallbacks) // FIXME: save config // FIXME: profile selector / creator etc. - // + // elm_frame_content_set(fr, bx2); evas_object_show(bx2); } @@ -191,7 +191,7 @@ back = elm_flip_content_back_get(fl); elm_table_pack(holder, back, 0, 0, 1, 1); evas_object_hide(back); -// elm_table_unpack(holder, wid); // this should NOT be needed - but in evas_table/elm_table + // elm_table_unpack(holder, wid); // this should NOT be needed - but in evas_table/elm_table elm_flip_content_back_set(fl, wid); } else @@ -199,10 +199,10 @@ front = elm_flip_content_front_get(fl); elm_table_pack(holder, front, 0, 0, 1, 1); evas_object_hide(front); -// elm_table_unpack(holder, wid); // this should NOT be needed - but in evas_table/elm_table + // elm_table_unpack(holder, wid); // this should NOT be needed - but in evas_table/elm_table elm_flip_content_front_set(fl, wid); } - + evas_object_show(wid); elm_flip_go(fl, ELM_FLIP_ROTATE_Y_CENTER_AXIS); } @@ -255,7 +255,7 @@ const char *defth; char *newth; Theme *t = tsel; - + if (!t) return; defth = elm_theme_get(NULL); newth = malloc(strlen(defth) + 1 + strlen(t->name) + 1); @@ -266,7 +266,7 @@ newth[0] = 0; rest = strchr(defth, ':'); if (!rest) - strcpy(newth, t->name); + strcpy(newth, t->name); else { strcpy(newth, t->name); @@ -298,7 +298,7 @@ newth[0] = 0; rest = strchr(defth, ':'); if (!rest) - strcpy(newth, t->name); + strcpy(newth, t->name); else { strcpy(newth, t->name); @@ -312,34 +312,34 @@ } /*static void -_theme_browse(void *data, Evas_Object *obj, void *event_info) -{ - printf("not implemented\n"); -}*/ + _theme_browse(void *data, Evas_Object *obj, void *event_info) + { + printf("not implemented\n"); + }*/ static void _status_config_sizing(Evas_Object *win, Evas_Object *holder) { Evas_Object *lb, *pd, *bx2, *sl, *sp; - + bx2 = elm_box_add(win); evas_object_size_hint_weight_set(bx2, 1.0, 0.0); evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, 0.5); - + pd = elm_frame_add(win); evas_object_size_hint_weight_set(pd, 1.0, 0.0); evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5); elm_object_style_set(pd, "pad_medium"); elm_box_pack_end(bx2, pd); evas_object_show(pd); - + lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, 1.0, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); elm_label_label_set(lb,"<hilight>Scale</>"); elm_frame_content_set(pd, lb); evas_object_show(lb); - + sl = elm_slider_add(win); evas_object_size_hint_weight_set(sl, 1.0, 0.0); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -350,31 +350,31 @@ elm_slider_value_set(sl, elm_scale_get()); elm_box_pack_end(bx2, sl); evas_object_show(sl); - + evas_object_smart_callback_add(sl, "changed", sc_round, NULL); evas_object_smart_callback_add(sl, "delay,changed", sc_change, NULL); - + sp = elm_separator_add(win); elm_separator_horizontal_set(sp, 1); evas_object_size_hint_weight_set(sp, 1.0, 0.0); evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx2, sp); evas_object_show(sp); - + pd = elm_frame_add(win); evas_object_size_hint_weight_set(pd, 1.0, 0.0); evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5); elm_object_style_set(pd, "pad_medium"); elm_box_pack_end(bx2, pd); evas_object_show(pd); - + lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, 1.0, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); elm_label_label_set(lb, "<hilight>Finger Size</><br>"); elm_frame_content_set(pd, lb); evas_object_show(lb); - + sl = elm_slider_add(win); evas_object_size_hint_weight_set(sl, 1.0, 0.0); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -385,12 +385,12 @@ elm_slider_value_set(sl, elm_finger_size_get()); elm_box_pack_end(bx2, sl); evas_object_show(sl); - + evas_object_smart_callback_add(sl, "changed", fs_round, NULL); evas_object_smart_callback_add(sl, "delay,changed", fs_change, NULL); evas_object_data_set(win, "sizing", bx2); - + elm_table_pack(holder, bx2, 0, 0, 1, 1); } @@ -398,17 +398,17 @@ _sample_theme_new(Evas_Object *win) { Evas_Object *base, *bg, *bt, *ck, *rd, *rdg, *sl, *fr, *li, *rc, *sp; - + base = elm_table_add(win); evas_object_size_hint_weight_set(base, 1.0, 1.0); evas_object_size_hint_align_set(base, EVAS_HINT_FILL, EVAS_HINT_FILL); - + bg = elm_bg_add(win); evas_object_size_hint_weight_set(bg, 1.0, 1.0); evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(base, bg, 0, 0, 2, 5); evas_object_show(bg); - + bt = elm_button_add(win); elm_button_label_set(bt, "Button"); elm_table_pack(base, bt, 0, 0, 1, 1); @@ -418,28 +418,28 @@ elm_check_label_set(ck, "Check"); elm_table_pack(base, ck, 0, 1, 1, 1); evas_object_show(ck); - + rd = elm_radio_add(win); elm_radio_state_value_set(rd, 0); elm_radio_label_set(rd, "Radio 1"); elm_table_pack(base, rd, 1, 0, 1, 1); evas_object_show(rd); rdg = rd; - + rd = elm_radio_add(win); elm_radio_state_value_set(rd, 1); elm_radio_label_set(rd, "Radio 2"); elm_radio_group_add(rd, rdg); elm_table_pack(base, rd, 1, 1, 1, 1); evas_object_show(rd); - + sp = elm_separator_add(win); elm_separator_horizontal_set(sp, 1); evas_object_size_hint_weight_set(sp, 1.0, 0.0); evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5); elm_table_pack(base, sp, 0, 2, 2, 1); evas_object_show(sp); - + sl = elm_slider_add(win); elm_slider_label_set(sl, "Slider"); elm_slider_span_size_set(sl, 120); @@ -456,13 +456,13 @@ evas_object_size_hint_weight_set(fr, 1.0, 1.0); evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(fr); - + li = elm_list_add(win); evas_object_size_hint_weight_set(li, 1.0, 1.0); evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_frame_content_set(fr, li); evas_object_show(li); - + elm_list_item_append(li, "List Item 1", NULL, NULL, NULL, NULL); elm_list_item_append(li, "Second Item", NULL, NULL, NULL, NULL); elm_list_item_append(li, "Third Item", NULL, NULL, NULL, NULL); @@ -471,7 +471,7 @@ rc = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(rc, 120, 120); elm_table_pack(base, rc, 0, 4, 2, 1); - + return base; } @@ -481,11 +481,11 @@ Evas_Object *tb, *rc, *sc, *sp, *li, *pd, *fr, *bt, *sample; Eina_List *list, *l; char *th, *s, *ext; - + tb = elm_table_add(win); evas_object_size_hint_weight_set(tb, 1.0, 1.0); evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); - + rc = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(rc, 240, 120); elm_table_pack(tb, rc, 0, 0, 1, 1); @@ -493,27 +493,27 @@ rc = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(rc, 240, 240); elm_table_pack(tb, rc, 0, 1, 1, 1); - + ///////////////////////////////////////////// - + pd = elm_frame_add(win); elm_object_style_set(pd, "pad_medium"); evas_object_size_hint_weight_set(pd, 1.0, 1.0); evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, pd, 0, 0, 1, 1); evas_object_show(pd); - + li = elm_list_add(win); evas_object_size_hint_weight_set(li, 1.0, 1.0); evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_frame_content_set(pd, li); evas_object_show(li); - + list = elm_theme_name_available_list_new(); EINA_LIST_FOREACH(list, l, th) { Theme *t; - + t = calloc(1, sizeof(Theme)); t->name = eina_stringshare_add(th); s = elm_theme_list_item_path_get(th, &(t->in_search_path)); @@ -532,7 +532,7 @@ free(s); } else - t->label = eina_stringshare_add(s); + t->label = eina_stringshare_add(s); } else { @@ -546,7 +546,7 @@ free(s); } else - t->label = eina_stringshare_add(s); + t->label = eina_stringshare_add(s); } themes = eina_list_append(themes, t); elm_list_item_append(li, t->label, NULL, NULL, _theme_sel, t); @@ -554,23 +554,23 @@ elm_theme_name_available_list_free(list); elm_list_go(li); - + pd = elm_frame_add(win); elm_object_style_set(pd, "pad_medium"); evas_object_size_hint_weight_set(pd, 1.0, 1.0); evas_object_size_hint_align_set(pd, 0.9, 0.9); elm_table_pack(tb, pd, 0, 0, 1, 1); evas_object_show(pd); - -/* FIXME: not implemented yet - bt = elm_button_add(win); - evas_object_smart_callback_add(bt, "clicked", _theme_browse, win); - elm_button_label_set(bt, "Browse..."); - evas_object_size_hint_weight_set(bt, 1.0, 1.0); - evas_object_size_hint_align_set(bt, 0.9, 0.9); - elm_frame_content_set(pd, bt); - evas_object_show(bt); - */ + + /* FIXME: not implemented yet + bt = elm_button_add(win); + evas_object_smart_callback_add(bt, "clicked", _theme_browse, win); + elm_button_label_set(bt, "Browse..."); + evas_object_size_hint_weight_set(bt, 1.0, 1.0); + evas_object_size_hint_align_set(bt, 0.9, 0.9); + elm_frame_content_set(pd, bt); + evas_object_show(bt); + */ pd = elm_frame_add(win); elm_object_style_set(pd, "pad_medium"); evas_object_size_hint_weight_set(pd, 1.0, 0.0); @@ -584,19 +584,19 @@ evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_frame_content_set(pd, fr); evas_object_show(fr); - + sc = elm_scroller_add(win); elm_scroller_bounce_set(sc, 0, 0); evas_object_size_hint_weight_set(sc, 1.0, 1.0); evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_frame_content_set(fr, sc); evas_object_show(sc); - + sample = _sample_theme_new(win); elm_scroller_content_set(sc, sample); evas_object_show(sample); evas_object_data_set(win, "sample", sample); - + ///////////////////////////////////////////// sp = elm_separator_add(win); elm_separator_horizontal_set(sp, 1); @@ -604,14 +604,14 @@ evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5); elm_table_pack(tb, sp, 0, 2, 1, 1); evas_object_show(sp); - + pd = elm_frame_add(win); elm_object_style_set(pd, "pad_medium"); evas_object_size_hint_weight_set(pd, 0.0, 0.0); evas_object_size_hint_align_set(pd, 0.5, 0.5); elm_table_pack(tb, pd, 0, 3, 1, 1); evas_object_show(pd); - + bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _theme_use, win); elm_button_label_set(bt, "Use Theme"); @@ -619,9 +619,9 @@ evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_frame_content_set(pd, bt); evas_object_show(bt); - + evas_object_data_set(win, "themes", tb); - + elm_table_pack(holder, tb, 0, 0, 1, 1); } @@ -629,27 +629,27 @@ _unimplemented(Evas_Object *win, Evas_Object *holder, const char *name) { Evas_Object *lb, *pd, *bx2; - + bx2 = elm_box_add(win); evas_object_size_hint_weight_set(bx2, 1.0, 0.0); evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, 0.5); - + pd = elm_frame_add(win); evas_object_size_hint_weight_set(pd, 0.0, 0.0); evas_object_size_hint_align_set(pd, 0.5, 0.5); elm_object_style_set(pd, "pad_medium"); elm_box_pack_end(bx2, pd); evas_object_show(pd); - + lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, 0.0, 0.0); evas_object_size_hint_align_set(lb, 0.5, 0.5); elm_label_label_set(lb,"<hilight>Not implemented yet</>"); elm_frame_content_set(pd, lb); evas_object_show(lb); - + evas_object_data_set(win, name, bx2); - + elm_table_pack(holder, bx2, 0, 0, 1, 1); } @@ -688,7 +688,7 @@ { Evas_Object *tb, *holder, *fl; Elm_Toolbar_Item *it; - + tb = elm_toolbar_add(win); elm_toolbar_homogenous_set(tb, 0); evas_object_size_hint_weight_set(tb, 1.0, 0.0); @@ -696,7 +696,7 @@ it = elm_toolbar_item_add(tb, NULL, "Sizing", _cf_sizing, win); elm_toolbar_item_add(tb, NULL, "Theme", _cf_themes, win); - + elm_toolbar_item_add(tb, NULL, "Fonts", _cf_fonts, win); elm_toolbar_item_add(tb, NULL, "Profiles", _cf_profiles, win); elm_toolbar_item_add(tb, NULL, "Scrolling", _cf_scrolling, win); @@ -704,14 +704,14 @@ elm_toolbar_item_add(tb, NULL, "Caches", _cf_caches, win); elm_box_pack_end(bx0, tb); evas_object_show(tb); - + holder = elm_table_add(win); evas_object_size_hint_align_set(holder, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(holder, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(bx0, holder); evas_object_show(holder); evas_object_data_set(win, "holder", holder); - + _status_config_sizing(win, holder); _status_config_themes(win, holder); _status_config_fonts(win, holder); @@ -719,14 +719,14 @@ _status_config_rendering(win, holder); _status_config_scrolling(win, holder); _status_config_caches(win, holder); - + fl = elm_flip_add(win); evas_object_size_hint_align_set(fl, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(fl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_table_pack(holder, fl, 0, 0, 1, 1); evas_object_show(fl); evas_object_data_set(win, "flip", fl); - + elm_toolbar_item_select(it); } @@ -752,7 +752,7 @@ if (!interactive) _status_basic(win, bx0); else if (0) _status_config(win, bx0); else _status_config_full(win, bx0); - + evas_object_show(win); } @@ -763,14 +763,14 @@ return ECORE_CALLBACK_CANCEL; } -/* this is your elementary main function - it MUSt be called IMMEDIATELY - * after elm_init() and MUSt be passed argc and argv, and MUST be called +/* this is your elementary main function - it MUST be called IMMEDIATELY + * after elm_init() and MUST be passed argc and argv, and MUST be called * elm_main and not be static - must be a visible symbol with EAPI infront */ EAPI int elm_main(int argc, char **argv) { int i; - + for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-h")) @@ -807,7 +807,7 @@ interactive = 0; } } - /* put here any init specific to this app like parsing args etc. */ + /* put here any init code specific to this app like parsing args, etc. */ if (!quiet) { status_win(); /* create main window */ @@ -833,12 +833,12 @@ elm_exit(); } } - elm_run(); /* and run the program now and handle all events etc. */ - /* if the mainloop that elm_run() runs exist - we exit the app */ + elm_run(); /* and run the program now and handle all events, etc. */ + /* if the mainloop that elm_run() runs exists, we exit the app */ elm_shutdown(); /* clean up and shut down */ /* exit code */ return 0; } #endif -/* all emeentary apps should use this. but it right after elm_main() */ +/* All emelentary apps should use this. Put it right after elm_main() */ ELM_MAIN() |
From: Enlightenment S. <no-...@en...> - 2010-10-29 17:32:12
|
Log: Ahh, the trailing whitespaces... Author: glima Date: 2010-10-29 10:32:06 -0700 (Fri, 29 Oct 2010) New Revision: 54001 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-10-29 17:29:07 UTC (rev 54000) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-10-29 17:32:06 UTC (rev 54001) @@ -788,10 +788,10 @@ const char *prof_name; char buf[PATH_MAX]; Evas_Object *en; -#ifdef ELM_EFREET +#ifdef ELM_EFREET Efreet_Desktop *desk = NULL; #endif - + sel_profile = data; if (!sel_profile) return; @@ -800,12 +800,12 @@ cur_selected = !strcmp(cur_profile, sel_profile); pdir = elm_profile_dir_get(sel_profile, EINA_FALSE); -#ifdef ELM_EFREET +#ifdef ELM_EFREET snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir); desk = efreet_desktop_new(buf); if ((desk) && (desk->name)) prof_name = desk->name; else -#endif +#endif prof_name = cur_profile; if (!pdir) @@ -823,15 +823,15 @@ elm_label_label_set(evas_object_data_get(obj, "prof_name_lbl"), buf); en = evas_object_data_get(obj, "prof_desc_entry"); -#ifdef ELM_EFREET +#ifdef ELM_EFREET if (desk) elm_scrolled_entry_entry_set(en, desk->comment); else #endif elm_scrolled_entry_entry_set(en, "Unknown"); -#ifdef ELM_EFREET +#ifdef ELM_EFREET if (desk) efreet_desktop_free(desk); -#endif +#endif } static void @@ -861,19 +861,19 @@ pdir = elm_profile_dir_get(profile, EINA_FALSE); label = profile; - + #ifdef ELM_EFREET snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir); desk = efreet_desktop_new(buf); if ((desk) && (desk->name)) label = desk->name; #endif - + buf[0] = 0; if (pdir) snprintf(buf, sizeof(buf), "%s/icon.edj", pdir); #ifdef ELM_EFREET if ((desk) && (desk->icon) && (pdir)) snprintf(buf, sizeof(buf), "%s/%s", pdir, desk->icon); -#endif +#endif ic = elm_icon_add(l_widget); ext = strrchr(buf, '.'); if (ext) @@ -896,7 +896,7 @@ #ifdef ELM_EFREET if (desk) efreet_desktop_free(desk); -#endif +#endif } if (sel_it) elm_list_item_selected_set(sel_it, EINA_TRUE); @@ -1184,7 +1184,7 @@ { #ifdef ELM_EFREET elm_need_efreet(); -#endif +#endif status_win(); /* create main window */ if (!interactive) ecore_timer_add(2.0, _exit_timer, NULL); |
From: Enlightenment S. <no-...@en...> - 2010-11-04 13:51:16
|
Log: Accomodating for scrolled entry changes at elm config app's profile page. NB: there is no sane way of restraining the min/max size of an elm widget right now. This is why the scrolled entry is now (hopefully not for toooo long) with half the size of a box, not 60px in height anymore. Author: glima Date: 2010-11-04 06:51:09 -0700 (Thu, 04 Nov 2010) New Revision: 54151 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-11-04 13:51:02 UTC (rev 54150) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-11-04 13:51:09 UTC (rev 54151) @@ -941,8 +941,8 @@ static void _status_config_profiles(Evas_Object *win, Evas_Object *holder) { - Evas_Object *li, *bx, *fr_bx, *btn_bx, *fr, *lb, *en, *sp, *pd, *bt; - char buf[PATH_MAX]; + Evas_Object *li, *bx, *fr_bx1, *fr_bx2, *btn_bx, *fr, *lb, *en, *sp, *pd, + *bt; Eina_List *profs; Evas *evas; @@ -950,15 +950,22 @@ evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); - fr_bx = elm_box_add(win); - evas_object_size_hint_weight_set(fr_bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(fr_bx, EVAS_HINT_FILL, EVAS_HINT_FILL); + fr_bx1 = elm_box_add(win); + evas_object_size_hint_weight_set(fr_bx1, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(fr_bx1, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_box_homogenous_set(fr_bx1, EINA_TRUE); + evas_object_show(fr_bx1); + fr_bx2 = elm_box_add(win); + evas_object_size_hint_weight_set(fr_bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(fr_bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_show(fr_bx2); + fr = elm_frame_add(win); elm_frame_label_set(fr, "Available Profiles"); evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_frame_content_set(fr, fr_bx); + elm_frame_content_set(fr, fr_bx1); elm_box_pack_end(bx, fr); evas_object_show(fr); @@ -969,26 +976,26 @@ profs = elm_profile_list_get(); evas_object_show(li); - elm_box_pack_end(fr_bx, li); + elm_box_pack_end(fr_bx2, li); lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); - elm_label_label_set(lb, buf); evas_object_show(lb); en = elm_scrolled_entry_add(win); - evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); - evas_object_size_hint_min_set(en, 0, 60); + elm_scrolled_entry_editable_set(en, EINA_FALSE); + evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(en); evas_object_data_set(li, "prof_name_lbl", lb); evas_object_data_set(li, "prof_desc_entry", en); - elm_box_pack_end(fr_bx, lb); - elm_box_pack_end(fr_bx, en); + elm_box_pack_end(fr_bx2, lb); + elm_box_pack_end(fr_bx1, fr_bx2); + elm_box_pack_end(fr_bx1, en); ///////////////////////////////////////////// sp = elm_separator_add(win); |
From: Enlightenment S. <no-...@en...> - 2010-11-22 06:56:00
|
Log: Better sizes here. Author: glima Date: 2010-11-21 22:55:54 -0800 (Sun, 21 Nov 2010) New Revision: 54769 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-11-22 06:08:52 UTC (rev 54768) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-11-22 06:55:54 UTC (rev 54769) @@ -799,11 +799,11 @@ evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); rc = evas_object_rectangle_add(evas_object_evas_get(win)); - evas_object_size_hint_min_set(rc, 320, 120); + evas_object_size_hint_min_set(rc, 0, 130); elm_table_pack(tb, rc, 0, 0, 1, 1); rc = evas_object_rectangle_add(evas_object_evas_get(win)); - evas_object_size_hint_min_set(rc, 320, 240); + evas_object_size_hint_min_set(rc, 0, 200); elm_table_pack(tb, rc, 0, 1, 1, 1); ///////////////////////////////////////////// |
From: Enlightenment S. <no-...@en...> - 2010-11-23 06:40:23
|
Log: More font sizes. Author: glima Date: 2010-11-22 22:40:15 -0800 (Mon, 22 Nov 2010) New Revision: 54852 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-11-23 06:10:58 UTC (rev 54851) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-11-23 06:40:15 UTC (rev 54852) @@ -1424,7 +1424,7 @@ sd->size = -250; fdata.font_scale_list = eina_list_append(fdata.font_scale_list, sd); - for (i = 5; i < 21; i++) + for (i = 5; i < 51; i++) { char str[16]; |
From: Enlightenment S. <no-...@en...> - 2010-11-23 08:31:02
|
Log: "Set to all" actions on font dialog, elm config app. You may now set a common font overlay for all text classes available. Author: glima Date: 2010-11-23 00:30:55 -0800 (Tue, 23 Nov 2010) New Revision: 54857 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-11-23 07:38:46 UTC (rev 54856) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-11-23 08:30:55 UTC (rev 54857) @@ -447,6 +447,37 @@ } static void +_font_overlay_set_all(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) +{ + Evas_Object *win, *fclasses, *fnames, *fstyles, *fsizes; + Elm_Text_Class_Data *tc_data, *tc; + Elm_List_Item *it; + Eina_List *l; + + win = data; + + fclasses = evas_object_data_get(win, "font_classes_list"); + it = elm_list_selected_item_get(fclasses); + if (!it) return; + tc_data = elm_list_item_data_get(it); + + fnames = evas_object_data_get(win, "font_names_list"); + fstyles = evas_object_data_get(win, "font_styles_list"); + fsizes = evas_object_data_get(win, "font_sizes_list"); + + EINA_LIST_FOREACH(fdata.text_classes, l, tc) + { + eina_stringshare_replace(&tc->font, tc_data->font); + eina_stringshare_replace(&tc->style, tc_data->style); + tc->size = tc_data->size; + } + + elm_config_save(); +} + +static void _font_overlay_reset(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) @@ -1668,6 +1699,14 @@ evas_object_show(bx); bt = elm_button_add(win); + evas_object_smart_callback_add(bt, "clicked", _font_overlay_set_all, win); + elm_button_label_set(bt, "Set to All"); + evas_object_size_hint_weight_set(bt, 0.0, 0.0); + evas_object_size_hint_align_set(bt, 0.5, 0.5); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _font_overlay_reset, win); elm_button_label_set(bt, "Reset"); evas_object_size_hint_weight_set(bt, 0.0, 0.0); |
From: Enlightenment S. <no-...@en...> - 2010-11-24 08:22:48
|
Log: Indenting this little monster. Author: glima Date: 2010-11-24 00:22:41 -0800 (Wed, 24 Nov 2010) New Revision: 54923 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-11-24 08:22:24 UTC (rev 54922) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-11-24 08:22:41 UTC (rev 54923) @@ -4,17 +4,17 @@ #endif #ifndef ELM_LIB_QUICKLAUNCH -typedef struct _Theme Theme; -typedef struct _Fonts_Data Fonts_Data; +typedef struct _Theme Theme; +typedef struct _Fonts_Data Fonts_Data; typedef struct _Elm_Text_Class_Data Elm_Text_Class_Data; -typedef struct _Elm_Font_Size_Data Elm_Font_Size_Data; +typedef struct _Elm_Font_Size_Data Elm_Font_Size_Data; struct _Theme { const char *label; const char *name; const char *path; - Eina_Bool in_search_path; + Eina_Bool in_search_path; }; static Theme *tsel = NULL; @@ -119,7 +119,9 @@ } static void -cf_round(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +cf_round(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double val = elm_slider_value_get(obj); double v; @@ -129,7 +131,9 @@ } static void -cf_change(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +cf_change(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double scale = elm_scale_get(); double val = elm_slider_value_get(obj); @@ -139,7 +143,9 @@ } static void -fc_round(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +fc_round(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double val = elm_slider_value_get(obj); double v; @@ -149,7 +155,9 @@ } static void -fc_change(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +fc_change(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double font_cache = elm_font_cache_get(); double val = elm_slider_value_get(obj); @@ -159,7 +167,9 @@ } static void -ic_round(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +ic_round(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double val = elm_slider_value_get(obj); double v; @@ -169,7 +179,9 @@ } static void -ic_change(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +ic_change(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double image_cache = elm_image_cache_get(); double val = elm_slider_value_get(obj); @@ -179,7 +191,9 @@ } static void -sc_round(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +sc_round(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double val = elm_slider_value_get(obj); double v; @@ -189,7 +203,9 @@ } static void -sc_change(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +sc_change(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double scale = elm_scale_get(); double val = elm_slider_value_get(obj); @@ -199,7 +215,9 @@ } static void -fs_round(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +fs_round(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double val = elm_slider_value_get(obj); double v; @@ -209,7 +227,9 @@ } static void -fs_change(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +fs_change(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double scale = elm_scale_get(); double val = elm_slider_value_get(obj); @@ -219,7 +239,9 @@ } static void -efc_round(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +efc_round(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double val = elm_slider_value_get(obj); double v; @@ -229,7 +251,9 @@ } static void -efc_change(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +efc_change(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double scale = elm_scale_get(); double val = elm_slider_value_get(obj); @@ -239,7 +263,9 @@ } static void -ecc_round(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +ecc_round(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double val = elm_slider_value_get(obj); double v; @@ -249,7 +275,9 @@ } static void -ecc_change(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +ecc_change(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { double scale = elm_scale_get(); double val = elm_slider_value_get(obj); @@ -259,7 +287,8 @@ } static void -_status_basic(Evas_Object *win, Evas_Object *bx0) +_status_basic(Evas_Object *win, + Evas_Object *bx0) { Evas_Object *lb, *fr; @@ -278,7 +307,8 @@ } static void -_status_config(Evas_Object *win, Evas_Object *bx0) +_status_config(Evas_Object *win, + Evas_Object *bx0) { Evas_Object *lb, *pd, *bx2, *fr, *sl, *sp; @@ -303,7 +333,7 @@ lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, 1.0, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); - elm_label_label_set(lb,"<hilight>Scale</>"); + elm_label_label_set(lb, "<hilight>Scale</>"); elm_frame_content_set(pd, lb); evas_object_show(lb); @@ -359,13 +389,13 @@ // FIXME: add theme selector (basic mode and advanced for fallbacks) // FIXME: save config // FIXME: profile selector / creator etc. - // elm_frame_content_set(fr, bx2); evas_object_show(bx2); } static void -_flip_to(Evas_Object *win, const char *name) +_flip_to(Evas_Object *win, + const char *name) { Evas_Object *wid, *pager; wid = evas_object_data_get(win, name); @@ -374,43 +404,57 @@ } static void -_cf_sizing(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cf_sizing(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { _flip_to(data, "sizing"); } static void -_cf_themes(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cf_themes(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { _flip_to(data, "themes"); } static void -_cf_fonts(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cf_fonts(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { _flip_to(data, "fonts"); } static void -_cf_profiles(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cf_profiles(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { _flip_to(data, "profiles"); } static void -_cf_scrolling(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cf_scrolling(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { _flip_to(data, "scrolling"); } static void -_cf_rendering(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cf_rendering(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { _flip_to(data, "rendering"); } static void -_cf_caches(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cf_caches(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { _flip_to(data, "caches"); } @@ -424,23 +468,23 @@ if (!theme_search_order) return NULL; - for (p = theme_search_order; ; p++) + for (p = theme_search_order;; p++) { - if ((*p == ':') || (!*p)) - { - if (p > theme_search_order) - { - char *n = malloc(p - theme_search_order + 1); - if (!n) - return NULL; + if ((*p == ':') || (!*p)) + { + if (p > theme_search_order) + { + char *n = malloc(p - theme_search_order + 1); + if (!n) + return NULL; - strncpy(n, theme_search_order, p - theme_search_order); - n[p - theme_search_order] = 0; - ret = eina_stringshare_add(n); - free(n); - break; - } - } + strncpy(n, theme_search_order, p - theme_search_order); + n[p - theme_search_order] = 0; + ret = eina_stringshare_add(n); + free(n); + break; + } + } } return ret; @@ -566,7 +610,8 @@ { const char *name; - name = elm_font_fontconfig_name_get(tc_data->font, tc_data->style); + name = elm_font_fontconfig_name_get(tc_data->font, + tc_data->style); elm_font_overlay_set(tc_data->name, name, tc_data->size ? tc_data->size : -100); elm_font_fontconfig_name_free(name); @@ -582,7 +627,8 @@ } static void -_profile_change_do(Evas_Object *win, const char *profile) +_profile_change_do(Evas_Object *win, + const char *profile) { int flush_interval, font_c, image_c, edje_file_c, edje_col_c; const char *curr_theme, *curr_engine; @@ -639,16 +685,18 @@ l_items = elm_list_items_get(evas_object_data_get(win, "engines_list")); EINA_LIST_FOREACH(l_items, l, it) { - if (!strcmp(elm_list_item_data_get(it), curr_engine)) - { - elm_list_item_selected_set(it, EINA_TRUE); - break; - } + if (!strcmp(elm_list_item_data_get(it), curr_engine)) + { + elm_list_item_selected_set(it, EINA_TRUE); + break; + } } } static void -_engine_use(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_engine_use(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { Evas_Object *li; const char *selection; @@ -664,7 +712,9 @@ } static void -_profile_use(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_profile_use(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { Evas_Object *li; const char *selection; @@ -683,13 +733,17 @@ } static void -_btn_todo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_btn_todo(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { printf("To be done!\n"); } static void -_profile_reset(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_profile_reset(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { const char *selection, *curr; const char *pdir; @@ -715,7 +769,9 @@ } static void -_theme_use(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_theme_use(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { const char *defth; char *newth; @@ -743,7 +799,9 @@ } static void -_theme_sel(void *data, Evas_Object *obj, void *event_info __UNUSED__) +_theme_sel(void *data, + Evas_Object *obj, + void *event_info __UNUSED__) { Theme *t = data; Evas_Object *win = elm_object_top_widget_get(obj); @@ -777,13 +835,14 @@ } /*static void - _theme_browse(void *data, Evas_Object *obj, void *event_info) - { - printf("not implemented\n"); - }*/ + _theme_browse(void *data, Evas_Object *obj, void *event_info) + { + printf("not implemented\n"); + }*/ static void -_status_config_sizing(Evas_Object *win, Evas_Object *pager) +_status_config_sizing(Evas_Object *win, + Evas_Object *pager) { Evas_Object *lb, *pd, *bx, *sl, *sp; @@ -801,7 +860,7 @@ lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); - elm_label_label_set(lb,"<hilight>Scale</>"); + elm_label_label_set(lb, "<hilight>Scale</>"); elm_frame_content_set(pd, lb); evas_object_show(lb); @@ -930,9 +989,9 @@ elm_frame_content_set(fr, li); evas_object_show(li); - elm_list_item_append(li, "List Item 1", NULL, NULL, NULL, NULL); - elm_list_item_append(li, "Second Item", NULL, NULL, NULL, NULL); - elm_list_item_append(li, "Third Item", NULL, NULL, NULL, NULL); + elm_list_item_append(li, "List Item 1", NULL, NULL, NULL, NULL); + elm_list_item_append(li, "Second Item", NULL, NULL, NULL, NULL); + elm_list_item_append(li, "Third Item", NULL, NULL, NULL, NULL); elm_list_go(li); rc = evas_object_rectangle_add(evas_object_evas_get(win)); @@ -943,7 +1002,8 @@ } static void -_status_config_themes(Evas_Object *win, Evas_Object *pager) +_status_config_themes(Evas_Object *win, + Evas_Object *pager) { Evas_Object *tb, *rc, *sc, *sp, *li, *pd, *fr, *bt, *sample; Eina_List *list, *l; @@ -1016,7 +1076,7 @@ t->label = eina_stringshare_add(s); } themes = eina_list_append(themes, t); - elm_list_item_append(li, t->label, NULL, NULL, _theme_sel, t); + elm_list_item_append(li, t->label, NULL, NULL, _theme_sel, t); } elm_theme_name_available_list_free(list); @@ -1037,7 +1097,7 @@ evas_object_size_hint_align_set(bt, 0.9, 0.9); elm_frame_content_set(pd, bt); evas_object_show(bt); - */ + */ pd = elm_frame_add(win); elm_object_style_set(pd, "pad_medium"); evas_object_size_hint_weight_set(pd, 1.0, 0.0); @@ -1092,7 +1152,9 @@ } static void -_unimplemented(Evas_Object *win, Evas_Object *pager, const char *name) +_unimplemented(Evas_Object *win, + Evas_Object *pager, + const char *name) { Evas_Object *lb, *pd, *bx2; @@ -1110,7 +1172,7 @@ lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, 0.0, 0.0); evas_object_size_hint_align_set(lb, 0.5, 0.5); - elm_label_label_set(lb,"<hilight>Not implemented yet</>"); + elm_label_label_set(lb, "<hilight>Not implemented yet</>"); elm_frame_content_set(pd, lb); evas_object_show(lb); @@ -1359,8 +1421,8 @@ edje_freeze(); EINA_LIST_FOREACH(fdata.text_classes, l, tc_data) - elm_list_item_append(li, tc_data->desc, NULL, NULL, _font_classes_list_sel, - tc_data); + elm_list_item_append(li, tc_data->desc, NULL, NULL, + _font_classes_list_sel, tc_data); evas_object_smart_callback_add(li, "unselected", _fc_list_unselect_cb, NULL); @@ -1410,7 +1472,8 @@ { tc_data->font = eina_stringshare_add(efp->name); /* we're sure we recorded with only 1 style selected */ - tc_data->style = eina_stringshare_add(efp->styles->data); + tc_data->style = + eina_stringshare_add(efp->styles->data); elm_font_properties_free(efp); } } @@ -1555,10 +1618,10 @@ EINA_LIST_FOREACH(names_list, l, font) elm_list_item_append(flist, font, NULL, NULL, _font_names_list_sel, NULL); - EINA_LIST_FREE(names_list, font); + EINA_LIST_FREE(names_list, font) ; - evas_object_smart_callback_add(flist, "unselected", _fnames_list_unselect_cb, - NULL); + evas_object_smart_callback_add(flist, "unselected", + _fnames_list_unselect_cb, NULL); elm_list_go(flist); @@ -1738,19 +1801,25 @@ } static void -_engines_list_item_del_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_engines_list_item_del_cb(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { free(data); } static void -_profiles_list_item_del_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_profiles_list_item_del_cb(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { free(data); } static void -_profiles_list_selected_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) +_profiles_list_selected_cb(void *data, + Evas_Object *obj, + void *event_info __UNUSED__) { const char *cur_profile = NULL; const char *sel_profile, *pdir; @@ -1776,16 +1845,16 @@ if ((desk) && (desk->name)) prof_name = desk->name; else #endif - prof_name = cur_profile; + prof_name = cur_profile; if (!pdir) - elm_object_disabled_set(evas_object_data_get(obj, "prof_reset_btn"), - cur_selected); + elm_object_disabled_set(evas_object_data_get(obj, "prof_reset_btn"), + cur_selected); else { - elm_object_disabled_set(evas_object_data_get(obj, "prof_del_btn"), - EINA_TRUE); - elm_profile_dir_free(pdir); + elm_object_disabled_set(evas_object_data_get(obj, "prof_del_btn"), + EINA_TRUE); + elm_profile_dir_free(pdir); } snprintf(buf, sizeof(buf), "<hilight>Selected profile: %s</><br>", @@ -1797,7 +1866,7 @@ if (desk) elm_scrolled_entry_entry_set(en, desk->comment); else #endif - elm_scrolled_entry_entry_set(en, "Unknown"); + elm_scrolled_entry_entry_set(en, "Unknown"); #ifdef ELM_EFREET if (desk) efreet_desktop_free(desk); @@ -1805,7 +1874,8 @@ } static void -_profiles_list_fill(Evas_Object *l_widget, Eina_List *p_names) +_profiles_list_fill(Evas_Object *l_widget, + Eina_List *p_names) { const char *cur_profile = NULL; const char *profile; @@ -1822,7 +1892,7 @@ EINA_LIST_FOREACH(p_names, l, profile) { #ifdef ELM_EFREET - Efreet_Desktop *desk = NULL; + Efreet_Desktop *desk = NULL; #endif const char *label, *ext, *pdir; char buf[PATH_MAX]; @@ -1865,7 +1935,7 @@ elm_profile_dir_free(pdir); #ifdef ELM_EFREET - if (desk) efreet_desktop_free(desk); + if (desk) efreet_desktop_free(desk); #endif } @@ -1874,10 +1944,11 @@ } static void -_status_config_profiles(Evas_Object *win, Evas_Object *pager) +_status_config_profiles(Evas_Object *win, + Evas_Object *pager) { Evas_Object *li, *bx, *fr_bx1, *fr_bx2, *btn_bx, *fr, *lb, *en, *sp, *pd, - *bt; + *bt; Eina_List *profs; Evas *evas; @@ -1886,13 +1957,15 @@ evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); fr_bx1 = elm_box_add(win); - evas_object_size_hint_weight_set(fr_bx1, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(fr_bx1, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); evas_object_size_hint_align_set(fr_bx1, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_homogenous_set(fr_bx1, EINA_TRUE); evas_object_show(fr_bx1); fr_bx2 = elm_box_add(win); - evas_object_size_hint_weight_set(fr_bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(fr_bx2, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); evas_object_size_hint_align_set(fr_bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(fr_bx2); @@ -1949,7 +2022,8 @@ btn_bx = elm_box_add(win); elm_box_horizontal_set(btn_bx, EINA_TRUE); - evas_object_size_hint_weight_set(btn_bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(btn_bx, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn_bx, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(btn_bx); @@ -2007,7 +2081,8 @@ } static void -_status_config_scrolling(Evas_Object *win, Evas_Object *pager) +_status_config_scrolling(Evas_Object *win, + Evas_Object *pager) { _unimplemented(win, pager, "scrolling"); } @@ -2015,17 +2090,17 @@ static char * _engine_name_prettify(const char *engine) { - char *ret, *ptr; + char *ret, *ptr; - ret = strdup(engine); - ret[0] -= 0x20; + ret = strdup(engine); + ret[0] -= 0x20; - while ((ptr = strpbrk(ret, "_"))) - { - *ptr = ' '; - } + while ((ptr = strpbrk(ret, "_"))) + { + *ptr = ' '; + } - return ret; + return ret; } /* FIXME! ideally, we would trim elm_config.c's _elm_engines list at @@ -2033,37 +2108,38 @@ static Eina_Bool _elm_engine_supported(const char *engine) { - const char *engines[] = { - "software_x11", - "fb", - "directfb", - "software_16_x11", - "software_8_x11", - "xrender_x11", - "opengl_x11", - "software_gdi", - "software_16_wince_gdi", - "sdl", - "software_16_sdl", - "opengl_sdl", - NULL - }; + const char *engines[] = { + "software_x11", + "fb", + "directfb", + "software_16_x11", + "software_8_x11", + "xrender_x11", + "opengl_x11", + "software_gdi", + "software_16_wince_gdi", + "sdl", + "software_16_sdl", + "opengl_sdl", + NULL + }; - unsigned int i; + unsigned int i; - for (i = 0; engines[i]; i++) - { + for (i = 0; engines[i]; i++) + { #define ENGINE_COMPARE(name) (!strcmp(engines[i], name)) - if (ENGINE_COMPARE(engine)) - return EINA_TRUE; + if (ENGINE_COMPARE(engine)) + return EINA_TRUE; #undef ENGINE_COMPARE - } + } - return EINA_FALSE; + return EINA_FALSE; } static void -_engines_list_fill(Evas_Object *l_widget, Eina_List *e_names) +_engines_list_fill(Evas_Object *l_widget, + Eina_List *e_names) { const char *engine, *cur_engine; void *sel_it = NULL; @@ -2098,7 +2174,8 @@ } static void -_status_config_rendering(Evas_Object *win, Evas_Object *pager) +_status_config_rendering(Evas_Object *win, + Evas_Object *pager) { Evas_Object *li, *bx, *fr, *sp, *pd, *bt; Eina_List *engines; @@ -2154,7 +2231,8 @@ } static void -_status_config_caches(Evas_Object *win, Evas_Object *pager) +_status_config_caches(Evas_Object *win, + Evas_Object *pager) { Evas_Object *lb, *pd, *bx, *sl, *sp; @@ -2172,7 +2250,7 @@ lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); - elm_label_label_set(lb,"<hilight>Cache Flush Interval</>"); + elm_label_label_set(lb, "<hilight>Cache Flush Interval</>"); elm_frame_content_set(pd, lb); evas_object_show(lb); @@ -2208,7 +2286,7 @@ lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); - elm_label_label_set(lb,"<hilight>Font Cache Size</>"); + elm_label_label_set(lb, "<hilight>Font Cache Size</>"); elm_frame_content_set(pd, lb); evas_object_show(lb); @@ -2280,7 +2358,7 @@ lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); - elm_label_label_set(lb,"<hilight>Number of Edje Files to Cache</>"); + elm_label_label_set(lb, "<hilight>Number of Edje Files to Cache</>"); elm_frame_content_set(pd, lb); evas_object_show(lb); @@ -2316,7 +2394,7 @@ lb = elm_label_add(win); evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); - elm_label_label_set(lb,"<hilight>Number of Edje Collections to Cache</>"); + elm_label_label_set(lb, "<hilight>Number of Edje Collections to Cache</>"); elm_frame_content_set(pd, lb); evas_object_show(lb); @@ -2341,7 +2419,8 @@ } static void -_status_config_full(Evas_Object *win, Evas_Object *bx0) +_status_config_full(Evas_Object *win, + Evas_Object *bx0) { Evas_Object *tb, *pager; Elm_Toolbar_Item *sizing, *it; @@ -2415,7 +2494,8 @@ evas_object_show(bx0); if (!interactive) _status_basic(win, bx0); - else if (0) _status_config(win, bx0); + else if (0) + _status_config(win, bx0); else _status_config_full(win, bx0); evas_object_resize(win, 320, 480); @@ -2433,7 +2513,8 @@ * after elm_init() and MUST be passed argc and argv, and MUST be called * elm_main and not be static - must be a visible symbol with EAPI infront */ EAPI int -elm_main(int argc, char **argv) +elm_main(int argc, + char **argv) { int i; @@ -2508,6 +2589,7 @@ /* exit code */ return 0; } + #endif /* All emelentary apps should use this. Put it right after elm_main() */ ELM_MAIN() |
From: Enlightenment S. <no-...@en...> - 2010-11-25 06:27:50
|
Log: Elm photocam now back to life. Now whoever broke fileselector, please fix it!! Author: glima Date: 2010-11-24 22:27:42 -0800 (Wed, 24 Nov 2010) New Revision: 54971 Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c =================================================================== --- trunk/TMP/st/elementary/src/bin/test_photocam.c 2010-11-25 03:56:53 UTC (rev 54970) +++ trunk/TMP/st/elementary/src/bin/test_photocam.c 2010-11-25 06:27:42 UTC (rev 54971) @@ -105,39 +105,16 @@ } static void -sel_done(void *data, Evas_Object *obj, void *event_info __UNUSED__) +my_bt_open(void *data, Evas_Object *obj __UNUSED__, void *event_info) { - Evas_Object *ph, *iw; + Evas_Object *ph = data; + const char *file = event_info; - ph = data; - iw = evas_object_data_get(ph, "inwin"); - elm_photocam_file_set(ph, elm_fileselector_selected_get(obj)); - evas_object_del(iw); + if (file) + elm_photocam_file_set(ph, file); } static void -my_bt_open(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -{ - Evas_Object *ph, *win; - Evas_Object *iw, *fs; - - ph = data; - win = evas_object_data_get(ph, "window"); - iw = elm_win_inwin_add(win); - - fs = elm_fileselector_add(win); - elm_fileselector_expandable_set(fs, EINA_TRUE); - elm_fileselector_path_set(fs, getenv("HOME")); - evas_object_smart_callback_add(fs, "done", sel_done, ph); - - evas_object_data_set(ph, "inwin", iw); - - elm_win_inwin_content_set(iw, fs); - evas_object_show(fs); - elm_win_inwin_activate(iw); -} - -static void my_bt_show_reg(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { elm_photocam_image_region_show(data, 30, 50, 500, 300); @@ -301,9 +278,9 @@ elm_table_pack(tb2, bt, 0, 0, 1, 1); evas_object_show(bt); - bt = elm_button_add(win); - elm_button_label_set(bt, "Select Photo"); - evas_object_smart_callback_add(bt, "clicked", my_bt_open, ph); + bt = elm_fileselector_button_add(win); + elm_fileselector_button_label_set(bt, "Select Photo"); + evas_object_smart_callback_add(bt, "file,chosen", my_bt_open, ph); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.5, 0.1); elm_table_pack(tb2, bt, 1, 0, 1, 1); |
From: Enlightenment S. <no-...@en...> - 2010-11-29 13:15:26
|
Log: Account for list unselection (elm profiles). Sorry, my bad, discomfitor. Author: glima Date: 2010-11-29 05:15:20 -0800 (Mon, 29 Nov 2010) New Revision: 55059 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-11-29 13:15:09 UTC (rev 55058) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-11-29 13:15:20 UTC (rev 55059) @@ -726,7 +726,7 @@ if (!profile) { - fprintf(stderr, "No profile currently set!"); + fprintf(stderr, "No profile currently set!\n"); /* FIXME: log domain */ return; } @@ -1857,11 +1857,15 @@ if (!pdir) elm_object_disabled_set(evas_object_data_get(obj, "prof_reset_btn"), - cur_selected); + EINA_TRUE); else { elm_object_disabled_set(evas_object_data_get(obj, "prof_del_btn"), EINA_TRUE); + elm_object_disabled_set(evas_object_data_get(obj, "prof_reset_btn"), + EINA_FALSE); + elm_object_disabled_set(evas_object_data_get(obj, "prof_use_btn"), + EINA_FALSE); elm_profile_dir_free(pdir); } @@ -1952,6 +1956,20 @@ } static void +_profiles_list_unselect_cb(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) +{ + if (elm_list_selected_item_get(obj)) return; + elm_object_disabled_set(evas_object_data_get(obj, "prof_del_btn"), + EINA_TRUE); + elm_object_disabled_set(evas_object_data_get(obj, "prof_reset_btn"), + EINA_TRUE); + elm_object_disabled_set(evas_object_data_get(obj, "prof_use_btn"), + EINA_TRUE); +} + +static void _status_config_profiles(Evas_Object *win, Evas_Object *pager) { @@ -1988,6 +2006,8 @@ li = elm_list_add(win); evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_smart_callback_add(li, "unselected", _profiles_list_unselect_cb, + NULL); profs = elm_profile_list_get(); @@ -2043,6 +2063,8 @@ elm_box_pack_end(btn_bx, bt); evas_object_show(bt); + evas_object_data_set(li, "prof_use_btn", bt); + bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _btn_todo, NULL); /* TODO */ elm_button_label_set(bt, "Delete"); |
From: Enlightenment S. <no-...@en...> - 2010-12-06 12:45:20
|
Log: Redundant semicolons here. Author: glima Date: 2010-12-06 04:45:11 -0800 (Mon, 06 Dec 2010) New Revision: 55320 Trac: http://trac.enlightenment.org/e/changeset/55320 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-12-06 09:07:56 UTC (rev 55319) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-12-06 12:45:11 UTC (rev 55320) @@ -58,14 +58,14 @@ elm_object_disabled_set(list, EINA_TRUE); \ } \ } \ - while (0); + while (0) #define ELM_LIST_ENABLE(list) \ do \ { \ elm_object_disabled_set(list, EINA_FALSE); \ } \ - while (0); + while (0) static int quiet = 0; static int interactive = 1; |
From: Enlightenment S. <no-...@en...> - 2010-12-06 12:45:25
|
Log: Typos, damn typos. Author: glima Date: 2010-12-06 04:45:18 -0800 (Mon, 06 Dec 2010) New Revision: 55321 Trac: http://trac.enlightenment.org/e/changeset/55321 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-12-06 12:45:11 UTC (rev 55320) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-12-06 12:45:18 UTC (rev 55321) @@ -135,10 +135,10 @@ Evas_Object *obj, void *event_info __UNUSED__) { - double scale = elm_scale_get(); + double cf = elm_cache_flush_interval_get(); double val = elm_slider_value_get(obj); - if (scale == val) return; + if (cf == val) return; elm_cache_flush_interval_all_set(val); } @@ -231,10 +231,10 @@ Evas_Object *obj, void *event_info __UNUSED__) { - double scale = elm_scale_get(); + double fs = elm_finger_size_get(); double val = elm_slider_value_get(obj); - if (scale == val) return; + if (fs == val) return; elm_finger_size_all_set(val); } @@ -255,10 +255,10 @@ Evas_Object *obj, void *event_info __UNUSED__) { - double scale = elm_scale_get(); + double efc = elm_edje_file_cache_get(); double val = elm_slider_value_get(obj); - if (scale == val) return; + if (efc == val) return; elm_edje_file_cache_all_set(val); } @@ -279,10 +279,10 @@ Evas_Object *obj, void *event_info __UNUSED__) { - double scale = elm_scale_get(); + double ecc = elm_edje_collection_cache_get(); double val = elm_slider_value_get(obj); - if (scale == val) return; + if (ecc == val) return; elm_edje_collection_cache_all_set(val); } |
From: Enlightenment S. <no-...@en...> - 2010-12-06 12:45:33
|
Log: Misusing API. Author: glima Date: 2010-12-06 04:45:26 -0800 (Mon, 06 Dec 2010) New Revision: 55322 Trac: http://trac.enlightenment.org/e/changeset/55322 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-12-06 12:45:18 UTC (rev 55321) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-12-06 12:45:26 UTC (rev 55322) @@ -761,14 +761,14 @@ selection = elm_list_item_data_get(elm_list_selected_item_get(li)); curr = elm_profile_current_get(); + elm_config_save(); /* dump config into old profile's data dir */ + pdir = elm_profile_dir_get(selection, EINA_TRUE); if (!pdir) return; - elm_config_save(); /* dump config into old profile's data dir */ - ecore_file_recursive_rm(pdir); - free((void *)pdir); + elm_profile_dir_free(pdir); elm_config_reload(); |
From: Enlightenment S. <no-...@en...> - 2010-12-06 12:46:08
|
Log: Just indenting this file. Author: glima Date: 2010-12-06 04:46:02 -0800 (Mon, 06 Dec 2010) New Revision: 55327 Trac: http://trac.enlightenment.org/e/changeset/55327 Modified: trunk/TMP/st/elementary/src/bin/test_tooltip.c Modified: trunk/TMP/st/elementary/src/bin/test_tooltip.c =================================================================== --- trunk/TMP/st/elementary/src/bin/test_tooltip.c 2010-12-06 12:45:56 UTC (rev 55326) +++ trunk/TMP/st/elementary/src/bin/test_tooltip.c 2010-12-06 12:46:02 UTC (rev 55327) @@ -7,15 +7,17 @@ typedef struct _Testitem { Elm_Gengrid_Item *item; - const char *path; - int mode; - int onoff; + const char *path; + int mode; + int onoff; } Testitem; static Elm_Gengrid_Item_Class gic; char * -grdt_lbl_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +grdt_lbl_get(void *data, + Evas_Object *obj __UNUSED__, + const char *part __UNUSED__) { const Testitem *ti = data; char buf[256]; @@ -24,16 +26,20 @@ } Evas_Object * -grdt_icon_get(void *data, Evas_Object *obj, const char *part) +grdt_icon_get(void *data, + Evas_Object *obj, + const char *part) { const Testitem *ti = data; if (!strcmp(part, "elm.swallow.icon")) { - Evas_Object *icon = elm_bg_add(obj); - elm_bg_file_set(icon, ti->path, NULL); - evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); - evas_object_show(icon); - return icon; + Evas_Object *icon = elm_bg_add(obj); + elm_bg_file_set(icon, ti->path, NULL); + evas_object_size_hint_aspect_set(icon, + EVAS_ASPECT_CONTROL_VERTICAL, + 1, 1); + evas_object_show(icon); + return icon; } return NULL; } @@ -41,7 +47,9 @@ static Elm_Genlist_Item_Class itct; static void -gltt_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +gltt_exp(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info) { Elm_Genlist_Item *it = event_info; Evas_Object *gl = elm_genlist_item_genlist_get(it); @@ -62,28 +70,36 @@ } static void -gltt_con(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +gltt_con(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info) { Elm_Genlist_Item *it = event_info; elm_genlist_item_subitems_clear(it); } static void -gltt_exp_req(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +gltt_exp_req(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info) { Elm_Genlist_Item *it = event_info; elm_genlist_item_expanded_set(it, 1); } static void -gltt_con_req(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +gltt_con_req(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info) { Elm_Genlist_Item *it = event_info; elm_genlist_item_expanded_set(it, 0); } char * -gltt_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +gltt_label_get(void *data, + Evas_Object *obj __UNUSED__, + const char *part __UNUSED__) { char buf[256]; snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data); @@ -91,11 +107,14 @@ } static Evas_Object * -_tt_item_icon(void *data __UNUSED__, Evas_Object *obj, void *item __UNUSED__) +_tt_item_icon(void *data __UNUSED__, + Evas_Object *obj, + void *item __UNUSED__) { Evas_Object *ic = elm_icon_add(obj); char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/logo_small.png", + PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); evas_object_resize(ic, 64, 64); @@ -103,7 +122,9 @@ } static void -_tt_item_icon_del(void *data, Evas_Object *obj __UNUSED__, void *event_info) +_tt_item_icon_del(void *data, + Evas_Object *obj __UNUSED__, + void *event_info) { // test to check for del_cb behavior! printf("_tt_icon_del: data=%ld (== 456?), event_info=%p\n", @@ -111,7 +132,9 @@ } static void -_tt_text_replace(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_tt_text_replace(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { static int count = 0; char buf[64]; @@ -121,7 +144,10 @@ } static void -_tt_timer_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_tt_timer_del(void *data __UNUSED__, + Evas *e __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { Ecore_Timer *timer = evas_object_data_del(obj, "test-timer"); if (!timer) return; @@ -136,28 +162,34 @@ } static void -_tt_text_replace_timed(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_tt_text_replace_timed(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { Ecore_Timer *timer = evas_object_data_get(obj, "test-timer"); if (timer) { ecore_timer_del(timer); evas_object_data_del(obj, "test-timer"); - elm_button_label_set(obj, "Simple text tooltip, click to start changed timed"); + elm_button_label_set(obj, "Simple text tooltip, click to start" + " changed timed"); return; } timer = ecore_timer_add(1.5, _tt_text_replace_timer_cb, obj); evas_object_data_set(obj, "test-timer", timer); - elm_button_label_set(obj, "Simple text tooltip, click to stop changed timed"); + elm_button_label_set(obj, "Simple text tooltip, click to stop changed" + " timed"); } static Evas_Object * -_tt_icon(void *data __UNUSED__, Evas_Object *obj) +_tt_icon(void *data __UNUSED__, + Evas_Object *obj) { Evas_Object *ic = elm_icon_add(obj); char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/logo_small.png", + PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); evas_object_resize(ic, 64, 64); @@ -165,7 +197,8 @@ } static Evas_Object * -_tt_icon2(void *data __UNUSED__, Evas_Object *obj) +_tt_icon2(void *data __UNUSED__, + Evas_Object *obj) { Evas_Object *ic = elm_icon_add(obj); char buf[PATH_MAX]; @@ -177,7 +210,9 @@ } static void -_tt_icon_del(void *data, Evas_Object *obj __UNUSED__, void *event_info) +_tt_icon_del(void *data, + Evas_Object *obj __UNUSED__, + void *event_info) { // test to check for del_cb behavior! printf("_tt_icon_del: data=%ld (== 123?), event_info=%p\n", @@ -197,14 +232,17 @@ } static void -_tt_icon_replace_timed(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_tt_icon_replace_timed(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { Ecore_Timer *timer = evas_object_data_get(obj, "test-timer"); if (timer) { ecore_timer_del(timer); evas_object_data_del(obj, "test-timer"); - elm_button_label_set(obj, "Icon tooltip, click to start changed timed"); + elm_button_label_set(obj, "Icon tooltip, click to start changed" + " timed"); return; } @@ -223,24 +261,30 @@ } static void -_tt_style_replace_timed(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_tt_style_replace_timed(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { Ecore_Timer *timer = evas_object_data_get(obj, "test-timer"); if (timer) { ecore_timer_del(timer); evas_object_data_del(obj, "test-timer"); - elm_button_label_set(obj, "Icon tooltip style, click to start changed timed"); + elm_button_label_set(obj, "Icon tooltip style, click to start" + " changed timed"); return; } timer = ecore_timer_add(1.5, _tt_style_replace_timer_cb, obj); evas_object_data_set(obj, "test-timer", timer); - elm_button_label_set(obj, "Icon tooltip style, click to stop changed timed"); + elm_button_label_set(obj, "Icon tooltip style, click to stop changed" + " timed"); } static void -_tt_visible_lock_toggle(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_tt_visible_lock_toggle(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { static int locked = 0; @@ -248,20 +292,25 @@ if (locked) { elm_button_label_set(obj, "Locked tooltip visibility"); - elm_object_tooltip_text_set(obj, "This tooltip is locked visible,<br> click the button to unlock!"); + elm_object_tooltip_text_set(obj, "This tooltip is locked" + " visible,<br> click the button" + " to unlock!"); elm_object_tooltip_show(obj); } else { elm_button_label_set(obj, "Unlocked tooltip visibility"); - elm_object_tooltip_text_set(obj, "This tooltip is unlocked visible,<br> click the button to lock!"); + elm_object_tooltip_text_set(obj, "This tooltip is unlocked" + " visible,<br> click the button" + " to lock!"); elm_object_tooltip_hide(obj); } - } void -test_tooltip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +test_tooltip(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { Evas_Object *win, *bg, *bx, *tb, *bt, *se, *lst; Elm_Toolbar_Item *ti; @@ -273,11 +322,13 @@ bg = elm_bg_add(win); elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -310,26 +361,32 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Simple text tooltip, click to start changed timed"); + elm_button_label_set(bt, "Simple text tooltip, click to start" + " changed timed"); elm_object_tooltip_text_set(bt, "Initial"); - evas_object_smart_callback_add(bt, "clicked", _tt_text_replace_timed, NULL); + evas_object_smart_callback_add(bt, "clicked", _tt_text_replace_timed, + NULL); elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_event_callback_add(bt, EVAS_CALLBACK_DEL, _tt_timer_del, NULL); + evas_object_event_callback_add(bt, EVAS_CALLBACK_DEL, _tt_timer_del, + NULL); bt = elm_button_add(win); elm_button_label_set(bt, "Icon tooltip"); - elm_object_tooltip_content_cb_set(bt, _tt_icon, (void*)123L, _tt_icon_del); + elm_object_tooltip_content_cb_set(bt, _tt_icon, (void *)123L, + _tt_icon_del); elm_box_pack_end(bx, bt); evas_object_show(bt); bt = elm_button_add(win); elm_button_label_set(bt, "Icon tooltip, click to start changed timed"); elm_object_tooltip_content_cb_set(bt, _tt_icon, NULL, NULL); - evas_object_smart_callback_add(bt, "clicked", _tt_icon_replace_timed, NULL); + evas_object_smart_callback_add(bt, "clicked", _tt_icon_replace_timed, + NULL); elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_event_callback_add(bt, EVAS_CALLBACK_DEL, _tt_timer_del, NULL); + evas_object_event_callback_add(bt, EVAS_CALLBACK_DEL, _tt_timer_del, + NULL); bt = elm_button_add(win); elm_button_label_set(bt, "Transparent Icon tooltip"); @@ -339,24 +396,30 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Icon tooltip style, click to start changed timed"); + elm_button_label_set(bt, "Icon tooltip style, click to start changed" + " timed"); elm_object_tooltip_content_cb_set(bt, _tt_icon, NULL, NULL); - evas_object_smart_callback_add(bt, "clicked", _tt_style_replace_timed, NULL); + evas_object_smart_callback_add(bt, "clicked", _tt_style_replace_timed, + NULL); elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_event_callback_add(bt, EVAS_CALLBACK_DEL, _tt_timer_del, NULL); + evas_object_event_callback_add(bt, EVAS_CALLBACK_DEL, _tt_timer_del, + NULL); bt = elm_button_add(win); elm_button_label_set(bt, "Unlocked tooltip visibility"); - elm_object_tooltip_text_set(bt, "This tooltip is unlocked visible,<br> click the button to lock!"); - evas_object_smart_callback_add(bt, "clicked", _tt_visible_lock_toggle, NULL); + elm_object_tooltip_text_set(bt, "This tooltip is unlocked visible,<br>" + " click the button to lock!"); + evas_object_smart_callback_add(bt, "clicked", _tt_visible_lock_toggle, + NULL); elm_box_pack_end(bx, bt); evas_object_show(bt); se = elm_scrolled_entry_add(win); evas_object_size_hint_weight_set(se, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(se, EVAS_HINT_FILL, 0.5); - elm_scrolled_entry_scrollbar_policy_set(se, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); + elm_scrolled_entry_scrollbar_policy_set(se, ELM_SCROLLER_POLICY_OFF, + ELM_SCROLLER_POLICY_OFF); elm_scrolled_entry_entry_set(se, "Hello, some scrolled entry here!"); elm_object_tooltip_text_set(se, "Type something here!"); elm_scrolled_entry_single_line_set(se, 1); @@ -364,11 +427,12 @@ evas_object_show(se); lst = elm_list_add(win); - li = elm_list_item_append(lst, "Hello", NULL, NULL, NULL, NULL); + li = elm_list_item_append(lst, "Hello", NULL, NULL, NULL, NULL); elm_list_item_tooltip_text_set(li, "Something useful here?"); - li = elm_list_item_append(lst, "Icon Tooltip", NULL, NULL, NULL, NULL); + li = elm_list_item_append(lst, "Icon Tooltip", NULL, NULL, NULL, NULL); elm_list_item_tooltip_content_cb_set(li, _tt_item_icon, NULL, NULL); - evas_object_size_hint_weight_set(lst, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(lst, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); evas_object_size_hint_align_set(lst, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_min_set(lst, 100, 100); elm_list_go(lst); @@ -380,7 +444,9 @@ } void -test_tooltip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +test_tooltip2(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { Evas_Object *win, *bg, *bx, *grid, *gl; Elm_Genlist_Item *it1, *it2, *it3; @@ -388,29 +454,31 @@ int i, n; char buf[PATH_MAX]; const char *img[9] = - { - "panel_01.jpg", - "plant_01.jpg", - "rock_01.jpg", - "rock_02.jpg", - "sky_01.jpg", - "sky_02.jpg", - "sky_03.jpg", - "sky_04.jpg", - "wood_01.jpg", - }; + { + "panel_01.jpg", + "plant_01.jpg", + "rock_01.jpg", + "rock_02.jpg", + "sky_01.jpg", + "sky_02.jpg", + "sky_03.jpg", + "sky_04.jpg", + "wood_01.jpg", + }; win = elm_win_add(NULL, "tooltip2", ELM_WIN_BASIC); elm_win_title_set(win, "Tooltip 2"); elm_win_autodel_set(win, 1); bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bg); evas_object_show(bg); bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); @@ -419,7 +487,8 @@ elm_gengrid_horizontal_set(grid, EINA_FALSE); elm_gengrid_multi_select_set(grid, EINA_TRUE); evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); gic.item_style = "default"; gic.func.label_get = grdt_lbl_get; @@ -428,17 +497,19 @@ n = 0; for (i = 0; i < 9; i++) { - snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, img[n]); - n++; - ti[i].mode = i; - ti[i].path = eina_stringshare_add(buf); - ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), NULL, NULL); - if (n % 2) - elm_gengrid_item_tooltip_text_set(ti[i].item, "Testing X"); - else - elm_gengrid_item_tooltip_text_set(ti[i].item, "Testing Y"); - if (!(i % 5)) - elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE); + snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, + img[n]); + n++; + ti[i].mode = i; + ti[i].path = eina_stringshare_add(buf); + ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), NULL, + NULL); + if (n % 2) + elm_gengrid_item_tooltip_text_set(ti[i].item, "Testing X"); + else + elm_gengrid_item_tooltip_text_set(ti[i].item, "Testing Y"); + if (!(i % 5)) + elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE); } elm_box_pack_end(bx, grid); @@ -446,9 +517,10 @@ gl = elm_genlist_add(win); evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); - itct.item_style = "default"; + itct.item_style = "default"; itct.func.label_get = gltt_label_get; it1 = elm_genlist_item_append(gl, &itct, (void *)1, NULL, @@ -463,7 +535,8 @@ elm_genlist_item_tooltip_text_set(it3, "Testing 3"); evas_object_smart_callback_add(gl, "expand,request", gltt_exp_req, gl); - evas_object_smart_callback_add(gl, "contract,request", gltt_con_req, gl); + evas_object_smart_callback_add(gl, "contract,request", gltt_con_req, + gl); evas_object_smart_callback_add(gl, "expanded", gltt_exp, gl); evas_object_smart_callback_add(gl, "contracted", gltt_con, gl); @@ -473,4 +546,5 @@ evas_object_resize(win, 320, 480); evas_object_show(win); } + #endif |
From: Enlightenment S. <no-...@en...> - 2010-12-07 19:18:12
|
Log: Typo, old typo. Author: glima Date: 2010-12-07 11:18:05 -0800 (Tue, 07 Dec 2010) New Revision: 55363 Trac: http://trac.enlightenment.org/e/changeset/55363 Modified: trunk/TMP/st/elementary/src/bin/test_fileselector_button.c Modified: trunk/TMP/st/elementary/src/bin/test_fileselector_button.c =================================================================== --- trunk/TMP/st/elementary/src/bin/test_fileselector_button.c 2010-12-07 19:17:50 UTC (rev 55362) +++ trunk/TMP/st/elementary/src/bin/test_fileselector_button.c 2010-12-07 19:18:05 UTC (rev 55363) @@ -31,10 +31,10 @@ _current_sel_toggle(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *fs_bt = data; - Eina_Bool value = elm_fileselector_button_folder_only_get(fs_bt); - elm_fileselector_button_folder_only_set(fs_bt, !value); - printf("Current selection entry display set to: %s\n", - value ? "false" : "true"); + Eina_Bool value = elm_fileselector_button_is_save_get(fs_bt); + elm_fileselector_button_is_save_set(fs_bt, !value); + printf("Current selection editable entry set to: %s\n", + value ? "false" : "true"); } static void |
From: Enlightenment S. <no-...@en...> - 2010-12-10 13:01:38
|
Log: Typo--. Author: glima Date: 2010-12-10 05:01:31 -0800 (Fri, 10 Dec 2010) New Revision: 55446 Trac: http://trac.enlightenment.org/e/changeset/55446 Modified: trunk/TMP/st/elementary/src/bin/config.c Modified: trunk/TMP/st/elementary/src/bin/config.c =================================================================== --- trunk/TMP/st/elementary/src/bin/config.c 2010-12-10 11:14:28 UTC (rev 55445) +++ trunk/TMP/st/elementary/src/bin/config.c 2010-12-10 13:01:31 UTC (rev 55446) @@ -2524,7 +2524,7 @@ LABEL_FRAME_ADD("<hilight>Zoom scroll friction</>"); sl = elm_slider_add(win); - elm_object_tooltip_text_set(sl, "This is the amount of inertia inertia<br>" + elm_object_tooltip_text_set(sl, "This is the amount of inertia<br>" "scrollers will impose at animations<br>" "triggered by Elementary widgets'<br>" "zooming API"); |