Changeset 49467 in vbox for trunk/src/VBox

Timestamp:

Nov 13, 2013 1:45:14 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Close actions handling rework (step 3): Some change in Close VM dialog initialization.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineWindow.cpp (modified) (1 diff)
• UIVMCloseDialog.cpp (modified) (2 diffs)
• UIVMCloseDialog.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -291 +291 @@
         /* Prepare close-dialog: */
         QWidget *pParentDlg = windowManager().realParentWindow(this);
-        QPointer<UIVMCloseDialog> pCloseDlg = new UIVMCloseDialog(pParentDlg, m, session());
+        QPointer<UIVMCloseDialog> pCloseDlg = new UIVMCloseDialog(pParentDlg, m,
+                                                                  session().GetConsole().GetGuestEnteredACPIMode());
 
         /* Make sure close-dialog is valid: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp

@@ -46 +46 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-UIVMCloseDialog::UIVMCloseDialog(QWidget *pParent, CMachine &machine, const CSession &session)
+UIVMCloseDialog::UIVMCloseDialog(QWidget *pParent, CMachine &machine, bool fIsACPIEnabled)
     : QIWithRetranslateUI<QIDialog>(pParent)
     , m_machine(machine)
-    , m_session(session)
+    , m_fIsACPIEnabled(fIsACPIEnabled)
     , m_fValid(false)
-    , m_fIsACPIEnabled(false)
     , m_lastCloseAction(MachineCloseAction_Invalid)
 {
@@ -297 +296 @@
     /* Make 'Shutdown button' visible/hidden depending on restriction: */
     setShutdownButtonVisible(fIsACPIShutdownAllowed);
-    /* Make 'Shutdown button' enabled/disabled depending on ACPI-state & machine-state: */
-    m_fIsACPIEnabled = m_session.GetConsole().GetGuestEnteredACPIMode();
     setShutdownButtonEnabled(m_fIsACPIEnabled && machineState != KMachineState_Stuck);
     /* Make 'Power off' button visible/hidden depending on restriction: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.h

@@ -27 +27 @@
 /* Forward declarations: */
 class CMachine;
-class CSession;
 class QLabel;
 class QRadioButton;
@@ -40 +39 @@
 
     /* Constructor: */
-    UIVMCloseDialog(QWidget *pParent, CMachine &machine, const CSession &session);
+    UIVMCloseDialog(QWidget *pParent, CMachine &machine, bool fIsACPIEnabled);
 
     /* API: Validation stuff: */
@@ -96 +95 @@
     /* Variables: */
     CMachine &m_machine;
-    const CSession &m_session;
+    bool m_fIsACPIEnabled;
     bool m_fValid;
-    bool m_fIsACPIEnabled;
     QString m_strDiscardCheckBoxText;
     MachineCloseAction m_lastCloseAction;