diff --git a/config/illume-home/Makefile.am b/config/illume-home/Makefile.am index 66a4517f8..71cc07f6c 100644 --- a/config/illume-home/Makefile.am +++ b/config/illume-home/Makefile.am @@ -7,10 +7,10 @@ EXTRA_DIST = \ icon.png \ e.src \ module.battery.src \ - module.pager.src \ module.illume-home.src \ module.illume-keyboard.src \ - module.illume-softkey.src + module.illume-softkey.src \ + module.illume2.src filesdir = $(datadir)/enlightenment/data/config/illume-home files_DATA = \ @@ -18,10 +18,10 @@ files_DATA = \ icon.png \ e.cfg \ module.battery.cfg \ - module.pager.cfg \ module.illume-home.cfg \ module.illume-keyboard.cfg \ - module.illume-softkey.cfg + module.illume-softkey.cfg \ + module.illume2.cfg %.cfg: %.src $(EET_EET) -e \ diff --git a/config/illume-home/e.src b/config/illume-home/e.src index fffb03a7c..4ac91709f 100644 --- a/config/illume-home/e.src +++ b/config/illume-home/e.src @@ -56,14 +56,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "pager"; - value "enabled" uchar: 1; - value "delayed" uchar: 0; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "exebuf"; @@ -72,14 +64,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "winlist"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf"; @@ -363,7 +347,7 @@ group "E_Config" struct { group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_winlist"; - value "enabled" uchar: 1; + value "enabled" uchar: 0; value "delayed" uchar: 1; value "priority" int: 0; } @@ -1694,8 +1678,8 @@ group "E_Config" struct { } group "clients" list { group "E_Config_Gadcon_Client" struct { - value "name" string: "illume2"; - value "id" string: "illume2.0"; + value "name" string: "illume-kbd-toggle"; + value "id" string: "illume-kbd-toggle.0"; value "geom.pos" int: 0; value "geom.size" int: 32; value "geom.res" int: 800; @@ -1703,7 +1687,90 @@ group "E_Config" struct { 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.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: "illume2-mode"; + value "id" string: "illume2-mode.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: 6; + value "state_info.flags" int: 0; + value "style" string: "plain"; + value "orient" int: 0; + value "autoscroll" uchar: 0; + value "resizable" uchar: 0; + } + } + } + } + group "gadcons" list { + group "E_Config_Gadcon" struct { + value "name" string: "illume-indicator"; + value "id" int: 2; + value "zone" int: 1; + 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: 4; + 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: 5; value "state_info.flags" int: 0; value "style" string: "plain"; value "orient" int: 0; diff --git a/config/illume-home/module.pager.src b/config/illume-home/module.pager.src deleted file mode 100644 index 320830c22..000000000 --- a/config/illume-home/module.pager.src +++ /dev/null @@ -1,15 +0,0 @@ -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; -}