diff --git a/src/modules/conf_exebuf/e_int_config_exebuf.c b/src/modules/conf_exebuf/e_int_config_exebuf.c index ac011333b..d5e463cf8 100644 --- a/src/modules/conf_exebuf/e_int_config_exebuf.c +++ b/src/modules/conf_exebuf/e_int_config_exebuf.c @@ -12,7 +12,7 @@ static Evas_Object *_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_C static int _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); static void _cb_animate_changed(void *data, Evas_Object *obj __UNUSED__); -struct _E_Config_Dialog_Data +struct _E_Config_Dialog_Data { /* Basic */ int max_exe_list, max_eap_list, max_hist_list; @@ -22,14 +22,14 @@ struct _E_Config_Dialog_Data double pos_size_w, pos_size_h; int pos_min_w, pos_min_h, pos_max_w, pos_max_h; char *term_cmd; - struct + struct { - Evas_Object *scroll_speed_lbl, *scroll_speed_slider; + Evas_Object *scroll_speed_lbl, *scroll_speed_slider; } gui; }; E_Config_Dialog * -e_int_config_exebuf(E_Container *con, const char *params __UNUSED__) +e_int_config_exebuf(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -46,14 +46,14 @@ e_int_config_exebuf(E_Container *con, const char *params __UNUSED__) v->advanced.apply_cfdata = _adv_apply; v->advanced.check_changed = _adv_check_changed; - cfd = e_config_dialog_new(con, _("Run Command Settings"), "E", - "advanced/run_command", "system-run", 0, v, NULL); + cfd = e_config_dialog_new(con, _("Run Command Settings"), "E", + "advanced/run_command", "system-run", 0, v, NULL); return cfd; } /* local function prototypes */ static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -62,8 +62,8 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) return cfdata; } -static void -_fill_data(E_Config_Dialog_Data *cfdata) +static void +_fill_data(E_Config_Dialog_Data *cfdata) { cfdata->max_exe_list = e_config->exebuf_max_exe_list; cfdata->max_eap_list = e_config->exebuf_max_eap_list; @@ -78,19 +78,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 -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +static void +_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata->term_cmd); E_FREE(cfdata); } -static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, 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; @@ -101,7 +101,7 @@ _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) +_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ow; @@ -110,18 +110,18 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data 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); + 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); + 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); + 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); @@ -133,8 +133,8 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data return o; } -static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +static int +_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { #define CHK_CHG(_e_config, _cfdata) \ if (e_config->exebuf_##_e_config != cfdata->_cfdata) return 1; @@ -149,8 +149,8 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda return 0; } -static int -_adv_apply(E_Config_Dialog *cfd __UNUSED__, 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; @@ -169,7 +169,7 @@ _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) +_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *ow; @@ -179,21 +179,21 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c 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); + 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); + 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); + 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, 1, 0, 1, 0, - 0.5, 0.0); + e_widget_toolbook_page_append(otb, NULL, _("General"), ol, 1, 0, 1, 0, + 0.5, 0.0); /* Scroll Page */ ol = e_widget_list_add(evas, 0, 0); @@ -203,47 +203,47 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c 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); + 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, _("Animations"), ol, 1, 0, 1, 0, - 0.5, 0.0); + e_widget_toolbook_page_append(otb, NULL, _("Animations"), ol, 1, 0, 1, 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); + 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); + 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); + 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); + 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); 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); + 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); + 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, _("Geometry"), ol, 1, 0, 1, 0, - 0.5, 0.0); + e_widget_toolbook_page_append(otb, NULL, _("Geometry"), ol, 1, 0, 1, 0, + 0.5, 0.0); /* Terminal Page */ ol = e_widget_list_add(evas, 0, 0); @@ -251,15 +251,15 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c 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, 1, 0, 1, 0, - 0.5, 0.0); + e_widget_toolbook_page_append(otb, NULL, _("Terminal"), ol, 1, 0, 1, 0, + 0.5, 0.0); e_widget_toolbook_page_show(otb, 0); return otb; } -static int -_adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +static int +_adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { #define CHK_CHG(_e_config, _cfdata) \ if (e_config->exebuf_##_e_config != cfdata->_cfdata) return 1; @@ -282,8 +282,8 @@ _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata return 0; } -static void -_cb_animate_changed(void *data, Evas_Object *obj __UNUSED__) +static void +_cb_animate_changed(void *data, Evas_Object *obj __UNUSED__) { E_Config_Dialog_Data *cfdata;