From 46b1dc2c4fdf3d996e94dc59504e6bf533523aa8 Mon Sep 17 00:00:00 2001 From: jihye kim Date: Thu, 5 Jul 2012 19:43:57 +0900 Subject: [PATCH] [Title] remove setting count of touch poinat [Type] work [Module] emulator manager [Priority] major [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- .../tizen/emulator/manager/console/ActionList.java | 4 ++++ .../emulator/manager/ui/detail/VMPropertyView.java | 22 +++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/org/tizen/emulator/manager/console/ActionList.java b/src/org/tizen/emulator/manager/console/ActionList.java index aa705a2..b1e33c0 100644 --- a/src/org/tizen/emulator/manager/console/ActionList.java +++ b/src/org/tizen/emulator/manager/console/ActionList.java @@ -359,8 +359,10 @@ class Create extends Action { commandList.add(new Command("g", Actions.OP_GLACCELERATION, "Select enable or disable hardware GL acceleration.(yes | no)", property.isGLAcceleration ? "yes" : "no", false, true)); + /* commandList.add(new Command("t", Actions.OP_MAXTOUCH, "Set count of multi touch point.(1 ~ 3)", Integer.toString(property.maxTouchCount), false, true)); + */ commandList.add(new AddOptions("a", Actions.OP_ADDOPTION, "Add other qemu's options.", "", false, true)); } @@ -416,8 +418,10 @@ class Modify extends Action { commandList.add(new Command("g", Actions.OP_GLACCELERATION, "Select enable or disable hardware GL acceleration.(yes | no)", property.isGLAcceleration ? "yes" : "no", false, true)); + /* commandList.add(new Command("t", Actions.OP_MAXTOUCH, "Set count of multi touch point.(1 or 2)", Integer.toString(property.maxTouchCount), false, true)); + */ commandList.add(new AddOptions("a", Actions.OP_ADDOPTION, "Add other qemu's options.", "", false, true)); } diff --git a/src/org/tizen/emulator/manager/ui/detail/VMPropertyView.java b/src/org/tizen/emulator/manager/ui/detail/VMPropertyView.java index 5a19d49..616a0eb 100644 --- a/src/org/tizen/emulator/manager/ui/detail/VMPropertyView.java +++ b/src/org/tizen/emulator/manager/ui/detail/VMPropertyView.java @@ -230,7 +230,7 @@ public class VMPropertyView { createFileShareArea(table); createHWVirtualArea(table); createGLAcceleArea(table); - createTouchArea(table); + //createTouchArea(table); settingModifyTableEditor(); } @@ -246,7 +246,7 @@ public class VMPropertyView { createFileShareArea(table); createHWVirtualArea(table); createGLAcceleArea(table); - createTouchArea(table); + //createTouchArea(table); settingCreateTableEditor(); } @@ -300,9 +300,13 @@ public class VMPropertyView { editor.grabHorizontal = true; editor.setEditor(widget.GLAcceleCombo, widget.itemList.get(DItem.GLAccele.ordinal()), 1); + /* editor = new TableEditor(table); editor.grabHorizontal = true; editor.setEditor(widget.TouchSpinner, widget.itemList.get(DItem.TouchType.ordinal()), 1); + */ + + widget.itemList.get(DItem.TouchType.ordinal()).setText(1, String.valueOf(oldValue.maxTouchCount)); } private void settingCreateTableEditor() { @@ -352,9 +356,12 @@ public class VMPropertyView { editor.grabHorizontal = true; editor.setEditor(widget.GLAcceleCombo, widget.itemList.get(CItem.GLAccele.ordinal()), 1); + /* editor = new TableEditor(table); editor.grabHorizontal = true; editor.setEditor(widget.TouchSpinner, widget.itemList.get(CItem.TouchType.ordinal()), 1); + */ + widget.itemList.get(DItem.TouchType.ordinal()).setText(1, String.valueOf(oldValue.maxTouchCount)); } public static final int MAX_NAME_LEN = 20; @@ -694,9 +701,10 @@ public class VMPropertyView { }); } +/* private void createTouchArea(Table table) { widget.TouchSpinner = new Spinner(table, SWT.BORDER); - widget.TouchSpinner.setValues(oldValue.maxTouchCount, 1, 3, 0, 1, 1); + widget.TouchSpinner.setValues(oldValue.maxTouchCount, 3, 3, 0, 1, 1); createTouchListener(); } @@ -706,12 +714,16 @@ public class VMPropertyView { @Override public void modifyText(ModifyEvent e) { newValue.maxTouchCount = widget.TouchSpinner.getSelection(); + if (newValue.maxTouchCount != 3) { + newValue.maxTouchCount = 3; + } if (!isCreateMode) { checkModifyState(); } } }); } +*/ private void checkModifyState() { if (!newValue.equals(oldValue)) { @@ -770,7 +782,7 @@ class VMViewWidget { public Combo HWVirtualCombo; public Combo GLAcceleCombo; - public Spinner TouchSpinner; + //public Spinner TouchSpinner; public Button cancelButton; public Button confirmButton; @@ -789,6 +801,6 @@ class VMViewWidget { selectShareFolderButton.dispose(); HWVirtualCombo.dispose(); GLAcceleCombo.dispose(); - TouchSpinner.dispose(); + //TouchSpinner.dispose(); } } -- 2.7.4