Changeset 26644 in vbox for trunk

Timestamp:

Feb 19, 2010 11:35:45 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Entry point for new running VM core (vboxglobal).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• VBoxGlobal.cpp (modified) (5 diffs)
• VBoxGlobal.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -33 +33 @@
 #include "QIDialogButtonBox.h"
 
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+#include "UIMachine.h"
+#endif
 #ifdef VBOX_WITH_REGISTRATION
 #include "UIRegistrationWzd.h"
@@ -592 +595 @@
     : mValid (false)
     , mSelectorWnd (NULL), mConsoleWnd (NULL)
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+    , m_pVirtualMachine(0)
+#endif
     , mMainWindow (NULL)
 #ifdef VBOX_WITH_REGISTRATION
@@ -777 +783 @@
     return *mConsoleWnd;
 }
+
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+UIMachine& VBoxGlobal::virtualMachine(const CSession &session /* = CSession() */)
+{
+    if (!m_pVirtualMachine)
+    {
+        UIMachine *pVirtualMachine = new UIMachine(&m_pVirtualMachine, session);
+        Assert(pVirtualMachine == m_pVirtualMachine);
+        NOREF(pVirtualMachine);
+    }
+    return *m_pVirtualMachine;
+}
+#endif
 
 bool VBoxGlobal::brandingIsActive (bool aForce /* = false*/)
@@ -2248 +2267 @@
         return false;
 
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+    virtualMachine(session);
+    return true;
+#else
     return consoleWnd().openView (session);
+#endif
 }
 
@@ -4992 +5016 @@
     if (mSelectorWnd)
         delete mSelectorWnd;
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+    if (m_pVirtualMachine)
+        delete m_pVirtualMachine;
+#endif
 
     /* ensure CGuestOSType objects are no longer used */

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -45 +45 @@
 class QLabel;
 class QToolButton;
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+class UIMachine;
+#endif
 
 // VirtualBox callback events
@@ -304 +307 @@
     VBoxSelectorWnd &selectorWnd();
     VBoxConsoleWnd &consoleWnd();
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+    UIMachine &virtualMachine(const CSession &session = CSession());
+#endif
 
     /* main window handle storage */
@@ -899 +905 @@
     VBoxSelectorWnd *mSelectorWnd;
     VBoxConsoleWnd *mConsoleWnd;
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+    UIMachine *m_pVirtualMachine;
+#endif
     QWidget* mMainWindow;