From: Jinkun Jang Date: Fri, 15 Mar 2013 16:19:06 +0000 (+0900) Subject: merge with master X-Git-Tag: 2.1b_release~6 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fe17-misc.git;a=commitdiff_plain;h=46e7886bea8e2c89c57b8e443dcfc1e66e17453b merge with master --- diff --git a/arm/opt/home/app/.e/e/config/samsung/Makefile.am b/arm/opt/home/app/.e/e/config/samsung/Makefile.am index fbbeb61..794f1b8 100644 --- a/arm/opt/home/app/.e/e/config/samsung/Makefile.am +++ b/arm/opt/home/app/.e/e/config/samsung/Makefile.am @@ -3,20 +3,20 @@ MAINTAINERCLEANFILES = Makefile.in EET_EET = @eet_eet@ EXTRA_DIST = \ - module.comp-slp.src \ + module.comp-tizen.src \ e.src \ - module.illume2-slp.src \ - module.devicemgr-slp.src \ - module.move-slp.src \ + module.illume2-tizen.src \ + module.devicemgr-tizen.src \ + module.move-tizen.src \ exehist.src filesdir = $(prefix)/.e/e/config/samsung/ files_DATA = \ - module.comp-slp.cfg \ + module.comp-tizen.cfg \ e.cfg \ - module.illume2-slp.cfg \ - module.devicemgr-slp.cfg \ - module.move-slp.cfg \ + module.illume2-tizen.cfg \ + module.devicemgr-tizen.cfg \ + module.move-tizen.cfg \ exehist.cfg SUFFIXES = .cfg diff --git a/arm/opt/home/app/.e/e/config/samsung/e.src b/arm/opt/home/app/.e/e/config/samsung/e.src index e88c83d..8ba97ef 100644 --- a/arm/opt/home/app/.e/e/config/samsung/e.src +++ b/arm/opt/home/app/.e/e/config/samsung/e.src @@ -5,12 +5,12 @@ group "E_Config" struct { value "zone" int: 1; value "desk_x" int: -1; value "desk_y" int: -1; - value "file" string: "/opt/home/root/.e/e/backgrounds/DM_Wallpaper03.edj"; + value "file" string: "/opt/home/app/.e/e/backgrounds/DM_Wallpaper03.edj"; } } group "modules" list { group "E_Config_Module" struct { - value "name" string: "illume2-slp"; + value "name" string: "illume2-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 100; @@ -52,19 +52,19 @@ group "E_Config" struct { value "priority" int: 0; } group "E_Config_Module" struct { - value "name" string: "comp-slp"; + value "name" string: "comp-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: -1000; } group "E_Config_Module" struct { - value "name" string: "config-slp"; + value "name" string: "config-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: -2000; } group "E_Config_Module" struct { - value "name" string: "move-slp"; + value "name" string: "move-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: -2000; @@ -479,8 +479,8 @@ group "E_Config" struct { value "auto_raise_delay" double: 0.5000000000000000000000000; value "use_resist" int: 1; value "drag_resist" int: 16; - value "desk_resist" int: 32; - value "window_resist" int: 12; + value "desk_resist" int: 64; + value "window_resist" int: 64; value "gadget_resist" int: 32; value "geometry_auto_resize_limit" int: 0; value "geometry_auto_move" int: 0; @@ -664,4 +664,5 @@ group "E_Config" struct { value "update.check" uchar: 0; value "update.later" uchar: 0; value "xkb.only_label" int: 0; + value "wm_win_rotation" uchar: 1; } diff --git a/arm/opt/home/app/.e/e/config/samsung/module.comp-slp.src b/arm/opt/home/app/.e/e/config/samsung/module.comp-tizen.src similarity index 98% rename from arm/opt/home/app/.e/e/config/samsung/module.comp-slp.src rename to arm/opt/home/app/.e/e/config/samsung/module.comp-tizen.src index 444c30b..1ab928e 100644 --- a/arm/opt/home/app/.e/e/config/samsung/module.comp-slp.src +++ b/arm/opt/home/app/.e/e/config/samsung/module.comp-tizen.src @@ -170,7 +170,9 @@ group "Comp_Config" struct { value "canvas_per_zone" uchar: 1; value "use_lock_screen" uchar: 1; value "default_window_effect" uchar: 0; + value "fake_image_launch" uchar: 0; value "keyboard_effect" uchar: 0; + value "defer_raise_effect" uchar: 0; value "max_lock_screen_time" double: 2.0000000000000000000000000; value "damage_timeout" double: 10.0000000000000000000000000; value "use_hw_ov" uchar: 0; diff --git a/i386/opt/home/app/.e/e/config/samsung/module.devicemgr-slp.src b/arm/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src similarity index 100% rename from i386/opt/home/app/.e/e/config/samsung/module.devicemgr-slp.src rename to arm/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src diff --git a/i386/opt/home/app/.e/e/config/samsung/module.illume2-slp.src b/arm/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src similarity index 100% rename from i386/opt/home/app/.e/e/config/samsung/module.illume2-slp.src rename to arm/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src diff --git a/i386/opt/home/app/.e/e/config/samsung/module.move-slp.src b/arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src similarity index 100% rename from i386/opt/home/app/.e/e/config/samsung/module.move-slp.src rename to arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src diff --git a/emulator/opt/home/app/.e/e/config/samsung/Makefile.am b/emulator/opt/home/app/.e/e/config/samsung/Makefile.am index c29e8cd..5a87da3 100644 --- a/emulator/opt/home/app/.e/e/config/samsung/Makefile.am +++ b/emulator/opt/home/app/.e/e/config/samsung/Makefile.am @@ -3,20 +3,20 @@ MAINTAINERCLEANFILES = Makefile.in EET_EET = @eet_eet@ EXTRA_DIST = \ - module.comp-slp.src \ + module.comp-tizen.src \ e.src \ - module.illume2-slp.src \ - module.devicemgr-slp.src \ - module.move-slp.src \ + module.illume2-tizen.src \ + module.devicemgr-tizen.src \ + module.move-tizen.src \ exehist.src filesdir = $(prefix)/.e/e/config/samsung/ files_DATA = \ - module.comp-slp.cfg \ + module.comp-tizen.cfg \ e.cfg \ - module.illume2-slp.cfg \ - module.devicemgr-slp.cfg \ - module.move-slp.cfg \ + module.illume2-tizen.cfg \ + module.devicemgr-tizen.cfg \ + module.move-tizen.cfg \ exehist.cfg SUFFIXES = .cfg diff --git a/emulator/opt/home/app/.e/e/config/samsung/e.src b/emulator/opt/home/app/.e/e/config/samsung/e.src index ba8f283..4b47043 100644 --- a/emulator/opt/home/app/.e/e/config/samsung/e.src +++ b/emulator/opt/home/app/.e/e/config/samsung/e.src @@ -192,7 +192,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "illume2-slp"; + value "name" string: "illume2-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 100; @@ -216,19 +216,19 @@ group "E_Config" struct { value "priority" int: 0; } group "E_Config_Module" struct { - value "name" string: "comp-slp"; + value "name" string: "comp-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: -1000; } group "E_Config_Module" struct { - value "name" string: "move-slp"; + value "name" string: "move-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: -2000; } group "E_Config_Module" struct { - value "name" string: "config-slp"; + value "name" string: "config-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: -2000; @@ -284,8 +284,8 @@ group "E_Config" struct { value "auto_raise_delay" double: 0.5000000000000000000000000; value "use_resist" int: 1; value "drag_resist" int: 16; - value "desk_resist" int: 32; - value "window_resist" int: 12; + value "desk_resist" int: 64; + value "window_resist" int: 64; value "gadget_resist" int: 32; value "geometry_auto_resize_limit" int: 0; value "geometry_auto_move" int: 0; @@ -469,4 +469,5 @@ group "E_Config" struct { value "update.check" uchar: 0; value "update.later" uchar: 0; value "xkb.only_label" int: 0; + value "wm_win_rotation" uchar: 1; } diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.comp-slp.src b/emulator/opt/home/app/.e/e/config/samsung/module.comp-tizen.src similarity index 98% rename from emulator/opt/home/app/.e/e/config/samsung/module.comp-slp.src rename to emulator/opt/home/app/.e/e/config/samsung/module.comp-tizen.src index 66f4f06..c937cd8 100644 --- a/emulator/opt/home/app/.e/e/config/samsung/module.comp-slp.src +++ b/emulator/opt/home/app/.e/e/config/samsung/module.comp-tizen.src @@ -170,7 +170,9 @@ group "Comp_Config" struct { value "canvas_per_zone" uchar: 1; value "use_lock_screen" uchar: 1; value "default_window_effect" uchar: 0; + value "fake_image_launch" uchar: 0; value "keyboard_effect" uchar: 0; + value "defer_raise_effect" uchar: 0; value "max_lock_screen_time" double: 2.0000000000000000000000000; value "damage_timeout" double: 10.0000000000000000000000000; value "use_hw_ov" uchar: 0; diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-slp.src b/emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src similarity index 100% rename from emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-slp.src rename to emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.illume2-slp.src b/emulator/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src similarity index 100% rename from emulator/opt/home/app/.e/e/config/samsung/module.illume2-slp.src rename to emulator/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.move-slp.src b/emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src similarity index 100% rename from emulator/opt/home/app/.e/e/config/samsung/module.move-slp.src rename to emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src diff --git a/i386/opt/home/app/.e/e/config/samsung/Makefile.am b/i386/opt/home/app/.e/e/config/samsung/Makefile.am index 46f05a4..39d89f5 100644 --- a/i386/opt/home/app/.e/e/config/samsung/Makefile.am +++ b/i386/opt/home/app/.e/e/config/samsung/Makefile.am @@ -3,20 +3,20 @@ MAINTAINERCLEANFILES = Makefile.in EET_EET = @eet_eet@ EXTRA_DIST = \ - module.comp-slp.src \ + module.comp-tizen.src \ e.src \ - module.illume2-slp.src \ - module.devicemgr-slp.src \ - module.move-slp.src \ + module.illume2-tizen.src \ + module.devicemgr-tizen.src \ + module.move-tizen.src \ exehist.src filesdir = $(prefix)/.e/e/config/samsung/ files_DATA = \ - module.comp-slp.cfg \ + module.comp-tizen.cfg \ e.cfg \ - module.illume2-slp.cfg \ - module.devicemgr-slp.cfg \ - module.move-slp.cfg \ + module.illume2-tizen.cfg \ + module.devicemgr-tizen.cfg \ + module.move-tizen.cfg \ exehist.cfg SUFFIXES = .cfg diff --git a/i386/opt/home/app/.e/e/config/samsung/e.src b/i386/opt/home/app/.e/e/config/samsung/e.src index ba8f283..4b47043 100644 --- a/i386/opt/home/app/.e/e/config/samsung/e.src +++ b/i386/opt/home/app/.e/e/config/samsung/e.src @@ -192,7 +192,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "illume2-slp"; + value "name" string: "illume2-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 100; @@ -216,19 +216,19 @@ group "E_Config" struct { value "priority" int: 0; } group "E_Config_Module" struct { - value "name" string: "comp-slp"; + value "name" string: "comp-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: -1000; } group "E_Config_Module" struct { - value "name" string: "move-slp"; + value "name" string: "move-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: -2000; } group "E_Config_Module" struct { - value "name" string: "config-slp"; + value "name" string: "config-tizen"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: -2000; @@ -284,8 +284,8 @@ group "E_Config" struct { value "auto_raise_delay" double: 0.5000000000000000000000000; value "use_resist" int: 1; value "drag_resist" int: 16; - value "desk_resist" int: 32; - value "window_resist" int: 12; + value "desk_resist" int: 64; + value "window_resist" int: 64; value "gadget_resist" int: 32; value "geometry_auto_resize_limit" int: 0; value "geometry_auto_move" int: 0; @@ -469,4 +469,5 @@ group "E_Config" struct { value "update.check" uchar: 0; value "update.later" uchar: 0; value "xkb.only_label" int: 0; + value "wm_win_rotation" uchar: 1; } diff --git a/i386/opt/home/app/.e/e/config/samsung/module.comp-slp.src b/i386/opt/home/app/.e/e/config/samsung/module.comp-tizen.src similarity index 98% rename from i386/opt/home/app/.e/e/config/samsung/module.comp-slp.src rename to i386/opt/home/app/.e/e/config/samsung/module.comp-tizen.src index 444c30b..1ab928e 100644 --- a/i386/opt/home/app/.e/e/config/samsung/module.comp-slp.src +++ b/i386/opt/home/app/.e/e/config/samsung/module.comp-tizen.src @@ -170,7 +170,9 @@ group "Comp_Config" struct { value "canvas_per_zone" uchar: 1; value "use_lock_screen" uchar: 1; value "default_window_effect" uchar: 0; + value "fake_image_launch" uchar: 0; value "keyboard_effect" uchar: 0; + value "defer_raise_effect" uchar: 0; value "max_lock_screen_time" double: 2.0000000000000000000000000; value "damage_timeout" double: 10.0000000000000000000000000; value "use_hw_ov" uchar: 0; diff --git a/arm/opt/home/app/.e/e/config/samsung/module.devicemgr-slp.src b/i386/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src similarity index 100% rename from arm/opt/home/app/.e/e/config/samsung/module.devicemgr-slp.src rename to i386/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src diff --git a/arm/opt/home/app/.e/e/config/samsung/module.illume2-slp.src b/i386/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src similarity index 100% rename from arm/opt/home/app/.e/e/config/samsung/module.illume2-slp.src rename to i386/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src diff --git a/arm/opt/home/app/.e/e/config/samsung/module.move-slp.src b/i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src similarity index 100% rename from arm/opt/home/app/.e/e/config/samsung/module.move-slp.src rename to i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src diff --git a/packaging/e17-misc.spec b/packaging/e17-misc.spec index 4ff9225..fa72ed9 100644 --- a/packaging/e17-misc.spec +++ b/packaging/e17-misc.spec @@ -1,4 +1,3 @@ -#sbs-git:slp/pkgs/e/e17-misc e17-misc 0.2 Name: e17-misc Summary: E17 Config files Version: 0.2