From 077469968323e5ae4d584736543925c0a93e5aae Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Mon, 8 Mar 2010 18:03:42 +0000 Subject: [PATCH] Make Run Command settings dialog work w/ all resolutions. (May need/want label changes). SVN revision: 47044 --- src/modules/conf_exebuf/e_int_config_exebuf.c | 342 +++++++++--------- 1 file changed, 172 insertions(+), 170 deletions(-) diff --git a/src/modules/conf_exebuf/e_int_config_exebuf.c b/src/modules/conf_exebuf/e_int_config_exebuf.c index bcae18ba0e..6a364b07f4 100644 --- a/src/modules/conf_exebuf/e_int_config_exebuf.c +++ b/src/modules/conf_exebuf/e_int_config_exebuf.c @@ -1,66 +1,70 @@ #include "e.h" -static void *_create_data (E_Config_Dialog *cfd); -static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _advanced_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static void _cb_disable_check_list(void *data, Evas_Object *obj); +/* local function prototypes */ +static void *_create_data(E_Config_Dialog *cfd __UNUSED__); +static void _fill_data(E_Config_Dialog_Data *cfdata); +static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static Evas_Object *_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); +static void _cb_animate_changed(void *data, Evas_Object *obj __UNUSED__); struct _E_Config_Dialog_Data { /* Basic */ - int max_exe_list; - int max_eap_list; - int max_hist_list; + int max_exe_list, max_eap_list, max_hist_list; int scroll_animate; /* Advanced */ - double scroll_speed; - double pos_align_x; - double pos_align_y; - double pos_size_w; - double pos_size_h; - int pos_min_w; - int pos_min_h; - int pos_max_w; - int pos_max_h; + double scroll_speed, pos_align_x, pos_align_y; + double pos_size_w, pos_size_h; + int pos_min_w, pos_min_h, pos_max_w, pos_max_h; char *term_cmd; + struct + { + Evas_Object *scroll_speed_lbl, *scroll_speed_slider; + } gui; }; -Eina_List *scroll_list = NULL; - E_Config_Dialog * e_int_config_exebuf(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; - + if (e_config_dialog_find("E", "advanced/run_command")) return NULL; + v = E_NEW(E_Config_Dialog_View, 1); - v->create_cfdata = _create_data; v->free_cfdata = _free_data; - v->basic.apply_cfdata = _basic_apply_data; - v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = _advanced_apply_data; - v->advanced.create_widgets = _advanced_create_widgets; - cfd = e_config_dialog_new(con, - _("Run Command Settings"), - "E", "advanced/run_command", - "system-run", 0, v, NULL); + v->basic.create_widgets = _basic_create; + v->basic.apply_cfdata = _basic_apply; + v->advanced.create_widgets = _adv_create; + v->advanced.apply_cfdata = _adv_apply; + + cfd = e_config_dialog_new(con, _("Run Command Settings"), "E", + "advanced/run_command", "system-run", 0, v, NULL); return cfd; } -static void +/* local function prototypes */ +static void * +_create_data(E_Config_Dialog *cfd __UNUSED__) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = E_NEW(E_Config_Dialog_Data, 1); + _fill_data(cfdata); + return cfdata; +} + +static void _fill_data(E_Config_Dialog_Data *cfdata) { - /* Basic */ cfdata->max_exe_list = e_config->exebuf_max_exe_list; cfdata->max_eap_list = e_config->exebuf_max_eap_list; cfdata->max_hist_list = e_config->exebuf_max_hist_list; cfdata->scroll_animate = e_config->exebuf_scroll_animate; - /* Advanced */ cfdata->scroll_speed = e_config->exebuf_scroll_speed; cfdata->pos_align_x = e_config->exebuf_pos_align_x; cfdata->pos_align_y = e_config->exebuf_pos_align_y; @@ -70,31 +74,19 @@ _fill_data(E_Config_Dialog_Data *cfdata) cfdata->pos_min_h = e_config->exebuf_pos_min_h; cfdata->pos_max_w = e_config->exebuf_pos_max_w; cfdata->pos_max_h = e_config->exebuf_pos_max_h; - if (e_config->exebuf_term_cmd) + if (e_config->exebuf_term_cmd) cfdata->term_cmd = strdup(e_config->exebuf_term_cmd); } -static void * -_create_data(E_Config_Dialog *cfd) -{ - E_Config_Dialog_Data *cfdata; - - cfdata = E_NEW(E_Config_Dialog_Data, 1); - _fill_data(cfdata); - return cfdata; -} - -static void -_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +static void +_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - scroll_list = eina_list_free(scroll_list); - E_FREE(cfdata->term_cmd); E_FREE(cfdata); } -static int -_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +static int +_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { e_config->exebuf_max_exe_list = cfdata->max_exe_list; e_config->exebuf_max_eap_list = cfdata->max_eap_list; @@ -105,41 +97,45 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *o, *of, *ob; - + Evas_Object *o, *of, *ow; + o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("General Settings"), 0); - ob = e_widget_label_add(evas, _("Maximum Number of Matched Apps to List")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, &(cfdata->max_eap_list), 200); - e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("Maximum Number of Matched Exes to List")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, &(cfdata->max_exe_list), 200); - e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("Maximum History to List")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 200, 5, 0, NULL, &(cfdata->max_hist_list), 200); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - - of = e_widget_framelist_add(evas, _("Scroll Settings"), 0); - ob = e_widget_check_add(evas, _("Scroll Animate"), &(cfdata->scroll_animate)); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); + of = e_widget_framelist_add(evas, _("General"), 0); + ow = e_widget_label_add(evas, _("Maximum Apps to List")); + e_widget_framelist_object_append(of, ow); + ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, + &(cfdata->max_eap_list), 100); + e_widget_framelist_object_append(of, ow); + ow = e_widget_label_add(evas, _("Maximum Exes to List")); + e_widget_framelist_object_append(of, ow); + ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, + &(cfdata->max_exe_list), 100); + e_widget_framelist_object_append(of, ow); + ow = e_widget_label_add(evas, _("Maximum History to List")); + e_widget_framelist_object_append(of, ow); + ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 200, 5, 0, NULL, + &(cfdata->max_hist_list), 100); + e_widget_framelist_object_append(of, ow); + e_widget_list_object_append(o, of, 1, 0, 0.5); + + of = e_widget_framelist_add(evas, _("Scroll"), 0); + ow = e_widget_check_add(evas, _("Animate"), &(cfdata->scroll_animate)); + e_widget_framelist_object_append(of, ow); + e_widget_list_object_append(o, of, 1, 0, 0.5); + return o; } -static int -_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +static int +_adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { e_config->exebuf_max_exe_list = cfdata->max_exe_list; - e_config->exebuf_max_eap_list = cfdata->max_eap_list; - e_config->exebuf_max_hist_list = cfdata->max_hist_list; - e_config->exebuf_scroll_animate = cfdata->scroll_animate; + e_config->exebuf_max_eap_list = cfdata->max_eap_list; + e_config->exebuf_max_hist_list = cfdata->max_hist_list; + e_config->exebuf_scroll_animate = cfdata->scroll_animate; e_config->exebuf_scroll_speed = cfdata->scroll_speed; e_config->exebuf_pos_align_x = cfdata->pos_align_x; e_config->exebuf_pos_align_y = cfdata->pos_align_y; @@ -147,106 +143,112 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config->exebuf_pos_min_h = cfdata->pos_min_h; e_config->exebuf_pos_max_w = cfdata->pos_max_w; e_config->exebuf_pos_max_h = cfdata->pos_max_h; - if (e_config->exebuf_term_cmd) - eina_stringshare_del(e_config->exebuf_term_cmd); - e_config->exebuf_term_cmd = NULL; - if (cfdata->term_cmd) - e_config->exebuf_term_cmd = eina_stringshare_add(cfdata->term_cmd); + eina_stringshare_replace(&e_config->exebuf_term_cmd, cfdata->term_cmd); e_config_save_queue(); return 1; } static Evas_Object * -_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *of, *ob, *ot; - Evas_Object *scroll_check; - - ot = e_widget_table_add(evas, 0); - - of = e_widget_framelist_add(evas, _("General Settings"), 0); - ob = e_widget_label_add(evas, _("Maximum Number of Matched Apps to List")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, &(cfdata->max_eap_list), 200); - e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("Maximum Number of Matched Exes to List")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, &(cfdata->max_exe_list), 200); - e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("Maximum History to List")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 200, 5, 0, NULL, &(cfdata->max_hist_list), 200); - e_widget_framelist_object_append(of, ob); - e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1); - - of = e_widget_framelist_add(evas, _("Scroll Settings"), 0); - scroll_check = e_widget_check_add(evas, _("Scroll Animate"), &(cfdata->scroll_animate)); - e_widget_framelist_object_append(of, scroll_check); - ob = e_widget_label_add(evas, _("Scroll Speed")); - scroll_list = eina_list_append (scroll_list, ob); - e_widget_disabled_set(ob, !cfdata->scroll_animate); // set state from saved config - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, &(cfdata->scroll_speed), NULL, 200); - scroll_list = eina_list_append (scroll_list, ob); - e_widget_disabled_set(ob, !cfdata->scroll_animate); // set state from saved config - e_widget_framelist_object_append(of, ob); - e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 1); - // handler for enable/disable widget array - e_widget_on_change_hook_set(scroll_check, _cb_disable_check_list, scroll_list); - - of = e_widget_frametable_add(evas, _("Terminal Settings"), 0); - ob = e_widget_label_add(evas, _("Terminal Command (CTRL+RETURN to utilize)")); - e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0); -// e_widget_framelist_object_append(of, ob); - ob = e_widget_entry_add(evas, &(cfdata->term_cmd), NULL, NULL, NULL); - e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0); -// e_widget_framelist_object_append(of, ob); - e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1); - - of = e_widget_frametable_add(evas, _("Size Settings"), 0); - ob = e_widget_label_add(evas, _("Minimum Width")); - e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 0); - ob = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, &(cfdata->pos_min_w), 200); - e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 0); - ob = e_widget_label_add(evas, _("Minimum Height")); - e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 0); - ob = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, &(cfdata->pos_min_h), 200); - e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 0); - ob = e_widget_label_add(evas, _("Maximum Width")); - e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 0); - ob = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, &(cfdata->pos_max_w), 200); - e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 0); - ob = e_widget_label_add(evas, _("Maximum Height")); - e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 0); - ob = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, &(cfdata->pos_max_h), 200); - e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 1, 0); - e_widget_table_object_append(ot, of, 1, 0, 1, 2, 1, 1, 1, 1); - - of = e_widget_framelist_add(evas, _("Position Settings"), 0); - ob = e_widget_label_add(evas, _("X-Axis Alignment")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, &(cfdata->pos_align_x), NULL, 200); - e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("Y-Axis Alignment")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, &(cfdata->pos_align_y), NULL, 200); - e_widget_framelist_object_append(of, ob); - e_widget_table_object_append(ot, of, 1, 2, 1, 1, 1, 1, 1, 1); - - return ot; + Evas_Object *otb, *ol, *ow; + + otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale)); + + /* General Page */ + ol = e_widget_list_add(evas, 0, 0); + ow = e_widget_label_add(evas, _("Maximum Apps to List")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, + &(cfdata->max_eap_list), 100); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_label_add(evas, _("Maximum Exes to List")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, + &(cfdata->max_exe_list), 100); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_label_add(evas, _("Maximum History to List")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 200, 5, 0, NULL, + &(cfdata->max_hist_list), 100); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("General"), ol, 0, 0, 0, 0, + 0.5, 0.0); + + /* Scroll Page */ + ol = e_widget_list_add(evas, 0, 0); + ow = e_widget_check_add(evas, _("Animate"), &(cfdata->scroll_animate)); + e_widget_on_change_hook_set(ow, _cb_animate_changed, cfdata); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_label_add(evas, _("Speed")); + cfdata->gui.scroll_speed_lbl = ow; + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, + &(cfdata->scroll_speed), NULL, 100); + cfdata->gui.scroll_speed_slider = ow; + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("Scroll"), ol, 0, 0, 0, 0, + 0.5, 0.0); + + /* Size Page */ + ol = e_widget_list_add(evas, 0, 0); + ow = e_widget_label_add(evas, _("Minimum Width")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, + NULL, &(cfdata->pos_min_w), 100); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_label_add(evas, _("Minimum Height")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, + NULL, &(cfdata->pos_min_h), 100); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_label_add(evas, _("Maximum Width")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, + NULL, &(cfdata->pos_max_w), 100); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_label_add(evas, _("Maximum Height")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, + NULL, &(cfdata->pos_max_h), 100); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("Size"), ol, 0, 0, 0, 0, + 0.5, 0.0); + + /* Position Page */ + ol = e_widget_list_add(evas, 0, 0); + ow = e_widget_label_add(evas, _("X-Axis Alignment")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, + &(cfdata->pos_align_x), NULL, 100); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_label_add(evas, _("Y-Axis Alignment")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, + &(cfdata->pos_align_y), NULL, 100); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("Position"), ol, 0, 0, 0, 0, + 0.5, 0.0); + + /* Terminal Page */ + ol = e_widget_list_add(evas, 0, 0); + ow = e_widget_label_add(evas, _("Command (CTRL+RETURN to utilize)")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_entry_add(evas, &(cfdata->term_cmd), NULL, NULL, NULL); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("Terminal"), ol, 0, 0, 0, 0, + 0.5, 0.0); + + e_widget_toolbook_page_show(otb, 0); + return otb; } -/*! - * @param data A Eina_List of Evas_Object to chain widgets together with the checkbox - * @param obj A Evas_Object checkbox created with e_widget_check_add() - */ -static void -_cb_disable_check_list(void *data, Evas_Object *obj) +static void +_cb_animate_changed(void *data, Evas_Object *obj __UNUSED__) { - Eina_List *list = (Eina_List*) data; - Eina_List *l; - Evas_Object *o; + E_Config_Dialog_Data *cfdata; - EINA_LIST_FOREACH(list, l, o) - e_widget_disabled_set(o, !e_widget_check_checked_get(obj)); + if (!(cfdata = data)) return; + e_widget_disabled_set(cfdata->gui.scroll_speed_lbl, !cfdata->scroll_animate); + e_widget_disabled_set(cfdata->gui.scroll_speed_slider, !cfdata->scroll_animate); } -- 2.34.1