From 1d93c81f5988919dfbf44a97aa254193534480dd Mon Sep 17 00:00:00 2001 From: "jihye424.kim" Date: Thu, 3 Dec 2015 11:02:46 +0900 Subject: [PATCH] file dialog item: add text label for detail mode - detail mode: only display text that can not modified Change-Id: Ie2d772d87dc491ea9deba2955cb3c57a6bcc8f95 Signed-off-by: jihye424.kim --- .../item/modify/baseimage/BaseImageFileItem.java | 16 ++--- .../renewal/item/modify/common/FileDialogItem.java | 76 ++++++++++------------ .../ui/renewal/item/modify/vm/CameraImageItem.java | 23 +------ .../ui/renewal/item/modify/vm/FileSharingItem.java | 39 +++-------- .../ui/renewal/item/modify/vm/TunerTableItem.java | 11 ++-- 5 files changed, 55 insertions(+), 110 deletions(-) diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageFileItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageFileItem.java index b73d3da..78416b9 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageFileItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageFileItem.java @@ -68,15 +68,15 @@ public class BaseImageFileItem extends FileDialogItem { @Override public void create(Composite parent) { create(parent, getTitle(), ImageResources.ICON_TITLE_IMAGE_FILE, TEXT_BOX_WIDTH); - if (imageFilePath == null || imageFilePath.isEmpty()) { - setTextBox("(select base image path...)"); - } else { - // you can modify if emulator using base image does not exist - setTextBox(imageFilePath); - } - // you can not modify if emulator using base image exist. if (getItemListComp().isDetailMode()) { - fileDialogButton.setEnabled(false); + setTextBox(imageFilePath); + } else { + if (imageFilePath == null || imageFilePath.isEmpty()) { + setTextBox("(select base image path...)"); + } else { + // you can modify if emulator using base image does not exist + setTextBox(imageFilePath); + } } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/FileDialogItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/FileDialogItem.java index 4acc3f6..070626a 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/FileDialogItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/FileDialogItem.java @@ -49,13 +49,13 @@ import org.tizen.emulator.manager.ui.renewal.widgets.BlueButton; import org.tizen.emulator.manager.ui.renewal.widgets.TextBox; import org.tizen.emulator.manager.ui.renewal.widgets.WidgetHelper; - - public abstract class FileDialogItem extends ModifyDialogItem { protected TextBox textBox; protected String filePath; protected BlueButton fileDialogButton; + // for detail mode dialog + protected Canvas textLabel; private final static int BUTTON_SPACE = 5; private final static int BUTTON_WIDTH = 32; @@ -74,7 +74,6 @@ public abstract class FileDialogItem extends ModifyDialogItem { lastPath = path; } - public int getContentRight(int boxWidth) { return boxWidth + BUTTON_SPACE + BUTTON_WIDTH; } @@ -87,7 +86,6 @@ public abstract class FileDialogItem extends ModifyDialogItem { super(name, title); } - protected void create(Composite parent, String title, ImageResources iconResource, int textBoxWidth) { item = new ModifyItem(this); @@ -100,46 +98,44 @@ public abstract class FileDialogItem extends ModifyDialogItem { protected void makeBody(int textBoxWidth) { item.setBodyLayoutForm(); + if (getItemListComp().isDetailMode()) { + createDetailItem(); + } else { + createTextBox(textBoxWidth); + createFileDialogButton(); + } + } - createTextBox(textBoxWidth); - createFileDialogButton(); + protected void createDetailItem() { + textLabel = new Canvas(item.getBody(), SWT.NONE); + textLabel.setLayoutData(getDetailItemFormData()); } public void setFilePath(String path) { filePath = path; } - - public void settingDetailItemPath(String path, Canvas canvas) { - String text = ""; - if (path == null || path.isEmpty()) { - text = ""; - - } else { - text = path.substring(path - .lastIndexOf(File.separator) + 1, path.length()); - canvas.setToolTipText(path); - } - WidgetHelper.drawText(canvas, text, SWT.LEFT); - } - public void setTextBox(String path) { - if (path == null || path.isEmpty()) { - textBox.setText(""); - textBox.setToolTipText(""); - } else { - String fileName = path.substring(path + String fileName = ""; + if (path != null && !path.isEmpty()) { + fileName = path.substring(path .lastIndexOf(File.separator) + 1, path.length()); - textBox.setText(fileName); - textBox.setToolTipText(path); + } if (getItemListComp().isDetailMode()) { - textBox.setEnabled(false); + WidgetHelper.drawText(textLabel, fileName, SWT.LEFT); + if (!fileName.isEmpty()) { + textLabel.setToolTipText(path); + } + } else { + textBox.setText(fileName); + if (!fileName.isEmpty()) { + textBox.setToolTipText(path); + } } } - protected void createTextBox(int textBoxWidth) { FormData data = new FormData(); data.left = new FormAttachment(0, ModifyItem.BODY_MARGIN_LEFT); @@ -148,7 +144,6 @@ public abstract class FileDialogItem extends ModifyDialogItem { data.height = ModifyItem.WIDGET_HEIGHT; textBox = new TextBox(item.getBody(), SWT.NONE, SWT.CENTER); textBox.setLayoutData(data); - } protected void createFileDialogButton() { @@ -168,19 +163,19 @@ public abstract class FileDialogItem extends ModifyDialogItem { } } - private void addButtonListener() { fileDialogButton.addListener(SWT.Selection, new Listener(){ @Override public void handleEvent(Event event) { - if (event.type == SWT.Selection) { - String path = clickFileDialogButon(); - if (path != null) { - FileDialogItem.setLastDirectoryPath(path); - filePath = path; - setTextBox(filePath); - fileSelected(); - } + if (event.type != SWT.Selection) { + return; + } + String path = clickFileDialogButon(); + if (path != null) { + FileDialogItem.setLastDirectoryPath(path); + filePath = path; + setTextBox(filePath); + fileSelected(); } } }); @@ -199,7 +194,6 @@ public abstract class FileDialogItem extends ModifyDialogItem { public abstract void fileSelected(); - public void setItemEnable(boolean enable) { textBox.setEnabled(enable); fileDialogButton.setShowImage(enable); @@ -209,8 +203,6 @@ public abstract class FileDialogItem extends ModifyDialogItem { } } - - @Override public void changeWidgetState(boolean isError) { if (!getItemListComp().isDetailMode()) { diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraImageItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraImageItem.java index 0928603..5dd7e57 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraImageItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraImageItem.java @@ -32,8 +32,6 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import java.io.File; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.renewal.resources.ColorResources; import org.tizen.emulator.manager.resources.FilePathResources; @@ -69,30 +67,11 @@ public class CameraImageItem extends FileDialogItem { makeBody(SubModifyItem.BOX_WIDTH); - } - - @Override - protected void makeBody(int textBoxWidth) { - item.setBodyLayoutForm(); if (getItemListComp().isDetailMode()) { - createDetailItem(); - - } else { - createTextBox(textBoxWidth); - createFileDialogButton(); + setTextBox(imagePath); } } - private void createDetailItem() { - item.setBodyLayoutForm(); - Canvas canvas = new Canvas(item.getBody(), SWT.NONE) ; - canvas.setLayoutData(getDetailItemFormData()); - - settingDetailItemPath(imagePath, canvas); - - } - - @Override public void setParentItem(ModifyDialogItem parentItem) { super.setParentItem(parentItem); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/FileSharingItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/FileSharingItem.java index 3ee4f66..0b04d36 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/FileSharingItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/FileSharingItem.java @@ -30,8 +30,6 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.renewal.resources.ImageResources; import org.tizen.emulator.manager.ui.renewal.item.modify.common.FileDialogItem; @@ -51,45 +49,25 @@ public class FileSharingItem extends FileDialogItem { super(NAME, TITLE); } - @Override public void create(Composite parent) { create(parent, getTitle(), TITLE_ICON_RESOURCE, TEXT_BOX_WIDTH); - + updateUI(); } - private void updateUI() { - if (sharingPath == null || sharingPath.isEmpty()) { - setTextBox("(select sharing path...)"); - - } else { - setTextBox(sharingPath); - } - } - - @Override - protected void makeBody(int textBoxWidth) { - item.setBodyLayoutForm(); if (getItemListComp().isDetailMode()) { - createDetailItem(); - + setTextBox(sharingPath); } else { - createTextBox(textBoxWidth); - createFileDialogButton(); - updateUI(); - } - } + if (sharingPath == null || sharingPath.isEmpty()) { + setTextBox("(select sharing path...)"); - private void createDetailItem() { - item.setBodyLayoutForm(); - Canvas canvas = new Canvas(item.getBody(), SWT.NONE); - canvas.setLayoutData(getDetailItemFormData()); - - settingDetailItemPath(sharingPath, canvas); + } else { + setTextBox(sharingPath); + } + } } - @Override public void setInitialValue(PropertyValue value) { if (getItemListComp().isCreateMode()) { @@ -110,7 +88,6 @@ public class FileSharingItem extends FileDialogItem { return new FileSharingItem(); } - @Override public void fileSelected() { sharingPath = filePath; diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerTableItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerTableItem.java index 0919d0f..155c8d0 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerTableItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerTableItem.java @@ -34,7 +34,6 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import java.io.File; import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; import org.tizen.emulator.manager.renewal.resources.ColorResources; @@ -88,14 +87,12 @@ public class TunerTableItem extends FileDialogItem { } } - private void createDetailItem() { - item.setBodyLayoutForm(); - Canvas canvas = new Canvas(item.getBody(), SWT.NONE) ; - canvas.setLayoutData(getDetailItemFormData()); - + @Override + protected void createDetailItem() { + super.createDetailItem(); String text = newTableFilePath.isEmpty() ? newTableFileName : newTableFilePath; - settingDetailItemPath(text, canvas); + setTextBox(text); } -- 2.7.4