Template: Add item type.("lineLabel")

- In VM property UI, a "lineLabel" item categorizes items which are displayed below .
- Each item can refer each other by using map in "lineLabel" item.

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

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/AdvancedViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/AdvancedViewItem.java
index 6c6e29a..5001590 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/AdvancedViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/AdvancedViewItem.java
@@ -41,6 +41,16 @@ public abstract class AdvancedViewItem extends DetailViewItem {
 
        protected boolean isHide = false;
 
+       protected LineLabelViewItem lineLabelViewItem;
+
+       public AdvancedViewItem(LineLabelViewItem lineLabelViewItem) {
+               this.lineLabelViewItem = lineLabelViewItem;
+       }
+
+       public LineLabelViewItem getLineLabelViewItem() {
+               return lineLabelViewItem;
+       }
+
        public boolean isArrowSelected() {
                return arrowSelected;
        }

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/CommonItemListFactory.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/CommonItemListFactory.java
index 0005f3d..cb42c41 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/CommonItemListFactory.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/CommonItemListFactory.java
@@ -50,6 +50,7 @@ import org.tizen.emulator.manager.ui.detail.item.template.ComboViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.FileViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.LabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.OnOffViewItem;
+import org.tizen.emulator.manager.ui.detail.item.template.TextViewItem;
 import org.tizen.emulator.manager.vms.xml.template.DeviceList;
 import org.tizen.emulator.manager.vms.xml.template.Item;
 import org.tizen.emulator.manager.vms.xml.template.ItemList;
@@ -74,28 +75,38 @@ public abstract class CommonItemListFactory implements IItemListFactory{
                if (propertyList != null) {
                        List<IViewItem> itemList = (List<IViewItem>)list;
                        List<Item> propertyItemList = propertyList.getItem();
+                       LineLabelViewItem currentLineLabel = null;   // Top categorizing item
+
                        for (Item item : propertyItemList) {
+                               String type = item.getType();
                                String itemName = item.getName();
+
+                               if (type.equals(ItemType.LINE_LABEL.getName())) { // Top categorizing item
+                                       currentLineLabel = new LineLabelViewItem(item);
+                                       itemList.add(currentLineLabel);
+                                       continue;
+                               }
+
                                if (itemName.equals(ITEM_VM_NAME)) {
-                                       itemList.add(new VMNameViewItem(item, false));
+                                       itemList.add(new VMNameViewItem(item, currentLineLabel));
 
                                } else if (itemName.equals(ITEM_BASE_IMAGE)) {
-                                       itemList.add(new BaseImageViewItem(item, false));
+                                       itemList.add(new BaseImageViewItem(item, currentLineLabel));
 
                                } else if (itemName.equals(ITEM_DISPLAY)) {
-                                       itemList.add(new DisplayViewItem(item, false));
+                                       itemList.add(new DisplayViewItem(item, currentLineLabel));
 
                                } else if (itemName.equals(ITEM_RAM_SIZE)) {
-                                       itemList.add(new RamSizeItem(item, false));
+                                       itemList.add(new RamSizeItem(item, currentLineLabel));
 
                                } else if (itemName.equals(ITEM_MAX_TOUCH)) {
-                                       itemList.add(new MaxTouchViewItem(item, false));
+                                       itemList.add(new MaxTouchViewItem(item, currentLineLabel));
 
                                } else if (itemName.equals(ITEM_FILE_SHARE)) {
-                                       itemList.add(new FileShareViewItem(item, false));
+                                       itemList.add(new FileShareViewItem(item, currentLineLabel));
 
                                } else if (itemName.equals(ITEM_HW_SUPPORT)) {
-                                       itemList.add(new HWSupportViewItem(item, false));
+                                       itemList.add(new HWSupportViewItem(item, currentLineLabel));
                                }
                        }
                }
@@ -107,34 +118,38 @@ public abstract class CommonItemListFactory implements IItemListFactory{
                if (deviceList != null) {
                        List<IViewItem> itemList = (List<IViewItem>)list;
                        List<Item> deviceItemList = deviceList.getItem();
-                       if (deviceItemList.size() > 0) {
-                               itemList.add(new TAdvancedOptionLabelItem());
-                       }
-                       makeItemList(itemList, deviceItemList);
-               }
-       }
+                       LineLabelViewItem currentLineLabel = null;   // Top categorizing item
+
+                       for (Item item : deviceItemList) {
+                               String type = item.getType();
+
+                               if (type.equals(ItemType.LINE_LABEL.getName())) { // Top categorizing item
+                                       currentLineLabel = new LineLabelViewItem(item);
+                                       itemList.add(currentLineLabel);
 
-       private void makeItemList(List<IViewItem> itemList, List<Item> templateItemList) {
-               for (Item item : templateItemList) {
-                       String type = item.getType();
-                       if (type.equals(ItemType.TOGGLE.getName())) {
-                               itemList.add(new OnOffViewItem(item, true));
+                               } else if (type.equals(ItemType.TOGGLE.getName())) {
+                                       itemList.add(new OnOffViewItem(item, currentLineLabel));
 
-                       } else if (type.equals(ItemType.LABEL.getName())) {
-                               itemList.add(new LabelViewItem(item, true));
+                               } else if (type.equals(ItemType.LABEL.getName())) {
+                                       itemList.add(new LabelViewItem(item, currentLineLabel));
 
-                       } else if (type.equals(ItemType.COMBO.getName())) {
-                               itemList.add(new ComboViewItem(item, true));
+                               } else if (type.equals(ItemType.COMBO.getName())) {
+                                       itemList.add(new ComboViewItem(item, currentLineLabel));
 
-                       } else if (type.equals(ItemType.FILE.getName())) {
-                               itemList.add(new FileViewItem(item, true));
+                               } else if (type.equals(ItemType.FILE.getName())) {
+                                       itemList.add(new FileViewItem(item, currentLineLabel));
 
-                       } else if (type.equals(ItemType.CHECK_LABEL.getName())) {
-                               itemList.add(new CheckLabelViewItem(item, true));
+                               } else if (type.equals(ItemType.CHECK_LABEL.getName())) {
+                                       itemList.add(new CheckLabelViewItem(item, currentLineLabel));
+
+                               } else if (type.equals(ItemType.TEXT.getName())) {
+                                       itemList.add(new TextViewItem(item, currentLineLabel));
+                               }
                        }
                }
        }
 
+
        // Override if need
        public void makeCustomDeviceItemList(List<? extends IViewItem> list, List<ItemList> templateList) {
                if (templateList == null || templateList.size() == 0 ) {

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/ItemType.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/ItemType.java
index a5ea123..98f9678 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/ItemType.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/ItemType.java
@@ -40,7 +40,8 @@ public enum ItemType {
        SPINNER("spinner"),
        LABEL("label"),
        CHECK_LABEL("checkLabel"),
-       CHECK_BOX("checkbox")
+       CHECK_BOX("checkbox"),
+       LINE_LABEL("lineLabel")
        ;
 
        private String name;

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/TAdvancedOptionLabelItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/LineLabelViewItem.java
similarity index 91%
rename from common-project/src/org/tizen/emulator/manager/ui/detail/item/TAdvancedOptionLabelItem.java
rename to common-project/src/org/tizen/emulator/manager/ui/detail/item/LineLabelViewItem.java
index 3556fd8..69391a5 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/TAdvancedOptionLabelItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/LineLabelViewItem.java
@@ -31,6 +31,9 @@
 
 package org.tizen.emulator.manager.ui.detail.item;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
@@ -49,8 +52,25 @@ import org.tizen.emulator.manager.ui.detail.item.AdvancedViewItem;
 import org.tizen.emulator.manager.ui.detail.item.DetailViewItem;
 import org.tizen.emulator.manager.ui.widgets.ImageButton;
 import org.tizen.emulator.manager.vms.VMPropertyValue;
+import org.tizen.emulator.manager.vms.xml.template.Item;
+
+public class LineLabelViewItem extends DetailViewItem{
+
+       private Map<String, AdvancedViewItem> itemMap = new HashMap<String, AdvancedViewItem>();
+
+       public LineLabelViewItem() {
+               this.title = "Advanced Options";
+       }
+       public LineLabelViewItem(Item template) {
+               this.title = template.getTitle();
+       }
 
-public class TAdvancedOptionLabelItem extends DetailViewItem{
+       public void addItem(String name, AdvancedViewItem item) {
+               itemMap.put(name, item);
+       }
+       public AdvancedViewItem getItem(String name) {
+               return (AdvancedViewItem)itemMap.get(name);
+       }
 
        @Override
        public void drawDetail() {
@@ -65,7 +85,6 @@ public class TAdvancedOptionLabelItem extends DetailViewItem{
 
        @Override
        public void init() {
-               title = "Advanced Options";
                count = 1;
                TITLE_WIDTH = 150;
        }

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java
index 68c37af..f418163 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java
@@ -45,6 +45,7 @@ import org.tizen.emulator.manager.resources.PatchImageResources;
 import org.tizen.emulator.manager.resources.StringResources;
 import org.tizen.emulator.manager.ui.MainDialog;
 import org.tizen.emulator.manager.ui.VMsMainView;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.FileViewItem;
 import org.tizen.emulator.manager.ui.dialog.MessageDialog;
 import org.tizen.emulator.manager.ui.widgets.ImageButton;
@@ -63,8 +64,8 @@ public class BaseImageViewItem extends FileViewItem {
        private boolean isStandard;
        private Image IMAGE_INPUTBOX_IMAGE = null;
 
-       public BaseImageViewItem(Item template, boolean isDeviceItem) {
-               super(template, isDeviceItem);
+       public BaseImageViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(template, lineLabelViewItem);
        }
 
        @Override

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/DisplayViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/DisplayViewItem.java
index a58b76c..f76a7fb 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/DisplayViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/DisplayViewItem.java
@@ -35,6 +35,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.tizen.emulator.manager.logging.EMLogger;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.ISubViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.LabelViewItem;
 import org.tizen.emulator.manager.vms.RESOLUTION;
@@ -50,8 +51,8 @@ public class DisplayViewItem extends LabelViewItem {
        private DPISubViewItem dpiItem;
        private SkinSubViewItem skinItem;
 
-       public DisplayViewItem(Item template, boolean isDeviceItem) {
-               super(template, isDeviceItem);
+       public DisplayViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(template, lineLabelViewItem);
        }
 
        @Override

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/FileShareViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/FileShareViewItem.java
index 560700e..a366005 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/FileShareViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/FileShareViewItem.java
@@ -34,6 +34,7 @@ package org.tizen.emulator.manager.ui.detail.item.property;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.ISubViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.LabelViewItem;
 import org.tizen.emulator.manager.vms.xml.template.Item;
@@ -45,8 +46,8 @@ public class FileShareViewItem extends LabelViewItem {
 
        FileShareDialogSubViewItem dialogItem;
 
-       public FileShareViewItem(Item template, boolean isDeviceItem) {
-               super(template, isDeviceItem);
+       public FileShareViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(template, lineLabelViewItem);
        }
 
        protected List<ISubViewItem> getSubItemList() {

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/HWSupportViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/HWSupportViewItem.java
index a7cd07a..7450ebf 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/HWSupportViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/HWSupportViewItem.java
@@ -34,6 +34,7 @@ package org.tizen.emulator.manager.ui.detail.item.property;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.ISubViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.LabelViewItem;
 import org.tizen.emulator.manager.vms.xml.template.Item;
@@ -43,8 +44,8 @@ public class HWSupportViewItem extends LabelViewItem {
        public static String ITEM_CPU = "cpu";
        public static String ITEM_GPU = "gpu";
 
-       public HWSupportViewItem(Item template, boolean isDeviceItem) {
-               super(template, isDeviceItem);
+       public HWSupportViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(template, lineLabelViewItem);
        }
 
 

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/MaxTouchViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/MaxTouchViewItem.java
index 9db8b5a..1646853 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/MaxTouchViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/MaxTouchViewItem.java
@@ -36,6 +36,7 @@ import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.tizen.emulator.manager.logging.EMLogger;
 import org.tizen.emulator.manager.resources.PatchImageResources;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.TextViewItem;
 import org.tizen.emulator.manager.ui.widgets.ImageLabel;
 import org.tizen.emulator.manager.vms.VMPropertyValue;
@@ -43,8 +44,8 @@ import org.tizen.emulator.manager.vms.xml.template.Item;
 
 public class MaxTouchViewItem extends TextViewItem {
 
-       public MaxTouchViewItem(Item template, boolean isDeviceItem) {
-               super(template, isDeviceItem);
+       public MaxTouchViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(template, lineLabelViewItem);
        }
 
        @Override

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/RamSizeItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/RamSizeItem.java
index efc33b4..59ea697 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/RamSizeItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/RamSizeItem.java
@@ -42,6 +42,7 @@ import org.tizen.emulator.manager.resources.ColorResources;
 import org.tizen.emulator.manager.resources.FontResources;
 import org.tizen.emulator.manager.resources.ImageResources;
 import org.tizen.emulator.manager.resources.PatchImageResources;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.ComboViewItem;
 import org.tizen.emulator.manager.ui.widgets.ImageCombo;
 import org.tizen.emulator.manager.ui.widgets.WSTATE;
@@ -52,12 +53,13 @@ import org.tizen.emulator.manager.vms.xml.template.Option;
 
 public class RamSizeItem extends ComboViewItem{
 
+       public RamSizeItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(template, lineLabelViewItem);
+       }
+
        private Label unitLabel;
        private static String RAM_UNIT = "MB";
 
-       public RamSizeItem(Item template, boolean isDeviceItem) {
-               super(template, isDeviceItem);
-       }
 
        @Override
        protected void parseOption(List<Option> optionList) {

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/VMNameViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/VMNameViewItem.java
index 84b9771..dbe43ea 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/VMNameViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/VMNameViewItem.java
@@ -48,6 +48,7 @@ import org.tizen.emulator.manager.resources.FontResources;
 import org.tizen.emulator.manager.resources.PatchImageResources;
 import org.tizen.emulator.manager.ui.VMsMainView;
 import org.tizen.emulator.manager.ui.detail.item.ItemChangeState;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.TextViewItem;
 import org.tizen.emulator.manager.ui.widgets.ImageLabel;
 import org.tizen.emulator.manager.vms.VMProperty;
@@ -59,8 +60,8 @@ public class VMNameViewItem extends TextViewItem{
 
        private boolean isStandard;
 
-       public VMNameViewItem(Item template, boolean isDeviceItem) {
-               super(template, isDeviceItem);
+       public VMNameViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(template, lineLabelViewItem);
        }
 
        @Override

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/CheckLabelViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/CheckLabelViewItem.java
index 6dbceb5..ad9df59 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/CheckLabelViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/CheckLabelViewItem.java
@@ -41,6 +41,7 @@ import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.tizen.emulator.manager.resources.ImageResources;
 import org.tizen.emulator.manager.ui.detail.item.ItemType;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.OptionType;
 import org.tizen.emulator.manager.ui.widgets.ImageButton;
 import org.tizen.emulator.manager.vms.VMPropertyValue;
@@ -52,8 +53,8 @@ public class CheckLabelViewItem extends LabelViewItem {
        private ImageButton checkBox;
        private boolean hideLabel = false;
 
-       public CheckLabelViewItem(Item template, boolean isDeviceItem) {
-               super(template, isDeviceItem);
+       public CheckLabelViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(template, lineLabelViewItem);
                TITLE_WIDTH = 60; // override
                parseOption(template.getOption());
        }

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 c296e5f..3882387 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
@@ -40,9 +40,12 @@ import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Text;
 import org.tizen.emulator.manager.resources.ImageResources;
 import org.tizen.emulator.manager.resources.PatchImageResources;
 import org.tizen.emulator.manager.ui.detail.item.AdvancedViewItem;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.OptionType;
 import org.tizen.emulator.manager.ui.widgets.ImageCombo;
 import org.tizen.emulator.manager.ui.widgets.ImageLabel;
@@ -67,12 +70,15 @@ public class ComboViewItem extends AdvancedViewItem{
        protected List<String> comboOptions = new ArrayList<String>();
        protected ImageCombo combo;
        protected Image INPUTBOX_ON_IMAGE = null;
+       protected Image INPUTBOX_OFF_IMAGE = null;
        protected int COMBOBOX_WIDTH = 175;
 
-       public ComboViewItem(Item template, boolean isDeviceItem) {
-               if (!isDeviceItem) {
+       public ComboViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(lineLabelViewItem);
+               if (lineLabelViewItem == null) {
                        INDENT = 0;
                }
+
                name = template.getName();
                title = template.getTitle();
                count = 1;
@@ -124,6 +130,9 @@ public class ComboViewItem extends AdvancedViewItem{
                if (combo != null) {
                        combo.dispose();
                }
+               if (INPUTBOX_ON_IMAGE != null) {
+                       INPUTBOX_ON_IMAGE.dispose();
+               }
        }
 
        @Override
@@ -145,6 +154,7 @@ public class ComboViewItem extends AdvancedViewItem{
                combo.setArrowButtonImage(ImageResources.ARROW_DROPDOWN.getImage());
                combo.setEnabled(true);
                combo.setItemHeight(INPUTBOX_ON_IMAGE.getImageData().height);
+               combo.setLayout(new FormLayout());
 
                FormData data = new FormData();
                data.left       = new FormAttachment(0, INPUTBOX_OFFSET);

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/FileViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/FileViewItem.java
index aed5f4f..f85d50f 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/FileViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/FileViewItem.java
@@ -45,6 +45,7 @@ import org.tizen.emulator.manager.resources.ImageResources;
 import org.tizen.emulator.manager.resources.PatchImageResources;
 import org.tizen.emulator.manager.ui.MainDialog;
 import org.tizen.emulator.manager.ui.detail.item.AdvancedViewItem;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.OptionType;
 import org.tizen.emulator.manager.ui.widgets.ImageButton;
 import org.tizen.emulator.manager.ui.widgets.ImageLabel;
@@ -70,10 +71,12 @@ public class FileViewItem extends AdvancedViewItem {
        protected FileDialog fd;
        protected List<String> filters = new ArrayList<String>();
 
-       public FileViewItem(Item template, boolean isDeviceItem) {
-               if (!isDeviceItem) {
+       public FileViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(lineLabelViewItem);
+               if (lineLabelViewItem == null) {
                        INDENT = 0;
                }
+
                name = template.getName();
                title = template.getTitle();
                count = 1;

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/LabelViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/LabelViewItem.java
index a93ca66..d459ad7 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/LabelViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/LabelViewItem.java
@@ -36,6 +36,7 @@ import java.util.List;
 
 import org.tizen.emulator.manager.ui.detail.item.AdvancedViewItem;
 import org.tizen.emulator.manager.ui.detail.item.ItemType;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.detail.item.OptionType;
 import org.tizen.emulator.manager.vms.VMPropertyValue;
 import org.tizen.emulator.manager.vms.xml.template.Item;
@@ -49,11 +50,12 @@ public class LabelViewItem extends AdvancedViewItem{
        boolean isDeviceItem;
        boolean spreadOnStart = true;
 
-       public LabelViewItem(Item template, boolean isDeviceItem) {
-//             super.init();
-               if (!isDeviceItem) {
+       public LabelViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(lineLabelViewItem);
+               if (lineLabelViewItem == null) {
                        INDENT = 0;
                }
+
                title = template.getTitle();
                name = template.getName();
 //             count = template.getItem().size();

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/OnOffViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/OnOffViewItem.java
index dacda4c..edc8d7a 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/OnOffViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/OnOffViewItem.java
@@ -43,6 +43,7 @@ import org.tizen.emulator.manager.resources.ImageResources;
 import org.tizen.emulator.manager.resources.PatchImageResources;
 import org.tizen.emulator.manager.resources.StringResources;
 import org.tizen.emulator.manager.ui.detail.item.AdvancedViewItem;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.widgets.ImageButton;
 import org.tizen.emulator.manager.ui.widgets.ImageLabel;
 import org.tizen.emulator.manager.vms.VMPropertyValue;
@@ -67,10 +68,12 @@ public class OnOffViewItem extends AdvancedViewItem{
        private ImageButton onOffButton;
 
 
-       public OnOffViewItem(Item template, boolean isDeviceItem) {
-               if (!isDeviceItem) {
+       public OnOffViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(lineLabelViewItem);
+               if (lineLabelViewItem == null) {
                        INDENT = 0;
                }
+
                name = template.getName();
                title = template.getTitle();
                count = 1;

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/TextSubViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/TextSubViewItem.java
index 709b6e3..31eaa13 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/TextSubViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/TextSubViewItem.java
@@ -150,6 +150,7 @@ public class TextSubViewItem extends SubViewItem {
        @Override
        public boolean settingModifyItem(VMPropertyValue value) {
                newValue = value.getAdvancedOptionSubValue(parentItem.getName(), name);
+               text.setText(newValue);
                return false;
        }
 

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/TextViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/TextViewItem.java
index dbc8b95..b5d1ff2 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/TextViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/template/TextViewItem.java
@@ -46,6 +46,7 @@ import org.tizen.emulator.manager.resources.FontResources;
 import org.tizen.emulator.manager.resources.PatchImageResources;
 import org.tizen.emulator.manager.ui.detail.item.AdvancedViewItem;
 import org.tizen.emulator.manager.ui.detail.item.ItemChangeState;
+import org.tizen.emulator.manager.ui.detail.item.LineLabelViewItem;
 import org.tizen.emulator.manager.ui.widgets.ImageLabel;
 import org.tizen.emulator.manager.vms.VMProperty;
 import org.tizen.emulator.manager.vms.VMPropertyValue;
@@ -67,8 +68,9 @@ public class TextViewItem extends AdvancedViewItem{
        protected Image INPUTBOX_ON_IMAGE = null;
        protected Image INPUTBOX_OFF_IMAGE = null;
 
-       public TextViewItem(Item template, boolean isDeviceItem) {
-               if (!isDeviceItem) {
+       public TextViewItem(Item template, LineLabelViewItem lineLabelViewItem) {
+               super(lineLabelViewItem);
+               if (lineLabelViewItem == null) {
                        INDENT = 0;
                }
                name = template.getName();
@@ -105,7 +107,7 @@ public class TextViewItem extends AdvancedViewItem{
 
                valueLabel = new ImageLabel(compList.get(0), SWT.NONE);
                valueLabel.setEnableImage(INPUTBOX_ON_IMAGE);
-               valueLabel.setDisableImage(INPUTBOX_OFF_IMAGE);
+//             valueLabel.setDisableImage(INPUTBOX_OFF_IMAGE);
                valueLabel.setLayout(new FormLayout());
 
                FormData data = new FormData();
@@ -182,7 +184,7 @@ public class TextViewItem extends AdvancedViewItem{
 
        @Override
        public boolean settingDetailItem(VMPropertyValue value) {
-               // TODO Auto-generated method stub
+               valueLabel.setText(value.getAdvancedOptionValue(name));
                return false;
        }
 
@@ -194,13 +196,14 @@ public class TextViewItem extends AdvancedViewItem{
 
        @Override
        public void setValue(VMPropertyValue value) {
-               // TODO Auto-generated method stub
+               value.setAdvancedOption(name, newValue);
        }
 
 
        @Override
        public boolean settingModifyItem(VMPropertyValue value) {
-               // TODO Auto-generated method stub
+               newValue = value.getAdvancedOptionValue(name);
+               text.setText(newValue);
                return false;
        }