From 064e1406bbb91de2e5016e69180023f6c89cb9f9 Mon Sep 17 00:00:00 2001
From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Thu, 14 Nov 2013 14:23:21 +0900
Subject: [PATCH] menu: added schema for host keyboard menu

Now, user can configure the host keyboard menu
(Right click popup>Advance>Host Keyboard menu) by
skin layout XML file.

Change-Id: I150a494d0657b9670ad82bda48a6b4431fbc6d9b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---
 .../emulator/skin/dbi/PopupMenuType.java      | 28 +++++++++++++++++-
 .../skins/emul-general-3btn/default.dbi       |  1 +
 .../tizen/emulator/skin/menu/PopupMenu.java   | 29 ++++++++++++++-----
 .../client/xsd/ProfileSpecificSkin-layout.xsd |  1 +
 4 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/PopupMenuType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/PopupMenuType.java
index e8828e7e45..6a7ff8a956 100644
--- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/PopupMenuType.java
+++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/PopupMenuType.java
@@ -30,7 +30,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2013.07.11 at 04:55:34 PM KST 
+// Generated on: 2013.11.14 at 01:04:55 PM KST 
 //
 
 
@@ -55,6 +55,7 @@ import javax.xml.bind.annotation.XmlType;
  *         &lt;element name="rotateItem" type="{http://www.tizen.org/emulator/skin/dbi}menuItemType" minOccurs="0"/>
  *         &lt;element name="scaleItem" type="{http://www.tizen.org/emulator/skin/dbi}menuItemType" minOccurs="0"/>
  *         &lt;element name="keywindowItem" type="{http://www.tizen.org/emulator/skin/dbi}menuItemType" minOccurs="0"/>
+ *         &lt;element name="hostKeyboardItem" type="{http://www.tizen.org/emulator/skin/dbi}menuItemType" minOccurs="0"/>
  *         &lt;element name="shellItem" type="{http://www.tizen.org/emulator/skin/dbi}menuItemType" minOccurs="0"/>
  *       &lt;/all>
  *     &lt;/restriction>
@@ -74,6 +75,7 @@ public class PopupMenuType {
     protected MenuItemType rotateItem;
     protected MenuItemType scaleItem;
     protected MenuItemType keywindowItem;
+    protected MenuItemType hostKeyboardItem;
     protected MenuItemType shellItem;
 
     /**
@@ -172,6 +174,30 @@ public class PopupMenuType {
         this.keywindowItem = value;
     }
 
+    /**
+     * Gets the value of the hostKeyboardItem property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MenuItemType }
+     *     
+     */
+    public MenuItemType getHostKeyboardItem() {
+        return hostKeyboardItem;
+    }
+
+    /**
+     * Sets the value of the hostKeyboardItem property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MenuItemType }
+     *     
+     */
+    public void setHostKeyboardItem(MenuItemType value) {
+        this.hostKeyboardItem = value;
+    }
+
     /**
      * Gets the value of the shellItem property.
      * 
diff --git a/tizen/src/skin/client/skins/emul-general-3btn/default.dbi b/tizen/src/skin/client/skins/emul-general-3btn/default.dbi
index a960a9c538..0f0e9698cc 100644
--- a/tizen/src/skin/client/skins/emul-general-3btn/default.dbi
+++ b/tizen/src/skin/client/skins/emul-general-3btn/default.dbi
@@ -71,6 +71,7 @@
         <rotateItem visible="true" />
         <scaleItem visible="true" />
         <keywindowItem visible="true" />
+        <hostKeyboardItem visible="true" />
         <shellItem visible="true" />
     </popupMenu>
     <option>
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
index a90eb22329..4426634172 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
@@ -182,15 +182,16 @@ public class PopupMenu {
 			createScreenShotItem(advancedSubMenu, SCREENSHOT_MENUITEM_NAME);
 
 			/* VirtIO Keyboard menu */
-			hostKeyboardItem = new MenuItem(advancedSubMenu, SWT.CASCADE);
-			hostKeyboardItem.setText(HOSTKEYBOARD_MENUITEM_NAME);
-			hostKeyboardItem.setImage(imageRegistry.getIcon(IconName.HOST_KEYBOARD));
-
-			Menu hostKeyboardSubMenu = new Menu(advancedSubMenu.getShell(), SWT.DROP_DOWN);
-			{
-				createKeyboardOnOffItem(hostKeyboardSubMenu);
+			if (itemProperties == null || itemProperties.getHostKeyboardItem() == null) {
+				createHostKeyboardItem(advancedSubMenu, HOSTKEYBOARD_MENUITEM_NAME);
+			} else {
+				MenuItemType hostKeyboardMenuType = itemProperties.getHostKeyboardItem();
+				if (hostKeyboardMenuType.isVisible() == true) {
+					createHostKeyboardItem(advancedSubMenu,
+							(hostKeyboardMenuType.getItemName().isEmpty()) ?
+							HOSTKEYBOARD_MENUITEM_NAME : hostKeyboardMenuType.getItemName());
+				}
 			}
-			hostKeyboardItem.setMenu(hostKeyboardSubMenu);
 
 			/* Diagnosis menu */
 			if (SwtUtil.isLinuxPlatform()) { //TODO: windows
@@ -322,6 +323,18 @@ public class PopupMenu {
 		screenshotItem.addSelectionListener(screenshotListener);
 	}
 
+	private void createHostKeyboardItem(Menu menu, String name) {
+		hostKeyboardItem = new MenuItem(menu, SWT.CASCADE);
+		hostKeyboardItem.setText(name);
+		hostKeyboardItem.setImage(imageRegistry.getIcon(IconName.HOST_KEYBOARD));
+
+		Menu hostKeyboardSubMenu = new Menu(menu.getShell(), SWT.DROP_DOWN);
+		{
+			createKeyboardOnOffItem(hostKeyboardSubMenu);
+		}
+		hostKeyboardItem.setMenu(hostKeyboardSubMenu);
+	}
+
 	private void createKeyboardOnOffItem(Menu menu) {
 		kbdOnItem = new MenuItem(menu, SWT.RADIO);
 		kbdOnItem.setText("On");
diff --git a/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd b/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
index fdf541e3b6..ac6cb73e87 100644
--- a/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
+++ b/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
@@ -99,6 +99,7 @@ xmlns:dbi="http://www.tizen.org/emulator/skin/dbi" elementFormDefault="qualified
 			<element name="rotateItem" type="dbi:menuItemType" minOccurs="0" maxOccurs="1"> </element>
 			<element name="scaleItem" type="dbi:menuItemType" minOccurs="0" maxOccurs="1"> </element>
 			<element name="keywindowItem" type="dbi:menuItemType" minOccurs="0" maxOccurs="1"> </element>
+			<element name="hostKeyboardItem" type="dbi:menuItemType" minOccurs="0" maxOccurs="1"> </element>
 			<element name="shellItem" type="dbi:menuItemType" minOccurs="0" maxOccurs="1"> </element>
 		</all>
 	</complexType>
-- 
2.34.1