From 4e053d8611253401a5702df727733ec78fae4f7d Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 5 Mar 2021 12:28:09 +0000 Subject: default config - load systray and adjust shelf gadgets to match --- data/config/standard/e.src | 75 ++++++++++++++++++++++++++++----------- data/config/tiling/e.src | 88 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 116 insertions(+), 47 deletions(-) (limited to 'data') diff --git a/data/config/standard/e.src b/data/config/standard/e.src index 8691866dae..d9168bd32c 100644 --- a/data/config/standard/e.src +++ b/data/config/standard/e.src @@ -674,8 +674,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "backlight"; - value "id" string: "backlight"; + value "name" string: "ibar"; + value "id" string: "ibar.1"; value "geom.pos" int: 128; value "geom.size" int: 32; value "geom.res" int: 800; @@ -684,6 +684,21 @@ group "E_Config" struct { value "geom.size_w" double: 0.0; value "geom.size_h" double: 0.0; value "state_info.seq" int: 5; + value "state_info.flags" int: 1; + value "autoscroll" uchar: 0; + value "resizable" uchar: 0; + } + group "E_Config_Gadcon_Client" struct { + value "name" string: "backlight"; + value "id" string: "backlight"; + value "geom.pos" int: 160; + 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 "state_info.seq" int: 6; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -692,14 +707,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "temperature"; value "id" string: "temperature.1"; - value "geom.pos" int: 160; + value "geom.pos" int: 192; 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 "state_info.seq" int: 6; + value "state_info.seq" int: 7; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -708,14 +723,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "cpufreq"; value "id" string: "cpufreq"; - value "geom.pos" int: 192; + value "geom.pos" int: 224; 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 "state_info.seq" int: 7; + value "state_info.seq" int: 8; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -724,14 +739,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "battery"; value "id" string: "battery"; - value "geom.pos" int: 224; + value "geom.pos" int: 256; 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 "state_info.seq" int: 8; + value "state_info.seq" int: 9; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -740,14 +755,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "clock"; value "id" string: "clock"; - value "geom.pos" int: 256; + value "geom.pos" int: 288; 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 "state_info.seq" int: 9; + value "state_info.seq" int: 10; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -756,14 +771,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "mixer"; value "id" string: "mixer.0"; - value "geom.pos" int: 288; + value "geom.pos" int: 320; 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 "state_info.seq" int: 10; + value "state_info.seq" int: 11; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -772,14 +787,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "connman"; value "id" string: "connman"; - value "geom.pos" int: 320; + value "geom.pos" int: 352; 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 "state_info.seq" int: 11; + value "state_info.seq" int: 12; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -788,14 +803,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "bluez5"; value "id" string: "bluez5.0"; - value "geom.pos" int: 352; + value "geom.pos" int: 384; 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 "state_info.seq" int: 12; + value "state_info.seq" int: 13; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -804,14 +819,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "tasks"; value "id" string: "tasks.0"; - value "geom.pos" int: 384; + value "geom.pos" int: 416; 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 "state_info.seq" int: 13; + value "state_info.seq" int: 14; value "state_info.flags" int: 0; value "style" string: "inset"; value "autoscroll" uchar: 1; @@ -820,14 +835,30 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "xkbswitch"; value "id" string: "xkbswitch"; - value "geom.pos" int: 416; + 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 "state_info.seq" int: 14; + value "state_info.seq" int: 15; + value "state_info.flags" int: 0; + value "style" string: "plain"; + value "autoscroll" uchar: 0; + value "resizable" uchar: 0; + } + group "E_Config_Gadcon_Client" struct { + value "name" string: "syscon"; + value "id" string: "syscon.1"; + 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 "state_info.seq" int: 16; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -1022,6 +1053,10 @@ group "E_Config" struct { value "name" string: "polkit"; value "enabled" uchar: 1; } + group "E_Config_Module" struct { + value "name" string: "systray"; + value "enabled" uchar: 1; + } } group "xkb.used_layouts" list { group "E_Config_XKB_Layout" struct { diff --git a/data/config/tiling/e.src b/data/config/tiling/e.src index 719dce6652..2e9b4fd2de 100644 --- a/data/config/tiling/e.src +++ b/data/config/tiling/e.src @@ -675,8 +675,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "backlight"; - value "id" string: "backlight"; + value "name" string: "ibar"; + value "id" string: "ibar.1"; value "geom.pos" int: 128; value "geom.size" int: 32; value "geom.res" int: 800; @@ -685,6 +685,21 @@ group "E_Config" struct { value "geom.size_w" double: 0.0; value "geom.size_h" double: 0.0; value "state_info.seq" int: 5; + value "state_info.flags" int: 1; + value "autoscroll" uchar: 0; + value "resizable" uchar: 0; + } + group "E_Config_Gadcon_Client" struct { + value "name" string: "backlight"; + value "id" string: "backlight"; + value "geom.pos" int: 160; + 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 "state_info.seq" int: 6; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -693,14 +708,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "temperature"; value "id" string: "temperature.1"; - value "geom.pos" int: 160; + value "geom.pos" int: 192; 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 "state_info.seq" int: 6; + value "state_info.seq" int: 7; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -709,14 +724,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "cpufreq"; value "id" string: "cpufreq"; - value "geom.pos" int: 192; + value "geom.pos" int: 224; 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 "state_info.seq" int: 7; + value "state_info.seq" int: 8; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -725,14 +740,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "battery"; value "id" string: "battery"; - value "geom.pos" int: 224; + value "geom.pos" int: 256; 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 "state_info.seq" int: 8; + value "state_info.seq" int: 9; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -741,14 +756,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "clock"; value "id" string: "clock"; - value "geom.pos" int: 256; + value "geom.pos" int: 288; 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 "state_info.seq" int: 9; + value "state_info.seq" int: 10; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -757,14 +772,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "mixer"; value "id" string: "mixer.0"; - value "geom.pos" int: 288; + value "geom.pos" int: 320; 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 "state_info.seq" int: 10; + value "state_info.seq" int: 11; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -773,14 +788,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "connman"; value "id" string: "connman"; - value "geom.pos" int: 320; + value "geom.pos" int: 352; 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 "state_info.seq" int: 11; + value "state_info.seq" int: 12; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -789,14 +804,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "bluez5"; value "id" string: "bluez5.0"; - value "geom.pos" int: 352; + value "geom.pos" int: 384; 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 "state_info.seq" int: 12; + value "state_info.seq" int: 13; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -805,14 +820,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "tasks"; value "id" string: "tasks.0"; - value "geom.pos" int: 384; + value "geom.pos" int: 416; 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 "state_info.seq" int: 12; + value "state_info.seq" int: 14; value "state_info.flags" int: 0; value "style" string: "inset"; value "autoscroll" uchar: 1; @@ -821,14 +836,14 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "xkbswitch"; value "id" string: "xkbswitch"; - value "geom.pos" int: 416; + 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 "state_info.seq" int: 13; + value "state_info.seq" int: 15; value "state_info.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; @@ -837,20 +852,35 @@ group "E_Config" struct { group "E_Config_Gadcon_Client" struct { value "name" string: "tiling"; value "id" string: "Tiling 0"; - value "geom.pos" int: 768; + value "geom.pos" int: 736; value "geom.size" int: 40; 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: 14; + 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 "state_info.seq" int: 16; value "state_info.flags" int: 3; value "orient" int: 0; value "autoscroll" uchar: 0; value "resizable" uchar: 0; } - + group "E_Config_Gadcon_Client" struct { + value "name" string: "syscon"; + value "id" string: "syscon.1"; + 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 "state_info.seq" int: 17; + value "state_info.flags" int: 0; + value "style" string: "plain"; + value "autoscroll" uchar: 0; + value "resizable" uchar: 0; + } } value "name" string: "shelf"; value "id" int: 1; @@ -1040,6 +1070,10 @@ group "E_Config" struct { value "name" string: "polkit"; value "enabled" uchar: 1; } + group "E_Config_Module" struct { + value "name" string: "systray"; + value "enabled" uchar: 1; + } group "E_Config_Module" struct { value "name" string: "tiling"; value "enabled" uchar: 1; -- cgit v1.2.1