VMListTable: delete 'reset' and 'export as' button

- you can see 'reset' and 'export as' menu in context menu
- add normal state arrow button to combo box

Change-Id: I3e84a2b0d8e23df71894d1ebf5cbd3b64ff14931
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java
index 35c0dfb..ec19656 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java
@@ -78,8 +78,6 @@ public class VMListTable {
 
        private List<ProfileButton> profileButtonList;
 
-       private ImageButton resetButton;
-       private ImageButton exportButton;
        private ImageButton deleteButton;
        private ImageButton modifyButton;
        private ImageButton launchButton;
@@ -533,38 +531,6 @@ public class VMListTable {
        }
 
        private void makeVMButton() {
-               resetButton = new ImageButton(comp, SWT.PUSH);
-               resetButton.setBackground(null);
-               resetButton.setImages(ImageResources.BUTTON_RESET_NORMAL.getImage(),
-                               ImageResources.BUTTON_RESET_HOVER.getImage(),
-                               ImageResources.BUTTON_RESET_HOVER.getImage(),
-                               ImageResources.BUTTON_RESET_DISABLE.getImage());
-               resetButton.addListener(SWT.Selection, new Listener() {
-                       @Override
-                       public void handleEvent(Event event) {
-                               if (event.type == SWT.Selection) {
-                                       resetVMList();
-                               }
-                       }
-               });
-               resetButton.setToolTipText("reset emulator");
-
-               exportButton = new ImageButton(comp, SWT.PUSH);
-               exportButton.setBackground(null);
-               exportButton.setImages(ImageResources.BUTTON_EXPORT_NORMAL.getImage(),
-                               ImageResources.BUTTON_EXPORT_HOVER.getImage(),
-                               ImageResources.BUTTON_EXPORT_HOVER.getImage(),
-                               ImageResources.BUTTON_EXPORT_DISABLE.getImage());
-               exportButton.addListener(SWT.Selection, new Listener() {
-                       @Override
-                       public void handleEvent(Event event) {
-                               if (event.type == SWT.Selection) {
-                                       exportEmulatorImage();
-                               }
-                       }
-               });
-               exportButton.setToolTipText("create new base image");
-
                deleteButton = new ImageButton(comp, SWT.PUSH);
                deleteButton.setBackground(null);
                deleteButton.setImages(ImageResources.BUTTON_DELETE_NORMAL.getImage(),
@@ -613,8 +579,6 @@ public class VMListTable {
                });
                launchButton.setToolTipText("launch emulator");
 
-               resetButton.setEnabled(false);
-               exportButton.setEnabled(false);
                deleteButton.setEnabled(false);
                modifyButton.setEnabled(false);
                launchButton.setEnabled(false);
@@ -821,20 +785,6 @@ public class VMListTable {
                deleteButton.setLayoutData(workerButtonData);
 
                workerButtonData = new FormData();
-               workerButtonData.right = new FormAttachment(deleteButton, -17);
-               workerButtonData.top = new FormAttachment(0, 13);
-               workerButtonData.width = BUTTON_WIDTH;
-               workerButtonData.height = BUTTON_HEIGHT;
-               exportButton.setLayoutData(workerButtonData);
-
-               workerButtonData = new FormData();
-               workerButtonData.right = new FormAttachment(exportButton, -5);
-               workerButtonData.top = new FormAttachment(0, 13);
-               workerButtonData.width = BUTTON_WIDTH;
-               workerButtonData.height = BUTTON_HEIGHT;
-               resetButton.setLayoutData(workerButtonData);
-
-               workerButtonData = new FormData();
                workerButtonData.top = new FormAttachment(0, 45);
                workerButtonData.left = new FormAttachment(0, 10);
                workerButtonData.right = new FormAttachment(100, -10);
@@ -845,22 +795,16 @@ public class VMListTable {
        private void tableSelected() {
                int count = table.getSelectionCount();
                if (count == 0) {
-                       resetButton.setEnabled(false);
-                       exportButton.setEnabled(false);
                        deleteButton.setEnabled(false);
                        modifyButton.setEnabled(false);
                        launchButton.setEnabled(false);
                } else if (count == 1) {
                        VMProperty prop = (VMProperty)table.getSelection()[0].getData();
                        if (prop.isRunning()) {
-                               resetButton.setEnabled(false);
-                               exportButton.setEnabled(false);
                                deleteButton.setEnabled(false);
                                modifyButton.setEnabled(false);
                                launchButton.setEnabled(false);
                        } else {
-                               resetButton.setEnabled(true);
-                               exportButton.setEnabled(true);
                                deleteButton.setEnabled(true);
                                modifyButton.setEnabled(true);
                                launchButton.setEnabled(true);
@@ -874,14 +818,10 @@ public class VMListTable {
                                }
                        }
                        if (isRunning == table.getSelectionCount()) {
-                               resetButton.setEnabled(false);
-                               exportButton.setEnabled(false);
                                deleteButton.setEnabled(false);
                                modifyButton.setEnabled(false);
                                launchButton.setEnabled(false);
                        } else {
-                               resetButton.setEnabled(true);
-                               exportButton.setEnabled(false);
                                deleteButton.setEnabled(true);
                                modifyButton.setEnabled(false);
                                launchButton.setEnabled(false);

diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMCombo.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMCombo.java
index a3c0c5e..6c19419 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMCombo.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMCombo.java
@@ -74,6 +74,7 @@ public class CreateVMCombo extends Canvas {
        private int itemHeight = 0;
 
        private Image arrowButtonImage = null;
+       private Image arrowHoverButtonImage = null;
 
        public CreateVMCombo(Composite parent, int style) {
                super(parent, style);
@@ -106,7 +107,8 @@ public class CreateVMCombo extends Canvas {
                images.add(WSTATE.DISABLE_OFF.getId(),
                                PatchImageResources.getNinePatchButtonImage(width, height, nomalInfo));
 
-               arrowButtonImage = ImageResources.DROP_DOWN_ARROW_HOVER.getImage();
+               arrowButtonImage = ImageResources.DROP_DOWN_ARROW_NORMAL.getImage();
+               arrowHoverButtonImage = ImageResources.DROP_DOWN_ARROW_HOVER.getImage();
 
                this.setBackground(ColorResources.WHITE.getColor());
                this.setForeground(ColorResources.CREATE_VM_COMBO_FONT.getColor());
@@ -402,7 +404,9 @@ public class CreateVMCombo extends Canvas {
                                int h = arrowButtonImage.getImageData().height;
                                x += rect.width - w - ARROW_OFFSET;
                                y += (rect.height - h) / 2;
-                               e.gc.drawImage(arrowButtonImage, x, y);
+                               e.gc.drawImage((state == WSTATE.NORMAL
+                                               ? arrowButtonImage
+                                               : arrowHoverButtonImage), x, y);
                                Rectangle clipping = new Rectangle(rect.x, rect.y,
                                                rect.width - w - ARROW_OFFSET - 2, rect.height);
                                e.gc.setClipping(clipping);