From c4fa4ebebde177386533dbf8f1b6df6bdd5e8bc0 Mon Sep 17 00:00:00 2001 From: heeyoung Date: Tue, 7 Oct 2014 18:39:40 +0900 Subject: [PATCH] AboutDialog : add DA Version information Change-Id: Iecdf591935f21cd0709de9d2357d761d4b60c9ea Signed-off-by: heeyoung --- .../dynamicanalyzer/common/AnalyzerConstants.java | 1 + .../org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java | 1 + .../dynamicanalyzer/nl/AnalyzerLabels.properties | 3 ++- .../tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java | 19 ++++++++++++++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java index 60ee3c8..cd9e6bd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java @@ -37,6 +37,7 @@ public class AnalyzerConstants { public static final String DA_VERSION_SWAP = "3.0"; public static final String DA_VERSION_OLD = "2.2"; + public static final String DA_VERSION = "DA-2014-10-07"; /* folder names */ public static final String TEMP_FOLDER_RUN_PREFIX = ".RUN"; //$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java index 2a0f2d6..1204ab4 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java @@ -138,6 +138,7 @@ public class AnalyzerLabels extends NLS { public static String ABOUT_DIALOG_TITLE; public static String ABOUT_DIALOG_BUILD_TIME_TAB; public static String ABOUT_DIALOG_VERSION_TAB; + public static String ABOUT_DIALOG_DA_VERSION_TAB; public static String ABOUT_DIALOG_LICENSE; public static String CONFIGURATION_DIALOG_AUTO_RANGE; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties index c3fcc0c..bdb8f74 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties @@ -102,7 +102,8 @@ LICENSE_DIALOG_NOT_FOUND=License file not found ABOUT_DIALOG_TITLE=Tizen Dynamic Analyzer ABOUT_DIALOG_BUILD_TIME_TAB=Build time\t: -ABOUT_DIALOG_VERSION_TAB=Version\t\t: +ABOUT_DIALOG_VERSION_TAB=SDK Version\t: +ABOUT_DIALOG_DA_VERSION_TAB=DA Version\t: ABOUT_DIALOG_LICENSE=License CONFIGURATION_DIALOG_AUTO_RANGE=Auto Range View Transmit diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java index 3f6e094..5e0a9ab 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java @@ -49,6 +49,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.appearance.DesignConstants; +import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; @@ -73,6 +74,8 @@ public class AboutDialog extends DAMessageBox { private static String ideBuildVersionInfo = CommonConstants.EMPTY; private static String daBuildVersionInfo = CommonConstants.EMPTY; private static String daBuildTimeInfo = CommonConstants.EMPTY; + + private static String daVersionInfo = AnalyzerConstants.DA_VERSION; private final Image iconImage = ImageResources.ABOUT_TIZEN_SDK; @@ -153,6 +156,13 @@ public class AboutDialog extends DAMessageBox { version.setForeground(ColorResources.DEFAULT_FONT_COLOR); version.setFont(FontResources.ABOUT_TEXT); + Label daVersion = new Label(base, SWT.TRANSPARENT); + daVersion.setText(AnalyzerLabels.ABOUT_DIALOG_DA_VERSION_TAB + daVersionInfo); + daVersion.setBackground(ColorResources.DIALOG_BG_UPPER); + daVersion.setAlignment(SWT.LEFT); + daVersion.setForeground(ColorResources.DEFAULT_FONT_COLOR); + daVersion.setFont(FontResources.ABOUT_TEXT); + Label buildTime = new Label(base, SWT.TRANSPARENT); // String buildTimeString = getBuildTime();// FIXME buildTime.setText(AnalyzerLabels.ABOUT_DIALOG_BUILD_TIME_TAB + daBuildTimeInfo); @@ -160,7 +170,7 @@ public class AboutDialog extends DAMessageBox { buildTime.setAlignment(SWT.LEFT); buildTime.setForeground(ColorResources.DEFAULT_FONT_COLOR); buildTime.setFont(FontResources.ABOUT_TEXT); - + FormData labelData = new FormData(); labelData.left = new FormAttachment(0, 0); labelData.top = new FormAttachment(0, 0); @@ -191,6 +201,13 @@ public class AboutDialog extends DAMessageBox { labelData.right = new FormAttachment(100, 0); labelData.top = new FormAttachment(0, textPos += 17); labelData.height = 17; + daVersion.setLayoutData(labelData); + + labelData = new FormData(); + labelData.left = new FormAttachment(0, 155); + labelData.right = new FormAttachment(100, 0); + labelData.top = new FormAttachment(0, textPos += 17); + labelData.height = 17; buildTime.setLayoutData(labelData); Composite buttonComp = new Composite(shell, SWT.NONE); -- 2.7.4