Changeset 71374 in vbox for trunk/src/VBox

Timestamp:

Mar 19, 2018 3:19:12 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Runtime UI: Cleanup for main/active machine-window usage.

Location:

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

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachineLogic.cpp (modified) (5 diffs)
• UIMachineWindow.cpp (modified) (1 diff)
• UIMachineWindow.h (modified) (2 diffs)
• UISession.cpp (modified) (8 diffs)
• UISession.h (modified) (2 diffs)

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

@@ -132 +132 @@
 QWidget* UIMachine::activeWindow() const
 {
-    if (machineLogic() &&  machineLogic()->activeMachineWindow())
-        return machineLogic()->activeMachineWindow();
-    return 0;
+    return   machineLogic() && machineLogic()->activeMachineWindow()
+           ? machineLogic()->activeMachineWindow()
+           : 0;
 }
 

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

@@ -196 +196 @@
     prepareMenu();
 
-    /* Prepare machine window(s): */
+    /* Prepare machine-window(s): */
     prepareMachineWindows();
 
@@ -236 +236 @@
     cleanupMenu();
 
-    /* Cleanup machine window(s): */
+    /* Cleanup machine-window(s): */
     cleanupMachineWindows();
 
@@ -316 +316 @@
     if (!isMachineWindowsCreated())
         return 0;
-    /* First machine-window otherwise: */
-    return machineWindows().first();
+
+    /* First machine-window by default: */
+    return machineWindows().value(0);
 }
 
 UIMachineWindow* UIMachineLogic::activeMachineWindow() const
 {
-    /* Return null if windows are not created yet: */
+    /* Null if machine-window(s) not yet created: */
     if (!isMachineWindowsCreated())
         return 0;
@@ -334 +335 @@
     }
 
-    /* Return main machine window: */
+    /* Main machine-window by default: */
     return mainMachineWindow();
 }
@@ -1740 +1741 @@
 
     /* Invoke VM information dialog: */
-    UIVMInformationDialog::invoke(mainMachineWindow());
+    UIVMInformationDialog::invoke(activeMachineWindow());
 }
 

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

@@ -260 +260 @@
 }
 
-void UIMachineWindow::showEvent(QShowEvent *pShowEvent)
-{
-    /* Call to base class: */
-    QMainWindow::showEvent(pShowEvent);
+void UIMachineWindow::showEvent(QShowEvent *pEvent)
+{
+    /* Call to base-class: */
+    QMainWindow::showEvent(pEvent);
 
     /* Update appearance for indicator-pool: */

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

@@ -36 +36 @@
 class QCloseEvent;
 class QGridLayout;
+class QShowEvent;
 class QSpacerItem;
 class UIActionPool;
@@ -125 +126 @@
     void retranslateUi();
 
-    /** Show event handler. */
-    void showEvent(QShowEvent *pShowEvent);
+    /** Handles show @a pEvent. */
+    virtual void showEvent(QShowEvent *pEvent) /* override */;
 
     /** Close event handler. */

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

@@ -167 +167 @@
     /* Notify user about mouse&keyboard auto-capturing: */
     if (gEDataManager->autoCaptureEnabled())
-        popupCenter().remindAboutAutoCapture(machineLogic()->activeMachineWindow());
+        popupCenter().remindAboutAutoCapture(activeMachineWindow());
 
     /* Check if we are in teleportation waiting mode.
@@ -501 +501 @@
 {
     return mainMachineWindow()->winId();
+}
+
+UIMachineWindow *UISession::activeMachineWindow() const
+{
+    return machineLogic() ? machineLogic()->activeMachineWindow() : 0;
 }
 
@@ -1782 +1787 @@
     /// @todo In case of multi-monitor setup check whether device-pixel-ratio and cursor are screen specific.
     /* Get screen-id of main-window: */
-    const ulong uScreenID = machineLogic()->activeMachineWindow()->screenId();
+    const ulong uScreenID = activeMachineWindow()->screenId();
     /* Get device-pixel-ratio: */
     const double dDevicePixelRatio = frameBuffer(uScreenID)->devicePixelRatio();
@@ -1796 +1801 @@
     /// @todo In case of multi-monitor setup check whether device-pixel-ratio and cursor are screen specific.
     /* Get screen-id of main-window: */
-    const ulong uScreenID = machineLogic()->activeMachineWindow()->screenId();
+    const ulong uScreenID = activeMachineWindow()->screenId();
     /* Get device-pixel-ratio: */
     const double dDevicePixelRatio = frameBuffer(uScreenID)->devicePixelRatio();
@@ -1908 +1913 @@
         if (!comVBox.isOk() || comMedium.isNull())
         {
-            popupCenter().cannotOpenMedium(machineLogic()->activeMachineWindow(), comVBox, enmMediumType, strMediumName);
+            popupCenter().cannotOpenMedium(activeMachineWindow(), comVBox, enmMediumType, strMediumName);
             return false;
         }
@@ -1951 +1956 @@
     if (sStorageSlots.isEmpty())
     {
-        popupCenter().cannotMountImage(machineLogic()->activeMachineWindow(), machineName(), strMediumName);
+        popupCenter().cannotMountImage(activeMachineWindow(), machineName(), strMediumName);
         return false;
     }
@@ -1967 +1972 @@
     if (!machine().isOk())
     {
-        msgCenter().cannotRemountMedium(machine(), guiMedium, true /* mount? */, false /* retry? */, mainMachineWindow());
+        msgCenter().cannotRemountMedium(machine(), guiMedium, true /* mount? */, false /* retry? */, activeMachineWindow());
         return false;
     }
@@ -1977 +1982 @@
     if (!machine().isOk())
     {
-        popupCenter().cannotSaveMachineSettings(machineLogic()->activeMachineWindow(), machine());
+        popupCenter().cannotSaveMachineSettings(activeMachineWindow(), machine());
         return false;
     }

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

@@ -45 +45 @@
 class UIMachine;
 class UIMachineLogic;
+class UIMachineWindow;
 class UIActionPool;
 class CUSBDevice;
@@ -126 +127 @@
     QWidget* mainMachineWindow() const;
     WId mainMachineWindowId() const;
+    UIMachineWindow *activeMachineWindow() const;
     QCursor cursor() const { return m_cursor; }