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

Timestamp:

Sep 21, 2015 4:26:00 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector-window cleanup/rework (step 6): Representing selector-window as singleton.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIModalWindowManager.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• main.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (2 diffs)
• selector/UISelectorWindow.h (modified) (4 diffs)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (1 diff)

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

@@ -100 +100 @@
     {
         /* It will be the selector window if visible: */
-        if (vboxGlobal().selectorWnd().isVisible())
-            return &vboxGlobal().selectorWnd();
+        if (gpSelectorWindow &&
+            gpSelectorWindow->isVisible())
+            return gpSelectorWindow;
     }
 

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

@@ -233 +233 @@
     : mValid (false)
     , m_fVBoxSVCAvailable(true)
-    , mSelectorWnd (NULL)
     , m_fSeparateProcess(false)
     , m_pMediumEnumerator(0)
@@ -428 +427 @@
 
     return true;
-}
-
-/**
- *  Returns a reference to the main VBox VM Selector window.
- *  The reference is valid until application termination.
- *
- *  There is only one such a window per VirtualBox application.
- */
-UISelectorWindow &VBoxGlobal::selectorWnd()
-{
-    AssertMsg (!vboxGlobal().isVMConsoleProcess(),
-               ("Must NOT be a VM console process"));
-    Assert (mValid);
-
-    if (!mSelectorWnd)
-    {
-        /*
-         *  We pass the address of mSelectorWnd to the constructor to let it be
-         *  initialized right after the constructor is called. It is necessary
-         *  to avoid recursion, since this method may be (and will be) called
-         *  from the below constructor or from constructors/methods it calls.
-         */
-        UISelectorWindow *w = new UISelectorWindow (&mSelectorWnd);
-        Assert (w == mSelectorWnd);
-        NOREF(w);
-    }
-
-    return *mSelectorWnd;
 }
 
@@ -3997 +3968 @@
     {
         m_ArgUrlList = list;
-        QTimer::singleShot(0, &vboxGlobal().selectorWnd(), SLOT(sltOpenUrls()));
+        UISelectorWindow::create();
+        QTimer::singleShot(0, gpSelectorWindow, SLOT(sltOpenUrls()));
     }
     return fResult;
@@ -4432 +4404 @@
     /* Destroy the GUI root windows _BEFORE_ the media-mess, because there is
        code in the GUI that's using the media code an will be racing us! */
-    if (mSelectorWnd)
-    {
-        delete mSelectorWnd;
-        mSelectorWnd = NULL;
-    }
+    if (gpSelectorWindow)
+        UISelectorWindow::destroy();
     if (gpMachine)
         UIMachine::destroy();

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

@@ -73 +73 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-class UISelectorWindow;
 class VBoxUpdateDlg;
 
@@ -174 +173 @@
     VBoxGlobalSettings &settings() { return gset; }
     bool setSettings (VBoxGlobalSettings &gs);
-
-    UISelectorWindow &selectorWnd();
 
     /** Returns currently active virtual machine window. */
@@ -536 +533 @@
 
     VBoxGlobalSettings gset;
-
-    UISelectorWindow *mSelectorWnd;
 
     /** Holds whether GUI is separate (from VM) process. */

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

@@ -511 +511 @@
 
                 /* Create/show selector window: */
-                vboxGlobal().selectorWnd().show();
+                UISelectorWindow::create();
 
                 /* Start application: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -78 +78 @@
 
 
-UISelectorWindow::UISelectorWindow(UISelectorWindow **ppSelf)
+/* static */
+UISelectorWindow* UISelectorWindow::m_spInstance = 0;
+
+/* static */
+void UISelectorWindow::create()
+{
+    /* Make sure selector-window is not created: */
+    AssertReturnVoid(!m_spInstance);
+
+    /* Create selector-window: */
+    new UISelectorWindow;
+    /* Prepare selector-window: */
+    m_spInstance->prepare();
+    /* Show selector-window: */
+    m_spInstance->show();
+}
+
+/* static */
+void UISelectorWindow::destroy()
+{
+    /* Make sure selector-window is created: */
+    AssertPtrReturnVoid(m_spInstance);
+
+    /* Cleanup selector-window: */
+    m_spInstance->cleanup();
+    /* Destroy machine UI: */
+    delete m_spInstance;
+}
+
+UISelectorWindow::UISelectorWindow()
     : m_fPolished(false)
     , m_fWarningAboutInaccessibleMediaShown(false)
@@ -94 +123 @@
     , m_pMachineMenuAction(0)
 {
-    /* Remember self: */
-    if (ppSelf)
-        *ppSelf = this;
-
-    /* Prepare: */
-    prepare();
+    m_spInstance = this;
 }
 
 UISelectorWindow::~UISelectorWindow()
 {
-    /* Cleanup: */
-    cleanup();
+    m_spInstance = 0;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -40 +40 @@
 class QStackedWidget;
 
-/** QMainWindow extension
+/** Singleton QMainWindow extension
   * used as VirtualBox Manager (selector-window) instance. */
 class UISelectorWindow : public QIWithRetranslateUI<QMainWindow>
@@ -48 +48 @@
 public:
 
-    /** Constructs selector-window passing @a pParent to the QMainWindow base-class.
+    /** Static constructor. */
+    static void create();
+    /** Static destructor. */
+    static void destroy();
+    /** Static instance. */
+    static UISelectorWindow* instance() { return m_spInstance; }
+
+    /** Returns the action-pool instance. */
+    UIActionPool* actionPool() const { return m_pActionPool; }
+
+protected:
+
+    /** Constructs selector-window.
       * @param ppSelf brings the pointer to pointer to this window instance used by the external caller.
       * @param flags  brings the selector-window flags dialogs should have. */
-    UISelectorWindow(UISelectorWindow **ppSelf);
+    UISelectorWindow();
     /** Destructs selector-window. */
     ~UISelectorWindow();
-
-    /** Returns the action-pool instance. */
-    UIActionPool* actionPool() const { return m_pActionPool; }
 
 private slots:
@@ -250 +259 @@
     /** @} */
 
+    /** Static instance. */
+    static UISelectorWindow *m_spInstance;
+
     /** Holds whether the dialog is polished. */
     bool m_fPolished : 1;
@@ -292 +304 @@
 };
 
+#define gpSelectorWindow UISelectorWindow::instance()
+
 #endif /* !___UISelectorWindow_h___ */
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -883 +883 @@
 
     /* Prepare the new VM wizard: */
-    UISafePointerWizardNewVM pWizard = new UIWizardNewVM(&vboxGlobal().selectorWnd(), strGroupName);
+    UISafePointerWizardNewVM pWizard = new UIWizardNewVM(m_pChooser->selector(), strGroupName);
     pWizard->prepare();