From e48947da48686120c1397b3034d23b26dc097d33 Mon Sep 17 00:00:00 2001 From: "jihye424.kim" Date: Thu, 3 Dec 2015 14:05:37 +0900 Subject: [PATCH] platform item: add detail mode item - detail mode: display platform name, not make combo box Change-Id: I34e336a8a094b2c7e03fc3076e5e4e4166a1781a Signed-off-by: jihye424.kim --- .../item/modify/baseimage/PlatformItem.java | 67 +++++++++++----------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/PlatformItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/PlatformItem.java index bc3ecbb..056421f 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/PlatformItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/PlatformItem.java @@ -85,9 +85,14 @@ public class PlatformItem extends ComboItem { button32 = new ImageButton(item.getBody(), SWT.RADIO); button64 = new ImageButton(item.getBody(), SWT.RADIO); - createCombo(item, COMBO_WIDTH); + if (isDetailMode()) { + createDetailItem(selectedPlatform.getName()); + selectArchitecture(); + } else { + createCombo(item, COMBO_WIDTH); + initPlatformCombo(); + } - initPlatformCombo(); settingRadioButton(); } @@ -112,13 +117,13 @@ public class PlatformItem extends ComboItem { // set layout int top = (item.getItemHeight() - 15) / 2; FormData data = new FormData(); - data.left = new FormAttachment(comboBox, 10); + data.right = new FormAttachment(100, 0); data.top = new FormAttachment(0, top); - button32.setLayoutData(data); + button64.setLayoutData(data); data = new FormData(); - data.left = new FormAttachment(button32, 5); + data.right = new FormAttachment(button64, 0); data.top = new FormAttachment(0, top); - button64.setLayoutData(data); + button32.setLayoutData(data); if (getItemListComp().isDetailMode()) { button32.setEnabled(false, button32.isSelection()); @@ -158,27 +163,21 @@ public class PlatformItem extends ComboItem { this.comboBox.clear(); - if (getItemListComp().isDetailMode()) { - addComboItem(selectedPlatform.getName(), selectedPlatform); - comboBox.select(0); - comboBox.setEnabled(false); - } else { - for (Platform platform : profile.getPlatformList()) { - addComboItem(platform.getName(), platform); - } + for (Platform platform : profile.getPlatformList()) { + addComboItem(platform.getName(), platform); + } - if (!comboBox.getItemList().isEmpty()) { - if (selectedPlatform != null && selectedPlatform.getProfile().equals(profile.getName())) { - for (int i = 0; i < comboBox.getItemList().size(); i++) { - if (selectedPlatform.getName().equals(comboBox.getItemList().get(i))) { - // call item selected - selectComboItem(i); - break; - } + if (!comboBox.getItemList().isEmpty()) { + if (selectedPlatform != null && selectedPlatform.getProfile().equals(profile.getName())) { + for (int i = 0; i < comboBox.getItemList().size(); i++) { + if (selectedPlatform.getName().equals(comboBox.getItemList().get(i))) { + // call item selected + selectComboItem(i); + break; } - } else { - selectComboItem(0); } + } else { + selectComboItem(0); } } } @@ -186,6 +185,15 @@ public class PlatformItem extends ComboItem { @Override public void itemSelected(ComboBox comboBox) { selectedPlatform = (Platform)getSelectedData(); + selectArchitecture(); + // TODO + getItemListComp().checkValid(); + } + + private void selectArchitecture() { + if (selectedPlatform == null) { + return; + } button32.setEnabled(false, false); button64.setEnabled(false, false); @@ -207,8 +215,6 @@ public class PlatformItem extends ComboItem { button32.setSelection(arch.getBit() == 32); button64.setSelection(arch.getBit() == 64); - // TODO - getItemListComp().checkValid(); } @Override @@ -232,13 +238,8 @@ public class PlatformItem extends ComboItem { return; } arch = temp; - button32.setSelection(false); - button64.setSelection(false); - if (arch.getBit() == 32) { - button32.setSelection(true); - } else { - button64.setSelection(true); - } + button32.setSelection(arch.getBit() == 32); + button64.setSelection(arch.getBit() == 64); } } -- 2.7.4