Changeset 59380 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 18, 2016 5:04:54 PM (9 years ago)

Author:

vboxsync

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

105073

Message:

FE/Qt: Qt5 migration (part 63): Runtime UI: Another bit of machine-view rework for further improvements.

Location:

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

Files:

• UIMachineView.cpp (modified) (4 diffs)
• UIMachineView.h (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.h (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.h (modified) (1 diff)
• scale/UIMachineViewScale.cpp (modified) (1 diff)
• scale/UIMachineViewScale.h (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)
• seamless/UIMachineViewSeamless.h (modified) (1 diff)

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

@@ -171 +171 @@
     }
 
+    /* Load machine-view settings: */
+    pMachineView->loadMachineViewSettings();
+
+    /* Prepare viewport: */
+    pMachineView->prepareViewport();
+
+    /* Prepare frame-buffer: */
+    pMachineView->prepareFrameBuffer();
+
     /* Prepare common things: */
     pMachineView->prepareCommon();
@@ -205 +214 @@
     if (!pMachineView)
         return;
+
+    /* Cleanup frame-buffer: */
+    pMachineView->cleanupFrameBuffer();
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
@@ -611 +623 @@
 #endif
 {
-    /* Load machine view settings: */
-    loadMachineViewSettings();
-
-    /* Prepare viewport: */
-    prepareViewport();
-
-    /* Prepare frame buffer: */
-    prepareFrameBuffer();
-}
-
-UIMachineView::~UIMachineView()
-{
+}
+
+void UIMachineView::loadMachineViewSettings()
+{
+    /* Global settings: */
+    {
+        /* Remember the maximum guest size policy for telling the guest about
+         * video modes we like: */
+        QString maxGuestSize = vboxGlobal().settings().publicProperty("GUI/MaxGuestResolution");
+        if ((maxGuestSize == QString::null) || (maxGuestSize == "auto"))
+            m_maxGuestSizePolicy = MaxGuestSizePolicy_Automatic;
+        else if (maxGuestSize == "any")
+            m_maxGuestSizePolicy = MaxGuestSizePolicy_Any;
+        else  /** @todo Mea culpa, but what about error checking? */
+        {
+            int width  = maxGuestSize.section(',', 0, 0).toInt();
+            int height = maxGuestSize.section(',', 1, 1).toInt();
+            m_maxGuestSizePolicy = MaxGuestSizePolicy_Fixed;
+            m_fixedMaxGuestSize = QSize(width, height);
+        }
+    }
 }
 
@@ -802 +823 @@
     /* Machine state-change updater: */
     connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
-}
-
-void UIMachineView::loadMachineViewSettings()
-{
-    /* Global settings: */
-    {
-        /* Remember the maximum guest size policy for telling the guest about
-         * video modes we like: */
-        QString maxGuestSize = vboxGlobal().settings().publicProperty("GUI/MaxGuestResolution");
-        if ((maxGuestSize == QString::null) || (maxGuestSize == "auto"))
-            m_maxGuestSizePolicy = MaxGuestSizePolicy_Automatic;
-        else if (maxGuestSize == "any")
-            m_maxGuestSizePolicy = MaxGuestSizePolicy_Any;
-        else  /** @todo Mea culpa, but what about error checking? */
-        {
-            int width  = maxGuestSize.section(',', 0, 0).toInt();
-            int height = maxGuestSize.section(',', 1, 1).toInt();
-            m_maxGuestSizePolicy = MaxGuestSizePolicy_Fixed;
-            m_fixedMaxGuestSize = QSize(width, height);
-        }
-    }
 }
 

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

@@ -170 +170 @@
     );
     /* Machine-view destructor: */
-    virtual ~UIMachineView();
+    virtual ~UIMachineView() {}
 
     /* Prepare routines: */
-    void prepareViewport();
-    void prepareFrameBuffer();
+    virtual void loadMachineViewSettings();
+    virtual void prepareViewport();
+    virtual void prepareFrameBuffer();
     virtual void prepareCommon();
     virtual void prepareFilters();
     virtual void prepareConnections();
     virtual void prepareConsoleConnections();
-    void loadMachineViewSettings();
 
     /* Cleanup routines: */
-    //virtual void saveMachineViewSettings() {}
     //virtual void cleanupConsoleConnections() {}
+    //virtual void cleanupConnections() {}
     //virtual void cleanupFilters() {}
     //virtual void cleanupCommon() {}
     virtual void cleanupFrameBuffer();
     //virtual void cleanupViewport();
+    //virtual void saveMachineViewSettings() {}
 
     /** Returns the session UI reference. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -61 +61 @@
 }
 
-UIMachineViewFullscreen::~UIMachineViewFullscreen()
-{
-    /* Cleanup frame buffer: */
-    cleanupFrameBuffer();
-}
-
 void UIMachineViewFullscreen::sltAdditionsStateChanged()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.h

@@ -36 +36 @@
     );
     /* Fullscreen machine-view destructor: */
-    virtual ~UIMachineViewFullscreen();
+    virtual ~UIMachineViewFullscreen() {}
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -54 +54 @@
     , m_bIsGuestAutoresizeEnabled(actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked())
 {
-}
-
-UIMachineViewNormal::~UIMachineViewNormal()
-{
-    /* Cleanup frame buffer: */
-    cleanupFrameBuffer();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h

@@ -36 +36 @@
     );
     /* Normal machine-view destructor: */
-    virtual ~UIMachineViewNormal();
+    virtual ~UIMachineViewNormal() {}
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -56 +56 @@
                     )
 {
-}
-
-UIMachineViewScale::~UIMachineViewScale()
-{
-    /* Cleanup frame buffer: */
-    cleanupFrameBuffer();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.h

@@ -36 +36 @@
     );
     /* Scale machine-view destructor: */
-    virtual ~UIMachineViewScale();
+    virtual ~UIMachineViewScale() {}
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -67 +67 @@
 }
 
-UIMachineViewSeamless::~UIMachineViewSeamless()
-{
-    /* Cleanup seamless mode: */
-    cleanupSeamless();
-
-    /* Cleanup frame buffer: */
-    cleanupFrameBuffer();
-}
-
 void UIMachineViewSeamless::sltAdditionsStateChanged()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h

@@ -36 +36 @@
     );
     /* Seamless machine-view destructor: */
-    virtual ~UIMachineViewSeamless();
+    virtual ~UIMachineViewSeamless() { cleanupSeamless(); }
 
 private slots: