From 9229f26d6d76a67e5e86d1726c26c3113b399068 Mon Sep 17 00:00:00 2001
From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Tue, 17 Jun 2014 16:32:52 +0900
Subject: [PATCH] menu: added schema for close menu

Now, user can configure the Close & Force Close menu
by skin layout XML file.

Change-Id: I07f6702392ea6195d351ee55618f82d4224af7de
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---
 .../org/tizen/emulator/skin/dbi/PopupMenuType.java | 54 +++++++++++++++++++++-
 .../client/skins/mobile-general-3btn/default.dbi   |  2 +
 .../client/skins/wearable-general-1btn/default.dbi |  3 ++
 .../org/tizen/emulator/skin/menu/PopupMenu.java    | 25 ++++++++--
 .../skin/client/xsd/ProfileSpecificSkin-layout.xsd |  2 +
 5 files changed, 82 insertions(+), 4 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 ab0a785..2cd497c 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: 2014.02.17 at 10:58:21 AM KST 
+// Generated on: 2014.06.17 at 03:54:23 PM KST 
 //
 
 
@@ -59,6 +59,8 @@ import javax.xml.bind.annotation.XmlType;
  *         &lt;element name="ramdumpItem" 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;element name="forceCloseItem" type="{http://www.tizen.org/emulator/skin/dbi}menuItemType" minOccurs="0"/>
+ *         &lt;element name="closeItem" type="{http://www.tizen.org/emulator/skin/dbi}menuItemType" minOccurs="0"/>
  *       &lt;/all>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -81,6 +83,8 @@ public class PopupMenuType {
     protected MenuItemType ramdumpItem;
     protected MenuItemType shellItem;
     protected MenuItemType controlPanelItem;
+    protected MenuItemType forceCloseItem;
+    protected MenuItemType closeItem;
 
     /**
      * Gets the value of the topmostItem property.
@@ -274,4 +278,52 @@ public class PopupMenuType {
         this.controlPanelItem = value;
     }
 
+    /**
+     * Gets the value of the forceCloseItem property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MenuItemType }
+     *     
+     */
+    public MenuItemType getForceCloseItem() {
+        return forceCloseItem;
+    }
+
+    /**
+     * Sets the value of the forceCloseItem property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MenuItemType }
+     *     
+     */
+    public void setForceCloseItem(MenuItemType value) {
+        this.forceCloseItem = value;
+    }
+
+    /**
+     * Gets the value of the closeItem property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MenuItemType }
+     *     
+     */
+    public MenuItemType getCloseItem() {
+        return closeItem;
+    }
+
+    /**
+     * Sets the value of the closeItem property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MenuItemType }
+     *     
+     */
+    public void setCloseItem(MenuItemType value) {
+        this.closeItem = 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 573e3e3..2e51261 100644
--- a/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi
+++ b/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi
@@ -75,6 +75,8 @@
         <ramdumpItem visible="true" />
         <shellItem visible="true" />
         <controlPanelItem visible="true" />
+        <forceCloseItem visible="true" />
+        <closeItem visible="true" />
     </popupMenu>
     <option>
         <blankGuide visible="true" />
diff --git a/tizen/src/skin/client/skins/wearable-general-1btn/default.dbi b/tizen/src/skin/client/skins/wearable-general-1btn/default.dbi
index c8aa1b1..d4822b5 100644
--- a/tizen/src/skin/client/skins/wearable-general-1btn/default.dbi
+++ b/tizen/src/skin/client/skins/wearable-general-1btn/default.dbi
@@ -38,6 +38,9 @@
         <keywindowItem visible="true" />
         <hostKeyboardItem visible="false" />
         <shellItem visible="true" />
+        <controlPanelItem visible="true" />
+        <forceCloseItem visible="true" />
+        <closeItem 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 911f47e..d50fd0d 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
@@ -263,8 +263,17 @@ public class PopupMenu {
 			}
 
 			/* Force close menu */
-			forceCloseItem = createForceCloseItem(
-					advancedSubMenu, FORCECLOSE_MENUITEM_NAME);
+			if (itemProperties == null ||
+					itemProperties.getForceCloseItem() == null) {
+				forceCloseItem = createForceCloseItem(advancedSubMenu, FORCECLOSE_MENUITEM_NAME);
+			} else {
+				MenuItemType closeMenuType = itemProperties.getForceCloseItem();
+				if (closeMenuType.isVisible() == true) {
+					forceCloseItem = createForceCloseItem(advancedSubMenu,
+							(closeMenuType.getItemName().isEmpty()) ?
+									FORCECLOSE_MENUITEM_NAME : closeMenuType.getItemName());
+				}
+			}
 
 			if (screenshotItem != null || hostKbdItem != null || diagnosisItem != null
 					|| aboutItem != null || forceCloseItem != null) {
@@ -311,7 +320,17 @@ public class PopupMenu {
 		}
 
 		/* Close menu */
-		closeItem = createCloseItem(menu, CLOSE_MENUITEM_NAME);
+		if (itemProperties == null ||
+				itemProperties.getCloseItem() == null) {
+			closeItem = createCloseItem(menu, CLOSE_MENUITEM_NAME);
+		} else {
+			MenuItemType closeMenuType = itemProperties.getCloseItem();
+			if (closeMenuType.isVisible() == true) {
+				closeItem = createCloseItem(menu,
+						(closeMenuType.getItemName().isEmpty()) ?
+								CLOSE_MENUITEM_NAME : closeMenuType.getItemName());
+			}
+		}
 	}
 
 	private MenuItem createMenuItem(Menu menu, int style,
diff --git a/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd b/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
index 7a30b60..8c966cf 100644
--- a/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
+++ b/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
@@ -103,6 +103,8 @@ xmlns:dbi="http://www.tizen.org/emulator/skin/dbi" elementFormDefault="qualified
 			<element name="ramdumpItem" 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>
+			<element name="forceCloseItem" type="dbi:menuItemType" minOccurs="0" maxOccurs="1"> </element>
+			<element name="closeItem" type="dbi:menuItemType" minOccurs="0" maxOccurs="1"> </element>
 		</all>
 	</complexType>
 
-- 
2.7.4