enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

you're all goign to kill me :) but here goes - i broke the dialog and config 

dialog api's - added name and class params so u can set the name and class -
so users can later use things like rememebr to rememebr where a dialog will
go for usability and convenience.


SVN revision: 24691
This commit is contained in:
Carsten Haitzler 2006-08-14 15:22:46 +00:00
parent ba4555a3f2
commit a9e7340190
53 changed files with 189 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_actions.c
View File

@ -1435,7 +1435,7 @@ _e_actions_cb_exit_dialog_delete(E_Win *win)
ACT_FN_GO(exit)
{
if (exit_dialog) e_object_del(E_OBJECT(exit_dialog));
exit_dialog = e_dialog_new(e_container_current_get(e_manager_current_get()));
exit_dialog = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_exit_dialog");
if (!exit_dialog) return;
e_win_delete_callback_set(exit_dialog->win, _e_actions_cb_exit_dialog_delete);
e_dialog_title_set(exit_dialog, _("Are you sure you want to exit?"));

2
src/bin/e_apps.c
View File

@ -2098,7 +2098,7 @@ _e_apps_cb_exit(void *data, int type, void *event)
{
E_Dialog *dia;
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_app_run_error_dialog");
if (dia)
{
char buf[4096];

4
src/bin/e_apps_error.c
View File

@ -34,7 +34,9 @@ e_app_error_dialog(E_Container *con, E_App_Autopsy *app)
v->advanced.create_widgets = _advanced_create_widgets;
/* Create The Dialog */
cfd = e_config_dialog_new(con, _("Application Execution Error"), NULL, 0, v, app);
cfd = e_config_dialog_new(con, _("Application Execution Error"),
"E", "_app_exec_error_exit_dialog",
NULL, 0, v, app);
app->error_dialog = cfd;
}
}

14
src/bin/e_config_dialog.c
View File

@ -20,7 +20,7 @@ static void _e_config_dialog_cb_close(void *data, E_Dialog *dia);
/* externally accessible functions */
EAPI E_Config_Dialog *
e_config_dialog_new(E_Container *con, const char *title, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data)
e_config_dialog_new(E_Container *con, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data)
{
E_Config_Dialog *cfd;
@ -28,6 +28,8 @@ e_config_dialog_new(E_Container *con, const char *title, const char *icon, int i
cfd->view = view;
cfd->con = con;
cfd->title = evas_stringshare_add(title);
cfd->name = evas_stringshare_add(name);
cfd->class = evas_stringshare_add(class);
if (icon)
{
cfd->icon = evas_stringshare_add(icon);
@ -79,6 +81,8 @@ _e_config_dialog_free(E_Config_Dialog *cfd)
{
if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd);
if (cfd->title) evas_stringshare_del(cfd->title);
if (cfd->name) evas_stringshare_del(cfd->name);
if (cfd->class) evas_stringshare_del(cfd->class);
if (cfd->icon) evas_stringshare_del(cfd->icon);
if (cfd->cfdata)
{
@ -101,9 +105,15 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
E_Dialog *pdia;
Evas_Object *o, *ob;
Evas_Coord mw = 0, mh = 0;
char buf[256];
pdia = cfd->dia;
cfd->dia = e_dialog_new(cfd->con);
/* FIXME: get name/class form new call and use here */
if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
snprintf(buf, sizeof(buf), "%s...%s", cfd->class, "BASIC");
else
snprintf(buf, sizeof(buf), "%s...%s", cfd->class, "ADVANCED");
cfd->dia = e_dialog_new(cfd->con, cfd->name, buf);
cfd->dia->data = cfd;
e_object_del_attach_func_set(E_OBJECT(cfd->dia), _e_config_dialog_cb_dialog_del);
e_dialog_title_set(cfd->dia, cfd->title);

4
src/bin/e_config_dialog.h
View File

@ -42,6 +42,8 @@ struct _E_Config_Dialog
E_Container *con;
const char *title;
const char *icon;
const char *name;
const char *class;
int icon_size;
E_Dialog *dia;
void *data;
@ -50,7 +52,7 @@ struct _E_Config_Dialog
Ecore_Timer *auto_apply_timer;
};
EAPI E_Config_Dialog *e_config_dialog_new(E_Container *con, const char *title, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data);
EAPI E_Config_Dialog *e_config_dialog_new(E_Container *con, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data);
#endif
#endif

2
src/bin/e_confirm_dialog.c
View File

@ -43,7 +43,7 @@ e_confirm_dialog_show(const char *title, const char *icon, const char *text,
cd->no.func = func2;
cd->no.data = data2;
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_confirm_dialog");
if (!dia)
{
E_FREE(cd);

4
src/bin/e_dialog.c
View File

@ -16,7 +16,7 @@ static void _e_dialog_cb_wid_on_focus(void *data, Evas_Object *obj);
/* externally accessible functions */
EAPI E_Dialog *
e_dialog_new(E_Container *con)
e_dialog_new(E_Container *con, const char *name, const char *class)
{
E_Dialog *dia;
E_Manager *man;
@ -43,7 +43,7 @@ e_dialog_new(E_Container *con)
e_win_resize_callback_set(dia->win, _e_dialog_cb_resize);
dia->win->data = dia;
e_win_dialog_set(dia->win, 1);
e_win_name_class_set(dia->win, "E", "_dialog");
e_win_name_class_set(dia->win, name, class);
o = edje_object_add(e_win_evas_get(dia->win));
dia->bg_object = o;
e_theme_edje_object_set(o, "base/theme/dialog",

2
src/bin/e_dialog.h
View File

@ -29,7 +29,7 @@ struct _E_Dialog
unsigned char resizable : 1;
};
EAPI E_Dialog *e_dialog_new (E_Container *con);
EAPI E_Dialog *e_dialog_new (E_Container *con, const char *name, const char *class);
EAPI void e_dialog_button_add (E_Dialog *dia, const char *label, const char *icon, void (*func) (void *data, E_Dialog *dia), void *data);
EAPI int e_dialog_button_focus_num (E_Dialog *dia, int button);
EAPI int e_dialog_button_disable_num_set (E_Dialog *dia, int button, int disabled);

7
src/bin/e_eap_editor.c
View File

@ -88,7 +88,10 @@ e_eap_edit_show(E_Container *con, E_App *a)
v->advanced.apply_cfdata = _e_eap_edit_advanced_apply_data;
v->advanced.create_widgets = _e_eap_edit_advanced_create_widgets;
/* create config diaolg for NULL object/data */
editor->cfd = e_config_dialog_new(con, _("Eap Editor"), NULL, 0, v, editor);
editor->cfd = e_config_dialog_new(con,
_("Eap Editor"),
"E", "_eap_editor_dialog",
NULL, 0, v, editor);
}
/* local subsystem functions */
@ -415,7 +418,7 @@ _e_eap_editor_cb_icon_select(void *data1, void *data2)
Evas_Coord mw, mh;
cfdata = data1;
dia = e_dialog_new(cfdata->editor->cfd->con);
dia = e_dialog_new(cfdata->editor->cfd->con, "E", "_eap_icon_select_dialog");
if (!dia) return;
e_dialog_title_set(dia, _("Select An Icon"));
dia->data = cfdata;

2
src/bin/e_entry_dialog.c
View File

@ -26,7 +26,7 @@ e_entry_dialog_show(const char *title, const char *icon, const char *text,
ed->cancel.data = data;
ed->text = strdup(initial_text);
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_entry_dialog");
if (!dia)
{
E_FREE(ed);

2
src/bin/e_file_dialog.c
View File

@ -35,7 +35,7 @@ e_file_dialog_new(E_Container *con)
dia = E_OBJECT_ALLOC(E_File_Dialog, E_FILE_DIALOG_TYPE, _e_file_dialog_free);
if(!dia) return NULL;
dia->dia = e_dialog_new(con);
dia->dia = e_dialog_new(con, "E", "_file_dialog");
if(!dia->dia)
{
free(dia);

9
src/bin/e_fileman_smart.c
View File

@ -902,7 +902,7 @@ _e_fm_file_delete(E_Fm_Icon *icon)
E_Dialog *dia;
char text[PATH_MAX + 256];
dia = e_dialog_new(icon->sd->win->container);
dia = e_dialog_new(icon->sd->win->container, "E", "_file_delete_error_dialog");
e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
e_dialog_button_focus_num(dia, 1);
e_dialog_title_set(dia, _("Error"));
@ -992,7 +992,7 @@ _e_fm_file_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi)
icon = data;
dia = e_dialog_new(icon->sd->win->container);
dia = e_dialog_new(icon->sd->win->container, "E", "_file_delete_dialog");
e_dialog_button_add(dia, _("Yes"), NULL, _e_fm_file_delete_yes_cb, icon);
e_dialog_button_add(dia, _("No"), NULL, NULL, NULL);
e_dialog_button_focus_num(dia, 1);
@ -1377,7 +1377,10 @@ _e_fm_file_menu_properties(void *data, E_Menu *m, E_Menu_Item *mi)
v->advanced.apply_cfdata = _e_fm_icon_prop_advanced_apply_data;
v->advanced.create_widgets = _e_fm_icon_prop_advanced_create_widgets;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(icon->sd->win->container, _("Properties"), NULL, 0, v, icon);
cfd = e_config_dialog_new(icon->sd->win->container,
_("Properties"),
"E", "_fileman_file_properties",
NULL, 0, v, icon);
}
}

8
src/bin/e_fm.c
View File

@ -2595,7 +2595,7 @@ _e_fm2_new_directory_yes_cb(char *text, void *data)
con = e_container_current_get(man);
if (!con) return;
dialog = e_dialog_new(con);
dialog = e_dialog_new(con, "E", "_fm_new_dir_error_dialog");
e_dialog_button_add(dialog, _("OK"), NULL, NULL, NULL);
e_dialog_button_focus_num(dialog, 1);
e_dialog_title_set(dialog, _("Error"));
@ -2684,7 +2684,7 @@ _e_fm2_file_rename_yes_cb(char *text, void *data)
con = e_container_current_get(man);
if (!con) return;
dialog = e_dialog_new(con);
dialog = e_dialog_new(con, "E", "_fm_file_rename_error_dialog");
e_dialog_button_add(dialog, _("OK"), NULL, NULL, NULL);
e_dialog_button_focus_num(dialog, 1);
e_dialog_title_set(dialog, _("Error"));
@ -2726,7 +2726,7 @@ _e_fm2_file_delete(void *data, E_Menu *m, E_Menu_Item *mi)
ic = data;
if (ic->dialog) return;
dialog = e_dialog_new(con);
dialog = e_dialog_new(con, "E", "_fm_file_delete_dialog");
ic->dialog = dialog;
E_OBJECT(dialog)->data = ic;
e_object_del_attach_func_set(E_OBJECT(dialog), _e_fm2_file_delete_delete_cb);
@ -2778,7 +2778,7 @@ _e_fm2_file_delete_yes_cb(void *data, E_Dialog *dialog)
if (!con) return;
e_object_del(E_OBJECT(dialog));
dialog = e_dialog_new(con);
dialog = e_dialog_new(con, "E", "_fm_file_delete_error_dialog");
e_dialog_button_add(dialog, _("OK"), NULL, NULL, NULL);
e_dialog_button_focus_num(dialog, 1);
e_dialog_title_set(dialog, _("Error"));

4
src/bin/e_int_border_border.c
View File

@ -37,7 +37,9 @@ e_int_border_border(E_Border *bd)
/* create config diaolg for bd object/data */
cfd = e_config_dialog_new(bd->zone->container,
_("Window Border Selection"), NULL, 0, v, bd);
_("Window Border Selection"),
"E", "_border_sel_dialog",
NULL, 0, v, bd);
bd->border_border_dialog = cfd;
}
}

4
src/bin/e_int_border_locks.c
View File

@ -64,7 +64,9 @@ e_int_border_locks(E_Border *bd)
v->override_auto_apply = 1;
/* create config diaolg for bd object/data */
cfd = e_config_dialog_new(bd->zone->container,
_("Window Locks"), NULL, 0, v, bd);
_("Window Locks"),
"E", "_border_locks_dialog",
NULL, 0, v, bd);
bd->border_locks_dialog = cfd;
}
}

4
src/bin/e_int_border_prop.c
View File

@ -70,7 +70,9 @@ e_int_border_prop(E_Border *bd)
/* create config dialog for bd object/data */
cfd = e_config_dialog_new(bd->zone->container,
_("Window Properties"), NULL, 0, v, bd);
_("Window Properties"),
"E", "_border_properties_dialog",
NULL, 0, v, bd);
}
}

10
src/bin/e_int_border_remember.c
View File

@ -67,7 +67,9 @@ e_int_border_remember(E_Border *bd)
/* create config dialog for bd object/data */
cfd = e_config_dialog_new(bd->zone->container,
_("Window Remember"), NULL, 0, v, bd);
_("Window Remember"),
"E", "_border_remember_dialog",
NULL, 0, v, bd);
bd->border_remember_dialog = cfd;
}
}
@ -225,7 +227,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
E_Dialog *dia;
dia = e_dialog_new(cfd->con);
dia = e_dialog_new(cfd->con, "E", "_border_remember_error_multi_dialog");
e_dialog_title_set(dia, _("Window properties are not a unique match"));
e_dialog_text_set
(dia,
@ -314,7 +316,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
E_Dialog *dia;
dia = e_dialog_new(cfd->con);
dia = e_dialog_new(cfd->con, "E", "_border_remember_error_noprop_dialog");
e_dialog_title_set(dia, _("No match properties set"));
e_dialog_text_set
(dia,
@ -344,7 +346,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
E_Dialog *dia;
dia = e_dialog_new(cfd->con);
dia = e_dialog_new(cfd->con, "E", "_border_remember_error_no_remember_dialog");
e_dialog_title_set(dia, _("No match properties set"));
e_dialog_text_set
(dia,

5
src/bin/e_int_config_cfgdialogs.c
View File

@ -31,7 +31,10 @@ e_int_config_cfgdialogs(E_Container *con)
v->advanced.create_widgets = NULL;
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Config Dialog Settings"), "enlightenment/configuration", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Config Dialog Settings"),
"E", "_config_config_dialog_dialog",
"enlightenment/configuration", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_cursor.c
View File

@ -30,7 +30,10 @@ e_int_config_cursor(E_Container *con)
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
cfd = e_config_dialog_new(con, _("Cursor Settings"), "enlightenment/mouse", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Cursor Settings"),
"E", "_config_cursor_dialog",
"enlightenment/mouse", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_desklock.c
View File

@ -98,7 +98,10 @@ e_int_config_desklock(E_Container *con)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Desktop Lock Settings"), "enlightenment/desklock", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Desktop Lock Settings"),
"E", "_config_desklock_dialog",
"enlightenment/desklock", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_desks.c
View File

@ -43,7 +43,10 @@ e_int_config_desks(E_Container *con)
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Desktop Settings"), "enlightenment/desktops", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Desktop Settings"),
"E", "_config_desks_dialog",
"enlightenment/desktops", 0, v, NULL);
return cfd;
}

7
src/bin/e_int_config_display.c
View File

@ -155,7 +155,7 @@ _surebox_new(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
SureBox *sb;
sb = E_NEW(SureBox, 1);
sb->dia = e_dialog_new(cfd->con);
sb->dia = e_dialog_new(cfd->con, "E", "_display_res_sure_dialog");
sb->timer = ecore_timer_add(1.0, _surebox_timer_cb, sb);
sb->iterations = 15;
sb->orig_size = cfdata->orig_size;
@ -193,7 +193,10 @@ e_int_config_display(E_Container *con)
v->basic.create_widgets = _basic_create_widgets;
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Display Settings"), "enlightenment/screen_resolution", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Display Settings"),
"E", "_config_display_dialog",
"enlightenment/screen_resolution", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_exebuf.c
View File

@ -39,7 +39,10 @@ e_int_config_exebuf(E_Container *con)
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, _("Exebuf Settings"), "enlightenment/run", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Run Command Settings"),
"E", "_config_exebuf_dialog",
"enlightenment/run", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_focus.c
View File

@ -44,7 +44,10 @@ e_int_config_focus(E_Container *con)
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Focus Settings"), "enlightenment/focus", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Focus Settings"),
"E", "_config_focus_dialog",
"enlightenment/focus", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_fonts.c
View File

@ -129,7 +129,10 @@ e_int_config_fonts(E_Container *con)
v->basic.create_widgets = _basic_create_widgets;
v->basic.apply_cfdata = _basic_apply_data;
cfd = e_config_dialog_new(con, _("Font Settings"), "enlightenment/fonts", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Font Settings"),
"E", "_config_fonts_dialog",
"enlightenment/fonts", 0, v, NULL);
return cfd;
}

6
src/bin/e_int_config_hinting.c
View File

@ -3,6 +3,7 @@
*/
#include "e.h"
/* FIXME: FIXME: this code is dead - part of font dialog */
/* PROTOTYPES - same all the time */
static void *_create_data(E_Config_Dialog *cfd);
@ -34,7 +35,10 @@ e_int_config_hinting(E_Container *con)
v->advanced.apply_cfdata = NULL;
v->advanced.create_widgets = NULL;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Font Hinting Settings"), NULL, 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Font Hinting Settings"),
"E", "_config_hinting_dialog",
NULL, 0, v, NULL);
return cfd;
}

7
src/bin/e_int_config_keybindings.c
View File

@ -312,7 +312,10 @@ e_int_config_keybindings(E_Container *con)
v->basic.create_widgets = _basic_create_widgets;
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Key Binding Settings"), "enlightenment/keys", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Key Binding Settings"),
"E", "_config_keybindings_dialog",
"enlightenment/keys", 0, v, NULL);
return cfd;
}
@ -1283,7 +1286,7 @@ _e_keybinding_keybind_cb_new_shortcut(void *data, void *data2)
if (!cfdata || cfdata->locals.keybind_win != 0) return;
cfdata->locals.dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
cfdata->locals.dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_keybind_getkey_dialog");
if (!cfdata->locals.dia) return;
e_dialog_title_set(cfdata->locals.dia, _("Binding Key Sequence"));
e_dialog_icon_set(cfdata->locals.dia, "enlightenment/e", 64);

5
src/bin/e_int_config_menus.c
View File

@ -36,7 +36,10 @@ e_int_config_menus(E_Container *con)
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
cfd = e_config_dialog_new(con, _("Menu Settings"), "enlightenment/menus", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Menu Settings"),
"E", "_config_menus_dialog",
"enlightenment/menus", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_modules.c
View File

@ -50,7 +50,10 @@ e_int_config_modules(E_Container *con)
v->basic.create_widgets = _basic_create_widgets;
v->basic.apply_cfdata = _basic_apply_data;
cfd = e_config_dialog_new(con, _("Module Settings"), "enlightenment/modules", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Module Settings"),
"E", "_config_modules_dialog",
"enlightenment/modules", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_paths.c
View File

@ -60,7 +60,10 @@ e_int_config_paths(E_Container *con)
v->basic.create_widgets = _basic_create_widgets;
v->basic.apply_cfdata = _basic_apply_data;
cfd = e_config_dialog_new(con, _("Search Path Configuration"), "enlightenment/directories", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Search Path Configuration"),
"E", "_config_paths_dialog",
"enlightenment/directories", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_performance.c
View File

@ -34,7 +34,10 @@ e_int_config_performance(E_Container *con)
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
cfd = e_config_dialog_new(con, _("Performance Settings"), "enlightenment/performance", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Performance Settings"),
"E", "_config_performance_dialog",
"enlightenment/performance", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_shelf.c
View File

@ -31,7 +31,10 @@ e_int_config_shelf(E_Container *con)
v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create_widgets;
cfd = e_config_dialog_new(con, _("Shelf Settings"), "enlightenment/shelf", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Shelf Settings"),
"E", "_config_shelf_dialog",
"enlightenment/shelf", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_startup.c
View File

@ -32,7 +32,10 @@ e_int_config_startup(E_Container *con)
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
cfd = e_config_dialog_new(con, _("Startup Settings"), "enlightenment/startup", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Startup Settings"),
"E", "_config_startup_dialog",
"enlightenment/startup", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_theme.c
View File

@ -44,7 +44,10 @@ e_int_config_theme(E_Container *con)
v->override_auto_apply = 1;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Theme Selector"), "enlightenment/themes", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Theme Selector"),
"E", "_config_theme_dialog",
"enlightenment/themes", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_wallpaper.c
View File

@ -46,7 +46,10 @@ e_int_config_wallpaper(E_Container *con)
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Wallpaper Settings"), "enlightenment/background", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Wallpaper Settings"),
"E", "_config_wallpaper_dialog",
"enlightenment/background", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_window_display.c
View File

@ -47,7 +47,10 @@ e_int_config_window_display(E_Container *con)
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Window Display"), "enlightenment/windows", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Window Display"),
"E", "_config_window_display_dialog",
"enlightenment/windows", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_window_manipulation.c
View File

@ -46,7 +46,10 @@ e_int_config_window_manipulation(E_Container *con)
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Window Manipulation"), "enlightenment/window_manipulation", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Window Manipulation"),
"E", "_config_window_manipulation_dialog",
"enlightenment/window_manipulation", 0, v, NULL);
return cfd;
}

5
src/bin/e_int_config_winlist.c
View File

@ -48,7 +48,10 @@ e_int_config_winlist(E_Container *con)
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
cfd = e_config_dialog_new(con, _("Window List Settings"), "enlightenment/winlist", 0, v, NULL);
cfd = e_config_dialog_new(con,
_("Window List Settings"),
"E", "_config_winlist_dialog",
"enlightenment/winlist", 0, v, NULL);
return cfd;
}

4
src/bin/e_int_gadcon_config.c
View File

@ -37,7 +37,9 @@ e_int_gadcon_config(E_Gadcon *gc)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
_("Shelf Contents"), NULL, 0, v, gc);
_("Shelf Contents"),
"E", "_gadcon_config_dialog",
NULL, 0, v, gc);
gc->config_dialog = cfd;
}
}

4
src/bin/e_int_shelf_config.c
View File

@ -56,7 +56,9 @@ e_int_shelf_config(E_Shelf *es)
/* create config diaolg for bd object/data */
cfd = e_config_dialog_new(es->zone->container,
_("Shelf Configuration"), NULL, 0, v, es);
_("Shelf Configuration"),
"E", "_shelf_config_dialog",
NULL, 0, v, es);
es->config_dialog = cfd;
}
}

4
src/bin/e_module.c
View File

@ -367,7 +367,7 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body)
E_Border *bd;
char eap[4096];
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_module_dialog");
if (!dia) return;
e_dialog_title_set(dia, title);
@ -515,7 +515,7 @@ _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m)
E_Dialog *dia;
char buf[4096];
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_module_unload_dialog");
if (!dia) return;
snprintf(buf, sizeof(buf), "%s<br>%s", body,

2
src/bin/e_module.h
View File

@ -3,7 +3,7 @@
*/
#ifdef E_TYPEDEFS
#define E_MODULE_API_VERSION 5
#define E_MODULE_API_VERSION 6
typedef struct _E_Module E_Module;
typedef struct _E_Module_Api E_Module_Api;

16
src/bin/e_test.c
View File

@ -296,7 +296,7 @@ _e_test_internal(E_Container *con)
{
E_Dialog *dia;
dia = e_dialog_new(con);
dia = e_dialog_new(con, "E", "_test");
e_object_del_attach_func_set(E_OBJECT(dia), _e_test_dialog_del);
e_dialog_title_set(dia, "A Test Dialog");
e_dialog_text_set(dia, "A Test Dialog<br>And another line<br><hilight>Hilighted Text</hilight>");
@ -327,7 +327,7 @@ _e_test_internal(E_Container *con)
E_Dialog *dia;
Evas_Object *o, *o2, *o3;
dia = e_dialog_new(con);
dia = e_dialog_new(con, "E", "_test");
e_dialog_title_set(dia, "A Test Dialog");
o = e_icon_add(dia->win->evas);
@ -431,7 +431,7 @@ _e_test_internal(E_Container *con)
Evas_Coord mw, mh, vw, vh;
Evas_Object *o, *o2, *o3, *o4;
dia = e_dialog_new(con);
dia = e_dialog_new(con, "E", "_test");
e_dialog_title_set(dia, "A Test Dialog");
o = e_ilist_add(dia->win->evas);
@ -518,7 +518,7 @@ _e_test_internal(E_Container *con)
Evas_Object *o;
Evas_Coord mw, mh;
dia = e_dialog_new(con);
dia = e_dialog_new(con, "E", "_test");
e_dialog_title_set(dia, "A Test Dialog");
o = e_slider_add(dia->win->evas);
@ -546,7 +546,7 @@ _e_test_internal(E_Container *con)
Evas_Object *o;
Evas_Coord mw, mh;
dia = e_dialog_new(con);
dia = e_dialog_new(con, "E", "_test");
e_dialog_title_set(dia, "A Test Dialog");
o = e_widget_textblock_add(dia->win->evas);
@ -665,7 +665,7 @@ _e_test_internal(E_Container *con)
Evas_Coord mw, mh;
E_Fm2_Config fmc;
dia = e_dialog_new(con);
dia = e_dialog_new(con, "E", "_test");
e_dialog_title_set(dia, "A Test Dialog");
/* a table for layout */
@ -775,7 +775,7 @@ _e_test_internal(E_Container *con)
Evas_Object *o;
Evas_Coord mw, mh;
dia = e_dialog_new(con);
dia = e_dialog_new(con, "E", "_test");
e_dialog_title_set(dia, "A Test Dialog");
o = e_widget_fsel_add(dia->win->evas, "~/", "/tst", NULL, NULL,
@ -810,7 +810,7 @@ _e_test_internal(E_Container *con)
Evas_Coord mw, mh;
E_Color *color;
dia = e_dialog_new(con);
dia = e_dialog_new(con, "E", "_test");
e_dialog_title_set(dia, "Test Color Selector");
color = calloc(1, sizeof(E_Color));

2
src/bin/e_utils.c
View File

@ -518,7 +518,7 @@ e_util_dialog_internal(const char *title, const char *txt)
{
E_Dialog *dia;
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_error_dialog");
if (!dia) return;
e_dialog_title_set(dia, title);
e_dialog_text_set(dia, txt);

1
src/modules/battery/e_mod_config.c
View File

@ -35,6 +35,7 @@ _config_battery_module(void)
snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(battery_config->module));
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
_("Battery Monitor Configuration"),
"E", "_e_mod_battery_config_dialog",
buf, 0, v, NULL);
battery_config->config_dialog = cfd;
}

2
src/modules/battery/e_mod_main.c
View File

@ -292,7 +292,7 @@ _battery_cb_check(void *data)
{
E_Dialog *dia;
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_battery_low_dialog");
if (!dia) return 0;
e_dialog_title_set(dia, "Enlightenment Battery Module");
e_dialog_icon_set(dia, "enlightenment/e", 64);

6
src/modules/cpufreq/e_mod_main.c
View File

@ -322,7 +322,7 @@ _cpufreq_set_governor(const char *governor)
{
E_Dialog *dia;
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_cpufreq_error_setfreq");
if (!dia) return;
e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
e_dialog_icon_set(dia, "enlightenment/e", 64);
@ -348,7 +348,7 @@ _cpufreq_set_frequency(int frequency)
{
E_Dialog *dia;
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_cpufreq_error_setfreq");
if (!dia) return;
e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
e_dialog_icon_set(dia, "enlightenment/e", 64);
@ -368,7 +368,7 @@ _cpufreq_set_frequency(int frequency)
{
E_Dialog *dia;
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_cpufreq_error_setfreq");
if (!dia) return;
e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
e_dialog_icon_set(dia, "enlightenment/e", 64);

5
src/modules/dropshadow/e_mod_config.c
View File

@ -33,7 +33,10 @@ _config_dropshadow_module(E_Container *con, Dropshadow *ds)
v->basic.create_widgets = _basic_create_widgets;
snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(ds->module));
cfd = e_config_dialog_new(con, _("Dropshadow Configuration"), buf, 0, v, ds);
cfd = e_config_dialog_new(con,
_("Dropshadow Configuration"),
"E", "_e_mod_dropshadow_config_dialog",
buf, 0, v, ds);
ds->config_dialog = cfd;
}

4
src/modules/ibar/e_mod_config.c
View File

@ -49,7 +49,9 @@ _config_ibar_module(Config_Item *ci)
snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(ibar_config->module));
/* Create The Dialog */
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
_("IBar Configuration"), buf, 0, v, ci);
_("IBar Configuration"),
"E", "_e_mod_ibar_config_dialog",
buf, 0, v, ci);
ibar_config->config_dialog = cfd;
}

2
src/modules/ibar/e_mod_main.c
View File

@ -1204,7 +1204,7 @@ _ibar_inst_cb_drop(void *data, const char *type, void *event_info)
{
E_Dialog *dia;
dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_ibar_error_icon_add_dialog");
e_dialog_title_set(dia, _("Cannot add icon"));
e_dialog_text_set(dia,
_("You tried to drop an icon of an application that<br>"

4
src/modules/ibox/e_mod_config.c
View File

@ -48,7 +48,9 @@ _config_ibox_module(Config_Item *ci)
/* Create The Dialog */
snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(ibox_config->module));
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
_("IBox Configuration"), buf, 0, v, ci);
_("IBox Configuration"),
"E", "_e_mod_ibox_config_dialog",
buf, 0, v, ci);
ibox_config->config_dialog = evas_list_append(ibox_config->config_dialog, cfd);
}

4
src/modules/pager/e_mod_config.c
View File

@ -34,7 +34,9 @@ _config_pager_module(Config_Item *ci)
snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(pager_config->module));
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
_("Pager Configuration"), buf, 0, v, ci);
_("Pager Configuration"),
"E", "_e_mod_pager_config_dialog",
buf, 0, v, ci);
pager_config->config_dialog = cfd;
}

4
src/modules/temperature/e_mod_config.c
View File

@ -57,7 +57,9 @@ _config_temperature_module(void)
snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(temperature_config->module));
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
_("Temperature Configuration"), buf, 0, v, NULL);
_("Temperature Configuration"),
"E", "_e_mod_temperature_config_dialog",
buf, 0, v, NULL);
temperature_config->config_dialog = cfd;
}