From ed7aba1cfd64a7223d6305614deaebd69b5e7d43 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 30 Apr 2011 12:59:53 +0000 Subject: [PATCH] consolidate some more conf modules as per plan. SVN revision: 59052 --- config/minimalist/e.src | 24 ---------- config/netbook/e.src | 24 ---------- config/scaleable/e.src | 24 ---------- config/standard/e.src | 24 ---------- configure.ac | 9 ---- po/POTFILES.in | 9 ++-- src/modules/Makefile.am | 12 ----- src/modules/conf_clientlist/.cvsignore | 7 --- src/modules/conf_clientlist/Makefile.am | 31 ------------ .../e-module-conf_clientlist.edj | Bin 12858 -> 0 bytes src/modules/conf_clientlist/e_mod_main.c | 45 ------------------ src/modules/conf_clientlist/e_mod_main.h | 17 ------- src/modules/conf_clientlist/module.desktop.in | 36 -------------- src/modules/conf_window_display/.cvsignore | 7 --- src/modules/conf_window_display/Makefile.am | 31 ------------ .../e-module-conf_window_display.edj | Bin 11946 -> 0 bytes src/modules/conf_window_display/e_mod_main.c | 39 --------------- src/modules/conf_window_display/e_mod_main.h | 16 ------- .../conf_window_display/module.desktop.in | 34 ------------- src/modules/conf_window_focus/.cvsignore | 7 --- src/modules/conf_window_focus/Makefile.am | 31 ------------ .../e-module-conf_window_focus.edj | Bin 13224 -> 0 bytes src/modules/conf_window_focus/e_mod_main.c | 39 --------------- src/modules/conf_window_focus/e_mod_main.h | 16 ------- .../conf_window_focus/module.desktop.in | 34 ------------- .../conf_window_manipulation/Makefile.am | 8 +++- .../e_int_config_clientlist.c | 4 +- .../e_int_config_clientlist.h | 0 .../e_int_config_focus.c | 0 .../e_int_config_focus.h | 0 .../e_int_config_window_display.c | 0 .../e_int_config_window_display.h | 0 .../e_int_config_window_maxpolicy.c | 4 +- .../e_int_config_window_stacking.c | 4 +- .../conf_window_manipulation/e_mod_main.c | 21 +++++--- .../conf_window_manipulation/e_mod_main.h | 6 +++ 36 files changed, 37 insertions(+), 526 deletions(-) delete mode 100644 src/modules/conf_clientlist/.cvsignore delete mode 100644 src/modules/conf_clientlist/Makefile.am delete mode 100644 src/modules/conf_clientlist/e-module-conf_clientlist.edj delete mode 100644 src/modules/conf_clientlist/e_mod_main.c delete mode 100644 src/modules/conf_clientlist/e_mod_main.h delete mode 100644 src/modules/conf_clientlist/module.desktop.in delete mode 100644 src/modules/conf_window_display/.cvsignore delete mode 100644 src/modules/conf_window_display/Makefile.am delete mode 100644 src/modules/conf_window_display/e-module-conf_window_display.edj delete mode 100644 src/modules/conf_window_display/e_mod_main.c delete mode 100644 src/modules/conf_window_display/e_mod_main.h delete mode 100644 src/modules/conf_window_display/module.desktop.in delete mode 100644 src/modules/conf_window_focus/.cvsignore delete mode 100644 src/modules/conf_window_focus/Makefile.am delete mode 100644 src/modules/conf_window_focus/e-module-conf_window_focus.edj delete mode 100644 src/modules/conf_window_focus/e_mod_main.c delete mode 100644 src/modules/conf_window_focus/e_mod_main.h delete mode 100644 src/modules/conf_window_focus/module.desktop.in rename src/modules/{conf_clientlist => conf_window_manipulation}/e_int_config_clientlist.c (98%) rename src/modules/{conf_clientlist => conf_window_manipulation}/e_int_config_clientlist.h (100%) rename src/modules/{conf_window_focus => conf_window_manipulation}/e_int_config_focus.c (100%) rename src/modules/{conf_window_focus => conf_window_manipulation}/e_int_config_focus.h (100%) rename src/modules/{conf_window_display => conf_window_manipulation}/e_int_config_window_display.c (100%) rename src/modules/{conf_window_display => conf_window_manipulation}/e_int_config_window_display.h (100%) diff --git a/config/minimalist/e.src b/config/minimalist/e.src index 0cbb76142..d9deaf087 100644 --- a/config/minimalist/e.src +++ b/config/minimalist/e.src @@ -89,14 +89,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_clientlist"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_colors"; @@ -257,22 +249,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_window_display"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_window_focus"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_window_manipulation"; diff --git a/config/netbook/e.src b/config/netbook/e.src index 1e580ce07..807c81105 100644 --- a/config/netbook/e.src +++ b/config/netbook/e.src @@ -121,14 +121,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_clientlist"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_colors"; @@ -289,22 +281,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_window_display"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_window_focus"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_window_manipulation"; diff --git a/config/scaleable/e.src b/config/scaleable/e.src index 89d237d56..7e124fd24 100644 --- a/config/scaleable/e.src +++ b/config/scaleable/e.src @@ -96,22 +96,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_window_focus"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_window_display"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_wallpaper"; @@ -272,14 +256,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_clientlist"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_borders"; diff --git a/config/standard/e.src b/config/standard/e.src index 0361153e6..57b63f2d6 100644 --- a/config/standard/e.src +++ b/config/standard/e.src @@ -96,22 +96,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_window_focus"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_window_display"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_wallpaper"; @@ -272,14 +256,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_clientlist"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_borders"; diff --git a/configure.ac b/configure.ac index c895fcf9b..9b0b7c2c2 100644 --- a/configure.ac +++ b/configure.ac @@ -696,12 +696,9 @@ 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_window_display], true) -AC_E_OPTIONAL_MODULE([conf_window_focus], true) AC_E_OPTIONAL_MODULE([conf_window_remembers], true) AC_E_OPTIONAL_MODULE([conf_window_manipulation], true) AC_E_OPTIONAL_MODULE([conf_menus], true) -AC_E_OPTIONAL_MODULE([conf_clientlist], true) AC_E_OPTIONAL_MODULE([conf_dialogs], true) AC_E_OPTIONAL_MODULE([conf_performance], true) AC_E_OPTIONAL_MODULE([conf_winlist], true) @@ -825,18 +822,12 @@ src/modules/conf_keybindings/Makefile src/modules/conf_keybindings/module.desktop src/modules/conf_edgebindings/Makefile src/modules/conf_edgebindings/module.desktop -src/modules/conf_window_display/Makefile -src/modules/conf_window_display/module.desktop -src/modules/conf_window_focus/Makefile -src/modules/conf_window_focus/module.desktop src/modules/conf_window_remembers/Makefile src/modules/conf_window_remembers/module.desktop src/modules/conf_window_manipulation/Makefile src/modules/conf_window_manipulation/module.desktop src/modules/conf_menus/Makefile src/modules/conf_menus/module.desktop -src/modules/conf_clientlist/Makefile -src/modules/conf_clientlist/module.desktop src/modules/conf_dialogs/Makefile src/modules/conf_dialogs/module.desktop src/modules/conf_performance/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 535458d17..c65bf6901 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -135,8 +135,6 @@ src/modules/conf_applications/e_int_config_apps.c src/modules/conf_applications/e_mod_main.c src/modules/conf_borders/e_int_config_borders.c src/modules/conf_borders/e_mod_main.c -src/modules/conf_clientlist/e_int_config_clientlist.c -src/modules/conf_clientlist/e_mod_main.c src/modules/conf_colors/e_int_config_color_classes.c src/modules/conf_colors/e_mod_main.c src/modules/conf_dialogs/e_int_config_dialogs.c @@ -197,10 +195,9 @@ src/modules/conf_wallpaper/e_int_config_wallpaper.c src/modules/conf_wallpaper/e_int_config_wallpaper_import.c src/modules/conf_wallpaper/e_int_config_wallpaper_web.c src/modules/conf_wallpaper/e_mod_main.c -src/modules/conf_window_display/e_int_config_window_display.c -src/modules/conf_window_display/e_mod_main.c -src/modules/conf_window_focus/e_int_config_focus.c -src/modules/conf_window_focus/e_mod_main.c +src/modules/conf_window_manipulation/e_int_config_clientlist.c +src/modules/conf_window_manipulation/e_int_config_window_display.c +src/modules/conf_window_manipulation/e_int_config_focus.c src/modules/conf_window_manipulation/e_int_config_window_geometry.c src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c src/modules/conf_window_manipulation/e_int_config_window_stacking.c diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index f610fae2c..9f977afda 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -138,14 +138,6 @@ if USE_MODULE_CONF_EDGEBINDINGS SUBDIRS += conf_edgebindings endif -if USE_MODULE_CONF_WINDOW_DISPLAY -SUBDIRS += conf_window_display -endif - -if USE_MODULE_CONF_WINDOW_FOCUS -SUBDIRS += conf_window_focus -endif - if USE_MODULE_CONF_WINDOW_REMEMBERS SUBDIRS += conf_window_remembers endif @@ -158,10 +150,6 @@ if USE_MODULE_CONF_MENUS SUBDIRS += conf_menus endif -if USE_MODULE_CONF_CLIENTLIST -SUBDIRS += conf_clientlist -endif - if USE_MODULE_CONF_DIALOGS SUBDIRS += conf_dialogs endif diff --git a/src/modules/conf_clientlist/.cvsignore b/src/modules/conf_clientlist/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_clientlist/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_clientlist/Makefile.am b/src/modules/conf_clientlist/Makefile.am deleted file mode 100644 index a5b092b8b..000000000 --- a/src/modules/conf_clientlist/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_clientlist - -# 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_clientlist.c \ - e_int_config_clientlist.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_clientlist/e-module-conf_clientlist.edj b/src/modules/conf_clientlist/e-module-conf_clientlist.edj deleted file mode 100644 index 25fba8aac75d6e6bf17bdb458b85aec9f9084815..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12858 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 W-|kDJc7I;m-pyFUt&0A0<^KRElS0M- diff --git a/src/modules/conf_window_display/e_mod_main.c b/src/modules/conf_window_display/e_mod_main.c deleted file mode 100644 index 533292f49..000000000 --- a/src/modules/conf_window_display/e_mod_main.c +++ /dev/null @@ -1,39 +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 - Window Display" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows"); - e_configure_registry_item_add("windows/window_display", 10, _("Window Display"), NULL, "preferences-system-windows", e_int_config_window_display); - 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", "windows/window_display"))) e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("windows/window_display"); - e_configure_registry_category_del("windows"); - conf_module = NULL; - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} diff --git a/src/modules/conf_window_display/e_mod_main.h b/src/modules/conf_window_display/e_mod_main.h deleted file mode 100644 index 2b2bc0727..000000000 --- a/src/modules/conf_window_display/e_mod_main.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -#define E_TYPEDEFS 1 -#include "e_int_config_window_display.h" - -#undef E_TYPEDEFS -#include "e_int_config_window_display.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_window_display/module.desktop.in b/src/modules/conf_window_display/module.desktop.in deleted file mode 100644 index 9539fae62..000000000 --- a/src/modules/conf_window_display/module.desktop.in +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Window Display -Name[ru]=Показ окна -Name[cs]=Zobrazení okna -Name[de]= -Name[eo]=Vidigo de fenestroj -Name[es]=Visualización de ventanas -Name[fr]=Affichage des fenêtres -Name[hu]=Ablak megjelenés -Name[it]=Visualizzazione finestre -Name[ja]= -Name[pt]=Exibição da janela -Name[pt_BR]= -Name[tr]=Pencere Görünümü -Name[zh_CN]= -Name[zh_TW]= -Icon=e-module-conf_window_display -Comment=Configures default window properties such as default geometries, border icons, placement styles, etc. -Comment[ru]=Конфигурация стандартных настроек окна, типа геометрия, иконка окна, стили расположения и т.д. -Comment[cs]=Nastavení vlastností okna jako výchozí geometrie, ikony rámu aj. -Comment[de]= -Comment[eo]=Agordi la defaŭltjan ecojn de fenestroj kiel geometrio, stilo de pozicio, randaj piktogramoj, ktp. -Comment[es]=Configura las propiedades predefinidas de las ventanas, como su geometría, los íconos del borde, el diseño, ubicación, etc. -Comment[fr]=Paramétrage des propriétés par défaut d'une fenêtre comme la géométrie, la bordure, le positionnement, etc. -Comment[hu]=Az alapértelmezett ablakbeállításokat tudod elvégezni a modul segítségével, úgy mint, elhelyezkedés, stílus, stb. -Comment[it]=Configura le proprietà predefinite delle finestre come geometrie, icona del bordo, stile di posizionamento, ecc. -Comment[ja]= -Comment[pt]=Permite-lhe configurar diversas propriedades da janela, como a geometria, estilos... -Comment[pt_BR]= -Comment[tr]=Öntanımlı boyut, simge, yerleşim biçimleri vs. gibi pencere özelliklerini yapılandırır. -Comment[zh_CN]= -Comment[zh_TW]= -X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_window_focus/.cvsignore b/src/modules/conf_window_focus/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_window_focus/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_window_focus/Makefile.am b/src/modules/conf_window_focus/Makefile.am deleted file mode 100644 index e093bf655..000000000 --- a/src/modules/conf_window_focus/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_window_focus - -# 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_focus.c \ - e_int_config_focus.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_window_focus/e-module-conf_window_focus.edj b/src/modules/conf_window_focus/e-module-conf_window_focus.edj deleted file mode 100644 index 350d864be894c492b7197a55c8a5030199c66f1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13224 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.create_widgets = _basic_create; cfd = e_config_dialog_new(con, _("Client List Settings"), "E", - "menus/client_list_menu", + "windows/client_list_menu", "preferences-winlist", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_clientlist/e_int_config_clientlist.h b/src/modules/conf_window_manipulation/e_int_config_clientlist.h similarity index 100% rename from src/modules/conf_clientlist/e_int_config_clientlist.h rename to src/modules/conf_window_manipulation/e_int_config_clientlist.h diff --git a/src/modules/conf_window_focus/e_int_config_focus.c b/src/modules/conf_window_manipulation/e_int_config_focus.c similarity index 100% rename from src/modules/conf_window_focus/e_int_config_focus.c rename to src/modules/conf_window_manipulation/e_int_config_focus.c diff --git a/src/modules/conf_window_focus/e_int_config_focus.h b/src/modules/conf_window_manipulation/e_int_config_focus.h similarity index 100% rename from src/modules/conf_window_focus/e_int_config_focus.h rename to src/modules/conf_window_manipulation/e_int_config_focus.h diff --git a/src/modules/conf_window_display/e_int_config_window_display.c b/src/modules/conf_window_manipulation/e_int_config_window_display.c similarity index 100% rename from src/modules/conf_window_display/e_int_config_window_display.c rename to src/modules/conf_window_manipulation/e_int_config_window_display.c diff --git a/src/modules/conf_window_display/e_int_config_window_display.h b/src/modules/conf_window_manipulation/e_int_config_window_display.h similarity index 100% rename from src/modules/conf_window_display/e_int_config_window_display.h rename to src/modules/conf_window_manipulation/e_int_config_window_display.h diff --git a/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c b/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c index 01a39098a..dc57672a6 100644 --- a/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c +++ b/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c @@ -26,7 +26,7 @@ e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "_config_window_maxpolicy_dialog")) + if (e_config_dialog_find("E", "windows/window_maxpolicy_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); @@ -42,7 +42,7 @@ e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__) /* create config diaolg for NULL object/data */ cfd = e_config_dialog_new(con, _("Window Maximize Policy"), - "E", "_config_window_maxpolicy_dialog", + "E", "windows/window_maxpolicy_dialog", "preferences-window-manipulation", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_window_manipulation/e_int_config_window_stacking.c b/src/modules/conf_window_manipulation/e_int_config_window_stacking.c index 73c248a86..28e60f723 100644 --- a/src/modules/conf_window_manipulation/e_int_config_window_stacking.c +++ b/src/modules/conf_window_manipulation/e_int_config_window_stacking.c @@ -31,7 +31,7 @@ e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "_config_window_stacking_dialog")) + if (e_config_dialog_find("E", "windows/window_stacking_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); @@ -47,7 +47,7 @@ e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__) /* create config diaolg for NULL object/data */ cfd = e_config_dialog_new(con, _("Window Stacking"), - "E", "_config_window_stacking_dialog", + "E", "windows/window_stacking_dialog", "preferences-window-stacking", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_window_manipulation/e_mod_main.c b/src/modules/conf_window_manipulation/e_mod_main.c index 362512341..83b3e5350 100644 --- a/src/modules/conf_window_manipulation/e_mod_main.c +++ b/src/modules/conf_window_manipulation/e_mod_main.c @@ -15,9 +15,12 @@ EAPI void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows"); + e_configure_registry_item_add("windows/window_display", 10, _("Window Display"), NULL, "preferences-system-windows", e_int_config_window_display); + e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "preferences-focus", e_int_config_focus); e_configure_registry_item_add("windows/window_geometry", 30, _("Window Geometry"), NULL, "preferences-window-geometry", e_int_config_window_geometry); - e_configure_registry_item_add("windows/window_stacking", 30, _("Window Stacking"), NULL, "preferences-window-stacking", e_int_config_window_stacking); - e_configure_registry_item_add("windows/window_maxpolicy", 30, _("Window Maximize Policy"), NULL, "preferences-window-maximize", e_int_config_window_maxpolicy); + e_configure_registry_item_add("windows/window_stacking", 40, _("Window Stacking"), NULL, "preferences-window-stacking", e_int_config_window_stacking); + e_configure_registry_item_add("windows/window_maxpolicy", 50, _("Window Maximize Policy"), NULL, "preferences-window-maximize", e_int_config_window_maxpolicy); + e_configure_registry_item_add("windows/client_list_menu", 60, _("Client List Menu"), NULL, "preferences-winlist", e_int_config_clientlist); conf_module = m; e_module_delayed_set(m, 1); return m; @@ -27,12 +30,18 @@ EAPI int e_modapi_shutdown(E_Module *m __UNUSED__) { E_Config_Dialog *cfd; + while ((cfd = e_config_dialog_get("E", "windows/client_list_menu"))) e_object_del(E_OBJECT(cfd)); + while ((cfd = e_config_dialog_get("E", "windows/window_maxpolicy_dialog"))) e_object_del(E_OBJECT(cfd)); + while ((cfd = e_config_dialog_get("E", "windows/window_stacking_dialog"))) e_object_del(E_OBJECT(cfd)); while ((cfd = e_config_dialog_get("E", "windows/window_geometry"))) e_object_del(E_OBJECT(cfd)); - while ((cfd = e_config_dialog_get("E", "_config_window_stacking_dialog"))) e_object_del(E_OBJECT(cfd)); - while ((cfd = e_config_dialog_get("E", "_config_window_maxpolicy_dialog"))) e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("windows/window_geometry"); - e_configure_registry_item_del("windows/window_stacking"); + while ((cfd = e_config_dialog_get("E", "windows/window_focus"))) e_object_del(E_OBJECT(cfd)); + while ((cfd = e_config_dialog_get("E", "windows/window_display"))) e_object_del(E_OBJECT(cfd)); + e_configure_registry_item_del("windows/client_list_menu"); e_configure_registry_item_del("windows/window_maxpolicy"); + e_configure_registry_item_del("windows/window_stacking"); + e_configure_registry_item_del("windows/window_geometry"); + e_configure_registry_item_del("windows/window_focus"); + e_configure_registry_item_del("windows/window_display"); e_configure_registry_category_del("windows"); conf_module = NULL; return 1; diff --git a/src/modules/conf_window_manipulation/e_mod_main.h b/src/modules/conf_window_manipulation/e_mod_main.h index b8f80031b..1c06e354e 100644 --- a/src/modules/conf_window_manipulation/e_mod_main.h +++ b/src/modules/conf_window_manipulation/e_mod_main.h @@ -3,9 +3,15 @@ #define E_TYPEDEFS 1 #include "e_int_config_window_manip.h" +#include "e_int_config_window_display.h" +#include "e_int_config_focus.h" +#include "e_int_config_clientlist.h" #undef E_TYPEDEFS #include "e_int_config_window_manip.h" +#include "e_int_config_window_display.h" +#include "e_int_config_focus.h" +#include "e_int_config_clientlist.h" EAPI extern E_Module_Api e_modapi;