From e8a764578a096eb8224698f3979000addb2f1ed3 Mon Sep 17 00:00:00 2001
From: sungmin ha <sungmin82.ha@samsung.com>
Date: Tue, 14 Jul 2015 18:46:29 +0900
Subject: [PATCH] shortcut: replace Ctrl by Cmd on mac

changed rotate and volume key sequence

Change-Id: Ibba2ff76c4040b32b70b049e074acada1dd1cca2
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
---
 tizen/src/ui/menu/detailedinfodialog.cpp            |  6 ++++++
 .../resource/skins/mobile-320x480-3btn/layout.xml   | 21 +++++++++++----------
 .../resource/skins/mobile-480x800-3btn/layout.xml   | 21 +++++++++++----------
 .../resource/skins/mobile-540x960-3btn/layout.xml   | 21 +++++++++++----------
 .../resource/skins/mobile-720x1280-3btn/layout.xml  | 21 +++++++++++----------
 .../controller/key-window/layout.xml                |  5 +++--
 .../resource/skins/mobile-general-3btn/layout.xml   |  5 +++--
 .../resource/skins/wearable-320x320-1btn/layout.xml |  5 +++--
 .../resource/skins/wearable-360x360-1btn/layout.xml |  5 +++--
 .../resource/skins/wearable-360x480-1btn/layout.xml |  5 +++--
 .../resource/skins/wearable-general-1btn/layout.xml |  5 +++--
 .../skins/wearableO-360x360-1btn/layout.xml         |  5 +++--
 12 files changed, 71 insertions(+), 54 deletions(-)

diff --git a/tizen/src/ui/menu/detailedinfodialog.cpp b/tizen/src/ui/menu/detailedinfodialog.cpp
index 0af0219..a33eed8 100644
--- a/tizen/src/ui/menu/detailedinfodialog.cpp
+++ b/tizen/src/ui/menu/detailedinfodialog.cpp
@@ -189,7 +189,13 @@ void DetailedInfoDialog::setShortcutInfoTable(QMap<QString, QString> map)
     int row = shortcutInfoTable->rowCount();
     QMap<QString, QString>::const_iterator mapIter = map.constBegin();
     while (mapIter != map.constEnd()) {
+#ifdef CONFIG_DARWIN
+        QString value = mapIter.value();
+        value.replace("Ctrl", "Cmd");
+        setDataTable(shortcutInfoTable, mapIter.key(), value, row++);
+#else
         setDataTable(shortcutInfoTable, mapIter.key(), mapIter.value(), row++);
+#endif
         ++mapIter;
     }
 }
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 c428eb5..f190815 100644
--- a/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml
+++ b/tizen/src/ui/resource/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/ui/resource/skins/mobile-480x800-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile-480x800-3btn/layout.xml
index a570d60..d7b04c3 100644
--- a/tizen/src/ui/resource/skins/mobile-480x800-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile-480x800-3btn/layout.xml
@@ -37,13 +37,14 @@
                     <region left="541" top="81" 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="541" top="167" 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="80" top="2" width="74" height="20"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="165" top="2" 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="2" top="821" width="20" height="74"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="2" top="735" 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="822" top="539" width="74" height="20"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="735" top="539" 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/ui/resource/skins/mobile-540x960-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile-540x960-3btn/layout.xml
index 4f90146..298d7dd 100644
--- a/tizen/src/ui/resource/skins/mobile-540x960-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile-540x960-3btn/layout.xml
@@ -37,13 +37,14 @@
                     <region left="600" top="80" 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="600" top="167" 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="80" top="1" width="74" height="20"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="166" top="1" 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="1" top="981" width="20" height="74"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="1" top="895" 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="980" top="600" width="74" height="20"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="894" top="600" 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/ui/resource/skins/mobile-720x1280-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/layout.xml
index 7a82803..6e4c25f 100644
--- a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/layout.xml
@@ -37,13 +37,14 @@
                     <region left="841" top="108" 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="841" top="219" 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="108" top="2" width="96" height="24"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="217" top="2" 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="2" top="1310" width="24" height="96"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="2" top="1200" 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="1309" top="841" width="96" height="24"/>
                     <keycode>115</keycode>
                     <tooltip>Volume +</tooltip>
-                    <shortcut>Ctrl+Num++</shortcut>
+                    <shortcut>Ctrl+]</shortcut>
                 </key>
                 <key name="Volume -">
                     <region left="1199" top="841" 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/ui/resource/skins/mobile-general-3btn/controller/key-window/layout.xml b/tizen/src/ui/resource/skins/mobile-general-3btn/controller/key-window/layout.xml
index ebf67c7..91d067b 100644
--- a/tizen/src/ui/resource/skins/mobile-general-3btn/controller/key-window/layout.xml
+++ b/tizen/src/ui/resource/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/ui/resource/skins/mobile-general-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile-general-3btn/layout.xml
index 47e2e55..40b940b 100644
--- a/tizen/src/ui/resource/skins/mobile-general-3btn/layout.xml
+++ b/tizen/src/ui/resource/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/ui/resource/skins/wearable-320x320-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable-320x320-1btn/layout.xml
index 9d329dd..0ca3874 100644
--- a/tizen/src/ui/resource/skins/wearable-320x320-1btn/layout.xml
+++ b/tizen/src/ui/resource/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/ui/resource/skins/wearable-360x360-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable-360x360-1btn/layout.xml
index 98a2705..ef4cfda 100644
--- a/tizen/src/ui/resource/skins/wearable-360x360-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable-360x360-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/ui/resource/skins/wearable-360x480-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable-360x480-1btn/layout.xml
index e9b49b3..3633127 100644
--- a/tizen/src/ui/resource/skins/wearable-360x480-1btn/layout.xml
+++ b/tizen/src/ui/resource/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/ui/resource/skins/wearable-general-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable-general-1btn/layout.xml
index a355d37..cb25ba4 100644
--- a/tizen/src/ui/resource/skins/wearable-general-1btn/layout.xml
+++ b/tizen/src/ui/resource/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>
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 736a0a6..945f9b2 100644
--- a/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
@@ -78,6 +78,7 @@
 
     <menuList>
         <infoItem>
+            <!-- shortcut: on MacOSX, "Cmd" is used instead of "Ctrl" -->
             <shortcut>Ctrl+F1</shortcut>
         </infoItem>
         <separator/>
@@ -85,8 +86,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