Revert "all dialogs are now resizable"

This reverts commit 9157ca8ca7.

this also makes all dialogs that have content in a toolbar that goes
off window at min size resizable - this is actually what you wanted ..
bgut this previous "all dialogs are resizable" thing was uber-lazy.

Conflicts:
	src/modules/bluez4/e_mod_main.c
	src/modules/conf_bindings/e_int_config_signalbindings.c
	src/modules/conf_theme/e_int_config_theme.c
	src/modules/mixer/conf_gadget.c
	src/modules/shot/e_mod_main.c
This commit is contained in:
Carsten Haitzler 2014-12-22 23:02:05 +09:00
parent b63b2d548e
commit 6510e8bd0e
42 changed files with 55 additions and 1 deletions

View File

@ -47,7 +47,7 @@ _e_dialog_internal_new(Evas_Object *parent, const char *name, const char *class,
e_widget_on_focus_hook_set(o, _e_dialog_cb_wid_on_focus, dia);
dia->box_object = o;
edje_object_part_swallow(dia->bg_object, "e.swallow.buttons", o);
e_dialog_resizable_set(dia, 1);
edje_object_signal_emit(dia->bg_object, "e,state,no_resizable", "e");
o = evas_object_rectangle_add(e);
dia->event_object = o;

View File

@ -184,6 +184,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
Evas_Object *ob,*ol, *of, *otb, *oi, *orec0;
E_Radio_Group *rg;
e_dialog_resizable_set(cfd->dia, 1);
orec0 = evas_object_rectangle_add(evas);
evas_object_name_set(orec0, "style_shadows");
@ -541,6 +542,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED,
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");

View File

@ -115,6 +115,7 @@ _ebluez4_cb_search(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSE
dialog = e_dialog_new(NULL, "Search Dialog", "search");
e_dialog_title_set(dialog, _("Searching for Devices..."));
evas_object_event_callback_add(dialog->win, EVAS_CALLBACK_DEL, _ebluez4_cb_search_dialog_del, dialog);
e_dialog_resizable_set(dialog, EINA_TRUE);
evas = evas_object_evas_get(dialog->win);
@ -182,6 +183,7 @@ _ebluez4_cb_adap_settings(void *data)
dialog = e_dialog_new(NULL, "Adapter Dialog", "adapter");
e_dialog_title_set(dialog, _("Adapter Settings"));
evas_object_event_callback_add(dialog->win, EVAS_CALLBACK_DEL, _ebluez4_cb_adap_settings_dialog_del, dialog);
e_dialog_resizable_set(dialog, EINA_TRUE);
evas = evas_object_evas_get(dialog->win);
@ -252,6 +254,7 @@ _ebluez4_cb_adap_list(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UN
dialog = e_dialog_new(NULL, "Adapters Dialog", "adapters");
e_dialog_title_set(dialog, _("Adapters Available"));
evas_object_event_callback_add(dialog->win, EVAS_CALLBACK_DEL, _ebluez4_cb_adap_list_dialog_del, dialog);
e_dialog_resizable_set(dialog, EINA_TRUE);
evas = evas_object_evas_get(dialog->win);

View File

@ -248,6 +248,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
Evas_Object *otb, *ot;
int mw;
e_dialog_resizable_set(cfd->dia, 1);
otb = e_widget_toolbook_add(evas, 24, 24);
if (cfdata->data->show_autostart)

View File

@ -73,6 +73,7 @@ _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);

View File

@ -289,6 +289,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
Eina_List *l;
Config_Mime *m;
e_dialog_resizable_set(cfd->dia, 1);
otb = e_widget_toolbook_add(evas, 24, 24);
ot = e_widget_table_add(evas, EINA_FALSE);

View File

@ -221,6 +221,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 1, 0);
e_widget_list_object_append(ol, ot, 1, 1, 0.5);
e_dialog_resizable_set(cfd->dia, 1);
return ol;
}

View File

@ -312,6 +312,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
_update_edge_binding_list(cfdata);
_fill_actions_list(cfdata);
e_dialog_resizable_set(cfd->dia, 1);
return o;
}

View File

@ -272,6 +272,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
_update_key_binding_list(cfdata, NULL);
_fill_actions_list(cfdata);
e_dialog_resizable_set(cfd->dia, 1);
return o;
}

View File

@ -367,6 +367,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
_update_mouse_binding_list(cfdata);
_fill_actions_list(cfdata);
e_dialog_resizable_set(cfd->dia, 1);
return o;
}

View File

@ -617,6 +617,7 @@ _signal_add_show(E_Config_Dialog_Data *cfdata)
if (cfdata->locals.dia) return;
cfdata->locals.dia = e_dialog_new(cfdata->cfd->dia->win, "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);
@ -818,6 +819,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
_update_signal_binding_list(cfdata);
_fill_actions_list(cfdata);
e_dialog_resizable_set(cfd->dia, 1);
return o;
}

View File

@ -100,6 +100,7 @@ _create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Da
Evas_Coord mw, mh;
char buf[PATH_MAX];
e_dialog_resizable_set(cfd->dia, 1);
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Available Profiles"), 0);

View File

@ -222,6 +222,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
E_Comp *comp;
int screen_count, x = 0;
e_dialog_resizable_set(cfd->dia, 1);
screen_count = eina_list_count(e_xinerama_screens_get());
otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));

View File

@ -160,6 +160,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
{
Evas_Object *otb, *ol, *ow, *oc, *oc2;
e_dialog_resizable_set(cfd->dia, 1);
otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
/* Screensaver */

View File

@ -1019,6 +1019,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
char buf[PATH_MAX];
cfdata->evas = evas;
e_dialog_resizable_set(cfd->dia, 1);
o = e_widget_table_add(evas, 0);
of = e_widget_framelist_add(evas, _("Language Selector"), 0);
ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_blang));
@ -1106,6 +1107,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_
int sel = -1;
cfdata->evas = evas;
e_dialog_resizable_set(cfd->dia, 1);
_intl_current_locale_setup(cfdata);
o = e_widget_table_add(evas, 0);

View File

@ -252,6 +252,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
{
Evas_Object *otb, *ol, *of, *ow;
e_dialog_resizable_set(cfd->dia, 1);
otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
ol = e_widget_list_add(evas, 0, 0);

View File

@ -279,6 +279,7 @@ _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);

View File

@ -158,6 +158,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
Evas_Object *o, *of, *ob;
int i;
e_dialog_resizable_set(cfd->dia, 1);
o = e_widget_table_add(evas, 0);
of = e_widget_framelist_add(evas, _("Enlightenment Paths"), 0);

View File

@ -122,6 +122,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
char buf[64];
E_Zone *zone;
e_dialog_resizable_set(cfd->dia, 1);
ol = e_widget_list_add(evas, 0, 0);
zone = e_comp_object_util_zone_get(cfdata->cfd->dia->win);

View File

@ -200,6 +200,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
int n = 1, sel = 0;
const char *str, *tmp;
e_dialog_resizable_set(cfd->dia, 1);
if (cfdata->client)
tmp = cfdata->client->border.name;
else

View File

@ -529,6 +529,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
unsigned int i;
const Eina_List *l;
e_dialog_resizable_set(cfd->dia, 1);
cfdata->gui.evas = evas;
ol = e_widget_list_add(evas, 0, 0);

View File

@ -422,6 +422,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
cfdata->evas = evas;
e_dialog_resizable_set(cfd->dia, 1);
ot = e_widget_table_add(evas, 0);
cfdata->gui.class_list = NULL;

View File

@ -655,6 +655,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
char path[PATH_MAX];
z = e_zone_current_get(e_comp_get(NULL));
e_dialog_resizable_set(cfd->dia, 1);
ot = e_widget_table_add(evas, 0);
ol = e_widget_table_add(evas, 0);

View File

@ -410,6 +410,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
char path[PATH_MAX];
int mw, mh;
e_dialog_resizable_set(cfd->dia, 1);
zone = e_zone_current_get(e_comp_get(NULL));
o = e_widget_list_add(evas, 0, 1);
@ -563,6 +564,7 @@ _adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *
char path[PATH_MAX];
int mw, mh;
e_dialog_resizable_set(cfd->dia, 1);
zone = e_zone_current_get(e_comp_get(NULL));
o = e_widget_list_add(evas, 0, 1);

View File

@ -531,6 +531,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
1, 1, 1, 1, 0.5, 0.0);
e_widget_toolbook_page_show(otb, 0);
e_dialog_resizable_set(cfd->dia, 1);
_fill_files_ilist(cfdata);

View File

@ -108,6 +108,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
Evas_Object *otb, *ol, *of, *ow;
E_Radio_Group *rg;
e_dialog_resizable_set(cfd->dia, 1);
otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
ol = e_widget_list_add(evas, 0, 0);

View File

@ -222,6 +222,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
Evas_Object *o, *ob;
E_Radio_Group *rg;
e_dialog_resizable_set(cfd->dia, 1);
o = e_widget_list_add(evas, 0, 0);
rg = e_widget_radio_group_new(&(cfdata->mode));
ob = e_widget_radio_add(evas, _("Click Window to Focus"), E_FOCUS_CLICK, rg);
@ -245,6 +246,7 @@ _advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Da
Evas_Object *autoraise_check;
E_Radio_Group *rg;
e_dialog_resizable_set(cfd->dia, 1);
otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
/* Focus */

View File

@ -123,6 +123,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
Evas_Object *otb, *ol, *of, *ow, *oc;
E_Radio_Group *rg;
e_dialog_resizable_set(cfd->dia, 1);
otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
/* Display */

View File

@ -170,6 +170,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
Evas_Object *otb, *ol, *of, *ow, *oc;
E_Radio_Group *rg;
e_dialog_resizable_set(cfd->dia, 1);
otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
/* Resistance */

View File

@ -123,6 +123,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
Evas_Object *ol, *of2, *ow, *oc;
Evas_Coord mw, mh;
e_dialog_resizable_set(cfd->dia, 1);
ol = e_widget_list_add(evas, 0, 0);
ow = e_widget_check_add(evas, _("Remember internal dialogs"),

View File

@ -2548,6 +2548,7 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page,
"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..."));

View File

@ -164,6 +164,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
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);

View File

@ -298,6 +298,7 @@ _cb_icon_sel(void *data, void *data2)
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);

View File

@ -305,6 +305,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__,
E_Radio_Group *rg;
int mw, mh;
e_dialog_resizable_set(cfd->dia, 1);
otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);
o = e_widget_list_add(evas, 0, 0);

View File

@ -343,6 +343,8 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
{
if (!cfdata) return NULL;
e_dialog_resizable_set(cfd->dia, 1);
cfdata->ui.table = e_widget_table_add(evas, 0);
_basic_create_general(evas, cfdata);
_basic_create_cards(evas, cfdata);

View File

@ -65,6 +65,7 @@ _cfg_widgets_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialo
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(list, of, 1, 0, 0.5);
e_dialog_resizable_set(cfd->dia, 1);
return list;
}

View File

@ -120,6 +120,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *ol, *of, *ow;
e_dialog_resizable_set(cfd->dia, 1);
cfdata->cfd = cfd;
ol = e_widget_list_add(evas, 0, 0);
@ -173,6 +174,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
Evas_Object *otb, *ol, *ow;
Evas_Object *pc, *uc;
e_dialog_resizable_set(cfd->dia, 1);
cfdata->cfd = cfd;
otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));

View File

@ -121,6 +121,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *ol, *of, *ow;
e_dialog_resizable_set(cfd->dia, 1);
cfdata->cfd = cfd;
ol = e_widget_list_add(evas, 0, 0);
@ -179,6 +180,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
Evas_Object *otb, *ol, *ow;
Evas_Object *pc, *uc;
e_dialog_resizable_set(cfd->dia, 1);
cfdata->cfd = cfd;
otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));

View File

@ -236,6 +236,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_
Evas_Object *ob, *ol, *otb, *tab;
int w, h;
e_dialog_resizable_set(cfd->dia, 1);
tab = e_widget_table_add(evas, 0);
evas_object_name_set(tab, "dia_table");
@ -322,6 +323,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
{
Evas_Object *ob, *ol, *otb, *tab;
e_dialog_resizable_set(cfd->dia, 1);
cfdata->o_list_entry = cfdata->o_list_transient = NULL;
tab = e_widget_table_add(evas, 0);

View File

@ -260,6 +260,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(NULL, "E", "_e_shot_fsel");
e_dialog_resizable_set(dia, EINA_TRUE);
e_dialog_title_set(dia, _("Select screenshot save location"));
o = e_widget_fsel_add(evas_object_evas_get(dia->win), "desktop", "/",
buf,
@ -491,6 +492,7 @@ _win_share_cb(void *data __UNUSED__, void *data2 __UNUSED__)
ecore_con_url_http_version_set(url_up, ECORE_CON_URL_HTTP_VERSION_1_0);
ecore_con_url_post(url_up, fdata, fsize, "application/x-e-shot");
dia = e_dialog_new(NULL, "E", "_e_shot_share");
e_dialog_resizable_set(dia, EINA_TRUE);
e_dialog_title_set(dia, _("Uploading screenshot"));
o = e_widget_list_add(evas_object_evas_get(dia->win), 0, 0);

View File

@ -179,6 +179,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
{
Evas_Object *otb, *ol, *ob, *iconified, *scroll_animate, *ck;
e_dialog_resizable_set(cfd->dia, 1);
otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
ol = e_widget_list_add(evas, 0, 0);

View File

@ -281,6 +281,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
Eina_List *l, *ll, *lll;
Evas_Coord mw, mh;
/* Holds the dialog contents, displays a toolbar on the top */
e_dialog_resizable_set(cfd->dia, 1);
mainn = e_widget_toolbook_add(evas, 24, 24);
/* Holds the used layouts ilist and the button table */
@ -506,6 +507,7 @@ _dlg_add_new(E_Config_Dialog_Data *cfdata)
if (!(dlg = e_dialog_new(NULL, "E", "xkbswitch_config_add_dialog"))) return NULL;
e_dialog_resizable_set(dlg, 1);
dlg->data = cfdata;
e_object_del_attach_func_set(E_OBJECT(dlg), _dlg_add_cb_del);