From 852b11c8453e8ba8743a5e08c6a4fedd08c68854 Mon Sep 17 00:00:00 2001
From: sungmin ha <sungmin82.ha@samsung.com>
Date: Fri, 17 Jul 2015 15:26:34 +0900
Subject: [PATCH] keyboard shortcut: modified emulator shortcut order

added back and controller shortcuts

Change-Id: Ic5b822027ba8eed1a376f49945a26a7534c1bf89
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
---
 org.tizen.devtools/html/common_tools/emulator.htm  |  1 +
 .../html/common_tools/keyboard_shortcuts.htm       | 70 +++++++++++++---------
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/org.tizen.devtools/html/common_tools/emulator.htm b/org.tizen.devtools/html/common_tools/emulator.htm
index ac2e623..e48a10a 100644
--- a/org.tizen.devtools/html/common_tools/emulator.htm
+++ b/org.tizen.devtools/html/common_tools/emulator.htm
@@ -384,6 +384,7 @@ $egrep -c &#39;(vmx|svm)&#39; /proc/cpuinfo</pre>
 <ul>
 <li>Emulator name (the top row in the menu)
 <p>Display the <strong>Detailed Info</strong> window, showing the <strong>Shortcut Info</strong> and <strong>VM Info</strong> tabs. The <strong>Shortcut Info</strong> tab lists the <a href="keyboard_shortcuts.htm#emulator">Emulator keyboard shortcuts</a> and the <strong>VM Info</strong> tab defines the virtual machine details.</p>
+<p>In Mac OS® X: To use Emulator keyboard shortcuts, open the Keyboard Setting dialog and switch your Mac function keys option to work as standard function keys.</p>
 <table border="1">
 	<caption>Table: VM Info tab</caption>
 		<tbody>
diff --git a/org.tizen.devtools/html/common_tools/keyboard_shortcuts.htm b/org.tizen.devtools/html/common_tools/keyboard_shortcuts.htm
index 6f0946a..d3b1ca4 100644
--- a/org.tizen.devtools/html/common_tools/keyboard_shortcuts.htm
+++ b/org.tizen.devtools/html/common_tools/keyboard_shortcuts.htm
@@ -867,29 +867,6 @@
                 <th>Shortcut</th>
         </tr>
         <tr>
-                <td rowspan="2">Always on Top</td>
-                <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> </td>
-                <td>Ctrl+F2</td>
-        </tr>
-        <tr>
-                <td><img alt="mac" src="../images/mac.png" /></td>
-                <td><img alt="command" src="../images/command.png" />+F2</td>
-        </tr>
-        <tr>
-                <td>Close</td>
-                <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> <img alt="mac" src="../images/mac.png" /></td>
-                <td>F4</td>
-        </tr>
-        <tr>
-                <td rowspan="2">Control Panel</td>
-                <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> </td>
-                <td>Ctrl+F6</td>
-        </tr>
-        <tr>
-                <td><img alt="mac" src="../images/mac.png" /></td>
-                <td><img alt="command" src="../images/command.png" />+F6</td>
-        </tr>
-        <tr>
                 <td rowspan="2">Detailed Info</td>
                 <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> </td>
                 <td>Ctrl+F1</td>
@@ -899,13 +876,13 @@
                 <td><img alt="command" src="../images/command.png" />+F1</td>
         </tr>
         <tr>
-                <td rowspan="2">Force Close</td>
+                <td rowspan="2">Always on Top</td>
                 <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> </td>
-                <td>Ctrl+F4</td>
+                <td>Ctrl+F2</td>
         </tr>
         <tr>
                 <td><img alt="mac" src="../images/mac.png" /></td>
-                <td><img alt="command" src="../images/command.png" />+F4</td>
+                <td><img alt="command" src="../images/command.png" />+F2</td>
         </tr>
         <tr>
                 <td rowspan="2">Rotate next</td>
@@ -944,6 +921,15 @@
                 <td><img alt="command" src="../images/command.png" />+F9</td>
         </tr>
         <tr>
+                <td rowspan="2">Controller</td>
+                <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> </td>
+                <td>Ctrl+F8</td>
+        </tr>
+        <tr>
+                <td><img alt="mac" src="../images/mac.png" /></td>
+                <td><img alt="command" src="../images/command.png" />+F8</td>
+        </tr>
+        <tr>
                 <td rowspan="2">Screen Shot</td>
                 <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> </td>
                 <td>Ctrl+F7</td>
@@ -953,6 +939,15 @@
                 <td><img alt="command" src="../images/command.png" />+F7</td>
         </tr>
         <tr>
+                <td rowspan="2">Force Close</td>
+                <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> </td>
+                <td>Ctrl+F4</td>
+        </tr>
+        <tr>
+                <td><img alt="mac" src="../images/mac.png" /></td>
+                <td><img alt="command" src="../images/command.png" />+F4</td>
+        </tr>
+        <tr>
                 <td rowspan="2">Shell</td>
                 <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> </td>
                 <td>Ctrl+F5</td>
@@ -962,9 +957,18 @@
                 <td><img alt="command" src="../images/command.png" />+F5</td>
         </tr>
         <tr>
-                <td>Home</td>
+                <td rowspan="2">Control Panel</td>
+                <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> </td>
+                <td>Ctrl+F6</td>
+        </tr>
+        <tr>
+                <td><img alt="mac" src="../images/mac.png" /></td>
+                <td><img alt="command" src="../images/command.png" />+F6</td>
+        </tr>
+        <tr>
+                <td>Close</td>
                 <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> <img alt="mac" src="../images/mac.png" /></td>
-                <td>F1</td>
+                <td>F4</td>
         </tr>
         <tr>
                 <td>Menu</td>
@@ -972,6 +976,16 @@
                 <td>F2</td>
         </tr>
         <tr>
+                <td>Home</td>
+                <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> <img alt="mac" src="../images/mac.png" /></td>
+                <td>F1</td>
+        </tr>
+        <tr>
+                <td>Back</td>
+                <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> <img alt="mac" src="../images/mac.png" /></td>
+                <td>Esc</td>
+        </tr>
+        <tr>
                 <td>Power</td>
                 <td><img alt="ubuntu" src="../images/ubuntu.png" /> <img alt="windows" src="../images/windows.png" /> <img alt="mac" src="../images/mac.png" /></td>
                 <td>F3</td>
-- 
2.7.4