menu: enable DPI information on Detailed Info dialog

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

diff --git a/tizen/src/ui/menu/detailedinfodialog.cpp b/tizen/src/ui/menu/detailedinfodialog.cpp
index 38d19cf9567320ffef5bc7d8e9418af71e3d7d23..86b0161559546e0147593230a62fcc5d712810f4 100644 (file)
--- a/tizen/src/ui/menu/detailedinfodialog.cpp
+++ b/tizen/src/ui/menu/detailedinfodialog.cpp
@@ -31,6 +31,10 @@
 #include "resource/ui_strings.h"
 #include "mainwindow.h"
 
+extern "C" {
+int get_display_pixel_density(void);
+}
+
 extern int _qemu_argc;
 extern char **_qemu_argv;
 
@@ -87,23 +91,29 @@ DetailedInfoDialog::DetailedInfoDialog(QWidget *parent) :
     int index = 0;
     setDataTable(vmInfoTable, DETAILED_INFO_VM_NAME,
         win->uiInfo->vmName, index++);
+
     setDataTable(vmInfoTable, DETAILED_INFO_SKIN_NAME,
         win->uiInfo->skinName, index++);
+
     setDataTable(vmInfoTable, DETAILED_INFO_CPU, "x86", index++);
+
     setDataTable(vmInfoTable, DETAILED_INFO_RAM_SIZE,
         QString(get_emul_ram_size()) + " MB", index++);
+
     setDataTable(vmInfoTable, DETAILED_INFO_DPY_RESOLUTION,
         QString::number(win->uiInfo->resolution.width()) + "x" +
         QString::number(win->uiInfo->resolution.height()), index++);
-#if 0
-    setDataTable(vmInfoTable, "Display Density", "0"/* TODO: */, index++);
-#endif
+
+    setDataTable(vmInfoTable, DETAILED_INFO_DPY_DENSITY,
+        QString::number(get_display_pixel_density()), index++);
 
     QString sharingPath(get_emul_file_sharing_path());
     setDataTable(vmInfoTable, DETAILED_INFO_HDS_PATH,
         (sharingPath.isEmpty()) ? "None" : sharingPath, index++);
+
     setDataTable(vmInfoTable, DETAILED_INFO_CPU_VT,
         (get_emul_cpu_accel()) ? "Enabled" : "Disabled", index++);
+
     setDataTable(vmInfoTable, DETAILED_INFO_GPU_VT,
         (is_gpu_accel_enabled()) ? "Enabled" : "Disabled", index++);
 
@@ -113,6 +123,7 @@ DetailedInfoDialog::DetailedInfoDialog(QWidget *parent) :
 
         item->setToolTip(imagePathList[i]);
     }
+
     setDataTable(vmInfoTable, DETAILED_INFO_LOG_PATH, get_log_path(), index++);
     item->setToolTip(get_log_path());
 
@@ -193,7 +204,8 @@ void DetailedInfoDialog::slotSetMaximumSize(int tab)
     table->horizontalHeader()->setStretchLastSection(true);
 }
 
-void DetailedInfoDialog::setShortcutInfoTable(QMap<QString, QString> map, QList<QShortcut *> list)
+void DetailedInfoDialog::setShortcutInfoTable(
+    QMap<QString, QString> map, QList<QShortcut *> list)
 {
     int row = shortcutInfoTable->rowCount();
     QMap<QString, QString>::const_iterator mapIter = map.constBegin();
@@ -216,7 +228,8 @@ void DetailedInfoDialog::setShortcutInfoTable(QMap<QString, QString> map, QList<
     }
 }
 
-void DetailedInfoDialog::setDataTable(QTableWidget* table, QString key, QString value, int index)
+void DetailedInfoDialog::setDataTable(
+    QTableWidget* table, QString key, QString value, int index)
 {
     table->insertRow(index);
     item = new QTableWidgetItem(key);

diff --git a/tizen/src/ui/qt5.c b/tizen/src/ui/qt5.c
index 7e8a714522d033c3dd286e658971b5e3e2f207e2..91ee0a695293c83fc9d35b6c5ed445558b8fbb75 100644 (file)
--- a/tizen/src/ui/qt5.c
+++ b/tizen/src/ui/qt5.c
@@ -166,9 +166,16 @@ static void maru_qt5_display_fini(void)
 
 void set_display_pixel_density(int dpi)
 {
+    LOG_INFO("display density: %d\n", dpi);
+
     pixel_density_dpi = dpi;
 }
 
+int get_display_pixel_density(void)
+{
+    return pixel_density_dpi;
+}
+
 void maru_qt5_display_init(DisplayState *ds, int full_screen)
 {
     int i;

diff --git a/tizen/src/ui/qt5.h b/tizen/src/ui/qt5.h
index b1aac1c35455912e821e4d1c683f333878f422cb..83ee83ac77bdef8a927c3f4a31c8988428965c6e 100644 (file)
--- a/tizen/src/ui/qt5.h
+++ b/tizen/src/ui/qt5.h
@@ -37,5 +37,6 @@ void maru_early_qt5_display_init(bool isOnscreen);
 void maru_qt5_display_init(DisplayState *ds, int full_screen);
 
 void set_display_pixel_density(int dpi);
+int get_display_pixel_density(void);
 
 #endif // __QT5_H__

diff --git a/tizen/src/ui/resource/ui_strings.h b/tizen/src/ui/resource/ui_strings.h
index c1e1f85d2c461c77d0b75369072f53c2b9a7be33..4d3821a91aeb0563e54cef7438579d6aaf001095 100644 (file)
--- a/tizen/src/ui/resource/ui_strings.h
+++ b/tizen/src/ui/resource/ui_strings.h
@@ -73,6 +73,7 @@
 #define DETAILED_INFO_CPU "CPU"
 #define DETAILED_INFO_RAM_SIZE "Ram Size"
 #define DETAILED_INFO_DPY_RESOLUTION "Display Resolution"
+#define DETAILED_INFO_DPY_DENSITY "Display Density"
 #define DETAILED_INFO_HDS_PATH "File Sharing Path"
 #define DETAILED_INFO_CPU_VT "CPU Virtualization"
 #define DETAILED_INFO_GPU_VT "GPU Virtualization"