as per plan - merge more core modules.
authorCarsten Haitzler <raster@rasterman.com>
Sat, 9 Apr 2011 15:01:07 +0000 (15:01 +0000)
committerCarsten Haitzler <raster@rasterman.com>
Sat, 9 Apr 2011 15:01:07 +0000 (15:01 +0000)
SVN revision: 58526

36 files changed:
config/minimalist/e.src
config/netbook/e.src
config/scaleable/e.src
config/standard/e.src
configure.ac
src/modules/Makefile.am
src/modules/conf_acpibindings/Makefile.am [deleted file]
src/modules/conf_acpibindings/e_mod_main.c [deleted file]
src/modules/conf_acpibindings/e_mod_main.h [deleted file]
src/modules/conf_acpibindings/module.desktop.in [deleted file]
src/modules/conf_interaction/Makefile.am
src/modules/conf_interaction/e_int_config_mouse.c [moved from src/modules/conf_mouse/e_int_config_mouse.c with 100% similarity]
src/modules/conf_interaction/e_int_config_mouse.h [moved from src/modules/conf_mouse/e_int_config_mouse.h with 100% similarity]
src/modules/conf_interaction/e_mod_main.c
src/modules/conf_interaction/e_mod_main.h
src/modules/conf_interaction/module.desktop.in
src/modules/conf_keybindings/Makefile.am
src/modules/conf_keybindings/e_int_config_acpibindings.c [moved from src/modules/conf_acpibindings/e_int_config_acpibindings.c with 100% similarity]
src/modules/conf_keybindings/e_int_config_acpibindings.h [moved from src/modules/conf_acpibindings/e_int_config_acpibindings.h with 100% similarity]
src/modules/conf_keybindings/e_int_config_mousebindings.c [moved from src/modules/conf_mousebindings/e_int_config_mousebindings.c with 100% similarity]
src/modules/conf_keybindings/e_int_config_mousebindings.h [moved from src/modules/conf_mousebindings/e_int_config_mousebindings.h with 100% similarity]
src/modules/conf_keybindings/e_mod_main.c
src/modules/conf_keybindings/e_mod_main.h
src/modules/conf_keybindings/module.desktop.in
src/modules/conf_mouse/.cvsignore [deleted file]
src/modules/conf_mouse/Makefile.am [deleted file]
src/modules/conf_mouse/e-module-conf_mouse.edj [deleted file]
src/modules/conf_mouse/e_mod_main.c [deleted file]
src/modules/conf_mouse/e_mod_main.h [deleted file]
src/modules/conf_mouse/module.desktop.in [deleted file]
src/modules/conf_mousebindings/.cvsignore [deleted file]
src/modules/conf_mousebindings/Makefile.am [deleted file]
src/modules/conf_mousebindings/e-module-conf_mousebindings.edj [deleted file]
src/modules/conf_mousebindings/e_mod_main.c [deleted file]
src/modules/conf_mousebindings/e_mod_main.h [deleted file]
src/modules/conf_mousebindings/module.desktop.in [deleted file]

index 5c01c74..0cbb761 100644 (file)
@@ -179,22 +179,6 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "conf_mouse";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mousebindings";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
       value "name" string: "conf_mouse_cursor";
       value "enabled" uchar: 1;
       value "delayed" uchar: 1;
index f925cca..1e580ce 100644 (file)
@@ -211,22 +211,6 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "conf_mouse";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mousebindings";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
       value "name" string: "conf_mouse_cursor";
       value "enabled" uchar: 1;
       value "delayed" uchar: 1;
index 6e41639..89d237d 100644 (file)
@@ -194,22 +194,6 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "conf_mousebindings";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mouse";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
       value "name" string: "conf_mime";
       value "enabled" uchar: 1;
       value "delayed" uchar: 1;
index 5522627..c9712d7 100644 (file)
@@ -194,22 +194,6 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "conf_mousebindings";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mouse";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
       value "name" string: "conf_mime";
       value "enabled" uchar: 1;
       value "delayed" uchar: 1;
@@ -472,14 +456,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_acpibindings";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "themes" list {
     group "E_Config_Theme" struct {
       value "category" string: "theme";
index f82a77b..387e2cf 100644 (file)
@@ -671,10 +671,7 @@ 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_mousebindings], true)
 AC_E_OPTIONAL_MODULE([conf_edgebindings], true)
-AC_E_OPTIONAL_MODULE([conf_acpibindings], true)
-AC_E_OPTIONAL_MODULE([conf_mouse], true)
 AC_E_OPTIONAL_MODULE([conf_window_display], true)
 AC_E_OPTIONAL_MODULE([conf_window_focus], true)
 AC_E_OPTIONAL_MODULE([conf_window_remembers], true)
@@ -802,14 +799,8 @@ src/modules/conf_shelves/Makefile
 src/modules/conf_shelves/module.desktop
 src/modules/conf_keybindings/Makefile
 src/modules/conf_keybindings/module.desktop
-src/modules/conf_mousebindings/Makefile
-src/modules/conf_mousebindings/module.desktop
 src/modules/conf_edgebindings/Makefile
 src/modules/conf_edgebindings/module.desktop
-src/modules/conf_acpibindings/Makefile
-src/modules/conf_acpibindings/module.desktop
-src/modules/conf_mouse/Makefile
-src/modules/conf_mouse/module.desktop
 src/modules/conf_window_display/Makefile
 src/modules/conf_window_display/module.desktop
 src/modules/conf_window_focus/Makefile
index cfb918f..f610fae 100644 (file)
@@ -134,22 +134,10 @@ if USE_MODULE_CONF_KEYBINDINGS
 SUBDIRS += conf_keybindings
 endif
 
-if USE_MODULE_CONF_MOUSEBINDINGS
-SUBDIRS += conf_mousebindings
-endif
-
 if USE_MODULE_CONF_EDGEBINDINGS
 SUBDIRS += conf_edgebindings
 endif
 
-if USE_MODULE_CONF_ACPIBINDINGS
-SUBDIRS += conf_acpibindings
-endif
-
-if USE_MODULE_CONF_MOUSE
-SUBDIRS += conf_mouse
-endif
-
 if USE_MODULE_CONF_WINDOW_DISPLAY
 SUBDIRS += conf_window_display
 endif
diff --git a/src/modules/conf_acpibindings/Makefile.am b/src/modules/conf_acpibindings/Makefile.am
deleted file mode 100644 (file)
index 67b5469..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_acpibindings
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-                        e_int_config_acpibindings.c \
-                         e_int_config_acpibindings.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-       rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_acpibindings/e_mod_main.c b/src/modules/conf_acpibindings/e_mod_main.c
deleted file mode 100644 (file)
index b4450b9..0000000
+++ /dev/null
@@ -1,45 +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 - ACPI Bindings"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("advanced", 80, 
-                                    _("Advanced"), NULL, 
-                                     "preferences-advanced");
-   e_configure_registry_item_add("advanced/acpi_bindings", 10, 
-                                _("ACPI Bindings"), NULL, 
-                                "preferences-system-power-management", 
-                                e_int_config_acpibindings);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   if ((cfd = e_config_dialog_get("E", "advanced/acpi_bindings")))
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("advanced/acpi_bindings");
-   e_configure_registry_category_del("advanced");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_acpibindings/e_mod_main.h b/src/modules/conf_acpibindings/e_mod_main.h
deleted file mode 100644 (file)
index 2fb7323..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_acpibindings.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_acpibindings.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
-#endif
diff --git a/src/modules/conf_acpibindings/module.desktop.in b/src/modules/conf_acpibindings/module.desktop.in
deleted file mode 100644 (file)
index f79c646..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=ACPI Bindings
-Name[ru]=Привязки ACPI
-Name[fr]=Raccourcis ACPI
-Name[it]=Associazioni ACPI
-Name[pt]=Associações ACPI
-Name[tr]=ACPI Bağlayıcıları
-Icon=preferences-system-power-management
-Comment=Configure your ACPI bindings here.
-Comment[ru]=Настройте Ваши ACPI привязки здесь.
-Comment[fr]=Permet de configurer vos raccourcis ACPI.
-Comment[it]=Configurate qui le vostre associazioni con ACPI.
-Comment[pt]=Permite-lhe configurar as associações ACPI
-Comment[tr]=ACPI bağlayıcılarınızı yapılandırın.
-X-Enlightenment-ModuleType=settings
index df5f4f3..338c6b8 100644 (file)
@@ -22,7 +22,9 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
                         e_int_config_interaction.c \
-                         e_int_config_interaction.h
+                         e_int_config_interaction.h \
+                         e_int_config_mouse.c \
+                         e_int_config_mouse.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
index 373a0fa..626c686 100644 (file)
@@ -16,10 +16,14 @@ e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"), 
                                      NULL, "preferences-behavior");
-   e_configure_registry_item_add("keyboard_and_mouse/interaction", 11
-                                 _("Interaction"), NULL, 
+   e_configure_registry_item_add("keyboard_and_mouse/interaction", 40
+                                 _("Touch"), NULL, 
                                  "preferences-interaction", 
                                  e_int_config_interaction);
+   e_configure_registry_item_add("keyboard_and_mouse/mouse_settings", 50,
+                                 _("Mouse"), NULL,
+                                 "preferences-desktop-mouse",
+                                 e_int_config_mouse);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -30,10 +34,16 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
 
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_settings")))
+      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/mouse_settings");
    e_configure_registry_item_del("keyboard_and_mouse/interaction");
+   
    e_configure_registry_category_del("keyboard_and_mouse");
+   
    conf_module = NULL;
    return 1;
 }
index 74c8c50..b3e5816 100644 (file)
@@ -3,9 +3,11 @@
 
 #define E_TYPEDEFS 1
 #include "e_int_config_interaction.h"
+#include "e_int_config_mouse.h"
 
 #undef E_TYPEDEFS
 #include "e_int_config_interaction.h"
+#include "e_int_config_mouse.h"
 
 EAPI extern E_Module_Api e_modapi;
 
index 606c3a2..9cc27a8 100644 (file)
@@ -1,34 +1,34 @@
 [Desktop Entry]
 Type=Link
 Name=Interaction
-Name[ru]=Взаимодействие
-Name[cs]=Interakce
+Name[ru]=
+Name[cs]=
 Name[de]=
-Name[eo]=Interagoj
+Name[eo]=
 Name[es]=
-Name[fr]=Interaction
-Name[hu]=Kölcsönhatások
-Name[it]=Interazione
+Name[fr]=
+Name[hu]=
+Name[it]=
 Name[ja]=
-Name[pt]=Interação
+Name[pt]=
 Name[pt_BR]=
-Name[tr]=Etkileşim
+Name[tr]=
 Name[zh_CN]=
 Name[zh_TW]=
 Icon=e-module-conf_interaction
-Comment=Configure default user interaction settings.
-Comment[ru]=Настройка стандартных параметров взаимодействия с пользователем.
-Comment[cs]=Nastavte výchozí volby interakce s uživatelem.
+Comment=Configure Mouse and Touch input.
+Comment[ru]=
+Comment[cs]=
 Comment[de]=
-Comment[eo]=Agordas defaŭltajn uzantajn interagojn.
+Comment[eo]=
 Comment[es]=
-Comment[fr]=Paramétrage par défaut de l'interaction au niveau utilisateur.
-Comment[hu]=Alapértelmezett felhasználói kölcsönhatás beállítása.
-Comment[it]=Configura le impostazioni predefinite per l'interazione utente.
+Comment[fr]=
+Comment[hu]=
+Comment[it]=
 Comment[ja]=
-Comment[pt]=Permite-lhe configurar as definições de interação do utilizador
+Comment[pt]=
 Comment[pt_BR]=
-Comment[tr]=Öntanımlı kullanıcı etkileşim ayarlarını yapılandırır.
+Comment[tr]=
 Comment[zh_CN]=
 Comment[zh_TW]=
 X-Enlightenment-ModuleType=settings
index fafd65c..47a7165 100644 (file)
@@ -21,7 +21,11 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
                         e_int_config_keybindings.c \
-                         e_int_config_keybindings.h
+                         e_int_config_keybindings.h \
+                        e_int_config_mousebindings.c \
+                         e_int_config_mousebindings.h \
+                        e_int_config_acpibindings.c \
+                         e_int_config_acpibindings.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
index 5895aaa..32815dd 100644 (file)
@@ -8,7 +8,7 @@ static E_Module *conf_module = NULL;
 EAPI E_Module_Api e_modapi =
 {
    E_MODULE_API_VERSION,
-     "Settings - Key Bindings"
+     "Settings - Input Controls"
 };
 
 EAPI void *
@@ -16,10 +16,19 @@ e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), 
                                      NULL, "preferences-behavior");
+   
    e_configure_registry_item_add("keyboard_and_mouse/key_bindings", 10, 
-                                 _("Key Bindings"), NULL, 
+                                 _("Keys"), NULL, 
                                  "preferences-desktop-keyboard-shortcuts", 
                                  e_int_config_keybindings);
+   e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20,
+                                 _("Mouse"), NULL,
+                                 "preferences-desktop-mouse",
+                                 e_int_config_mousebindings);
+   e_configure_registry_item_add("keyboard_and_mouse/acpi_bindings", 30,
+                                 _("Buttons"), NULL,
+                                 "preferences-system-power-management",
+                                 e_int_config_acpibindings);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -30,10 +39,19 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
 
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/acpi_bindings")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_bindings")))
+      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_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_category_del("keyboard_and_mouse");
+   
    conf_module = NULL;
    return 1;
 }
index 0bcac3f..e1f0139 100644 (file)
@@ -3,9 +3,13 @@
 
 #define E_TYPEDEFS 1
 #include "e_int_config_keybindings.h"
+#include "e_int_config_mousebindings.h"
+#include "e_int_config_acpibindings.h"
 
 #undef E_TYPEDEFS
 #include "e_int_config_keybindings.h"
+#include "e_int_config_mousebindings.h"
+#include "e_int_config_acpibindings.h"
 
 EAPI extern E_Module_Api e_modapi;
 
index 48e55ed..3e55e0a 100644 (file)
@@ -1,34 +1,34 @@
 [Desktop Entry]
 Type=Link
-Name=Key Bindings
-Name[ru]=Привязки клавиатуры
-Name[cs]=Klávesové zkratky
+Name=Input Control Settings
+Name[ru]=
+Name[cs]=
 Name[de]=
-Name[eo]=Klavaraj bindoj
-Name[es]=Atajos de teclado
-Name[fr]=Raccourcis clavier
-Name[hu]=Kombinációk
-Name[it]=Associazioni di tasti
+Name[eo]=
+Name[es]=
+Name[fr]=
+Name[hu]=
+Name[it]=
 Name[ja]=
-Name[pt]=Atalhos de teclado
+Name[pt]=
 Name[pt_BR]=
-Name[tr]=Tuş Bağlayıcıları
+Name[tr]=
 Name[zh_CN]=
 Name[zh_TW]=
 Icon=preferences-desktop-keyboard-shortcuts
-Comment=Configure your keybindings here.
-Comment[ru]=Настройка привязок клавиатуры здесь.
-Comment[cs]=Nastavení klávesových zkratek.
+Comment=Key, Mouse and Button control settings
+Comment[ru]=
+Comment[cs]=
 Comment[de]=
-Comment[eo]=Agordi siajn klavarajn bindojn.
-Comment[es]=Configure sus atajos de teclado.
-Comment[fr]=Configure vos raccourcis clavier.
-Comment[hu]=Billentyű kombinációk, gyorsbillentyűk beállítása.
-Comment[it]=Configura le vostre associazioni di tasti.
+Comment[eo]=
+Comment[es]=
+Comment[fr]=
+Comment[hu]=
+Comment[it]=
 Comment[ja]=
-Comment[pt]=Permite-lhe configurar os atalhos do teclado
+Comment[pt]=
 Comment[pt_BR]=
-Comment[tr]=Tuş bağlayıcılarınızı buradan yapılandırın.
+Comment[tr]=
 Comment[zh_CN]=
 Comment[zh_TW]=
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_mouse/.cvsignore b/src/modules/conf_mouse/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_mouse/Makefile.am b/src/modules/conf_mouse/Makefile.am
deleted file mode 100644 (file)
index f3f1dcf..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_mouse
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-                        e_int_config_mouse.c \
-                         e_int_config_mouse.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-       rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_mouse/e-module-conf_mouse.edj b/src/modules/conf_mouse/e-module-conf_mouse.edj
deleted file mode 100644 (file)
index 2a3f888..0000000
Binary files a/src/modules/conf_mouse/e-module-conf_mouse.edj and /dev/null differ
diff --git a/src/modules/conf_mouse/e_mod_main.c b/src/modules/conf_mouse/e_mod_main.c
deleted file mode 100644 (file)
index c62ca8c..0000000
+++ /dev/null
@@ -1,45 +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 - Mouse Settings"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), 
-                                     NULL, "preferences-behavior");
-   e_configure_registry_item_add("keyboard_and_mouse/mouse_settings", 30, 
-                                 _("Mouse Settings"), NULL, 
-                                 "preferences-desktop-mouse", 
-                                 e_int_config_mouse);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   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/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;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_mouse/e_mod_main.h b/src/modules/conf_mouse/e_mod_main.h
deleted file mode 100644 (file)
index 784a10b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_mouse.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_mouse.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_mouse/module.desktop.in b/src/modules/conf_mouse/module.desktop.in
deleted file mode 100644 (file)
index 74a4898..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Mouse Settings
-Name[ru]=Настройки мыши
-Name[cs]=Volby myši
-Name[de]=
-Name[eo]=Musa plirapidigo
-Name[es]=Aceleración del mouse
-Name[fr]=Paramétrage de la souris
-Name[hu]=Egér sebessége
-Name[it]=Accelerazione mouse
-Name[ja]=
-Name[pt]=Definições do rato
-Name[pt_BR]=
-Name[tr]=Fare Ayarları
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_mouse
-Comment=Configure mouse behavior.
-Comment[ru]=Конфигурация настроек мышки.
-Comment[cs]=Volby chování myši.
-Comment[de]=
-Comment[eo]=Agordi la musan plirapidigon.
-Comment[es]=Configure la aceleración del cursor del mouse.
-Comment[fr]=Configure les options de la souris.
-Comment[hu]=Egér kurzor sebességének beállítása.
-Comment[it]=Configura l'accelerazione del puntatore del mouse.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar o comportamento do rato
-Comment[pt_BR]=
-Comment[tr]=Fare davranışını yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_mousebindings/.cvsignore b/src/modules/conf_mousebindings/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_mousebindings/Makefile.am b/src/modules/conf_mousebindings/Makefile.am
deleted file mode 100644 (file)
index a95e63e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_mousebindings
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-                        e_int_config_mousebindings.c \
-                         e_int_config_mousebindings.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-       rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_mousebindings/e-module-conf_mousebindings.edj b/src/modules/conf_mousebindings/e-module-conf_mousebindings.edj
deleted file mode 100644 (file)
index 2a3f888..0000000
Binary files a/src/modules/conf_mousebindings/e-module-conf_mousebindings.edj and /dev/null differ
diff --git a/src/modules/conf_mousebindings/e_mod_main.c b/src/modules/conf_mousebindings/e_mod_main.c
deleted file mode 100644 (file)
index 0c3c513..0000000
+++ /dev/null
@@ -1,45 +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 - Mouse 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_item_add("keyboard_and_mouse/mouse_bindings", 20, 
-                                 _("Mouse Bindings"), NULL, 
-                                 "preferences-desktop-mouse", 
-                                 e_int_config_mousebindings);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   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/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;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_mousebindings/e_mod_main.h b/src/modules/conf_mousebindings/e_mod_main.h
deleted file mode 100644 (file)
index 3843b70..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_mousebindings.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_mousebindings.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_mousebindings/module.desktop.in b/src/modules/conf_mousebindings/module.desktop.in
deleted file mode 100644 (file)
index 31c9aa6..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Mouse Bindings
-Name[ru]=Привязки мыши
-Name[cs]=Zkratky myši
-Name[de]=
-Name[eo]=Musaj bindoj
-Name[es]=Atajos del mouse
-Name[fr]=Raccourcis souris
-Name[hu]=Egér kombinációk
-Name[it]=Associazioni del mouse
-Name[ja]=
-Name[pt]=Atalhos do rato
-Name[pt_BR]=
-Name[tr]=Fare Bağlayıcıları
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_mousebindings
-Comment=Used to configure your mouse bindings.
-Comment[ru]=Используется для настройки привязок мышки.
-Comment[cs]=Použit k nastavení zkratek myši.
-Comment[de]=
-Comment[eo]=Agordi siajn musajn bindojn.
-Comment[es]=Usado para configurar los atajos del mouse.
-Comment[fr]=Paramétrage des raccourcis souris.
-Comment[hu]=Az egér gombok kombinációjának beállítása.
-Comment[it]=Usato per configurare le associazioni per i tasti del mouse.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar os atalhos do rato
-Comment[pt_BR]=
-Comment[tr]=Farenizin bağlayıcılarını yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings