From 06b228b27e39900a2159b6e983896e6623fdaf37 Mon Sep 17 00:00:00 2001
From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Wed, 29 Jul 2015 20:44:07 +0900
Subject: [PATCH] menu: SDK image packaging for About dialog

Change-Id: Ib3f61ed7ec943940099dbd4cbeed3af8486af693
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---
 tizen/src/Makefile                   | 2 ++
 tizen/src/ui/displaybase.cpp         | 8 +++-----
 tizen/src/ui/menu/aboutdialog.cpp    | 7 ++++---
 tizen/src/ui/resource/maru_strings.h | 9 +++++++++
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 04e69e9..2af8478 100755
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -184,6 +184,7 @@ endif
 
 ifdef CONFIG_QT
 	cp -pP ui/resource/images/display_off_guide.png $(EMUL_DIR)/images
+	cp -pP ui/resource/images/tizen_sdk.png $(EMUL_DIR)/images
 ifdef CONFIG_DARWIN
 	cp -pP ui/resource/icons/emulator_icon.ico $(EMUL_DIR)/icons
 endif
@@ -323,6 +324,7 @@ endif
 
 ifdef CONFIG_QT
 	cp -pP ui/resource/images/display_off_guide.png $(DIBS_COMMON_DIR)/images
+	cp -pP ui/resource/images/tizen_sdk.png $(DIBS_COMMON_DIR)/images
 ifdef CONFIG_DARWIN
 	cp -pP ui/resource/icons/emulator_icon.ico $(DIBS_COMMON_DIR)/icons
 endif
diff --git a/tizen/src/ui/displaybase.cpp b/tizen/src/ui/displaybase.cpp
index 4f253d4..49622fe 100644
--- a/tizen/src/ui/displaybase.cpp
+++ b/tizen/src/ui/displaybase.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "displaybase.h"
+#include "resource/maru_strings.h"
 #include "mainwindow.h"
 
 extern "C" {
@@ -36,9 +37,6 @@ void req_set_sensor_accel_angle(int angle);
 void maru_tablet_event(int event_type, int x, int y, int btn, int btn_status);
 }
 
-#define BLANK_GUIDE_IMAGE_PATH "../images/"
-#define BLANK_GUIDE_IMAGE_NAME "display_off_guide.png"
-
 uint32_t qt5_window_width = 0;
 uint32_t qt5_window_height = 0;
 int qt5_window_angle = 0;
@@ -78,8 +76,8 @@ DisplayBase::DisplayBase(DisplayType *displayForm, QSize resolution, qreal scale
 
 void DisplayBase::loadGuideImg()
 {
-    QString guide_img_path(BLANK_GUIDE_IMAGE_PATH);
-    guide_img_path.append(BLANK_GUIDE_IMAGE_NAME);
+    QString guide_img_path(SDK_EMULATOR_IMAGES_PATH);
+    guide_img_path.append(DISPLAY_OFF_GUIDE_IMAGE_FILE);
 
     bool ret = gImg->load(guide_img_path);
     if (ret == false) {
diff --git a/tizen/src/ui/menu/aboutdialog.cpp b/tizen/src/ui/menu/aboutdialog.cpp
index 0599197..bc0ec33 100644
--- a/tizen/src/ui/menu/aboutdialog.cpp
+++ b/tizen/src/ui/menu/aboutdialog.cpp
@@ -32,7 +32,6 @@
 #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>";
 
@@ -51,10 +50,12 @@ AboutDialog::AboutDialog(QWidget *parent) :
     upsideLayout->setSpacing(0);
 
     QLabel *imageLabel = new QLabel(this);
-    imageLabel->setPixmap(QPixmap(":/images/tizen_sdk.png"));
+    imageLabel->setPixmap(QPixmap(
+        QString(SDK_EMULATOR_IMAGES_PATH) + QString(SDK_ABOUT_IMAGE_FILE)));
     upsideLayout->addWidget(imageLabel);
 
-    QSettings sdkVersion(SDK_VERSION_FILE_PATH, QSettings::IniFormat);
+    QSettings sdkVersion(
+        QString(SDK_ROOT_PATH) + QString(SDK_VERSION_FILE), QSettings::IniFormat);
     QString version = sdkVersion.value(SDK_VERSION_FILE_KEY).toString();
     if (version.isEmpty() == true) {
         qWarning("failed to load SDK version");
diff --git a/tizen/src/ui/resource/maru_strings.h b/tizen/src/ui/resource/maru_strings.h
index bbd5602..f249f07 100644
--- a/tizen/src/ui/resource/maru_strings.h
+++ b/tizen/src/ui/resource/maru_strings.h
@@ -30,6 +30,15 @@
 #ifndef MARU_STRINGS_H
 #define MARU_STRINGS_H
 
+/* SDK path */
+#define SDK_ROOT_PATH "../../../../../"
+#define SDK_EMULATOR_IMAGES_PATH "../images/"
+
+/* resource file name */
+#define SDK_ABOUT_IMAGE_FILE "tizen_sdk.png"
+#define SDK_VERSION_FILE "sdk.version"
+#define DISPLAY_OFF_GUIDE_IMAGE_FILE "display_off_guide.png"
+
 /* detailed info dialog */
 #define DETAILED_INFO_TITLE "Detailed Info"
 #define DETAILED_INFO_VMTAB_TITLE "VM Info"
-- 
2.7.4