Changeset 16264 in vbox for trunk/src

Timestamp:

Jan 27, 2009 3:09:27 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

42075

Message:

FE/Qt4: 3225: Disable ACPI actions if the guest did not enter (or exit already) ACPI.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (5 diffs)
• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (7 diffs)
• src/VBoxProblemReporter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -74 +74 @@
     void refreshView();
 
-    bool isWindowMaximized() const 
-    { 
+    bool isWindowMaximized() const
+    {
 #ifdef Q_WS_MAC
         /* On Mac OS X we didn't really jump to the fullscreen mode but
@@ -83 +83 @@
 #else /* Q_WS_MAC */
         return QMainWindow::isMaximized();
-#endif /* Q_WS_MAC */ 
+#endif /* Q_WS_MAC */
     }
-    bool isWindowFullScreen() const 
-    { 
+    bool isWindowFullScreen() const
+    {
 #ifdef Q_WS_MAC
         /* On Mac OS X we didn't really jump to the fullscreen mode but
@@ -94 +94 @@
 #else /* Q_WS_MAC */
         return QMainWindow::isFullScreen();
-#endif /* Q_WS_MAC */ 
+#endif /* Q_WS_MAC */
     }
 
@@ -217 +217 @@
     void updateMediaDriveState (VBoxDefs::MediaType aType);
     void updateSharedFoldersState();
+    void updateACPIStatus();
 
     void tryClose();
@@ -326 +327 @@
     QString caption_prefix;
 
+    QTimer *mACPITimer;
+    bool mACPIEnabled : 1;
+
     bool no_auto_close : 1;
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -232 +232 @@
     void cannotDiscardSavedState (const CConsole &console);
 
+    void cannotSendACPIToMachine();
+
     void cannotSetSnapshotFolder (const CMachine &aMachine, const QString &aPath);
     void cannotDiscardSnapshot (const CConsole &aConsole,

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -224 +224 @@
     , console (0)
     , machine_state (KMachineState_Null)
+    , mACPIEnabled (false)
     , no_auto_close (false)
     , mIsFullscreen (false)
@@ -244 +245 @@
 
     idle_timer = new QTimer (this);
+    mACPITimer = new QTimer (this);
 
 #if !(defined (Q_WS_WIN) || defined (Q_WS_MAC))
@@ -914 +916 @@
     idle_timer->start (50);
 
+    /* start an idle timer that will update acpi status */
+    connect (mACPITimer, SIGNAL (timeout()), SLOT (updateACPIStatus()));
+    mACPITimer->start (1000);
+
     connect (console, SIGNAL (mouseStateChanged (int)),
              this, SLOT (updateMouseState (int)));
@@ -1336 +1342 @@
                     cmachine.GetExtraData (VBoxDefs::GUI_LastCloseAction).split (',');
                 AssertWrapperOk (cmachine);
-                if (lastAction [0] == kPowerOff)
-                {
-                    dlg.mRbPowerOff->setChecked (true);
-                    dlg.mRbPowerOff->setFocus();
-                }
-                else if (lastAction [0] == kShutdown)
-                {
-                    dlg.mRbShutdown->setChecked (true);
-                    dlg.mRbShutdown->setFocus();
-                }
-                else if (lastAction [0] == kSave)
+                if (lastAction [0] == kSave)
                 {
                     dlg.mRbSave->setChecked (true);
                     dlg.mRbSave->setFocus();
+                }
+                else if ((lastAction [0] == kPowerOff) && !mACPIEnabled)
+                {
+                    dlg.mRbShutdown->setEnabled (false);
+                    dlg.mRbPowerOff->setChecked (true);
+                    dlg.mRbPowerOff->setFocus();
                 }
                 else /* the default is ACPI Shutdown */
@@ -1517 +1519 @@
         idle_timer->disconnect (SIGNAL (timeout()), this, SLOT (updateDeviceLights()));
 
+        /* Stop ACPI update timer */
+        mACPITimer->stop();
+        mACPITimer->disconnect (SIGNAL (timeout()), this, SLOT (updateACPIStatus()));
+
         /* Hide console window */
         hide();
@@ -2603 +2609 @@
 void VBoxConsoleWnd::vmACPIShutdown()
 {
+    if (!mACPIEnabled)
+        return vboxProblem().cannotSendACPIToMachine();
+
     if (console)
     {
@@ -3537 +3546 @@
 }
 
+void VBoxConsoleWnd::updateACPIStatus()
+{
+    mACPIEnabled = csession.GetConsole().GetGuestEnteredACPIMode();
+}
+
 /**
  *  Helper to safely close the main console window.

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -922 +922 @@
 }
 
+void VBoxProblemReporter::cannotSendACPIToMachine()
+{
+    message (mainWindowShown(),  Warning,
+        tr ("Cannot send the ACPI Power Button press event to the "
+            "virtual machine because ACPI is not available now."));
+}
+
 void VBoxProblemReporter::cannotSetSnapshotFolder (const CMachine &aMachine,
                                                    const QString &aPath)