From ac5a8f04c376183de517dc31927db0412cac0168 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Tue, 4 Jun 2013 23:49:13 +0900 Subject: [PATCH] Merge with e17-misc devel Change-Id: I63fc016ced6fa60f8319d25d0028ed1edc3fb8e6 --- .../app/.e/e/config/samsung/module.comp-tizen.src | 1 + .../.e/e/config/samsung/module.devicemgr-tizen.src | 18 ++++++++++++++++++ .../app/.e/e/config/samsung/module.move-tizen.src | 21 ++++++++++++--------- .../app/.e/e/config/samsung/module.comp-tizen.src | 1 + .../.e/e/config/samsung/module.devicemgr-tizen.src | 18 ++++++++++++++++++ .../app/.e/e/config/samsung/module.move-tizen.src | 21 ++++++++++++--------- .../app/.e/e/config/samsung/module.comp-tizen.src | 1 + .../.e/e/config/samsung/module.devicemgr-tizen.src | 18 ++++++++++++++++++ .../app/.e/e/config/samsung/module.move-tizen.src | 21 ++++++++++++--------- packaging/e17-misc.spec | 2 +- scripts/wmrc | 3 +++ 11 files changed, 97 insertions(+), 28 deletions(-) create mode 100755 scripts/wmrc diff --git a/arm/opt/home/app/.e/e/config/samsung/module.comp-tizen.src b/arm/opt/home/app/.e/e/config/samsung/module.comp-tizen.src index b3b6581..bc79080 100644 --- a/arm/opt/home/app/.e/e/config/samsung/module.comp-tizen.src +++ b/arm/opt/home/app/.e/e/config/samsung/module.comp-tizen.src @@ -172,6 +172,7 @@ group "Comp_Config" struct { value "default_window_effect" uchar: 0; value "fake_image_launch" uchar: 0; value "fake_launch_layer" int: 4; + value "lower_layer" int: 5; value "keyboard_effect" uchar: 0; value "defer_raise_effect" uchar: 0; value "max_lock_screen_time" double: 2.0000000000000000000000000; diff --git a/arm/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src b/arm/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src index c8be06f..12f0939 100644 --- a/arm/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src +++ b/arm/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src @@ -2,4 +2,22 @@ group "Devicemgr_Config" struct { value "ScrnConf.enable" uchar: 0; value "ScrnConf.default_dispmode" int: 1; value "ScrnConf.isPopUpEnabled" uchar: 0; + group "rotation" list { + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 270; + } + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 0; + } + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 180; + } + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 90; + } + } } diff --git a/arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src b/arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src index 732531a..f44515b 100644 --- a/arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src +++ b/arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src @@ -1,15 +1,18 @@ group "Move_Config" struct { value "indicator_always_portrait_region_ratio" double: 0.0; value "indicator_always_landscape_region_ratio" double: 0.0; - value "indicator_quickpanel_portrait_region_ratio" double: 1.0; - value "indicator_quickpanel_landscape_region_ratio" double: 1.0; + value "indicator_quickpanel_portrait_region_ratio" double: 0.8917; + value "indicator_quickpanel_landscape_region_ratio" double: 0.9390; value "indicator_apptray_portrait_region_ratio" double: 1.0; value "indicator_apptray_landscape_region_ratio" double: 1.0; value "qp_scroll_with_visible_win" uchar: 1; value "qp_scroll_with_clipping" uchar: 1; value "dim_max_opacity" int: 200; value "dim_min_opacity" int: 0; - value "flick_speed_limit" double: 200.0; + value "flick_limit.speed" double: 200.0; + value "flick_limit.angle" double: 0.26; + value "flick_limit.distance" double: 105.0; + value "flick_limit.distance_rate" double: 0.1; value "animation_duration" double: 0.4; value "event_log" uchar: 1; value "event_log_count" int: 600; @@ -31,19 +34,19 @@ group "Move_Config" struct { value "indicator_widget_geometry[E_MOVE_ANGLE_270].w" int: 50; value "indicator_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].x" int: 0; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].y" int: 1230; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].y" int: 1260; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].w" int: 720; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].h" int: 50; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].x" int: 670; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].h" int: 20; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].x" int: 700; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].y" int: 0; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].w" int: 50; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].w" int: 20; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].h" int: 1280; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].x" int: 0; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].y" int: 0; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].w" int: 720; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].h" int: 50; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].h" int: 20; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].x" int: 0; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].y" int: 0; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].w" int: 50; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].w" int: 20; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280; } diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.comp-tizen.src b/emulator/opt/home/app/.e/e/config/samsung/module.comp-tizen.src index 1c7af07..dd8d9fd 100644 --- a/emulator/opt/home/app/.e/e/config/samsung/module.comp-tizen.src +++ b/emulator/opt/home/app/.e/e/config/samsung/module.comp-tizen.src @@ -172,6 +172,7 @@ group "Comp_Config" struct { value "default_window_effect" uchar: 0; value "fake_image_launch" uchar: 0; value "fake_launch_layer" int: 4; + value "lower_layer" int: 5; value "keyboard_effect" uchar: 0; value "defer_raise_effect" uchar: 0; value "max_lock_screen_time" double: 2.0000000000000000000000000; diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src b/emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src index c8be06f..12f0939 100644 --- a/emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src +++ b/emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src @@ -2,4 +2,22 @@ group "Devicemgr_Config" struct { value "ScrnConf.enable" uchar: 0; value "ScrnConf.default_dispmode" int: 1; value "ScrnConf.isPopUpEnabled" uchar: 0; + group "rotation" list { + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 270; + } + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 0; + } + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 180; + } + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 90; + } + } } diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src b/emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src index 732531a..f44515b 100644 --- a/emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src +++ b/emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src @@ -1,15 +1,18 @@ group "Move_Config" struct { value "indicator_always_portrait_region_ratio" double: 0.0; value "indicator_always_landscape_region_ratio" double: 0.0; - value "indicator_quickpanel_portrait_region_ratio" double: 1.0; - value "indicator_quickpanel_landscape_region_ratio" double: 1.0; + value "indicator_quickpanel_portrait_region_ratio" double: 0.8917; + value "indicator_quickpanel_landscape_region_ratio" double: 0.9390; value "indicator_apptray_portrait_region_ratio" double: 1.0; value "indicator_apptray_landscape_region_ratio" double: 1.0; value "qp_scroll_with_visible_win" uchar: 1; value "qp_scroll_with_clipping" uchar: 1; value "dim_max_opacity" int: 200; value "dim_min_opacity" int: 0; - value "flick_speed_limit" double: 200.0; + value "flick_limit.speed" double: 200.0; + value "flick_limit.angle" double: 0.26; + value "flick_limit.distance" double: 105.0; + value "flick_limit.distance_rate" double: 0.1; value "animation_duration" double: 0.4; value "event_log" uchar: 1; value "event_log_count" int: 600; @@ -31,19 +34,19 @@ group "Move_Config" struct { value "indicator_widget_geometry[E_MOVE_ANGLE_270].w" int: 50; value "indicator_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].x" int: 0; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].y" int: 1230; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].y" int: 1260; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].w" int: 720; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].h" int: 50; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].x" int: 670; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].h" int: 20; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].x" int: 700; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].y" int: 0; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].w" int: 50; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].w" int: 20; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].h" int: 1280; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].x" int: 0; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].y" int: 0; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].w" int: 720; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].h" int: 50; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].h" int: 20; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].x" int: 0; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].y" int: 0; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].w" int: 50; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].w" int: 20; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280; } diff --git a/i386/opt/home/app/.e/e/config/samsung/module.comp-tizen.src b/i386/opt/home/app/.e/e/config/samsung/module.comp-tizen.src index b3b6581..bc79080 100644 --- a/i386/opt/home/app/.e/e/config/samsung/module.comp-tizen.src +++ b/i386/opt/home/app/.e/e/config/samsung/module.comp-tizen.src @@ -172,6 +172,7 @@ group "Comp_Config" struct { value "default_window_effect" uchar: 0; value "fake_image_launch" uchar: 0; value "fake_launch_layer" int: 4; + value "lower_layer" int: 5; value "keyboard_effect" uchar: 0; value "defer_raise_effect" uchar: 0; value "max_lock_screen_time" double: 2.0000000000000000000000000; diff --git a/i386/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src b/i386/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src index c8be06f..12f0939 100644 --- a/i386/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src +++ b/i386/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src @@ -2,4 +2,22 @@ group "Devicemgr_Config" struct { value "ScrnConf.enable" uchar: 0; value "ScrnConf.default_dispmode" int: 1; value "ScrnConf.isPopUpEnabled" uchar: 0; + group "rotation" list { + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 270; + } + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 0; + } + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 180; + } + group "E_Devicemgr_Config_Rotation" struct { + value "enable" uchar: 1; + value "angle" int: 90; + } + } } diff --git a/i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src b/i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src index 732531a..f44515b 100644 --- a/i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src +++ b/i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src @@ -1,15 +1,18 @@ group "Move_Config" struct { value "indicator_always_portrait_region_ratio" double: 0.0; value "indicator_always_landscape_region_ratio" double: 0.0; - value "indicator_quickpanel_portrait_region_ratio" double: 1.0; - value "indicator_quickpanel_landscape_region_ratio" double: 1.0; + value "indicator_quickpanel_portrait_region_ratio" double: 0.8917; + value "indicator_quickpanel_landscape_region_ratio" double: 0.9390; value "indicator_apptray_portrait_region_ratio" double: 1.0; value "indicator_apptray_landscape_region_ratio" double: 1.0; value "qp_scroll_with_visible_win" uchar: 1; value "qp_scroll_with_clipping" uchar: 1; value "dim_max_opacity" int: 200; value "dim_min_opacity" int: 0; - value "flick_speed_limit" double: 200.0; + value "flick_limit.speed" double: 200.0; + value "flick_limit.angle" double: 0.26; + value "flick_limit.distance" double: 105.0; + value "flick_limit.distance_rate" double: 0.1; value "animation_duration" double: 0.4; value "event_log" uchar: 1; value "event_log_count" int: 600; @@ -31,19 +34,19 @@ group "Move_Config" struct { value "indicator_widget_geometry[E_MOVE_ANGLE_270].w" int: 50; value "indicator_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].x" int: 0; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].y" int: 1230; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].y" int: 1260; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].w" int: 720; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].h" int: 50; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].x" int: 670; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].h" int: 20; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].x" int: 700; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].y" int: 0; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].w" int: 50; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].w" int: 20; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].h" int: 1280; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].x" int: 0; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].y" int: 0; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].w" int: 720; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].h" int: 50; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].h" int: 20; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].x" int: 0; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].y" int: 0; - value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].w" int: 50; + value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].w" int: 20; value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280; } diff --git a/packaging/e17-misc.spec b/packaging/e17-misc.spec index d0ad803..58b53d7 100644 --- a/packaging/e17-misc.spec +++ b/packaging/e17-misc.spec @@ -2,7 +2,7 @@ Name: e17-misc Summary: E17 Config files -Version: 0.4.2 +Version: 0.5.1 Release: 1 Group: Graphics & UI Framework/Configuration License: BSD-2-Clause diff --git a/scripts/wmrc b/scripts/wmrc new file mode 100755 index 0000000..bbd8e6f --- /dev/null +++ b/scripts/wmrc @@ -0,0 +1,3 @@ +#!/bin/sh + +EVAS_NO_DRI_SWAPBUF=1 /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it & -- 2.7.4