shortcut: modified default close shortcut

removed force close shortcut

Change-Id: I1dcbe45fe2ebe5a14f725468e30cbbe5d46807f9
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

diff --git a/tizen/src/ui/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp
index 84fc6fd5537ccf72849f63e1245f5e91fc2c7c51..a70c8957f5f0ab71451c6bda53ace243e9d30210 100644 (file)
--- a/tizen/src/ui/mainwindow.cpp
+++ b/tizen/src/ui/mainwindow.cpp
@@ -527,13 +527,15 @@ MainWindow::~MainWindow()
 void MainWindow::closeEvent(QCloseEvent *event)
 {
     int result = QMessageBox::question(this, EMULATOR_TITLE,
-        MSG_CLOSE_POPUP, QMessageBox::Yes | QMessageBox::Default, QMessageBox::No);
+        MSG_FORCE_CLOSE_POPUP, QMessageBox::Yes, QMessageBox::No | QMessageBox::Default);
 
     if (result == QMessageBox::Yes) {
         /* force close */
+        qDebug() << "exit!";
         qemu_system_graceful_shutdown_request(TIMEOUT_FOR_SHUTDOWN);
         event->accept();
     } else {
+        qDebug() << "cancel";
         event->ignore();
     }
 }

diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp
index dbbb486e3772a6f4e6448a126f031a6827222a83..2ba7dca17f5eb509d8daeabe060877789b5f9a01 100644 (file)
--- a/tizen/src/ui/menu/contextmenu.cpp
+++ b/tizen/src/ui/menu/contextmenu.cpp
@@ -999,37 +999,7 @@ void ContextMenu::slotForceClose()
 {
     qDebug("force close");
 
-    QMessageBox *msgBox = showMsgBox(QMessageBox::Question,
-        MSG_FORCE_CLOSE_POPUP,
-        QMessageBox::No | QMessageBox::Yes, QMessageBox::No);
-
-    connect(msgBox, SIGNAL(buttonClicked(QAbstractButton *)),
-        this, SLOT(slotForceCloseSelected(QAbstractButton *)));
-}
-
-void ContextMenu::slotForceCloseSelected(QAbstractButton *button)
-{
-    QMessageBox *msgBox = (QMessageBox *)button->parent()->parent();
-    if (msgBox == NULL) {
-        qWarning() << "invalid slot call";
-        return;
-    }
-
-    switch(msgBox->standardButton(button)) {
-        case QMessageBox::Yes:
-            qDebug() << "exit!";
-            qemu_system_graceful_shutdown_request(3);
-
-            break;
-        case QMessageBox::No:
-            qDebug() << "cancel";
-
-            break;
-        default:
-            /* do nothing */
-            qWarning() << "invalid return value";
-            break;
-    }
+    parent->close();
 }
 
 void ContextMenu::slotPwkeyRelease()

diff --git a/tizen/src/ui/menu/contextmenu.h b/tizen/src/ui/menu/contextmenu.h
index 1d9d3dfa74bd0db427766d3efd1afd5042befa20..e19f5114dfe869b65dfa3cacd18cfe72dcf80cf8 100644 (file)
--- a/tizen/src/ui/menu/contextmenu.h
+++ b/tizen/src/ui/menu/contextmenu.h
@@ -97,7 +97,6 @@ public slots:
     void slotAbout();
 
     void slotForceClose();
-    void slotForceCloseSelected(QAbstractButton *);
     void slotClose();
     void slotPwkeyRelease();
 

diff --git a/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml
index 9a50f946ff209799798c178b3f04ee180f262331..f38d8c76e6a53cec94f2bf078e201423ba9645cd 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml
@@ -220,7 +220,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -232,7 +231,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml
index 57fb37d2db0bcd5ae003e2a540cc74ad250493e2..dc89dee990548bc93151b608ec6b0c75a1ab2904 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml
@@ -220,7 +220,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -232,7 +231,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml
index 7e06325f85b4b909a641c07ffc9948a8a301c610..f100fb38707a6ad9597337323c43a56c9ba5ef10 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml
@@ -220,7 +220,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -232,7 +231,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml
index d9b226ccabe46d163a91c3fea553ab911161f9ef..b0693a09bc5c26f4e871eb351c1728defcc3c218 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml
@@ -220,7 +220,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -232,7 +231,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/layout.xml
index c5c079e9af17007b8fc7af6ec4f828b1a0f0aa5d..eeb0b5a6829a9710428e4c804ede6d07abc0bf7f 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/layout.xml
@@ -59,7 +59,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -71,7 +70,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/tv/tv-1920x1080/layout.xml b/tizen/src/ui/resource/skins/tv/tv-1920x1080/layout.xml
index d9278f412e851cd3c5fd3b4b79b753961924d20c..0cb67a8ce3c64a4c81744b43da559f73321379bb 100644 (file)
--- a/tizen/src/ui/resource/skins/tv/tv-1920x1080/layout.xml
+++ b/tizen/src/ui/resource/skins/tv/tv-1920x1080/layout.xml
@@ -43,7 +43,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -55,7 +54,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/wearable-360x360-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable-360x360-1btn/layout.xml
index ef4cfda463efd3eb242de7c00a9ffe388bbab91b..19a893dd660cc17203ef110e4b562ca7e13921aa 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable-360x360-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable-360x360-1btn/layout.xml
@@ -90,7 +90,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -102,7 +101,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml
index 0ca3874630dea15d6441c513099e32aa868c59f9..ce6b4004ab0c9084741a75c2315abb7120c7e52c 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml
@@ -90,7 +90,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -102,7 +101,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml
index 3633127c6264edfcb7244caeab713b6b02a99bf9..97c15d950d39bcc0c6f02b2252e69edcfea8be05 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml
@@ -90,7 +90,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -102,7 +101,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/layout.xml
index 06b2823396d24fb530431014ab0e9944fd1ba836..af6fb1c48a176c9f7fd9beb69a7abe134a42c0cb 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/layout.xml
@@ -49,7 +49,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -61,7 +60,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml b/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
index 945f9b2935db2428918424d7dd1af16fa6e5a010..28e761c807109ae83ab31be16484b78feb9b7c8a 100644 (file)
--- a/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
@@ -98,7 +98,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -110,7 +109,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>
 

diff --git a/tizen/src/ui/resource/skins/wearableO-360x360-2btn/layout.xml b/tizen/src/ui/resource/skins/wearableO-360x360-2btn/layout.xml
index ba1248c60b52f8a1ae1fa7ef7709cf49fd3aae2a..92f576d3d8fe0cc84444be28969b941aaa700d1e 100644 (file)
--- a/tizen/src/ui/resource/skins/wearableO-360x360-2btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearableO-360x360-2btn/layout.xml
@@ -122,7 +122,6 @@
                 <separator/>
                 <aboutItem name="About"/>
                 <forceCloseItem name="Force Close">
-                    <shortcut>Ctrl+F4</shortcut>
                 </forceCloseItem>
             </menuList>
         </advancedItem>
@@ -134,7 +133,7 @@
         </controlPanelItem>
         <separator/>
         <closeItem name="Close">
-            <shortcut>F4</shortcut>
+            <shortcut>Ctrl+F4</shortcut>
         </closeItem>
     </menuList>