and now wizard is pretty much required. functionalyl its almost all there.

just the init of ibar/fileman favorites is the old untar code moved to
wizard. icons for all profiels are nto done yet - doing. broung some
backgrounds back - small .edj files though.



SVN revision: 37119

config/Makefile.am

@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = default standard
+SUBDIRS = default standard minimalist scaleable netbook
 
 EET_EET = @eet_eet@
 

config/default/Makefile.am

@@ -3,29 +3,13 @@ MAINTAINERCLEANFILES = Makefile.in
 EET_EET = @eet_eet@
 
 EXTRA_DIST = \
-	e.src \
-	module.battery.src \
-	module.cpufreq.src \
-	module.dropshadow.src \
-	module.fileman.src \
-	module.ibar.src \
-	module.ibox.src \
-	module.pager.src \
-	module.temperature.src
+	e.src
 
 filesdir = $(datadir)/enlightenment/data/config/default
 files_DATA = \
         profile.desktop \
         icon.png \
-	e.cfg \
-	module.battery.cfg \
-	module.cpufreq.cfg \
-	module.dropshadow.cfg \
-	module.fileman.cfg \
-	module.ibar.cfg \
-	module.ibox.cfg \
-	module.pager.cfg \
-	module.temperature.cfg
+	e.cfg
 
 %.cfg: %.src
 	$(EET_EET) -e \

config/minimalist/.cvsignore

@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+*.cfg

config/minimalist/Makefile.am

@@ -0,0 +1,37 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EET_EET = @eet_eet@
+
+EXTRA_DIST = \
+	e.src \
+	module.battery.src \
+	module.cpufreq.src \
+	module.dropshadow.src \
+	module.fileman.src \
+	module.ibar.src \
+	module.ibox.src \
+	module.pager.src \
+	module.temperature.src
+
+filesdir = $(datadir)/enlightenment/data/config/minimalist
+files_DATA = \
+        profile.desktop \
+        icon.png \
+	e.cfg \
+	module.battery.cfg \
+	module.cpufreq.cfg \
+	module.dropshadow.cfg \
+	module.fileman.cfg \
+	module.ibar.cfg \
+	module.ibox.cfg \
+	module.pager.cfg \
+	module.temperature.cfg
+
+%.cfg: %.src
+	$(EET_EET) -e \
+	$(top_builddir)/config/minimalist/$@ config \
+	$< 1
+
+clean-local:
+	rm -rf *.cfg *~
+	

config/minimalist/module.dropshadow.src

@@ -0,0 +1,7 @@
+group "Dropshadow_Config" struct {
+  value "shadow_x" int: 2;
+  value "shadow_y" int: 2;
+  value "blur_size" int: 10;
+  value "quality" int: 4;
+  value "shadow_darkness" double: 0.2500000000000000000000000;
+}

config/minimalist/module.ibar.src

@@ -7,13 +7,6 @@ group "IBar_Config" struct {
       value "eap_label" int: 0;
     }
   }
-  group "items" list {
-    group "IBar_Config_Item" struct {
-      value "id" string: "ibar.1";
-      value "show_label" int: 1;
-      value "eap_label" int: 0;
-    }
-  }
   group "items" list {
     group "IBar_Config_Item" struct {
       value "id" string: "ibar.1";

config/minimalist/module.pager.src

@@ -0,0 +1,15 @@
+group "Pager_Config" struct {
+  value "popup" uint: 1;
+  value "popup_speed" double: 1.0000000000000000000000000;
+  value "popup_urgent" uint: 0;
+  value "popup_urgent_stick" uint: 0;
+  value "popup_urgent_speed" double: 1.5000000000000000000000000;
+  value "show_desk_names" uint: 0;
+  value "popup_height" int: 60;
+  value "popup_act_height" int: 60;
+  value "drag_resist" uint: 3;
+  value "btn_drag" uchar: 1;
+  value "btn_noplace" uchar: 2;
+  value "btn_desk" uchar: 0;
+  value "flip_desk" uchar: 0;
+}

config/minimalist/profile.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Link
+Name=Minimalist
+Icon=icon.png
+Comment=A mininimalist setup<br>with very few things on<br>the screen. Should<br>appeal to Those<br>that like as little<br>clutter as possible.

config/netbook/.cvsignore

@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+*.cfg

config/netbook/Makefile.am

@@ -0,0 +1,37 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EET_EET = @eet_eet@
+
+EXTRA_DIST = \
+	e.src \
+	module.battery.src \
+	module.cpufreq.src \
+	module.dropshadow.src \
+	module.fileman.src \
+	module.ibar.src \
+	module.ibox.src \
+	module.pager.src \
+	module.temperature.src
+
+filesdir = $(datadir)/enlightenment/data/config/netbook
+files_DATA = \
+        profile.desktop \
+        icon.png \
+	e.cfg \
+	module.battery.cfg \
+	module.cpufreq.cfg \
+	module.dropshadow.cfg \
+	module.fileman.cfg \
+	module.ibar.cfg \
+	module.ibox.cfg \
+	module.pager.cfg \
+	module.temperature.cfg
+
+%.cfg: %.src
+	$(EET_EET) -e \
+	$(top_builddir)/config/netbook/$@ config \
+	$< 1
+
+clean-local:
+	rm -rf *.cfg *~
+	

config/netbook/module.battery.src

@@ -0,0 +1,6 @@
+group "Battery_Config" struct {
+  value "poll_interval" int: 512;
+  value "alert" int: 30;
+  value "alert_p" int: 10;
+  value "alert_timeout" int: 0;
+}

config/netbook/module.cpufreq.src

@@ -0,0 +1,4 @@
+group "Cpufreq_Config" struct {
+  value "poll_interval" int: 32;
+  value "restore_governor" int: 1;
+}

config/netbook/module.dropshadow.src

@@ -3,5 +3,5 @@ group "Dropshadow_Config" struct {
   value "shadow_y" int: 4;
   value "blur_size" int: 10;
   value "quality" int: 2;
-  value "shadow_darkness" double: 0.5;
+  value "shadow_darkness" double: 0.5000000000000000000000000;
 }

config/netbook/module.fileman.src

@@ -0,0 +1,28 @@
+group "Fileman_Config" struct {
+  value "config_version" int: 65793;
+  value "view.mode" int: 1;
+  value "view.open_dirs_in_place" uchar: 0;
+  value "view.selector" uchar: 0;
+  value "view.single_click" uchar: 0;
+  value "view.no_subdir_jump" uchar: 0;
+  value "view.no_subdir_drop" uchar: 0;
+  value "view.always_order" uchar: 0;
+  value "view.link_drop" uchar: 0;
+  value "view.fit_custom_pos" uchar: 0;
+  value "view.show_full_path" uchar: 0;
+  value "view.show_desktop_icons" uchar: 1;
+  value "view.show_toolbar" uchar: 0;
+  value "icon.icon.w" int: 48;
+  value "icon.icon.h" int: 48;
+  value "icon.list.w" int: 16;
+  value "icon.list.h" int: 16;
+  value "icon.fixed.w" uchar: 0;
+  value "icon.fixed.h" uchar: 0;
+  value "icon.extension.show" uchar: 1;
+  value "list.sort.no_case" uchar: 1;
+  value "list.sort.dirs.first" uchar: 1;
+  value "list.sort.dirs.last" uchar: 0;
+  value "selection.single" uchar: 0;
+  value "selection.windows_modifiers" uchar: 0;
+  value "theme.fixed" uchar: 0;
+}

config/netbook/module.ibar.src

@@ -0,0 +1,18 @@
+group "IBar_Config" struct {
+  group "items" list {
+    group "IBar_Config_Item" struct {
+      value "id" string: "0";
+      value "dir" string: "default";
+      value "show_label" int: 1;
+      value "eap_label" int: 0;
+    }
+  }
+  group "items" list {
+    group "IBar_Config_Item" struct {
+      value "id" string: "ibar.1";
+      value "dir" string: "default";
+      value "show_label" int: 1;
+      value "eap_label" int: 0;
+    }
+  }
+}

config/netbook/module.ibox.src

@@ -0,0 +1,20 @@
+group "IBox_Config" struct {
+  group "items" list {
+    group "IBox_Config_Item" struct {
+      value "id" string: "0";
+      value "show_label" int: 0;
+      value "show_zone" int: 1;
+      value "show_desk" int: 0;
+      value "icon_label" int: 0;
+    }
+  }
+  group "items" list {
+    group "IBox_Config_Item" struct {
+      value "id" string: "ibox.1";
+      value "show_label" int: 0;
+      value "show_zone" int: 1;
+      value "show_desk" int: 0;
+      value "icon_label" int: 0;
+    }
+  }
+}

config/netbook/module.pager.src

@@ -1,9 +1,9 @@
 group "Pager_Config" struct {
   value "popup" uint: 1;
-  value "popup_speed" double: 1.0;
+  value "popup_speed" double: 1.0000000000000000000000000;
   value "popup_urgent" uint: 0;
   value "popup_urgent_stick" uint: 0;
-  value "popup_urgent_speed" double: 1.5;
+  value "popup_urgent_speed" double: 1.5000000000000000000000000;
   value "show_desk_names" uint: 1;
   value "popup_height" int: 60;
   value "popup_act_height" int: 60;

config/netbook/module.temperature.src

@@ -0,0 +1,13 @@
+group "Temperature_Config" struct {
+  group "faces" hash {
+    key "temperature.1";
+    group "Temperature_Config_Face" struct {
+      value "id" string: "temperature.1";
+      value "poll_interval" int: 128;
+      value "low" int: 30;
+      value "high" int: 80;
+      value "sensor_type" int: 0;
+      value "units" int: 0;
+    }
+  }
+}

config/netbook/profile.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Link
+Name=Netbook
+Icon=icon.png
+Comment=If you have a very<br>small, low-powered laptop<br>(also known as Netbooks),<br>then this profile is for<br>you. It has heavier<br>features turned off<br>to save resources.

config/scaleable/.cvsignore

@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+*.cfg

config/scaleable/Makefile.am

@@ -0,0 +1,37 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EET_EET = @eet_eet@
+
+EXTRA_DIST = \
+	e.src \
+	module.battery.src \
+	module.cpufreq.src \
+	module.dropshadow.src \
+	module.fileman.src \
+	module.ibar.src \
+	module.ibox.src \
+	module.pager.src \
+	module.temperature.src
+
+filesdir = $(datadir)/enlightenment/data/config/scaleable
+files_DATA = \
+        profile.desktop \
+        icon.png \
+	e.cfg \
+	module.battery.cfg \
+	module.cpufreq.cfg \
+	module.dropshadow.cfg \
+	module.fileman.cfg \
+	module.ibar.cfg \
+	module.ibox.cfg \
+	module.pager.cfg \
+	module.temperature.cfg
+
+%.cfg: %.src
+	$(EET_EET) -e \
+	$(top_builddir)/config/scaleable/$@ config \
+	$< 1
+
+clean-local:
+	rm -rf *.cfg *~
+	

config/scaleable/module.battery.src

@@ -0,0 +1,6 @@
+group "Battery_Config" struct {
+  value "poll_interval" int: 512;
+  value "alert" int: 30;
+  value "alert_p" int: 10;
+  value "alert_timeout" int: 0;
+}

config/scaleable/module.cpufreq.src

@@ -0,0 +1,4 @@
+group "Cpufreq_Config" struct {
+  value "poll_interval" int: 32;
+  value "restore_governor" int: 1;
+}

config/scaleable/module.dropshadow.src

@@ -0,0 +1,7 @@
+group "Dropshadow_Config" struct {
+  value "shadow_x" int: 4;
+  value "shadow_y" int: 4;
+  value "blur_size" int: 10;
+  value "quality" int: 2;
+  value "shadow_darkness" double: 0.5000000000000000000000000;
+}

config/scaleable/module.fileman.src

@@ -0,0 +1,28 @@
+group "Fileman_Config" struct {
+  value "config_version" int: 65793;
+  value "view.mode" int: 1;
+  value "view.open_dirs_in_place" uchar: 0;
+  value "view.selector" uchar: 0;
+  value "view.single_click" uchar: 0;
+  value "view.no_subdir_jump" uchar: 0;
+  value "view.no_subdir_drop" uchar: 0;
+  value "view.always_order" uchar: 0;
+  value "view.link_drop" uchar: 0;
+  value "view.fit_custom_pos" uchar: 0;
+  value "view.show_full_path" uchar: 0;
+  value "view.show_desktop_icons" uchar: 1;
+  value "view.show_toolbar" uchar: 0;
+  value "icon.icon.w" int: 48;
+  value "icon.icon.h" int: 48;
+  value "icon.list.w" int: 16;
+  value "icon.list.h" int: 16;
+  value "icon.fixed.w" uchar: 0;
+  value "icon.fixed.h" uchar: 0;
+  value "icon.extension.show" uchar: 1;
+  value "list.sort.no_case" uchar: 1;
+  value "list.sort.dirs.first" uchar: 1;
+  value "list.sort.dirs.last" uchar: 0;
+  value "selection.single" uchar: 0;
+  value "selection.windows_modifiers" uchar: 0;
+  value "theme.fixed" uchar: 0;
+}

config/scaleable/module.ibar.src

@@ -0,0 +1,18 @@
+group "IBar_Config" struct {
+  group "items" list {
+    group "IBar_Config_Item" struct {
+      value "id" string: "0";
+      value "dir" string: "default";
+      value "show_label" int: 1;
+      value "eap_label" int: 0;
+    }
+  }
+  group "items" list {
+    group "IBar_Config_Item" struct {
+      value "id" string: "ibar.1";
+      value "dir" string: "default";
+      value "show_label" int: 1;
+      value "eap_label" int: 0;
+    }
+  }
+}

config/scaleable/module.ibox.src

@@ -0,0 +1,20 @@
+group "IBox_Config" struct {
+  group "items" list {
+    group "IBox_Config_Item" struct {
+      value "id" string: "0";
+      value "show_label" int: 0;
+      value "show_zone" int: 1;
+      value "show_desk" int: 0;
+      value "icon_label" int: 0;
+    }
+  }
+  group "items" list {
+    group "IBox_Config_Item" struct {
+      value "id" string: "ibox.1";
+      value "show_label" int: 0;
+      value "show_zone" int: 1;
+      value "show_desk" int: 0;
+      value "icon_label" int: 0;
+    }
+  }
+}

config/scaleable/module.pager.src

@@ -0,0 +1,15 @@
+group "Pager_Config" struct {
+  value "popup" uint: 1;
+  value "popup_speed" double: 1.0000000000000000000000000;
+  value "popup_urgent" uint: 0;
+  value "popup_urgent_stick" uint: 0;
+  value "popup_urgent_speed" double: 1.5000000000000000000000000;
+  value "show_desk_names" uint: 1;
+  value "popup_height" int: 60;
+  value "popup_act_height" int: 60;
+  value "drag_resist" uint: 3;
+  value "btn_drag" uchar: 1;
+  value "btn_noplace" uchar: 2;
+  value "btn_desk" uchar: 0;
+  value "flip_desk" uchar: 0;
+}

config/scaleable/module.temperature.src

@@ -0,0 +1,13 @@
+group "Temperature_Config" struct {
+  group "faces" hash {
+    key "temperature.1";
+    group "Temperature_Config_Face" struct {
+      value "id" string: "temperature.1";
+      value "poll_interval" int: 128;
+      value "low" int: 30;
+      value "high" int: 80;
+      value "sensor_type" int: 0;
+      value "units" int: 0;
+    }
+  }
+}

config/scaleable/profile.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Link
+Name=Scaleable
+Icon=icon.png
+Comment=The Stanard setup, but<br>width automatic scaling<br>enabled to adapt to<br>the resolution of your<br>display, if it is set<br>correctly.

config/standard/e.src

@@ -3,13 +3,13 @@ group "E_Config" struct {
   value "show_splash" int: 1;
   value "init_default_theme" string: "default.edj";
   value "desktop_default_name" string: "Desktop %i, %i";
-  value "menus_scroll_speed" double: 1000.0;
-  value "menus_fast_mouse_move_threshhold" double: 300.0;
-  value "menus_click_drag_timeout" double: 0.25;
+  value "menus_scroll_speed" double: 1000.0000000000000000000000000;
+  value "menus_fast_mouse_move_threshhold" double: 300.0000000000000000000000000;
+  value "menus_click_drag_timeout" double: 0.2500000000000000000000000;
   value "border_shade_animate" int: 1;
   value "border_shade_transition" int: 3;
-  value "border_shade_speed" double: 3000.0;
-  value "framerate" double: 30.0;
+  value "border_shade_speed" double: 3000.0000000000000000000000000;
+  value "framerate" double: 30.0000000000000000000000000;
   value "image_cache" int: 4096;
   value "font_cache" int: 512;
   value "edje_cache" int: 32;
@@ -20,7 +20,7 @@ group "E_Config" struct {
   value "show_desktop_icons" int: 1;
   value "edge_flip_dragging" int: 1;
   value "edge_flip_moving" int: 1;
-  value "edge_flip_timeout" double: 0.25;
+  value "edge_flip_timeout" double: 0.2500000000000000000000000;
   value "evas_engine_default" int: 1;
   value "evas_engine_container" int: 0;
   value "evas_engine_init" int: 0;
@@ -31,7 +31,32 @@ group "E_Config" struct {
   value "evas_engine_drag" int: 0;
   value "evas_engine_win" int: 0;
   value "evas_engine_zone" int: 0;
- value "use_composite" int: 0;
+  value "use_composite" int: 0;
+  value "language" string: "en_US.UTF-8";
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "mixer";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_window_remembers";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      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";
@@ -1405,7 +1430,7 @@ group "E_Config" struct {
   value "always_click_to_raise" int: 0;
   value "always_click_to_focus" int: 0;
   value "use_auto_raise" int: 0;
-  value "auto_raise_delay" double: 0.5;
+  value "auto_raise_delay" double: 0.5000000000000000000000000;
   value "use_resist" int: 1;
   value "drag_resist" int: 16;
   value "desk_resist" int: 32;
@@ -1413,9 +1438,9 @@ group "E_Config" struct {
   value "gadget_resist" int: 32;
   value "winlist_warp_while_selecting" int: 1;
   value "winlist_warp_at_end" int: 1;
-  value "winlist_warp_speed" double: 0.1;
+  value "winlist_warp_speed" double: 0.1000000000000000055511151;
   value "winlist_scroll_animate" int: 1;
-  value "winlist_scroll_speed" double: 0.1;
+  value "winlist_scroll_speed" double: 0.1000000000000000055511151;
   value "winlist_list_show_iconified" int: 1;
   value "winlist_list_show_other_desk_iconified" int: 1;
   value "winlist_list_show_other_screen_iconified" int: 0;
@@ -1425,10 +1450,10 @@ group "E_Config" struct {
   value "winlist_list_jump_desk_while_selecting" int: 0;
   value "winlist_list_focus_while_selecting" int: 1;
   value "winlist_list_raise_while_selecting" int: 1;
-  value "winlist_pos_align_x" double: 0.5;
-  value "winlist_pos_align_y" double: 0.5;
-  value "winlist_pos_size_w" double: 0.5;
-  value "winlist_pos_size_h" double: 0.5;
+  value "winlist_pos_align_x" double: 0.5000000000000000000000000;
+  value "winlist_pos_align_y" double: 0.5000000000000000000000000;
+  value "winlist_pos_size_w" double: 0.5000000000000000000000000;
+  value "winlist_pos_size_h" double: 0.5000000000000000000000000;
   value "winlist_pos_min_w" int: 0;
   value "winlist_pos_min_h" int: 0;
   value "winlist_pos_max_w" int: 320;
@@ -1439,11 +1464,11 @@ group "E_Config" struct {
   value "allow_above_fullscreen" int: 0;
   value "kill_if_close_not_possible" int: 1;
   value "kill_process" int: 1;
-  value "kill_timer_wait" double: 10.0;
+  value "kill_timer_wait" double: 10.0000000000000000000000000;
   value "ping_clients" int: 1;
   value "transition_desk" string: "vswipe";
   value "transition_change" string: "crossfade";
-  value "remember_internal_windows" int: 1;
+  value "remember_internal_windows" int: 0;
   value "move_info_follows" int: 1;
   value "resize_info_follows" int: 1;
   value "move_info_visible" int: 1;
@@ -1471,11 +1496,11 @@ group "E_Config" struct {
   value "exebuf_max_eap_list" int: 20;
   value "exebuf_max_hist_list" int: 20;
   value "exebuf_scroll_animate" int: 1;
-  value "exebuf_scroll_speed" double: 0.1;
-  value "exebuf_pos_align_x" double: 0.5;
-  value "exebuf_pos_align_y" double: 0.5;
-  value "exebuf_pos_size_w" double: 0.75;
-  value "exebuf_pos_size_h" double: 0.25;
+  value "exebuf_scroll_speed" double: 0.1000000000000000055511151;
+  value "exebuf_pos_align_x" double: 0.5000000000000000000000000;
+  value "exebuf_pos_align_y" double: 0.5000000000000000000000000;
+  value "exebuf_pos_size_w" double: 0.7500000000000000000000000;
+  value "exebuf_pos_size_h" double: 0.2500000000000000000000000;
   value "exebuf_pos_min_w" int: 200;
   value "exebuf_pos_min_h" int: 160;
   value "exebuf_pos_max_w" int: 400;
@@ -1496,10 +1521,10 @@ group "E_Config" struct {
           value "geom.pos" int: 0;
           value "geom.size" int: 32;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 2;
           value "state_info.flags" int: 0;
           value "style" string: "plain";
@@ -1514,10 +1539,10 @@ group "E_Config" struct {
           value "geom.pos" int: 32;
           value "geom.size" int: 120;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 3;
           value "state_info.flags" int: 0;
           value "style" string: "inset";
@@ -1532,10 +1557,10 @@ group "E_Config" struct {
           value "geom.pos" int: 152;
           value "geom.size" int: 32;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 4;
           value "state_info.flags" int: 0;
           value "style" string: "inset";
@@ -1550,10 +1575,10 @@ group "E_Config" struct {
           value "geom.pos" int: 350;
           value "geom.size" int: 200;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 5;
           value "state_info.flags" int: 0;
           value "style" string: "inset";
@@ -1568,10 +1593,10 @@ group "E_Config" struct {
           value "geom.pos" int: 672;
           value "geom.size" int: 32;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 6;
           value "state_info.flags" int: 0;
           value "style" string: "plain";
@@ -1586,10 +1611,10 @@ group "E_Config" struct {
           value "geom.pos" int: 704;
           value "geom.size" int: 32;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 7;
           value "state_info.flags" int: 0;
           value "style" string: "plain";
@@ -1604,10 +1629,10 @@ group "E_Config" struct {
           value "geom.pos" int: 736;
           value "geom.size" int: 32;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 8;
           value "state_info.flags" int: 0;
           value "style" string: "plain";
@@ -1622,10 +1647,10 @@ group "E_Config" struct {
           value "geom.pos" int: 768;
           value "geom.size" int: 32;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 9;
           value "state_info.flags" int: 0;
           value "style" string: "plain";
@@ -1645,10 +1670,10 @@ group "E_Config" struct {
           value "geom.pos" int: 0;
           value "geom.size" int: 120;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 0;
           value "state_info.flags" int: 0;
           value "autoscroll" uchar: 0;
@@ -1661,10 +1686,10 @@ group "E_Config" struct {
           value "geom.pos" int: 768;
           value "geom.size" int: 32;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 0;
           value "state_info.flags" int: 0;
           value "autoscroll" uchar: 0;
@@ -1683,10 +1708,10 @@ group "E_Config" struct {
           value "geom.pos" int: 0;
           value "geom.size" int: 120;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 0;
           value "state_info.flags" int: 0;
           value "autoscroll" uchar: 0;
@@ -1699,10 +1724,10 @@ group "E_Config" struct {
           value "geom.pos" int: 768;
           value "geom.size" int: 32;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 0;
           value "state_info.flags" int: 0;
           value "autoscroll" uchar: 0;
@@ -1721,10 +1746,10 @@ group "E_Config" struct {
           value "geom.pos" int: 0;
           value "geom.size" int: 120;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 0;
           value "state_info.flags" int: 0;
           value "autoscroll" uchar: 0;
@@ -1737,10 +1762,10 @@ group "E_Config" struct {
           value "geom.pos" int: 768;
           value "geom.size" int: 32;
           value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0;
-          value "geom.pos_y" double: 0.0;
-          value "geom.size_w" double: 0.0;
-          value "geom.size_h" double: 0.0;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
           value "state_info.seq" int: 0;
           value "state_info.flags" int: 0;
           value "autoscroll" uchar: 0;
@@ -1777,8 +1802,8 @@ group "E_Config" struct {
       value "overlap" int: 0;
       value "autohide" int: 0;
       value "autohide_show_action" int: 0;
-      value "hide_timeout" float: 1.0;
-      value "hide_duration" float: 1.0;
+      value "hide_timeout" float: 1.0000000000000000000000000;
+      value "hide_duration" float: 1.0000000000000000000000000;
       value "desk_show_mode" int: 0;
       group "desk_list" list {
         group "E_Config_Shelf_Desk" struct {
@@ -1804,8 +1829,8 @@ group "E_Config" struct {
       value "overlap" int: 0;
       value "autohide" int: 0;
       value "autohide_show_action" int: 0;
-      value "hide_timeout" float: 1.0;
-      value "hide_duration" float: 1.0;
+      value "hide_timeout" float: 1.0000000000000000000000000;
+      value "hide_duration" float: 1.0000000000000000000000000;
       value "desk_show_mode" int: 0;
       group "desk_list" list {
         group "E_Config_Shelf_Desk" struct {
@@ -1831,8 +1856,8 @@ group "E_Config" struct {
       value "overlap" int: 0;
       value "autohide" int: 0;
       value "autohide_show_action" int: 0;
-      value "hide_timeout" float: 1.0;
-      value "hide_duration" float: 1.0;
+      value "hide_timeout" float: 1.0000000000000000000000000;
+      value "hide_duration" float: 1.0000000000000000000000000;
       value "desk_show_mode" int: 0;
       group "desk_list" list {
         group "E_Config_Shelf_Desk" struct {
@@ -1858,8 +1883,8 @@ group "E_Config" struct {
       value "overlap" int: 0;
       value "autohide" int: 0;
       value "autohide_show_action" int: 0;
-      value "hide_timeout" float: 1.0;
-      value "hide_duration" float: 1.0;
+      value "hide_timeout" float: 1.0000000000000000000000000;
+      value "hide_duration" float: 1.0000000000000000000000000;
       value "desk_show_mode" int: 0;
       group "desk_list" list {
         group "E_Config_Shelf_Desk" struct {
@@ -1874,7 +1899,7 @@ group "E_Config" struct {
   value "desklock_login_box_zone" int: -1;
   value "desklock_autolock_screensaver" int: 0;
   value "desklock_autolock_idle" int: 0;
-  value "desklock_autolock_idle_timeout" double: 300.0;
+  value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
   value "desklock_use_custom_desklock" int: 0;
   value "display_res_restore" int: 0;
   value "display_res_width" int: 1;
@@ -1908,10 +1933,10 @@ group "E_Config" struct {
   value "border_raise_on_mouse_action" int: 1;
   value "border_raise_on_focus" int: 1;
   value "desk_flip_wrap" int: 0;
-  value "icon_theme" string: "hicolor";
+  value "icon_theme" string: "Tango";
   value "desk_flip_animate_mode" int: 1;
   value "desk_flip_animate_interpolation" int: 0;
-  value "desk_flip_animate_time" double: 0.2;
+  value "desk_flip_animate_time" double: 0.2000000000000000111022302;
   value "wallpaper_import_last_dev" string: "~/";
   value "wallpaper_import_last_path" string: "/";
   value "wallpaper_grad_c1_r" int: 0;
@@ -1977,21 +2002,21 @@ group "E_Config" struct {
   value "cache_flush_poll_interval" int: 512;
   value "thumbscroll_enable" int: 0;
   value "thumbscroll_threshhold" int: 8;
-  value "thumbscroll_momentum_threshhold" double: 100.0;
-  value "thumbscroll_friction" double: 1.0;
+  value "thumbscroll_momentum_threshhold" double: 100.0000000000000000000000000;
+  value "thumbscroll_friction" double: 1.0000000000000000000000000;
   value "hal_desktop" int: 1;
   value "border_keyboard.timeout" double: 5.0000000000000000000000000;
   value "border_keyboard.move.dx" uchar: 5;
   value "border_keyboard.move.dy" uchar: 5;
   value "border_keyboard.resize.dx" uchar: 5;
   value "border_keyboard.resize.dy" uchar: 5;
-  value "scale.min" double: 1.0;
-  value "scale.max" double: 3.0;
-  value "scale.factor" double: 1.0;
+  value "hal_desktop" int: 1;
+  value "scale.min" double: 1.0000000000000000000000000;
+  value "scale.max" double: 3.0000000000000000000000000;
+  value "scale.factor" double: 1.0000000000000000000000000;
   value "scale.base_dpi" int: 142;
   value "scale.use_dpi" uchar: 0;
-  value "scale.use_custom" uchar: 1;
+  value "scale.use_custom" uchar: 0;
   value "show_cursor" uchar: 1;
   value "idle_cursor" uchar: 1;
-  value "default_system_menu" string: "";
 }

config/standard/module.dropshadow.src

@@ -3,5 +3,5 @@ group "Dropshadow_Config" struct {
   value "shadow_y" int: 4;
   value "blur_size" int: 10;
   value "quality" int: 2;
-  value "shadow_darkness" double: 0.5;
+  value "shadow_darkness" double: 0.5000000000000000000000000;
 }

config/standard/module.ibar.src

@@ -7,13 +7,6 @@ group "IBar_Config" struct {
       value "eap_label" int: 0;
     }
   }
-  group "items" list {
-    group "IBar_Config_Item" struct {
-      value "id" string: "ibar.1";
-      value "show_label" int: 1;
-      value "eap_label" int: 0;
-    }
-  }
   group "items" list {
     group "IBar_Config_Item" struct {
       value "id" string: "ibar.1";

config/standard/module.pager.src

@@ -1,9 +1,9 @@
 group "Pager_Config" struct {
   value "popup" uint: 1;
-  value "popup_speed" double: 1.0;
+  value "popup_speed" double: 1.0000000000000000000000000;
   value "popup_urgent" uint: 0;
   value "popup_urgent_stick" uint: 0;
-  value "popup_urgent_speed" double: 1.5;
+  value "popup_urgent_speed" double: 1.5000000000000000000000000;
   value "show_desk_names" uint: 1;
   value "popup_height" int: 60;
   value "popup_act_height" int: 60;

configure.ac

@@ -450,9 +450,13 @@ data/xsession/Makefile
 data/xsession/enlightenment.desktop
 data/etc/Makefile
 data/icons/Makefile
+data/backgrounds/Makefile
 doc/Makefile
 config/Makefile
 config/default/Makefile
 config/standard/Makefile
+config/minimalist/Makefile
+config/scaleable/Makefile
+config/netbook/Makefile
 po/Makefile.in
 ])

data/Makefile.am

@@ -6,5 +6,6 @@ other \
 xsession \
 input_methods \
 etc \
-icons
+icons \
+backgrounds
 

data/backgrounds/Makefile.am

@@ -0,0 +1,7 @@
+MAINTAINERCLEANFILES = Makefile.in
+filesdir = $(datadir)/enlightenment/data/backgrounds
+files_DATA = \
+Dark_Gradient.edj \
+Light_Gradient.edj
+
+EXTRA_DIST = $(files_DATA)

src/bin/e_bg.c

@@ -79,6 +79,7 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
 {
    Eina_List *l, *ll, *entries;
    E_Config_Desktop_Background *bg = NULL;
+   const char *bgfile = "";
    int current_spec = 0; /* how specific the setting is - we want the least general one that applies */
 
    /* look for desk specific background. */
@@ -102,8 +103,18 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
 	     else if (cfbg->desk_y >= 0) continue;
 
 	     if (spec <= current_spec) continue;
-
-	     entries = edje_file_collection_list(cfbg->file);
+	     bgfile = cfbg->file;
+	     if (bgfile)
+	       {
+		  if (bgfile[0] != '/')
+		    {
+		       const char *bf;
+		  
+		       bf = e_path_find(path_backgrounds, bgfile);
+		       if (bf) bgfile = bf;
+		    }
+	       }
+	     entries = edje_file_collection_list(bgfile);
 	     if (entries)
 	       {
 		  for (ll = entries; ll; ll = ll->next)
@@ -133,17 +144,39 @@ e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y)
 
    /* fall back to default */
    if (cfbg)
-     bgfile = cfbg->file;
+     {
+	bgfile = cfbg->file;
+	if (bgfile)
+	  {
+	     if (bgfile[0] != '/')
+	       {
+		  const char *bf;
+		  
+		  bf = e_path_find(path_backgrounds, bgfile);
+		  if (bf) bgfile = bf;
+	       }
+	  }
+     }
    else
      {
-	entries = edje_file_collection_list(e_config->desktop_default_background);
+	bgfile = e_config->desktop_default_background;
+	if (bgfile)
+	  {
+	     if (bgfile[0] != '/')
+	       {
+		  const char *bf;
+		  
+		  bf = e_path_find(path_backgrounds, bgfile);
+		  if (bf) bgfile = bf;
+	       }
+	  }
+	entries = edje_file_collection_list(bgfile);
 	if (entries)
 	  {
 	     for (l = entries; l; l = l->next)
 	       {
 		  if (!strcmp(l->data, "e/desktop/background"))
 		    {
-		       bgfile = e_config->desktop_default_background;
 		       ok = 1;
 		       break;
 		    }

src/bin/e_config.c

@@ -637,7 +637,40 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, idle_cursor, UCHAR); /**/
 
    E_CONFIG_VAL(D, T, default_system_menu, STR);
+
+   e_config_load();
    
+   e_config_save_queue();
+   return 1;
+}
+
+EAPI int
+e_config_shutdown(void)
+{
+   E_FREE(_e_config_profile);
+   E_CONFIG_DD_FREE(_e_config_edd);
+   E_CONFIG_DD_FREE(_e_config_module_edd);
+   E_CONFIG_DD_FREE(_e_config_font_default_edd);
+   E_CONFIG_DD_FREE(_e_config_font_fallback_edd);
+   E_CONFIG_DD_FREE(_e_config_theme_edd);
+   E_CONFIG_DD_FREE(_e_config_bindings_mouse_edd);
+   E_CONFIG_DD_FREE(_e_config_bindings_key_edd);
+   E_CONFIG_DD_FREE(_e_config_bindings_signal_edd);
+   E_CONFIG_DD_FREE(_e_config_bindings_wheel_edd);
+   E_CONFIG_DD_FREE(_e_config_path_append_edd);
+   E_CONFIG_DD_FREE(_e_config_desktop_bg_edd);
+   E_CONFIG_DD_FREE(_e_config_desktop_name_edd);
+   E_CONFIG_DD_FREE(_e_config_remember_edd);
+   E_CONFIG_DD_FREE(_e_config_gadcon_edd);
+   E_CONFIG_DD_FREE(_e_config_gadcon_client_edd);
+   E_CONFIG_DD_FREE(_e_config_shelf_edd);
+   E_CONFIG_DD_FREE(_e_config_shelf_desk_edd);
+   return 1;
+}
+
+EAPI void
+e_config_load(void)
+{
    e_config = e_config_domain_load("e", _e_config_edd);
    if (e_config)
      {
@@ -694,11 +727,11 @@ e_config_init(void)
    e_config->font_cache = 512;
    e_config->edje_cache = 32;
    e_config->edje_collection_cache = 64;
-   e_config->zone_desks_x_count = 4;
+   e_config->zone_desks_x_count = 1;
    e_config->zone_desks_y_count = 1;
    e_config->use_virtual_roots = 0;
-   e_config->edge_flip_dragging = 1;
-   e_config->edge_flip_moving = 1;
+   e_config->edge_flip_dragging = 0;
+   e_config->edge_flip_moving = 0;
    e_config->edge_flip_timeout = 0.25;
    e_config->evas_engine_default = E_EVAS_ENGINE_SOFTWARE_X11;
    e_config->evas_engine_container = E_EVAS_ENGINE_DEFAULT;
@@ -834,120 +867,7 @@ e_config_init(void)
    em->priority = _priority; \
    e_config->modules = eina_list_append(e_config->modules, em)
 
-	CFG_MODULE("start", 1, 0, 0);
-	CFG_MODULE("ibar", 1, 0, 0);
-	CFG_MODULE("ibox", 1, 0, 0);
-	CFG_MODULE("dropshadow", 1, 0, 0);
-	CFG_MODULE("clock", 1, 0, 0);
-	CFG_MODULE("battery", 1, 0, 0);
-	CFG_MODULE("cpufreq", 1, 0, 0);
-	CFG_MODULE("temperature", 1, 0, 0);
-	CFG_MODULE("gadman", 1, 0, -100);
-	CFG_MODULE("pager", 1, 0, 0);
-	CFG_MODULE("exebuf", 1, 1, 0);
-	CFG_MODULE("winlist", 1, 1, 0);
-	CFG_MODULE("conf", 1, 1, 0);
-	CFG_MODULE("conf_applications", 1, 1, 0);
-	CFG_MODULE("conf_borders", 1, 1, 0);
-	CFG_MODULE("conf_clientlist", 1, 1, 0);
-	CFG_MODULE("conf_colors", 1, 1, 0);
-	CFG_MODULE("conf_desk", 1, 1, 0);
-	CFG_MODULE("conf_desklock", 1, 1, 0);
-	CFG_MODULE("conf_desks", 1, 1, 0);
-	CFG_MODULE("conf_dialogs", 1, 1, 0);
-	CFG_MODULE("conf_display", 1, 1, 0);
-	CFG_MODULE("conf_dpms", 1, 1, 0);
-	CFG_MODULE("conf_exebuf", 1, 1, 0);
-	CFG_MODULE("conf_fonts", 1, 1, 0);
-	CFG_MODULE("conf_icon_theme", 1, 1, 0);
-	CFG_MODULE("conf_imc", 1, 1, 0);
-	CFG_MODULE("conf_intl", 1, 1, 0);
-	CFG_MODULE("conf_keybindings", 1, 1, 0);
-	CFG_MODULE("conf_menus", 1, 1, 0);
-	CFG_MODULE("conf_mime", 1, 1, 0);
-	CFG_MODULE("conf_mouse", 1, 1, 0);
-	CFG_MODULE("conf_mousebindings", 1, 1, 0);
-	CFG_MODULE("conf_mouse_cursor", 1, 1, 0);
-	CFG_MODULE("conf_paths", 1, 1, 0);
-	CFG_MODULE("conf_performance", 1, 1, 0);
-	CFG_MODULE("conf_profiles", 1, 1, 0);
-	CFG_MODULE("conf_screensaver", 1, 1, 0);
-	CFG_MODULE("conf_shelves", 1, 1, 0);
-	CFG_MODULE("conf_startup", 1, 1, 0);
-	CFG_MODULE("conf_theme", 1, 1, 0);
-	CFG_MODULE("conf_transitions", 1, 1, 0);
-	CFG_MODULE("conf_wallpaper", 1, 1, 0);
-	CFG_MODULE("conf_window_display", 1, 1, 0);
-	CFG_MODULE("conf_window_focus", 1, 1, 0);
-	CFG_MODULE("conf_window_manipulation", 1, 1, 0);
-	CFG_MODULE("conf_winlist", 1, 1, 0);
-	CFG_MODULE("conf_engine", 1, 1, 0);
-	CFG_MODULE("fileman", 1, 1, 0);
-	CFG_MODULE("conf_interaction", 1, 1, 0);
-     }
-#if 0
-     {
-	E_Font_Fallback* eff;
-	
-#define CFG_FONTFALLBACK(_name) \
-   eff = E_NEW(E_Font_Fallback, 1); \
-   eff->name = eina_stringshare_add(_name); \
-   e_config->font_fallbacks = eina_list_append(e_config->font_fallbacks, eff)
-	
-	CFG_FONTFALLBACK("New-Sung");
-	CFG_FONTFALLBACK("Kochi-Gothic");
-	CFG_FONTFALLBACK("Baekmuk-Dotum");
-     }
-#endif
-     { 
-	E_Font_Default* efd;
-	
-#define CFG_FONTDEFAULT(_tclass, _name, _size) \
-   efd = E_NEW(E_Font_Default, 1); \
-   efd->text_class = eina_stringshare_add(_tclass); \
-   efd->font = eina_stringshare_add(_name); \
-   efd->size = _size; \
-   e_config->font_defaults = eina_list_append(e_config->font_defaults, efd)
-	
-	CFG_FONTDEFAULT("default", "Vera", 10);
-     }
-     {
-	E_Config_Theme *et;
-	
-	et = E_NEW(E_Config_Theme, 1);
-	et->category = eina_stringshare_add("theme");
-	et->file = eina_stringshare_add("default.edj");
-	e_config->themes = eina_list_append(e_config->themes, et);
-     }
-     {
-	E_Config_Binding_Mouse *eb;
-
-#define CFG_MOUSEBIND(_context, _button, _modifiers, _anymod, _action, _params) \
-   eb = E_NEW(E_Config_Binding_Mouse, 1); \
-   eb->context = _context; \
-   eb->button = _button; \
-   eb->modifiers = _modifiers; \
-   eb->any_mod = _anymod; \
-   eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
-   eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
-   e_config->mouse_bindings = eina_list_append(e_config->mouse_bindings, eb)
-
-	/*
-	 * FIXME:
-	 * If new mouse binding are added/changed/modified, then do not
-	 * forget to reflect those changes in e_int_config_mousebinding.c in
-	 * _restore_defaults_cb function
-	 */
-	
-	CFG_MOUSEBIND(E_BINDING_CONTEXT_BORDER, 1,
-		      E_BINDING_MODIFIER_ALT, 0, "window_move", NULL);
-	CFG_MOUSEBIND(E_BINDING_CONTEXT_BORDER, 2,
-		      E_BINDING_MODIFIER_ALT, 0, "window_resize", NULL);
-	CFG_MOUSEBIND(E_BINDING_CONTEXT_BORDER, 3,
-		      E_BINDING_MODIFIER_ALT, 0, "window_menu", NULL);
-	CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 1, 0, 0, "menu_show", "main");
-	CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 2, 0, 0, "menu_show", "clients");
-	CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 3, 0, 0, "menu_show", "favorites");
+	CFG_MODULE("wizard", 1, 0, 0);
      }
      {
 	E_Config_Binding_Key *eb;
@@ -969,150 +889,15 @@ e_config_init(void)
 	 * _restore_key_binding_defaults_cb function
 	 */
 
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
-		    E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
-		    "desk_flip_by", "-1 0");
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Right",
-		    E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
-		    "desk_flip_by", "1 0");
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Up",
-		    E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
-		    "desk_flip_by", "0 -1");
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Down",
-		    E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
-		    "desk_flip_by", "0 1");
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Up",
-		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
-		    "window_raise", NULL);
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Down",
-		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
-		    "window_lower", NULL);
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "x",
-		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
-		    "window_close", NULL);
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "k",
-		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
-		    "window_kill", NULL);
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "w",
-		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
-		    "window_menu", NULL);
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "s",
-		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
-		    "window_sticky_toggle", NULL);
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "i",
-		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
-		    "window_iconic_toggle", NULL);
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "f",
-		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
-		    "window_maximized_toggle", NULL);
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F10",
-		    E_BINDING_MODIFIER_SHIFT, 0,
-		    "window_maximized_toggle", "default vertical");
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F10",
-		    E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
-		    "window_maximized_toggle", "default horizontal");
-	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "r",
-		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
-		    "window_shaded_toggle", NULL);