From 4e053d8611253401a5702df727733ec78fae4f7d Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 5 Mar 2021 12:28:09 +0000 Subject: [PATCH] default config - load systray and adjust shelf gadgets to match --- data/config/standard/e.src | 83 +++++++++++++++++-------- data/config/tiling/e.src | 120 ++++++++++++++++++++++++------------- 2 files changed, 136 insertions(+), 67 deletions(-) diff --git a/data/config/standard/e.src b/data/config/standard/e.src index 8691866da..d9168bd32 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,14 +684,13 @@ 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: 0; - value "style" string: "plain"; + value "state_info.flags" int: 1; value "autoscroll" uchar: 0; value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "temperature"; - value "id" string: "temperature.1"; + value "name" string: "backlight"; + value "id" string: "backlight"; value "geom.pos" int: 160; value "geom.size" int: 32; value "geom.res" int: 800; @@ -706,8 +705,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "cpufreq"; - value "id" string: "cpufreq"; + value "name" string: "temperature"; + value "id" string: "temperature.1"; value "geom.pos" int: 192; value "geom.size" int: 32; value "geom.res" int: 800; @@ -722,8 +721,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "battery"; - value "id" string: "battery"; + value "name" string: "cpufreq"; + value "id" string: "cpufreq"; value "geom.pos" int: 224; value "geom.size" int: 32; value "geom.res" int: 800; @@ -738,8 +737,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "clock"; - value "id" string: "clock"; + value "name" string: "battery"; + value "id" string: "battery"; value "geom.pos" int: 256; value "geom.size" int: 32; value "geom.res" int: 800; @@ -754,8 +753,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "mixer"; - value "id" string: "mixer.0"; + value "name" string: "clock"; + value "id" string: "clock"; value "geom.pos" int: 288; value "geom.size" int: 32; value "geom.res" int: 800; @@ -770,8 +769,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "connman"; - value "id" string: "connman"; + value "name" string: "mixer"; + value "id" string: "mixer.0"; value "geom.pos" int: 320; value "geom.size" int: 32; value "geom.res" int: 800; @@ -786,8 +785,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "bluez5"; - value "id" string: "bluez5.0"; + value "name" string: "connman"; + value "id" string: "connman"; value "geom.pos" int: 352; value "geom.size" int: 32; value "geom.res" int: 800; @@ -802,8 +801,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "tasks"; - value "id" string: "tasks.0"; + value "name" string: "bluez5"; + value "id" string: "bluez5.0"; value "geom.pos" int: 384; value "geom.size" int: 32; value "geom.res" int: 800; @@ -813,13 +812,13 @@ group "E_Config" struct { value "geom.size_h" double: 0.0; value "state_info.seq" int: 13; value "state_info.flags" int: 0; - value "style" string: "inset"; - value "autoscroll" uchar: 1; + value "style" string: "plain"; + value "autoscroll" uchar: 0; value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "xkbswitch"; - value "id" string: "xkbswitch"; + value "name" string: "tasks"; + value "id" string: "tasks.0"; value "geom.pos" int: 416; value "geom.size" int: 32; value "geom.res" int: 800; @@ -829,6 +828,38 @@ group "E_Config" struct { value "geom.size_h" double: 0.0; value "state_info.seq" int: 14; value "state_info.flags" int: 0; + value "style" string: "inset"; + value "autoscroll" uchar: 1; + value "resizable" uchar: 0; + } + group "E_Config_Gadcon_Client" struct { + value "name" string: "xkbswitch"; + value "id" string: "xkbswitch"; + 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: 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; value "resizable" 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 719dce665..2e9b4fd2d 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,14 +685,13 @@ 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: 0; - value "style" string: "plain"; + value "state_info.flags" int: 1; value "autoscroll" uchar: 0; value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "temperature"; - value "id" string: "temperature.1"; + value "name" string: "backlight"; + value "id" string: "backlight"; value "geom.pos" int: 160; value "geom.size" int: 32; value "geom.res" int: 800; @@ -707,8 +706,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "cpufreq"; - value "id" string: "cpufreq"; + value "name" string: "temperature"; + value "id" string: "temperature.1"; value "geom.pos" int: 192; value "geom.size" int: 32; value "geom.res" int: 800; @@ -723,8 +722,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "battery"; - value "id" string: "battery"; + value "name" string: "cpufreq"; + value "id" string: "cpufreq"; value "geom.pos" int: 224; value "geom.size" int: 32; value "geom.res" int: 800; @@ -739,8 +738,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "clock"; - value "id" string: "clock"; + value "name" string: "battery"; + value "id" string: "battery"; value "geom.pos" int: 256; value "geom.size" int: 32; value "geom.res" int: 800; @@ -755,8 +754,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "mixer"; - value "id" string: "mixer.0"; + value "name" string: "clock"; + value "id" string: "clock"; value "geom.pos" int: 288; value "geom.size" int: 32; value "geom.res" int: 800; @@ -771,8 +770,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "connman"; - value "id" string: "connman"; + value "name" string: "mixer"; + value "id" string: "mixer.0"; value "geom.pos" int: 320; value "geom.size" int: 32; value "geom.res" int: 800; @@ -787,8 +786,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "bluez5"; - value "id" string: "bluez5.0"; + value "name" string: "connman"; + value "id" string: "connman"; value "geom.pos" int: 352; value "geom.size" int: 32; value "geom.res" int: 800; @@ -803,8 +802,8 @@ group "E_Config" struct { value "resizable" uchar: 0; } group "E_Config_Gadcon_Client" struct { - value "name" string: "tasks"; - value "id" string: "tasks.0"; + value "name" string: "bluez5"; + value "id" string: "bluez5.0"; value "geom.pos" int: 384; value "geom.size" int: 32; value "geom.res" int: 800; @@ -812,45 +811,76 @@ group "E_Config" struct { 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.flags" int: 0; - value "style" string: "inset"; - value "autoscroll" uchar: 1; - value "resizable" uchar: 0; - } - group "E_Config_Gadcon_Client" struct { - value "name" string: "xkbswitch"; - value "id" string: "xkbswitch"; - 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.flags" int: 0; value "style" string: "plain"; value "autoscroll" uchar: 0; value "resizable" uchar: 0; } + group "E_Config_Gadcon_Client" struct { + value "name" string: "tasks"; + value "id" string: "tasks.0"; + 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: 14; + value "state_info.flags" int: 0; + value "style" string: "inset"; + value "autoscroll" uchar: 1; + value "resizable" uchar: 0; + } + group "E_Config_Gadcon_Client" struct { + value "name" string: "xkbswitch"; + value "id" string: "xkbswitch"; + 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: 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: "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;