default copied to standard. default will change and become a minimal wizard

only setup as will compiled in defaults. not yet - but getting prepared.



SVN revision: 37109

config/Makefile.am

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

config/default/profile.desktop

@@ -2,4 +2,4 @@
 Type=Link
 Name=Default
 Icon=icon.png
-Comment=This is the default<br>theme that is<br>universal for most<br>desktop and laptop<br>systems. Choose this<br>if you are not<br>sure what to choose.
+Comment=Select this to begin<br>the initial setup again.

config/standard/.cvsignore

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

config/standard/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/standard
+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/standard/$@ config \
+	$< 1
+
+clean-local:
+	rm -rf *.cfg *~
+	

config/standard/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/standard/module.cpufreq.src

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

config/standard/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.5;
+}

config/standard/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/standard/module.ibar.src

@@ -0,0 +1,25 @@
+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 "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/standard/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/standard/module.pager.src

@@ -0,0 +1,15 @@
+group "Pager_Config" struct {
+  value "popup" uint: 1;
+  value "popup_speed" double: 1.0;
+  value "popup_urgent" uint: 0;
+  value "popup_urgent_stick" uint: 0;
+  value "popup_urgent_speed" double: 1.5;
+  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/standard/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/standard/profile.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Link
+Name=Standard
+Icon=icon.png
+Comment=This is the standard<br>profile that is<br>universal for most<br>desktop and laptop<br>systems. Choose this<br>if you are not<br>sure what to choose.

configure.ac

@@ -453,5 +453,6 @@ data/icons/Makefile
 doc/Makefile
 config/Makefile
 config/default/Makefile
+config/standard/Makefile
 po/Makefile.in
 ])

src/modules/wizard/page_030.c

@@ -160,7 +160,7 @@ wizard_page_hide(E_Wizard_Page *pg)
 EAPI int
 wizard_page_apply(E_Wizard_Page *pg)
 {
-   if (!strcmp("/etc/xdg/menus/applications.menu", xdg_sel))
+   if ((xdg_sel) && (!strcmp("/etc/xdg/menus/applications.menu", xdg_sel)))
      xdg_sel = NULL;
    if (xdg_sel)
      e_config->default_system_menu = eina_stringshare_add(xdg_sel);