From ee82a15d310568a3f74cbde7b95ed924a7ce82b4 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 26 Nov 2001 13:08:34 +0000 Subject: [PATCH] add stuff to e_setup.. dialog has buttons now. fixed bug with view with bg addition not working. SVN revision: 5738 --- data/setup/textzone_button.bits.db | Bin 0 -> 77824 bytes src/view.c | 36 +++++++- src/view.h | 2 + tools/e_setup.c | 143 +++++++++++++++++++++++++---- 4 files changed, 162 insertions(+), 19 deletions(-) create mode 100644 data/setup/textzone_button.bits.db diff --git a/data/setup/textzone_button.bits.db b/data/setup/textzone_button.bits.db new file mode 100644 index 0000000000000000000000000000000000000000..8b600c05452b74dd6a974c0b7ab4432ba2a55292 GIT binary patch literal 77824 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 BF#P}k literal 0 HcmV?d00001 diff --git a/src/view.c b/src/view.c index eee9d14ec..fb1e24b86 100644 --- a/src/view.c +++ b/src/view.c @@ -1527,7 +1527,7 @@ e_view_file_added(int id, char *file) v = e_view_find_by_monitor_id(id); if (!v) D_RETURN; e_iconbar_file_add(v, file); - e_view_bg_change(v, file); + e_view_bg_add(v, file); /* filter files here */ if (!e_view_filter_file(v, file)) D_RETURN; if (!e_icon_find_by_file(v, file)) @@ -1559,7 +1559,7 @@ e_view_file_deleted(int id, char *file) v = e_view_find_by_monitor_id(id); if (!v) D_RETURN; e_iconbar_file_delete(v, file); - e_view_bg_change(v, file); + e_view_bg_del(v, file); { E_Icon *ic; @@ -2407,13 +2407,43 @@ e_view_bg_change(E_View *v, char *file) D_ENTER; + printf("change %s\n", file); if (!(!strcmp(file, ".e_background.bg.db"))) return; - sprintf(buf, "background_reload:%s", v->dir); + sprintf(buf, "background_reload:%s", v->dir); ecore_add_event_timer(buf, 0.5, e_view_bg_reload_timeout, 0, v); D_RETURN; } +void +e_view_bg_add(E_View *v, char *file) +{ + char buf[PATH_MAX]; + + D_ENTER; + + printf("change %s\n", file); + if (!(!strcmp(file, ".e_background.bg.db"))) return; + sprintf(buf, "%s/%s", v->dir, file); + if (!strcmp(buf, v->bg_file)) D_RETURN; + IF_FREE(v->bg_file); + e_strdup(v->bg_file, ""); + sprintf(buf, "background_reload:%s", v->dir); + ecore_add_event_timer(buf, 0.5, e_view_bg_reload_timeout, 0, v); + + D_RETURN; +} + +void +e_view_bg_del(E_View *v, char *file) +{ + D_ENTER; + + e_view_bg_change(v, file); + + D_RETURN; +} + void e_view_init(void) { diff --git a/src/view.h b/src/view.h index 9d3b598dd..3f7929e28 100644 --- a/src/view.h +++ b/src/view.h @@ -229,6 +229,8 @@ void e_view_update(E_View *v); void e_view_bg_load(E_View *v); void e_view_bg_change(E_View *v, char *file); +void e_view_bg_add(E_View *v, char *file); +void e_view_bg_del(E_View *v, char *file); void e_view_close_all(void); diff --git a/tools/e_setup.c b/tools/e_setup.c index 499ead365..40903e9e3 100644 --- a/tools/e_setup.c +++ b/tools/e_setup.c @@ -604,6 +604,7 @@ e_file_list_dir_free(Evas_List list) /* */ typedef struct _text_zone Text_Zone; +typedef struct _text_zone_button Text_Zone_Button; struct _text_zone { @@ -615,12 +616,26 @@ struct _text_zone struct { double x, y, w, h; } l; + struct { + double x, y, w, h; + } b; struct { double dx, dy; int go; } move; Evas_List lines; + Evas_List buttons; +}; + +struct _text_zone_button +{ + Evas_Object label; + Ebits_Object *bg; + + double x, y, w, h; + void (*func) (void *data); + void *func_data; }; Window win_main; @@ -644,6 +659,7 @@ void txz_show(Text_Zone *txz); void txz_hide(Text_Zone *txz); void txz_move(Text_Zone *txz, double x, double y); void txz_text(Text_Zone *txz, char *text); +void txz_button(Text_Zone *txz, char *text, void (*func) (void *data), void *data); void txz_adjust_txt(Text_Zone *txz); void animate_logo(int v, void *data); @@ -779,19 +795,21 @@ setup(void) txz = txz_new ((root_w - 512) / 2, 130, - "6c Enlightenment\n" - "3c \n" - "3c Welcome to Enlightenment 0.17 (pre-release). This is the setup\n" - "3c program. It will help you get a base configuration initialised\n" - "3c for your user and do some initial tweaks and system queries.\n" - "3c \n" - "3c Please be patient and read the dialogs carefully, as your answers\n" - "3c to questions posed will affect your initial setup of Enlightenment,\n" - "3c and so your initial impressions.\n" - "3c \n" - "3c N.B. - during pre-release stages, this setup program may come up\n" - "3c more than just once, as new setups need to be installed\n" + "7c Enlightenment\n" + "4c \n" + "4c Welcome to Enlightenment 0.17 (pre-release). This is the setup\n" + "4c program. It will help you get a base configuration initialised\n" + "4c for your user and do some initial tweaks and system queries.\n" + "4c \n" + "4c Please be patient and read the dialogs carefully, as your answers\n" + "4c to questions posed will affect your initial setup of Enlightenment,\n" + "4c and so your initial impressions.\n" + "4c \n" + "4c N.B. - during pre-release stages, this setup program may come up\n" + "4c more than just once, as new setups need to be installed\n" ); + txz_button(txz, "OK", NULL, NULL); + txz_button(txz, "Cancel", NULL, NULL); } { Evas_Object o; @@ -849,7 +867,6 @@ _txz_cb_move(void *data, double x, double y) txz = (Text_Zone *)data; txz->l.x = x; txz->l.y = y; - txz_adjust_txt(txz); } static void @@ -860,7 +877,6 @@ _txz_cb_resize(void *data, double w, double h) txz = (Text_Zone *)data; txz->l.w = w; txz->l.h = h; - txz_adjust_txt(txz); } static void @@ -959,6 +975,26 @@ _txz_cb_get_max_size(void *data, double *maxw, double *maxh) *maxh += 8; } +static void +_txz_cb_tb_move(void *data, double x, double y) +{ + Text_Zone *txz; + + txz = (Text_Zone *)data; + txz->b.x = x; + txz->b.y = y; +} + +static void +_txz_cb_tb_resize(void *data, double w, double h) +{ + Text_Zone *txz; + + txz = (Text_Zone *)data; + txz->b.w = w; + txz->b.h = h; +} + static void _txz_cb_title_down(void *_data, Ebits_Object _o, char *_c, int _b, int _x, int _y, @@ -1028,6 +1064,19 @@ txz_new(double x, double y, char *text) _txz_cb_get_min_size, _txz_cb_get_max_size, txz); + ebits_set_named_bit_replace(txz->bg, "Button_Area", + NULL, + NULL, + _txz_cb_tb_move, + _txz_cb_tb_resize, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + txz); ebits_set_classed_bit_callback(txz->bg, "Title_Bar", CALLBACK_MOUSE_DOWN, _txz_cb_title_down, @@ -1071,6 +1120,15 @@ txz_show(Text_Zone *txz) ebits_show(txz->bg); for (l = txz->lines; l; l = l->next) evas_show(evas, (Evas_Object)l->data); + for (l = txz->buttons; l; l = l->next) + { + Text_Zone_Button *tb; + + tb = l->data; + if (tb->bg) ebits_show(tb->bg); + evas_show(evas, tb->label); + } + txz_adjust_txt(txz); } void @@ -1082,6 +1140,15 @@ txz_hide(Text_Zone *txz) ebits_hide(txz->bg); for (l = txz->lines; l; l = l->next) evas_hide(evas, (Evas_Object)l->data); + for (l = txz->buttons; l; l = l->next) + { + Text_Zone_Button *tb; + + tb = l->data; + if (tb->bg) ebits_hide(tb->bg); + evas_hide(evas, tb->label); + } + txz_adjust_txt(txz); } void @@ -1095,6 +1162,7 @@ txz_move(Text_Zone *txz, double x, double y) { ebits_move(txz->bg, txz->x, txz->y); } + txz_adjust_txt(txz); } void @@ -1153,11 +1221,29 @@ txz_text(Text_Zone *txz, char *text) ebits_get_real_min_size(txz->bg, &minw, &minh); ebits_resize(txz->bg, minw + 8, minh + 8); - ebits_hide(txz->bg); ebits_show(txz->bg); - ebits_set_layer(txz->bg, 0); ebits_set_layer(txz->bg, 9); } + txz_adjust_txt(txz); +} + +void +txz_button(Text_Zone *txz, char *text, void (*func) (void *data), void *data) +{ + Text_Zone_Button *tb; + + tb = NEW(Text_Zone_Button, 1); + ZERO(tb, Text_Zone_Button, 1); + + txz->buttons = evas_list_append(txz->buttons, tb); + tb->label = evas_add_text(evas, "nationff", 12, text); + evas_set_pass_events(evas, tb->label, 1); + evas_set_color(evas, tb->label, 0, 0, 0, 255); + evas_set_layer(evas, tb->label, 12); + tb->bg = ebits_load(PACKAGE_DATA_DIR"/data/setup/textzone_button.bits.db"); + if (tb->bg) + ebits_add_to_evas(tb->bg, evas); + txz_adjust_txt(txz); } void @@ -1165,6 +1251,7 @@ txz_adjust_txt(Text_Zone *txz) { Evas_List l; double ypos; + double xpos; ypos = txz->l.y + 4; evas_move(evas, txz->clip, txz->l.x, txz->l.y); @@ -1186,6 +1273,30 @@ txz_adjust_txt(Text_Zone *txz) evas_move(evas, o, x, ypos); ypos += th; } + xpos = 0; + for (l = txz->buttons; l; l = l->next) + { + Text_Zone_Button *tb; + double tw, th; + + tb = l->data; + tw = evas_get_text_width(evas, tb->label); + th = evas_get_text_height(evas, tb->label); + if (tb->bg) + { + int pl, pr, pt, pb; + + pl = pr = pt = pb = 0; + ebits_get_insets(tb->bg, &pl, &pr, &pt, &pb); + ebits_set_layer(tb->bg, 11); + ebits_show(tb->bg); + ebits_resize(tb->bg, tw + pl + pr, txz->b.h); + ebits_move(tb->bg, txz->b.x + xpos, txz->b.y); + evas_move(evas, tb->label, txz->b.x + pl + xpos, txz->b.y + pt + ((txz->b.h - pt - pb - th) / 2)); + evas_show(evas, tb->label); + xpos += tw + pl + pr; + } + } } void