menu: add None sub-menu for Controller

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

diff --git a/tizen/src/display/qt5_supplement.cpp b/tizen/src/display/qt5_supplement.cpp
index dd2ef40300d1f9d7f00680974d60741fdbff1c5c..d75ab83f816a68da7c98ae449c2880a72c6e325c 100644 (file)
--- a/tizen/src/display/qt5_supplement.cpp
+++ b/tizen/src/display/qt5_supplement.cpp
@@ -191,11 +191,14 @@ void qt5_gui_init(void)
     mainwindow->show();
 
     /* controller */
+    const int defaultDockPos = Qt::AlignRight | Qt::AlignCenter;
+    mainwindow->getUIState()->conState.recentlyDockPos = defaultDockPos;
+
     int conIndex = mruInfo.value(SKIN_PROPERTY_CONTROLLER_INDEX).toInt();
     if (conIndex >= 0 && conIndex < uiInfo->conFormList.count()) {
         int conDockPos = mruInfo.value(SKIN_PROPERTY_CONTROLLER_DOCK).toInt();
         if (conDockPos <= 0) {
-            conDockPos = Qt::AlignRight | Qt::AlignCenter;
+            conDockPos = defaultDockPos;
         }
 
         mainwindow->openController(conIndex, conDockPos);

diff --git a/tizen/src/ui/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp
index ca383764ee53fa334b68069c135690ee10271349..c00cc2dd3601cd568411e674ed1189d6780ec62d 100644 (file)
--- a/tizen/src/ui/mainwindow.cpp
+++ b/tizen/src/ui/mainwindow.cpp
@@ -43,10 +43,9 @@ QOpenGLContext *qt5GLContext = NULL;
 QSurfaceFormat qt5GLFormat;
 
 DisplaySwapper::DisplaySwapper(QGLContext* context, QObject* parent)
-: QObject(parent),
-  context(context),
-  terminating(false)
+    : QObject(parent), context(context), terminating(false)
 {
+    /* do nothing */
 }
 
 void DisplaySwapper::display()

diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp
index 9e36c4ad93d64a86223cee8ccacb528388287bd0..b9fe39eff5aaab31f00799067361cedb40aff1ee 100644 (file)
--- a/tizen/src/ui/menu/contextmenu.cpp
+++ b/tizen/src/ui/menu/contextmenu.cpp
@@ -159,6 +159,12 @@ void ContextMenu::createItems() {
         controllerMapper = new QSignalMapper(this);
         connect(controllerMapper, SIGNAL(mapped(int)), this, SLOT(slotController(int)));
 
+        action = controllerMenu->addAction("None");
+        action->setActionGroup(controllerGroup);
+        action->setCheckable(true);
+        action->setChecked(true);
+        connect(action, SIGNAL(triggered()), this, SLOT(slotCloseCon()));
+
         for (int i = 0; i < win->uiInfo->conFormList.count(); i++) {
             action = controllerMenu->addAction(win->uiInfo->conFormList.at(i)->name);
             action->setActionGroup(controllerGroup);
@@ -315,6 +321,14 @@ void ContextMenu::slotController(int index)
         parent->getUIState()->conState.recentlyDockPos);
 }
 
+void ContextMenu::slotCloseCon()
+{
+    qDebug("controller : None");
+
+    parent->closeController();
+    parent->getUIState()->conState.conFormIndex = -1;
+}
+
 void ContextMenu::slotShell()
 {
     qDebug("SDB shell");

diff --git a/tizen/src/ui/menu/contextmenu.h b/tizen/src/ui/menu/contextmenu.h
index c5ed7a6f8a15cbef7c66a38577e9f690525583d6..2edb4321ceb2f65ddd6046fd25b259ba473af466 100644 (file)
--- a/tizen/src/ui/menu/contextmenu.h
+++ b/tizen/src/ui/menu/contextmenu.h
@@ -66,6 +66,7 @@ public slots:
     void slotRotate(int angle);
     void slotScale(int scale);
     void slotController(int index);
+    void slotCloseCon();
     void slotShell();
     void slotControlPanel();
     void slotHostKeyboard(bool on);

diff --git a/tizen/src/ui/menu/detailedinfodialog.cpp b/tizen/src/ui/menu/detailedinfodialog.cpp
index 9d9e415f44e8f102a211acfdd92166bd3e007a80..9847eec2352d18ab7112ed6f5b0d2933f62bcf47 100644 (file)
--- a/tizen/src/ui/menu/detailedinfodialog.cpp
+++ b/tizen/src/ui/menu/detailedinfodialog.cpp
@@ -83,7 +83,7 @@ DetailedInfoDialog::DetailedInfoDialog(QWidget *parent) :
 
     item = new QTableWidgetItem("Ram Size");
     infoTable->setItem(index, 0, item);
-    item = new QTableWidgetItem(get_emul_ram_size());
+    item = new QTableWidgetItem(QString(get_emul_ram_size()) + " MB");
     infoTable->setItem(index++, 1, item);
 
     item = new QTableWidgetItem("Display Resolution");