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

Fix all this config window class mess once and for all. Now using the config 

registry path for window class correctly in that when the module(s) shut
down, the will kill the dialogs.



SVN revision: 44191
This commit is contained in:
Christopher Michael 2009-12-04 22:37:18 +00:00
parent 1aa44b0081
commit ff96a40305
79 changed files with 161 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/conf_borders/e_int_config_borders.c
View File

@ -24,11 +24,11 @@ e_int_config_borders(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_border_style_dialog")) return NULL;
if (e_config_dialog_find("E", "appearance/borders")) return NULL;
v = _config_view_new();
if (!v) return NULL;
cfd = e_config_dialog_new(con, _("Default Border Style"),
"E", "_config_border_style_dialog",
"E", "appearance/borders",
"preferences-system-windows", 0, v, con);
return cfd;
}

7
src/modules/conf_borders/e_mod_main.c
View File

@ -30,8 +30,11 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_border_style_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "_config_border_border_style_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "internal/borders_border")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/borders")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("internal/borders_border");
e_configure_registry_category_del("internal");
e_configure_registry_item_del("appearance/borders");

3
src/modules/conf_clientlist/e_int_config_clientlist.c
View File

@ -27,7 +27,8 @@ e_int_config_clientlist(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_clientlist_dialog")) return NULL;
if (e_config_dialog_find("E", "menus/client_list_menu"))
return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;

12
src/modules/conf_clientlist/e_mod_main.c
View File

@ -17,8 +17,12 @@ EAPI E_Module_Api e_modapi =
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "preferences-menus");
e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "preferences-winlist", e_int_config_clientlist);
e_configure_registry_category_add("menus", 60, _("Menus"), NULL,
"preferences-menus");
e_configure_registry_item_add("menus/client_list_menu", 40,
_("Client List Menu"), NULL,
"preferences-winlist",
e_int_config_clientlist);
conf_module = m;
e_module_delayed_set(m, 1);
return m;
@ -28,7 +32,9 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_clientlist_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "menus/client_list_menu")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("menus/client_list_menu");
e_configure_registry_category_del("menus");
conf_module = NULL;

5
src/modules/conf_colors/e_int_config_color_classes.c
View File

@ -127,8 +127,9 @@ e_int_config_color_classes(E_Container *con, const char *params __UNUSED__)
v->advanced.apply_cfdata = _adv_apply_data;
v->advanced.create_widgets = _adv_create_widgets;
cfd = e_config_dialog_new(con, _("Colors"), "E", "_config_color_classes_dialog",
"preferences-desktop-color", 0, v, NULL);
cfd =
e_config_dialog_new(con, _("Colors"), "E", "appearance/colors",
"preferences-desktop-color", 0, v, NULL);
return cfd;
}

11
src/modules/conf_colors/e_mod_main.c
View File

@ -17,8 +17,11 @@ EAPI E_Module_Api e_modapi =
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "preferences-desktop-color", e_int_config_color_classes);
e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-appearance");
e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL,
"preferences-desktop-color",
e_int_config_color_classes);
conf_module = m;
e_module_delayed_set(m, 1);
return m;
@ -28,7 +31,9 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_color_classes_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/colors")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/colors");
e_configure_registry_category_del("appearance");
conf_module = NULL;

4
src/modules/conf_desk/e_int_config_desk.c
View File

@ -33,7 +33,7 @@ e_int_config_desk(E_Container *con, const char *params)
if (sscanf(params, "%i %i %i %i", &con_num, &zone_num, &dx, &dy) != 4)
return NULL;
if (e_config_dialog_find("E", "_config_desk_dialog")) return NULL;
if (e_config_dialog_find("E", "internal/desk")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
@ -49,7 +49,7 @@ e_int_config_desk(E_Container *con, const char *params)
v->basic.create_widgets = _basic_create;
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Desk Settings"), "E", "_config_desk_dialog",
cfd = e_config_dialog_new(con, _("Desk Settings"), "E", "internal/desk",
"preferences-desktop", 0, v, cfdata);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_desk_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "internal/desk"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("internal/desk");
e_configure_registry_category_del("internal");
conf_module = NULL;

4
src/modules/conf_desklock/e_int_config_desklock.c
View File

@ -79,7 +79,7 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_desklock_dialog")) return NULL;
if (e_config_dialog_find("E", "screen/screen_lock")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
if (!v) return NULL;
v->create_cfdata = _create_data;
@ -94,7 +94,7 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Screen Lock Settings"), "E",
"_config_desklock_dialog", "preferences-desklock",
"screen/screen_lock", "preferences-desklock",
0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_desklock_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/screen_lock"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/screen_lock");
e_configure_registry_category_del("screen");
conf_module = NULL;

16
src/modules/conf_desks/e_int_config_desks.c
View File

@ -49,18 +49,18 @@ e_int_config_desks(E_Container *con, const char *params __UNUSED__)
v = E_NEW(E_Config_Dialog_View, 1);
/* methods */
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
v->basic.check_changed = _basic_check_changed;
v->advanced.apply_cfdata = _advanced_apply_data;
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
v->basic.check_changed = _basic_check_changed;
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
v->advanced.check_changed = _advanced_check_changed;
v->advanced.check_changed = _advanced_check_changed;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con,
_("Virtual Desktops Settings"),
"E", "_config_desks_dialog",
"E", "screen/virtual_desktops",
"preferences-desktop", 0, v, NULL);
return cfd;
}

11
src/modules/conf_desks/e_mod_main.c
View File

@ -19,8 +19,11 @@ EAPI E_Module_Api e_modapi =
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
e_configure_registry_item_add("screen/virtual_desktops", 10, _("Virtual Desktops"), NULL, "preferences-desktop", e_int_config_desks);
e_configure_registry_category_add("screen", 30, _("Screen"), NULL,
"preferences-desktop-display");
e_configure_registry_item_add("screen/virtual_desktops", 10,
_("Virtual Desktops"), NULL,
"preferences-desktop", e_int_config_desks);
conf_module = m;
e_module_delayed_set(m, 1);
return m;
@ -30,7 +33,9 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_desks_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/virtual_desktops")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/virtual_desktops");
e_configure_registry_category_del("screen");
conf_module = NULL;

4
src/modules/conf_dialogs/e_int_config_dialogs.c
View File

@ -24,7 +24,7 @@ e_int_config_dialogs(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_config_dialog_dialog")) return NULL;
if (e_config_dialog_find("E", "settings/dialogs")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -35,7 +35,7 @@ e_int_config_dialogs(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Dialog Settings"),
"E", "_config_config_dialog_dialog",
"E", "settings/dialogs",
"preferences-dialogs", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_config_dialog_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "settings/dialogs"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("settings/dialogs");
e_configure_registry_category_del("settings");
conf_module = NULL;

4
src/modules/conf_display/e_int_config_display.c
View File

@ -216,7 +216,7 @@ e_int_config_display(E_Container *con, const char *params __UNUSED__)
return NULL;
}
if (e_config_dialog_find("E", "_config_display_dialog")) return NULL;
if (e_config_dialog_find("E", "screen/screen_resolution")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
@ -226,7 +226,7 @@ e_int_config_display(E_Container *con, const char *params __UNUSED__)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Screen Resolution Settings"),
"E", "_config_display_dialog",
"E", "screen/screen_resolution",
"preferences-system-screen-resolution", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_display_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/screen_resolution"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/screen_resolution");
e_configure_registry_category_del("screen");
conf_module = NULL;

4
src/modules/conf_dpms/e_int_config_dpms.c
View File

@ -95,7 +95,7 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if ((e_config_dialog_find("E", "_config_dpms_dialogt")) ||
if ((e_config_dialog_find("E", "screen/power_management")) ||
(!_e_int_config_dpms_available()) ||
(!_e_int_config_dpms_capable()))
return NULL;
@ -110,7 +110,7 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Display Power Management Settings"), "E",
"_config_dpms_dialog", "preferences-system-power-management",
"screen/power_management", "preferences-system-power-management",
0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_dpms_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/power_management"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/power_management");
e_configure_registry_category_del("screen");
conf_module = NULL;

4
src/modules/conf_edgebindings/e_int_config_edgebindings.c
View File

@ -93,7 +93,7 @@ e_int_config_edgebindings(E_Container *con, const char *params)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_edgebindings_dialog")) return NULL;
if (e_config_dialog_find("E", "keyboard_and_mouse/edge_bindings")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -103,7 +103,7 @@ e_int_config_edgebindings(E_Container *con, const char *params)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Edge Binding Settings"), "E",
"_config_edgebindings_dialog",
"keyboard_and_mouse/edge_bindings",
"enlightenment/edges", 0, v, NULL);
if ((params) && (params[0]))
{

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_edgebindings_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/edge_bindings"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("keyboard_and_mouse/edge_bindings");
e_configure_registry_category_del("keyboard_and_mouse");
conf_module = NULL;

4
src/modules/conf_engine/e_int_config_engine.c
View File

@ -25,7 +25,7 @@ e_int_config_engine(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_engine_dialog")) return NULL;
if (e_config_dialog_find("E", "advanced/engine")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
if (!v) return NULL;
v->create_cfdata = _create_data;
@ -36,7 +36,7 @@ e_int_config_engine(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Engine Settings"),
"E", "_config_engine_dialog",
"E", "advanced/engine",
"preferences-engine", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_engine_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "advanced/engine"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("advanced/engine");
e_configure_registry_category_del("advanced");
conf_module = NULL;

4
src/modules/conf_exebuf/e_int_config_exebuf.c
View File

@ -36,7 +36,7 @@ e_int_config_exebuf(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_exebuf_dialog")) return NULL;
if (e_config_dialog_find("E", "advanced/run_command")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -47,7 +47,7 @@ e_int_config_exebuf(E_Container *con, const char *params __UNUSED__)
v->advanced.create_widgets = _advanced_create_widgets;
cfd = e_config_dialog_new(con,
_("Run Command Settings"),
"E", "_config_exebuf_dialog",
"E", "advanced/run_command",
"system-run", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_exebuf_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "advanced/run_command"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("advanced/run_command");
e_configure_registry_category_del("advanced");
conf_module = NULL;

14
src/modules/conf_fonts/e_int_config_fonts.c
View File

@ -155,18 +155,18 @@ e_int_config_fonts(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_fonts_dialog")) return NULL;
if (e_config_dialog_find("E", "appearance/fonts")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create_widgets;
v->basic.apply_cfdata = _basic_apply_data;
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create_widgets;
v->basic.apply_cfdata = _basic_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.apply_cfdata = _advanced_apply_data;
cfd = e_config_dialog_new(con, _("Font Settings"),
"E", "_config_fonts_dialog",
"E", "appearance/fonts",
"preferences-desktop-font", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_fonts_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/fonts"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/fonts");
e_configure_registry_category_del("appearance");
conf_module = NULL;

4
src/modules/conf_icon_theme/e_int_config_icon_themes.c
View File

@ -30,7 +30,7 @@ e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_icon_theme_dialog")) return NULL;
if (e_config_dialog_find("E", "appearance/icon_theme")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -41,7 +41,7 @@ e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Icon Theme Settings"),
"E", "_config_icon_theme_dialog",
"E", "appearance/icon_theme",
"preferences-icon-theme", 0, v, NULL);
return cfd;
}

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

@ -30,7 +30,7 @@ e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_icon_theme_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/icon_theme"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/icon_theme");
e_configure_registry_category_del("appearance");
conf_module = NULL;

4
src/modules/conf_imc/e_int_config_imc.c
View File

@ -95,7 +95,7 @@ e_int_config_imc(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_imc_dialog")) return NULL;
if (e_config_dialog_find("E", "language/input_method_settings")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -107,7 +107,7 @@ e_int_config_imc(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Input Method Settings"),
"E", "_config_imc_dialog",
"E", "language/input_method_settings",
"preferences-imc", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_imc_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "language/input_method_settings"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("language/input_method_settings");
e_configure_registry_category_del("language");
conf_module = NULL;

4
src/modules/conf_interaction/e_int_config_interaction.c
View File

@ -23,7 +23,7 @@ e_int_config_interaction(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_config_interaction_dialog")) return NULL;
if (e_config_dialog_find("E", "keyboard_and_mouse/interaction")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -35,7 +35,7 @@ e_int_config_interaction(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Interaction Settings"),
"E", "_config_config_interaction_dialog",
"E", "keyboard_and_mouse/interaction",
"preferences-interaction", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_config_interaction_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/interaction"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("keyboard_and_mouse/interaction");
e_configure_registry_category_del("keyboard_and_mouse");
conf_module = NULL;

4
src/modules/conf_intl/e_int_config_intl.c
View File

@ -569,7 +569,7 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_intl_dialog")) return NULL;
if (e_config_dialog_find("E", "language/language_settings")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -581,7 +581,7 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Language Settings"),
"E", "_config_intl_dialog",
"E", "language/language_settings",
"preferences-desktop-locale", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_intl_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "language/language_settings"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("language/language_settings");
e_configure_registry_category_del("language");
conf_module = NULL;

4
src/modules/conf_keybindings/e_int_config_keybindings.c
View File

@ -80,7 +80,7 @@ e_int_config_keybindings(E_Container *con, const char *params)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_keybindings_dialog")) return NULL;
if (e_config_dialog_find("E", "keyboard_and_mouse/key_bindings")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -90,7 +90,7 @@ e_int_config_keybindings(E_Container *con, const char *params)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Key Binding Settings"), "E",
"_config_keybindings_dialog",
"keyboard_and_mouse/key_bindings",
"preferences-desktop-keyboard", 0, v, NULL);
if ((params) && (params[0]))
{

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_keybindings_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/key_bindings"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("keyboard_and_mouse/key_bindings");
e_configure_registry_category_del("keyboard_and_mouse");
conf_module = NULL;

4
src/modules/conf_menus/e_int_config_menus.c
View File

@ -30,7 +30,7 @@ e_int_config_menus(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_menus_dialog")) return NULL;
if (e_config_dialog_find("E", "menus/menu_settings")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -42,7 +42,7 @@ e_int_config_menus(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Menu Settings"),
"E", "_config_menus_dialog",
"E", "menus/menu_settings",
"preferences-menus", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_menus_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "menus/menu_settings"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("menus/menu_settings");
e_configure_registry_category_del("menus");
conf_module = NULL;

4
src/modules/conf_mime/e_int_config_mime.c
View File

@ -54,14 +54,14 @@ e_int_config_mime(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_mime_dialog")) return NULL;
if (e_config_dialog_find("E", "fileman/file_icons")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create;
cfd = e_config_dialog_new(con, _("File Icons"), "E", "_config_mime_dialog",
cfd = e_config_dialog_new(con, _("File Icons"), "E", "fileman/file_icons",
"preferences-file-icons", 0, v, NULL);
return cfd;
}

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

@ -30,7 +30,7 @@ e_modapi_shutdown(E_Module *m)
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_mime_edit_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "_config_mime_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "fileman/file_icons"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("fileman/file_icons");
e_configure_registry_category_del("fileman");
conf_module = NULL;

4
src/modules/conf_mouse/e_int_config_mouse.c
View File

@ -23,7 +23,7 @@ e_int_config_mouse(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_mouse_dialog"))
if (e_config_dialog_find("E", "keyboard_and_mouse/mouse_settings"))
return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
@ -35,7 +35,7 @@ e_int_config_mouse(E_Container *con, const char *params __UNUSED__)
v->basic.check_changed = _basic_check_changed;
cfd = e_config_dialog_new(con, _("Mouse Settings"), "E",
"_config_mouse_dialog",
"keyboard_and_mouse/mouse_settings",
"preferences-desktop-mouse", 0, v, NULL);
return cfd;
}

4
src/modules/conf_mouse/e_mod_main.c
View File

@ -28,8 +28,8 @@ EAPI int
e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_mouse_dialog"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("keyboard_and_mouse/mouse_acceleration");
while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_settings"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("keyboard_and_mouse/mouse_settings");
e_configure_registry_category_del("keyboard_and_mouse");
conf_module = NULL;
return 1;

4
src/modules/conf_mouse_cursor/e_int_config_cursor.c
View File

@ -31,7 +31,7 @@ e_int_config_cursor(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_cursor_dialog")) return NULL;
if (e_config_dialog_find("E", "appearance/mouse_cursor")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -43,7 +43,7 @@ e_int_config_cursor(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Cursor Settings"),
"E", "_config_cursor_dialog",
"E", "appearance/mouse_cursor",
"preferences-desktop-pointer", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_cursor_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/mouse_cursor"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/mouse_cursor");
e_configure_registry_category_del("appearance");
conf_module = NULL;

4
src/modules/conf_mousebindings/e_int_config_mousebindings.c
View File

@ -99,7 +99,7 @@ e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_mousebindings_dialog")) return NULL;
if (e_config_dialog_find("E", "keyboard_and_mouse/mouse_bindings")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -110,7 +110,7 @@ e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Mouse Binding Settings"),
"E", "_config_mousebindings_dialog",
"E", "keyboard_and_mouse/mouse_bindings",
"preferences-desktop-mouse", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_mousebindings_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_bindings"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("keyboard_and_mouse/mouse_bindings");
e_configure_registry_category_del("keyboard_and_mouse");
conf_module = NULL;

4
src/modules/conf_paths/e_int_config_paths.c
View File

@ -51,7 +51,7 @@ e_int_config_paths(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_paths_dialog")) return NULL;
if (e_config_dialog_find("E", "advanced/search_directories")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -60,7 +60,7 @@ e_int_config_paths(E_Container *con, const char *params __UNUSED__)
v->basic.apply_cfdata = _basic_apply_data;
cfd = e_config_dialog_new(con, _("Search Path Settings"),
"E", "_config_paths_dialog",
"E", "advanced/search_directories",
"preferences-directories", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_paths_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "advanced/search_directories"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("advanced/search_directories");
e_configure_registry_category_del("advanced");
conf_module = NULL;

4
src/modules/conf_performance/e_int_config_performance.c
View File

@ -26,7 +26,7 @@ e_int_config_performance(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_performance_dialog")) return NULL;
if (e_config_dialog_find("E", "advanced/performance")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -38,7 +38,7 @@ e_int_config_performance(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Performance Settings"),
"E", "_config_performance_dialog",
"E", "advanced/performance",
"preferences-system-performance", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_performance_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "advanced/performance"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("advanced/performance");
e_configure_registry_category_del("advanced");
conf_module = NULL;

4
src/modules/conf_profiles/e_int_config_profiles.c
View File

@ -43,7 +43,7 @@ e_int_config_profiles(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_profiles_dialog")) return NULL;
if (e_config_dialog_find("E", "settings/profiles")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
if (!v) return NULL;
v->create_cfdata = _create_data;
@ -53,7 +53,7 @@ e_int_config_profiles(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Profile Selector"),
"E", "_config_profiles_dialog",
"E", "settings/profiles",
"preferences-profiles", 0, v, NULL);
e_config_dialog_changed_auto_set(cfd, 0);
return cfd;

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

@ -32,7 +32,7 @@ e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_profiles_dialog")))
while ((cfd = e_config_dialog_get("E", "settings/profiles")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("settings/profiles");
e_configure_registry_category_del("settings");

4
src/modules/conf_scale/e_int_config_scale.c
View File

@ -45,7 +45,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_scale_dialog")) return NULL;
if (e_config_dialog_find("E", "appearance/scale")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -59,7 +59,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Scaling Settings"),
"E", "_config_scale_dialog",
"E", "appearance/scale",
"preferences-scale", 0, v, NULL);
return cfd;
}

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

@ -29,7 +29,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_scale_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/scale"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/scale");
e_configure_registry_category_del("appearance");
conf_module = NULL;

4
src/modules/conf_screensaver/e_int_config_screensaver.c
View File

@ -52,7 +52,7 @@ e_int_config_screensaver(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_screensaver_dialog")) return NULL;
if (e_config_dialog_find("E", "screen/screen_saver")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -65,7 +65,7 @@ e_int_config_screensaver(E_Container *con, const char *params __UNUSED__)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con,_("Screen Saver Settings"),
"E", "_config_screensaver_dialog",
"E", "screen/screen_saver",
"preferences-desktop-screensaver", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_screensaver_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/screen_saver"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/screen_saver");
e_configure_registry_category_del("screen");
conf_module = NULL;

4
src/modules/conf_shelves/e_int_config_shelf.c
View File

@ -33,7 +33,7 @@ e_int_config_shelf(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_shelf_dialog")) return NULL;
if (e_config_dialog_find("E", "extensions/shelves")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
if (!v) return NULL;
v->create_cfdata = _create_data;
@ -41,7 +41,7 @@ e_int_config_shelf(E_Container *con, const char *params __UNUSED__)
v->basic.create_widgets = _basic_create;
cfd = e_config_dialog_new(con, _("Shelf Settings"), "E",
"_config_shelf_dialog",
"extensions/shelves",
"preferences-desktop-shelf", 0, v, NULL);
return cfd;
}

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

@ -41,7 +41,7 @@ e_modapi_shutdown(E_Module *m)
e_int_menus_menu_augmentation_del("config/1", maug);
maug = NULL;
}
while ((cfd = e_config_dialog_get("E", "_config_shelf_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "extensions/shelves"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("extensions/shelves");
e_configure_registry_category_del("extensions");
conf_module = NULL;

4
src/modules/conf_startup/e_int_config_startup.c
View File

@ -27,7 +27,7 @@ e_int_config_startup(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_startup_dialog")) return NULL;
if (e_config_dialog_find("E", "appearance/startup")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -37,7 +37,7 @@ e_int_config_startup(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Startup Settings"),
"E", "_config_startup_dialog",
"E", "appearance/startup",
"preferences-startup", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_startup_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/startup"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/startup");
e_configure_registry_category_del("appearance");
conf_module = NULL;

4
src/modules/conf_theme/e_int_config_theme.c
View File

@ -77,7 +77,7 @@ e_int_config_theme(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_theme_dialog")) return NULL;
if (e_config_dialog_find("E", "appearance/theme")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -89,7 +89,7 @@ e_int_config_theme(E_Container *con, const char *params __UNUSED__)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con,
_("Theme Selector"),
"E", "_config_theme_dialog",
"E", "appearance/theme",
"preferences-desktop-theme", 0, v, NULL);
return cfd;
}

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

@ -48,7 +48,7 @@ e_modapi_shutdown(E_Module *m)
maug = NULL;
}
while ((cfd = e_config_dialog_get("E", "_config_theme_dialog")))
while ((cfd = e_config_dialog_get("E", "apppearance/theme")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/theme");

4
src/modules/conf_transitions/e_int_config_transitions.c
View File

@ -32,7 +32,7 @@ e_int_config_transitions(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_transitions_dialog")) return NULL;
if (e_config_dialog_find("E", "appearance/transitions")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
if (!v) return NULL;
@ -42,7 +42,7 @@ e_int_config_transitions(E_Container *con, const char *params __UNUSED__)
v->basic.create_widgets = _basic_create_widgets;
cfd = e_config_dialog_new(con, _("Transition Settings"),
"E", "_config_transitions_dialog",
"E", "appearance/transitions",
"preferences-transitions", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_transitions_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/transitions"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/transitions");
e_configure_registry_category_del("appearance");
conf_module = NULL;

4
src/modules/conf_wallpaper/e_int_config_wallpaper.c
View File

@ -83,7 +83,7 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de
E_Config_Dialog_View *v;
E_Config_Wallpaper *cw;
if (e_config_dialog_find("E", "_config_wallpaper_dialog")) return NULL;
if (e_config_dialog_find("E", "appearance/wallpaper")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
cw = E_NEW(E_Config_Wallpaper, 1);
@ -108,7 +108,7 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de
cw->desk_y = desk_y;
cfd = e_config_dialog_new(con, _("Wallpaper Settings"), "E",
"_config_wallpaper_dialog",
"appearance/wallpaper",
"preferences-desktop-wallpaper", 0, v, cw);
return cfd;
}

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

@ -61,7 +61,7 @@ e_modapi_shutdown(E_Module *m)
e_int_menus_menu_augmentation_del("config/1", maug);
maug = NULL;
}
while ((cfd = e_config_dialog_get("E", "_config_wallpaper_dialog")))
while ((cfd = e_config_dialog_get("E", "appearance/wallpaper")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("internal/wallpaper_desk");
e_configure_registry_category_del("internal");

4
src/modules/conf_window_display/e_int_config_window_display.c
View File

@ -43,7 +43,7 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_window_display_dialog")) return NULL;
if (e_config_dialog_find("E", "windows/window_display")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
/* methods */
@ -57,7 +57,7 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__)
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con,
_("Window Display"),
"E", "_config_window_display_dialog",
"E", "windows/window_display",
"preferences-system-windows", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_window_display_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_display"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("windows/window_display");
e_configure_registry_category_del("windows");
conf_module = NULL;

4
src/modules/conf_window_focus/e_int_config_focus.c
View File

@ -35,7 +35,7 @@ e_int_config_focus(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_focus_dialog")) return NULL;
if (e_config_dialog_find("E", "windows/window_focus")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
/* methods */
@ -49,7 +49,7 @@ e_int_config_focus(E_Container *con, const char *params __UNUSED__)
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con,
_("Focus Settings"),
"E", "_config_focus_dialog",
"E", "windows/window_focus",
"preferences-focus", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_focus_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_focus"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("windows/window_focus");
e_configure_registry_category_del("windows");
conf_module = NULL;

4
src/modules/conf_window_manipulation/e_int_config_window_geometry.c
View File

@ -41,7 +41,7 @@ e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_window_geometry_dialog")) return NULL;
if (e_config_dialog_find("E", "windows/window_geometry")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
/* methods */
@ -53,7 +53,7 @@ e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__)
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con,
_("Window Geometry"),
"E", "_config_window_geometry_dialog",
"E", "windows/window_geometry",
"preferences-window-manipulation", 0, v, NULL);
return cfd;
}

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

@ -30,7 +30,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_window_geometry_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_geometry"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "_config_window_stacking_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "_config_window_maxpolicy_dialog"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("windows/window_geometry");

4
src/modules/conf_window_remembers/e_int_config_remembers.c
View File

@ -22,7 +22,7 @@ e_int_config_remembers(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_remember_dialog")) return NULL;
if (e_config_dialog_find("E", "windows/window_remembers")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -31,7 +31,7 @@ e_int_config_remembers(E_Container *con, const char *params __UNUSED__)
v->basic.create_widgets = _basic_create;
cfd = e_config_dialog_new(con, _("Window Remembers"), "E",
"_config_remember_dialog",
"windows/window_remembers",
"preferences-desktop-window-remember", 0, v, NULL);
e_dialog_resizable_set(cfd->dia, 1);
return cfd;

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

@ -27,7 +27,7 @@ e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_remember_dialog")))
while ((cfd = e_config_dialog_get("E", "windows/window_remembers")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("windows/window_remembers");
e_configure_registry_category_del("windows");

4
src/modules/conf_winlist/e_int_config_winlist.c
View File

@ -48,7 +48,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_winlist_dialog")) return NULL;
if (e_config_dialog_find("E", "advanced/window_list")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -60,7 +60,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Window List Settings"),
"E", "_config_winlist_dialog",
"E", "advanced/window_list",
"preferences-winlist", 0, v, NULL);
return cfd;
}

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

@ -28,7 +28,7 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "_config_winlist_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "advanced/window_list"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("advanced/window_list");
e_configure_registry_category_del("advanced");
conf_module = NULL;

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

@ -27,7 +27,7 @@ e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__)
Dropshadow *ds;
ds = dropshadow_mod->data;
if (e_config_dialog_find("E", "_config_dropshadow")) return NULL;
if (e_config_dialog_find("E", "appearance/dropshadow")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@ -38,7 +38,7 @@ e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__)
snprintf(buf, sizeof(buf), "%s/e-module-dropshadow.edj", e_module_dir_get(ds->module));
cfd = e_config_dialog_new(con,
_("Dropshadow Settings"),
"E", "_config_dropshadow",
"E", "appearance/dropshadow",
buf, 0, v, ds);
ds->config_dialog = cfd;
return cfd;

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

@ -85,7 +85,7 @@ e_int_config_fileman(E_Container *con, const char *params __UNUSED__)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_fileman")) return NULL;
if (e_config_dialog_find("E", "fileman/fileman")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
@ -94,7 +94,7 @@ e_int_config_fileman(E_Container *con, const char *params __UNUSED__)
v->basic.check_changed = _basic_check_changed;
cfd = e_config_dialog_new(con, _("Fileman Settings"), "E",
"_config_fileman",
"fileman/fileman",
"system-file-manager", 0, v, NULL);
return cfd;
}

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

@ -42,7 +42,7 @@ _config_gadman_module(E_Container *con, const char *params __UNUSED__)
char buf[4096];
/* check if config dialog exists ... */
if (e_config_dialog_find("E", "_config_gadman"))
if (e_config_dialog_find("E", "extensions/gadman"))
return NULL;
/* ... else create it */
@ -56,7 +56,7 @@ _config_gadman_module(E_Container *con, const char *params __UNUSED__)
snprintf(buf, sizeof(buf), "%s/e-module-gadman.edj", Man->module->dir);
cfd = e_config_dialog_new(con, _("Gadgets Manager"),
"E", "_config_gadman",
"E", "extensions/gadman",
buf, 0, v, Man);
Man->config_dialog = cfd;