From 74058548205e63dfa8d5a946562201804dac6a0b Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Thu, 11 Jul 2013 12:17:13 +0900 Subject: [PATCH] menu: added default popup menu schema added default popup menu schema Change-Id: Idc3e35cadb533d513f5af1070c132c1ae9b2c0e0 Signed-off-by: GiWoong Kim --- .../tizen/emulator/skin/dbi/DisplayType.java | 2 +- .../tizen/emulator/skin/dbi/EmulatorUI.java | 28 +++- .../emulator/skin/dbi/EventInfoType.java | 2 +- .../tizen/emulator/skin/dbi/HoverType.java | 2 +- .../emulator/skin/dbi/ImageListType.java | 2 +- .../emulator/skin/dbi/KeyMapListType.java | 2 +- .../tizen/emulator/skin/dbi/KeyMapType.java | 2 +- .../tizen/emulator/skin/dbi/MenuItemType.java | 128 ++++++++++++++++++ .../emulator/skin/dbi/ObjectFactory.java | 48 ++++--- .../emulator/skin/dbi/PopupMenuType.java | 122 +++++++++++++++++ .../tizen/emulator/skin/dbi/RegionType.java | 4 +- .../org/tizen/emulator/skin/dbi/RgbType.java | 4 +- .../emulator/skin/dbi/RotationNameType.java | 2 +- .../tizen/emulator/skin/dbi/RotationType.java | 2 +- .../emulator/skin/dbi/RotationsType.java | 2 +- .../tizen/emulator/skin/dbi/package-info.java | 2 +- .../client/skins/emul-320x480/default.dbi | 3 + .../skins/emul-480x800-3btn/default.dbi | 3 + .../client/skins/emul-480x800/default.dbi | 3 + .../client/skins/emul-600x1024/default.dbi | 3 + .../skins/emul-720x1280-3btn/default.dbi | 3 + .../client/skins/emul-720x1280/default.dbi | 3 + .../org/tizen/emulator/skin/EmulatorSkin.java | 50 ++++--- .../layout/GeneralPurposeSkinComposer.java | 2 +- .../tizen/emulator/skin/menu/PopupMenu.java | 35 ++++- tizen/src/skin/client/xsd/dbi.xsd | 12 ++ 26 files changed, 416 insertions(+), 55 deletions(-) create mode 100644 tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/MenuItemType.java create mode 100644 tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/PopupMenuType.java diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/DisplayType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/DisplayType.java index 46a53de1a3..01e5208344 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/DisplayType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/DisplayType.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EmulatorUI.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EmulatorUI.java index 14c83c2a17..346792414d 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EmulatorUI.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EmulatorUI.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // @@ -56,6 +56,7 @@ import javax.xml.bind.annotation.XmlType; * <element name="dbi_version" type="{http://www.w3.org/2001/XMLSchema}float"/> * <element name="rotations" type="{http://www.tizen.org/emulator/skin/dbi}rotationsType"/> * <element name="hover" type="{http://www.tizen.org/emulator/skin/dbi}hoverType" minOccurs="0"/> + * <element name="popupMenu" type="{http://www.tizen.org/emulator/skin/dbi}popupMenuType" minOccurs="0"/> * </all> * </restriction> * </complexContent> @@ -76,6 +77,7 @@ public class EmulatorUI { @XmlElement(required = true) protected RotationsType rotations; protected HoverType hover; + protected PopupMenuType popupMenu; /** * Gets the value of the dbiVersion property. @@ -141,4 +143,28 @@ public class EmulatorUI { this.hover = value; } + /** + * Gets the value of the popupMenu property. + * + * @return + * possible object is + * {@link PopupMenuType } + * + */ + public PopupMenuType getPopupMenu() { + return popupMenu; + } + + /** + * Sets the value of the popupMenu property. + * + * @param value + * allowed object is + * {@link PopupMenuType } + * + */ + public void setPopupMenu(PopupMenuType value) { + this.popupMenu = value; + } + } diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EventInfoType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EventInfoType.java index 6199df4bc0..ee302a643b 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EventInfoType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EventInfoType.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/HoverType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/HoverType.java index 27cb590743..ced0d34d79 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/HoverType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/HoverType.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ImageListType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ImageListType.java index 39696fe0c8..302ec979a0 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ImageListType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ImageListType.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapListType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapListType.java index 6ffdb31382..fa0f701b2d 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapListType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapListType.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapType.java index 7bd4dca6ed..64e9b32004 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapType.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/MenuItemType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/MenuItemType.java new file mode 100644 index 0000000000..ceecb7bc83 --- /dev/null +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/MenuItemType.java @@ -0,0 +1,128 @@ +/** + * XML Binding + * + * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * GiWoong Kim + * YeongKyoon Lee + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2013.07.11 at 12:12:25 PM KST +// + + +package org.tizen.emulator.skin.dbi; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for menuItemType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="menuItemType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="itemName" type="{http://www.w3.org/2001/XMLSchema}string" default="&Rotate" />
+ *       <attribute name="visible" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "menuItemType") +public class MenuItemType { + + @XmlAttribute(name = "itemName") + protected String itemName; + @XmlAttribute(name = "visible") + protected Boolean visible; + + /** + * Gets the value of the itemName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getItemName() { + if (itemName == null) { + return "&Rotate"; + } else { + return itemName; + } + } + + /** + * Sets the value of the itemName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setItemName(String value) { + this.itemName = value; + } + + /** + * Gets the value of the visible property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isVisible() { + if (visible == null) { + return true; + } else { + return visible; + } + } + + /** + * Sets the value of the visible property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setVisible(Boolean value) { + this.visible = value; + } + +} diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ObjectFactory.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ObjectFactory.java index ad389925c5..1ad06909d9 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ObjectFactory.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ObjectFactory.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // @@ -89,19 +89,19 @@ public class ObjectFactory { } /** - * Create an instance of {@link EventInfoType } + * Create an instance of {@link PopupMenuType } * */ - public EventInfoType createEventInfoType() { - return new EventInfoType(); + public PopupMenuType createPopupMenuType() { + return new PopupMenuType(); } /** - * Create an instance of {@link RgbType } + * Create an instance of {@link EventInfoType } * */ - public RgbType createRgbType() { - return new RgbType(); + public EventInfoType createEventInfoType() { + return new EventInfoType(); } /** @@ -113,19 +113,19 @@ public class ObjectFactory { } /** - * Create an instance of {@link DisplayType } + * Create an instance of {@link KeyMapListType } * */ - public DisplayType createDisplayType() { - return new DisplayType(); + public KeyMapListType createKeyMapListType() { + return new KeyMapListType(); } /** - * Create an instance of {@link KeyMapListType } + * Create an instance of {@link KeyMapType } * */ - public KeyMapListType createKeyMapListType() { - return new KeyMapListType(); + public KeyMapType createKeyMapType() { + return new KeyMapType(); } /** @@ -137,11 +137,27 @@ public class ObjectFactory { } /** - * Create an instance of {@link KeyMapType } + * Create an instance of {@link RgbType } * */ - public KeyMapType createKeyMapType() { - return new KeyMapType(); + public RgbType createRgbType() { + return new RgbType(); + } + + /** + * Create an instance of {@link DisplayType } + * + */ + public DisplayType createDisplayType() { + return new DisplayType(); + } + + /** + * Create an instance of {@link MenuItemType } + * + */ + public MenuItemType createMenuItemType() { + return new MenuItemType(); } /** 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 new file mode 100644 index 0000000000..54025e1eb3 --- /dev/null +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/PopupMenuType.java @@ -0,0 +1,122 @@ +/** + * XML Binding + * + * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * GiWoong Kim + * YeongKyoon Lee + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2013.07.11 at 12:12:25 PM KST +// + + +package org.tizen.emulator.skin.dbi; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for popupMenuType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="popupMenuType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="rotationItem" type="{http://www.tizen.org/emulator/skin/dbi}menuItemType" minOccurs="0"/>
+ *         <element name="keywindowItem" type="{http://www.tizen.org/emulator/skin/dbi}menuItemType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "popupMenuType", propOrder = { + "rotationItem", + "keywindowItem" +}) +public class PopupMenuType { + + protected MenuItemType rotationItem; + protected MenuItemType keywindowItem; + + /** + * Gets the value of the rotationItem property. + * + * @return + * possible object is + * {@link MenuItemType } + * + */ + public MenuItemType getRotationItem() { + return rotationItem; + } + + /** + * Sets the value of the rotationItem property. + * + * @param value + * allowed object is + * {@link MenuItemType } + * + */ + public void setRotationItem(MenuItemType value) { + this.rotationItem = value; + } + + /** + * Gets the value of the keywindowItem property. + * + * @return + * possible object is + * {@link MenuItemType } + * + */ + public MenuItemType getKeywindowItem() { + return keywindowItem; + } + + /** + * Sets the value of the keywindowItem property. + * + * @param value + * allowed object is + * {@link MenuItemType } + * + */ + public void setKeywindowItem(MenuItemType value) { + this.keywindowItem = value; + } + +} diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java index 763726d67b..8685466390 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java @@ -1,3 +1,4 @@ +// /** * XML Binding * @@ -26,11 +27,10 @@ * */ -// // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java index 1d12458485..2225e786b4 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java @@ -1,3 +1,4 @@ +// /** * XML Binding * @@ -26,11 +27,10 @@ * */ -// // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationNameType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationNameType.java index 169c15da1a..4959ceb300 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationNameType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationNameType.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationType.java index f92f3594d5..1289703387 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationType.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationsType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationsType.java index 2440617c62..63ee8437eb 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationsType.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationsType.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/package-info.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/package-info.java index bc87316451..bbce9c1d59 100644 --- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/package-info.java +++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/package-info.java @@ -30,7 +30,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.07.10 at 07:19:41 PM KST +// Generated on: 2013.07.11 at 12:12:25 PM KST // @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tizen.org/emulator/skin/dbi", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) diff --git a/tizen/src/skin/client/skins/emul-320x480/default.dbi b/tizen/src/skin/client/skins/emul-320x480/default.dbi index 2e17180b15..f1ce9ca4b4 100644 --- a/tizen/src/skin/client/skins/emul-320x480/default.dbi +++ b/tizen/src/skin/client/skins/emul-320x480/default.dbi @@ -178,4 +178,7 @@ + + + diff --git a/tizen/src/skin/client/skins/emul-480x800-3btn/default.dbi b/tizen/src/skin/client/skins/emul-480x800-3btn/default.dbi index 03dff1a068..6b39a7b3af 100644 --- a/tizen/src/skin/client/skins/emul-480x800-3btn/default.dbi +++ b/tizen/src/skin/client/skins/emul-480x800-3btn/default.dbi @@ -242,4 +242,7 @@ + + + diff --git a/tizen/src/skin/client/skins/emul-480x800/default.dbi b/tizen/src/skin/client/skins/emul-480x800/default.dbi index 5459bec7d6..66d3e226f7 100644 --- a/tizen/src/skin/client/skins/emul-480x800/default.dbi +++ b/tizen/src/skin/client/skins/emul-480x800/default.dbi @@ -178,4 +178,7 @@ + + + diff --git a/tizen/src/skin/client/skins/emul-600x1024/default.dbi b/tizen/src/skin/client/skins/emul-600x1024/default.dbi index be34f736bb..c012813758 100644 --- a/tizen/src/skin/client/skins/emul-600x1024/default.dbi +++ b/tizen/src/skin/client/skins/emul-600x1024/default.dbi @@ -178,4 +178,7 @@ + + + diff --git a/tizen/src/skin/client/skins/emul-720x1280-3btn/default.dbi b/tizen/src/skin/client/skins/emul-720x1280-3btn/default.dbi index 54dab56d0f..7c7187deae 100644 --- a/tizen/src/skin/client/skins/emul-720x1280-3btn/default.dbi +++ b/tizen/src/skin/client/skins/emul-720x1280-3btn/default.dbi @@ -242,4 +242,7 @@ + + + diff --git a/tizen/src/skin/client/skins/emul-720x1280/default.dbi b/tizen/src/skin/client/skins/emul-720x1280/default.dbi index 775d9aaad9..c4e4e0de52 100644 --- a/tizen/src/skin/client/skins/emul-720x1280/default.dbi +++ b/tizen/src/skin/client/skins/emul-720x1280/default.dbi @@ -178,4 +178,7 @@ + + + diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java index 7165eb5435..bae5741e7c 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java @@ -993,16 +993,29 @@ public class EmulatorSkin { /* abstract */ } - public boolean isSelectKeyWindow() { - return popupMenu.keyWindowItem.getSelection(); + public boolean isSelectKeyWindowMenu() { + if (popupMenu.keyWindowItem != null) { + return popupMenu.keyWindowItem.getSelection(); + } + + return false; + } + + public void selectKeyWindowMenu(boolean on) { + if (popupMenu.keyWindowItem != null) { + popupMenu.keyWindowItem.setSelection(on); + } } public void openKeyWindow(int dockValue, boolean recreate) { if (keyWindow != null) { if (recreate == false) { /* show the key window */ - popupMenu.keyWindowItem.setSelection(isKeyWindow = true); - pairTag.setVisible(true); + selectKeyWindowMenu(isKeyWindow = true); + + if (pairTag != null) { + pairTag.setVisible(true); + } keyWindow.getShell().setVisible(true); SkinUtil.setTopMost(keyWindow.getShell(), isOnTop); @@ -1019,28 +1032,33 @@ public class EmulatorSkin { SkinUtil.getHWKeyMapList(currentState.getCurrentRotationId()); if (keyMapList == null) { - popupMenu.keyWindowItem.setSelection(isKeyWindow = false); + selectKeyWindowMenu(isKeyWindow = false); logger.info("keyMapList is null"); return; } else if (keyMapList.isEmpty() == true) { - popupMenu.keyWindowItem.setSelection(isKeyWindow = false); + selectKeyWindowMenu(isKeyWindow = false); logger.info("keyMapList is empty"); return; } keyWindow = new KeyWindow(this, shell, communicator, keyMapList); - popupMenu.keyWindowItem.setSelection(isKeyWindow = true); + selectKeyWindowMenu(isKeyWindow = true); SkinUtil.setTopMost(keyWindow.getShell(), isOnTop); - pairTag.setVisible(true); + if (pairTag != null) { + pairTag.setVisible(true); + } keyWindow.open(dockValue); } public void hideKeyWindow() { - popupMenu.keyWindowItem.setSelection(isKeyWindow = false); - pairTag.setVisible(false); + selectKeyWindowMenu(isKeyWindow = false); + + if (pairTag != null) { + pairTag.setVisible(false); + } if (keyWindow != null) { keyWindow.getShell().setVisible(false); @@ -1048,8 +1066,11 @@ public class EmulatorSkin { } public void closeKeyWindow() { - popupMenu.keyWindowItem.setSelection(isKeyWindow = false); - pairTag.setVisible(false); + selectKeyWindowMenu(isKeyWindow = false); + + if (pairTag != null) { + pairTag.setVisible(false); + } if (keyWindow != null) { keyWindow.getShell().close(); @@ -1317,10 +1338,7 @@ public class EmulatorSkin { SelectionAdapter listener = new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - final boolean selectKeyWindow = - popupMenu.keyWindowItem.getSelection(); - - if (selectKeyWindow == true) { + if (isSelectKeyWindowMenu() == true) { if (keyWindow == null) { openKeyWindow(recentlyDocked, false); recentlyDocked = SWT.NONE; diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java index 930907e59a..a932632268 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java @@ -173,7 +173,7 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { toggleButton.addMouseListener(new MouseListener() { @Override public void mouseDown(MouseEvent e) { - if (skin.isSelectKeyWindow() == true) { + if (skin.isKeyWindow == true) { skin.closeKeyWindow(); skin.recentlyDocked = SWT.RIGHT | SWT.CENTER; } else { 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 d6198e8c86..6960f45b16 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 @@ -37,6 +37,8 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.skin.EmulatorSkin; import org.tizen.emulator.skin.config.EmulatorConfig; +import org.tizen.emulator.skin.dbi.MenuItemType; +import org.tizen.emulator.skin.dbi.PopupMenuType; import org.tizen.emulator.skin.image.ImageRegistry; import org.tizen.emulator.skin.image.ImageRegistry.IconName; import org.tizen.emulator.skin.log.SkinLogger; @@ -90,6 +92,9 @@ public class PopupMenu { } private void addMenuItems(final Menu menu) { + PopupMenuType itemProperties = config.getDbiContents().getPopupMenu(); + String menuName = ""; + /* Emulator detail info menu */ detailInfoItem = new MenuItem(menu, SWT.PUSH); String emulatorName = SkinUtil.makeEmulatorName(config); @@ -112,12 +117,21 @@ public class PopupMenu { } /* Rotate menu */ - rotateItem = new MenuItem(menu, SWT.CASCADE); - rotateItem.setText("&Rotate"); - rotateItem.setImage(imageRegistry.getIcon(IconName.ROTATE)); + MenuItemType rotationItem = (itemProperties != null) ? + itemProperties.getRotationItem() : null; + + menuName = (rotationItem != null) ? + rotationItem.getItemName() : "&Rotate"; + + if (rotationItem == null || + (rotationItem != null && rotationItem.isVisible() == true)) { + rotateItem = new MenuItem(menu, SWT.CASCADE); + rotateItem.setText(menuName); + rotateItem.setImage(imageRegistry.getIcon(IconName.ROTATE)); - Menu rotateMenu = skin.createRotateMenu(); - rotateItem.setMenu(rotateMenu); + Menu rotateMenu = skin.createRotateMenu(); + rotateItem.setMenu(rotateMenu); + } /* Scale menu */ scaleItem = new MenuItem(menu, SWT.CASCADE); @@ -130,7 +144,14 @@ public class PopupMenu { new MenuItem(menu, SWT.SEPARATOR); /* Key Window menu */ - if (skin.skinInfo.isPhoneShape() == false) { //TODO: + MenuItemType keywindowItem = (itemProperties != null) ? + itemProperties.getKeywindowItem() : null; + + menuName = (keywindowItem != null) ? + keywindowItem.getItemName() : "&Key Window"; + + if (keywindowItem == null || + (keywindowItem != null && keywindowItem.isVisible() == true)) { keyWindowItem = new MenuItem(menu, SWT.CHECK); keyWindowItem.setText("&Key Window"); keyWindowItem.setSelection(skin.isKeyWindow); @@ -144,7 +165,7 @@ public class PopupMenu { advancedItem.setText("Ad&vanced"); advancedItem.setImage(imageRegistry.getIcon(IconName.ADVANCED)); - Menu advancedMenu = new Menu(shell, SWT.DROP_DOWN); + Menu advancedMenu = new Menu(menu.getShell(), SWT.DROP_DOWN); { /* Screen shot menu */ screenshotItem = new MenuItem(advancedMenu, SWT.PUSH); diff --git a/tizen/src/skin/client/xsd/dbi.xsd b/tizen/src/skin/client/xsd/dbi.xsd index 4da68af19b..0158c82c09 100644 --- a/tizen/src/skin/client/xsd/dbi.xsd +++ b/tizen/src/skin/client/xsd/dbi.xsd @@ -8,6 +8,7 @@ xmlns:dbi="http://www.tizen.org/emulator/skin/dbi" elementFormDefault="qualified + @@ -90,4 +91,15 @@ xmlns:dbi="http://www.tizen.org/emulator/skin/dbi" elementFormDefault="qualified + + + + + + + + + + + \ No newline at end of file -- 2.34.1