menu: added schema for Ram Dump menu

Now, user can configure the Ram Dump menu
(Right click popup>Advanced>Diagnosis>Ram Dump)
by skin layout XML file.

Change-Id: I215457bf84ef2aaa5344da6113cf2db2a95e7ae6
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 08f6edd..ab0a785 100644 (file)
--- 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.01.15 at 07:09:19 PM KST 
+// Generated on: 2014.02.17 at 10:58:21 AM KST 
 //
 
 
@@ -56,6 +56,7 @@ import javax.xml.bind.annotation.XmlType;
  *         &lt;element name="scaleItem" type="{http://www.tizen.org/emulator/skin/dbi}scaleItemType" 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="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;/all>
@@ -77,6 +78,7 @@ public class PopupMenuType {
     protected ScaleItemType scaleItem;
     protected MenuItemType keywindowItem;
     protected MenuItemType hostKeyboardItem;
+    protected MenuItemType ramdumpItem;
     protected MenuItemType shellItem;
     protected MenuItemType controlPanelItem;
 
@@ -201,6 +203,30 @@ public class PopupMenuType {
     }
 
     /**
+     * Gets the value of the ramdumpItem property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MenuItemType }
+     *     
+     */
+    public MenuItemType getRamdumpItem() {
+        return ramdumpItem;
+    }
+
+    /**
+     * Sets the value of the ramdumpItem property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MenuItemType }
+     *     
+     */
+    public void setRamdumpItem(MenuItemType value) {
+        this.ramdumpItem = value;
+    }
+
+    /**
      * Gets the value of the shellItem property.
      * 
      * @return

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 4107402..573e3e3 100644 (file)
--- a/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi
+++ b/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi
@@ -72,6 +72,7 @@
         <scaleItem visible="true" />
         <keywindowItem visible="true" />
         <hostKeyboardItem visible="true" />
+        <ramdumpItem visible="true" />
         <shellItem visible="true" />
         <controlPanelItem visible="true" />
     </popupMenu>

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 517eba4..d75d6b1 100644 (file)
--- 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
@@ -208,10 +208,6 @@ public class PopupMenu {
                }
 
                /* Advanced menu */
-               advancedItem = new MenuItem(menu, SWT.CASCADE);
-               advancedItem.setText(ADVANCED_MENUITEM_NAME);
-               advancedItem.setImage(imageRegistry.getIcon(IconName.ADVANCED));
-
                Menu advancedSubMenu = new Menu(menu.getShell(), SWT.DROP_DOWN);
                {
                        /* Screen shot menu */
@@ -233,20 +229,35 @@ public class PopupMenu {
 
                        /* Diagnosis menu */
                        if (SwtUtil.isLinuxPlatform()) { //TODO: windows
-                               diagnosisItem = new MenuItem(advancedSubMenu, SWT.CASCADE);
-                               diagnosisItem.setText(DIAGNOSIS_MENUITEM_NAME);
-                               diagnosisItem.setImage(imageRegistry.getIcon(IconName.DIAGNOSIS));
-
                                Menu diagnosisSubMenu = new Menu(advancedSubMenu.getShell(), SWT.DROP_DOWN);
                                {
                                        /* Ram Dump menu */
-                                       ramdumpItem = createRamDumpItem(
-                                                       diagnosisSubMenu, RAMDUMP_MENUITEM_NAME);
+                                       if (itemProperties == null ||
+                                                       itemProperties.getRamdumpItem() == null) {
+                                               ramdumpItem = createRamDumpItem(diagnosisSubMenu, RAMDUMP_MENUITEM_NAME);
+                                       } else {
+                                               MenuItemType ramdumpMenuType = itemProperties.getRamdumpItem();
+                                               if (ramdumpMenuType.isVisible() == true) {
+                                                       ramdumpItem = createRamDumpItem(diagnosisSubMenu,
+                                                                       (ramdumpMenuType.getItemName().isEmpty()) ?
+                                                                       RAMDUMP_MENUITEM_NAME : ramdumpMenuType.getItemName());
+                                               }
+                                       }
+                               }
+
+                               if (ramdumpItem != null) {
+                                       diagnosisItem = new MenuItem(advancedSubMenu, SWT.CASCADE);
+                                       diagnosisItem.setText(DIAGNOSIS_MENUITEM_NAME);
+                                       diagnosisItem.setImage(imageRegistry.getIcon(IconName.DIAGNOSIS));
+                                       diagnosisItem.setMenu(diagnosisSubMenu);
                                }
-                               diagnosisItem.setMenu(diagnosisSubMenu);
                        }
 
                        if (screenshotItem != null || hostKbdItem != null || diagnosisItem != null) {
+                               advancedItem = new MenuItem(menu, SWT.CASCADE);
+                               advancedItem.setText(ADVANCED_MENUITEM_NAME);
+                               advancedItem.setImage(imageRegistry.getIcon(IconName.ADVANCED));
+
                                new MenuItem(advancedSubMenu, SWT.SEPARATOR);
                        }
 

diff --git a/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd b/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
index 51ac3d4..7a30b60 100644 (file)
--- a/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
+++ b/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
@@ -100,6 +100,7 @@ xmlns:dbi="http://www.tizen.org/emulator/skin/dbi" elementFormDefault="qualified
                        <element name="scaleItem" type="dbi:scaleItemType" 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="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>
                </all>