From 1f745881d9aa06136412721989570a1a07f9680f Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 20 Dec 2012 10:07:30 +0000 Subject: [PATCH] series of dialogs that were not resizable but should be, are now. SVN revision: 81434 --- src/bin/e_fm.c | 1 + src/bin/e_import_config_dialog.c | 3 ++ src/bin/e_import_dialog.c | 3 ++ src/bin/e_int_border_prop.c | 4 +- src/bin/e_int_border_remember.c | 42 +++++++++---------- src/bin/e_int_config_modules.c | 2 + src/modules/comp/e_mod_config.c | 2 + .../e_int_config_apps_personal.c | 2 + .../e_int_config_signalbindings.c | 1 + src/modules/conf_paths/e_int_config_env.c | 2 + src/modules/conf_shelves/e_int_config_shelf.c | 4 +- src/modules/fileman/e_fwin.c | 4 +- src/modules/fileman/e_int_config_mime.c | 4 +- src/modules/fileman/e_int_config_mime_edit.c | 2 + src/modules/shot/e_mod_main.c | 2 + 15 files changed, 52 insertions(+), 26 deletions(-) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 2efb83196..40f2e8043 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -9945,6 +9945,7 @@ _e_fm2_view_image_sel(E_Fm2_Smart_Data *sd, const char *title, dia = e_dialog_new(NULL, "E", "_fm2_view_image_select_dialog"); if (!dia) return; + e_dialog_resizable_set(dia, 1); e_dialog_title_set(dia, title); o = e_widget_fsel_add(dia->win->evas, "/", sd->realpath, NULL, NULL, NULL, sd, NULL, sd, 1); diff --git a/src/bin/e_import_config_dialog.c b/src/bin/e_import_config_dialog.c index 16e6ec374..4e7670ee1 100644 --- a/src/bin/e_import_config_dialog.c +++ b/src/bin/e_import_config_dialog.c @@ -449,6 +449,9 @@ e_import_config_dialog_show(E_Container *con, const char *path, Ecore_End_Cb ok, if (!import) return NULL; dia = e_dialog_new(con, "E", "_import_config_dialog"); + if (!dia) return NULL; + e_dialog_resizable_set(dia, 1); + e_dialog_title_set(dia, _("Import Settings...")); dia->data = import; import->dia = dia; diff --git a/src/bin/e_import_dialog.c b/src/bin/e_import_dialog.c index c0f3f9135..a26279cb8 100644 --- a/src/bin/e_import_dialog.c +++ b/src/bin/e_import_dialog.c @@ -146,6 +146,9 @@ e_import_dialog_show(E_Container *con, const char *dev, const char *path, Ecore_ if (!id) return NULL; dia = e_dialog_new(con, "E", "_import_fsel_dialog"); + if (!dia) return NULL; + e_dialog_resizable_set(dia, 1); + dia->data = id; id->dia = dia; id->ok = ok, id->cancel = cancel; diff --git a/src/bin/e_int_border_prop.c b/src/bin/e_int_border_prop.c index 904f2a1d7..b9559a806 100644 --- a/src/bin/e_int_border_prop.c +++ b/src/bin/e_int_border_prop.c @@ -413,7 +413,7 @@ _bd_go(void *data, void *data2) e_widget_entry_readonly_set(ob, 1); \ e_widget_size_min_get(ob, &mw, &mh); \ e_widget_size_min_set(ob, 160, mh); \ - e_widget_table_object_append(o, ob, x + 1, y, 1, 1, 1, 1, 1, 1); \ + e_widget_table_object_append(o, ob, x + 1, y, 1, 1, 1, 0, 1, 0); \ } #define CHK_ENTRY(label, x, y, val) \ { \ @@ -421,7 +421,7 @@ _bd_go(void *data, void *data2) e_widget_table_object_append(o, ob, x, y, 1, 1, 1, 1, 0, 1); \ ob = e_widget_check_add(evas, "", & (cfdata->val)); \ e_widget_disabled_set(ob, 1); \ - e_widget_table_object_append(o, ob, x + 1, y, 1, 1, 1, 1, 1, 1); \ + e_widget_table_object_append(o, ob, x + 1, y, 1, 1, 1, 0, 1, 0); \ } static Evas_Object * diff --git a/src/bin/e_int_border_remember.c b/src/bin/e_int_border_remember.c index 52d64dd62..fc5654bb4 100644 --- a/src/bin/e_int_border_remember.c +++ b/src/bin/e_int_border_remember.c @@ -691,74 +691,74 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D of = e_widget_table_add(evas, 0); ob = e_widget_check_add(evas, _("Position"), &(cfdata->remember.apply_pos)); - e_widget_table_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Size"), &(cfdata->remember.apply_size)); - e_widget_table_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Stacking"), &(cfdata->remember.apply_layer)); - e_widget_table_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 2, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Locks"), &(cfdata->remember.apply_locks)); - e_widget_table_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 3, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Border style"), &(cfdata->remember.apply_border)); - e_widget_table_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 4, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Icon Preference"), &(cfdata->remember.apply_icon_pref)); - e_widget_table_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 5, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Stickiness"), &(cfdata->remember.apply_sticky)); - e_widget_table_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 6, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Virtual Desktop"), &(cfdata->remember.apply_desktop)); - e_widget_table_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 1, 0, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Shaded state"), &(cfdata->remember.apply_shade)); - e_widget_table_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 1, 1, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Fullscreen state"), &(cfdata->remember.apply_fullscreen)); - e_widget_table_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Current Screen"), &(cfdata->remember.apply_zone)); - e_widget_table_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 1, 3, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Skip Window List"), &(cfdata->remember.apply_skip_winlist)); - e_widget_table_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 1, 4, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Skip Pager"), &(cfdata->remember.apply_skip_pager)); - e_widget_table_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 1, 5, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Skip Taskbar"), &(cfdata->remember.apply_skip_taskbar)); - e_widget_table_object_append(of, ob, 1, 6, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 1, 6, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Offer Resistance"), &(cfdata->remember.offer_resistance)); - e_widget_table_object_append(of, ob, 1, 7, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 1, 7, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Application file or name (.desktop)"), &(cfdata->remember.apply_desktop_file)); - e_widget_table_object_append(of, ob, 0, 7, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 7, 1, 1, 1, 0, 1, 0); ob = e_widget_entry_add(evas, &cfdata->desktop, NULL, NULL, NULL); - e_widget_table_object_append(of, ob, 0, 8, 2, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 8, 2, 1, 1, 0, 1, 0); e_widget_toolbook_page_append(o, NULL, _("Properties"), of, 1, 1, 1, 1, 0.5, 0.0); of = e_widget_table_add(evas, 0); ob = e_widget_check_add(evas, _("Match only one window"), &(cfdata->remember.apply_first_only)); - e_widget_table_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Always focus on start"), &(cfdata->remember.set_focus_on_start)); - e_widget_table_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _("Keep current properties"), &(cfdata->remember.keep_settings)); - e_widget_table_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 2, 1, 1, 1, 0, 1, 0); if (cfdata->command) { ob = e_widget_check_add(evas, _("Start this program on login"), &(cfdata->remember.apply_run)); - e_widget_table_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(of, ob, 0, 3, 1, 1, 1, 0, 1, 0); } e_widget_toolbook_page_append(o, NULL, _("Options"), of, 1, 1, 1, 1, 0.5, 0.0); e_widget_toolbook_page_show(o, 0); diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c index 3e9d4a0e4..da7f9ed3a 100644 --- a/src/bin/e_int_config_modules.c +++ b/src/bin/e_int_config_modules.c @@ -175,6 +175,8 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) Evas_Coord mw, mh; Evas_Object *of, *ol; + e_dialog_resizable_set(cfd->dia, 1); + cfdata->evas = e_win_evas_get(cfd->dia->win); of = e_widget_table_add(evas, 0); diff --git a/src/modules/comp/e_mod_config.c b/src/modules/comp/e_mod_config.c index a46cf3da4..18d9032ec 100644 --- a/src/modules/comp/e_mod_config.c +++ b/src/modules/comp/e_mod_config.c @@ -1146,6 +1146,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas_Object *ob,*ol, *of, *otb, *oi, *orec0, *tab; E_Radio_Group *rg; + e_dialog_resizable_set(cfd->dia, 1); + orec0 = evas_object_rectangle_add(evas); evas_object_name_set(orec0, "style_shadows"); diff --git a/src/modules/conf_applications/e_int_config_apps_personal.c b/src/modules/conf_applications/e_int_config_apps_personal.c index 7662646c6..356802a97 100644 --- a/src/modules/conf_applications/e_int_config_apps_personal.c +++ b/src/modules/conf_applications/e_int_config_apps_personal.c @@ -73,6 +73,8 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) Evas_Object *of, *li, *ob; Evas_Coord mw, mh; + e_dialog_resizable_set(cfd->dia, 1); + of = e_widget_table_add(evas, 0); li = e_widget_ilist_add(evas, 24, 24, NULL); diff --git a/src/modules/conf_edgebindings/e_int_config_signalbindings.c b/src/modules/conf_edgebindings/e_int_config_signalbindings.c index 4f59cae57..89a8a9dbf 100644 --- a/src/modules/conf_edgebindings/e_int_config_signalbindings.c +++ b/src/modules/conf_edgebindings/e_int_config_signalbindings.c @@ -630,6 +630,7 @@ _signal_add_show(E_Config_Dialog_Data *cfdata) if (cfdata->locals.dia) return; cfdata->locals.dia = e_dialog_new(NULL, "E", "_signalbind_new_dialog"); + e_dialog_resizable_set(cfdata->locals.dia, 1); e_dialog_title_set(cfdata->locals.dia, _("Add Signal Binding")); e_dialog_icon_set(cfdata->locals.dia, "enlightenment/signals", 48); e_dialog_button_add(cfdata->locals.dia, _("OK"), NULL, _signal_add_cb_ok, cfdata); diff --git a/src/modules/conf_paths/e_int_config_env.c b/src/modules/conf_paths/e_int_config_env.c index 83820596b..02db5b16c 100644 --- a/src/modules/conf_paths/e_int_config_env.c +++ b/src/modules/conf_paths/e_int_config_env.c @@ -279,6 +279,8 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia Eina_List *l; E_Config_Env_Var *evr; + e_dialog_resizable_set(cfd->dia, 1); + o = e_widget_table_add(evas, 0); ol = e_widget_ilist_add(evas, 0, 0, NULL); diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c index 238797e81..251bb5c58 100644 --- a/src/modules/conf_shelves/e_int_config_shelf.c +++ b/src/modules/conf_shelves/e_int_config_shelf.c @@ -114,12 +114,14 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *ol, *ow, *ot, *of; char buf[64]; E_Zone *zone; + e_dialog_resizable_set(cfd->dia, 1); + ol = e_widget_list_add(evas, 0, 0); zone = cfdata->cfd->dia->win->border ? cfdata->cfd->dia->win->border->zone : e_zone_current_get(cfdata->cfd->con); snprintf(buf, sizeof(buf), "%s %d", _("Configured Shelves: Display"), zone->num); diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index ede0901b4..f3d5a3623 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -2518,7 +2518,9 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page, dia = e_dialog_new(fwin->zone->container, "E", "_fwin_open_apps"); else return; /* make clang happy */ - + + e_dialog_resizable_set(dia, 1); + fad = E_NEW(E_Fwin_Apps_Dialog, 1); e_dialog_title_set(dia, _("Open with...")); e_dialog_button_add(dia, _("Open"), "document-open", diff --git a/src/modules/fileman/e_int_config_mime.c b/src/modules/fileman/e_int_config_mime.c index 07a26a54f..a552f5259 100644 --- a/src/modules/fileman/e_int_config_mime.c +++ b/src/modules/fileman/e_int_config_mime.c @@ -159,11 +159,13 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ol; Evas_Object *ob; + e_dialog_resizable_set(cfd->dia, 1); + o = e_widget_list_add(evas, 1, 1); of = e_widget_framelist_add(evas, _("Categories"), 0); ol = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_type)); diff --git a/src/modules/fileman/e_int_config_mime_edit.c b/src/modules/fileman/e_int_config_mime_edit.c index feba944d1..63f98500d 100644 --- a/src/modules/fileman/e_int_config_mime_edit.c +++ b/src/modules/fileman/e_int_config_mime_edit.c @@ -299,6 +299,8 @@ _cb_icon_sel(void *data, void *data2) e_dialog_title_set(dia, _("Select an Edje file")); else if (cfdata->type == IMG) e_dialog_title_set(dia, _("Select an image")); + + e_dialog_resizable_set(dia, 1); dia->data = cfdata; e_object_del_attach_func_set(E_OBJECT(dia), _dia_del); diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c index d9d9ff1d6..71553fdc6 100644 --- a/src/modules/shot/e_mod_main.c +++ b/src/modules/shot/e_mod_main.c @@ -273,6 +273,7 @@ _win_save_cb(void *data __UNUSED__, void *data2 __UNUSED__) else strftime(buf, sizeof(buf), "shot-%Y-%m-%d_%H-%M-%S.jpg", tm); fsel_dia = dia = e_dialog_new(scon, "E", "_e_shot_fsel"); + e_dialog_resizable_set(dia, 1); e_dialog_title_set(dia, _("Select screenshot save location")); o = e_widget_fsel_add(dia->win->evas, "desktop", "/", buf, @@ -517,6 +518,7 @@ _win_share_cb(void *data __UNUSED__, void *data2 __UNUSED__) ecore_con_url_post(url_up, fdata, fsize, "application/x-e-shot"); dia = e_dialog_new(scon, "E", "_e_shot_share"); + e_dialog_resizable_set(dia, 1); e_dialog_title_set(dia, _("Uploading screenshot")); o = e_widget_list_add(dia->win->evas, 0, 0);