From: minkee.lee Date: Tue, 29 Dec 2015 09:24:35 +0000 (+0900) Subject: dialog: adjust dialog size X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=faf72f4a1fd3934e6e7b781fea38bff8808ec474;p=sdk%2Femulator%2Femulator-manager.git dialog: adjust dialog size - Change some dialog's size not to fixed. - Proxy dialog: modify label width. - About dialog: set fixed font, move ok button to right-bottom. Change-Id: I4dd2fed444806fa357275acb1e7c3629d28e9e59 Signed-off-by: minkee.lee --- diff --git a/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java b/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java index b23561b..e7b9bba 100644 --- a/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java +++ b/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java @@ -32,6 +32,7 @@ package org.tizen.emulator.manager.ui.dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -43,6 +44,7 @@ import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.EmulatorManager; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.resources.FilePathResources; +import org.tizen.emulator.manager.resources.FontResources; import org.tizen.emulator.manager.resources.ImageResources; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.tool.About; @@ -95,14 +97,13 @@ public class AboutDialog { Composite lowerComposite = new Composite(dialog, SWT.NONE); GridLayout layout = getGridLayout(1, true); layout.marginRight = 10; + layout.marginBottom = 15; lowerComposite.setLayout(layout); // TODO - lowerComposite.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, false)); - - Label dummy = new Label(lowerComposite, SWT.NONE); - dummy.setLayoutData(new GridData(110, 40)); + lowerComposite.setLayoutData(new GridData(SWT.RIGHT, SWT.BOTTOM, false, true)); Button okButton = new Button(lowerComposite, SWT.PUSH); + okButton.setFont(FontResources.ABOUT_TEXT.getFont()); okButton.setLayoutData(new GridData(110, SWT.DEFAULT)); okButton.setText(StringResources.OK); okButton.setFocus(); @@ -115,6 +116,14 @@ public class AboutDialog { public void widgetDefaultSelected(SelectionEvent e) { } }); + + Shell mainShell = MainDialog.getShell(); + if (mainShell != null) { + Point p = mainShell.getLocation(); + Point s = mainShell.getSize(); + dialog.setLocation(p.x + (s.x>>2), p.y + (s.y>>2)); + } + } private static void makeTextContents(Composite upperComposite) { @@ -180,6 +189,10 @@ public class AboutDialog { } } }); + + visit.setFont(FontResources.ABOUT_TEXT.getFont()); + workspace.setFont(FontResources.ABOUT_TEXT.getFont()); + contents.setFont(FontResources.ABOUT_TEXT.getFont()); } private static GridLayout getGridLayout(int numColumns, boolean makeColumnEqualWidth) { diff --git a/src/org/tizen/emulator/manager/ui/dialog/MessageDialog.java b/src/org/tizen/emulator/manager/ui/dialog/MessageDialog.java index c50768e..f85f191 100644 --- a/src/org/tizen/emulator/manager/ui/dialog/MessageDialog.java +++ b/src/org/tizen/emulator/manager/ui/dialog/MessageDialog.java @@ -231,7 +231,13 @@ public class MessageDialog public int openMessageDialog(final String title, final String message, final int icon_style, final int style) { dialog = new Shell(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL); dialog.setText(title); - dialog.setLayout(new GridLayout(2, false)); + GridLayout layout = new GridLayout(2, false); + layout.marginHeight = 10; + layout.marginRight = 20; + layout.marginLeft = 10; + layout.horizontalSpacing = 10; + + dialog.setLayout(layout); dialog.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); Label icon = new Label(dialog, SWT.NONE); @@ -242,16 +248,6 @@ public class MessageDialog text.setText(message); text.pack(); - int x = icon.getSize().x + text.getSize().x; - int y = 0; - if (icon.getSize().y > text.getSize().y ) { - y = icon.getSize().y; - } else { - y = text.getSize().y; - } - - dialog.setSize(x + 50, y + 100); - if (MainDialog.getShell() != null) { Point p = MainDialog.getShell().getLocation(); Point s = MainDialog.getShell().getSize(); @@ -265,6 +261,7 @@ public class MessageDialog makeButtonComposite(style, icon.getSize().x); + dialog.pack(); dialog.open(); while(!dialog.isDisposed()) { if(!Display.getCurrent().readAndDispatch()) { @@ -301,7 +298,7 @@ public class MessageDialog cancleButton.setFocus(); } else { - new Label(dialog, SWT.NONE); + new Label(buttonComposite, SWT.NONE); } Button okButton = makeButton(buttonComposite, SWT.OK); diff --git a/src/org/tizen/emulator/manager/ui/dialog/ProxyDialog.java b/src/org/tizen/emulator/manager/ui/dialog/ProxyDialog.java index c090c65..e0cef4a 100644 --- a/src/org/tizen/emulator/manager/ui/dialog/ProxyDialog.java +++ b/src/org/tizen/emulator/manager/ui/dialog/ProxyDialog.java @@ -95,6 +95,7 @@ public class ProxyDialog { createWidgets(shell); setValues(value); + shell.pack(); shell.open(); while (!shell.isDisposed()) { @@ -164,6 +165,7 @@ public class ProxyDialog { cancelButton.setLayoutData(data); okButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { if (applyAllProtocol.isSelection()) { String httpProxyAddr = textArrayAddr.get(0).getText(); @@ -229,6 +231,7 @@ public class ProxyDialog { }); cancelButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { returnValue = null; shell.close(); @@ -281,9 +284,9 @@ public class ProxyDialog { labelAddr.setText(proxy + ":"); //$NON-NLS-1$ // labelAddr.setBackground(ColorResources.DETAIL_MIDDLE_COLOR.getColor()); FormData data = new FormData(); - data.left = new FormAttachment(0, 15); + data.left = new FormAttachment(0, 7); data.top = new FormAttachment(0, LABEL_HEIGHT_POS); - data.width = 50; + data.width = 55; data.height = 20; labelAddr.setLayoutData(data); labelArrayAddr.add(index, labelAddr); @@ -426,6 +429,7 @@ public class ProxyDialog { }); textPort.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent arg0) { if (checkTextPort() && checkTextAddr()) { okButton.setEnabled(true); @@ -439,6 +443,7 @@ public class ProxyDialog { for (Text textAddr : textArrayAddr) { textAddr.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent arg0) { if (checkTextPort() && checkTextAddr()) { okButton.setEnabled(true); diff --git a/src/org/tizen/emulator/manager/ui/dialog/TapGuideDialogForMac.java b/src/org/tizen/emulator/manager/ui/dialog/TapGuideDialogForMac.java index 91a172e..e568e79 100644 --- a/src/org/tizen/emulator/manager/ui/dialog/TapGuideDialogForMac.java +++ b/src/org/tizen/emulator/manager/ui/dialog/TapGuideDialogForMac.java @@ -35,7 +35,6 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.layout.RowData; import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; @@ -49,11 +48,10 @@ import org.tizen.emulator.manager.ui.MainDialog; public class TapGuideDialogForMac { private static Shell dialog = null; - private static int WIDTH = 500; - private static int HEIGHT = 400; private static int TITLE_INDENT = 7; private static int CONTENT_INDENT = 15; + private static int MARGIN_RIGHT = 5; public static void open() { makeDialog(); @@ -68,21 +66,23 @@ public class TapGuideDialogForMac { private static void makeDialog() { dialog = new Shell(MainDialog.getShell(), SWT.DIALOG_TRIM | SWT.NONE); dialog.setText("Using Bridge Network"); - dialog.setSize(WIDTH, HEIGHT); dialog.setBackground(ColorResources.TAB_CONTENTS_BG_COLOR.getColor()); RowLayout rowLayout = new RowLayout(); rowLayout.type = 512; rowLayout.marginTop = 15; + rowLayout.marginBottom =15; rowLayout.marginLeft = 10; + rowLayout.marginRight = 10; rowLayout.spacing = 3; dialog.setLayout(rowLayout); makeContent(); + Point size = dialog.getSize(); if (MainDialog.getShell() != null) { Point p = MainDialog.getShell().getLocation(); Rectangle rect = MainDialog.getShell().getBounds(); - int posX = p.x + (rect.width - WIDTH) / 2; - int posY = p.y + (rect.height - HEIGHT) / 2; + int posX = p.x + (rect.width - size.x) / 2; + int posY = p.y + (rect.height - size.y) / 2; dialog.setLocation(posX, posY); } @@ -91,7 +91,6 @@ public class TapGuideDialogForMac { private static void makeContent() { Composite comp = new Composite(dialog, SWT.BORDER); - comp.setLayoutData(new RowData(WIDTH - 30, HEIGHT - 60)); comp.setLayout(new FormLayout()); String newLine = StringResources.NEW_LINE; @@ -104,8 +103,7 @@ public class TapGuideDialogForMac { FormData data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); data.top = new FormAttachment(0, 5); - data.width = WIDTH - 50; - data.height = 40; + data.right = new FormAttachment(100, -MARGIN_RIGHT); objective.setLayoutData(data); Label title1 = new Label(comp, SWT.NONE); @@ -115,8 +113,7 @@ public class TapGuideDialogForMac { data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); data.top = new FormAttachment(objective, 3); - data.width = WIDTH - 50; - data.height = 20; + data.right = new FormAttachment(100, -MARGIN_RIGHT); title1.setLayoutData(data); Label content1 = new Label(comp, SWT.NONE); @@ -135,8 +132,7 @@ public class TapGuideDialogForMac { data = new FormData(); data.left = new FormAttachment(0, CONTENT_INDENT); data.top = new FormAttachment(title1, 5); - data.width = WIDTH - 50; - data.height = 100; + data.right = new FormAttachment(100, -MARGIN_RIGHT); content1.setLayoutData(data); Label title2 = new Label(comp, SWT.NONE); @@ -146,8 +142,7 @@ public class TapGuideDialogForMac { data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); data.top = new FormAttachment(content1, 20); - data.width = WIDTH - 50; - data.height = 20; + data.right = new FormAttachment(100, -MARGIN_RIGHT); title2.setLayoutData(data); Label content2 = new Label(comp, SWT.NONE); @@ -158,8 +153,7 @@ public class TapGuideDialogForMac { data = new FormData(); data.left = new FormAttachment(0, CONTENT_INDENT); data.top = new FormAttachment(title2, 5); - data.width = WIDTH - 50; - data.height = 50; + data.right = new FormAttachment(100, -MARGIN_RIGHT); content2.setLayoutData(data); @@ -168,15 +162,17 @@ public class TapGuideDialogForMac { + newLine + "If host network doesn't work like before, there may be some problems in" + newLine - + "bridge configuration."; + + "bridge configuration." + + newLine + newLine; end.setFont(FontResources.DETAIL_TITLE_FONT.getFont()); end.setText(endMsg); data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); data.top = new FormAttachment(content2, 0); - data.width = WIDTH - 50; - data.height = 50; + data.right = new FormAttachment(100, -MARGIN_RIGHT); end.setLayoutData(data); + + dialog.pack(); } } diff --git a/src/org/tizen/emulator/manager/ui/dialog/TapGuideDialogForWin.java b/src/org/tizen/emulator/manager/ui/dialog/TapGuideDialogForWin.java index 4c80350..cc33ed5 100644 --- a/src/org/tizen/emulator/manager/ui/dialog/TapGuideDialogForWin.java +++ b/src/org/tizen/emulator/manager/ui/dialog/TapGuideDialogForWin.java @@ -33,7 +33,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.layout.RowData; import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; @@ -41,17 +40,17 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.resources.ColorResources; import org.tizen.emulator.manager.resources.FontResources; +import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.MainDialog; import org.tizen.emulator.manager.ui.Messages; public class TapGuideDialogForWin { private static Shell dialog = null; - private static int WIDTH = 520; - private static int HEIGHT = 590; private static int TITLE_INDENT = 7; private static int CONTENT_INDENT = 15; + private static int MARGIN_RIGHT = 5; public static void open() { makeDialog(); @@ -66,12 +65,13 @@ public class TapGuideDialogForWin { private static void makeDialog() { dialog = new Shell(MainDialog.getShell(), SWT.DIALOG_TRIM | SWT.NONE); dialog.setText(Messages.getString("TapGuideDialogForWin.UseBridgeDialog.0")); //$NON-NLS-1$ - dialog.setSize(WIDTH, HEIGHT); dialog.setBackground(ColorResources.TAB_CONTENTS_BG_COLOR.getColor()); RowLayout rowLayout = new RowLayout(); rowLayout.type = 512; rowLayout.marginTop = 15; + rowLayout.marginBottom =15; rowLayout.marginLeft = 10; + rowLayout.marginRight = 10; rowLayout.spacing = 3; dialog.setLayout(rowLayout); makeContent(); @@ -81,7 +81,6 @@ public class TapGuideDialogForWin { private static void makeContent() { Composite comp = new Composite(dialog, SWT.BORDER); - comp.setLayoutData(new RowData(WIDTH - 30, HEIGHT - 60)); comp.setLayout(new FormLayout()); Label objective = new Label(comp, SWT.NONE); @@ -92,8 +91,7 @@ public class TapGuideDialogForWin { FormData data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); data.top = new FormAttachment(0, 5); - data.width = WIDTH - 50; - data.height = 40; + data.right = new FormAttachment(100, -MARGIN_RIGHT); objective.setLayoutData(data); Label title1 = new Label(comp, SWT.NONE); @@ -103,12 +101,12 @@ public class TapGuideDialogForWin { data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); data.top = new FormAttachment(objective, 3); - data.width = WIDTH - 50; - data.height = 20; + data.right = new FormAttachment(100, -MARGIN_RIGHT); title1.setLayoutData(data); Label content1 = new Label(comp, SWT.NONE); - String msg = Messages.getString("TapGuideDialogForWin.CreateBridgeDialog.1") //$NON-NLS-1$ + String msg = StringResources.NEW_LINE + + Messages.getString("TapGuideDialogForWin.CreateBridgeDialog.1") //$NON-NLS-1$ + Messages.getString("TapGuideDialogForWin.CreateBridgeDialog.2") //$NON-NLS-1$ + Messages.getString("TapGuideDialogForWin.CreateBridgeDialog.3") //$NON-NLS-1$ @@ -126,8 +124,7 @@ public class TapGuideDialogForWin { data = new FormData(); data.left = new FormAttachment(0, CONTENT_INDENT); data.top = new FormAttachment(title1, 5); - data.width = WIDTH - 50; - data.height = 150; + data.right = new FormAttachment(100, -MARGIN_RIGHT); content1.setLayoutData(data); Label title2 = new Label(comp, SWT.NONE); @@ -137,8 +134,7 @@ public class TapGuideDialogForWin { data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); data.top = new FormAttachment(content1, 20); - data.width = WIDTH - 50; - data.height = 20; + data.right = new FormAttachment(100, -MARGIN_RIGHT); title2.setLayoutData(data); Label content2 = new Label(comp, SWT.NONE); @@ -162,23 +158,26 @@ public class TapGuideDialogForWin { data = new FormData(); data.left = new FormAttachment(0, CONTENT_INDENT); data.top = new FormAttachment(title2, 5); - data.width = WIDTH - 50; - data.height = 200; + data.right = new FormAttachment(100, -MARGIN_RIGHT); content2.setLayoutData(data); Label end = new Label(comp, SWT.NONE); - String endMsg = Messages.getString("TapGuideDialogForWin.NetworkWarning.0") //$NON-NLS-1$ + String endMsg = StringResources.NEW_LINE + + Messages.getString("TapGuideDialogForWin.NetworkWarning.0") //$NON-NLS-1$ + Messages.getString("TapGuideDialogForWin.NetworkWarning.1") //$NON-NLS-1$ - + Messages.getString("TapGuideDialogForWin.NetworkWarning.2"); //$NON-NLS-1$ + + Messages.getString("TapGuideDialogForWin.NetworkWarning.2") //$NON-NLS-1$ + + StringResources.NEW_LINE + + StringResources.NEW_LINE; end.setFont(FontResources.DETAIL_TITLE_FONT.getFont()); end.setText(endMsg); data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); data.top = new FormAttachment(content2, 0); - data.width = WIDTH - 50; - data.height = 50; + data.right = new FormAttachment(100, -MARGIN_RIGHT); end.setLayoutData(data); + dialog.pack(); + } }