Add softkey config to illume-home profile.

Remove dropshadow config (we don't use it).
Update e.cfg/src for softkey.

SVN revision: 43964

diff --git a/config/illume-home/Makefile.am b/config/illume-home/Makefile.am
index dbd22be..66a4517 100644 (file)
--- a/config/illume-home/Makefile.am
+++ b/config/illume-home/Makefile.am
@@ -7,9 +7,10 @@ EXTRA_DIST = \
         icon.png \
         e.src \
        module.battery.src \
-       module.dropshadow.src \
        module.pager.src \
-       module.illume-home.src
+       module.illume-home.src \
+       module.illume-keyboard.src \
+       module.illume-softkey.src
 
 filesdir = $(datadir)/enlightenment/data/config/illume-home
 files_DATA = \
@@ -17,9 +18,10 @@ files_DATA = \
         icon.png \
        e.cfg \
        module.battery.cfg \
-       module.dropshadow.cfg \
        module.pager.cfg \
-       module.illume-home.cfg
+       module.illume-home.cfg \
+        module.illume-keyboard.cfg \
+        module.illume-softkey.cfg
 
 %.cfg: %.src
        $(EET_EET) -e \
@@ -28,4 +30,3 @@ files_DATA = \
 
 clean-local:
        rm -rf *.cfg *~
-       

diff --git a/config/illume-home/e.cfg b/config/illume-home/e.cfg
index 7339573..4076489 100644 (file)
Binary files a/config/illume-home/e.cfg and b/config/illume-home/e.cfg differ

diff --git a/config/illume-home/e.src b/config/illume-home/e.src
index b6709ec..31e4ef0 100644 (file)
--- a/config/illume-home/e.src
+++ b/config/illume-home/e.src
@@ -9,7 +9,7 @@ group "E_Config" struct {
   value "border_shade_animate" int: 1;
   value "border_shade_transition" int: 3;
   value "border_shade_speed" double: 3000.0000000000000000000000000;
-  value "framerate" double: 60.0000000000000000000000000;
+  value "framerate" double: 30.0000000000000000000000000;
   value "priority" int: 1;
   value "image_cache" int: 4096;
   value "font_cache" int: 512;
@@ -31,9 +31,34 @@ group "E_Config" struct {
   value "evas_engine_win" int: 0;
   value "evas_engine_zone" 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: "syscon";
+      value "name" string: "illume-indicator";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "illume-home";
+      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;
@@ -145,7 +170,7 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "conf_edgebindings";
+      value "name" string: "conf_performance";
       value "enabled" uchar: 1;
       value "delayed" uchar: 1;
       value "priority" int: 0;
@@ -153,7 +178,7 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "conf_performance";
+      value "name" string: "conf_edgebindings";
       value "enabled" uchar: 1;
       value "delayed" uchar: 1;
       value "priority" int: 0;
@@ -361,7 +386,7 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "battery";
+      value "name" string: "pager";
       value "enabled" uchar: 1;
       value "delayed" uchar: 0;
       value "priority" int: 0;
@@ -369,7 +394,7 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "illume-home";
+      value "name" string: "battery";
       value "enabled" uchar: 1;
       value "delayed" uchar: 0;
       value "priority" int: 0;
@@ -377,9 +402,9 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "pager";
+      value "name" string: "syscon";
       value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
+      value "delayed" uchar: 1;
       value "priority" int: 0;
     }
   }
@@ -960,6 +985,16 @@ group "E_Config" struct {
       value "delay" float: 0.3000000119209289550781250;
     }
   }
+  group "edge_bindings" list {
+    group "E_Config_Binding_Edge" struct {
+      value "context" int: 3;
+      value "modifiers" int: 0;
+      value "action" string: "desk_deskshow_toggle";
+      value "edge" uchar: 6;
+      value "any_mod" uchar: 0;
+      value "delay" float: 0.3000000119209289550781250;
+    }
+  }
   group "signal_bindings" list {
     group "E_Config_Binding_Signal" struct {
       value "context" int: 2;
@@ -1396,7 +1431,7 @@ group "E_Config" struct {
   value "pass_click_on" int: 1;
   value "always_click_to_raise" int: 0;
   value "always_click_to_focus" int: 0;
-  value "use_auto_raise" int: 1;
+  value "use_auto_raise" int: 0;
   value "auto_raise_delay" double: 0.5000000000000000000000000;
   value "use_resist" int: 1;
   value "drag_resist" int: 16;
@@ -1438,8 +1473,8 @@ group "E_Config" struct {
   value "remember_internal_windows" int: 0;
   value "move_info_follows" int: 1;
   value "resize_info_follows" int: 1;
-  value "move_info_visible" int: 0;
-  value "resize_info_visible" int: 0;
+  value "move_info_visible" int: 1;
+  value "resize_info_visible" int: 1;
   value "focus_last_focused_per_desktop" int: 1;
   value "focus_revert_on_hide_or_close" int: 1;
   value "pointer_slide" int: 1;
@@ -1456,7 +1491,7 @@ group "E_Config" struct {
   value "transient.iconify" int: 1;
   value "modal_windows" int: 1;
   value "menu_eap_name_show" int: 1;
-  value "menu_eap_generic_show" int: 0;
+  value "menu_eap_generic_show" int: 1;
   value "menu_eap_comment_show" int: 0;
   value "fullscreen_policy" int: 0;
   value "exebuf_max_exe_list" int: 20;
@@ -1482,158 +1517,6 @@ group "E_Config" struct {
       value "name" string: "shelf";
       value "id" int: 1;
       value "zone" int: 0;
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "start";
-          value "id" string: "start";
-          value "geom.pos" int: 0;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          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";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "ibox";
-          value "id" string: "ibox.1";
-          value "geom.pos" int: 152;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          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";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "temperature";
-          value "id" string: "temperature.1";
-          value "geom.pos" int: 672;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          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";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "cpufreq";
-          value "id" string: "cpufreq";
-          value "geom.pos" int: 704;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          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";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "battery";
-          value "id" string: "battery";
-          value "geom.pos" int: 736;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          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";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "clock";
-          value "id" string: "clock";
-          value "geom.pos" int: 768;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          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";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "configuration";
-          value "id" string: "configuration";
-          value "geom.pos" int: 720;
-          value "geom.size" int: 80;
-          value "geom.res" int: 800;
-          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: "plain";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "illume-home";
-          value "id" string: "illume-home.0";
-          value "geom.pos" int: 0;
-          value "geom.size" int: 34;
-          value "geom.res" int: 314;
-          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: 1;
-          value "state_info.flags" int: 3;
-          value "style" string: "plain";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
     }
   }
   group "gadcons" list {
@@ -1775,37 +1658,66 @@ group "E_Config" struct {
   }
   group "gadcons" list {
     group "E_Config_Gadcon" struct {
-      value "name" string: "slipshelf_extra";
-      value "id" int: 0;
-      value "zone" int: 0;
-    }
-  }
-  group "gadcons" list {
-    group "E_Config_Gadcon" struct {
-      value "name" string: "slipshelf";
-      value "id" int: 0;
-      value "zone" int: 0;
-    }
-  }
-  group "shelves" list {
-    group "E_Config_Shelf" struct {
-      value "name" string: "shelf";
+      value "name" string: "illume-indicator";
       value "id" int: 1;
-      value "container" int: 0;
       value "zone" int: 0;
-      value "layer" int: 1;
-      value "popup" uchar: 0;
-      value "orient" int: 5;
-      value "fit_along" uchar: 0;
-      value "fit_size" uchar: 0;
-      value "style" string: "alternate";
-      value "size" int: 32;
-      value "overlap" int: 0;
-      value "autohide" int: 0;
-      value "autohide_show_action" int: 0;
-      value "hide_timeout" float: 1.0000000000000000000000000;
-      value "hide_duration" float: 1.0000000000000000000000000;
-      value "desk_show_mode" int: 0;
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "illume-home";
+          value "id" string: "illume-home.0";
+          value "geom.pos" int: 0;
+          value "geom.size" int: 32;
+          value "geom.res" int: 800;
+          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: 1;
+          value "state_info.flags" int: 0;
+          value "style" string: "plain";
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "battery";
+          value "id" string: "battery";
+          value "geom.pos" int: 800;
+          value "geom.size" int: 80;
+          value "geom.res" int: 800;
+          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";
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "configuration";
+          value "id" string: "configuration";
+          value "geom.pos" int: 800;
+          value "geom.size" int: 80;
+          value "geom.res" int: 800;
+          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: "plain";
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
     }
   }
   group "shelves" list {
@@ -2008,7 +1920,7 @@ group "E_Config" struct {
   }
   value "desk_auto_switch" int: 0;
   value "thumb_nice" int: 0;
-  value "menu_favorites_show" int: 0;
+  value "menu_favorites_show" int: 1;
   value "menu_apps_show" int: 1;
   value "ping_clients_interval" int: 128;
   value "cache_flush_poll_interval" int: 512;
@@ -2029,10 +1941,10 @@ group "E_Config" struct {
   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: "/etc/xdg/menus/gnome-applications.menu";
+  value "default_system_menu" string: "";
   value "cfgdlg_normal_wins" uchar: 0;
   value "syscon.main.icon_size" int: 64;
   value "syscon.secondary.icon_size" int: 48;

diff --git a/config/illume-home/module.dropshadow.cfg b/config/illume-home/module.dropshadow.cfg
deleted file mode 100644 (file)
index cec4695..0000000
Binary files a/config/illume-home/module.dropshadow.cfg and /dev/null differ

diff --git a/config/illume-home/module.dropshadow.src b/config/illume-home/module.dropshadow.src
deleted file mode 100644 (file)
index faefaad..0000000
--- a/config/illume-home/module.dropshadow.src
+++ /dev/null
@@ -1,7 +0,0 @@
-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;
-}

diff --git a/config/illume-home/module.illume-home.cfg b/config/illume-home/module.illume-home.cfg
new file mode 100644 (file)
index 0000000..3059571
Binary files /dev/null and b/config/illume-home/module.illume-home.cfg differ

diff --git a/config/illume-home/module.illume-keyboard.cfg b/config/illume-home/module.illume-keyboard.cfg
new file mode 100644 (file)
index 0000000..acd37ac
Binary files /dev/null and b/config/illume-home/module.illume-keyboard.cfg differ

diff --git a/config/illume-home/module.illume-keyboard.src b/config/illume-home/module.illume-keyboard.src
index cda77d6..46cda9c 100644 (file)
--- a/config/illume-home/module.illume-keyboard.src
+++ b/config/illume-home/module.illume-keyboard.src
@@ -1,5 +1,5 @@
 group "Illume_Kbd_Cfg" struct {
   value "version" int: 0;
   value "use_internal" int: 1;
-  value "dict" string: "English_(US).dic";
+  value "dict" string: "English_(US)_Small.dic";
 }

diff --git a/config/illume-home/module.illume-softkey.cfg b/config/illume-home/module.illume-softkey.cfg
new file mode 100644 (file)
index 0000000..f0e47ca
Binary files /dev/null and b/config/illume-home/module.illume-softkey.cfg differ

diff --git a/config/illume-home/module.illume-softkey.src b/config/illume-home/module.illume-softkey.src
new file mode 100644 (file)
index 0000000..56b88fc
--- /dev/null
+++ b/config/illume-home/module.illume-softkey.src
@@ -0,0 +1,3 @@
+group "Illume-Softkey_Cfg" struct {
+  value "version" int: 0;
+}