forked from enlightenment/enlightenment
Patch from jeffdameth to fix hard-coded window size on the eap_editor dialog.
Fixed some formatting issues. SVN revision: 31039
This commit is contained in:
parent
70e391e0cf
commit
8c8de13c71
|
@ -577,7 +577,8 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
|
|||
|
||||
dia = e_dialog_new(cfdata->editor->cfd->con, "E", "_eap_icon_select_dialog");
|
||||
if (!dia) return;
|
||||
e_object_del_attach_func_set(E_OBJECT(dia), _e_desktop_edit_cb_icon_select_destroy);
|
||||
e_object_del_attach_func_set(E_OBJECT(dia),
|
||||
_e_desktop_edit_cb_icon_select_destroy);
|
||||
e_dialog_title_set(dia, _("Select an Icon"));
|
||||
dia->data = cfdata;
|
||||
|
||||
|
@ -590,15 +591,15 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
|
|||
if (dir)
|
||||
{
|
||||
o = e_widget_fsel_add(dia->win->evas, dir, "/", NULL, NULL,
|
||||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
free(dir);
|
||||
}
|
||||
else
|
||||
{
|
||||
o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
|
||||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
}
|
||||
|
||||
evas_object_show(o);
|
||||
|
@ -607,12 +608,13 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
|
|||
e_dialog_content_set(dia, o, mw, mh);
|
||||
|
||||
/* buttons at the bottom */
|
||||
e_dialog_button_add(dia, _("OK"), NULL, _e_desktop_edit_cb_icon_select_ok, cfdata);
|
||||
e_dialog_button_add(dia, _("Cancel"), NULL, _e_desktop_edit_cb_icon_select_cancel, cfdata);
|
||||
e_dialog_button_add(dia, _("OK"), NULL,
|
||||
_e_desktop_edit_cb_icon_select_ok, cfdata);
|
||||
e_dialog_button_add(dia, _("Cancel"), NULL,
|
||||
_e_desktop_edit_cb_icon_select_cancel, cfdata);
|
||||
e_dialog_resizable_set(dia, 1);
|
||||
e_win_centered_set(dia->win, 1);
|
||||
e_dialog_show(dia);
|
||||
e_win_resize(dia->win, 475, 341);
|
||||
editor->icon_fsel_dia = dia;
|
||||
}
|
||||
|
||||
|
@ -633,7 +635,8 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2)
|
|||
|
||||
dia = e_dialog_new(cfdata->editor->cfd->con, "E", "_eap_exec_select_dialog");
|
||||
if (!dia) return;
|
||||
e_object_del_attach_func_set(E_OBJECT(dia), _e_desktop_edit_cb_exec_select_destroy);
|
||||
e_object_del_attach_func_set(E_OBJECT(dia),
|
||||
_e_desktop_edit_cb_exec_select_destroy);
|
||||
e_dialog_title_set(dia, _("Select an Executable"));
|
||||
dia->data = cfdata;
|
||||
|
||||
|
@ -644,15 +647,15 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2)
|
|||
if (dir)
|
||||
{
|
||||
o = e_widget_fsel_add(dia->win->evas, dir, "/", NULL, NULL,
|
||||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
free(dir);
|
||||
}
|
||||
else
|
||||
{
|
||||
o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
|
||||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
}
|
||||
|
||||
evas_object_show(o);
|
||||
|
@ -666,7 +669,6 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2)
|
|||
e_dialog_resizable_set(dia, 1);
|
||||
e_win_centered_set(dia->win, 1);
|
||||
e_dialog_show(dia);
|
||||
e_win_resize(dia->win, 475, 341);
|
||||
editor->exec_fsel_dia = dia;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue