From b39304d26829e64b08e83e75ea339315d3190529 Mon Sep 17 00:00:00 2001
From: sungmin ha <sungmin82.ha@samsung.com>
Date: Wed, 15 Jul 2015 17:09:40 +0900
Subject: [PATCH] shortcut: changed rotate and volume key sequence

Change-Id: I329cfa4af1786b67a97fa15f18c2fba9a2d55375
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
---
 .../client/skins/mobile-320x480-3btn/layout.xml     | 21 +++++++++++----------
 .../client/skins/mobile-480x800-3btn/layout.xml     | 21 +++++++++++----------
 .../client/skins/mobile-540x960-3btn/layout.xml     | 21 +++++++++++----------
 .../client/skins/mobile-720x1280-3btn/layout.xml    | 21 +++++++++++----------
 .../controller/key-window/layout.xml                |  5 +++--
 .../client/skins/mobile-general-3btn/layout.xml     |  5 +++--
 tizen/src/skin/client/skins/tv-1920x1080/layout.xml |  1 +
 .../client/skins/wearable-320x320-1btn/layout.xml   |  5 +++--
 .../client/skins/wearable-360x480-1btn/layout.xml   |  5 +++--
 .../client/skins/wearable-general-1btn/layout.xml   |  5 +++--
 10 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/tizen/src/skin/client/skins/mobile-320x480-3btn/layout.xml b/tizen/src/skin/client/skins/mobile-320x480-3btn/layout.xml
index c428eb5..f190815 100644
--- a/tizen/src/skin/client/skins/mobile-320x480-3btn/layout.xml
+++ b/tizen/src/skin/client/skins/mobile-320x480-3btn/layout.xml
@@ -37,13 +37,14 @@
                     <region left="362" top="63" width="15" height="70"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="362" top="140" width="15" height="70"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -82,13 +83,13 @@
                     <region left="63" top="3" width="70" height="15"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="139" top="3" width="70" height="15"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -127,13 +128,13 @@
                     <region left="3" top="488" width="15" height="70"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="3" top="412" width="15" height="70"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -172,13 +173,13 @@
                     <region left="488" top="362" width="70" height="15"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="412" top="362" width="70" height="15"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -193,8 +194,8 @@
             <shortcut>Ctrl+F2</shortcut>
         </onTopItem>
         <switchItem name="Rotate">
-            <shortcut property="prev">Ctrl+Num+7</shortcut>
-            <shortcut property="next">Ctrl+Num+9</shortcut>
+            <shortcut property="prev">Ctrl+F11</shortcut>
+            <shortcut property="next">Ctrl+F12</shortcut>
         </switchItem>
         <scaleItem name="Scale">
             <shortcut property="prev">Ctrl+F9</shortcut>
diff --git a/tizen/src/skin/client/skins/mobile-480x800-3btn/layout.xml b/tizen/src/skin/client/skins/mobile-480x800-3btn/layout.xml
index 0ca6240..973ee93 100644
--- a/tizen/src/skin/client/skins/mobile-480x800-3btn/layout.xml
+++ b/tizen/src/skin/client/skins/mobile-480x800-3btn/layout.xml
@@ -37,13 +37,14 @@
                     <region left="536" top="76" width="20" height="74"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="536" top="162" width="20" height="74"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -82,13 +83,13 @@
                     <region left="75" top="0" width="74" height="20"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="161" top="0" width="74" height="20"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -127,13 +128,13 @@
                     <region left="0" top="816" width="20" height="74"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="0" top="730" width="20" height="74"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -172,13 +173,13 @@
                     <region left="816" top="534" width="74" height="20"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="730" top="534" width="74" height="20"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -193,8 +194,8 @@
             <shortcut>Ctrl+F2</shortcut>
         </onTopItem>
         <switchItem name="Rotate">
-            <shortcut property="prev">Ctrl+Num+7</shortcut>
-            <shortcut property="next">Ctrl+Num+9</shortcut>
+            <shortcut property="prev">Ctrl+F11</shortcut>
+            <shortcut property="next">Ctrl+F12</shortcut>
         </switchItem>
         <scaleItem name="Scale">
             <shortcut property="prev">Ctrl+F9</shortcut>
diff --git a/tizen/src/skin/client/skins/mobile-540x960-3btn/layout.xml b/tizen/src/skin/client/skins/mobile-540x960-3btn/layout.xml
index ddc7d94..42ba76b 100644
--- a/tizen/src/skin/client/skins/mobile-540x960-3btn/layout.xml
+++ b/tizen/src/skin/client/skins/mobile-540x960-3btn/layout.xml
@@ -37,13 +37,14 @@
                     <region left="595" top="75" width="20" height="74"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="595" top="162" width="20" height="74"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -82,13 +83,13 @@
                     <region left="75" top="0" width="74" height="20"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="161" top="0" width="74" height="20"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -127,13 +128,13 @@
                     <region left="0" top="976" width="20" height="74"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="0" top="890" width="20" height="74"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -172,13 +173,13 @@
                     <region left="975" top="595" width="74" height="20"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="889" top="595" width="74" height="20"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -193,8 +194,8 @@
             <shortcut>Ctrl+F2</shortcut>
         </onTopItem>
         <switchItem name="Rotate">
-            <shortcut property="prev">Ctrl+Num+7</shortcut>
-            <shortcut property="next">Ctrl+Num+9</shortcut>
+            <shortcut property="prev">Ctrl+F11</shortcut>
+            <shortcut property="next">Ctrl+F12</shortcut>
         </switchItem>
         <scaleItem name="Scale">
             <shortcut property="prev">Ctrl+F9</shortcut>
diff --git a/tizen/src/skin/client/skins/mobile-720x1280-3btn/layout.xml b/tizen/src/skin/client/skins/mobile-720x1280-3btn/layout.xml
index 31d8d8c..b67df0a 100644
--- a/tizen/src/skin/client/skins/mobile-720x1280-3btn/layout.xml
+++ b/tizen/src/skin/client/skins/mobile-720x1280-3btn/layout.xml
@@ -37,13 +37,14 @@
                     <region left="836" top="103" width="24" height="96"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="836" top="213" width="24" height="96"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -82,13 +83,13 @@
                     <region left="103" top="0" width="96" height="24"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="212" top="0" width="96" height="24"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -127,13 +128,13 @@
                     <region left="0" top="1305" width="24" height="96"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="0" top="1195" width="24" height="96"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -172,13 +173,13 @@
                     <region left="1304" top="836" width="96" height="24"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="1194" top="836" width="96" height="24"/>
                     <keycode>114</keycode>
                     <tooltip>Volume -</tooltip>
-                    <shortcut>Ctrl+Num+-</shortcut>
+                    <shortcut>Ctrl+[</shortcut>
                 </key>
             </keyList>
         </form>
@@ -193,8 +194,8 @@
             <shortcut>Ctrl+F2</shortcut>
         </onTopItem>
         <switchItem name="Rotate">
-            <shortcut property="prev">Ctrl+Num+7</shortcut>
-            <shortcut property="next">Ctrl+Num+9</shortcut>
+            <shortcut property="prev">Ctrl+F11</shortcut>
+            <shortcut property="next">Ctrl+F12</shortcut>
         </switchItem>
         <scaleItem name="Scale">
             <shortcut property="prev">Ctrl+F9</shortcut>
diff --git a/tizen/src/skin/client/skins/mobile-general-3btn/controller/key-window/layout.xml b/tizen/src/skin/client/skins/mobile-general-3btn/controller/key-window/layout.xml
index ebf67c7..91d067b 100644
--- a/tizen/src/skin/client/skins/mobile-general-3btn/controller/key-window/layout.xml
+++ b/tizen/src/skin/client/skins/mobile-general-3btn/controller/key-window/layout.xml
@@ -26,12 +26,13 @@
             <key name="Volume +">
                 <keycode>115</keycode>
                 <tooltip>Volume +</tooltip>
-                <shortcut>Ctrl+Num++</shortcut>
+                <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
+                <shortcut>Ctrl+]</shortcut>
             </key>
             <key name="Volume -">
                 <keycode>114</keycode>
                 <tooltip>Volume -</tooltip>
-                <shortcut>Ctrl+Num+-</shortcut>
+                <shortcut>Ctrl+[</shortcut>
             </key>
         </keyList>
     </form>
diff --git a/tizen/src/skin/client/skins/mobile-general-3btn/layout.xml b/tizen/src/skin/client/skins/mobile-general-3btn/layout.xml
index 47e2e55..40b940b 100644
--- a/tizen/src/skin/client/skins/mobile-general-3btn/layout.xml
+++ b/tizen/src/skin/client/skins/mobile-general-3btn/layout.xml
@@ -26,6 +26,7 @@
 
     <menuList>
         <infoItem>
+            <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
             <shortcut>Ctrl+F1</shortcut>
         </infoItem>
         <separator/>
@@ -33,8 +34,8 @@
             <shortcut>Ctrl+F2</shortcut>
         </onTopItem>
         <switchItem name="Rotate">
-            <shortcut property="prev">Ctrl+Num+7</shortcut>
-            <shortcut property="next">Ctrl+Num+9</shortcut>
+            <shortcut property="prev">Ctrl+F11</shortcut>
+            <shortcut property="next">Ctrl+F12</shortcut>
         </switchItem>
         <scaleItem name="Scale">
             <shortcut property="prev">Ctrl+F9</shortcut>
diff --git a/tizen/src/skin/client/skins/tv-1920x1080/layout.xml b/tizen/src/skin/client/skins/tv-1920x1080/layout.xml
index 2dc65ae..335b5eb 100644
--- a/tizen/src/skin/client/skins/tv-1920x1080/layout.xml
+++ b/tizen/src/skin/client/skins/tv-1920x1080/layout.xml
@@ -14,6 +14,7 @@
 
     <menuList>
         <infoItem>
+            <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
             <shortcut>Ctrl+F1</shortcut>
         </infoItem>
         <separator/>
diff --git a/tizen/src/skin/client/skins/wearable-320x320-1btn/layout.xml b/tizen/src/skin/client/skins/wearable-320x320-1btn/layout.xml
index 9d329dd..0ca3874 100644
--- a/tizen/src/skin/client/skins/wearable-320x320-1btn/layout.xml
+++ b/tizen/src/skin/client/skins/wearable-320x320-1btn/layout.xml
@@ -70,6 +70,7 @@
 
     <menuList>
         <infoItem>
+            <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
             <shortcut>Ctrl+F1</shortcut>
         </infoItem>
         <separator/>
@@ -77,8 +78,8 @@
             <shortcut>Ctrl+F2</shortcut>
         </onTopItem>
         <switchItem name="Rotate">
-            <shortcut property="prev">Ctrl+Num+7</shortcut>
-            <shortcut property="next">Ctrl+Num+9</shortcut>
+            <shortcut property="prev">Ctrl+F11</shortcut>
+            <shortcut property="next">Ctrl+F12</shortcut>
         </switchItem>
         <separator/>
         <advancedItem>
diff --git a/tizen/src/skin/client/skins/wearable-360x480-1btn/layout.xml b/tizen/src/skin/client/skins/wearable-360x480-1btn/layout.xml
index e9b49b3..3633127 100644
--- a/tizen/src/skin/client/skins/wearable-360x480-1btn/layout.xml
+++ b/tizen/src/skin/client/skins/wearable-360x480-1btn/layout.xml
@@ -70,6 +70,7 @@
 
     <menuList>
         <infoItem>
+            <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
             <shortcut>Ctrl+F1</shortcut>
         </infoItem>
         <separator/>
@@ -77,8 +78,8 @@
             <shortcut>Ctrl+F2</shortcut>
         </onTopItem>
         <switchItem name="Rotate">
-            <shortcut property="prev">Ctrl+Num+7</shortcut>
-            <shortcut property="next">Ctrl+Num+9</shortcut>
+            <shortcut property="prev">Ctrl+F11</shortcut>
+            <shortcut property="next">Ctrl+F12</shortcut>
         </switchItem>
         <separator/>
         <advancedItem>
diff --git a/tizen/src/skin/client/skins/wearable-general-1btn/layout.xml b/tizen/src/skin/client/skins/wearable-general-1btn/layout.xml
index a355d37..cb25ba4 100644
--- a/tizen/src/skin/client/skins/wearable-general-1btn/layout.xml
+++ b/tizen/src/skin/client/skins/wearable-general-1btn/layout.xml
@@ -26,6 +26,7 @@
 
     <menuList>
         <infoItem>
+            <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
             <shortcut>Ctrl+F1</shortcut>
         </infoItem>
         <separator/>
@@ -33,8 +34,8 @@
             <shortcut>Ctrl+F2</shortcut>
         </onTopItem>
         <switchItem name="Rotate">
-            <shortcut property="prev">Ctrl+Num+7</shortcut>
-            <shortcut property="next">Ctrl+Num+9</shortcut>
+            <shortcut property="prev">Ctrl+F11</shortcut>
+            <shortcut property="next">Ctrl+F12</shortcut>
         </switchItem>
         <separator/>
         <advancedItem>
-- 
2.7.4