From 7469a45aefb0682a0c18903f8d4d5b2c732e116b Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 1 May 2011 03:56:17 +0000 Subject: [PATCH] and more module merging! that's pretty much all of the merges done. now probably need to consider some module renaming as a result of the merges. but for now that can wait. SVN revision: 59059 --- config/illume-home/e.src | 12 - config/illume/e.src | 48 -- config/minimalist/e.src | 64 --- config/netbook/e.src | 72 --- config/scaleable/e.src | 72 --- config/standard/e.src | 72 --- configure.ac | 31 +- po/POTFILES.in | 31 +- src/modules/Makefile.am | 36 -- src/modules/conf_borders/.cvsignore | 7 - src/modules/conf_borders/Makefile.am | 31 -- .../conf_borders/e-module-conf_borders.edj | Bin 11946 -> 0 bytes src/modules/conf_borders/e_mod_main.c | 47 -- src/modules/conf_borders/e_mod_main.h | 17 - src/modules/conf_borders/module.desktop.in | 36 -- src/modules/conf_colors/.cvsignore | 7 - src/modules/conf_colors/Makefile.am | 31 -- .../conf_colors/e-module-conf_colors.edj | Bin 15925 -> 0 bytes src/modules/conf_colors/e_mod_main.c | 44 -- src/modules/conf_colors/e_mod_main.h | 15 - src/modules/conf_colors/module.desktop.in | 34 -- src/modules/conf_fonts/.cvsignore | 7 - src/modules/conf_fonts/Makefile.am | 31 -- src/modules/conf_fonts/e_mod_main.c | 44 -- src/modules/conf_fonts/e_mod_main.h | 15 - src/modules/conf_fonts/module.desktop.in | 34 -- src/modules/conf_icon_theme/.cvsignore | 7 - src/modules/conf_icon_theme/Makefile.am | 31 -- .../e-module-conf_icon_theme.edj | Bin 17315 -> 0 bytes src/modules/conf_icon_theme/e_mod_main.c | 41 -- src/modules/conf_icon_theme/e_mod_main.h | 16 - src/modules/conf_icon_theme/module.desktop.in | 34 -- src/modules/conf_mouse_cursor/.cvsignore | 7 - src/modules/conf_mouse_cursor/Makefile.am | 31 -- .../e-module-conf_mouse_cursor.edj | Bin 15051 -> 0 bytes src/modules/conf_mouse_cursor/e_mod_main.c | 39 -- src/modules/conf_mouse_cursor/e_mod_main.h | 16 - .../conf_mouse_cursor/module.desktop.in | 34 -- src/modules/conf_scale/.cvsignore | 7 - src/modules/conf_scale/Makefile.am | 31 -- .../conf_scale/e-module-conf_scale.edj | Bin 13792 -> 0 bytes src/modules/conf_scale/e_mod_main.c | 44 -- src/modules/conf_scale/e_mod_main.h | 16 - src/modules/conf_scale/module.desktop.in | 34 -- src/modules/conf_startup/.cvsignore | 7 - src/modules/conf_startup/Makefile.am | 31 -- .../conf_startup/e-module-conf_startup.edj | Bin 15610 -> 0 bytes src/modules/conf_startup/e_mod_main.c | 43 -- src/modules/conf_startup/e_mod_main.h | 16 - src/modules/conf_startup/module.desktop.in | 34 -- src/modules/conf_theme/Makefile.am | 34 +- .../e_int_config_borders.c | 0 .../e_int_config_borders.h | 0 .../e_int_config_color_classes.c | 0 .../e_int_config_color_classes.h | 0 .../e_int_config_cursor.c | 0 .../e_int_config_cursor.h | 0 .../e_int_config_fonts.c | 0 .../e_int_config_fonts.h | 0 .../e_int_config_icon_themes.c | 0 .../e_int_config_icon_themes.h | 0 .../e_int_config_scale.c | 0 .../e_int_config_scale.h | 0 .../e_int_config_startup.c | 0 .../e_int_config_startup.h | 0 .../e_int_config_transitions.c | 0 .../e_int_config_transitions.h | 0 .../e_int_config_wallpaper.c | 0 .../e_int_config_wallpaper.h | 0 .../e_int_config_wallpaper_import.c | 0 .../e_int_config_wallpaper_import.h | 0 .../e_int_config_wallpaper_web.c | 0 .../e_int_config_wallpaper_web.h | 0 src/modules/conf_theme/e_mod_main.c | 128 ++++- src/modules/conf_theme/e_mod_main.h | 23 + src/modules/conf_transitions/.cvsignore | 7 - src/modules/conf_transitions/Makefile.am | 31 -- .../e-module-conf_transitions.edj | Bin 16270 -> 0 bytes src/modules/conf_transitions/e_mod_main.c | 45 -- src/modules/conf_transitions/e_mod_main.h | 16 - .../conf_transitions/module.desktop.in | 34 -- src/modules/conf_wallpaper/.cvsignore | 7 - src/modules/conf_wallpaper/Makefile.am | 36 -- .../e_int_config_wallpaper_gradient.c | 486 ------------------ .../e_int_config_wallpaper_gradient.h | 10 - src/modules/conf_wallpaper/e_mod_main.c | 83 --- src/modules/conf_wallpaper/e_mod_main.h | 19 - src/modules/conf_wallpaper/module.desktop.in | 34 -- 88 files changed, 176 insertions(+), 2174 deletions(-) delete mode 100644 src/modules/conf_borders/.cvsignore delete mode 100644 src/modules/conf_borders/Makefile.am delete mode 100644 src/modules/conf_borders/e-module-conf_borders.edj delete mode 100644 src/modules/conf_borders/e_mod_main.c delete mode 100644 src/modules/conf_borders/e_mod_main.h delete mode 100644 src/modules/conf_borders/module.desktop.in delete mode 100644 src/modules/conf_colors/.cvsignore delete mode 100644 src/modules/conf_colors/Makefile.am delete mode 100644 src/modules/conf_colors/e-module-conf_colors.edj delete mode 100644 src/modules/conf_colors/e_mod_main.c delete mode 100644 src/modules/conf_colors/e_mod_main.h delete mode 100644 src/modules/conf_colors/module.desktop.in delete mode 100644 src/modules/conf_fonts/.cvsignore delete mode 100644 src/modules/conf_fonts/Makefile.am delete mode 100644 src/modules/conf_fonts/e_mod_main.c delete mode 100644 src/modules/conf_fonts/e_mod_main.h delete mode 100644 src/modules/conf_fonts/module.desktop.in delete mode 100644 src/modules/conf_icon_theme/.cvsignore delete mode 100644 src/modules/conf_icon_theme/Makefile.am delete mode 100644 src/modules/conf_icon_theme/e-module-conf_icon_theme.edj delete mode 100644 src/modules/conf_icon_theme/e_mod_main.c delete mode 100644 src/modules/conf_icon_theme/e_mod_main.h delete mode 100644 src/modules/conf_icon_theme/module.desktop.in delete mode 100644 src/modules/conf_mouse_cursor/.cvsignore delete mode 100644 src/modules/conf_mouse_cursor/Makefile.am delete mode 100644 src/modules/conf_mouse_cursor/e-module-conf_mouse_cursor.edj delete mode 100644 src/modules/conf_mouse_cursor/e_mod_main.c delete mode 100644 src/modules/conf_mouse_cursor/e_mod_main.h delete mode 100644 src/modules/conf_mouse_cursor/module.desktop.in delete mode 100644 src/modules/conf_scale/.cvsignore delete mode 100644 src/modules/conf_scale/Makefile.am delete mode 100644 src/modules/conf_scale/e-module-conf_scale.edj delete mode 100644 src/modules/conf_scale/e_mod_main.c delete mode 100644 src/modules/conf_scale/e_mod_main.h delete mode 100644 src/modules/conf_scale/module.desktop.in delete mode 100644 src/modules/conf_startup/.cvsignore delete mode 100644 src/modules/conf_startup/Makefile.am delete mode 100644 src/modules/conf_startup/e-module-conf_startup.edj delete mode 100644 src/modules/conf_startup/e_mod_main.c delete mode 100644 src/modules/conf_startup/e_mod_main.h delete mode 100644 src/modules/conf_startup/module.desktop.in rename src/modules/{conf_borders => conf_theme}/e_int_config_borders.c (100%) rename src/modules/{conf_borders => conf_theme}/e_int_config_borders.h (100%) rename src/modules/{conf_colors => conf_theme}/e_int_config_color_classes.c (100%) rename src/modules/{conf_colors => conf_theme}/e_int_config_color_classes.h (100%) rename src/modules/{conf_mouse_cursor => conf_theme}/e_int_config_cursor.c (100%) rename src/modules/{conf_mouse_cursor => conf_theme}/e_int_config_cursor.h (100%) rename src/modules/{conf_fonts => conf_theme}/e_int_config_fonts.c (100%) rename src/modules/{conf_fonts => conf_theme}/e_int_config_fonts.h (100%) rename src/modules/{conf_icon_theme => conf_theme}/e_int_config_icon_themes.c (100%) rename src/modules/{conf_icon_theme => conf_theme}/e_int_config_icon_themes.h (100%) rename src/modules/{conf_scale => conf_theme}/e_int_config_scale.c (100%) rename src/modules/{conf_scale => conf_theme}/e_int_config_scale.h (100%) rename src/modules/{conf_startup => conf_theme}/e_int_config_startup.c (100%) rename src/modules/{conf_startup => conf_theme}/e_int_config_startup.h (100%) rename src/modules/{conf_transitions => conf_theme}/e_int_config_transitions.c (100%) rename src/modules/{conf_transitions => conf_theme}/e_int_config_transitions.h (100%) rename src/modules/{conf_wallpaper => conf_theme}/e_int_config_wallpaper.c (100%) rename src/modules/{conf_wallpaper => conf_theme}/e_int_config_wallpaper.h (100%) rename src/modules/{conf_wallpaper => conf_theme}/e_int_config_wallpaper_import.c (100%) rename src/modules/{conf_wallpaper => conf_theme}/e_int_config_wallpaper_import.h (100%) rename src/modules/{conf_wallpaper => conf_theme}/e_int_config_wallpaper_web.c (100%) rename src/modules/{conf_wallpaper => conf_theme}/e_int_config_wallpaper_web.h (100%) delete mode 100644 src/modules/conf_transitions/.cvsignore delete mode 100644 src/modules/conf_transitions/Makefile.am delete mode 100644 src/modules/conf_transitions/e-module-conf_transitions.edj delete mode 100644 src/modules/conf_transitions/e_mod_main.c delete mode 100644 src/modules/conf_transitions/e_mod_main.h delete mode 100644 src/modules/conf_transitions/module.desktop.in delete mode 100644 src/modules/conf_wallpaper/.cvsignore delete mode 100644 src/modules/conf_wallpaper/Makefile.am delete mode 100644 src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c delete mode 100644 src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h delete mode 100644 src/modules/conf_wallpaper/e_mod_main.c delete mode 100644 src/modules/conf_wallpaper/e_mod_main.h delete mode 100644 src/modules/conf_wallpaper/module.desktop.in diff --git a/config/illume-home/e.src b/config/illume-home/e.src index c63c97ed4..02a8ec00a 100644 --- a/config/illume-home/e.src +++ b/config/illume-home/e.src @@ -1198,24 +1198,12 @@ group "E_Config" struct { value "delayed" uchar: 1; value "priority" int: 0; } - group "E_Config_Module" struct { - value "name" string: "conf_scale"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } group "E_Config_Module" struct { value "name" string: "conf_display"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; } - group "E_Config_Module" struct { - value "name" string: "conf_startup"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } group "E_Config_Module" struct { value "name" string: "start"; value "enabled" uchar: 1; diff --git a/config/illume/e.src b/config/illume/e.src index 0a0f3ee18..cb5dc2346 100644 --- a/config/illume/e.src +++ b/config/illume/e.src @@ -79,22 +79,6 @@ group "E_Config" struct { 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; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_transitions"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_display"; @@ -111,22 +95,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_fonts"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_startup"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_theme"; @@ -135,14 +103,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_wallpaper"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "dropshadow"; @@ -151,14 +111,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_scale"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "gadman"; diff --git a/config/minimalist/e.src b/config/minimalist/e.src index b08bb3a30..a1e9a1154 100644 --- a/config/minimalist/e.src +++ b/config/minimalist/e.src @@ -81,22 +81,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_borders"; - 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"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_dialogs"; @@ -113,22 +97,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_fonts"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_icon_theme"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_intl"; @@ -153,14 +121,6 @@ group "E_Config" struct { 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; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_paths"; @@ -193,14 +153,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_startup"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_theme"; @@ -209,22 +161,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_transitions"; - 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"; - 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 f9c60cf6f..a6e8b18bc 100644 --- a/config/netbook/e.src +++ b/config/netbook/e.src @@ -113,22 +113,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_borders"; - 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"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_dialogs"; @@ -145,22 +129,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_fonts"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_icon_theme"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_intl"; @@ -185,14 +153,6 @@ group "E_Config" struct { 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; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_paths"; @@ -225,14 +185,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_startup"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_theme"; @@ -241,22 +193,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_transitions"; - 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"; - 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"; @@ -289,14 +225,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_scale"; - 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_remembers"; diff --git a/config/scaleable/e.src b/config/scaleable/e.src index 4c371c215..b5c69ab31 100644 --- a/config/scaleable/e.src +++ b/config/scaleable/e.src @@ -48,14 +48,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_scale"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_interaction"; @@ -80,22 +72,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_wallpaper"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_transitions"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_theme"; @@ -104,14 +80,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_startup"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_shelves"; @@ -144,14 +112,6 @@ group "E_Config" struct { 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; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_menus"; @@ -176,22 +136,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_icon_theme"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_fonts"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_display"; @@ -208,22 +152,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_colors"; - 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"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_applications"; diff --git a/config/standard/e.src b/config/standard/e.src index 78a312951..0e37ab16f 100644 --- a/config/standard/e.src +++ b/config/standard/e.src @@ -48,14 +48,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_scale"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_interaction"; @@ -80,22 +72,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_wallpaper"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_transitions"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_theme"; @@ -104,14 +80,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_startup"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_shelves"; @@ -144,14 +112,6 @@ group "E_Config" struct { 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; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_menus"; @@ -176,22 +136,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_icon_theme"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_fonts"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_display"; @@ -208,22 +152,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_colors"; - 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"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_applications"; diff --git a/configure.ac b/configure.ac index aab2885c0..fe74a12c6 100644 --- a/configure.ac +++ b/configure.ac @@ -676,16 +676,8 @@ AC_E_OPTIONAL_MODULE([fileman], true) AC_E_OPTIONAL_MODULE([fileman_opinfo], true) AC_E_OPTIONAL_MODULE([wizard], true) AC_E_OPTIONAL_MODULE([conf], true) -AC_E_OPTIONAL_MODULE([conf_wallpaper], true) AC_E_OPTIONAL_MODULE([conf_wallpaper2], true) AC_E_OPTIONAL_MODULE([conf_theme], true, [CHECK_MODULE_CONF_THEME]) -AC_E_OPTIONAL_MODULE([conf_colors], true) -AC_E_OPTIONAL_MODULE([conf_fonts], true) -AC_E_OPTIONAL_MODULE([conf_borders], true) -AC_E_OPTIONAL_MODULE([conf_icon_theme], true) -AC_E_OPTIONAL_MODULE([conf_mouse_cursor], true) -AC_E_OPTIONAL_MODULE([conf_transitions], true) -AC_E_OPTIONAL_MODULE([conf_startup], true) AC_E_OPTIONAL_MODULE([conf_intl], true) AC_E_OPTIONAL_MODULE([msgbus], true) AC_E_OPTIONAL_MODULE([conf_applications], true) @@ -700,7 +692,6 @@ AC_E_OPTIONAL_MODULE([conf_dialogs], true) AC_E_OPTIONAL_MODULE([conf_performance], true) AC_E_OPTIONAL_MODULE([conf_paths], true) AC_E_OPTIONAL_MODULE([conf_interaction], true) -AC_E_OPTIONAL_MODULE([conf_scale], true) AC_E_OPTIONAL_MODULE([gadman], true) AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER]) AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN]) @@ -777,30 +768,12 @@ src/modules/fileman_opinfo/module.desktop src/modules/wizard/Makefile src/modules/conf/Makefile src/modules/conf/module.desktop -src/modules/conf_wallpaper/Makefile -src/modules/conf_wallpaper/module.desktop src/modules/conf_wallpaper2/Makefile src/modules/conf_wallpaper2/module.desktop src/modules/conf_theme/Makefile src/modules/conf_theme/module.desktop -src/modules/conf_colors/Makefile -src/modules/conf_colors/module.desktop -src/modules/conf_fonts/Makefile -src/modules/conf_fonts/module.desktop -src/modules/conf_borders/Makefile -src/modules/conf_borders/module.desktop -src/modules/conf_icon_theme/Makefile -src/modules/conf_icon_theme/module.desktop -src/modules/conf_mouse_cursor/Makefile -src/modules/conf_mouse_cursor/module.desktop -src/modules/conf_transitions/Makefile -src/modules/conf_transitions/module.desktop -src/modules/conf_startup/Makefile -src/modules/conf_startup/module.desktop src/modules/conf_intl/Makefile src/modules/conf_intl/module.desktop -src/modules/msgbus/Makefile -src/modules/msgbus/module.desktop src/modules/conf_applications/Makefile src/modules/conf_applications/module.desktop src/modules/conf_display/Makefile @@ -825,8 +798,8 @@ src/modules/conf_paths/Makefile src/modules/conf_paths/module.desktop src/modules/conf_interaction/Makefile src/modules/conf_interaction/module.desktop -src/modules/conf_scale/Makefile -src/modules/conf_scale/module.desktop +src/modules/msgbus/Makefile +src/modules/msgbus/module.desktop src/modules/gadman/Makefile src/modules/gadman/module.desktop src/modules/mixer/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 6630b6364..1fab46c9d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -133,10 +133,6 @@ src/modules/conf/e_conf.c src/modules/conf/e_mod_main.c 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_colors/e_int_config_color_classes.c -src/modules/conf_colors/e_mod_main.c src/modules/conf_dialogs/e_int_config_profiles.c src/modules/conf_dialogs/e_int_config_dialogs.c src/modules/conf_dialogs/e_mod_main.c @@ -150,10 +146,6 @@ src/modules/conf_display/e_int_config_dpms.c src/modules/conf_display/e_mod_main.c src/modules/conf_edgebindings/e_int_config_edgebindings.c src/modules/conf_edgebindings/e_mod_main.c -src/modules/conf_fonts/e_int_config_fonts.c -src/modules/conf_fonts/e_mod_main.c -src/modules/conf_icon_theme/e_int_config_icon_themes.c -src/modules/conf_icon_theme/e_mod_main.c src/modules/conf_interaction/e_int_config_interaction.c src/modules/conf_interaction/e_int_config_mouse.c src/modules/conf_interaction/e_mod_main.c @@ -166,29 +158,28 @@ src/modules/conf_keybindings/e_int_config_mousebindings.c src/modules/conf_keybindings/e_mod_main.c src/modules/conf_menus/e_int_config_menus.c src/modules/conf_menus/e_mod_main.c -src/modules/conf_mouse_cursor/e_int_config_cursor.c -src/modules/conf_mouse_cursor/e_mod_main.c src/modules/conf_paths/e_int_config_paths.c src/modules/conf_paths/e_mod_main.c src/modules/conf_performance/e_int_config_engine.c src/modules/conf_performance/e_int_config_performance.c src/modules/conf_performance/e_mod_main.c -src/modules/conf_scale/e_int_config_scale.c -src/modules/conf_scale/e_mod_main.c src/modules/conf_shelves/e_int_config_shelf.c src/modules/conf_shelves/e_mod_main.c -src/modules/conf_startup/e_int_config_startup.c -src/modules/conf_startup/e_mod_main.c +src/modules/conf_theme/e_int_config_wallpaper.c +src/modules/conf_theme/e_int_config_wallpaper_import.c +src/modules/conf_theme/e_int_config_wallpaper_web.c +src/modules/conf_theme/e_int_config_borders.c +src/modules/conf_theme/e_int_config_color_classes.c +src/modules/conf_theme/e_int_config_fonts.c +src/modules/conf_theme/e_int_config_icon_themes.c +src/modules/conf_theme/e_int_config_cursor.c +src/modules/conf_theme/e_int_config_scale.c +src/modules/conf_theme/e_int_config_startup.c +src/modules/conf_theme/e_int_config_transitions.c src/modules/conf_theme/e_int_config_theme.c src/modules/conf_theme/e_int_config_theme_import.c src/modules/conf_theme/e_int_config_theme_web.c src/modules/conf_theme/e_mod_main.c -src/modules/conf_transitions/e_int_config_transitions.c -src/modules/conf_transitions/e_mod_main.c -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_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 diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index bc09a1969..b4990bef4 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -58,10 +58,6 @@ if USE_MODULE_CONF SUBDIRS += conf endif -if USE_MODULE_CONF_WALLPAPER -SUBDIRS += conf_wallpaper -endif - if USE_MODULE_CONF_WALLPAPER2 SUBDIRS += conf_wallpaper2 endif @@ -70,34 +66,6 @@ if USE_MODULE_CONF_THEME SUBDIRS += conf_theme endif -if USE_MODULE_CONF_COLORS -SUBDIRS += conf_colors -endif - -if USE_MODULE_CONF_FONTS -SUBDIRS += conf_fonts -endif - -if USE_MODULE_CONF_BORDERS -SUBDIRS += conf_borders -endif - -if USE_MODULE_CONF_ICON_THEME -SUBDIRS += conf_icon_theme -endif - -if USE_MODULE_CONF_MOUSE_CURSOR -SUBDIRS += conf_mouse_cursor -endif - -if USE_MODULE_CONF_TRANSITIONS -SUBDIRS += conf_transitions -endif - -if USE_MODULE_CONF_STARTUP -SUBDIRS += conf_startup -endif - if USE_MODULE_CONF_INTL SUBDIRS += conf_intl endif @@ -154,10 +122,6 @@ if USE_MODULE_CONF_INTERACTION SUBDIRS += conf_interaction endif -if USE_MODULE_CONF_SCALE -SUBDIRS += conf_scale -endif - if USE_MODULE_GADMAN SUBDIRS += gadman endif diff --git a/src/modules/conf_borders/.cvsignore b/src/modules/conf_borders/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_borders/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_borders/Makefile.am b/src/modules/conf_borders/Makefile.am deleted file mode 100644 index 6f9da3cb6..000000000 --- a/src/modules/conf_borders/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_borders - -# 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_borders.c \ - e_int_config_borders.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_borders/e-module-conf_borders.edj b/src/modules/conf_borders/e-module-conf_borders.edj deleted file mode 100644 index c3d87e852adbc17ce9baf1d2981667a95a46235b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11946 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 W-|kDJc7I;m-pyFUt&0A0<^KRElS0M- diff --git a/src/modules/conf_borders/e_mod_main.c b/src/modules/conf_borders/e_mod_main.c deleted file mode 100644 index d35f696f3..000000000 --- a/src/modules/conf_borders/e_mod_main.c +++ /dev/null @@ -1,47 +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 - Borders" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look"); - e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "preferences-system-windows", e_int_config_borders); - e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal"); - e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "preferences-system-windows", e_int_config_borders_border); - 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", "internal/borders_border"))) - e_object_del(E_OBJECT(cfd)); - while ((cfd = e_config_dialog_get("E", "appearance/borders"))) - e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("internal/borders_border"); - e_configure_registry_category_del("internal"); - e_configure_registry_item_del("appearance/borders"); - e_configure_registry_category_del("appearance"); - conf_module = NULL; - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} diff --git a/src/modules/conf_borders/e_mod_main.h b/src/modules/conf_borders/e_mod_main.h deleted file mode 100644 index e1455f77d..000000000 --- a/src/modules/conf_borders/e_mod_main.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -#define E_TYPEDEFS 1 -#include "e_int_config_borders.h" - -#undef E_TYPEDEFS -#include "e_int_config_borders.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_borders/module.desktop.in b/src/modules/conf_borders/module.desktop.in deleted file mode 100644 index 791ab0990..000000000 --- a/src/modules/conf_borders/module.desktop.in +++ /dev/null @@ -1,36 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Borders -Name[ru]=Бордюры -Name[cs]=Rámy -Name[de]= -Name[el]=Περιγράμματα -Name[eo]=Randoj -Name[es]=Bordes -Name[fr]=Bordures -Name[hu]=Ablakkeret -Name[it]=Bordi -Name[ja]= -Name[pt]=Contornos -Name[pt_BR]= -Name[tr]=Sınırlar -Name[zh_CN]= -Name[zh_TW]= -Icon=e-module-conf_borders -Comment=Used to select a default border style. -Comment[ru]=Используется для выбора стиля бордюра по умолчанию. -Comment[cs]=Volby výchozího rámu okna. -Comment[de]= -Comment[el]=Χρησιμοποιείται για την επιλογή προκαθορισμένου στυλ περιγράμματος. -Comment[eo]=Elekti pravaloran randan stilon. -Comment[es]=USado para elegir un diseño de borde predeterminado. -Comment[fr]=Permet de choisir le style de bordure par défaut. -Comment[hu]=Beállíthatod az alapértelmezett ablakkeret stílust. -Comment[it]=Usato per selezionare uno stile di bordo predefinito. -Comment[ja]= -Comment[pt]=Permite-lhe escolher o estilo dos contornos -Comment[pt_BR]= -Comment[tr]=Öntanımlı sınır biçimini seçmekte kullanılır. -Comment[zh_CN]= -Comment[zh_TW]= -X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_colors/.cvsignore b/src/modules/conf_colors/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_colors/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_colors/Makefile.am b/src/modules/conf_colors/Makefile.am deleted file mode 100644 index 287995d0c..000000000 --- a/src/modules/conf_colors/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_colors - -# 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_color_classes.c \ - e_int_config_color_classes.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_colors/e-module-conf_colors.edj b/src/modules/conf_colors/e-module-conf_colors.edj deleted file mode 100644 index e125980d0cdbb3dc82116b268068e94e6ed16a7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15925 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 Y&aw68$3#?;!(2{A&L5yT%+3t>Kcr5{wEzGB diff --git a/src/modules/conf_colors/e_mod_main.c b/src/modules/conf_colors/e_mod_main.c deleted file mode 100644 index 4be948084..000000000 --- a/src/modules/conf_colors/e_mod_main.c +++ /dev/null @@ -1,44 +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 - Colors" -}; - -EAPI void * -e_modapi_init(E_Module *m __UNUSED__) -{ - e_configure_registry_category_add("appearance", 10, _("Look"), NULL, - "preferences-look"); - e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, - "preferences-desktop-color", - e_int_config_color_classes); - 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", "appearance/colors"))) - e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("appearance/colors"); - e_configure_registry_category_del("appearance"); - conf_module = NULL; - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} diff --git a/src/modules/conf_colors/e_mod_main.h b/src/modules/conf_colors/e_mod_main.h deleted file mode 100644 index 6cbb7b733..000000000 --- a/src/modules/conf_colors/e_mod_main.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -#define E_TYPEDEFS 1 -#include "e_int_config_color_classes.h" -#undef E_TYPEDEFS -#include "e_int_config_color_classes.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_colors/module.desktop.in b/src/modules/conf_colors/module.desktop.in deleted file mode 100644 index 18fa239ff..000000000 --- a/src/modules/conf_colors/module.desktop.in +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Colors -Name[ru]=Цвета -Name[cs]=Barvy -Name[de]= -Name[eo]=Koloroj -Name[es]=Colores -Name[fr]=Couleurs -Name[hu]=Színek -Name[it]=Colori -Name[ja]= -Name[pt]=Cores -Name[pt_BR]= -Name[tr]=Renkler -Name[zh_CN]= -Name[zh_TW]= -Icon=e-module-conf_colors -Comment=Used to customize the color classes. -Comment[ru]=Используется для настройки цветовых классов. -Comment[cs]=Určen k nastavení tříd barev. -Comment[de]= -Comment[eo]=Adapti la kolorajn grupojn. -Comment[es]=Usado para personalizar las clases de colores. -Comment[fr]=Permet de personnaliser les classes de couleurs. -Comment[hu]=Itt szín beállításokat végezhetsz. -Comment[it]=Usato per la personalizzazione delle classi di colore. -Comment[ja]= -Comment[pt]=Permite-lhe personalizar as classes das cores -Comment[pt_BR]= -Comment[tr]=Renkleri özelleştirmekte kullanılır. -Comment[zh_CN]= -Comment[zh_TW]= -X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_fonts/.cvsignore b/src/modules/conf_fonts/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_fonts/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_fonts/Makefile.am b/src/modules/conf_fonts/Makefile.am deleted file mode 100644 index 21844baea..000000000 --- a/src/modules/conf_fonts/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_fonts - -# 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_fonts.c \ - e_int_config_fonts.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_fonts/e_mod_main.c b/src/modules/conf_fonts/e_mod_main.c deleted file mode 100644 index 66b5a3bb4..000000000 --- a/src/modules/conf_fonts/e_mod_main.c +++ /dev/null @@ -1,44 +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 - Fonts" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - e_configure_registry_category_add("appearance", 10, _("Look"), NULL, - "preferences-look"); - e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, - "preferences-desktop-font", - e_int_config_fonts); - 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", "appearance/fonts"))) - e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("appearance/fonts"); - e_configure_registry_category_del("appearance"); - conf_module = NULL; - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} diff --git a/src/modules/conf_fonts/e_mod_main.h b/src/modules/conf_fonts/e_mod_main.h deleted file mode 100644 index 82d0a0919..000000000 --- a/src/modules/conf_fonts/e_mod_main.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -#define E_TYPEDEFS 1 -#include "e_int_config_fonts.h" -#undef E_TYPEDEFS -#include "e_int_config_fonts.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_fonts/module.desktop.in b/src/modules/conf_fonts/module.desktop.in deleted file mode 100644 index cbd428b6c..000000000 --- a/src/modules/conf_fonts/module.desktop.in +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Fonts -Name[ru]=Шрифты -Name[cs]=Písmo -Name[de]= -Name[eo]=Tiparoj -Name[es]=Fuentes -Name[fr]=Polices -Name[hu]=Betűtípusok -Name[it]=Font -Name[ja]= -Name[pt]=Tipo de letra -Name[pt_BR]= -Name[tr]=Yazıtipleri -Name[zh_CN]= -Name[zh_TW]= -Icon=preferences-desktop-font -Comment=Font configuration dialog. -Comment[ru]=Диалог конфигурации шрифтов. -Comment[cs]=Dialog pro výběr písma. -Comment[de]= -Comment[eo]=Dialogo de agordo de tiparoj. -Comment[es]=Diálogo de configuración de fuentes. -Comment[fr]=Interface de configuration des polices. -Comment[hu]=Kiválaszthatod a számodra legmegfelellőbb betűtípust. -Comment[it]=Interfaccia per la configurazione dei font. -Comment[ja]= -Comment[pt]=Permite-lhe configurar o tipo de letra -Comment[pt_BR]= -Comment[tr]=Yazıtipi yapılandırma diyaloğu. -Comment[zh_CN]= -Comment[zh_TW]= -X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_icon_theme/.cvsignore b/src/modules/conf_icon_theme/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_icon_theme/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_icon_theme/Makefile.am b/src/modules/conf_icon_theme/Makefile.am deleted file mode 100644 index ed7d387d2..000000000 --- a/src/modules/conf_icon_theme/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_icon_theme - -# 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_icon_themes.c \ - e_int_config_icon_themes.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_icon_theme/e-module-conf_icon_theme.edj b/src/modules/conf_icon_theme/e-module-conf_icon_theme.edj deleted file mode 100644 index 7516322431f40d3ea866d94790cce12c649c03ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17315 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
vnxfq9Xc2~I*EVeB7uj0x*` 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ⅅ2ONvK7o4V^!o64;7Yi_ibMsAMXbh4ouf7xmNitPrs z8qLg&omAJy3+A@MSIULDw$equ<^om3GijyX8b^W8QKh*EQ+O~Fk(l^rt zhmTbrNqd<+6WDg-i5$s1b@43MB!|NWt1BK2)UiRsFGX)&Ih{LmrtnMg?b{r?ML62x zmuad5*32!b-0idMHcyce53aT$WZCA$VJY)SrnoQa`!}g-Pi;JZcYdw^@>s16xVH-) zQSr48!wrJczC3&sjkIxcy&Wyd&S!g~FYeS%1xw}>CyQRa66GwZ7H)15 z(vG@{pL5#BW?9U_V4{yrqJXHD6vyrn?Jr8&QG!K=+_+kc{m%TNRYBI8>z8GSMwVSv zc^_?o(biECqFz=qdplB8M^BP>a=1NhRjfeu@2u^Z_uLu5b$Bi=mc}lz&S0sNk zw6AmN%R4?GxaF*x-s`*axjjg>U+8>xR?Z?A0Eve1uP>+TTi-SiWLa&sTvBTefDF3qCrs!dYcgU0Z$U$@?}9 zLgsY0-~rKo$$l4m_pwGNTn^_9CkLmN$HsG<+c}H3&xY#-O%cRHukG7BHtsY`TG+l2J}bjsuEol-9nbBffiKP)aj zweR}vwBll8?b}Cp4{hNk>=?>=7NXX6{8r26>3iQk$-bwjmHH;XEN+-5Z4zg{C4BRH zNr9MhPyGu?hVjl9@7M+rerQ&{_uW0Dkagjpdi=)ou9cJe4_7a&64za-D_x|nyZUnR koSSW-=F*m8mQt2f`v>*O5!&LC60)5uO{{?I% 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 AcK`qY diff --git a/src/modules/conf_mouse_cursor/e_mod_main.c b/src/modules/conf_mouse_cursor/e_mod_main.c deleted file mode 100644 index 84aff5cb1..000000000 --- a/src/modules/conf_mouse_cursor/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 - Mouse Cursor" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look"); - e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "preferences-desktop-pointer", e_int_config_cursor); - 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", "appearance/mouse_cursor"))) e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("appearance/mouse_cursor"); - e_configure_registry_category_del("appearance"); - conf_module = NULL; - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} diff --git a/src/modules/conf_mouse_cursor/e_mod_main.h b/src/modules/conf_mouse_cursor/e_mod_main.h deleted file mode 100644 index 13b456f05..000000000 --- a/src/modules/conf_mouse_cursor/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_cursor.h" - -#undef E_TYPEDEFS -#include "e_int_config_cursor.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_cursor/module.desktop.in b/src/modules/conf_mouse_cursor/module.desktop.in deleted file mode 100644 index 6a0d45262..000000000 --- a/src/modules/conf_mouse_cursor/module.desktop.in +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Mouse Cursor -Name[ru]=Курсор мыши -Name[cs]=Kurzor myši -Name[de]= -Name[eo]=Musa kursoro -Name[es]=Cursor del mouse -Name[fr]=Curseur de souris -Name[hu]=Egér mutató -Name[it]=Cursore del mouse -Name[ja]= -Name[pt]=Cursor do rato -Name[pt_BR]= -Name[tr]=Fare İmleci -Name[zh_CN]= -Name[zh_TW]= -Icon=e-module-conf_mouse_cursor -Comment=Select the mouse cursor style. -Comment[ru]=Выбор стиля курсора мышки. -Comment[cs]=Výběr stylu kurzoru myši. -Comment[de]= -Comment[eo]=Elekti la stilon de la musa kursoro. -Comment[es]=Seleccione el diseño del cursor del mouse. -Comment[fr]=Permet de choisir le style du curseur de souris. -Comment[hu]=Az egér kurzor stílusának a beállítása. -Comment[it]=Seleziona lo stile di puntatore per il mouse. -Comment[ja]= -Comment[pt]=Permite-lhe escolher o cursor do rato -Comment[pt_BR]= -Comment[tr]=Fare imleci biçemini seçin. -Comment[zh_CN]= -Comment[zh_TW]= -X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_scale/.cvsignore b/src/modules/conf_scale/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_scale/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_scale/Makefile.am b/src/modules/conf_scale/Makefile.am deleted file mode 100644 index 0de9e3ab9..000000000 --- a/src/modules/conf_scale/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_scale - -# 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_scale.c \ - e_int_config_scale.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_scale/e-module-conf_scale.edj b/src/modules/conf_scale/e-module-conf_scale.edj deleted file mode 100644 index ddaec205027205245e7c4242912b7954841e40ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13792 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�Vqnjh3s{qMb(F=HHBuS6ONk{vaQ>O2+w%wzq%-wKQ3Yp(=6 zHSe^q&2MyvnzlLid+J=;*GrR~Gp@|k=0hTWLSfA#E|@1xnDvY&N$y~qAkPV4(fSEt>MR}>nn z;#Y4-Tee|EcrS-VH+k>#t~kf+-kcCLyD_mfC%wU5=X-3IIRpOf*lDm&`61yn$MMB8 z`_Fn+l@RYZs$ub}nEbZF^0Q}NzAb*?G;-3uN++TE+hJwOZmY}h|MbW@zUaL!Nx0UD3)NA5w&S}^$ob@ic`Cds~*uI>G)GJdq=G2*w zdN*vMt-ecIpM~n<>qfqh%~5TL_BHeElD+s)m|4xtJxX6VJ5uYu>)IdvqPl76xEDQa z4L-^rO4b{ovgBY-=SBO>4co1Ao@LN6I!>L-=*gu!vTV9H+7?}$-09!)P4)^O=e4SFwy8Pj zJkJi-Yrg!*rZHY1Ob8o!NpGKCY~qj6?HZMROr2lo8tdJ;?ccHKr|HU~=DbbUZ|nN7 zx+RpH$@n;0{h)#KrA>QN=|(Hb9fr1{RqUMpjaHNWe7>b^E>*|mJU^I-$4P2+tmHg8CG znr3i3k$1bB58L_0u_FeP6C32KM{eN{@|JeI z&U<&&+>!Gl@7u4}?CZ6B;&=~%tv+XT_mxEX=(r`Z?``XjlP&Cf>jmcPd8?EPdpR#w9#OezuRMQ3(vsy_BeQZITrhaix8viYoSg30?lUffA6`xfU~ z9+hd)Nhjsf*|Ld?)Z}k!#P{xyI>Iz)wAtx|rcl@0^WGoWk@7;}ZdKgG-u<5S(ktw% zG-k=H?rHAvs*U$mQWjV0>kRDE^Q+@itDY56WfKy|Eyy!hS^W=hLdtX%ho!;in=|G; zR2h5vor65zYfh8%<}(WAP3>amUND&HW@TQGe{zX-nodOHtBr}C&Z8Y`Zdo-J-)-#E zvgpm4QR(}3mffAnmg{@Eb@}#zTTKc_$u~{%7;AMtYwyZI1-mj2xBd8BGIg9$`Xt>- zp9z^8%Zq|syX1X-G(FN)^gQ1ur+90{tz9-Lg96Hm*c*d8c6S+ILOxNoAt^)9ZQ#VOK}{)y4&ffh+TRl@%i=6 zH~NomKCRcZtfj_3M#Xn&y_J)o&;HkXra#*y+AP0RE1y`n#pPZgrI3;Q3x+$|t=S&Py*DYM<<6x$8Mt4{KYIEfRzfrG5 zy3e;%vJZCHFVNI2R6bkGy5rDO7o*V`sP>6v*rxUY|B19Ue{2Vf9;>^jzjPBk4z11h zs?!|2e3Q*A_u-n5CCcB{UbFWkJ#;%BSe8e5$s#5qB9&Lq>l}C6sH5qol+PCp_!-Wckm;UMb z#+;c=qt@Q*xo)ABaEPa2vG)L@Da)$O%+=P#EE8qEYX9oWA=cQ~wHAAMcfYqQH_lLL z**5Uy*vfv5CnE&Ij`lpt&JYQ9WEynq-s{7^8UqFoId@0%=#1_mR)Zc_K6x8($hS;u z_Rom*b-Eu7KZXh-o1X=z=!U^PJV!K~&x#vX>9ym9&G-E;|1rJ)^W?4A^ox0A9gHWX3I=bp zxo@bk?@sjCRma^9gsk4}x6bpOL&5#n(G3I7ubN_azzone->container, NULL); +} + +static void +_e_mod_menu_wallpaper_add(void *data __UNUSED__, E_Menu *m) +{ + E_Menu_Item *mi; + + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Wallpaper")); + e_util_menu_item_theme_icon_set(mi, "preferences-desktop-wallpaper"); + e_menu_item_callback_set(mi, _e_mod_run_wallpaper_cb, NULL); +} + static void -_e_mod_run_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_mod_run_theme_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) { e_configure_registry_call("appearance/theme", m->zone->container, NULL); } -/* menu item add hook */ static void -_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) +_e_mod_menu_theme_add(void *data __UNUSED__, E_Menu *m) { E_Menu_Item *mi; mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Theme")); e_util_menu_item_theme_icon_set(mi, "preferences-desktop-theme"); - e_menu_item_callback_set(mi, _e_mod_run_cb, NULL); + e_menu_item_callback_set(mi, _e_mod_run_theme_cb, NULL); } diff --git a/src/modules/conf_theme/e_mod_main.h b/src/modules/conf_theme/e_mod_main.h index 2e78ceb60..9022f3c78 100644 --- a/src/modules/conf_theme/e_mod_main.h +++ b/src/modules/conf_theme/e_mod_main.h @@ -2,13 +2,36 @@ #define E_MOD_MAIN_H #define E_TYPEDEFS 1 +#include "e_int_config_borders.h" +#include "e_int_config_color_classes.h" +#include "e_int_config_cursor.h" +#include "e_int_config_fonts.h" +#include "e_int_config_icon_themes.h" +#include "e_int_config_scale.h" +#include "e_int_config_startup.h" #include "e_int_config_theme.h" #include "e_int_config_theme_import.h" #include "e_int_config_theme_web.h" +#include "e_int_config_transitions.h" +#include "e_int_config_wallpaper.h" +#include "e_int_config_wallpaper_import.h" +#include "e_int_config_wallpaper_web.h" + #undef E_TYPEDEFS +#include "e_int_config_borders.h" +#include "e_int_config_color_classes.h" +#include "e_int_config_cursor.h" +#include "e_int_config_fonts.h" +#include "e_int_config_icon_themes.h" +#include "e_int_config_scale.h" +#include "e_int_config_startup.h" #include "e_int_config_theme.h" #include "e_int_config_theme_import.h" #include "e_int_config_theme_web.h" +#include "e_int_config_transitions.h" +#include "e_int_config_wallpaper.h" +#include "e_int_config_wallpaper_import.h" +#include "e_int_config_wallpaper_web.h" EAPI extern E_Module_Api e_modapi; diff --git a/src/modules/conf_transitions/.cvsignore b/src/modules/conf_transitions/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_transitions/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_transitions/Makefile.am b/src/modules/conf_transitions/Makefile.am deleted file mode 100644 index 06352d1a8..000000000 --- a/src/modules/conf_transitions/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_transitions - -# 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_transitions.c \ - e_int_config_transitions.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_transitions/e-module-conf_transitions.edj b/src/modules/conf_transitions/e-module-conf_transitions.edj deleted file mode 100644 index 2216bcb99ac923e22d67db9da6f12bdc7de6dbcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16270 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 diff --git a/src/modules/conf_transitions/e_mod_main.c b/src/modules/conf_transitions/e_mod_main.c deleted file mode 100644 index a994b7b00..000000000 --- a/src/modules/conf_transitions/e_mod_main.c +++ /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 - Transitions" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - e_configure_registry_category_add("appearance", 10, _("Look"), NULL, - "preferences-look"); - e_configure_registry_item_add("appearance/transitions", 80, - _("Transitions"), NULL, - "preferences-transitions", - e_int_config_transitions); - 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", "appearance/transitions"))) - e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("appearance/transitions"); - e_configure_registry_category_del("appearance"); - conf_module = NULL; - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} diff --git a/src/modules/conf_transitions/e_mod_main.h b/src/modules/conf_transitions/e_mod_main.h deleted file mode 100644 index ee7dec666..000000000 --- a/src/modules/conf_transitions/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_transitions.h" - -#undef E_TYPEDEFS -#include "e_int_config_transitions.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_transitions/module.desktop.in b/src/modules/conf_transitions/module.desktop.in deleted file mode 100644 index b533eb69c..000000000 --- a/src/modules/conf_transitions/module.desktop.in +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Transitions -Name[ru]=Переходы -Name[cs]=Přechody -Name[de]= -Name[eo]=Transiroj -Name[es]=Transiciones -Name[fr]=Transitions -Name[hu]=Átmenetek -Name[it]=Transizioni -Name[ja]= -Name[pt]=Transicões -Name[pt_BR]= -Name[tr]=Geçişler -Name[zh_CN]= -Name[zh_TW]= -Icon=e-module-conf_transitions -Comment=Used to choose a default transition. Transitions are used upon wallpaper changes, among other things. -Comment[ru]=Используется для выбора эффекта перехода. Переходы срабатывают при смене обоев, так и в других случаях. -Comment[cs]=Volby přechodů. Použity při změně pozadí plochy a jiných akcích. -Comment[de]= -Comment[eo]=Elekti defaŭltan transiron. Transiroj estas uzataj dum ŝanĝoj de tapeto interalie. -Comment[es]=Usado para elegir la transición predeterminada. Las transiciones se usan cuando se cambia el fondo de pantalla, entre otras cosas. -Comment[fr]=Permet de choisir une transition par défaut. Les transitions sont utilisées lors des changements de fonds d'écran, entre autres. -Comment[hu]=Ennek segítségével be tudod állítani az alapértelmezett átmeneteket a munkaasztal váltásnál, és a háttérkép váltásnál. -Comment[it]=Usato per scegliere una transizione predefinita. Le transizioni sono usate al cambio di sfondo, e per altre cose. -Comment[ja]= -Comment[pt]=Permite-lhe configurar as transições a utilizar, entre outras coisas, nas alterações do papel de parede -Comment[pt_BR]= -Comment[tr]=Öntanımlı geçişi seçmekte kullanılır. Geçişler duvarkağıdı değişimleri gibi geçişlerde görünürler. -Comment[zh_CN]= -Comment[zh_TW]= -X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_wallpaper/.cvsignore b/src/modules/conf_wallpaper/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_wallpaper/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_wallpaper/Makefile.am b/src/modules/conf_wallpaper/Makefile.am deleted file mode 100644 index 542fa8a48..000000000 --- a/src/modules/conf_wallpaper/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_wallpaper - -# 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@ \ - @EXCHANGE_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_wallpaper.c \ - e_int_config_wallpaper.h \ - e_int_config_wallpaper_import.c \ - e_int_config_wallpaper_import.h \ - e_int_config_wallpaper_web.c \ - e_int_config_wallpaper_web.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ @EXCHANGE_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_wallpaper/e_int_config_wallpaper_gradient.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c deleted file mode 100644 index 12ef8550e..000000000 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c +++ /dev/null @@ -1,486 +0,0 @@ -#include "e.h" -#include "e_mod_main.h" - -#define GRAD_H 0 -#define GRAD_V 1 -#define GRAD_DU 2 -#define GRAD_DD 3 -#define GRAD_RAD 4 - -#define TYPE_LINEAR 0 -#define TYPE_RADIAL 1 - -typedef struct _Import Import; - -struct _Import -{ - E_Config_Dialog *parent; - E_Config_Dialog_Data *cfdata; - - E_Dialog *dia; - - Evas_Object *fill_h_obj; - Evas_Object *fill_v_obj; - Evas_Object *fill_du_obj; - Evas_Object *fill_dd_obj; - Evas_Object *fill_rad_obj; - - Evas_Object *well1, *well2; - - Evas_Object *preview; - - Ecore_Exe *exe; - Ecore_Event_Handler *exe_handler; - char *tmpf; - char *fdest; -}; - -struct _E_Config_Dialog_Data -{ - char *name; - int mode; - int spread; - - E_Color *color1, *color2; -}; - -static void _import_edj_gen(Import *import); -static Eina_Bool _import_cb_edje_cc_exit(void *data, int type, void *event); -static void _import_cb_close(void *data, E_Dialog *dia); -static void _import_cb_ok(void *data, E_Dialog *dia); -static void _import_config_save(Import *import); -static void _import_cb_dia_del(void *obj); -static Evas_Object *_preview_widget_add(Evas *evas); -static void _import_cb_on_change(void *data, Evas_Object *obj); -static void _import_cb_color_swap(void *data, void *data2); - -E_Dialog * -e_int_config_wallpaper_gradient(E_Config_Dialog *parent) -{ - Evas *evas; - E_Dialog *dia; - Import *import; - Evas_Object *o, *ol, *of, *ord, *ot, *ott; - Evas_Coord mw, mh; - E_Radio_Group *rg; - E_Config_Dialog_Data *cfdata; - - import = E_NEW(Import, 1); - if (!import) return NULL; - - dia = e_dialog_new(parent->con, "E", "_wallpaper_gradient_dialog"); - if (!dia) - { - free(import); - return NULL; - } - - dia->data = import; - e_object_del_attach_func_set(E_OBJECT(dia), _import_cb_dia_del); - e_win_centered_set(dia->win, 1); - - cfdata = E_NEW(E_Config_Dialog_Data, 1); - cfdata->mode = GRAD_H; - cfdata->spread = 0; - import->cfdata = cfdata; - import->dia = dia; - - cfdata->name = strdup("gradient"); - - evas = e_win_evas_get(dia->win); - - import->parent = parent; - - e_dialog_title_set(dia, _("Create a gradient...")); - - cfdata->color1 = calloc(1, sizeof(E_Color)); - cfdata->color1->a = 255; - cfdata->color2 = calloc(1, sizeof(E_Color)); - cfdata->color2->a = 255; - - cfdata->color1->r = e_config->wallpaper_grad_c1_r; - cfdata->color1->g = e_config->wallpaper_grad_c1_g; - cfdata->color1->b = e_config->wallpaper_grad_c1_b; - cfdata->color2->r = e_config->wallpaper_grad_c2_r; - cfdata->color2->g = e_config->wallpaper_grad_c2_g; - cfdata->color2->b = e_config->wallpaper_grad_c2_b; - e_color_update_rgb(cfdata->color1); - e_color_update_rgb(cfdata->color2); - - ol = e_widget_list_add(evas, 0, 0); - - ot = e_widget_table_add(evas, 0); - evas_object_show(ot); - ott = e_widget_table_add(evas, 0); - evas_object_show(ott); - - o = e_widget_label_add(evas, _("Name:")); - evas_object_show(o); - e_widget_table_object_append(ott, o, 0, 0, 1, 1, 0, 1, 0, 1); - - o = e_widget_label_add(evas, _("Color 1:")); - evas_object_show(o); - e_widget_table_object_append(ott, o, 0, 1, 1, 1, 0, 1, 0, 1); - - o = e_widget_label_add(evas, _("Color 2:")); - evas_object_show(o); - e_widget_table_object_append(ott, o, 0, 2, 1, 1, 0, 1, 0, 1); - - o = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL); - evas_object_show(o); - e_widget_table_object_append(ott, o, 1, 0, 1, 1, 1, 1, 1, 1); - - o = e_widget_color_well_add(evas, cfdata->color1, 1); - e_widget_on_change_hook_set(o, _import_cb_on_change, import); - evas_object_show(o); - e_widget_table_object_append(ott, o, 1, 1, 1, 1, 1, 1, 1, 1); - import->well1 = o; - - o = e_widget_color_well_add(evas, cfdata->color2, 1); - e_widget_on_change_hook_set(o, _import_cb_on_change, import); - evas_object_show(o); - e_widget_table_object_append(ott, o, 1, 2, 1, 1, 1, 1, 1, 1); - import->well2 = o; - - o = e_widget_button_add(evas, "Swap Colors", "edit-swap", _import_cb_color_swap, import, NULL); - evas_object_show(o); - e_widget_table_object_append(ott, o, 1, 3, 1, 1, 1, 1, 1, 1); - - e_widget_table_object_append(ot, ott, 0, 0, 1, 1, 1, 1, 1, 1); - - of = e_widget_framelist_add(evas, _("Preview"), 1); - o = _preview_widget_add(evas); - evas_object_show(o); - evas_object_resize(o, 200, 150); - e_widget_size_min_set(o, 200, 150); - e_widget_framelist_object_append(of, o); - e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1); - import->preview = o; - _import_cb_on_change(import, NULL); - - of = e_widget_framelist_add(evas, _("Fill Options"), 1); - rg = e_widget_radio_group_new(&(cfdata->mode)); - - ord = e_widget_radio_icon_add(evas, _("Horizontal"), "enlightenment/gradient_h", 24, 24, GRAD_H, rg); - e_widget_on_change_hook_set(ord, _import_cb_on_change, import); - import->fill_h_obj = ord; - e_widget_framelist_object_append(of, ord); - - ord = e_widget_radio_icon_add(evas, _("Vertical"), "enlightenment/gradient_v", 24, 24, GRAD_V, rg); - e_widget_on_change_hook_set(ord, _import_cb_on_change, import); - import->fill_h_obj = ord; - e_widget_framelist_object_append(of, ord); - - ord = e_widget_radio_icon_add(evas, _("Diagonal Up"), "enlightenment/gradient_du", 24, 24, GRAD_DU, rg); - e_widget_on_change_hook_set(ord, _import_cb_on_change, import); - import->fill_h_obj = ord; - e_widget_framelist_object_append(of, ord); - - ord = e_widget_radio_icon_add(evas, _("Diagonal Down"), "enlightenment/gradient_dd", 24, 24, GRAD_DD, rg); - e_widget_on_change_hook_set(ord, _import_cb_on_change, import); - import->fill_h_obj = ord; - e_widget_framelist_object_append(of, ord); - - ord = e_widget_radio_icon_add(evas, _("Radial"), "enlightenment/gradient_rad", 24, 24, GRAD_RAD, rg); - e_widget_on_change_hook_set(ord, _import_cb_on_change, import); - import->fill_h_obj = ord; - e_widget_framelist_object_append(of, ord); - - e_widget_table_object_append(ot, of, 0, 2, 2, 1, 1, 1, 1, 1); - e_widget_list_object_append(ol, ot, 1, 1, 0.5); - - e_widget_size_min_get(ol, &mw, &mh); - e_dialog_content_set(dia, ol, mw, mh); - - e_dialog_button_add(dia, _("OK"), NULL, _import_cb_ok, cfdata); - e_dialog_button_add(dia, _("Cancel"), NULL, _import_cb_close, cfdata); - - e_dialog_resizable_set(dia, 0); - e_dialog_show(dia); - - e_dialog_border_icon_set(dia, "preferences-gradient"); - return dia; -} - -void -e_int_config_wallpaper_gradient_del(E_Dialog *dia) -{ - Import *import; - - import = dia->data; - _import_config_save(import); - - if (import->exe_handler) ecore_event_handler_del(import->exe_handler); - import->exe_handler = NULL; - if (import->tmpf) unlink(import->tmpf); - E_FREE(import->tmpf); - E_FREE(import->fdest); - import->exe = NULL; - - e_int_config_wallpaper_gradient_done(import->parent); - E_FREE(import->cfdata->name); - E_FREE(import->cfdata->color1); - E_FREE(import->cfdata->color2); - E_FREE(import->cfdata); - E_FREE(import); - e_object_unref(E_OBJECT(dia)); - -} - -static void -_import_config_save(Import *import) -{ - if (import->cfdata->color1) - { - e_config->wallpaper_grad_c1_r = import->cfdata->color1->r; - e_config->wallpaper_grad_c1_g = import->cfdata->color1->g; - e_config->wallpaper_grad_c1_b = import->cfdata->color1->b; - } - if (import->cfdata->color2) - { - e_config->wallpaper_grad_c2_r = import->cfdata->color2->r; - e_config->wallpaper_grad_c2_g = import->cfdata->color2->g; - e_config->wallpaper_grad_c2_b = import->cfdata->color2->b; - } - e_config_save_queue(); -} - -static void -_import_edj_gen(Import *import) -{ - int fd, num = 1; - const char *file; - char buf[4096], cmd[4096], tmpn[4096]; - char *fstrip; - FILE *f; - size_t len, off; - - file = import->cfdata->name; - fstrip = ecore_file_strip_ext(file); - if (!fstrip) return; - len = e_user_dir_snprintf(buf, sizeof(buf), "backgrounds/%s.edj", fstrip); - if (len >= sizeof(buf)) return; - off = len - (sizeof(".edj") - 1); - while (ecore_file_exists(buf)) - { - snprintf(buf + off, sizeof(buf) - off, "-%d.edj", num); - num++; - } - free(fstrip); - strcpy(tmpn, "/tmp/e_bgdlg_new.edc-tmp-XXXXXX"); - fd = mkstemp(tmpn); - if (fd < 0) - { - printf("Error Creating tmp file: %s\n", strerror(errno)); - return; - } - close(fd); - - f = fopen(tmpn, "w"); - if (!f) - { - printf("Cannot open %s for writing\n", tmpn); - return; - } - - fstrip = strdup(e_util_filename_escape(file)); - - fprintf(f, - "spectra { spectrum { name: \"gradient\"; color: %d %d %d 255 1; color: %d %d %d 255 1; } }\n" - "collections {\n" - "group {\n" - "name: \"e/desktop/background\";\n" - "parts {\n" - "part {\n" - " name: \"gradient\";\n" - " type: GRADIENT;\n" - " description {\n" - " state: \"default\" 0.0;\n" - " gradient.spectrum: \"gradient\";\n", - import->cfdata->color1->r, import->cfdata->color1->g, import->cfdata->color1->b, - import->cfdata->color2->r, import->cfdata->color2->g, import->cfdata->color2->b); - - switch (import->cfdata->mode) - { - case GRAD_H: - fprintf(f, - " gradient.rel1.relative: 0 0.5;\n" - " gradient.rel1.offset: 0 0;\n" - " gradient.rel2.relative: 1 0.5;\n" - " gradient.rel2.offset: -1 0;\n"); - break; - case GRAD_V: - break; - case GRAD_DU: - fprintf(f, - " gradient.rel1.relative: 0 1;\n" - " gradient.rel1.offset: 0 -1;\n" - " gradient.rel2.relative: 1 0;\n" - " gradient.rel2.offset: -1 0;\n"); - break; - case GRAD_DD: - fprintf(f, - " gradient.rel1.relative: 0 0;\n" - " gradient.rel1.offset: 0 0;\n" - " gradient.rel2.relative: 1 1;\n" - " gradient.rel2.offset: -1 -1;\n"); - break; - case GRAD_RAD: - fprintf(f, - " gradient.type: \"radial\";\n" - " fill.origin.relative: 0.5 0.5;\n"); - break; - default: - /* won't happen */ - break; - - } - fprintf(f, "}}}}}\n"); - free(fstrip); - - fclose(f); - - snprintf(cmd, sizeof(cmd), "edje_cc -v %s %s", - tmpn, e_util_filename_escape(buf)); - - import->tmpf = strdup(tmpn); - import->fdest = strdup(buf); - import->exe_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _import_cb_edje_cc_exit, import); - import->exe = ecore_exe_run(cmd, NULL); -} - -static Eina_Bool -_import_cb_edje_cc_exit(void *data, __UNUSED__ int type, void *event) -{ - Import *import; - Ecore_Exe_Event_Del *ev; - - ev = event; - import = data; - if (ev->exe != import->exe) return ECORE_CALLBACK_PASS_ON; - - if (ev->exit_code != 0) - { - e_util_dialog_show(_("Gradient Creation Error"), - _("For some reason, Enlightenment was unable to create a gradient.")); - } - - e_int_config_wallpaper_update(import->parent, import->fdest); - - e_int_config_wallpaper_gradient_del(import->dia); - return ECORE_CALLBACK_DONE; -} - -static void -_import_cb_close(void *data, E_Dialog *dia) -{ - e_int_config_wallpaper_gradient_del(dia); -} - -static void -_import_cb_ok(void *data, E_Dialog *dia) -{ - Import *import; - - import = dia->data; - - if (dia && import->cfdata->name) - { - _import_edj_gen(import); - return; - } - e_int_config_wallpaper_gradient_del(dia); -} - -static void -_import_cb_dia_del(void *obj) -{ - E_Dialog *dia = obj; - e_int_config_wallpaper_gradient_del(dia); -} - -static Evas_Object * -_preview_widget_add(Evas *evas) -{ - Evas_Object *obj, *o, *g; - - obj = e_widget_add(evas); - - o = edje_object_add(evas); - e_theme_edje_object_set(o, "base/theme/widgets", "e/widgets/gradpreview"); - e_widget_sub_object_add(obj, o); - e_widget_resize_object_set(obj, o); - evas_object_show(o); - - g = evas_object_gradient_add(evas); - evas_object_show(g); - e_widget_sub_object_add(obj, g); - edje_object_part_swallow(o, "e.swallow.content", g); - - e_widget_data_set(obj, g); - - return obj; -} - -static void -_import_cb_on_change(void *data, Evas_Object *obj) -{ - Import *import; - Evas_Object *grad; - Evas_Coord w, h; - - import = data; - - grad = e_widget_data_get(import->preview); - evas_object_geometry_get(grad, NULL, NULL, &w, &h); - - evas_object_gradient_clear(grad); - evas_object_gradient_color_stop_add(grad, import->cfdata->color1->r, import->cfdata->color1->g, import->cfdata->color1->b, 255, 1); - evas_object_gradient_color_stop_add(grad, import->cfdata->color2->r, import->cfdata->color2->g, import->cfdata->color2->b, 255, 1); - - switch (import->cfdata->mode) - { - case GRAD_H: - evas_object_gradient_type_set(grad, "linear", NULL); - evas_object_gradient_angle_set(grad, 270); - evas_object_gradient_fill_set(grad, 0, 0, w, h); - break; - case GRAD_V: - evas_object_gradient_type_set(grad, "linear", NULL); - evas_object_gradient_angle_set(grad, 0); - evas_object_gradient_fill_set(grad, 0, 0, w, h); - break; - case GRAD_DU: - evas_object_gradient_type_set(grad, "linear.codiag", NULL); - evas_object_gradient_angle_set(grad, 180); - evas_object_gradient_fill_set(grad, 0, 0, w, h); - break; - case GRAD_DD: - evas_object_gradient_type_set(grad, "linear.diag", NULL); - evas_object_gradient_angle_set(grad, 0); - evas_object_gradient_fill_set(grad, 0, 0, w, h); - break; - case GRAD_RAD: - evas_object_gradient_type_set(grad, "radial", NULL); - evas_object_gradient_fill_set(grad, w / 2, h / 2, w, h); - break; - } -} - -static void -_import_cb_color_swap(void *data, void *data2) -{ - Import *import; - E_Color *tmp; - - import = data; - - tmp = malloc(sizeof(E_Color)); - e_color_copy(import->cfdata->color1, tmp); - e_color_copy(import->cfdata->color2, import->cfdata->color1); - e_color_copy(tmp, import->cfdata->color2); - - e_widget_color_well_update(import->well1); - e_widget_color_well_update(import->well2); - _import_cb_on_change(import, NULL); -} diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h deleted file mode 100644 index cb1b4a040..000000000 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifdef E_TYPEDEFS -#else -#ifndef E_INT_CONFIG_WALLPAPER_GRADIENT_H -#define E_INT_CONFIG_WALLPAPER_GRADIENT_H - -E_Dialog *e_int_config_wallpaper_gradient(E_Config_Dialog *parent); -void e_int_config_wallpaper_gradient_del(E_Dialog *dia); - -#endif -#endif diff --git a/src/modules/conf_wallpaper/e_mod_main.c b/src/modules/conf_wallpaper/e_mod_main.c deleted file mode 100644 index db17ad1b1..000000000 --- a/src/modules/conf_wallpaper/e_mod_main.c +++ /dev/null @@ -1,83 +0,0 @@ -#include "e.h" -#include "e_mod_main.h" - -/* actual module specifics */ -static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi); -static void _e_mod_menu_add(void *data, E_Menu *m); - -static E_Module *conf_module = NULL; -static E_Int_Menu_Augmentation *maug = NULL; - -/* module setup */ -EAPI E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "Settings - Wallpaper" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - e_configure_registry_category_add("appearance", 10, _("Look"), NULL, - "preferences-look"); - e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, - "preferences-desktop-wallpaper", e_int_config_wallpaper); - e_configure_registry_category_add("internal", -1, _("Internal"), - NULL, "enlightenment/internal"); - e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), - NULL, "preferences-system-windows", e_int_config_wallpaper_desk); - maug = - e_int_menus_menu_augmentation_add_sorted("config/1", _("Wallpaper"), - _e_mod_menu_add, NULL, NULL, NULL); - - conf_module = m; - e_module_delayed_set(m, 1); - return m; -} - -EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) -{ - E_Config_Dialog *cfd; - - /* remove module-supplied menu additions */ - if (maug) - { - e_int_menus_menu_augmentation_del("config/1", maug); - maug = NULL; - } - while ((cfd = e_config_dialog_get("E", "appearance/wallpaper"))) - e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("internal/wallpaper_desk"); - e_configure_registry_category_del("internal"); - e_configure_registry_item_del("appearance/wallpaper"); - e_configure_registry_category_del("appearance"); - - conf_module = NULL; - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} - -/* menu item callback(s) */ -static void -_e_mod_run_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) -{ - e_configure_registry_call("appearance/wallpaper", m->zone->container, NULL); -} - -/* menu item add hook */ -static void -_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) -{ - E_Menu_Item *mi; - - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Wallpaper")); - e_util_menu_item_theme_icon_set(mi, "preferences-desktop-wallpaper"); - e_menu_item_callback_set(mi, _e_mod_run_cb, NULL); -} diff --git a/src/modules/conf_wallpaper/e_mod_main.h b/src/modules/conf_wallpaper/e_mod_main.h deleted file mode 100644 index 92980cea4..000000000 --- a/src/modules/conf_wallpaper/e_mod_main.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -#define E_TYPEDEFS 1 -#include "e_int_config_wallpaper.h" -#include "e_int_config_wallpaper_import.h" -#include "e_int_config_wallpaper_web.h" -#undef E_TYPEDEFS -#include "e_int_config_wallpaper.h" -#include "e_int_config_wallpaper_import.h" -#include "e_int_config_wallpaper_web.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_wallpaper/module.desktop.in b/src/modules/conf_wallpaper/module.desktop.in deleted file mode 100644 index 77d0b0b17..000000000 --- a/src/modules/conf_wallpaper/module.desktop.in +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Wallpaper -Name[ru]=Обои -Name[cs]=Pozadí plochy -Name[de]= -Name[eo]=Tapeto -Name[es]=Fondo de pantalla -Name[fr]=Fond d'écran -Name[hu]=Háttérkép -Name[it]=Sfondo -Name[ja]= -Name[pt]=Papel de parede -Name[pt_BR]= -Name[tr]=Duvarkağıdı -Name[zh_CN]= -Name[zh_TW]= -Icon=preferences-desktop-wallpaper -Comment=Used to pick a wallpaper. -Comment[ru]=Используется для выбора обоев. -Comment[cs]=Použit k volbě pozadí. -Comment[de]= -Comment[eo]=Elekti tapeton. -Comment[es]=Para elegir un fondo de pantalla. -Comment[fr]=Permet de choisir un fond d'écran. -Comment[hu]=Háttérkép beállító modul. -Comment[it]=Usato per selezionare uno sfondo. -Comment[ja]= -Comment[pt]=Permite-lhe escolher o papel de parede -Comment[pt_BR]= -Comment[tr]=Duvarkağıdı seçiminde kullanılır. -Comment[zh_CN]= -Comment[zh_TW]= -X-Enlightenment-ModuleType=settings