diff options
Diffstat (limited to '')
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | config/standard/e.src | 8 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | src/bin/e_config.c | 39 | ||||
-rw-r--r-- | src/bin/e_config.h | 2 | ||||
-rw-r--r-- | src/bin/e_module.c | 10 | ||||
-rw-r--r-- | src/bin/e_module.h | 2 | ||||
-rw-r--r-- | src/modules/Makefile.am | 8 | ||||
-rw-r--r-- | src/modules/Makefile_conf_bindings.am | 19 | ||||
-rw-r--r-- | src/modules/Makefile_conf_edgebindings.am | 17 | ||||
-rw-r--r-- | src/modules/Makefile_conf_keybindings.am | 17 | ||||
-rw-r--r-- | src/modules/conf_bindings/e_int_config_acpibindings.c (renamed from src/modules/conf_keybindings/e_int_config_acpibindings.c) | 0 | ||||
-rw-r--r-- | src/modules/conf_bindings/e_int_config_edgebindings.c (renamed from src/modules/conf_edgebindings/e_int_config_edgebindings.c) | 0 | ||||
-rw-r--r-- | src/modules/conf_bindings/e_int_config_keybindings.c (renamed from src/modules/conf_keybindings/e_int_config_keybindings.c) | 0 | ||||
-rw-r--r-- | src/modules/conf_bindings/e_int_config_mousebindings.c (renamed from src/modules/conf_keybindings/e_int_config_mousebindings.c) | 0 | ||||
-rw-r--r-- | src/modules/conf_bindings/e_int_config_signalbindings.c (renamed from src/modules/conf_edgebindings/e_int_config_signalbindings.c) | 0 | ||||
-rw-r--r-- | src/modules/conf_bindings/e_mod_main.c (renamed from src/modules/conf_keybindings/e_mod_main.c) | 29 | ||||
-rw-r--r-- | src/modules/conf_bindings/e_mod_main.h (renamed from src/modules/conf_keybindings/e_mod_main.h) | 2 | ||||
-rw-r--r-- | src/modules/conf_bindings/module.desktop.in (renamed from src/modules/conf_keybindings/module.desktop.in) | 0 | ||||
-rw-r--r-- | src/modules/conf_edgebindings/e-module-conf_edgebindings.edj | bin | 14887 -> 0 bytes | |||
-rw-r--r-- | src/modules/conf_edgebindings/e_mod_main.c | 71 | ||||
-rw-r--r-- | src/modules/conf_edgebindings/e_mod_main.h | 20 | ||||
-rw-r--r-- | src/modules/conf_edgebindings/module.desktop.in | 24 |
24 files changed, 96 insertions, 180 deletions
@@ -3,6 +3,7 @@ | |||
3 | * improve load time of apps dialogs | 3 | * improve load time of apps dialogs |
4 | * fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf | 4 | * fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf |
5 | * edge bindings can now be set to "drag only" | 5 | * edge bindings can now be set to "drag only" |
6 | * merged all binding config dialogs into conf_bindings module | ||
6 | 7 | ||
7 | 2013-02-04 Mike Blumenkrantz | 8 | 2013-02-04 Mike Blumenkrantz |
8 | 9 | ||
@@ -35,6 +35,7 @@ Additions: | |||
35 | Changes: | 35 | Changes: |
36 | Modules: | 36 | Modules: |
37 | * modules no longer require shutdown or save functions | 37 | * modules no longer require shutdown or save functions |
38 | * merged all binding config dialogs into conf_bindings module | ||
38 | 39 | ||
39 | API: | 40 | API: |
40 | * e_menu_category_callback create callback parameter order has been changed | 41 | * e_menu_category_callback create callback parameter order has been changed |
diff --git a/config/standard/e.src b/config/standard/e.src index 8a178982d..6070023b2 100644 --- a/config/standard/e.src +++ b/config/standard/e.src | |||
@@ -846,12 +846,6 @@ group "E_Config" struct { | |||
846 | value "priority" int: 0; | 846 | value "priority" int: 0; |
847 | } | 847 | } |
848 | group "E_Config_Module" struct { | 848 | group "E_Config_Module" struct { |
849 | value "name" string: "conf_edgebindings"; | ||
850 | value "enabled" uchar: 1; | ||
851 | value "delayed" uchar: 1; | ||
852 | value "priority" int: 0; | ||
853 | } | ||
854 | group "E_Config_Module" struct { | ||
855 | value "name" string: "conf_paths"; | 849 | value "name" string: "conf_paths"; |
856 | value "enabled" uchar: 1; | 850 | value "enabled" uchar: 1; |
857 | value "delayed" uchar: 1; | 851 | value "delayed" uchar: 1; |
@@ -864,7 +858,7 @@ group "E_Config" struct { | |||
864 | value "priority" int: 0; | 858 | value "priority" int: 0; |
865 | } | 859 | } |
866 | group "E_Config_Module" struct { | 860 | group "E_Config_Module" struct { |
867 | value "name" string: "conf_keybindings"; | 861 | value "name" string: "conf_bindings"; |
868 | value "enabled" uchar: 1; | 862 | value "enabled" uchar: 1; |
869 | value "delayed" uchar: 1; | 863 | value "delayed" uchar: 1; |
870 | value "priority" int: 0; | 864 | value "priority" int: 0; |
diff --git a/configure.ac b/configure.ac index b4ec3113e..958e08dcf 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -850,8 +850,7 @@ AC_E_OPTIONAL_MODULE([msgbus], true) | |||
850 | AC_E_OPTIONAL_MODULE([conf_applications], true) | 850 | AC_E_OPTIONAL_MODULE([conf_applications], true) |
851 | AC_E_OPTIONAL_MODULE([conf_display], true) | 851 | AC_E_OPTIONAL_MODULE([conf_display], true) |
852 | AC_E_OPTIONAL_MODULE([conf_shelves], true) | 852 | AC_E_OPTIONAL_MODULE([conf_shelves], true) |
853 | AC_E_OPTIONAL_MODULE([conf_keybindings], true) | 853 | AC_E_OPTIONAL_MODULE([conf_bindings], true) |
854 | AC_E_OPTIONAL_MODULE([conf_edgebindings], true) | ||
855 | AC_E_OPTIONAL_MODULE([conf_window_remembers], true) | 854 | AC_E_OPTIONAL_MODULE([conf_window_remembers], true) |
856 | AC_E_OPTIONAL_MODULE([conf_window_manipulation], true) | 855 | AC_E_OPTIONAL_MODULE([conf_window_manipulation], true) |
857 | AC_E_OPTIONAL_MODULE([conf_menus], true) | 856 | AC_E_OPTIONAL_MODULE([conf_menus], true) |
@@ -947,8 +946,7 @@ src/modules/conf_intl/module.desktop | |||
947 | src/modules/conf_applications/module.desktop | 946 | src/modules/conf_applications/module.desktop |
948 | src/modules/conf_display/module.desktop | 947 | src/modules/conf_display/module.desktop |
949 | src/modules/conf_shelves/module.desktop | 948 | src/modules/conf_shelves/module.desktop |
950 | src/modules/conf_keybindings/module.desktop | 949 | src/modules/conf_bindings/module.desktop |
951 | src/modules/conf_edgebindings/module.desktop | ||
952 | src/modules/conf_window_remembers/module.desktop | 950 | src/modules/conf_window_remembers/module.desktop |
953 | src/modules/conf_window_manipulation/module.desktop | 951 | src/modules/conf_window_manipulation/module.desktop |
954 | src/modules/conf_menus/module.desktop | 952 | src/modules/conf_menus/module.desktop |
diff --git a/src/bin/e_config.c b/src/bin/e_config.c index c0d73d14f..ce70e32f6 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c | |||
@@ -1251,6 +1251,45 @@ e_config_load(void) | |||
1251 | e_config->config_type = E_CONFIG_PROFILE_TYPE_TABLET; | 1251 | e_config->config_type = E_CONFIG_PROFILE_TYPE_TABLET; |
1252 | } | 1252 | } |
1253 | } | 1253 | } |
1254 | CONFIG_VERSION_CHECK(10) | ||
1255 | { | ||
1256 | int do_conf = 0; | ||
1257 | Eina_List *l, *ll; | ||
1258 | E_Config_Module *em; | ||
1259 | int enabled = 0, delayed = 0, priority = 0; | ||
1260 | |||
1261 | CONFIG_VERSION_UPDATE_INFO(10); | ||
1262 | EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em) | ||
1263 | { | ||
1264 | Eina_Bool do_free = EINA_FALSE; | ||
1265 | |||
1266 | if (!e_util_strcmp(em->name, "comp")) | ||
1267 | do_free = EINA_TRUE; | ||
1268 | else if ((!e_util_strcmp(em->name, "conf_keybindings")) || (!e_util_strcmp(em->name, "conf_edgebindings"))) | ||
1269 | { | ||
1270 | do_conf += do_free = EINA_TRUE; | ||
1271 | enabled |= em->enabled; | ||
1272 | delayed |= em->delayed; | ||
1273 | priority = MIN(priority, em->priority); | ||
1274 | } | ||
1275 | if (do_free) | ||
1276 | { | ||
1277 | e_config->modules = eina_list_remove_list(e_config->modules, l); | ||
1278 | eina_stringshare_del(em->name); | ||
1279 | free(em); | ||
1280 | } | ||
1281 | if (do_conf == 2) break; | ||
1282 | } | ||
1283 | if (do_conf) | ||
1284 | { | ||
1285 | em = E_NEW(E_Config_Module, 1); | ||
1286 | em->name = eina_stringshare_add("conf_bindings"); | ||
1287 | em->enabled = !!enabled; | ||
1288 | em->delayed = !!delayed; | ||
1289 | em->priority = priority; | ||
1290 | e_config->modules = eina_list_append(e_config->modules, em); | ||
1291 | } | ||
1292 | } | ||
1254 | } | 1293 | } |
1255 | if (!e_config->remember_internal_fm_windows) | 1294 | if (!e_config->remember_internal_fm_windows) |
1256 | e_config->remember_internal_fm_windows = !!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS); | 1295 | e_config->remember_internal_fm_windows = !!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS); |
diff --git a/src/bin/e_config.h b/src/bin/e_config.h index 0b897a5e7..473b85ae7 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h | |||
@@ -48,7 +48,7 @@ typedef enum | |||
48 | /* increment this whenever a new set of config values are added but the users | 48 | /* increment this whenever a new set of config values are added but the users |
49 | * config doesn't need to be wiped - simply new values need to be put in | 49 | * config doesn't need to be wiped - simply new values need to be put in |
50 | */ | 50 | */ |
51 | #define E_CONFIG_FILE_GENERATION 9 | 51 | #define E_CONFIG_FILE_GENERATION 10 |
52 | #define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION) | 52 | #define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION) |
53 | 53 | ||
54 | #define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!! | 54 | #define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!! |
diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 3941dc4c7..2c35748e0 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c | |||
@@ -217,13 +217,6 @@ e_module_all_load(void) | |||
217 | EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em) | 217 | EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em) |
218 | { | 218 | { |
219 | if (!em) continue; | 219 | if (!em) continue; |
220 | if (!e_util_strcasecmp(em->name, "comp")) | ||
221 | { | ||
222 | e_config->modules = eina_list_remove_list(e_config->modules, l); | ||
223 | eina_stringshare_del(em->name); | ||
224 | free(em); | ||
225 | continue; | ||
226 | } | ||
227 | if ((em->delayed) && (em->enabled) & (!e_config->no_module_delay)) | 220 | if ((em->delayed) && (em->enabled) & (!e_config->no_module_delay)) |
228 | { | 221 | { |
229 | if (!_e_module_idler) | 222 | if (!_e_module_idler) |
@@ -847,10 +840,9 @@ _e_module_whitelist_check(void) | |||
847 | "conf_comp", | 840 | "conf_comp", |
848 | "conf_dialogs", | 841 | "conf_dialogs", |
849 | "conf_display", | 842 | "conf_display", |
850 | "conf_edgebindings", | ||
851 | "conf_interaction", | 843 | "conf_interaction", |
852 | "conf_intl", | 844 | "conf_intl", |
853 | "conf_keybindings", | 845 | "conf_bindings", |
854 | "conf_menus", | 846 | "conf_menus", |
855 | "conf_paths", | 847 | "conf_paths", |
856 | "conf_performance", | 848 | "conf_performance", |
diff --git a/src/bin/e_module.h b/src/bin/e_module.h index 2b8f5e2f8..f12fabcae 100644 --- a/src/bin/e_module.h +++ b/src/bin/e_module.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifdef E_TYPEDEFS | 1 | #ifdef E_TYPEDEFS |
2 | 2 | ||
3 | #define E_MODULE_API_VERSION 12 | 3 | #define E_MODULE_API_VERSION 13 |
4 | 4 | ||
5 | typedef struct _E_Module E_Module; | 5 | typedef struct _E_Module E_Module; |
6 | typedef struct _E_Module_Api E_Module_Api; | 6 | typedef struct _E_Module_Api E_Module_Api; |
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index b6bcd99e5..b61bb5a12 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am | |||
@@ -126,12 +126,8 @@ if USE_MODULE_CONF_SHELVES | |||
126 | include Makefile_conf_shelves.am | 126 | include Makefile_conf_shelves.am |
127 | endif | 127 | endif |
128 | 128 | ||
129 | if USE_MODULE_CONF_KEYBINDINGS | 129 | if USE_MODULE_CONF_BINDINGS |
130 | include Makefile_conf_keybindings.am | 130 | include Makefile_conf_bindings.am |
131 | endif | ||
132 | |||
133 | if USE_MODULE_CONF_EDGEBINDINGS | ||
134 | include Makefile_conf_edgebindings.am | ||
135 | endif | 131 | endif |
136 | 132 | ||
137 | if USE_MODULE_CONF_WINDOW_REMEMBERS | 133 | if USE_MODULE_CONF_WINDOW_REMEMBERS |
diff --git a/src/modules/Makefile_conf_bindings.am b/src/modules/Makefile_conf_bindings.am new file mode 100644 index 000000000..78084e40a --- /dev/null +++ b/src/modules/Makefile_conf_bindings.am | |||
@@ -0,0 +1,19 @@ | |||
1 | conf_bindingsdir = $(MDIR)/conf_bindings | ||
2 | conf_bindings_DATA = conf_bindings/module.desktop | ||
3 | |||
4 | EXTRA_DIST += $(conf_bindings_DATA) | ||
5 | |||
6 | conf_bindingspkgdir = $(MDIR)/conf_bindings/$(MODULE_ARCH) | ||
7 | conf_bindingspkg_LTLIBRARIES = conf_bindings/module.la | ||
8 | |||
9 | conf_bindings_module_la_SOURCES = conf_bindings/e_mod_main.c \ | ||
10 | conf_bindings/e_mod_main.h \ | ||
11 | conf_bindings/e_int_config_keybindings.c \ | ||
12 | conf_bindings/e_int_config_mousebindings.c \ | ||
13 | conf_bindings/e_int_config_edgebindings.c \ | ||
14 | conf_bindings/e_int_config_signalbindings.c \ | ||
15 | conf_bindings/e_int_config_acpibindings.c | ||
16 | |||
17 | .PHONY: conf_bindings install-conf_bindings | ||
18 | conf_bindings: $(conf_bindingspkg_LTLIBRARIES) $(conf_bindings_DATA) | ||
19 | install-conf_bindings: install-conf_bindingsDATA install-conf_bindingspkgLTLIBRARIES | ||
diff --git a/src/modules/Makefile_conf_edgebindings.am b/src/modules/Makefile_conf_edgebindings.am deleted file mode 100644 index 628acd4de..000000000 --- a/src/modules/Makefile_conf_edgebindings.am +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | conf_edgebindingsdir = $(MDIR)/conf_edgebindings | ||
2 | conf_edgebindings_DATA = conf_edgebindings/e-module-conf_edgebindings.edj \ | ||
3 | conf_edgebindings/module.desktop | ||
4 | |||
5 | EXTRA_DIST += $(conf_edgebindings_DATA) | ||
6 | |||
7 | conf_edgebindingspkgdir = $(MDIR)/conf_edgebindings/$(MODULE_ARCH) | ||
8 | conf_edgebindingspkg_LTLIBRARIES = conf_edgebindings/module.la | ||
9 | |||
10 | conf_edgebindings_module_la_SOURCES = conf_edgebindings/e_mod_main.c \ | ||
11 | conf_edgebindings/e_mod_main.h \ | ||
12 | conf_edgebindings/e_int_config_edgebindings.c \ | ||
13 | conf_edgebindings/e_int_config_signalbindings.c | ||
14 | |||
15 | .PHONY: conf_edgebindings install-conf_edgebindings | ||
16 | conf_edgebindings: $(conf_edgebindingspkg_LTLIBRARIES) $(conf_edgebindings_DATA) | ||
17 | install-conf_edgebindings: install-conf_edgebindingsDATA install-conf_edgebindingspkgLTLIBRARIES | ||
diff --git a/src/modules/Makefile_conf_keybindings.am b/src/modules/Makefile_conf_keybindings.am deleted file mode 100644 index 473ec0b65..000000000 --- a/src/modules/Makefile_conf_keybindings.am +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | conf_keybindingsdir = $(MDIR)/conf_keybindings | ||
2 | conf_keybindings_DATA = conf_keybindings/module.desktop | ||
3 | |||
4 | EXTRA_DIST += $(conf_keybindings_DATA) | ||
5 | |||
6 | conf_keybindingspkgdir = $(MDIR)/conf_keybindings/$(MODULE_ARCH) | ||
7 | conf_keybindingspkg_LTLIBRARIES = conf_keybindings/module.la | ||
8 | |||
9 | conf_keybindings_module_la_SOURCES = conf_keybindings/e_mod_main.c \ | ||
10 | conf_keybindings/e_mod_main.h \ | ||
11 | conf_keybindings/e_int_config_keybindings.c \ | ||
12 | conf_keybindings/e_int_config_mousebindings.c \ | ||
13 | conf_keybindings/e_int_config_acpibindings.c | ||
14 | |||
15 | .PHONY: conf_keybindings install-conf_keybindings | ||
16 | conf_keybindings: $(conf_keybindingspkg_LTLIBRARIES) $(conf_keybindings_DATA) | ||
17 | install-conf_keybindings: install-conf_keybindingsDATA install-conf_keybindingspkgLTLIBRARIES | ||
diff --git a/src/modules/conf_keybindings/e_int_config_acpibindings.c b/src/modules/conf_bindings/e_int_config_acpibindings.c index 416c518cf..416c518cf 100644 --- a/src/modules/conf_keybindings/e_int_config_acpibindings.c +++ b/src/modules/conf_bindings/e_int_config_acpibindings.c | |||
diff --git a/src/modules/conf_edgebindings/e_int_config_edgebindings.c b/src/modules/conf_bindings/e_int_config_edgebindings.c index 97f9af7e9..97f9af7e9 100644 --- a/src/modules/conf_edgebindings/e_int_config_edgebindings.c +++ b/src/modules/conf_bindings/e_int_config_edgebindings.c | |||
diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_bindings/e_int_config_keybindings.c index 431345f07..431345f07 100644 --- a/src/modules/conf_keybindings/e_int_config_keybindings.c +++ b/src/modules/conf_bindings/e_int_config_keybindings.c | |||
diff --git a/src/modules/conf_keybindings/e_int_config_mousebindings.c b/src/modules/conf_bindings/e_int_config_mousebindings.c index c2e818ba3..c2e818ba3 100644 --- a/src/modules/conf_keybindings/e_int_config_mousebindings.c +++ b/src/modules/conf_bindings/e_int_config_mousebindings.c | |||
diff --git a/src/modules/conf_edgebindings/e_int_config_signalbindings.c b/src/modules/conf_bindings/e_int_config_signalbindings.c index f57faca52..f57faca52 100644 --- a/src/modules/conf_edgebindings/e_int_config_signalbindings.c +++ b/src/modules/conf_bindings/e_int_config_signalbindings.c | |||
diff --git a/src/modules/conf_keybindings/e_mod_main.c b/src/modules/conf_bindings/e_mod_main.c index edd811d7c..e400c4a0a 100644 --- a/src/modules/conf_keybindings/e_mod_main.c +++ b/src/modules/conf_bindings/e_mod_main.c | |||
@@ -29,13 +29,23 @@ e_modapi_init(E_Module *m) | |||
29 | _("ACPI Bindings"), NULL, | 29 | _("ACPI Bindings"), NULL, |
30 | "preferences-system-power-management", | 30 | "preferences-system-power-management", |
31 | e_int_config_acpibindings); | 31 | e_int_config_acpibindings); |
32 | e_configure_registry_item_add("keyboard_and_mouse/edge_bindings", 10, | ||
33 | _("Edge Bindings"), NULL, | ||
34 | "preferences-desktop-edge-bindings", | ||
35 | e_int_config_edgebindings); | ||
36 | |||
37 | e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced"); | ||
38 | e_configure_registry_item_add("advanced/signal_bindings", 10, | ||
39 | _("Signal Bindings"), NULL, | ||
40 | "preferences-desktop-signal-bindings", | ||
41 | e_int_config_signalbindings); | ||
32 | conf_module = m; | 42 | conf_module = m; |
33 | e_module_delayed_set(m, 1); | 43 | e_module_delayed_set(m, 1); |
34 | 44 | ||
35 | { | 45 | { |
36 | E_Configure_Option *co; | 46 | E_Configure_Option *co; |
37 | 47 | ||
38 | e_configure_option_domain_current_set("conf_keybindings"); | 48 | e_configure_option_domain_current_set("conf_bindings"); |
39 | 49 | ||
40 | E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("key bindings"), _("Key binding settings"), _("input"), _("key"), _("binding")); | 50 | E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("key bindings"), _("Key binding settings"), _("input"), _("key"), _("binding")); |
41 | co->info = eina_stringshare_add("keyboard_and_mouse/key_bindings"); | 51 | co->info = eina_stringshare_add("keyboard_and_mouse/key_bindings"); |
@@ -46,6 +56,13 @@ e_modapi_init(E_Module *m) | |||
46 | E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("ACPI bindings"), _("ACPI binding settings"), _("input"), _("acpi"), _("binding")); | 56 | E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("ACPI bindings"), _("ACPI binding settings"), _("input"), _("acpi"), _("binding")); |
47 | co->info = eina_stringshare_add("keyboard_and_mouse/acpi_bindings"); | 57 | co->info = eina_stringshare_add("keyboard_and_mouse/acpi_bindings"); |
48 | E_CONFIGURE_OPTION_ICON(co, "preferences-system-power-management"); | 58 | E_CONFIGURE_OPTION_ICON(co, "preferences-system-power-management"); |
59 | |||
60 | E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("edge bindings"), _("Screen edge binding settings"), _("input"), _("edge"), _("screen"), _("binding")); | ||
61 | co->info = eina_stringshare_add("keyboard_and_mouse/edge_bindings"); | ||
62 | E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-edge-bindings"); | ||
63 | E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("signal bindings"), _("Edje signal binding settings"), _("input"), _("edje"), _("mouse"), _("binding")); | ||
64 | co->info = eina_stringshare_add("advanced/signal_bindings"); | ||
65 | E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-signal-bindings"); | ||
49 | } | 66 | } |
50 | 67 | ||
51 | 68 | ||
@@ -63,14 +80,20 @@ e_modapi_shutdown(E_Module *m __UNUSED__) | |||
63 | e_object_del(E_OBJECT(cfd)); | 80 | e_object_del(E_OBJECT(cfd)); |
64 | while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/key_bindings"))) | 81 | while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/key_bindings"))) |
65 | e_object_del(E_OBJECT(cfd)); | 82 | e_object_del(E_OBJECT(cfd)); |
83 | while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/edge_bindings"))) | ||
84 | e_object_del(E_OBJECT(cfd)); | ||
85 | while ((cfd = e_config_dialog_get("E", "advanced/signal_bindings"))) | ||
86 | e_object_del(E_OBJECT(cfd)); | ||
66 | 87 | ||
67 | e_configure_registry_item_del("keyboard_and_mouse/acpi_bindings"); | 88 | e_configure_registry_item_del("keyboard_and_mouse/acpi_bindings"); |
68 | e_configure_registry_item_del("keyboard_and_mouse/mouse_bindings"); | 89 | e_configure_registry_item_del("keyboard_and_mouse/mouse_bindings"); |
69 | e_configure_registry_item_del("keyboard_and_mouse/key_bindings"); | 90 | e_configure_registry_item_del("keyboard_and_mouse/key_bindings"); |
70 | 91 | e_configure_registry_item_del("keyboard_and_mouse/edge_bindings"); | |
92 | e_configure_registry_item_del("advanced/signal_bindings"); | ||
71 | e_configure_registry_category_del("keyboard_and_mouse"); | 93 | e_configure_registry_category_del("keyboard_and_mouse"); |
94 | e_configure_registry_category_del("advanced"); | ||
72 | 95 | ||
73 | e_configure_option_domain_clear("conf_keybindings"); | 96 | e_configure_option_domain_clear("conf_bindings"); |
74 | 97 | ||
75 | conf_module = NULL; | 98 | conf_module = NULL; |
76 | return 1; | 99 | return 1; |
diff --git a/src/modules/conf_keybindings/e_mod_main.h b/src/modules/conf_bindings/e_mod_main.h index cd9ac918b..e69f88dcd 100644 --- a/src/modules/conf_keybindings/e_mod_main.h +++ b/src/modules/conf_bindings/e_mod_main.h | |||
@@ -4,6 +4,8 @@ | |||
4 | E_Config_Dialog *e_int_config_acpibindings(E_Container *con, const char *params __UNUSED__); | 4 | E_Config_Dialog *e_int_config_acpibindings(E_Container *con, const char *params __UNUSED__); |
5 | E_Config_Dialog *e_int_config_keybindings(E_Container *con, const char *params __UNUSED__); | 5 | E_Config_Dialog *e_int_config_keybindings(E_Container *con, const char *params __UNUSED__); |
6 | E_Config_Dialog *e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__); | 6 | E_Config_Dialog *e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__); |
7 | E_Config_Dialog *e_int_config_edgebindings(E_Container *con, const char *params __UNUSED__); | ||
8 | E_Config_Dialog *e_int_config_signalbindings(E_Container *con, const char *params); | ||
7 | 9 | ||
8 | /** | 10 | /** |
9 | * @addtogroup Optional_Conf | 11 | * @addtogroup Optional_Conf |
diff --git a/src/modules/conf_keybindings/module.desktop.in b/src/modules/conf_bindings/module.desktop.in index a9785c925..a9785c925 100644 --- a/src/modules/conf_keybindings/module.desktop.in +++ b/src/modules/conf_bindings/module.desktop.in | |||
diff --git a/src/modules/conf_edgebindings/e-module-conf_edgebindings.edj b/src/modules/conf_edgebindings/e-module-conf_edgebindings.edj deleted file mode 100644 index 98987dae5..000000000 --- a/src/modules/conf_edgebindings/e-module-conf_edgebindings.edj +++ /dev/null | |||
Binary files differ | |||
diff --git a/src/modules/conf_edgebindings/e_mod_main.c b/src/modules/conf_edgebindings/e_mod_main.c deleted file mode 100644 index 85e6bd926..000000000 --- a/src/modules/conf_edgebindings/e_mod_main.c +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | #include "e.h" | ||
2 | #include "e_mod_main.h" | ||
3 | |||
4 | /* actual module specifics */ | ||
5 | static E_Module *conf_module = NULL; | ||
6 | |||
7 | /* module setup */ | ||
8 | EAPI E_Module_Api e_modapi = | ||
9 | { | ||
10 | E_MODULE_API_VERSION, | ||
11 | "Settings - Edge Bindings" | ||
12 | }; | ||
13 | |||
14 | EAPI void * | ||
15 | e_modapi_init(E_Module *m) | ||
16 | { | ||
17 | e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), | ||
18 | NULL, "preferences-behavior"); | ||
19 | e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced"); | ||
20 | e_configure_registry_item_add("keyboard_and_mouse/edge_bindings", 10, | ||
21 | _("Edge Bindings"), NULL, | ||
22 | "preferences-desktop-edge-bindings", | ||
23 | e_int_config_edgebindings); | ||
24 | e_configure_registry_item_add("advanced/signal_bindings", 10, | ||
25 | _("Signal Bindings"), NULL, | ||
26 | "preferences-desktop-signal-bindings", | ||
27 | e_int_config_signalbindings); | ||
28 | conf_module = m; | ||
29 | e_module_delayed_set(m, 1); | ||
30 | |||
31 | { | ||
32 | E_Configure_Option *co; | ||
33 | |||
34 | e_configure_option_domain_current_set("conf_edgebindings"); | ||
35 | |||
36 | E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("edge bindings"), _("Screen edge binding settings"), _("input"), _("edge"), _("screen"), _("binding")); | ||
37 | co->info = eina_stringshare_add("keyboard_and_mouse/edge_bindings"); | ||
38 | E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-edge-bindings"); | ||
39 | E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("signal bindings"), _("Edje signal binding settings"), _("input"), _("edje"), _("mouse"), _("binding")); | ||
40 | co->info = eina_stringshare_add("advanced/signal_bindings"); | ||
41 | E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-signal-bindings"); | ||
42 | } | ||
43 | |||
44 | return m; | ||
45 | } | ||
46 | |||
47 | EAPI int | ||
48 | e_modapi_shutdown(E_Module *m __UNUSED__) | ||
49 | { | ||
50 | E_Config_Dialog *cfd; | ||
51 | |||
52 | while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/edge_bindings"))) | ||
53 | e_object_del(E_OBJECT(cfd)); | ||
54 | while ((cfd = e_config_dialog_get("E", "advanced/signal_bindings"))) | ||
55 | e_object_del(E_OBJECT(cfd)); | ||
56 | e_configure_registry_item_del("keyboard_and_mouse/edge_bindings"); | ||
57 | e_configure_registry_item_del("advanced/signal_bindings"); | ||
58 | e_configure_registry_category_del("keyboard_and_mouse"); | ||
59 | e_configure_registry_category_del("advanced"); | ||
60 | |||
61 | e_configure_option_domain_clear("conf_edgebindings"); | ||
62 | conf_module = NULL; | ||
63 | return 1; | ||
64 | } | ||
65 | |||
66 | EAPI int | ||
67 | e_modapi_save(E_Module *m __UNUSED__) | ||
68 | { | ||
69 | return 1; | ||
70 | } | ||
71 | |||
diff --git a/src/modules/conf_edgebindings/e_mod_main.h b/src/modules/conf_edgebindings/e_mod_main.h deleted file mode 100644 index ffb2908e9..000000000 --- a/src/modules/conf_edgebindings/e_mod_main.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | #ifndef E_MOD_MAIN_H | ||
2 | #define E_MOD_MAIN_H | ||
3 | |||
4 | E_Config_Dialog *e_int_config_edgebindings(E_Container *con, const char *params __UNUSED__); | ||
5 | E_Config_Dialog *e_int_config_signalbindings(E_Container *con, const char *params); | ||
6 | |||
7 | |||
8 | /** | ||
9 | * @addtogroup Optional_Conf | ||
10 | * @{ | ||
11 | * | ||
12 | * @defgroup Module_Conf_EdgeBindings Edge Bindings Configuration | ||
13 | * | ||
14 | * Controls action on screen edges and corners. | ||
15 | * | ||
16 | * @see Module_Conf_MouseBindings | ||
17 | * @see Module_Conf_KeyBindings | ||
18 | * @} | ||
19 | */ | ||
20 | #endif | ||
diff --git a/src/modules/conf_edgebindings/module.desktop.in b/src/modules/conf_edgebindings/module.desktop.in deleted file mode 100644 index bc5d85274..000000000 --- a/src/modules/conf_edgebindings/module.desktop.in +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | [Desktop Entry] | ||
2 | Type=Link | ||
3 | Name=Edge Bindings | ||
4 | Name[ru]=Привязки по краям | ||
5 | Name[cs]=Zkratky okrajù | ||
6 | Name[eo]=Fulmklavoj de ekranrandoj | ||
7 | Name[es]=Asociaciones del margen de pantalla | ||
8 | Name[fr]=Raccourcis des bords de l'écran | ||
9 | Name[gl]=Asociacións dos marxes da pantalla | ||
10 | Name[it]=Associazioni a bordi dello schermo e segnali | ||
11 | Name[tr]=Kenar Bağlayıcıları | ||
12 | Name[pt]=Associação das margens do ecrã | ||
13 | Icon=e-module-conf_edgebindings | ||
14 | Comment=Configure your edge bindings here. | ||
15 | Comment[ru]=Здесь можно настроить привязки по краям экрана. | ||
16 | Comment[cs]=Zde mùžete nastavit zkratky pro okraje a rohy obrazovky. | ||
17 | Comment[eo]=Agordas la fulmklavoj de ekranrandoj. | ||
18 | Comment[es]=Configure las asociaciones de los bordes de la pantalla aquí. | ||
19 | Comment[fr]=Configure les raccourcis des bords de l'écran. | ||
20 | Comment[gl]=Configure as asociacións dos bordes da pantalla aquí. | ||
21 | Comment[it]=Configurate qui le azioni da eseguire quando il puntatore raggiunge<br>i bordi dello schermo o per alcuni segnali. | ||
22 | Comment[pt]=Configurar as associações aos limites do ecrã | ||
23 | Comment[tr]=Kenar bağlayıcılarınızı yapılandırın. | ||
24 | X-Enlightenment-ModuleType=settings | ||