From d7c52deb98dfa2a2df9190cbfa663735acbbdd1d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 5 Feb 2013 14:03:11 +0000 Subject: [PATCH] merge all bindings dialogs into single module: conf_bindings configs have been updated to load correct module and modapi version has been bumped to invalidate old modules SVN revision: 83632 --- ChangeLog | 1 + NEWS | 1 + config/standard/e.src | 8 +- configure.ac | 6 +- src/bin/e_config.c | 39 ++++++++++ src/bin/e_config.h | 2 +- src/bin/e_module.c | 10 +-- src/bin/e_module.h | 2 +- src/modules/Makefile.am | 8 +- src/modules/Makefile_conf_bindings.am | 19 +++++ src/modules/Makefile_conf_edgebindings.am | 17 ----- src/modules/Makefile_conf_keybindings.am | 17 ----- .../e_int_config_acpibindings.c | 0 .../e_int_config_edgebindings.c | 0 .../e_int_config_keybindings.c | 0 .../e_int_config_mousebindings.c | 0 .../e_int_config_signalbindings.c | 0 .../e_mod_main.c | 29 ++++++- .../e_mod_main.h | 2 + .../module.desktop.in | 0 .../e-module-conf_edgebindings.edj | Bin 14887 -> 0 bytes src/modules/conf_edgebindings/e_mod_main.c | 71 ------------------ src/modules/conf_edgebindings/e_mod_main.h | 20 ----- .../conf_edgebindings/module.desktop.in | 24 ------ 24 files changed, 96 insertions(+), 180 deletions(-) create mode 100644 src/modules/Makefile_conf_bindings.am delete mode 100644 src/modules/Makefile_conf_edgebindings.am delete mode 100644 src/modules/Makefile_conf_keybindings.am rename src/modules/{conf_keybindings => conf_bindings}/e_int_config_acpibindings.c (100%) rename src/modules/{conf_edgebindings => conf_bindings}/e_int_config_edgebindings.c (100%) rename src/modules/{conf_keybindings => conf_bindings}/e_int_config_keybindings.c (100%) rename src/modules/{conf_keybindings => conf_bindings}/e_int_config_mousebindings.c (100%) rename src/modules/{conf_edgebindings => conf_bindings}/e_int_config_signalbindings.c (100%) rename src/modules/{conf_keybindings => conf_bindings}/e_mod_main.c (62%) rename src/modules/{conf_keybindings => conf_bindings}/e_mod_main.h (76%) rename src/modules/{conf_keybindings => conf_bindings}/module.desktop.in (100%) delete mode 100644 src/modules/conf_edgebindings/e-module-conf_edgebindings.edj delete mode 100644 src/modules/conf_edgebindings/e_mod_main.c delete mode 100644 src/modules/conf_edgebindings/e_mod_main.h delete mode 100644 src/modules/conf_edgebindings/module.desktop.in diff --git a/ChangeLog b/ChangeLog index b80475d5a..23eb9c14a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * improve load time of apps dialogs * fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf * edge bindings can now be set to "drag only" + * merged all binding config dialogs into conf_bindings module 2013-02-04 Mike Blumenkrantz diff --git a/NEWS b/NEWS index 4651f1d6c..fdc3bbd60 100644 --- a/NEWS +++ b/NEWS @@ -35,6 +35,7 @@ Additions: Changes: Modules: * modules no longer require shutdown or save functions + * merged all binding config dialogs into conf_bindings module API: * 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 @@ -845,12 +845,6 @@ group "E_Config" struct { value "delayed" uchar: 1; value "priority" int: 0; } - group "E_Config_Module" struct { - value "name" string: "conf_edgebindings"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } group "E_Config_Module" struct { value "name" string: "conf_paths"; value "enabled" uchar: 1; @@ -864,7 +858,7 @@ group "E_Config" struct { value "priority" int: 0; } group "E_Config_Module" struct { - value "name" string: "conf_keybindings"; + value "name" string: "conf_bindings"; value "enabled" uchar: 1; value "delayed" uchar: 1; 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) AC_E_OPTIONAL_MODULE([conf_applications], true) AC_E_OPTIONAL_MODULE([conf_display], true) AC_E_OPTIONAL_MODULE([conf_shelves], true) -AC_E_OPTIONAL_MODULE([conf_keybindings], true) -AC_E_OPTIONAL_MODULE([conf_edgebindings], true) +AC_E_OPTIONAL_MODULE([conf_bindings], true) AC_E_OPTIONAL_MODULE([conf_window_remembers], true) AC_E_OPTIONAL_MODULE([conf_window_manipulation], true) AC_E_OPTIONAL_MODULE([conf_menus], true) @@ -947,8 +946,7 @@ src/modules/conf_intl/module.desktop src/modules/conf_applications/module.desktop src/modules/conf_display/module.desktop src/modules/conf_shelves/module.desktop -src/modules/conf_keybindings/module.desktop -src/modules/conf_edgebindings/module.desktop +src/modules/conf_bindings/module.desktop src/modules/conf_window_remembers/module.desktop src/modules/conf_window_manipulation/module.desktop 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) e_config->config_type = E_CONFIG_PROFILE_TYPE_TABLET; } } + CONFIG_VERSION_CHECK(10) + { + int do_conf = 0; + Eina_List *l, *ll; + E_Config_Module *em; + int enabled = 0, delayed = 0, priority = 0; + + CONFIG_VERSION_UPDATE_INFO(10); + EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em) + { + Eina_Bool do_free = EINA_FALSE; + + if (!e_util_strcmp(em->name, "comp")) + do_free = EINA_TRUE; + else if ((!e_util_strcmp(em->name, "conf_keybindings")) || (!e_util_strcmp(em->name, "conf_edgebindings"))) + { + do_conf += do_free = EINA_TRUE; + enabled |= em->enabled; + delayed |= em->delayed; + priority = MIN(priority, em->priority); + } + if (do_free) + { + e_config->modules = eina_list_remove_list(e_config->modules, l); + eina_stringshare_del(em->name); + free(em); + } + if (do_conf == 2) break; + } + if (do_conf) + { + em = E_NEW(E_Config_Module, 1); + em->name = eina_stringshare_add("conf_bindings"); + em->enabled = !!enabled; + em->delayed = !!delayed; + em->priority = priority; + e_config->modules = eina_list_append(e_config->modules, em); + } + } } if (!e_config->remember_internal_fm_windows) 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 /* increment this whenever a new set of config values are added but the users * config doesn't need to be wiped - simply new values need to be put in */ -#define E_CONFIG_FILE_GENERATION 9 +#define E_CONFIG_FILE_GENERATION 10 #define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION) #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) EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em) { if (!em) continue; - if (!e_util_strcasecmp(em->name, "comp")) - { - e_config->modules = eina_list_remove_list(e_config->modules, l); - eina_stringshare_del(em->name); - free(em); - continue; - } if ((em->delayed) && (em->enabled) & (!e_config->no_module_delay)) { if (!_e_module_idler) @@ -847,10 +840,9 @@ _e_module_whitelist_check(void) "conf_comp", "conf_dialogs", "conf_display", - "conf_edgebindings", "conf_interaction", "conf_intl", - "conf_keybindings", + "conf_bindings", "conf_menus", "conf_paths", "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 @@ #ifdef E_TYPEDEFS -#define E_MODULE_API_VERSION 12 +#define E_MODULE_API_VERSION 13 typedef struct _E_Module E_Module; 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 include Makefile_conf_shelves.am endif -if USE_MODULE_CONF_KEYBINDINGS -include Makefile_conf_keybindings.am -endif - -if USE_MODULE_CONF_EDGEBINDINGS -include Makefile_conf_edgebindings.am +if USE_MODULE_CONF_BINDINGS +include Makefile_conf_bindings.am endif 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 @@ +conf_bindingsdir = $(MDIR)/conf_bindings +conf_bindings_DATA = conf_bindings/module.desktop + +EXTRA_DIST += $(conf_bindings_DATA) + +conf_bindingspkgdir = $(MDIR)/conf_bindings/$(MODULE_ARCH) +conf_bindingspkg_LTLIBRARIES = conf_bindings/module.la + +conf_bindings_module_la_SOURCES = conf_bindings/e_mod_main.c \ + conf_bindings/e_mod_main.h \ + conf_bindings/e_int_config_keybindings.c \ + conf_bindings/e_int_config_mousebindings.c \ + conf_bindings/e_int_config_edgebindings.c \ + conf_bindings/e_int_config_signalbindings.c \ + conf_bindings/e_int_config_acpibindings.c + +.PHONY: conf_bindings install-conf_bindings +conf_bindings: $(conf_bindingspkg_LTLIBRARIES) $(conf_bindings_DATA) +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 @@ -conf_edgebindingsdir = $(MDIR)/conf_edgebindings -conf_edgebindings_DATA = conf_edgebindings/e-module-conf_edgebindings.edj \ - conf_edgebindings/module.desktop - -EXTRA_DIST += $(conf_edgebindings_DATA) - -conf_edgebindingspkgdir = $(MDIR)/conf_edgebindings/$(MODULE_ARCH) -conf_edgebindingspkg_LTLIBRARIES = conf_edgebindings/module.la - -conf_edgebindings_module_la_SOURCES = conf_edgebindings/e_mod_main.c \ - conf_edgebindings/e_mod_main.h \ - conf_edgebindings/e_int_config_edgebindings.c \ - conf_edgebindings/e_int_config_signalbindings.c - -.PHONY: conf_edgebindings install-conf_edgebindings -conf_edgebindings: $(conf_edgebindingspkg_LTLIBRARIES) $(conf_edgebindings_DATA) -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 @@ -conf_keybindingsdir = $(MDIR)/conf_keybindings -conf_keybindings_DATA = conf_keybindings/module.desktop - -EXTRA_DIST += $(conf_keybindings_DATA) - -conf_keybindingspkgdir = $(MDIR)/conf_keybindings/$(MODULE_ARCH) -conf_keybindingspkg_LTLIBRARIES = conf_keybindings/module.la - -conf_keybindings_module_la_SOURCES = conf_keybindings/e_mod_main.c \ - conf_keybindings/e_mod_main.h \ - conf_keybindings/e_int_config_keybindings.c \ - conf_keybindings/e_int_config_mousebindings.c \ - conf_keybindings/e_int_config_acpibindings.c - -.PHONY: conf_keybindings install-conf_keybindings -conf_keybindings: $(conf_keybindingspkg_LTLIBRARIES) $(conf_keybindings_DATA) -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 similarity index 100% rename from src/modules/conf_keybindings/e_int_config_acpibindings.c rename to 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 similarity index 100% rename from src/modules/conf_edgebindings/e_int_config_edgebindings.c rename to 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 similarity index 100% rename from src/modules/conf_keybindings/e_int_config_keybindings.c rename to 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 similarity index 100% rename from src/modules/conf_keybindings/e_int_config_mousebindings.c rename to 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 similarity index 100% rename from src/modules/conf_edgebindings/e_int_config_signalbindings.c rename to 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 similarity index 62% rename from src/modules/conf_keybindings/e_mod_main.c rename to 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) _("ACPI Bindings"), NULL, "preferences-system-power-management", e_int_config_acpibindings); + e_configure_registry_item_add("keyboard_and_mouse/edge_bindings", 10, + _("Edge Bindings"), NULL, + "preferences-desktop-edge-bindings", + e_int_config_edgebindings); + + e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced"); + e_configure_registry_item_add("advanced/signal_bindings", 10, + _("Signal Bindings"), NULL, + "preferences-desktop-signal-bindings", + e_int_config_signalbindings); conf_module = m; e_module_delayed_set(m, 1); { E_Configure_Option *co; - e_configure_option_domain_current_set("conf_keybindings"); + e_configure_option_domain_current_set("conf_bindings"); E_CONFIGURE_OPTION_ADD_CUSTOM(co, _("key bindings"), _("Key binding settings"), _("input"), _("key"), _("binding")); co->info = eina_stringshare_add("keyboard_and_mouse/key_bindings"); @@ -46,6 +56,13 @@ e_modapi_init(E_Module *m) 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"); + + 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"); } @@ -63,14 +80,20 @@ e_modapi_shutdown(E_Module *m __UNUSED__) e_object_del(E_OBJECT(cfd)); while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/key_bindings"))) e_object_del(E_OBJECT(cfd)); + while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/edge_bindings"))) + e_object_del(E_OBJECT(cfd)); + while ((cfd = e_config_dialog_get("E", "advanced/signal_bindings"))) + e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("keyboard_and_mouse/acpi_bindings"); e_configure_registry_item_del("keyboard_and_mouse/mouse_bindings"); e_configure_registry_item_del("keyboard_and_mouse/key_bindings"); - + e_configure_registry_item_del("keyboard_and_mouse/edge_bindings"); + 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_keybindings"); + e_configure_option_domain_clear("conf_bindings"); conf_module = NULL; return 1; diff --git a/src/modules/conf_keybindings/e_mod_main.h b/src/modules/conf_bindings/e_mod_main.h similarity index 76% rename from src/modules/conf_keybindings/e_mod_main.h rename to 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 @@ E_Config_Dialog *e_int_config_acpibindings(E_Container *con, const char *params __UNUSED__); E_Config_Dialog *e_int_config_keybindings(E_Container *con, const char *params __UNUSED__); E_Config_Dialog *e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_edgebindings(E_Container *con, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_signalbindings(E_Container *con, const char *params); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_keybindings/module.desktop.in b/src/modules/conf_bindings/module.desktop.in similarity index 100% rename from src/modules/conf_keybindings/module.desktop.in rename to 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 98987dae5e212a96d0a13f194e0045ff6160785c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14887 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 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 @@ -#include "e.h" -#include "e_mod_main.h" - -/* actual module specifics */ -static E_Module *conf_module = NULL; - -/* module setup */ -EAPI E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "Settings - Edge Bindings" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), - NULL, "preferences-behavior"); - e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced"); - e_configure_registry_item_add("keyboard_and_mouse/edge_bindings", 10, - _("Edge Bindings"), NULL, - "preferences-desktop-edge-bindings", - e_int_config_edgebindings); - e_configure_registry_item_add("advanced/signal_bindings", 10, - _("Signal Bindings"), NULL, - "preferences-desktop-signal-bindings", - 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; -} - -EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) -{ - E_Config_Dialog *cfd; - - while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/edge_bindings"))) - e_object_del(E_OBJECT(cfd)); - while ((cfd = e_config_dialog_get("E", "advanced/signal_bindings"))) - e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("keyboard_and_mouse/edge_bindings"); - 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; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} - 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 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -E_Config_Dialog *e_int_config_edgebindings(E_Container *con, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_signalbindings(E_Container *con, const char *params); - - -/** - * @addtogroup Optional_Conf - * @{ - * - * @defgroup Module_Conf_EdgeBindings Edge Bindings Configuration - * - * Controls action on screen edges and corners. - * - * @see Module_Conf_MouseBindings - * @see Module_Conf_KeyBindings - * @} - */ -#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 @@ -[Desktop Entry] -Type=Link -Name=Edge Bindings -Name[ru]=Привязки по краям -Name[cs]=Zkratky okrajù -Name[eo]=Fulmklavoj de ekranrandoj -Name[es]=Asociaciones del margen de pantalla -Name[fr]=Raccourcis des bords de l'écran -Name[gl]=Asociacións dos marxes da pantalla -Name[it]=Associazioni a bordi dello schermo e segnali -Name[tr]=Kenar Bağlayıcıları -Name[pt]=Associação das margens do ecrã -Icon=e-module-conf_edgebindings -Comment=Configure your edge bindings here. -Comment[ru]=Здесь можно настроить привязки по краям экрана. -Comment[cs]=Zde mùžete nastavit zkratky pro okraje a rohy obrazovky. -Comment[eo]=Agordas la fulmklavoj de ekranrandoj. -Comment[es]=Configure las asociaciones de los bordes de la pantalla aquí. -Comment[fr]=Configure les raccourcis des bords de l'écran. -Comment[gl]=Configure as asociacións dos bordes da pantalla aquí. -Comment[it]=Configurate qui le azioni da eseguire quando il puntatore raggiunge
i bordi dello schermo o per alcuni segnali. -Comment[pt]=Configurar as associações aos limites do ecrã -Comment[tr]=Kenar bağlayıcılarınızı yapılandırın. -X-Enlightenment-ModuleType=settings