shortcuts: changed the shortcut for Power function

According to the version of OS or Platform, the previous shortcut
for Power function(Ctrl+Shift+F7) did not work well.
After performing tests on MacOS 10.10, 10.11, Ubuntu, Windows 7 and Windows 10,
I confirmed the new shorcut(Ctrl+shift+F8) operates correctly.

Change-Id: I0a12216a066cd46a604a5060ed88a75dda29c3bc
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
(cherry picked from commit afbc265908c2319d03e596bd9f568a5d96e56004)

diff --git a/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml
index e5b6daeba562c8d04fe89f63d0a09d944cc69c71..1632cbf75f210fb096848b118e5c6af1ba60f835 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml
@@ -33,7 +33,7 @@
                     <region left="362" top="487" width="15" height="70"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="362" top="63" width="15" height="70"/>
@@ -79,7 +79,7 @@
                     <region left="486" top="3" width="70" height="15"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="63" top="3" width="70" height="15"/>
@@ -125,7 +125,7 @@
                     <region left="3" top="64" width="15" height="70"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="3" top="488" width="15" height="70"/>
@@ -171,7 +171,7 @@
                     <region left="64" top="362" width="70" height="15"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="488" top="362" width="70" height="15"/>

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml
index a531bac1ea8e1f459e0e2c971d70739e194dc404..b6b1aaf01e48fef323b377ffa8225c6c356f72b6 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml
@@ -33,7 +33,7 @@
                     <region left="536" top="814" width="20" height="74"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="536" top="76" width="20" height="74"/>
@@ -79,7 +79,7 @@
                     <region left="813" top="0" width="74" height="20"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="75" top="0" width="74" height="20"/>
@@ -125,7 +125,7 @@
                     <region left="0" top="79" width="20" height="74"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="0" top="816" width="20" height="74"/>
@@ -171,7 +171,7 @@
                     <region left="78" top="534" width="74" height="20"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="816" top="534" width="74" height="20"/>

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml
index f837aba936d7832ed616a5a313d99af06ce7aa48..4c0d240b441b22dfe99d6a1f352233ce373471d3 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml
@@ -33,7 +33,7 @@
                     <region left="595" top="974" width="20" height="74"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="595" top="75" width="20" height="74"/>
@@ -79,7 +79,7 @@
                     <region left="973" top="0" width="74" height="20"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="75" top="0" width="74" height="20"/>
@@ -125,7 +125,7 @@
                     <region left="0" top="79" width="20" height="74"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="0" top="976" width="20" height="74"/>
@@ -171,7 +171,7 @@
                     <region left="79" top="595" width="74" height="20"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="975" top="595" width="74" height="20"/>

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml
index 59d6b7fd413d64145d1e11df13ac572755fec431..c2e5702330373254ee5edb03fc187ca32500ac1c 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml
@@ -33,7 +33,7 @@
                     <region left="836" top="1304" width="24" height="96"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="836" top="103" width="24" height="96"/>
@@ -79,7 +79,7 @@
                     <region left="1303" top="0" width="96" height="24"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="103" top="0" width="96" height="24"/>
@@ -125,7 +125,7 @@
                     <region left="0" top="105" width="24" height="96"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="0" top="1305" width="24" height="96"/>
@@ -171,7 +171,7 @@
                     <region left="104" top="836" width="96" height="24"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="1304" top="836" width="96" height="24"/>

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/controller/key-window/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/controller/key-window/layout.xml
index ed9f88df1b6748f236b71510c837e331aaec2957..26fd74a81b0918718a1f1f0bc286ca9327a50ab7 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/controller/key-window/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/controller/key-window/layout.xml
@@ -23,7 +23,7 @@
             <key name="Power">
                 <keycode>116</keycode>
                 <tooltip>Power</tooltip>
-                <shortcut>Ctrl+Shift+F7</shortcut>
+                <shortcut>Ctrl+Shift+F8</shortcut>
             </key>
             <key name="Volume +">
                 <keycode>115</keycode>

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml
index 44829e541f39ce5faadea667810ca11935e9b507..7b07664eafccae686d022e1c018c88fccc09cf50 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml
@@ -15,7 +15,7 @@
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
                     <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -31,7 +31,7 @@
                     <region left="116" top="0" width="80" height="12"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -47,7 +47,7 @@
                     <region left="0" top="244" width="12" height="80"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -63,7 +63,7 @@
                     <region left="244" top="372" width="80" height="12"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml
index 01cf3ac2527390b3c2ca4b6366bf9c73ad03bc2a..d76efd68858d45c8572e03d86f5f1d999e7f1c9d 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml
@@ -15,7 +15,7 @@
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
                     <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -31,7 +31,7 @@
                     <region left="243" top="0" width="58" height="28"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -47,7 +47,7 @@
                     <region left="0" top="243" width="28" height="58"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -63,7 +63,7 @@
                     <region left="243" top="396" width="58" height="28"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml
index 7d5a8446ed25ba271cf564e1ec62eb0b3f89f064..91230683a23f631ae3b5009c3c0de9771d14fcb3 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml
@@ -15,7 +15,7 @@
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
                     <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -31,7 +31,7 @@
                     <region left="116" top="0" width="80" height="12"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -47,7 +47,7 @@
                     <region left="0" top="404" width="12" height="80"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -63,7 +63,7 @@
                     <region left="403" top="411" width="80" height="12"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-general-2btn/controller/key-window/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-general-2btn/controller/key-window/layout.xml
index db603f081b51360089db9d6692c88fc9c9c595e1..4024737c42ead7a2ff3f605ba83d317e20f2632e 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-general-2btn/controller/key-window/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-general-2btn/controller/key-window/layout.xml
@@ -12,7 +12,7 @@
                 <keycode>116</keycode>
                 <tooltip>Power</tooltip>
                 <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                <shortcut>Ctrl+Shift+F7</shortcut>
+                <shortcut>Ctrl+Shift+F8</shortcut>
             </key>
         </keyList>
     </form>

diff --git a/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml
index de13affb0eec6df6d9c15f3d1d079381c3ee689d..7b3b6b84d1c46cfd52a8ecac07767d63d418ac6e 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml
@@ -23,7 +23,7 @@
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
                     <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -47,7 +47,7 @@
                     <region left="363" top="0" width="36" height="32"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -71,7 +71,7 @@
                     <region left="0" top="145" width="32" height="36"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -95,7 +95,7 @@
                     <region left="145" top="368" width="36" height="32"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>

diff --git a/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml b/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
index eb07c5244d31d419da1bbbe5ea96fd6f74f6348f..0a9bf9ac456bdb5d3b1097ac40edcd9d23feb8ac 100644 (file)
--- a/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
@@ -17,7 +17,7 @@
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
                     <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -35,7 +35,7 @@
                     <region left="243" top="0" width="58" height="28"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -53,7 +53,7 @@
                     <region left="0" top="243" width="28" height="58"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -71,7 +71,7 @@
                     <region left="243" top="396" width="58" height="28"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>