From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Wed, 15 Jan 2014 10:10:13 +0000 (+0900)
Subject: menu: added schema for Control Panel menu
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~512
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eaf17e122df4d0c7ca6fce97dceaffc87f9fc67a;p=sdk%2Femulator%2Fqemu.git

menu: added schema for Control Panel menu

Now, user can configure the Control Panel menu
(Right click popup>Control Panel menu) by skin
layout XML file.

Change-Id: I43977590a281db0338f625d28a5534b8346bd4c0
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

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 cd45d17ff1..08f6edd1b3 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.11.20 at 02:29:25 PM KST 
+// Generated on: 2014.01.15 at 07:09:19 PM KST 
 //
 
 
@@ -57,6 +57,7 @@ import javax.xml.bind.annotation.XmlType;
  *         &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;element name="controlPanelItem" type="{http://www.tizen.org/emulator/skin/dbi}menuItemType" minOccurs="0"/>
  *       &lt;/all>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -77,6 +78,7 @@ public class PopupMenuType {
     protected MenuItemType keywindowItem;
     protected MenuItemType hostKeyboardItem;
     protected MenuItemType shellItem;
+    protected MenuItemType controlPanelItem;
 
     /**
      * Gets the value of the topmostItem property.
@@ -222,4 +224,28 @@ public class PopupMenuType {
         this.shellItem = value;
     }
 
+    /**
+     * Gets the value of the controlPanelItem property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MenuItemType }
+     *     
+     */
+    public MenuItemType getControlPanelItem() {
+        return controlPanelItem;
+    }
+
+    /**
+     * Sets the value of the controlPanelItem property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MenuItemType }
+     *     
+     */
+    public void setControlPanelItem(MenuItemType value) {
+        this.controlPanelItem = value;
+    }
+
 }
diff --git a/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi b/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi
index 0f0e9698cc..4107402939 100644
--- a/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi
+++ b/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi
@@ -73,6 +73,7 @@
         <keywindowItem visible="true" />
         <hostKeyboardItem visible="true" />
         <shellItem visible="true" />
+        <controlPanelItem visible="true" />
     </popupMenu>
     <option>
         <blankGuide visible="true" />
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 cbc8cbef7d..33b114b381 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
@@ -257,9 +257,19 @@ public class PopupMenu {
 		new MenuItem(menu, SWT.SEPARATOR);
 
 		/* Emulator Control Panel menu */
-		createEcpItem(menu, ECP_MENUITEM_NAME);
+		if (itemProperties == null || itemProperties.getControlPanelItem() == null) {
+			createEcpItem(menu, ECP_MENUITEM_NAME);
+		} else {
+			MenuItemType ecpMenuType = itemProperties.getControlPanelItem();
+			if (ecpMenuType.isVisible() == true) {
+				createEcpItem(menu, (ecpMenuType.getItemName().isEmpty()) ?
+						ECP_MENUITEM_NAME : ecpMenuType.getItemName());
+			}
+		}
 
-		new MenuItem(menu, SWT.SEPARATOR);
+		if (ecpItem != null) {
+			new MenuItem(menu, SWT.SEPARATOR);
+		}
 
 		/* Close menu */
 		createCloseItem(menu, CLOSE_MENUITEM_NAME);
diff --git a/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd b/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
index 2b5c8b4643..51ac3d4f17 100644
--- a/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
+++ b/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
@@ -101,6 +101,7 @@ xmlns:dbi="http://www.tizen.org/emulator/skin/dbi" elementFormDefault="qualified
 			<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>
+			<element name="controlPanelItem" type="dbi:menuItemType" minOccurs="0" maxOccurs="1"> </element>
 		</all>
 	</complexType>