image resources: add new image resources

- add new image resources
-- disable check box, radio button, text delete button ...

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

diff --git a/resource/renewal/res/btn_checkbox_checked_disable.png b/resource/renewal/res/btn_checkbox_checked_disable.png
new file mode 100644 (file)
index 0000000..4dce7d1
Binary files /dev/null and b/resource/renewal/res/btn_checkbox_checked_disable.png differ

diff --git a/resource/renewal/res/btn_checkbox_unchecked_disable.png b/resource/renewal/res/btn_checkbox_unchecked_disable.png
new file mode 100644 (file)
index 0000000..eb45a86
Binary files /dev/null and b/resource/renewal/res/btn_checkbox_unchecked_disable.png differ

diff --git a/resource/renewal/res/btn_radio_off_disable.png b/resource/renewal/res/btn_radio_off_disable.png
new file mode 100644 (file)
index 0000000..ab633e6
Binary files /dev/null and b/resource/renewal/res/btn_radio_off_disable.png differ

diff --git a/resource/renewal/res/btn_radio_off_nml.png b/resource/renewal/res/btn_radio_off_nml.png
new file mode 100644 (file)
index 0000000..53581b8
Binary files /dev/null and b/resource/renewal/res/btn_radio_off_nml.png differ

diff --git a/resource/renewal/res/btn_radio_on_disable.png b/resource/renewal/res/btn_radio_on_disable.png
new file mode 100644 (file)
index 0000000..e0ce4e5
Binary files /dev/null and b/resource/renewal/res/btn_radio_on_disable.png differ

diff --git a/resource/renewal/res/btn_radio_on_nml.png b/resource/renewal/res/btn_radio_on_nml.png
new file mode 100644 (file)
index 0000000..08a4680
Binary files /dev/null and b/resource/renewal/res/btn_radio_on_nml.png differ

diff --git a/resource/renewal/res/btn_run_disable.png b/resource/renewal/res/btn_run_disable.png
index d2a9fd6..444647b 100644 (file)
Binary files a/resource/renewal/res/btn_run_disable.png and b/resource/renewal/res/btn_run_disable.png differ

diff --git a/resource/renewal/res/btn_run_hover.png b/resource/renewal/res/btn_run_hover.png
index 3f74ebc..5fb29ab 100644 (file)
Binary files a/resource/renewal/res/btn_run_hover.png and b/resource/renewal/res/btn_run_hover.png differ

diff --git a/resource/renewal/res/btn_run_nml.png b/resource/renewal/res/btn_run_nml.png
index 7ff352b..6f9568d 100644 (file)
Binary files a/resource/renewal/res/btn_run_nml.png and b/resource/renewal/res/btn_run_nml.png differ

diff --git a/resource/renewal/res/btn_text_delete_hover.png b/resource/renewal/res/btn_text_delete_hover.png
new file mode 100644 (file)
index 0000000..14f4cc2
Binary files /dev/null and b/resource/renewal/res/btn_text_delete_hover.png differ

diff --git a/resource/renewal/res/btn_text_delete_nml.png b/resource/renewal/res/btn_text_delete_nml.png
new file mode 100644 (file)
index 0000000..f480f05
Binary files /dev/null and b/resource/renewal/res/btn_text_delete_nml.png differ

diff --git a/resource/renewal/res/icon_delete_btn.png b/resource/renewal/res/icon_delete_btn.png
deleted file mode 100644 (file)
index f9328ab..0000000
Binary files a/resource/renewal/res/icon_delete_btn.png and /dev/null differ

diff --git a/resource/renewal/res/icon_off.png b/resource/renewal/res/icon_off.png
new file mode 100644 (file)
index 0000000..91aa0c1
Binary files /dev/null and b/resource/renewal/res/icon_off.png differ

diff --git a/resource/renewal/res/icon_on.png b/resource/renewal/res/icon_on.png
index 29c75a1..bf93e68 100644 (file)
Binary files a/resource/renewal/res/icon_on.png and b/resource/renewal/res/icon_on.png differ

diff --git a/resource/renewal/res/icon_selected_mobile.png b/resource/renewal/res/icon_selected_mobile.png
index 427c37e..e0df6cb 100644 (file)
Binary files a/resource/renewal/res/icon_selected_mobile.png and b/resource/renewal/res/icon_selected_mobile.png differ

diff --git a/resource/renewal/res/icon_selected_tv.png b/resource/renewal/res/icon_selected_tv.png
index 4c61d8c..8f41958 100644 (file)
Binary files a/resource/renewal/res/icon_selected_tv.png and b/resource/renewal/res/icon_selected_tv.png differ

diff --git a/resource/renewal/res/icon_selected_wearable_round.png b/resource/renewal/res/icon_selected_wearable_round.png
index 9ffb676..d2d7383 100644 (file)
Binary files a/resource/renewal/res/icon_selected_wearable_round.png and b/resource/renewal/res/icon_selected_wearable_round.png differ

diff --git a/resource/renewal/res/icon_selected_wearable_square.png b/resource/renewal/res/icon_selected_wearable_square.png
index 9dc3872..d892f7f 100644 (file)
Binary files a/resource/renewal/res/icon_selected_wearable_square.png and b/resource/renewal/res/icon_selected_wearable_square.png differ

diff --git a/resource/renewal/res/img_title_yourvmlist.png b/resource/renewal/res/img_title_yourvmlist.png
index 88b7ea9..5d723f3 100644 (file)
Binary files a/resource/renewal/res/img_title_yourvmlist.png and b/resource/renewal/res/img_title_yourvmlist.png differ

diff --git a/src/org/tizen/emulator/manager/renewal/resources/ImageResources.java b/src/org/tizen/emulator/manager/renewal/resources/ImageResources.java
index 8b805ce..7b0a5f5 100644 (file)
--- a/src/org/tizen/emulator/manager/renewal/resources/ImageResources.java
+++ b/src/org/tizen/emulator/manager/renewal/resources/ImageResources.java
@@ -233,6 +233,8 @@ public enum ImageResources {
        BUTTON_FILTER_WEARABLE_SELECTED_HOVER("btn_filter_wearable_selected_hover"),
        BUTTON_FILTER_WEARABLE_UNSELECTED_HOVER("btn_filter_wearable_unselected_hover"),
        BUTTON_FILTER_WEARABLE_UNSELECTED_NORMAL("btn_filter_wearable_unselected_nml"),
+       BUTTON_TEXT_DELETE_NORMAL("btn_text_delete_nml"),
+       BUTTON_TEXT_DELETE_HOVER("btn_text_delete_hover"),
        ICON_TYPE_MOBILE("icon_type_mobile"),
        ICON_TYPE_TV("icon_type_tv"),
        ICON_TYPE_WEARABLE("icon_type_wearable"),
@@ -246,11 +248,11 @@ public enum ImageResources {
        ICON_FILE_SHARE_ON("icon_file_sharing_on"),
        ICON_FILE_SHARE_OFF("icon_file_sharing_off"),
        ICON_RUNNING("icon_on"),
+       ICON_NOT_RUNNING("icon_off"),
        ICON_CREATE_MOBILE("icon_create_mobile"),
        ICON_CREATE_NEW_VM("icon_create_new_vm"),
        ICON_CREATE_TV("icon_create_tv"),
        ICON_CREATE_WEARABLE("icon_create_wearable"),
-       ICON_DELETE_BUTTON("icon_delete_btn"),
 
        // Modify item title icon
        ICON_TITLE_VMNAME("icon_title_vmname"),
@@ -306,12 +308,16 @@ public enum ImageResources {
        // checkbox
        CHECKBOX_UNCHECKED_NML("btn_checkbox_unchecked_nml"),
        CHECKBOX_UNCHECKED_HOVER("btn_checkbox_unchecked_hover"),
+       CHECKBOX_UNCHECKED_DISABLE("btn_checkbox_unchecked_disable"),
        CHECKBOX_CHECKED_NML("btn_checkbox_checked_nml"),
        CHECKBOX_CHECKED_HOVER("btn_checkbox_checked_hover"),
+       CHECKBOX_CHECKED_DISABLE("btn_checkbox_checked_disable"),
 
        // radio buttonr
-       RADIO_BUTTON_OFF("radio_off"),
-       RADIO_BUTTON_ON("radio_on");
+       RADIO_BUTTON_OFF("btn_radio_off_nml"),
+       RADIO_BUTTON_ON("btn_radio_on_nml"),
+       RADIO_BUTTON_OFF_DISABLE("btn_radio_off_disable"),
+       RADIO_BUTTON_ON_DISABLE("btn_radio_on_disable");
 
 
        String name;

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 c8962d4..8fffdba 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java
@@ -229,7 +229,7 @@ public class VMListTable {
                if (property.isRunning()) {
                        item.setImage(0, ImageResources.ICON_RUNNING.getImage());
                } else {
-                       item.setImage(0, null);
+                       item.setImage(0, ImageResources.ICON_NOT_RUNNING.getImage());
                }
                item.setText(2, value.vmsName);
                item.setText(3, value.device != null

diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java
index 8df58ac..7f9027c 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java
@@ -371,7 +371,7 @@ public class VMListTableViewer extends AbstractTableViewer {
                FormData workerButtonData = new FormData();
                workerButtonData.right = new FormAttachment(100, -10);
                workerButtonData.top = new FormAttachment(0, 13);
-               workerButtonData.width = BUTTON_WIDTH;
+               workerButtonData.width = 74;
                workerButtonData.height = BUTTON_HEIGHT;
                launchButton.setLayoutData(workerButtonData);
 

diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/CheckBoxButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/CheckBoxButton.java
index 4083d47..2dcb841 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/renewal/widgets/CheckBoxButton.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/CheckBoxButton.java
@@ -51,8 +51,10 @@ import org.tizen.emulator.manager.ui.table.Helper;
 public class CheckBoxButton extends Canvas {
        private Image image = null;
        private Image imageHover = null;
+       private Image imageDisable = null;
        private Image checkedImage = null;
        private Image checkedImageHover = null;
+       private Image checkedImageDisable = null;
        private boolean isSelected = false;
        private boolean isHover = false;
 
@@ -68,8 +70,10 @@ public class CheckBoxButton extends Canvas {
        protected void initButton() {
                image = ImageResources.CHECKBOX_UNCHECKED_NML.getImage();
                imageHover = ImageResources.CHECKBOX_UNCHECKED_HOVER.getImage();
+               imageDisable = ImageResources.CHECKBOX_UNCHECKED_DISABLE.getImage();
                checkedImage = ImageResources.CHECKBOX_CHECKED_NML.getImage();
                checkedImageHover = ImageResources.CHECKBOX_CHECKED_HOVER.getImage();
+               checkedImageDisable = ImageResources.CHECKBOX_CHECKED_DISABLE.getImage();
        }
 
        private void addListeners() {
@@ -122,9 +126,17 @@ public class CheckBoxButton extends Canvas {
 
                        Image img = image;
                        if (isSelected) {
-                               img = isHover ? checkedImageHover : checkedImage;
+                               if (!isEnabled()) {
+                                       img = checkedImageDisable;
+                               } else {
+                                       img = isHover ? checkedImageHover : checkedImage;
+                               }
                        } else {
-                               img = isHover ? imageHover : image;
+                               if (!isEnabled()) {
+                                       img = imageDisable;
+                               } else {
+                                       img = isHover ? imageHover : image;
+                               }
                        }
 
                        Rectangle bounds = img.getBounds();

diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java
index 1886694..ceedd0d 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java
@@ -107,8 +107,8 @@ public class ImageButton extends Canvas {
                                        ImageResources.RADIO_BUTTON_ON.getImage(),
                                        ImageResources.RADIO_BUTTON_ON.getImage(),
                                        ImageResources.RADIO_BUTTON_ON.getImage(),
-                                       ImageResources.RADIO_BUTTON_ON.getImage(),
-                                       ImageResources.RADIO_BUTTON_OFF.getImage());
+                                       ImageResources.RADIO_BUTTON_ON_DISABLE.getImage(),
+                                       ImageResources.RADIO_BUTTON_OFF_DISABLE.getImage());
                }
        }
 

diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/TextInputBox.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/TextInputBox.java
index e736e7b..ecc1277 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/renewal/widgets/TextInputBox.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/TextInputBox.java
@@ -158,9 +158,9 @@ public class TextInputBox extends NinePatchBox{
 
                if (needClearButton) {
                        clearBtn = new ImageButton(this, SWT.PUSH);
-                       clearBtn.setImages(ImageResources.ICON_DELETE_BUTTON.getImage(),
-                                       ImageResources.ICON_DELETE_BUTTON.getImage(),
-                                       ImageResources.ICON_DELETE_BUTTON.getImage(),
+                       clearBtn.setImages(ImageResources.BUTTON_TEXT_DELETE_NORMAL.getImage(),
+                                       ImageResources.BUTTON_TEXT_DELETE_HOVER.getImage(),
+                                       ImageResources.BUTTON_TEXT_DELETE_HOVER.getImage(),
                                        null);
                        clearBtn.setEnabled(false);
                        clearBtn.addListener(SWT.Selection, new Listener(){

diff --git a/src/org/tizen/emulator/manager/ui/table/Table.java b/src/org/tizen/emulator/manager/ui/table/Table.java
index ad91bfe..5a66190 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/table/Table.java
+++ b/src/org/tizen/emulator/manager/ui/table/Table.java
@@ -57,7 +57,7 @@ public class Table extends TableScrolledComposite {
        private static final int[] EMPTY_SELECTION = new int[0];
        private static final int DEFAULT_COLUMN_HEIGHT = 30;
        private static final int DEFAULT_ITEM_HEIGHT = 30;
-       private static final int DEFAULT_SELECTED_ITEM_HEIGHT = 90;
+       private static final int DEFAULT_SELECTED_ITEM_HEIGHT = 60;
        private static final int CHECK_BOX_WIDTH = 30;
 
        private TableItem[] items;