From 43db0682d293e6acd9be379bae6d4a3c134e39a5 Mon Sep 17 00:00:00 2001 From: Son Hyunjun Date: Thu, 5 Apr 2012 21:00:30 +0900 Subject: [PATCH] [Title] change 'Close' button to 'OK' button [Type] Feature [Module] Skin [Priority] Minor [CQ#] [Redmine#] [Problem] [Cause] [Solution] Change-Id: Ibc972a443350b43cb7b8148d3841dc061b908e9c --- .../org/tizen/emulator/skin/dialog/AboutDialog.java | 2 +- .../tizen/emulator/skin/dialog/DetailInfoDialog.java | 8 ++++---- .../tizen/emulator/skin/dialog/LicenseDialog.java | 8 ++++---- .../org/tizen/emulator/skin/dialog/SkinDialog.java | 12 +++++++----- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java index 1f45c51e8d..eecb2522f6 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java @@ -161,7 +161,7 @@ public class AboutDialog extends SkinDialog { } } ); - createCloseButton( parent, true ); + createOKButton( parent, true ); } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java index e17ce9767d..0a3fe4fc08 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java @@ -348,16 +348,16 @@ public class DetailInfoDialog extends SkinDialog { protected void createButtons( Composite parent ) { super.createButtons( parent ); - Button closeButton = createButton( parent, "Close" ); + Button okButton = createButton( parent, OK ); GridData gd = new GridData(); gd.grabExcessHorizontalSpace = true; gd.horizontalAlignment = SWT.RIGHT; - closeButton.setLayoutData( gd ); + okButton.setLayoutData( gd ); - closeButton.setFocus(); + okButton.setFocus(); - closeButton.addSelectionListener( new SelectionAdapter() { + okButton.addSelectionListener( new SelectionAdapter() { @Override public void widgetSelected( SelectionEvent e ) { DetailInfoDialog.this.shell.close(); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/LicenseDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/LicenseDialog.java index 63064d904a..247969ce20 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/LicenseDialog.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/LicenseDialog.java @@ -90,16 +90,16 @@ public class LicenseDialog extends SkinDialog { protected void createButtons( Composite parent ) { super.createButtons( parent ); - Button closeButton = createButton( parent, "Close" ); + Button okButton = createButton( parent, OK ); GridData gd = new GridData(); gd.grabExcessHorizontalSpace = true; gd.horizontalAlignment = SWT.RIGHT; - closeButton.setLayoutData( gd ); + okButton.setLayoutData( gd ); - closeButton.setFocus(); + okButton.setFocus(); - closeButton.addSelectionListener( new SelectionAdapter() { + okButton.addSelectionListener( new SelectionAdapter() { @Override public void widgetSelected( SelectionEvent e ) { LicenseDialog.this.shell.close(); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/SkinDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/SkinDialog.java index 9833da09c1..255c03b757 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/SkinDialog.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/SkinDialog.java @@ -47,6 +47,8 @@ import org.tizen.emulator.skin.util.StringUtil; */ public abstract class SkinDialog extends Dialog { + public static final String OK = " " + "OK" + " "; + protected Shell shell; private boolean isReady; private Composite buttonComposite; @@ -143,10 +145,10 @@ public abstract class SkinDialog extends Dialog { } - protected Button createCloseButton( Composite parent, boolean setFocus ) { + protected Button createOKButton( Composite parent, boolean setFocus ) { - Button closeButton = createButton( parent, "Close" ); - closeButton.addSelectionListener( new SelectionAdapter() { + Button okButton = createButton( parent, OK ); + okButton.addSelectionListener( new SelectionAdapter() { @Override public void widgetSelected( SelectionEvent e ) { SkinDialog.this.shell.close(); @@ -154,10 +156,10 @@ public abstract class SkinDialog extends Dialog { } ); if ( setFocus ) { - closeButton.setFocus(); + okButton.setFocus(); } - return closeButton; + return okButton; } -- 2.34.1