From 3064d92b558f5d0d1061033ff486f4d0233b115e Mon Sep 17 00:00:00 2001 From: Munkyu Im Date: Wed, 29 Apr 2015 19:33:54 +0900 Subject: [PATCH] net: Modify dialog UX on Windows8 no need to show host network combo box on Windows8. Change-Id: I2aeb715b911f3d705e7072aae68353522b831a0b Signed-off-by: Munkyu Im --- .../manager/ui/dialog/TapDeviceDialogForWin.java | 75 +++++++++++----------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/common-project/src/org/tizen/emulator/manager/ui/dialog/TapDeviceDialogForWin.java b/common-project/src/org/tizen/emulator/manager/ui/dialog/TapDeviceDialogForWin.java index eb006ea..2e744b6 100644 --- a/common-project/src/org/tizen/emulator/manager/ui/dialog/TapDeviceDialogForWin.java +++ b/common-project/src/org/tizen/emulator/manager/ui/dialog/TapDeviceDialogForWin.java @@ -48,6 +48,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.tizen.emulator.manager.EmulatorManager; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.resources.ColorResources; import org.tizen.emulator.manager.resources.FilePathResources; @@ -181,42 +182,42 @@ public class TapDeviceDialogForWin { nameText.setLayoutData(data); nameText.setEnabled(false); nameText.setText(TapUtil.getAvailableTapName()); - - // interface (combo select) - Label ifLabel = new Label(upperComp, SWT.NONE); - ifLabel.setFont(FontResources.DETAIL_TITLE_FONT.getFont()); - ifLabel.setText("Host Network"); - data = new FormData(); - data.left = new FormAttachment(0, 15); - data.top = new FormAttachment(0, 31); - data.width = labelWidth; - data.height = 20; - ifLabel.setLayoutData(data); - - combo = new ImageCombo(upperComp, SWT.NONE); - combo.setImage(WSTATE.NORMAL, INPUTBOX_ON_IMAGE); - combo.setImage(WSTATE.PUSH, INPUTBOX_ON_IMAGE); - combo.setImage(WSTATE.HOVER, INPUTBOX_ON_IMAGE); - combo.setImage(WSTATE.DISABLE_ON, INPUTBOX_ON_IMAGE); - - combo.setArrowButtonImage(ImageResources.ARROW_DROPDOWN.getImage()); - combo.setEnabled(true); - combo.setItemHeight(INPUTBOX_ON_IMAGE.getImageData().height); - combo.setLayout(new FormLayout()); - - data = new FormData(); - data.left = new FormAttachment(ifLabel, 0); - data.right = new FormAttachment(100, -5); - data.top = new FormAttachment(0, 31); - data.width = INPUTBOX_ON_IMAGE.getImageData().width; - data.height = INPUTBOX_ON_IMAGE.getImageData().height; - combo.setLayoutData(data); - - for (String str : getInterfaceList()) { - combo.add(str); + if (!EmulatorManager.isWin8()) { + // interface (combo select) + Label ifLabel = new Label(upperComp, SWT.NONE); + ifLabel.setFont(FontResources.DETAIL_TITLE_FONT.getFont()); + ifLabel.setText("Host Network"); + data = new FormData(); + data.left = new FormAttachment(0, 15); + data.top = new FormAttachment(0, 31); + data.width = labelWidth; + data.height = 20; + ifLabel.setLayoutData(data); + + combo = new ImageCombo(upperComp, SWT.NONE); + combo.setImage(WSTATE.NORMAL, INPUTBOX_ON_IMAGE); + combo.setImage(WSTATE.PUSH, INPUTBOX_ON_IMAGE); + combo.setImage(WSTATE.HOVER, INPUTBOX_ON_IMAGE); + combo.setImage(WSTATE.DISABLE_ON, INPUTBOX_ON_IMAGE); + + combo.setArrowButtonImage(ImageResources.ARROW_DROPDOWN.getImage()); + combo.setEnabled(true); + combo.setItemHeight(INPUTBOX_ON_IMAGE.getImageData().height); + combo.setLayout(new FormLayout()); + + data = new FormData(); + data.left = new FormAttachment(ifLabel, 0); + data.right = new FormAttachment(100, -5); + data.top = new FormAttachment(0, 31); + data.width = INPUTBOX_ON_IMAGE.getImageData().width; + data.height = INPUTBOX_ON_IMAGE.getImageData().height; + combo.setLayoutData(data); + + for (String str : getInterfaceList()) { + combo.add(str); + } + combo.select(0); } - combo.select(0); - } private static void makeLowerComposite() { @@ -285,7 +286,9 @@ public class TapDeviceDialogForWin { // Check Tap duplication // if (TapUtil.nameNotExist(nameText.getText())) { tapName = nameText.getText(); - ifName = combo.getText(); + if (!EmulatorManager.isWin8()) { + ifName = combo.getText(); + } dialog.close(); TapUtil.createTapDevice(tapName, ifName, comboViewItem); -- 2.7.4