about: change version from build version to platform version
authorjihye <jihye424.kim@samsung.com>
Mon, 26 Sep 2016 09:19:00 +0000 (18:19 +0900)
committerJiHye Kim <jihye424.kim@samsung.com>
Tue, 27 Sep 2016 05:42:13 +0000 (14:42 +0900)
Change-Id: I4095209a97b751f51ce7c9696a98202399892493
Signed-off-by: jihye <jihye424.kim@samsung.com>
tizen/src/ui/menu/aboutdialog.cpp
tizen/src/ui/menu/detailedinfodialog.cpp
tizen/src/ui/resource/ui_strings.h

index 491eef6ed273b6356d293d5a651141bd72b0eee3..9b921554ba854690efd3816c8ade032a84425078 100644 (file)
@@ -30,6 +30,8 @@
 #include "aboutdialog.h"
 #include "resource/ui_strings.h"
 #include "build_info.h"
+#include "mainwindow.h"
+#include "emul_state.h"
 
 AboutDialog::AboutDialog(QWidget *parent) :
     QDialog(parent, Qt::Dialog | Qt::WindowStaysOnTopHint)
@@ -56,6 +58,9 @@ AboutDialog::AboutDialog(QWidget *parent) :
     }
     upsideLayout->addWidget(imageLabel);
 
+    /* Emulator platform version*/
+    QString platformVersion = QString(get_platform_version()).section('-', 1).trimmed();
+
     /* SDK version */
     QString versionFilePath = QDir(QCoreApplication::applicationDirPath() +
         QDir::separator() + SDK_ROOT_PATH + SDK_VERSION_FILE).absolutePath();
@@ -90,7 +95,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
     */
 
     QString aboutText =
-        "<b>" + QString(EMULATOR_TITLE) + " for " + EMULATOR_BUILD_VER + "</b><p>" +
+        "<b>" + QString(EMULATOR_TITLE) + " for " +  platformVersion + "</b><p>" +
         ABOUT_SDK_VERSION_TEXT + " : " + sdkVer + "<br>" +
         ABOUT_PKG_VERSION_TEXT + " : " + pkgVer + "<br>" +
         /* "Snapshot : " + SnapshotName + "<br>" + */
index 6bd9be74f134eed0e4ee08d7bcb7e98700b55b10..cbf664055251713d355020187fe7a883942dc359 100644 (file)
@@ -34,6 +34,7 @@
 #include "resource/ui_strings.h"
 #include "mainwindow.h"
 #include "menu/advancedmenuitem.h"
+#include "emul_state.h"
 
 extern "C" {
 int get_display_pixel_density(void);
@@ -202,7 +203,7 @@ QTableWidget *DetailedInfoDialog::createVmInfoTable()
     }
 
     QString pkgVer = QString(pkginfo_version).section(':', 1).trimmed();
-    insertTableRow(vmInfo, QString(DETAILED_INFO_EMUL_VER), QString(EMULATOR_BUILD_VER) +
+    insertTableRow(vmInfo, QString(DETAILED_INFO_EMUL_VER), QString(get_platform_version()).section('-', 1).trimmed() +
         " Release on " + sdkVer + " SDK (" + pkgVer + ")");
 
     /* add double click event listener */
index 65566ffcf88f63f88f3d0e73608ce879566e257b..3a5c3afa5c0ad6a2c9eba0b9e3e500290734a682 100644 (file)
@@ -33,7 +33,6 @@
 #define UI_STRINGS_H
 
 #define EMULATOR_TITLE "Tizen Emulator"
-#define EMULATOR_BUILD_VER "3.0"
 
 #define SDK_OFFICIAL_NAME "Tizen SDK"
 #define SDK_OFFICIAL_URL "https://developer.tizen.org"