reboot: add popup message & rename 'Force Reboot'

the location of reboot menu item is changed from first depth to
second depth under Advanced menu.

Change-Id: Ie471387ff45807f8819439ee16336b07b0053ab4
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>

diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp
index fb7e4b4..4e4514c 100644 (file)
--- a/tizen/src/ui/menu/contextmenu.cpp
+++ b/tizen/src/ui/menu/contextmenu.cpp
@@ -87,6 +87,9 @@ ContextMenu::ContextMenu(QWidget *parent) : QMenu(parent)
 
     /* for system reset */
     rebootTimer = new QTimer(this);
+    rebootTimer->setInterval(HARDWARE_REBOOT_INTERVAL);
+    rebootTimer->setSingleShot(true);
+    connect(rebootTimer, SIGNAL(timeout()), this, SLOT(slotDeviceReset()));
 
     createItems(this, this->parent->getUiInfo()->getMenuList());
 
@@ -1058,16 +1061,18 @@ void ContextMenu::slotDeviceReset()
 
 void ContextMenu::slotSystemReset()
 {
-    qDebug("Reboot.");
+    int result = QMessageBox::question(this, EMULATOR_TITLE,
+        MSG_SYSTEM_RESET_POPUP, QMessageBox::Yes, QMessageBox::No | QMessageBox::Default);
 
-    send_shutdown_request(MENU_ACTION_REBOOT);
+    if (result == QMessageBox::Yes) {
+        qDebug() << "Reboot.";
 
-    qDebug("Sent sync message to emuld.");
+        send_shutdown_request(MENU_ACTION_REBOOT);
 
-    rebootTimer->setInterval(HARDWARE_REBOOT_INTERVAL);
-    rebootTimer->setSingleShot(true);
-    connect(rebootTimer, SIGNAL(timeout()), this, SLOT(slotDeviceReset()));
-    rebootTimer->start();
+        rebootTimer->start();
+    } else {
+        qDebug() << "cancelled to reboot.";
+    }
 }
 
 void ContextMenu::slotForceClose()

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 3c13b91..27e43d8 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
@@ -222,6 +222,9 @@
                 </screenShotItem>
                 <separator/>
                 <aboutItem name="About"/>
+                <rebootItem name="Force Reboot">
+                    <shortcut>Ctrl+Shift+Del</shortcut>
+                </rebootItem>
                 <forceCloseItem name="Force Close">
                 </forceCloseItem>
             </menuList>
@@ -233,9 +236,6 @@
             <shortcut>Ctrl+Shift+P</shortcut>
         </controlPanelItem>
         <separator/>
-        <rebootItem name="Reboot">
-            <shortcut>Ctrl+Shift+Del</shortcut>
-        </rebootItem>
         <closeItem name="Close">
             <shortcut>Ctrl+Shift+F4</shortcut>
         </closeItem>

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 4b7a4f1..1ab18fb 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
@@ -222,6 +222,9 @@
                 </screenShotItem>
                 <separator/>
                 <aboutItem name="About"/>
+                <rebootItem name="Force Reboot">
+                    <shortcut>Ctrl+Shift+Del</shortcut>
+                </rebootItem>
                 <forceCloseItem name="Force Close">
                 </forceCloseItem>
             </menuList>
@@ -233,9 +236,6 @@
             <shortcut>Ctrl+Shift+P</shortcut>
         </controlPanelItem>
         <separator/>
-        <rebootItem name="Reboot">
-            <shortcut>Ctrl+Shift+Del</shortcut>
-        </rebootItem>
         <closeItem name="Close">
             <shortcut>Ctrl+Shift+F4</shortcut>
         </closeItem>

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 ad27c9d..147f6b4 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
@@ -222,6 +222,9 @@
                 </screenShotItem>
                 <separator/>
                 <aboutItem name="About"/>
+                <rebootItem name="Force Reboot">
+                    <shortcut>Ctrl+Shift+Del</shortcut>
+                </rebootItem>
                 <forceCloseItem name="Force Close">
                 </forceCloseItem>
             </menuList>
@@ -233,9 +236,6 @@
             <shortcut>Ctrl+Shift+P</shortcut>
         </controlPanelItem>
         <separator/>
-        <rebootItem name="Reboot">
-            <shortcut>Ctrl+Shift+Del</shortcut>
-        </rebootItem>
         <closeItem name="Close">
             <shortcut>Ctrl+Shift+F4</shortcut>
         </closeItem>

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 2f4f46c..01bfc86 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
@@ -61,6 +61,9 @@
                 </screenShotItem>
                 <separator/>
                 <aboutItem name="About"/>
+                <rebootItem name="Force Reboot">
+                    <shortcut>Ctrl+Shift+Del</shortcut>
+                </rebootItem>
                 <forceCloseItem name="Force Close">
                 </forceCloseItem>
             </menuList>
@@ -72,9 +75,6 @@
             <shortcut>Ctrl+Shift+P</shortcut>
         </controlPanelItem>
         <separator/>
-        <rebootItem name="Reboot">
-            <shortcut>Ctrl+Shift+Del</shortcut>
-        </rebootItem>
         <closeItem name="Close">
             <shortcut>Ctrl+Shift+F4</shortcut>
         </closeItem>

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 b4be699..852854e 100644 (file)
--- a/tizen/src/ui/resource/skins/tv/tv-1920x1080/layout.xml
+++ b/tizen/src/ui/resource/skins/tv/tv-1920x1080/layout.xml
@@ -44,6 +44,9 @@
                 </screenShotItem>
                 <separator/>
                 <aboutItem name="About"/>
+                <rebootItem name="Force Reboot">
+                    <shortcut>Ctrl+Shift+Del</shortcut>
+                </rebootItem>
                 <forceCloseItem name="Force Close">
                 </forceCloseItem>
             </menuList>
@@ -55,9 +58,6 @@
             <shortcut>Ctrl+Shift+P</shortcut>
         </controlPanelItem>
         <separator/>
-        <rebootItem name="Reboot">
-            <shortcut>Ctrl+Shift+Del</shortcut>
-        </rebootItem>
         <closeItem name="Close">
             <shortcut>Ctrl+Shift+F4</shortcut>
         </closeItem>

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 1d7478d..3ef248a 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
@@ -92,6 +92,9 @@
                 </screenShotItem>
                 <separator/>
                 <aboutItem name="About"/>
+                <rebootItem name="Force Reboot">
+                    <shortcut>Ctrl+Shift+Del</shortcut>
+                </rebootItem>
                 <forceCloseItem name="Force Close">
                 </forceCloseItem>
             </menuList>
@@ -103,9 +106,6 @@
             <shortcut>Ctrl+Shift+P</shortcut>
         </controlPanelItem>
         <separator/>
-        <rebootItem name="Reboot">
-            <shortcut>Ctrl+Shift+Del</shortcut>
-        </rebootItem>
         <closeItem name="Close">
             <shortcut>Ctrl+Shift+F4</shortcut>
         </closeItem>

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml
index 3ed2cbe..db3f0bb 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml
@@ -92,6 +92,9 @@
                 </screenShotItem>
                 <separator/>
                 <aboutItem name="About"/>
+                <rebootItem name="Force Reboot">
+                    <shortcut>Ctrl+Shift+Del</shortcut>
+                </rebootItem>
                 <forceCloseItem name="Force Close">
                 </forceCloseItem>
             </menuList>
@@ -103,9 +106,6 @@
             <shortcut>Ctrl+Shift+P</shortcut>
         </controlPanelItem>
         <separator/>
-        <rebootItem name="Reboot">
-            <shortcut>Ctrl+Shift+Del</shortcut>
-        </rebootItem>
         <closeItem name="Close">
             <shortcut>Ctrl+Shift+F4</shortcut>
         </closeItem>

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 7cc7857..cbc17eb 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
@@ -92,6 +92,9 @@
                 </screenShotItem>
                 <separator/>
                 <aboutItem name="About"/>
+                <rebootItem name="Force Reboot">
+                    <shortcut>Ctrl+Shift+Del</shortcut>
+                </rebootItem>
                 <forceCloseItem name="Force Close">
                 </forceCloseItem>
             </menuList>
@@ -103,9 +106,6 @@
             <shortcut>Ctrl+Shift+P</shortcut>
         </controlPanelItem>
         <separator/>
-        <rebootItem name="Reboot">
-            <shortcut>Ctrl+Shift+Del</shortcut>
-        </rebootItem>
         <closeItem name="Close">
             <shortcut>Ctrl+Shift+F4</shortcut>
         </closeItem>

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-general-2btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-general-2btn/layout.xml
index 9228eb8..d99afc0 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-general-2btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-general-2btn/layout.xml
@@ -51,6 +51,9 @@
                 </screenShotItem>
                 <separator/>
                 <aboutItem name="About"/>
+                <rebootItem name="Force Reboot">
+                    <shortcut>Ctrl+Shift+Del</shortcut>
+                </rebootItem>
                 <forceCloseItem name="Force Close">
                 </forceCloseItem>
             </menuList>
@@ -62,9 +65,6 @@
             <shortcut>Ctrl+Shift+P</shortcut>
         </controlPanelItem>
         <separator/>
-        <rebootItem name="Reboot">
-            <shortcut>Ctrl+Shift+Del</shortcut>
-        </rebootItem>
         <closeItem name="Close">
             <shortcut>Ctrl+Shift+F4</shortcut>
         </closeItem>

diff --git a/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml
index 81e0688..c748881 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml
@@ -125,6 +125,9 @@
                 </screenShotItem>
                 <separator/>
                 <aboutItem name="About"/>
+                <rebootItem name="Force Reboot">
+                    <shortcut>Ctrl+Shift+Del</shortcut>
+                </rebootItem>
                 <forceCloseItem name="Force Close">
                 </forceCloseItem>
             </menuList>
@@ -136,9 +139,6 @@
             <shortcut>Ctrl+Shift+P</shortcut>
         </controlPanelItem>
         <separator/>
-        <rebootItem name="Reboot">
-            <shortcut>Ctrl+Shift+Del</shortcut>
-        </rebootItem>
         <closeItem name="Close">
             <shortcut>Ctrl+Shift+F4</shortcut>
         </closeItem>

diff --git a/tizen/src/ui/resource/ui_strings.h b/tizen/src/ui/resource/ui_strings.h
index e2c2b17..5e6b6bd 100644 (file)
--- a/tizen/src/ui/resource/ui_strings.h
+++ b/tizen/src/ui/resource/ui_strings.h
@@ -142,6 +142,8 @@
 #define MSG_ECP_NOT_EXIST "Control Panel file does not exist in the following path.\n"
 #define MSG_INVALID_JAVA_PATH "Failed to get java path."
 #define MSG_INVALID_ECP_OPEN "Failed to open Control Panel : "
+#define MSG_SYSTEM_RESET_POPUP "If you force the emulator to reboot, it may cause problems.\n"\
+                          "Are you sure you want to continue?"
 #define MSG_FORCE_CLOSE_POPUP "If you force stop an emulator, it may cause some problems.\n"\
                           "Are you sure you want to continue?"
 #define MSG_CLOSE_POPUP "Do you really want to quit this program?"