Bug-fix: Fixed duplicated variable.

Change-Id: I5a2d6df9b2f4abd42e87f3d2154c23da38b85e15
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/ComboViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/ComboViewItem.java
index cd1b2bd..066f0f3 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/ComboViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/ComboViewItem.java
@@ -69,10 +69,6 @@ public class ComboViewItem extends AdvancedViewItem{
        protected Image INPUTBOX_OFF_IMAGE = null;
        protected int COMBOBOX_WIDTH = 175;
 
-
-       protected boolean useDefaultOnCreate = false;
-       protected String defaultOnCreate = null;
-
        public String getValue()
        {
                return newValue;

diff --git a/template/w-x86-standard-template-win.xml b/template/w-x86-standard-template-win.xml
new file mode 100644 (file)
index 0000000..256c509
--- /dev/null
+++ b/template/w-x86-standard-template-win.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!-- This file describes component of VM property UI in Emulator manager.
+     (VM property UI descriptor)
+     Each element in this file is matched with an item of vm property UI. -->
+     
+<ItemList xmlns="http://www.tizen.org/em/template" profile="wearable" image="x86-standard">
+
+       <propertyList>
+               <item type="text" name="vmName" title="Name"/>
+               <item type="file" name="baseImage" title="Base Image">
+                       <option name="dialogType">file</option>
+               </item>
+               <item type="label" name="display" title="Display">
+                       <item type="combo" name="resolution" title="Resolution">
+                               <!-- name, width, height, dpi -->
+                                       <option name="320"> ,320,320,316 </option>
+                                       <option name="480"> ,360,480,300 </option>
+<!--                           <option name="hvga"> HVGA,320,480,160 </option> -->
+<!--                           <option name="wvga"> WVGA,480,800,207 </option> -->
+<!--                           <option name="wsvga"> WSVGA,600,1024,207 </option> -->
+<!--                           <option name="qhd"> QHD,540,960,244 </option> -->
+<!--                           <option name="hd"> HD,720,1280,316 </option> -->
+<!--                           <option name="wxga"> WXGA,1280,800,300 </option> -->
+<!--                           <option name="hd1080"> HD1080,1920,1080,314 </option> -->
+<!--                           <option name="wqxga"> WQXGA,2560,1600,301 </option> -->
+<!--                           <option name="fullhd"> FULLHD,1080,1920,314 </option> -->
+                       </item>
+                       <item type="spinner" name="dpi" title="Density"/>
+                       <item type="combo" name="skin" title="Skin"/>
+               </item>
+               <item type="combo" name="processors" title="Processors" />
+               <item type="combo" name="ramSize" title="RAM Size">
+                       <option name="list">512,768,1024</option>
+               </item>
+<!--           <item type="combo" name="maxTouch" title="Max Touch Point"/> -->
+               <item type="label" name="fileShare" title="File Sharing">
+                       <item type="toggle" name="share" title="Sharing"/>
+                       <item type="file" name="directory" title="Directory">
+                               <option name="dialogType">directory</option>
+                       </item>
+               </item>"
+               <item type="label" name="hwSupport" title="HW Support">
+                       <item type="toggle" name="cpu" title="CPU VT"/>
+                       <item type="toggle" name="gpu" title="GPU"/>
+               </item>
+       </propertyList>
+
+<!-- Followings are drawn as check box in Emulator Manager vm property UI.-->
+       <deviceList>
+               <item type="lineLabel" name="advancedOption" title="Advanced Option"/>
+               <item type="checkLabel" name="sensor" title="Sensor">
+                       <item type="checkbox" name="accel" title="Accelerometer"/>
+                       <item type="checkbox" name="gyro" title="Gyroscope"/>
+                       <item type="checkbox" name="geo" title="Geomagnetic"/>
+                       <item type="checkbox" name="proxi" title="Proximity"/>
+                       <item type="checkbox" name="light" title="Light"/>
+                       <item type="checkbox" name="haptic" title="Haptic"/>
+                       <item type="checkbox" name="press" title="Pressure"/>
+                       <item type="checkbox" name="uv" title="Ultraviolet"/>
+                       <item type="checkbox" name="hrm" title="Heartbeat Rate"/>
+               </item>
+               <item type="checkLabel" name="device" title="Device">
+                       <item type="checkbox" name="nfc" title="NFC"/>
+                       <item type="checkbox" name="camera" title="Camera"/>
+<!--                   <item type="checkbox" name="battery" title="Battery"/> -->
+<!--                   <item type="checkbox" name="swap" title="Swap Image"> -->
+<!--                           <option name="defaultOnCreate">on</option> -->
+<!--                   </item> -->
+<!--                   <item type="checkbox" name="hwkey" title="HW Key"/> -->
+               </item>
+<!--           <item type="checkLabel" name="jack" title="Jack"> -->
+<!--                   <item type="checkbox" name="charger" title="Charger"/> -->
+<!--                   <item type="checkbox" name="usb" title="USB"/> -->
+<!--           </item> -->
+
+                </item>
+
+               <!-- Network configuration -->
+               <item name="netConfig" type="lineLabel" title="Network Configuration">
+                       <option name="spreadOnStart">false</option>
+               </item>
+               <item name="proxy" type="combo" title="Proxy">
+                       <option name="none">No proxy</option>
+                       <option name="auto">Use host proxy</option>
+                       <option name="manual">Use manual proxy</option>
+                       <option name="defaultOnCreate">auto</option>
+               </item>
+               <item name="netConnectType" type="combo" title="Connect Type">
+                       <option name="list">NAT, Bridge</option>
+               </item>
+               <item name="netTapDevice" type="combo" title="Tap Device"/>
+               <item name="netIpInfo" type="label" title="VM IP info">
+                       <item name="useDHCP" type="checkbox" title="Use DHCP">
+                               <option name="defaultOnCreate">off</option>
+                       </item>
+                       <item name="ipAddr" type="text" title="IP Address" />
+                       <item name="subnet" type="text" title="Subnet" />
+                       <item name="gateway" type="text" title="Gateway" />
+               </item>
+               <item name="netDns" type="text" title="DNS" />
+               <item name="netMac" type="text" title="MAC" />
+
+                <item type="lineLabel" name="experimental" title="Experimental Options"/>
+                <item type="checkLabel" name="experimental" title="Display">
+                        <option name="hideLabel">on</option>
+                        <item type="checkbox" name="qtEnable" title="Direct Rendering">
+                                <option name="defaultIfEmpty">on</option>
+                                <option name="defaultOnCreate">on</option>
+                        </item>
+       </deviceList>
+
+</ItemList>
+

diff --git a/template/w-x86-standard-template.xml b/template/w-x86-standard-template.xml
new file mode 100644 (file)
index 0000000..60d7171
--- /dev/null
+++ b/template/w-x86-standard-template.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!-- This file describes component of VM property UI in Emulator manager.
+     (VM property UI descriptor)
+     Each element in this file is matched with an item of vm property UI. -->
+     
+<ItemList xmlns="http://www.tizen.org/em/template" profile="wearable" image="x86-standard">
+
+       <propertyList>
+               <item type="text" name="vmName" title="Name"/>
+               <item type="file" name="baseImage" title="Base Image">
+                       <option name="dialogType">file</option>
+               </item>
+               <item type="label" name="display" title="Display">
+                       <item type="combo" name="resolution" title="Resolution">
+                               <!-- name, width, height, dpi -->
+                                       <option name="320"> ,320,320,316 </option>
+                                       <option name="480"> ,360,480,300 </option>
+<!--                           <option name="hvga"> HVGA,320,480,160 </option> -->
+<!--                           <option name="wvga"> WVGA,480,800,207 </option> -->
+<!--                           <option name="wsvga"> WSVGA,600,1024,207 </option> -->
+<!--                           <option name="qhd"> QHD,540,960,244 </option> -->
+<!--                           <option name="hd"> HD,720,1280,316 </option> -->
+<!--                           <option name="wxga"> WXGA,1280,800,300 </option> -->
+<!--                           <option name="hd1080"> HD1080,1920,1080,314 </option> -->
+<!--                           <option name="wqxga"> WQXGA,2560,1600,301 </option> -->
+<!--                           <option name="fullhd"> FULLHD,1080,1920,314 </option> -->
+                       </item>
+                       <item type="spinner" name="dpi" title="Density"/>
+                       <item type="combo" name="skin" title="Skin"/>
+               </item>
+               <item type="combo" name="processors" title="Processors" />
+               <item type="combo" name="ramSize" title="RAM Size">
+                       <option name="list">512,768,1024</option>
+               </item>
+<!--           <item type="combo" name="maxTouch" title="Max Touch Point"/> -->
+               <item type="label" name="fileShare" title="File Sharing">
+                       <item type="toggle" name="share" title="Sharing"/>
+                       <item type="file" name="directory" title="Directory">
+                               <option name="dialogType">directory</option>
+                       </item>
+               </item>"
+               <item type="label" name="hwSupport" title="HW Support">
+                       <item type="toggle" name="cpu" title="CPU VT"/>
+                       <item type="toggle" name="gpu" title="GPU"/>
+               </item>
+       </propertyList>
+
+<!-- Followings are drawn as check box in Emulator Manager vm property UI.-->
+       <deviceList>
+               <item type="lineLabel" name="advancedOption" title="Advanced Option"/>
+               <item type="checkLabel" name="sensor" title="Sensor">
+                       <item type="checkbox" name="accel" title="Accelerometer"/>
+                       <item type="checkbox" name="gyro" title="Gyroscope"/>
+                       <item type="checkbox" name="geo" title="Geomagnetic"/>
+                       <item type="checkbox" name="proxi" title="Proximity"/>
+                       <item type="checkbox" name="light" title="Light"/>
+                       <item type="checkbox" name="haptic" title="Haptic"/>
+                       <item type="checkbox" name="press" title="Pressure"/>
+                       <item type="checkbox" name="uv" title="Ultraviolet"/>
+                       <item type="checkbox" name="hrm" title="Heartbeat Rate"/>
+               </item>
+               <item type="checkLabel" name="device" title="Device">
+                       <item type="checkbox" name="nfc" title="NFC"/>
+                       <item type="checkbox" name="camera" title="Camera"/>
+<!--                   <item type="checkbox" name="battery" title="Battery"/> -->
+<!--                   <item type="checkbox" name="swap" title="Swap Image"> -->
+<!--                           <option name="defaultOnCreate">on</option> -->
+<!--                   </item> -->
+<!--                   <item type="checkbox" name="hwkey" title="HW Key"/> -->
+               </item>
+<!--           <item type="checkLabel" name="jack" title="Jack"> -->
+<!--                   <item type="checkbox" name="charger" title="Charger"/> -->
+<!--                   <item type="checkbox" name="usb" title="USB"/> -->
+<!--           </item> -->
+
+                </item>
+
+               <!-- Network configuration -->
+               <item name="netConfig" type="lineLabel" title="Network Configuration">
+                       <option name="spreadOnStart">false</option>
+               </item>
+               <item name="proxy" type="combo" title="Proxy">
+                       <option name="none">No proxy</option>
+                       <option name="auto">Use host proxy</option>
+                       <option name="manual">Use manual proxy</option>
+                       <option name="defaultOnCreate">auto</option>
+               </item>
+               <item name="netConnectType" type="combo" title="Connect Type">
+                       <option name="list">NAT, Bridge</option>
+               </item>
+               <item name="netTapDevice" type="combo" title="Base Network"/>
+               <item name="netIpInfo" type="label" title="VM IP info">
+                       <item name="useDHCP" type="checkbox" title="Use DHCP">
+                               <option name="defaultOnCreate">off</option>
+                       </item>
+                       <item name="ipAddr" type="text" title="IP Address" />
+                       <item name="subnet" type="text" title="Subnet" />
+                       <item name="gateway" type="text" title="Gateway" />
+               </item>
+               <item name="netDns" type="text" title="DNS" />
+               <item name="netMac" type="text" title="MAC" />
+
+                <item type="lineLabel" name="experimental" title="Experimental Options"/>
+                <item type="checkLabel" name="experimental" title="Display">
+                        <option name="hideLabel">on</option>
+                        <item type="checkbox" name="qtEnable" title="Direct Rendering">
+                                <option name="defaultIfEmpty">on</option>
+                                <option name="defaultOnCreate">on</option>
+                        </item>
+       </deviceList>
+
+</ItemList>
+