Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_apps.c e_apps_error.c e_config_dialog.c
e_config_dialog.h e_confirm_dialog.c e_dialog.c e_dialog.h
e_eap_editor.c e_entry_dialog.c e_file_dialog.c
e_fileman_smart.c e_fm.c e_int_border_border.c
e_int_border_locks.c e_int_border_prop.c
e_int_border_remember.c e_int_config_cfgdialogs.c
e_int_config_cursor.c e_int_config_desklock.c
e_int_config_desks.c e_int_config_display.c
e_int_config_exebuf.c e_int_config_focus.c
e_int_config_fonts.c e_int_config_hinting.c
e_int_config_keybindings.c e_int_config_menus.c
e_int_config_modules.c e_int_config_paths.c
e_int_config_performance.c e_int_config_shelf.c
e_int_config_startup.c e_int_config_theme.c
e_int_config_wallpaper.c e_int_config_window_display.c
e_int_config_window_manipulation.c e_int_config_winlist.c
e_int_gadcon_config.c e_int_shelf_config.c e_module.c
e_module.h e_test.c e_utils.c
Log Message:
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.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- e_actions.c 8 Aug 2006 01:28:06 -0000 1.76
+++ e_actions.c 14 Aug 2006 15:22:44 -0000 1.77
@@ -1435,7 +1435,7 @@
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?"));
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- e_apps.c 29 Jul 2006 09:26:18 -0000 1.146
+++ e_apps.c 14 Aug 2006 15:22:44 -0000 1.147
@@ -2098,7 +2098,7 @@
{
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];
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps_error.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_apps_error.c 28 Jul 2006 11:41:41 -0000 1.16
+++ e_apps_error.c 14 Aug 2006 15:22:44 -0000 1.17
@@ -34,7 +34,9 @@
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;
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config_dialog.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_config_dialog.c 28 Jul 2006 13:06:12 -0000 1.27
+++ e_config_dialog.c 14 Aug 2006 15:22:44 -0000 1.28
@@ -20,7 +20,7 @@
/* 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 @@
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 @@
{
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_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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config_dialog.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_config_dialog.h 10 May 2006 10:17:59 -0000 1.12
+++ e_config_dialog.h 14 Aug 2006 15:22:44 -0000 1.13
@@ -42,6 +42,8 @@
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 @@
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
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_confirm_dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_confirm_dialog.c 22 May 2006 20:28:32 -0000 1.1
+++ e_confirm_dialog.c 14 Aug 2006 15:22:44 -0000 1.2
@@ -43,7 +43,7 @@
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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_dialog.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_dialog.c 2 Jul 2006 16:19:51 -0000 1.35
+++ e_dialog.c 14 Aug 2006 15:22:44 -0000 1.36
@@ -16,7 +16,7 @@
/* 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_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",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_dialog.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_dialog.h 3 Jul 2006 07:35:44 -0000 1.14
+++ e_dialog.h 14 Aug 2006 15:22:44 -0000 1.15
@@ -29,7 +29,7 @@
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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_eap_editor.c 13 Aug 2006 02:51:34 -0000 1.37
+++ e_eap_editor.c 14 Aug 2006 15:22:44 -0000 1.38
@@ -88,7 +88,10 @@
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 @@
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry_dialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_entry_dialog.c 12 Aug 2006 14:27:52 -0000 1.4
+++ e_entry_dialog.c 14 Aug 2006 15:22:44 -0000 1.5
@@ -26,7 +26,7 @@
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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_file_dialog.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_file_dialog.c 12 Jun 2006 07:19:03 -0000 1.13
+++ e_file_dialog.c 14 Aug 2006 15:22:44 -0000 1.14
@@ -35,7 +35,7 @@
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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -3 -r1.139 -r1.140
--- e_fileman_smart.c 11 Aug 2006 21:48:18 -0000 1.139
+++ e_fileman_smart.c 14 Aug 2006 15:22:44 -0000 1.140
@@ -902,7 +902,7 @@
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 @@
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 @@
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);
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_fm.c 13 Aug 2006 05:39:42 -0000 1.29
+++ e_fm.c 14 Aug 2006 15:22:45 -0000 1.30
@@ -2595,7 +2595,7 @@
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 @@
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 @@
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 @@
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"));
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_border.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_int_border_border.c 18 Jul 2006 13:35:08 -0000 1.14
+++ e_int_border_border.c 14 Aug 2006 15:22:45 -0000 1.15
@@ -36,8 +36,10 @@
v->override_auto_apply = 1;
/* create config diaolg for bd object/data */
- cfd = e_config_dialog_new(bd->zone->container,
- _("Window Border Selection"), NULL, 0, v, bd);
+ cfd = e_config_dialog_new(bd->zone->container,
+ _("Window Border Selection"),
+ "E", "_border_sel_dialog",
+ NULL, 0, v, bd);
bd->border_border_dialog = cfd;
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_locks.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_int_border_locks.c 29 Jul 2006 19:00:30 -0000 1.13
+++ e_int_border_locks.c 14 Aug 2006 15:22:45 -0000 1.14
@@ -63,8 +63,10 @@
v->advanced.create_widgets = _advanced_create_widgets;
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);
+ cfd = e_config_dialog_new(bd->zone->container,
+ _("Window Locks"),
+ "E", "_border_locks_dialog",
+ NULL, 0, v, bd);
bd->border_locks_dialog = cfd;
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_prop.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_border_prop.c 16 Jun 2006 06:05:41 -0000 1.3
+++ e_int_border_prop.c 14 Aug 2006 15:22:45 -0000 1.4
@@ -69,8 +69,10 @@
v->override_auto_apply = 1;
/* create config dialog for bd object/data */
- cfd = e_config_dialog_new(bd->zone->container,
- _("Window Properties"), NULL, 0, v, bd);
+ cfd = e_config_dialog_new(bd->zone->container,
+ _("Window Properties"),
+ "E", "_border_properties_dialog",
+ NULL, 0, v, bd);
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_remember.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_int_border_remember.c 7 Jun 2006 23:30:12 -0000 1.10
+++ e_int_border_remember.c 14 Aug 2006 15:22:45 -0000 1.11
@@ -66,8 +66,10 @@
v->override_auto_apply = 1;
/* create config dialog for bd object/data */
- cfd = e_config_dialog_new(bd->zone->container,
- _("Window Remember"), NULL, 0, v, bd);
+ cfd = e_config_dialog_new(bd->zone->container,
+ _("Window Remember"),
+ "E", "_border_remember_dialog",
+ NULL, 0, v, bd);
bd->border_remember_dialog = cfd;
}
}
@@ -225,7 +227,7 @@
{
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 @@
{
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 @@
{
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,
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_cfgdialogs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_cfgdialogs.c 2 Jul 2006 16:19:51 -0000 1.6
+++ e_int_config_cfgdialogs.c 14 Aug 2006 15:22:45 -0000 1.7
@@ -31,7 +31,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_cursor.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_config_cursor.c 2 Jul 2006 16:19:51 -0000 1.8
+++ e_int_config_cursor.c 14 Aug 2006 15:22:45 -0000 1.9
@@ -30,7 +30,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_int_config_desklock.c 12 Aug 2006 13:25:29 -0000 1.27
+++ e_int_config_desklock.c 14 Aug 2006 15:22:45 -0000 1.28
@@ -98,7 +98,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desks.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_int_config_desks.c 10 Aug 2006 11:04:13 -0000 1.18
+++ e_int_config_desks.c 14 Aug 2006 15:22:45 -0000 1.19
@@ -43,7 +43,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_int_config_display.c 12 Aug 2006 23:40:26 -0000 1.23
+++ e_int_config_display.c 14 Aug 2006 15:22:45 -0000 1.24
@@ -155,7 +155,7 @@
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 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_exebuf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_exebuf.c 2 Jul 2006 16:19:51 -0000 1.3
+++ e_int_config_exebuf.c 14 Aug 2006 15:22:45 -0000 1.4
@@ -39,7 +39,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_focus.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_int_config_focus.c 2 Jul 2006 16:19:51 -0000 1.13
+++ e_int_config_focus.c 14 Aug 2006 15:22:45 -0000 1.14
@@ -44,7 +44,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_int_config_fonts.c 2 Jul 2006 16:19:51 -0000 1.16
+++ e_int_config_fonts.c 14 Aug 2006 15:22:45 -0000 1.17
@@ -129,7 +129,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_hinting.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_hinting.c 2 Mar 2006 12:01:21 -0000 1.6
+++ e_int_config_hinting.c 14 Aug 2006 15:22:45 -0000 1.7
@@ -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 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_int_config_keybindings.c 28 Jul 2006 11:31:00 -0000 1.34
+++ e_int_config_keybindings.c 14 Aug 2006 15:22:45 -0000 1.35
@@ -312,7 +312,10 @@
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 @@
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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_menus.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_menus.c 2 Jul 2006 16:19:51 -0000 1.7
+++ e_int_config_menus.c 14 Aug 2006 15:22:45 -0000 1.8
@@ -36,7 +36,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_int_config_modules.c 2 Jul 2006 16:19:51 -0000 1.38
+++ e_int_config_modules.c 14 Aug 2006 15:22:45 -0000 1.39
@@ -50,7 +50,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_paths.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_paths.c 1 Aug 2006 04:26:09 -0000 1.5
+++ e_int_config_paths.c 14 Aug 2006 15:22:45 -0000 1.6
@@ -60,7 +60,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_performance.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_config_performance.c 2 Jul 2006 16:19:51 -0000 1.8
+++ e_int_config_performance.c 14 Aug 2006 15:22:45 -0000 1.9
@@ -34,7 +34,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_shelf.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_int_config_shelf.c 28 Jul 2006 11:34:38 -0000 1.22
+++ e_int_config_shelf.c 14 Aug 2006 15:22:45 -0000 1.23
@@ -31,7 +31,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_int_config_startup.c 3 Aug 2006 02:05:33 -0000 1.13
+++ e_int_config_startup.c 14 Aug 2006 15:22:45 -0000 1.14
@@ -32,7 +32,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_int_config_theme.c 8 Jul 2006 09:18:03 -0000 1.28
+++ e_int_config_theme.c 14 Aug 2006 15:22:45 -0000 1.29
@@ -44,7 +44,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_wallpaper.c 8 Aug 2006 20:41:46 -0000 1.2
+++ e_int_config_wallpaper.c 14 Aug 2006 15:22:45 -0000 1.3
@@ -46,7 +46,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_window_display.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_int_config_window_display.c 2 Jul 2006 16:19:51 -0000 1.15
+++ e_int_config_window_display.c 14 Aug 2006 15:22:45 -0000 1.16
@@ -47,7 +47,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_window_manipulation.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_int_config_window_manipulation.c 2 Jul 2006 16:19:51 -0000 1.13
+++ e_int_config_window_manipulation.c 14 Aug 2006 15:22:45 -0000 1.14
@@ -46,7 +46,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_winlist.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_int_config_winlist.c 2 Jul 2006 16:19:51 -0000 1.9
+++ e_int_config_winlist.c 14 Aug 2006 15:22:45 -0000 1.10
@@ -48,7 +48,10 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_gadcon_config.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_int_gadcon_config.c 3 Aug 2006 15:35:38 -0000 1.27
+++ e_int_gadcon_config.c 14 Aug 2006 15:22:45 -0000 1.28
@@ -37,7 +37,9 @@
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;
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_int_shelf_config.c 27 Jul 2006 22:40:51 -0000 1.17
+++ e_int_shelf_config.c 14 Aug 2006 15:22:45 -0000 1.18
@@ -56,7 +56,9 @@
/* 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;
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- e_module.c 8 Aug 2006 01:46:41 -0000 1.63
+++ e_module.c 14 Aug 2006 15:22:45 -0000 1.64
@@ -367,7 +367,7 @@
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_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,
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_module.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_module.h 13 Aug 2006 05:33:15 -0000 1.16
+++ e_module.h 14 Aug 2006 15:22:45 -0000 1.17
@@ -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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- e_test.c 14 Aug 2006 07:05:31 -0000 1.64
+++ e_test.c 14 Aug 2006 15:22:45 -0000 1.65
@@ -296,7 +296,7 @@
{
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_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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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));
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_utils.c 22 Jul 2006 21:48:24 -0000 1.48
+++ e_utils.c 14 Aug 2006 15:22:45 -0000 1.49
@@ -518,7 +518,7 @@
{
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);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
