From 00f489a0e44ab7be466ee934793df0ae8f2b125e Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Wed, 10 Jun 2015 15:38:56 +0900 Subject: [PATCH] emul_state: set VM path information temporary on new argument parser Change-Id: I2aab1e7a50fa8c5da116357f235610c1260d60f5 Signed-off-by: GiWoong Kim --- tizen/src/display/qt5_supplement.cpp | 6 +++++- tizen/src/emul_state.c | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tizen/src/display/qt5_supplement.cpp b/tizen/src/display/qt5_supplement.cpp index a9618f3e68..b925b23a7d 100644 --- a/tizen/src/display/qt5_supplement.cpp +++ b/tizen/src/display/qt5_supplement.cpp @@ -94,19 +94,23 @@ void qt5_gui_init(void) // TODO: uiInfo->vmName = QString(get_emul_vm_name()).trimmed(); + qDebug() << "VM name :" << uiInfo->vmName; + uiInfo->resolution.setWidth(get_emul_resolution_width()); uiInfo->resolution.setHeight(get_emul_resolution_height()); uiInfo->basePort = get_emul_vm_base_port(); - uiInfo->vmDataPath = get_emul_vm_data_path(); + uiInfo->vmDataPath = QDir(get_emul_vm_data_path()).canonicalPath(); if (uiInfo->vmDataPath.endsWith(QDir::separator()) == false) { uiInfo->vmDataPath += QDir::separator(); } + qDebug() << "VM path :" << uiInfo->vmDataPath; uiInfo->skinPath = QDir(get_emul_skin_path()).canonicalPath(); if (uiInfo->skinPath.endsWith(QDir::separator()) == false) { uiInfo->skinPath += QDir::separator(); } + qDebug() << "skin path :" << uiInfo->skinPath; /* read skin information */ QSettings skinInfo(uiInfo->skinPath + SKIN_INFO_FILE_NAME, diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c index 5ad642a1e2..b5c405f527 100644 --- a/tizen/src/emul_state.c +++ b/tizen/src/emul_state.c @@ -582,5 +582,13 @@ void set_emul_vm_data_path(const char *path) const char* get_emul_vm_data_path(void) { + if (_emul_info.vm_data_path) { + return _emul_info.vm_data_path; + } + + // FIXME: we should support commandline users + _emul_info.vm_data_path = g_strdup_printf("%s/%s", + get_variable("vms_path"), get_emul_vm_name()); + return _emul_info.vm_data_path; } -- 2.34.1