From: jihye424.kim Date: Wed, 14 Oct 2015 09:07:57 +0000 (+0900) Subject: Modify Item: add 'DETAIL' mode X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8fe5d859b3e76dce554cb4c5829841f0c94e6466;p=sdk%2Femulator%2Femulator-manager.git Modify Item: add 'DETAIL' mode - 'DETALI' mode: dialog display information of property Change-Id: Icc383960a16d5a87da802541b72a188fbea2c59e Signed-off-by: jihye424.kim --- diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/DIALOG_MODE.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/DIALOG_MODE.java index 98b1711..90cb3e3 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/DIALOG_MODE.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/DIALOG_MODE.java @@ -31,5 +31,5 @@ package org.tizen.emulator.manager.ui.renewal.dialog; public enum DIALOG_MODE { - CREATE, MODIFY, CLONE; + CREATE, MODIFY, CLONE, DETAIL; } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/CheckBoxSubItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/CheckBoxSubItem.java index 4a2f30e..11635eb 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/CheckBoxSubItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/CheckBoxSubItem.java @@ -44,6 +44,7 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.tizen.emulator.manager.renewal.resources.ColorResources; import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.widgets.CheckBoxButton; @@ -95,6 +96,9 @@ public class CheckBoxSubItem { checkBox.setLayoutData(data); checkBox.setSelection(isChecked); + if (parentItem.getDialog().getDialogMode() == DIALOG_MODE.DETAIL) { + checkBox.setEnabled(false); + } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/DisplayItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/DisplayItem.java index 30d1681..3af6a77 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/DisplayItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/DisplayItem.java @@ -46,7 +46,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.tizen.emulator.manager.logging.EMLogger; +import org.tizen.emulator.manager.platform.Skin; import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubTreeModifyItem; @@ -93,12 +95,16 @@ public class DisplayItem extends ModifyDialogItem { item.create(); item.setBodyLayoutDefault(); - createResolutionComboItem(); - createResolutionTextItem(); - createSizeItem(); - createSkinItem(); + if (getDialog().getDialogMode() == DIALOG_MODE.DETAIL) { + createDisplayInfomation(); + } else { + createResolutionComboItem(); + createResolutionTextItem(); + createSizeItem(); + createSkinItem(); - initResolutionCombo(); + initResolutionCombo(); + } } @@ -114,6 +120,12 @@ public class DisplayItem extends ModifyDialogItem { displaySize = String.valueOf(value.getDisplaySize()); displayWidth = String.valueOf(value.getDisplayWidth()); displayHeight = String.valueOf(value.getDisplayHeight()); + + // for detail information + displayDPI = String.valueOf(value.getDisplayDPI()); + if (value.getSkin() != null) { + skin = value.getSkin(); + } } @@ -140,7 +152,54 @@ public class DisplayItem extends ModifyDialogItem { private String displayWidth = ""; private String displayHeight = ""; private String displaySize = ""; + private String displayDPI = ""; + private Skin skin = null; + private void createDisplayInfomation() { + Composite comp = createSubComp(1, TITLE_RESOLUTION); + // resolution label + FormData data = new FormData(); + data.left = new FormAttachment(0, BODY_MARGIN_LEFT); + data.top = new FormAttachment(0, WIDGET_TOP); + data.width = COMBO_WIDTH; + data.height = ModifyItem.WIDGET_HEIGHT; + Canvas canvas = new Canvas(comp, SWT.NONE); + canvas.setLayoutData(data); + WidgetHelper.drawText(canvas, resolution.getStrTypeValue(), SWT.NONE); + + comp = createSubComp(1, TITLE_SIZE); + // "inch" label + data = new FormData(); + data.left = new FormAttachment(0, BODY_MARGIN_LEFT); + data.top = new FormAttachment(0, WIDGET_TOP); + data.width = COMBO_WIDTH; + data.height = ModifyItem.WIDGET_HEIGHT; + canvas = new Canvas(comp, SWT.NONE); + canvas.setLayoutData(data); + WidgetHelper.drawText(canvas, displaySize + " inch" + " (DPI: " + displayDPI + ")" , SWT.NONE); + + comp = createSubComp(1, TITLE_SKIN); + // "inch" label + data = new FormData(); + data.left = new FormAttachment(0, BODY_MARGIN_LEFT); + data.top = new FormAttachment(0, WIDGET_TOP); + data.width = COMBO_WIDTH; + data.height = ModifyItem.WIDGET_HEIGHT; + canvas = new Canvas(comp, SWT.NONE); + canvas.setLayoutData(data); + WidgetHelper.drawText(canvas, skin == null ? "" : skin.getName(), SWT.NONE); + + comp = createSubComp(1, "Skin Path"); + // "inch" label + data = new FormData(); + data.left = new FormAttachment(0, BODY_MARGIN_LEFT); + data.top = new FormAttachment(0, WIDGET_TOP); + data.width = COMBO_WIDTH; + data.height = ModifyItem.WIDGET_HEIGHT; + canvas = new Canvas(comp, SWT.NONE); + canvas.setLayoutData(data); + WidgetHelper.drawText(canvas, skin == null ? "" : skin.getPath(), SWT.NONE); + } private void createResolutionComboItem() { Composite comp = createSubComp(1, TITLE_RESOLUTION); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProcessorItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProcessorItem.java index 9d503d5..3f75ef4 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProcessorItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProcessorItem.java @@ -31,15 +31,22 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.common; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.job.CheckVT; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubTreeModifyItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeModifyItem; import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox; +import org.tizen.emulator.manager.ui.renewal.widgets.WidgetHelper; import org.tizen.emulator.manager.vms.CPU; public class ProcessorItem extends ComboItem { @@ -74,9 +81,24 @@ public class ProcessorItem extends ComboItem { item.setItemTitle(createIconTitle(item, TITLE_ICON_RESOURCE)); item.create(); - createCombo(item, COMBO_WIDTH); - initProcessorCombo(); + if (getDialog().getDialogMode() == DIALOG_MODE.DETAIL) { + createDisplayInfomation(); + } else { + createCombo(item, COMBO_WIDTH); + initProcessorCombo(); + } + } + private void createDisplayInfomation() { + item.getBody().setLayout(new FormLayout()); + FormData data = new FormData(); + data.left = new FormAttachment(0, ModifyItem.BODY_MARGIN_LEFT); + data.top = new FormAttachment(0, ModifyItem.WIDGET_TOP); + data.width = COMBO_WIDTH; + data.height = ModifyItem.WIDGET_HEIGHT; + Canvas canvas = new Canvas(item.getBody(), SWT.NONE); + canvas.setLayoutData(data); + WidgetHelper.drawText(canvas, String.valueOf(cpuNum), SWT.NONE); } private void initProcessorCombo() { diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/RamSizeItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/RamSizeItem.java index e0c90b4..d6e9b95 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/RamSizeItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/RamSizeItem.java @@ -33,10 +33,12 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.common; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubTreeModifyItem; @@ -76,8 +78,26 @@ public class RamSizeItem extends ComboItem { item.setItemTitle(createIconTitle(item, TITLE_ICON_RESOURCE)); item.create(); - createCombo(item, COMBO_WIDTH); - initRamSizeCombo(); + if (getDialog().getDialogMode() == DIALOG_MODE.DETAIL) { + createDisplayInfomation(); + } else { + createCombo(item, COMBO_WIDTH); + initRamSizeCombo(); + addLabel(); + } + } + + private void createDisplayInfomation() { + item.getBody().setLayout(new FormLayout()); + FormData data = new FormData(); + data.left = new FormAttachment(0, ModifyItem.BODY_MARGIN_LEFT); + data.top = new FormAttachment(0, ModifyItem.WIDGET_TOP); + data.width = COMBO_WIDTH; + data.height = ModifyItem.WIDGET_HEIGHT; + Canvas canvas = new Canvas(item.getBody(), SWT.NONE); + canvas.setLayoutData(data); + WidgetHelper.drawText(canvas, String.valueOf(ramSize), SWT.NONE); + addLabel(); } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextInputBoxItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextInputBoxItem.java index 1e5f261..e0e046f 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextInputBoxItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextInputBoxItem.java @@ -80,7 +80,8 @@ public abstract class TextInputBoxItem extends ModifyDialogItem { protected void makeBody(int textBoxWidth) { item.setBodyLayoutDefault(); - if (getDialog().getDialogMode() == DIALOG_MODE.MODIFY) { + if (getDialog().getDialogMode() == DIALOG_MODE.MODIFY + || getDialog().getDialogMode() == DIALOG_MODE.DETAIL) { createTextLabel(); } else { createTextBox(textBoxWidth); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/PropertyValue.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/PropertyValue.java index 565204d..bc649be 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/PropertyValue.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/PropertyValue.java @@ -38,8 +38,10 @@ import java.util.List; import org.tizen.emulator.manager.devices.DeviceTemplateValue; import org.tizen.emulator.manager.devices.SubDevice; import org.tizen.emulator.manager.devices.SubDeviceItem; +import org.tizen.emulator.manager.platform.Skin; import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckItemData; import org.tizen.emulator.manager.vms.RESOLUTION; +import org.tizen.emulator.manager.vms.SKIN_SHAPE; import org.tizen.emulator.manager.vms.VMPropertyValue; public class PropertyValue { @@ -204,6 +206,34 @@ public class PropertyValue { return 0; } + public int getDisplayDPI() { + if (isVMValue()) { + + } else if (isTemplateValue()) { + return templateValue.getDisplayDPI(); + } + return 0; + } + + public String getSkinShape() { + if (isVMValue()) { + + } else if (isTemplateValue()) { + return templateValue.getSkinShape().toString(); + } + + return SKIN_SHAPE.SQUARE.toString(); + } + + public Skin getSkin() { + if (isVMValue()) { + + } else if (isTemplateValue()) { + return templateValue.getSkin(); + } + + return null; + } public int getRamSize() { if (isVMValue()) {