From: jihye424.kim Date: Wed, 16 Dec 2015 04:53:57 +0000 (+0900) Subject: table viewer: change viewer button to image button X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6be6147bc8f94fba7601c387cffb546477595516;p=sdk%2Femulator%2Femulator-manager.git table viewer: change viewer button to image button - change viewer button to image button from hyper link text - change title image Change-Id: I7c01a3b52e4476bcf3debf3219cfb9c64d05ec63 Signed-off-by: jihye424.kim --- diff --git a/resource/renewal/res/btn_nav_hover.png b/resource/renewal/res/btn_nav_hover.png new file mode 100644 index 0000000..4abf6d1 Binary files /dev/null and b/resource/renewal/res/btn_nav_hover.png differ diff --git a/resource/renewal/res/btn_nav_normal.png b/resource/renewal/res/btn_nav_normal.png new file mode 100644 index 0000000..7d87281 Binary files /dev/null and b/resource/renewal/res/btn_nav_normal.png differ diff --git a/resource/renewal/res/btn_nav_push.png b/resource/renewal/res/btn_nav_push.png new file mode 100644 index 0000000..9a67601 Binary files /dev/null and b/resource/renewal/res/btn_nav_push.png differ diff --git a/resource/renewal/res/img_title_baseimages.png b/resource/renewal/res/img_title_baseimages.png index 8e0b77f..0b12295 100644 Binary files a/resource/renewal/res/img_title_baseimages.png and b/resource/renewal/res/img_title_baseimages.png differ diff --git a/resource/renewal/res/img_title_creatnewdevice.png b/resource/renewal/res/img_title_creatnewdevice.png index da8566a..269331a 100644 Binary files a/resource/renewal/res/img_title_creatnewdevice.png and b/resource/renewal/res/img_title_creatnewdevice.png differ diff --git a/resource/renewal/res/img_title_emulatorlist.png b/resource/renewal/res/img_title_emulatorlist.png new file mode 100644 index 0000000..b3823fd Binary files /dev/null and b/resource/renewal/res/img_title_emulatorlist.png differ diff --git a/resource/renewal/res/img_title_templates.png b/resource/renewal/res/img_title_templates.png index 4d52732..b26a747 100644 Binary files a/resource/renewal/res/img_title_templates.png and b/resource/renewal/res/img_title_templates.png differ diff --git a/resource/renewal/res/img_title_yourvmlist.png b/resource/renewal/res/img_title_yourvmlist.png deleted file mode 100644 index 5d723f3..0000000 Binary files a/resource/renewal/res/img_title_yourvmlist.png and /dev/null differ diff --git a/src/org/tizen/emulator/manager/renewal/resources/ImageResources.java b/src/org/tizen/emulator/manager/renewal/resources/ImageResources.java index 9dbe927..41566af 100644 --- a/src/org/tizen/emulator/manager/renewal/resources/ImageResources.java +++ b/src/org/tizen/emulator/manager/renewal/resources/ImageResources.java @@ -255,7 +255,7 @@ public enum ImageResources { CONTEXT_MENU_T("9p_context_menu_t"), TITLE_IMAGE("img_titlebar"), - VMLIST_TITLE_IMAGE("img_title_yourvmlist"), + VMLIST_TITLE_IMAGE("img_title_emulatorlist"), TEMPLATE_LIST_TITLE_IMAGE("img_title_templates"), BASEIMAGE_LIST_TITLE_IMAGE("img_title_baseimages"), CREATE_VIEW_TITLE_IMAGE("img_title_creatnewdevice"), @@ -380,12 +380,16 @@ public enum ImageResources { CHECKBOX_CHECKED_HOVER("btn_checkbox_checked_hover"), CHECKBOX_CHECKED_DISABLE("btn_checkbox_checked_disable"), - // radio buttonr + // radio button 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"); + RADIO_BUTTON_ON_DISABLE("btn_radio_on_disable"), + // navigation button + BTN_NAV_NORMAL("btn_nav_normal"), + BTN_NAV_HOVER("btn_nav_hover"), + BTN_NAV_PUSH("btn_nav_push"); String name; Image image; diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/AbstractTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/AbstractTableViewer.java index 9250f6c..a5c48eb 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/AbstractTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/AbstractTableViewer.java @@ -41,13 +41,11 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.renewal.resources.ColorResources; import org.tizen.emulator.manager.renewal.resources.FontResources; import org.tizen.emulator.manager.renewal.resources.ImageResources; import org.tizen.emulator.manager.ui.dialog.AboutDialog; -import org.tizen.emulator.manager.ui.renewal.widgets.Hyperlink; import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton; public abstract class AbstractTableViewer { @@ -67,7 +65,7 @@ public abstract class AbstractTableViewer { private static ImageButton infoButton; private List buttonMenuList = new ArrayList(); - private List linkMenuList = new ArrayList(); + private List linkMenuList = new ArrayList(); public AbstractTableViewer(Shell shell, String key) { this.key = key; @@ -198,7 +196,7 @@ public abstract class AbstractTableViewer { } } - public void addLinkMenu(Hyperlink menu) { + public void addLinkMenu(ImageButton menu) { linkMenuList.add(menu); } @@ -207,31 +205,14 @@ public abstract class AbstractTableViewer { } public void settingTopLayout() { - if (!linkMenuList.isEmpty()) { - for (int i = 0; i < linkMenuList.size(); i++){ - FormData data = new FormData(); - if (i == 0) { - data.top = new FormAttachment (0, 5); - } else { - data.top = new FormAttachment(linkMenuList.get(i - 1), 5); - } - data.right = new FormAttachment(100, -8); - Hyperlink menu = linkMenuList.get(i); - menu.setLayoutData(data); - menu.setCursor(Display.getCurrent().getSystemCursor(SWT.CURSOR_HAND)); - menu.setForeground(ColorResources.LINK_MENU_FONT.getColor()); - menu.setFont(FontResources.TABLE_VIEWER_LINK_MENU.getFont()); - } - } - if (!buttonMenuList.isEmpty()) { for (int i = 0; i < buttonMenuList.size(); i++) { FormData data = new FormData(); - data.bottom = new FormAttachment(100, -7); + data.top = new FormAttachment(0, 10); if (i == 0) { data.right = new FormAttachment(100, -8); } else { - data.right = new FormAttachment(buttonMenuList.get(i-1), -11); + data.right = new FormAttachment(buttonMenuList.get(i-1), -10); } data.width = BUTTON_MENU_WIDTH; data.height = BUTTON_MENU_HEIGHT; @@ -240,6 +221,26 @@ public abstract class AbstractTableViewer { } } + + if (!linkMenuList.isEmpty()) { + for (int i = 0; i < linkMenuList.size(); i++){ + FormData data = new FormData(); + data.bottom = new FormAttachment (100, -10); + if (i == 0) { + data.right = new FormAttachment(100, -8); + } else { + data.right = new FormAttachment(linkMenuList.get(i - 1), -5); + } + data.width = 96; + data.height = 22; + ImageButton menu = linkMenuList.get(i); + menu.setLayoutData(data); + menu.setImages(ImageResources.BTN_NAV_NORMAL.getImage(), ImageResources.BTN_NAV_HOVER.getImage(), + ImageResources.BTN_NAV_PUSH.getImage(), ImageResources.BTN_NAV_NORMAL.getImage()); + menu.setForeground(ColorResources.LINK_MENU_FONT.getColor()); + menu.setFont(FontResources.TABLE_VIEWER_LINK_MENU.getFont()); + } + } } public void showTableViewer() { diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java index 0062190..0e93beb 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java @@ -63,7 +63,6 @@ import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.dialog.DeleteMessageBox; import org.tizen.emulator.manager.ui.renewal.dialog.MessageBox; import org.tizen.emulator.manager.ui.renewal.dialoghandler.BaseImageDialogHandler; -import org.tizen.emulator.manager.ui.renewal.widgets.Hyperlink; import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton; import org.tizen.emulator.manager.ui.table.Table; import org.tizen.emulator.manager.ui.table.TableColumn; @@ -74,7 +73,7 @@ public class BaseImageTableViewer extends AbstractTableViewer { private static final int BUTTON_WIDTH = 32; private static final int BUTTON_HEIGHT = 26; - private Hyperlink templateList; + private ImageButton templateList; private ImageButton refreshButton; private Composite comp; @@ -110,7 +109,7 @@ public class BaseImageTableViewer extends AbstractTableViewer { @Override void setLinkerMenu() { - templateList = new Hyperlink(getTopComp(), SWT.None); + templateList = new ImageButton(getTopComp(), SWT.PUSH); templateList.setText("Templates"); templateList.addListener(SWT.Selection, new Listener() { @Override diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java index 51fc4a8..dbce391 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java @@ -61,7 +61,7 @@ import org.tizen.emulator.manager.ui.renewal.item.modify.comp.AdvancedPropertyVi import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue; import org.tizen.emulator.manager.ui.renewal.item.modify.vm.AdvancedSkinItem; import org.tizen.emulator.manager.ui.renewal.item.modify.vm.CameraItem; -import org.tizen.emulator.manager.ui.renewal.widgets.GrayButton; +import org.tizen.emulator.manager.ui.renewal.widgets.HighLightButton; import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton; import org.tizen.emulator.manager.ui.renewal.widgets.NinePatchResourceInfo; import org.tizen.emulator.manager.vms.Creator; @@ -84,7 +84,7 @@ public class CreateVMTableViewer extends AbstractTableViewer { // top menu private ImageButton backVMListBtn; - private GrayButton confirmBtn; + private HighLightButton confirmBtn; // sash form menu private Label profileLabel; @@ -337,7 +337,7 @@ public class CreateVMTableViewer extends AbstractTableViewer { } }); - confirmBtn = new GrayButton(comp, SWT.PUSH); + confirmBtn = new HighLightButton(comp, SWT.PUSH); confirmBtn.setText("Confirm"); confirmBtn.setFont(FontResources.DEFAULT_BOLD_FONT_9.getFont()); confirmBtn.addListener(SWT.Selection, new Listener(){ diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java index b1d1dc5..5e0a9d9 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java @@ -62,7 +62,6 @@ import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.dialog.MessageBox; import org.tizen.emulator.manager.ui.renewal.dialoghandler.DeviceTemplateDialogHandler; -import org.tizen.emulator.manager.ui.renewal.widgets.Hyperlink; import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton; import org.tizen.emulator.manager.ui.table.Table; import org.tizen.emulator.manager.ui.table.TableColumn; @@ -72,7 +71,7 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { private static final int BUTTON_WIDTH = 32; private static final int BUTTON_HEIGHT = 26; - private Hyperlink baseImageList; + private ImageButton baseImageList; private ImageButton refreshButton; private Composite comp; @@ -101,7 +100,7 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { @Override void setLinkerMenu() { - baseImageList = new Hyperlink(getTopComp(), SWT.None); + baseImageList = new ImageButton(getTopComp(), SWT.PUSH); baseImageList.setText("Base Images"); baseImageList.addListener(SWT.Selection, new Listener() { @Override 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 88957d6..dd53b95 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java @@ -48,7 +48,6 @@ import org.tizen.emulator.manager.platform.ProfileList; import org.tizen.emulator.manager.renewal.resources.ImageResources; import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.widgets.CreateVMCombo; -import org.tizen.emulator.manager.ui.renewal.widgets.Hyperlink; import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton; import org.tizen.emulator.manager.vms.VMProperty; import org.tizen.emulator.manager.vms.helper.CheckingRunningEmulator; @@ -58,8 +57,8 @@ public class VMListTableViewer extends AbstractTableViewer { private static final int BUTTON_WIDTH = 32; private static final int BUTTON_HEIGHT = 26; - private Hyperlink templateList; - private Hyperlink baseImageList; + private ImageButton templateList; + private ImageButton baseImageList; private ImageButton refreshButton; private CreateVMCombo createVMCombo; @@ -180,7 +179,7 @@ public class VMListTableViewer extends AbstractTableViewer { @Override void setLinkerMenu() { // add linker - templateList = new Hyperlink(getTopComp(), SWT.None); + templateList = new ImageButton(getTopComp(), SWT.PUSH); templateList.setText("Templates"); templateList.addListener(SWT.Selection, new Listener() { @Override @@ -198,7 +197,7 @@ public class VMListTableViewer extends AbstractTableViewer { }); - baseImageList = new Hyperlink(getTopComp(), SWT.None); + baseImageList = new ImageButton(getTopComp(), SWT.PUSH); baseImageList.setText("Base Images"); baseImageList.addListener(SWT.Selection, new Listener() { @Override diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/Hyperlink.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/Hyperlink.java deleted file mode 100644 index ab994b6..0000000 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/Hyperlink.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Emulator Manager - * - * Copyright (C) 2015 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * JiHye Kim - * Minkee Lee - * SeokYeon Hwang - * Sangho Park - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -package org.tizen.emulator.manager.ui.renewal.widgets; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.events.MouseListener; -import org.eclipse.swt.events.PaintEvent; -import org.eclipse.swt.events.PaintListener; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.GC; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.widgets.Canvas; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; -import org.tizen.emulator.manager.renewal.resources.ColorResources; - -public class Hyperlink extends Canvas { - private String text = ""; - private boolean underlined = true; - private Color focusBoxColor; - - public Hyperlink(Composite parent, int style) { - super(parent, checkStyle(style)); - this.addPaintListener(paintListener); - this.addMouseListener(mouseListener); - this.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); - // TODO - this.setBackground(ColorResources.BLACK.getColor()); - focusBoxColor = Display.getCurrent().getSystemColor(SWT.COLOR_GRAY); - } - - private static int checkStyle(int style) { - return style | SWT.NO_BACKGROUND; - } - - public String getText() { - checkWidget(); - return text; - } - - public void setText(String text) { - checkWidget(); - if (text == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - this.text = text; - } - - public boolean isUnderlined() { - checkWidget(); - return underlined; - } - - public void setUnderlined(boolean underlined) { - checkWidget(); - this.underlined = underlined; - } - - @Override - public Point computeSize(int wHint, int hHint, boolean changes) { - checkWidget(); - - if (wHint != SWT.DEFAULT && wHint < 0) { - wHint = 0; - } - - if (hHint != SWT.DEFAULT && hHint < 0) { - hHint = 0; - } - - Point size = new Point(0, 0); - Point textSize = getTextSize(); - size.x = Math.max(wHint, textSize.x + 2); - if (underlined) { - textSize.y += 1; - } - size.y = Math.max(hHint, textSize.y); - - return size; - } - - private Point getTextSize() { - Point size = new Point(0, 0); - GC gc = new GC(this); - if (text != null && text.length() > 0) { - Point p = gc.textExtent(text, SWT.DRAW_MNEMONIC); - size.x += p.x; - size.y = Math.max(size.y, p.y); - } else { - size.y = Math.max(size.y, gc.getFontMetrics().getHeight()); - } - - gc.dispose(); - return size; - } - - private PaintListener paintListener = new PaintListener() { - - @Override - public void paintControl(PaintEvent e) { - Point extent = getTextSize(); - - GC gc = e.gc; - - if ((getStyle() & SWT.NO_BACKGROUND) != 0) { - Rectangle rect = ((Hyperlink)e.widget).getClientArea(); - gc.setBackground(getBackground()); - gc.fillRectangle(rect); - } - - gc.setForeground(focusBoxColor); - if (isMouseDown) { - gc.setLineStyle(SWT.LINE_DOT); - gc.drawRectangle(0, 0, extent.x, extent.y - 2); - } - - gc.setForeground(getForeground()); - gc.drawText(text, 0, 0, true); - - if (underlined) { - gc.setLineStyle(SWT.LINE_SOLID); - gc.drawLine(0, extent.y - 2, extent.x, extent.y - 2); - } - } - }; - - private boolean isMouseDown = false; - private MouseListener mouseListener = new MouseListener() { - - @Override - public void mouseDoubleClick(MouseEvent e) { - isMouseDown = false; - } - - @Override - public void mouseDown(MouseEvent e) { - isMouseDown = true; - redraw(); - } - - @Override - public void mouseUp(MouseEvent e) { - if (isMouseDown) { - isMouseDown = false; - Event event = new Event(); - event.widget = e.widget; - event.type = SWT.Selection; - e.widget.notifyListeners(SWT.Selection, event); - } - } - }; -} diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageRadioButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageRadioButton.java index fc12f28..bbd55e4 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageRadioButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageRadioButton.java @@ -48,7 +48,7 @@ public class ImageRadioButton extends Canvas { WStateImageMap images = new WStateImageMap(); WSTATE state = WSTATE.NORMAL; - private final boolean isSelected = false; +// private final boolean isSelected = false; public ImageRadioButton(Composite parent) { super(parent, SWT.DOUBLE_BUFFERED | SWT.RADIO); diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/ProfileImageButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/ProfileImageButton.java index 9f37fd4..26127dd 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/ProfileImageButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/ProfileImageButton.java @@ -45,5 +45,7 @@ public class ProfileImageButton extends ImageButton { this.profile = profile; } - + public String getProfile() { + return profile; + } }