aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-13 13:28:56 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-13 13:28:56 +0000
commit839a2f3f15eee2ca8d897f7d21daa182b2a5302a (patch)
tree7ca62760b64a0534b745701e6e3450d78c2e4674
parent964a0e3a7fdb1171752cbb1f56b7dafe96235340 (diff)
downloadenlightenment-839a2f3f15eee2ca8d897f7d21daa182b2a5302a.tar.gz
enlightenment-839a2f3f15eee2ca8d897f7d21daa182b2a5302a.tar.xz
enlightenment-839a2f3f15eee2ca8d897f7d21daa182b2a5302a.zip
move all conf2 options for opening config dialogs into the owner module
SVN revision: 82727
-rw-r--r--src/bin/e_configure_option.c103
-rw-r--r--src/modules/conf_applications/e_mod_main.c36
-rw-r--r--src/modules/conf_dialogs/e_mod_main.c11
-rw-r--r--src/modules/conf_edgebindings/e_mod_main.c16
-rw-r--r--src/modules/conf_intl/e_mod_main.c20
-rw-r--r--src/modules/conf_keybindings/e_mod_main.c20
-rw-r--r--src/modules/conf_paths/e_mod_main.c16
-rw-r--r--src/modules/conf_randr/e_mod_main.c13
-rw-r--r--src/modules/conf_shelves/e_mod_main.c14
-rw-r--r--src/modules/conf_theme/e_mod_main.c24
-rw-r--r--src/modules/conf_window_remembers/e_mod_main.c13
-rw-r--r--src/modules/notification/e_mod_main.c2
-rw-r--r--src/modules/xkbswitch/e_mod_main.c14
13 files changed, 214 insertions, 88 deletions
diff --git a/src/bin/e_configure_option.c b/src/bin/e_configure_option.c
index 4b345332d..9fef1957a 100644
--- a/src/bin/e_configure_option.c
+++ b/src/bin/e_configure_option.c
@@ -1471,19 +1471,10 @@ e_configure_option_init(void)
co->thumb_cb = _e_configure_transition_thumb_cb;
OPT_ICON("preferences-transitions");
- OPT_ADD(CUSTOM, themes, _("Enlightenment theme settings"), _("theme"));
- co->info = eina_stringshare_add("appearance/theme");
- OPT_ICON("preferences-desktop-theme");
- OPT_ADD(CUSTOM, desktop_backgrounds, _("Desktop wallpaper settings"), _("wallpaper"));
- co->info = eina_stringshare_add("appearance/wallpaper");
- OPT_ICON("preferences-desktop-wallpaper");
OPT_ADD(STR, desktop_default_background, _("Default desktop wallpaper"), _("wallpaper"));
co->info_cb = _e_configure_background_info_cb;
co->funcs[0].none = co->funcs[1].none = e_bg_update;
OPT_ICON("preferences-desktop-wallpaper");
- OPT_ADD(CUSTOM, color_classes, _("Enlightenment color settings"), _("theme"), _("color"));
- co->info = eina_stringshare_add("appearance/colors");
- OPT_ICON("preferences-desktop-color");
OPT_ADD(STR, desktop_default_name, _("Default desktop name"), _("desktop"), _("name"));
OPT_HELP(_("Used in Pager displays"));
OPT_ICON("preferences-desktop");
@@ -1536,17 +1527,6 @@ e_configure_option_init(void)
OPT_MINMAX_STEP_FMT(8, 4096, 8, "%1.0f ticks");
co->funcs[0].none = _e_configure_framerate_changed;
- OPT_ADD(CUSTOM, path_append_data, _("Search directory settings"), _("environment"));
- co->info = eina_stringshare_add("advanced/search_directories");
- OPT_ICON("preferences-directories");
- OPT_ADD(CUSTOM, path_append_data, _("Environment variable settings"), _("environment"));
- co->info = eina_stringshare_add("advanced/environment_variables");
- OPT_ICON("preferences-variables");
-
- OPT_ADD(CUSTOM, randr_serialized_setup, _("Screen resolution and orientation settings"), _("screen"), _("size"));
- co->info = eina_stringshare_add("screen/screen_setup");
- OPT_ICON("preferences-system-screen-resolution");
-
OPT_ADD(DOUBLE_INT, zone_desks_x_count, _("Horizontal virtual desktop count"), _("vdesk"), _("desktop"), _("screen"));
co->funcs[0].none = _e_configure_zone_desks_count_changed;
OPT_ADD(DOUBLE_INT, zone_desks_y_count, _("Vertical virtual desktop count"), _("vdesk"), _("desktop"), _("screen"));
@@ -1563,14 +1543,14 @@ e_configure_option_init(void)
"instead of loading them incrementally"));
/* FIXME */
- OPT_ADD(CUSTOM, language, _("Language"), _("language"));
- co->info = eina_stringshare_add("language/language_settings");
- OPT_ICON("preferences-desktop-locale");
+ //OPT_ADD(CUSTOM, language, _("Language"), _("language"));
+ //co->info = eina_stringshare_add("language/language_settings");
+ //OPT_ICON("preferences-desktop-locale");
//co->requires_restart = 1;
//co->funcs[0].one = e_intl_language_set;
- OPT_ADD(CUSTOM, desklock_language, _("Desklock language"), _("desklock"), _("language"));
- co->info = eina_stringshare_add("language/desklock_language_settings");
- OPT_ICON("preferences-desklock-locale");
+ //OPT_ADD(CUSTOM, desklock_language, _("Desklock language"), _("desklock"), _("language"));
+ //co->info = eina_stringshare_add("language/desklock_language_settings");
+ //OPT_ICON("preferences-desklock-locale");
OPT_ADD(ENUM, window_placement_policy, _("Window placement policy"), _("border"), _("placement")); //enum
co->info_cb = _e_configure_window_placement_policy_info_cb;
@@ -1603,9 +1583,6 @@ e_configure_option_init(void)
OPT_ADD(DOUBLE_INT, drag_resist, _("Shelf gadget resistance"), _("gadget"), _("resist"), _("drag"), _("shelf"));
OPT_MINMAX_STEP_FMT(0, 100, 2, "%2.0f pixels");
- OPT_ADD(CUSTOM, shelves, _("Shelf settings"), _("shelf"), _("desktop"));
- co->info = eina_stringshare_add("extensions/shelves");
- OPT_ICON("preferences-desktop-shelf");
OPT_ADD(BOOL, use_resist, _("Enable resistance when dragging windows"), _("border"), _("resist"), _("drag"));
OPT_ADD(DOUBLE_INT, desk_resist, _("Window resistance against screen edges"), _("border"), _("resist"), _("vdesk"), _("screen"), _("drag"));
@@ -1676,9 +1653,9 @@ e_configure_option_init(void)
OPT_MINMAX_STEP_FMT(1, 256, 1, "%1.0f seconds");
/* FIXME */
- OPT_ADD(CUSTOM, remembers, _("Window remember settings"), _("border"), _("remember"));
- co->info = eina_stringshare_add("windows/window_remembers");
- OPT_ICON("preferences-desktop-window-remember");
+ //OPT_ADD(CUSTOM, remembers, _("Window remember settings"), _("border"), _("remember"));
+ //co->info = eina_stringshare_add("windows/window_remembers");
+ //OPT_ICON("preferences-desktop-window-remember");
OPT_ADD(BOOL, remember_internal_windows, _("Remember internal window geometry"), _("border"), _("remember"));
OPT_HELP(_("This option causes E to remember the geometry of its internal dialogs and windows, NOT including filemanager windows"));
OPT_ADD(BOOL, remember_internal_fm_windows, _("Remember internal filemanager window geometry"), _("border"), _("remember"), _("files"));
@@ -1689,29 +1666,10 @@ e_configure_option_init(void)
OPT_ADD(BOOL, move_info_visible, _("Window position info visible when moving"), _("border"), _("placement"), _("move"));
OPT_ADD(BOOL, resize_info_visible, _("Window geometry info visible when moving"), _("border"), _("placement"), _("resize"));
- OPT_ADD(CUSTOM, key_bindings, _("Key bindings"), _("input"), _("key"), _("binding"));
- co->info = eina_stringshare_add("keyboard_and_mouse/key_bindings");
- OPT_ICON("preferences-desktop-keyboard-shortcuts");
- OPT_ADD(CUSTOM, mouse_bindings, _("Mouse bindings"), _("input"), _("mouse"), _("binding"));
- co->info = eina_stringshare_add("keyboard_and_mouse/mouse_bindings");
- OPT_ICON("preferences-desktop-mouse");
- OPT_ADD(CUSTOM, acpi_bindings, _("ACPI bindings"), _("input"), _("acpi"), _("binding"));
- co->info = eina_stringshare_add("keyboard_and_mouse/acpi_bindings");
- OPT_ICON("preferences-system-power-management");
- OPT_ADD(CUSTOM, edge_bindings, _("Screen edge bindings"), _("input"), _("edge"), _("screen"), _("binding"));
- co->info = eina_stringshare_add("keyboard_and_mouse/edge_bindings");
- OPT_ICON("preferences-desktop-edge-bindings");
- OPT_ADD(CUSTOM, signal_bindings, _("Edje signal bindings"), _("input"), _("edje"), _("mouse"), _("binding"));
- co->info = eina_stringshare_add("advanced/signal_bindings");
- OPT_ICON("preferences-desktop-signal-bindings");
- OPT_ADD(CUSTOM, xkb.used_layouts, _("Keyboard layout settings"), _("input"), _("key"), _("language"));
- co->info = eina_stringshare_add("keyboard_and_mouse/xkbswitch");
- OPT_ICON("preferences-desktop-keyboard");
-
/* FIXME */
- OPT_ADD(CUSTOM, input_method, _("Input method"), _("input"), _("language"));
- co->info = eina_stringshare_add("language/input_method_settings");
- OPT_ICON("preferences-imc");
+ //OPT_ADD(CUSTOM, input_method, _("Input method"), _("input"), _("language"));
+ //co->info = eina_stringshare_add("language/input_method_settings");
+ //OPT_ICON("preferences-imc");
//co->funcs[0].one = e_intl_input_method_set;
OPT_ADD(BOOL, transient.move, _("Transient windows follow movement of their child"), _("border"), _("transient"), _("move"), _("placement"));
@@ -1730,33 +1688,6 @@ e_configure_option_init(void)
OPT_ADD(BOOL, menu_eap_comment_show, _("Application menus shows Comment field"), _("menu"));
OPT_HELP(_("This information is taken from the related .desktop file"));
- OPT_ADD(CUSTOM, path_append_data, _("Create a new application launcher"), _("application"), _("exec"));
- co->info = eina_stringshare_add("applications/new_application");
- OPT_ICON("preferences-applications-add");
- OPT_ADD(CUSTOM, path_append_data, _("Application launchers"), _("application"), _("exec"));
- co->info = eina_stringshare_add("applications/personal_applications");
- OPT_ICON("preferences-applications-personal");
- OPT_ADD(CUSTOM, path_append_data, _("Favorite applications"), _("application"), _("exec"));
- co->info = eina_stringshare_add("applications/favorite_applications");
- OPT_ICON("user-bookmarks");
- OPT_ADD(CUSTOM, path_append_data, _("Ibar applications"), _("application"), _("exec"));
- co->info = eina_stringshare_add("applications/ibar_applications");
- OPT_ICON("preferences-applications-ibar");
- OPT_ADD(CUSTOM, path_append_data, _("Desk lock applications"), _("application"), _("exec"), _("desklock"));
- co->info = eina_stringshare_add("applications/screen_lock_applications");
- OPT_ICON("preferences-applications-screen-lock");
- OPT_ADD(CUSTOM, path_append_data, _("Desk unlock applications"), _("application"), _("exec"), _("desklock"));
- co->info = eina_stringshare_add("applications/screen_unlock_applications");
- OPT_ICON("preferences-applications-screen-unlock");
- OPT_ADD(CUSTOM, path_append_data, _("Enlightenment restart applications"), _("application"), _("exec"));
- co->info = eina_stringshare_add("applications/restart_applications");
- OPT_ICON("preferences-applications-restart");
- OPT_ADD(CUSTOM, path_append_data, _("Enlightenment start applications"), _("application"), _("exec"), _("startup"));
- co->info = eina_stringshare_add("applications/startup_applications");
- OPT_ICON("preferences-applications-startup");
- OPT_ADD(CUSTOM, path_append_data, _("Enlightenment default applications"), _("application"), _("exec"));
- co->info = eina_stringshare_add("applications/default_applications");
- OPT_ICON("preferences-desktop-default-applications");
OPT_ADD(BOOL, menu_favorites_show, _("Show Favorite Applications in the main menu"), _("menu"), _("application"));
OPT_ADD(BOOL, menu_apps_show, _("Show Applications in the main menu"), _("menu"), _("application"));
@@ -1769,9 +1700,10 @@ e_configure_option_init(void)
OPT_ADD(BOOL, use_app_icon, _("Window borders use application icon"), _("border"), _("image"));
OPT_HELP(_("Applications provide their own icons. If this option is not set, E will use internal theme icons instead of the application-provided icon"));
- OPT_ADD(CUSTOM, path_append_data, _("Enlightenment profile settings"), _("profile"));
- co->info = eina_stringshare_add("settings/profiles");
- OPT_ICON("preferences-profiles");
+ /* FIXME */
+ //OPT_ADD(CUSTOM, path_append_data, _("Enlightenment profile settings"), _("profile"));
+ //co->info = eina_stringshare_add("settings/profiles");
+ //OPT_ICON("preferences-profiles");
OPT_ADD(BOOL, cnfmdlg_disabled, _("Disable confirmation dialogs"), _("confirm"), _("dialog"));
OPT_HELP(_("This option suppresses all confirmation dialogs and assumes that the user has clicked the confirm option"));
@@ -1782,9 +1714,6 @@ e_configure_option_init(void)
OPT_ADD(BOOL, cfgdlg_normal_wins, _("Configuration dialog windows are normal windows"), _("dialog"), _("border"));
OPT_HELP(_("This option causes configuration dialogs to be normal windows instead of dialog windows"));
- OPT_ADD(CUSTOM, font_defaults, _("Enlightenment font settings"), _("font"));
- co->info = eina_stringshare_add("appearance/fonts");
- OPT_ICON("preferences-desktop-font");
OPT_ADD(ENUM, font_hinting, _("Set font hinting mode"), _("font"), _("hinting")); //enum
co->info_cb = _e_configure_font_hinting_info_cb;
OPT_ICON("preferences-desktop-font");
diff --git a/src/modules/conf_applications/e_mod_main.c b/src/modules/conf_applications/e_mod_main.c
index ee4b1ac16..cd1aa9104 100644
--- a/src/modules/conf_applications/e_mod_main.c
+++ b/src/modules/conf_applications/e_mod_main.c
@@ -63,6 +63,40 @@ e_modapi_init(E_Module *m)
NULL, "preferences-system-windows",
e_int_config_apps_ibar_other);
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("conf_applications");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("new app launcher"), _("Create a new application launcher"), _("application"), _("exec"));
+ co->info = eina_stringshare_add("applications/new_application");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-applications-add");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("apps"), _("Application launchers"), _("application"), _("exec"));
+ co->info = eina_stringshare_add("applications/personal_applications");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-applications-personal");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("favorite apps"), _("Favorite applications"), _("application"), _("exec"));
+ co->info = eina_stringshare_add("applications/favorite_applications");
+ E_CONFIGURE_OPTION_ICON(co, "user-bookmarks");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("ibar apps"), _("Ibar applications"), _("application"), _("exec"));
+ co->info = eina_stringshare_add("applications/ibar_applications");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-applications-ibar");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("desklock apps"), _("Desk lock applications"), _("application"), _("exec"), _("desklock"));
+ co->info = eina_stringshare_add("applications/screen_lock_applications");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-applications-screen-lock");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("deskunlock apps"), _("Desk unlock applications"), _("application"), _("exec"), _("desklock"));
+ co->info = eina_stringshare_add("applications/screen_unlock_applications");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-applications-screen-unlock");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("restart apps"), _("Enlightenment restart applications"), _("application"), _("exec"));
+ co->info = eina_stringshare_add("applications/restart_applications");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-applications-restart");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("startup apps"), _("Enlightenment start applications"), _("application"), _("exec"), _("startup"));
+ co->info = eina_stringshare_add("applications/startup_applications");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-applications-startup");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("default apps"), _("Enlightenment default applications"), _("application"), _("exec"));
+ co->info = eina_stringshare_add("applications/default_applications");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-default-applications");
+ }
+
conf_module = m;
e_module_delayed_set(m, 1);
return m;
@@ -86,6 +120,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_configure_registry_item_del("applications/default_applications");
e_configure_registry_item_del("applications/desktop_environments");
e_configure_registry_category_del("applications");
+
+ e_configure_option_domain_clear("conf_applications");
conf_module = NULL;
return 1;
}
diff --git a/src/modules/conf_dialogs/e_mod_main.c b/src/modules/conf_dialogs/e_mod_main.c
index 62d847963..7d4227a74 100644
--- a/src/modules/conf_dialogs/e_mod_main.c
+++ b/src/modules/conf_dialogs/e_mod_main.c
@@ -19,6 +19,17 @@ e_modapi_init(E_Module *m)
e_configure_registry_item_add("settings/profiles", 50, _("Profiles"), NULL, "preferences-profiles", e_int_config_profiles);
conf_module = m;
e_module_delayed_set(m, 1);
+
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("conf_dialogs");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("profiles"), _("Enlightenment profile settings"), _("profile"));
+ co->info = eina_stringshare_add("settings/profiles");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-profiles");
+ }
+
return m;
}
diff --git a/src/modules/conf_edgebindings/e_mod_main.c b/src/modules/conf_edgebindings/e_mod_main.c
index 18c294006..85e6bd926 100644
--- a/src/modules/conf_edgebindings/e_mod_main.c
+++ b/src/modules/conf_edgebindings/e_mod_main.c
@@ -27,6 +27,20 @@ e_modapi_init(E_Module *m)
e_int_config_signalbindings);
conf_module = m;
e_module_delayed_set(m, 1);
+
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("conf_edgebindings");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("edge bindings"), _("Screen edge binding settings"), _("input"), _("edge"), _("screen"), _("binding"));
+ co->info = eina_stringshare_add("keyboard_and_mouse/edge_bindings");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-edge-bindings");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("signal bindings"), _("Edje signal binding settings"), _("input"), _("edje"), _("mouse"), _("binding"));
+ co->info = eina_stringshare_add("advanced/signal_bindings");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-signal-bindings");
+ }
+
return m;
}
@@ -43,6 +57,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_configure_registry_item_del("advanced/signal_bindings");
e_configure_registry_category_del("keyboard_and_mouse");
e_configure_registry_category_del("advanced");
+
+ e_configure_option_domain_clear("conf_edgebindings");
conf_module = NULL;
return 1;
}
diff --git a/src/modules/conf_intl/e_mod_main.c b/src/modules/conf_intl/e_mod_main.c
index 5c5ff82b8..b6b759b67 100644
--- a/src/modules/conf_intl/e_mod_main.c
+++ b/src/modules/conf_intl/e_mod_main.c
@@ -29,6 +29,24 @@ e_modapi_init(E_Module *m)
"preferences-imc", e_int_config_imc);
conf_module = m;
e_module_delayed_set(m, 1);
+
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("conf_intl");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("language"), _("Language settings"), _("language"));
+ co->info = eina_stringshare_add("language/language_settings");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-locale");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("desklock language"), _("Desklock language settings"), _("desklock"), _("language"));
+ co->info = eina_stringshare_add("language/desklock_language_settings");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desklock-locale");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("input method"), _("Input method settings"), _("input"), _("language"));
+ co->info = eina_stringshare_add("language/input_method_settings");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-imc");
+ }
+
return m;
}
@@ -47,6 +65,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_configure_registry_item_del("language/desklock_language_settings");
e_configure_registry_item_del("language/language_settings");
e_configure_registry_category_del("language");
+
+ e_configure_option_domain_clear("conf_intl");
conf_module = NULL;
return 1;
}
diff --git a/src/modules/conf_keybindings/e_mod_main.c b/src/modules/conf_keybindings/e_mod_main.c
index cd401d045..edd811d7c 100644
--- a/src/modules/conf_keybindings/e_mod_main.c
+++ b/src/modules/conf_keybindings/e_mod_main.c
@@ -31,6 +31,24 @@ e_modapi_init(E_Module *m)
e_int_config_acpibindings);
conf_module = m;
e_module_delayed_set(m, 1);
+
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("conf_keybindings");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("key bindings"), _("Key binding settings"), _("input"), _("key"), _("binding"));
+ co->info = eina_stringshare_add("keyboard_and_mouse/key_bindings");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-keyboard-shortcuts");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("mouse bindings"), _("Mouse binding settings"), _("input"), _("mouse"), _("binding"));
+ co->info = eina_stringshare_add("keyboard_and_mouse/mouse_bindings");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-mouse");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("ACPI bindings"), _("ACPI binding settings"), _("input"), _("acpi"), _("binding"));
+ co->info = eina_stringshare_add("keyboard_and_mouse/acpi_bindings");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-system-power-management");
+ }
+
+
return m;
}
@@ -52,6 +70,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_configure_registry_category_del("keyboard_and_mouse");
+ e_configure_option_domain_clear("conf_keybindings");
+
conf_module = NULL;
return 1;
}
diff --git a/src/modules/conf_paths/e_mod_main.c b/src/modules/conf_paths/e_mod_main.c
index 2beb95ffa..759f4f1d1 100644
--- a/src/modules/conf_paths/e_mod_main.c
+++ b/src/modules/conf_paths/e_mod_main.c
@@ -26,6 +26,20 @@ e_modapi_init(E_Module *m)
e_int_config_env);
conf_module = m;
e_module_delayed_set(m, 1);
+
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("conf_paths");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("search directories"), _("Search directory settings"), _("environment"));
+ co->info = eina_stringshare_add("advanced/search_directories");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-directories");
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("environment variables"), _("Environment variable settings"), _("environment"));
+ co->info = eina_stringshare_add("advanced/environment_variables");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-variables");
+ }
+
return m;
}
@@ -41,6 +55,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_configure_registry_item_del("advanced/environment_variables");
e_configure_registry_item_del("advanced/search_directories");
e_configure_registry_category_del("advanced");
+
+ e_configure_option_domain_clear("conf_paths");
conf_module = NULL;
return 1;
}
diff --git a/src/modules/conf_randr/e_mod_main.c b/src/modules/conf_randr/e_mod_main.c
index 4eb17151a..db628dc2e 100644
--- a/src/modules/conf_randr/e_mod_main.c
+++ b/src/modules/conf_randr/e_mod_main.c
@@ -29,6 +29,17 @@ e_modapi_init(E_Module *m)
/* store the modules working directory for use later */
mod_dir = eina_stringshare_add(m->dir);
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("conf_randr");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("randr"), _("Screen resolution and orientation settings"), _("screen"), _("size"));
+ co->info = eina_stringshare_add("screen/screen_setup");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-system-screen-resolution");
+ }
+
+
/* return the module */
return m;
}
@@ -54,6 +65,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
* NB: If there are other items in 'screen' then this function is a no-op */
e_configure_registry_category_del("screen");
+ e_configure_option_domain_clear("conf_randr");
+
/* return 1 for shutdown success */
return 1;
}
diff --git a/src/modules/conf_shelves/e_mod_main.c b/src/modules/conf_shelves/e_mod_main.c
index ad24bbfc9..c33fe18df 100644
--- a/src/modules/conf_shelves/e_mod_main.c
+++ b/src/modules/conf_shelves/e_mod_main.c
@@ -29,6 +29,17 @@ e_modapi_init(E_Module *m)
conf_module = m;
e_module_delayed_set(m, 1);
+
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("conf_shelves");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("shelves"), _("Shelf settings"), _("shelf"), _("desktop"));
+ co->info = eina_stringshare_add("extensions/shelves");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-shelf");
+ }
+
return m;
}
@@ -47,6 +58,9 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("extensions/shelves");
e_configure_registry_category_del("extensions");
+
+ e_configure_option_domain_clear("conf_shelves");
+
conf_module = NULL;
return 1;
}
diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c
index d066bce9a..79d40ecc9 100644
--- a/src/modules/conf_theme/e_mod_main.c
+++ b/src/modules/conf_theme/e_mod_main.c
@@ -160,6 +160,28 @@ e_modapi_init(E_Module *m)
conf_module = m;
e_module_delayed_set(m, 1);
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("conf_theme");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("themes"), _("Enlightenment theme settings"), _("theme"));
+ co->info = eina_stringshare_add("appearance/theme");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-theme");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("wallpaper"), _("Desktop wallpaper settings"), _("wallpaper"));
+ co->info = eina_stringshare_add("appearance/wallpaper");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-wallpaper");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("colors"), _("Enlightenment color settings"), _("theme"), _("color"));
+ co->info = eina_stringshare_add("appearance/colors");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-color");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("fonts"), _("Enlightenment font settings"), _("font"));
+ co->info = eina_stringshare_add("appearance/fonts");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-font");
+ }
+
return m;
}
@@ -220,6 +242,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_configure_registry_item_del("internal/wallpaper_desk");
e_configure_registry_category_del("internal");
+ e_configure_option_domain_clear("conf_theme");
+
conf_module = NULL;
return 1;
}
diff --git a/src/modules/conf_window_remembers/e_mod_main.c b/src/modules/conf_window_remembers/e_mod_main.c
index c4a8c7403..f6dcba9e1 100644
--- a/src/modules/conf_window_remembers/e_mod_main.c
+++ b/src/modules/conf_window_remembers/e_mod_main.c
@@ -19,6 +19,17 @@ e_modapi_init(E_Module *m)
e_int_config_remembers);
conf_module = m;
e_module_delayed_set(m, 1);
+
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("conf_window_remembers");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("window remembers"), _("Window remember settings"), _("border"), _("remember"));
+ co->info = eina_stringshare_add("windows/window_remembers");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-window-remember");
+ }
+
return m;
}
@@ -31,6 +42,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("windows/window_remembers");
e_configure_registry_category_del("windows");
+
+ e_configure_option_domain_clear("conf_window_remembers");
conf_module = NULL;
return 1;
}
diff --git a/src/modules/notification/e_mod_main.c b/src/modules/notification/e_mod_main.c
index bba546d91..c9a62c741 100644
--- a/src/modules/notification/e_mod_main.c
+++ b/src/modules/notification/e_mod_main.c
@@ -270,7 +270,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_notification_server_unregister();
- e_configure_option_domain_clear("quickaccess");
+ e_configure_option_domain_clear("notification");
e_configure_option_category_tag_del(_("screen"), _("notification"));
e_configure_option_category_tag_del(_("notification"), _("notification"));
_notification_cfg_free(notification_cfg);
diff --git a/src/modules/xkbswitch/e_mod_main.c b/src/modules/xkbswitch/e_mod_main.c
index da52f2380..0798b9d23 100644
--- a/src/modules/xkbswitch/e_mod_main.c
+++ b/src/modules/xkbswitch/e_mod_main.c
@@ -74,6 +74,18 @@ e_modapi_init(E_Module *m)
_("Keyboard"), NULL,
"preferences-desktop-keyboard",
_xkb_cfg_dialog);
+
+ {
+ E_Configure_Option *co;
+
+ e_configure_option_domain_current_set("xkbswitch");
+
+ E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("xkb layouts"), _("Keyboard layout settings"), _("input"), _("key"), _("language"));
+ co->info = eina_stringshare_add("keyboard_and_mouse/xkbswitch");
+ E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-keyboard");
+ }
+
+
_xkb.module = m;
ecore_event_handler_add(ECORE_X_EVENT_XKB_STATE_NOTIFY, _xkb_changed_state, NULL);
/* Gadcon */
@@ -91,6 +103,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_configure_registry_item_del("keyboard_and_mouse/xkbswitch");
e_configure_registry_category_del("keyboard_and_mouse");
+ e_configure_option_domain_clear("xkbswitch");
+
if (_xkb.evh) ecore_event_handler_del(_xkb.evh);
if (_xkb.cfd) e_object_del(E_OBJECT(_xkb.cfd));
_xkb.cfd = NULL;