From 5dcfeff8b408398ccc364af85e41c29fc32b0b27 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Sun, 2 Nov 2008 21:23:02 +0100 Subject: [PATCH] illume-config: Sync with upstream brings in fixes for topshelf size --- illume/illume-config/e.src | 243 +++++++++++++++++++++++++++++++- illume/illume-config/module.battery.src | 6 +- illume/illume-config/module.illume.src | 10 +- 3 files changed, 244 insertions(+), 15 deletions(-) diff --git a/illume/illume-config/e.src b/illume/illume-config/e.src index 09dd398..2acc7a4 100644 --- a/illume/illume-config/e.src +++ b/illume/illume-config/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: 25.0000000000000000000000000; + value "framerate" double: 30.0000000000000000000000000; value "image_cache" int: 2048; value "font_cache" int: 512; value "edje_cache" int: 8; @@ -34,18 +34,90 @@ group "E_Config" struct { value "use_composite" int: 0; group "modules" list { group "E_Config_Module" struct { - value "name" string: "battery"; + value "name" string: "illume"; value "enabled" uchar: 1; value "delayed" uchar: 0; - value "priority" int: 0; + value "priority" int: 1; } } group "modules" list { group "E_Config_Module" struct { - value "name" string: "illume"; + value "name" string: "start"; value "enabled" uchar: 1; value "delayed" uchar: 0; - value "priority" int: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_desk"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_dialogs"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_imc"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_keybindings"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_intl"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_mouse_cursor"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_transitions"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "battery"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "mixer"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; } } group "modules" list { @@ -56,6 +128,118 @@ group "E_Config" struct { value "priority" int: 0; } } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "pager"; + value "enabled" uchar: 0; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "connman"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_display"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_profiles"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_performance"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_fonts"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_engine"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_startup"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_theme"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_wallpaper"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "dropshadow"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "conf_desks"; + 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; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "gadman"; + value "enabled" uchar: 1; + value "delayed" uchar: 1; + value "priority" int: -100; + } + } group "font_defaults" list { group "E_Font_Default" struct { value "text_class" string: "default"; @@ -293,7 +477,6 @@ group "E_Config" struct { value "focus_last_focused_per_desktop" int: 1; value "focus_revert_on_hide_or_close" int: 1; value "pointer_slide" int: 0; - value "show_cursor" int: 0; value "use_e_cursor" int: 1; value "cursor_size" int: 32; value "menu_autoscroll_margin" int: 0; @@ -446,6 +629,36 @@ group "E_Config" struct { value "resizable" uchar: 0; } } + group "clients" list { + group "E_Config_Gadcon_Client" struct { + value "name" string: "pager"; + value "id" string: "pager"; + value "geom.pos" int: 376; + value "geom.size" int: 96; + value "geom.res" int: 472; + 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 "autoscroll" uchar: 0; + value "resizable" uchar: 0; + } + } + } + } + group "gadcons" list { + group "E_Config_Gadcon" struct { + value "name" string: "gadman"; + value "id" int: 114; + } + } + group "gadcons" list { + group "E_Config_Gadcon" struct { + value "name" string: "gadman_top"; + value "id" int: 115; } } value "font_hinting" int: 0; @@ -480,6 +693,7 @@ group "E_Config" struct { value "clientlist_warp_to_iconified_desktop" int: 0; value "clientlist_limit_caption_len" int: 0; value "clientlist_max_caption_len" int: 2; + value "mouse_hand" int: 1; value "mouse_accel_numerator" int: 2; value "mouse_accel_denominator" int: 1; value "mouse_accel_threshold" int: 4; @@ -554,7 +768,22 @@ group "E_Config" struct { value "ping_clients_interval" int: 128; value "cache_flush_poll_interval" int: 512; value "thumbscroll_enable" int: 1; - value "thumbscroll_threshhold" int: 24; + value "thumbscroll_threshhold" int: 36; value "thumbscroll_momentum_threshhold" double: 100.0000000000000000000000000; value "thumbscroll_friction" double: 1.0000000000000000000000000; + value "hal_desktop" int: 0; + value "border_keyboard.timeout" double: 5.0000000000000000000000000; + value "border_keyboard.move.dx" uchar: 5; + value "border_keyboard.move.dy" uchar: 5; + value "border_keyboard.resize.dx" uchar: 5; + value "border_keyboard.resize.dy" uchar: 5; + value "scale.min" double: 1.0000000000000000000000000; + value "scale.max" double: 3.0000000000000000000000000; + value "scale.factor" double: 1.0000000000000000000000000; + value "scale.base_dpi" int: 142; + value "scale.use_dpi" uchar: 1; + value "scale.use_custom" uchar: 0; + value "show_cursor" uchar: 0; + value "idle_cursor" uchar: 0; + value "default_system_menu" string: ""; } diff --git a/illume/illume-config/module.battery.src b/illume/illume-config/module.battery.src index d6badd6..968034a 100644 --- a/illume/illume-config/module.battery.src +++ b/illume/illume-config/module.battery.src @@ -1,6 +1,6 @@ group "Battery_Config" struct { - value "poll_interval" int: 4; - value "alert" int: 0; - value "alert_p" int: 0; + value "poll_interval" int: 32; + value "alert" int: 10; + value "alert_p" int: 10; value "alert_timeout" int: 0; } diff --git a/illume/illume-config/module.illume.src b/illume/illume-config/module.illume.src index 6dd03f5..b32be87 100644 --- a/illume/illume-config/module.illume.src +++ b/illume/illume-config/module.illume.src @@ -1,18 +1,18 @@ group "Illume_Cfg" struct { - value "config_version" int: 1; + value "config_version" int: 3; value "launcher.mode" int: 1; value "launcher.icon_size" int: 120; value "launcher.single_click" int: 1; value "power.auto_suspend" int: 0; value "power.auto_suspend_delay" int: 1; value "performance.cache_level" int: 3; - value "performance.fps" int: 25; - value "slipshelf.main_gadget_size" int: 42; - value "slipshelf.extra_gagdet_size" int: 32; + value "performance.fps" int: 30; + value "slipshelf.main_gadget_size" int: 70; + value "slipshelf.extra_gagdet_size" int: 48; + value "slipshelf.style" int: 1; value "sliding.slipshelf.duration" int: 1000; value "sliding.kbd.duration" int: 1000; value "sliding.busywin.duration" int: 1000; value "sliding.layout.duration" int: 0; value "kbd.use_internal" int: 1; - value "kbd.dict" string: "English_(US).dic"; } -- 2.11.4.GIT