From: GiWoong Kim Date: Thu, 7 Jan 2016 05:38:31 +0000 (+0900) Subject: menu: improve VM information from Detailed Info X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~98 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=627ff7fe3341dbcaed6e88d6cd358559cf2595bb;p=sdk%2Femulator%2Fqemu.git menu: improve VM information from Detailed Info - reorder VM info contents - add emulator version - add network connection type - remove kernel and file info Change-Id: Idd305385ba21eb0f9240ee0c5f73cb1b8cc3e8ac Signed-off-by: GiWoong Kim --- diff --git a/tizen/src/ui/menu/aboutdialog.cpp b/tizen/src/ui/menu/aboutdialog.cpp index f88de30043..491eef6ed2 100644 --- a/tizen/src/ui/menu/aboutdialog.cpp +++ b/tizen/src/ui/menu/aboutdialog.cpp @@ -89,7 +89,8 @@ AboutDialog::AboutDialog(QWidget *parent) : } */ - QString aboutText = "" + QString(EMULATOR_TITLE) + "

" + + QString aboutText = + "" + QString(EMULATOR_TITLE) + " for " + EMULATOR_BUILD_VER + "

" + ABOUT_SDK_VERSION_TEXT + " : " + sdkVer + "
" + ABOUT_PKG_VERSION_TEXT + " : " + pkgVer + "
" + /* "Snapshot : " + SnapshotName + "
" + */ diff --git a/tizen/src/ui/menu/detailedinfodialog.cpp b/tizen/src/ui/menu/detailedinfodialog.cpp index c759b2793a..7f404902fa 100644 --- a/tizen/src/ui/menu/detailedinfodialog.cpp +++ b/tizen/src/ui/menu/detailedinfodialog.cpp @@ -28,6 +28,7 @@ */ #include "config-target.h" +#include "build_info.h" #include "detailedinfodialog.h" #include "resource/ui_strings.h" @@ -44,8 +45,8 @@ int get_display_pixel_density(void); #define DIALOG_VERTIC_SPACE 60 #define DIALOG_MIN_WIDTH 200 #define DIALOG_MIN_HEIGHT 200 -#define DIALOG_DEF_WIDTH 360 -#define DIALOG_DEF_HEIGHT 480 +#define DIALOG_DEF_WIDTH 480 +#define DIALOG_DEF_HEIGHT 360 DetailedInfoDialog::DetailedInfoDialog(QWidget *parent) : QDialog(parent) @@ -139,6 +140,11 @@ QTableWidget *DetailedInfoDialog::createVmInfoTable() QString::number(win->getUiInfo()->getResolution().height()) + " (" + QString::number(get_display_pixel_density()) + " ppi)"); + /* network connection type */ + QString networkType = (is_netclient_tap_attached()) ? "Bridged" : "NAT"; + insertTableRow(vmInfo, QString(DETAILED_INFO_NETWORK_CONNECTION), + networkType + " type"); + insertTableRow(vmInfo, QString(DETAILED_INFO_CPU_VT), (get_emul_cpu_accel()) ? QString(GENERIC_TEXT_ENABLED) : QString(GENERIC_TEXT_DISABLED)); @@ -147,12 +153,7 @@ QTableWidget *DetailedInfoDialog::createVmInfoTable() (is_gpu_accel_enabled()) ? QString(GENERIC_TEXT_ENABLED) : QString(GENERIC_TEXT_DISABLED)); - QString sharingPath(QString::fromLocal8Bit( - get_host_directory_sharing_path())); - insertTableRow(vmInfo, QString(DETAILED_INFO_HDS_PATH), - (sharingPath.isEmpty()) ? QString(GENERIC_TEXT_NONE) : sharingPath); - - /* image version */ + /* platform image version */ QString imageVer = QString::fromLocal8Bit(get_drive_image_ver()); if (imageVer.isEmpty() == false) { insertTableRow(vmInfo, QString(DETAILED_INFO_DRIVE_IMAGE_VER), imageVer); @@ -165,17 +166,10 @@ QTableWidget *DetailedInfoDialog::createVmInfoTable() drive_image_file, drive_image_file); } - QString swap_image_file(QString::fromLocal8Bit(get_swap_image_file())); - if (swap_image_file.isEmpty() == false) { - insertTableRow(vmInfo, QString(DETAILED_INFO_SWAP_IMAGE_FILE), - swap_image_file, swap_image_file); - } - - QString kernel_file(QString::fromLocal8Bit(get_kernel_file())); - if (kernel_file.isEmpty() == false) { - insertTableRow(vmInfo, QString(DETAILED_INFO_KERNEL_FILE), - kernel_file, kernel_file); - } + QString sharingPath(QString::fromLocal8Bit( + get_host_directory_sharing_path())); + insertTableRow(vmInfo, QString(DETAILED_INFO_HDS_PATH), + (sharingPath.isEmpty()) ? QString(GENERIC_TEXT_NONE) : sharingPath); QString kernel_log_redirect_file( QString::fromLocal8Bit(get_kernel_log_redirect_file())); @@ -184,17 +178,26 @@ QTableWidget *DetailedInfoDialog::createVmInfoTable() kernel_log_redirect_file, kernel_log_redirect_file); } -#if 0 - insertTableRow(vmInfo, DETAILED_INFO_TELNET_PORT, - QString::number(get_emul_serial_port())); -#endif - QString log_redirect_file(QString::fromLocal8Bit(get_log_redirect_file())); if (log_redirect_file.isEmpty() == false) { insertTableRow(vmInfo, QString(DETAILED_INFO_EMUL_LOG_FILE), log_redirect_file, log_redirect_file); } + /* emulator version */ + QString versionFilePath = QDir(QCoreApplication::applicationDirPath() + + QDir::separator() + SDK_ROOT_PATH + SDK_VERSION_FILE).absolutePath(); + QSettings versionFile(versionFilePath, QSettings::IniFormat); + QString sdkVer = versionFile.value(SDK_VERSION_FILE_KEY).toString(); + if (sdkVer.isEmpty() == true) { + qWarning() << "failed to load SDK version file from" << versionFilePath; + sdkVer = GENERIC_TEXT_UNDEFINED; + } + + QString pkgVer = QString(pkginfo_version).section(':', 1).trimmed(); + insertTableRow(vmInfo, QString(DETAILED_INFO_EMUL_VER), QString(EMULATOR_BUILD_VER) + + " Release on " + sdkVer + " SDK (" + pkgVer + ")"); + /* add double click event listener */ connect(vmInfo, SIGNAL(cellDoubleClicked(int, int)), this, SLOT(slotCellOpen(int, int))); @@ -399,9 +402,7 @@ void DetailedInfoDialog::slotCellOpen(int nRow, int nCol) if (item->text().compare(DETAILED_INFO_HDS_PATH) == 0 || item->text().compare(DETAILED_INFO_EMUL_LOG_FILE) == 0 || item->text().compare(DETAILED_INFO_KERNEL_LOG_FILE) == 0 || - item->text().compare(DETAILED_INFO_DRIVE_IMAGE_FILE) == 0 || - item->text().compare(DETAILED_INFO_SWAP_IMAGE_FILE) == 0 || - item->text().compare(DETAILED_INFO_KERNEL_FILE) == 0) { + item->text().compare(DETAILED_INFO_DRIVE_IMAGE_FILE) == 0) { qDebug("open the specified path"); /* get path item */ diff --git a/tizen/src/ui/resource/ui_strings.h b/tizen/src/ui/resource/ui_strings.h index dd3b1236a5..e2c2b17898 100644 --- a/tizen/src/ui/resource/ui_strings.h +++ b/tizen/src/ui/resource/ui_strings.h @@ -33,6 +33,7 @@ #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" @@ -101,16 +102,15 @@ #define DETAILED_INFO_CPU "CPU Arch" #define DETAILED_INFO_RAM_SIZE "Ram Size" #define DETAILED_INFO_DISPLAY "Display" +#define DETAILED_INFO_NETWORK_CONNECTION "Network Connection" #define DETAILED_INFO_CPU_VT "CPU Virtualization" #define DETAILED_INFO_GPU_VT "GPU Virtualization" #define DETAILED_INFO_HDS_PATH "Directory Sharing" -#define DETAILED_INFO_DRIVE_IMAGE_FILE "Image File" -#define DETAILED_INFO_DRIVE_IMAGE_VER "Image Version" -#define DETAILED_INFO_SWAP_IMAGE_FILE "Swap Image File" -#define DETAILED_INFO_KERNEL_FILE "Kernel File" +#define DETAILED_INFO_DRIVE_IMAGE_VER "Platform Image Version" +#define DETAILED_INFO_DRIVE_IMAGE_FILE "Platform Image File" #define DETAILED_INFO_KERNEL_LOG_FILE "Kernel Log File" -#define DETAILED_INFO_TELNET_PORT "Logging Telnet Port" #define DETAILED_INFO_EMUL_LOG_FILE "Emulator Log File" +#define DETAILED_INFO_EMUL_VER "Emulator Version" /* screen shot dialog */ #define SCREENSHOT_TITLE "Screen Shot"