From 98ef667ccfd04fa2d3147c7ff7b66e4519afa195 Mon Sep 17 00:00:00 2001
From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Tue, 1 Sep 2015 17:11:01 +0900
Subject: [PATCH] menu: modified About dialog contents

- change title (Tizen SDK -> Tizen Emulator)
- add a pacakge version information

Change-Id: Iedc9bf503705358340813d483faca5d3d6a601e8
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---
 tizen/src/ui/menu/aboutdialog.cpp  | 15 ++++++++++-----
 tizen/src/ui/resource/ui_strings.h |  4 +++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tizen/src/ui/menu/aboutdialog.cpp b/tizen/src/ui/menu/aboutdialog.cpp
index 88a8dd090d..f88de30043 100644
--- a/tizen/src/ui/menu/aboutdialog.cpp
+++ b/tizen/src/ui/menu/aboutdialog.cpp
@@ -56,15 +56,19 @@ AboutDialog::AboutDialog(QWidget *parent) :
     }
     upsideLayout->addWidget(imageLabel);
 
+    /* SDK version */
     QString versionFilePath = QDir(QCoreApplication::applicationDirPath() +
         QDir::separator() + SDK_ROOT_PATH + SDK_VERSION_FILE).absolutePath();
     QSettings versionFile(versionFilePath, QSettings::IniFormat);
-    QString version = versionFile.value(SDK_VERSION_FILE_KEY).toString();
-    if (version.isEmpty() == true) {
+    QString sdkVer = versionFile.value(SDK_VERSION_FILE_KEY).toString();
+    if (sdkVer.isEmpty() == true) {
         qWarning() << "failed to load SDK version file from" << versionFilePath;
-        version = "Undefined";
+        sdkVer = GENERIC_TEXT_UNDEFINED;
     }
 
+    /* Package version */
+    QString pkgVer = QString(pkginfo_version).section(':', 1);
+
     /*
     QString SnapshotName = "Undefined";
     QFile file("../../../install-manager/installmanager.conf");
@@ -85,8 +89,9 @@ AboutDialog::AboutDialog(QWidget *parent) :
     }
     */
 
-    QString aboutText = QString(SDK_OFFICIAL_NAME) + "<p>" +
-        ABOUT_VERSION_TEXT + " : " + version + "<br>" +
+    QString aboutText = "<b>" + QString(EMULATOR_TITLE) + "</b><p>" +
+        ABOUT_SDK_VERSION_TEXT + " : " + sdkVer + "<br>" +
+        ABOUT_PKG_VERSION_TEXT + " : " + pkgVer + "<br>" +
         /* "Snapshot : " + SnapshotName + "<br>" + */
         ABOUT_BUILD_DATE_TEXT + " : " + QString(build_date) + "<p><br>" +
         ABOUT_VISIT_TEXT + " <a href=\"" + SDK_OFFICIAL_URL + "\">" +
diff --git a/tizen/src/ui/resource/ui_strings.h b/tizen/src/ui/resource/ui_strings.h
index a2d2ddb8e6..115fee755e 100644
--- a/tizen/src/ui/resource/ui_strings.h
+++ b/tizen/src/ui/resource/ui_strings.h
@@ -60,6 +60,7 @@
 #define GENERIC_TEXT_NONE "None"
 #define GENERIC_TEXT_ENABLED "Enabled"
 #define GENERIC_TEXT_DISABLED "Disabled"
+#define GENERIC_TEXT_UNDEFINED "Undefined"
 
 /* context menu */
 #define MENU_ONTOP_ITEM_TEXT "Always on Top"
@@ -112,7 +113,8 @@
 
 /* about dialog */
 #define ABOUT_TITLE "About Emulator"
-#define ABOUT_VERSION_TEXT "Version"
+#define ABOUT_SDK_VERSION_TEXT "SDK Version"
+#define ABOUT_PKG_VERSION_TEXT "Package Version"
 #define ABOUT_BUILD_DATE_TEXT "Build Date"
 #define ABOUT_VISIT_TEXT "Visit"
 
-- 
2.34.1