From be7667e85d2d3382f3dbe299185f8d157bfffb18 Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Fri, 17 Oct 2014 19:44:06 +0900 Subject: [PATCH] menu: add None sub-menu for Controller Change-Id: Ibf40838c3acc9ccd6b51c0b7c7634afbf6f28d40 Signed-off-by: GiWoong Kim --- tizen/src/display/qt5_supplement.cpp | 5 ++++- tizen/src/ui/mainwindow.cpp | 5 ++--- tizen/src/ui/menu/contextmenu.cpp | 14 ++++++++++++++ tizen/src/ui/menu/contextmenu.h | 1 + tizen/src/ui/menu/detailedinfodialog.cpp | 2 +- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/tizen/src/display/qt5_supplement.cpp b/tizen/src/display/qt5_supplement.cpp index dd2ef40300..d75ab83f81 100644 --- 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 ca383764ee..c00cc2dd36 100644 --- 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 9e36c4ad93..b9fe39eff5 100644 --- 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 c5ed7a6f8a..2edb4321ce 100644 --- 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 9d9e415f44..9847eec235 100644 --- 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"); -- 2.34.1