menu: modified About Dialog message

consider multi-SDK path
disable snapshot information

Change-Id: I401e51981417292be465a0fc5122e04ca9046afe
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
index 7ccdd2e..8acd31f 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
@@ -189,6 +189,7 @@ public class SkinUtil {
 
        public static String getSdkVersionFilePath() {
                return (binaryPath + ".." + File.separator + ".." +
+                               File.separator + ".." + File.separator + ".." +
                                File.separator + ".." + File.separator + "sdk.version");
        }
 

diff --git a/tizen/src/ui/menu/aboutdialog.cpp b/tizen/src/ui/menu/aboutdialog.cpp
index 1690e97..09a6783 100644 (file)
--- a/tizen/src/ui/menu/aboutdialog.cpp
+++ b/tizen/src/ui/menu/aboutdialog.cpp
@@ -31,6 +31,8 @@
 #include "build_info.h"
 
 #define SDK_NAME "Tizen SDK"
+#define SDK_VERSION_FILE_PATH "../../../../../sdk.version"
+#define SDK_VERSION_FILE_KEY "TIZEN_SDK_VERSION"
 #define URL_TIZEN_ORG "<a href=\"https://developer.tizen.org\">https://developer.tizen.org</a>";
 
 AboutDialog::AboutDialog(QWidget *parent) :
@@ -51,13 +53,14 @@ AboutDialog::AboutDialog(QWidget *parent) :
     imageLabel->setPixmap(QPixmap(":/images/tizen_sdk.png"));
     upsideLayout->addWidget(imageLabel);
 
-    QSettings sdkVersion("../../../sdk.version", QSettings::IniFormat);
-    QString version = sdkVersion.value("TIZEN_SDK_VERSION").toString();
+    QSettings sdkVersion(SDK_VERSION_FILE_PATH, QSettings::IniFormat);
+    QString version = sdkVersion.value(SDK_VERSION_FILE_KEY).toString();
     if (version.isEmpty() == true) {
         qWarning("failed to load SDK version");
         version = "Undefined";
     }
 
+    /*
     QString SnapshotName = "Undefined";
     QFile file("../../../install-manager/installmanager.conf");
     if (file.open(QIODevice::ReadOnly | QIODevice::Text) == true) {
@@ -75,10 +78,11 @@ AboutDialog::AboutDialog(QWidget *parent) :
     } else {
         qWarning("failed to load snapshot name");
     }
+    */
 
     QString aboutText = QString(SDK_NAME) + "<p>"
         + "Version : " + version + "<br>"
-        + "Snapshot : " + SnapshotName + "<br>"
+        /* + "Snapshot : " + SnapshotName + "<br>" */
         + "Build Date : " + QString(build_date) + "<p><br>"
         + "Visit " + URL_TIZEN_ORG;
 
@@ -105,6 +109,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
     baseLayout->addLayout(downsideLayout);
 }
 
+/* override */
 void AboutDialog::showEvent(QShowEvent *event)
 {
     Q_UNUSED(event)