From: GiWoong Kim Date: Fri, 7 Aug 2015 06:48:34 +0000 (+0900) Subject: ui: followed mandatory design guide X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~40^2~216 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba6c3717519ea3659f939824ee98405b4d50db44;p=sdk%2Femulator%2Fqemu.git ui: followed mandatory design guide - add minimize button to Screen Shot window - replace close message box's icon and buttons Change-Id: I9493ebfae843f50518ac508e42cdc1856a90a3f4 Signed-off-by: GiWoong Kim --- diff --git a/tizen/src/ui/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp index 72e228f335..e737283514 100644 --- a/tizen/src/ui/mainwindow.cpp +++ b/tizen/src/ui/mainwindow.cpp @@ -519,7 +519,7 @@ MainWindow::~MainWindow() /* override */ void MainWindow::closeEvent(QCloseEvent *event) { - int result = QMessageBox::warning(this, EMULATOR_TITLE, + int result = QMessageBox::question(this, EMULATOR_TITLE, MSG_CLOSE_POPUP, QMessageBox::Yes | QMessageBox::Default, QMessageBox::No); if (result == QMessageBox::Yes) { diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp index f2cba97342..ffd591efd4 100644 --- a/tizen/src/ui/menu/contextmenu.cpp +++ b/tizen/src/ui/menu/contextmenu.cpp @@ -723,7 +723,7 @@ void ContextMenu::slotForceClose() QMessageBox *msgBox = showMsgBox(QMessageBox::Question, MSG_FORCE_CLOSE_POPUP, - QMessageBox::Cancel | QMessageBox::Ok, QMessageBox::Cancel); + QMessageBox::No | QMessageBox::Yes, QMessageBox::No); connect(msgBox, SIGNAL(buttonClicked(QAbstractButton *)), this, SLOT(slotForceCloseSelected(QAbstractButton *))); diff --git a/tizen/src/ui/menu/screenshotdialog.cpp b/tizen/src/ui/menu/screenshotdialog.cpp index cda58fa859..36636a818e 100644 --- a/tizen/src/ui/menu/screenshotdialog.cpp +++ b/tizen/src/ui/menu/screenshotdialog.cpp @@ -36,7 +36,7 @@ #include "mainwindow.h" ScreenShotDialog::ScreenShotDialog(QWidget *parent) : - QDialog(parent) + QDialog(parent, Qt::Window) { this->win = (MainWindow *)parent; this->ratio = 1;