Changeset 75158 in vbox for trunk

Timestamp:

Oct 29, 2018 4:37:53 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Mental note. Two dialog almost always needs two variables.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (5 diffs)
• UIMachineLogic.h (modified) (1 diff)

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

@@ -857 +857 @@
     , m_fIsHidLedsSyncEnabled(false)
     , m_pLogViewerDialog(0)
-    , m_pGuestControlDialog(0)
+    , m_pFileManagerDialog(0)
+    , m_pProcessControlDialog(0)
 {
 }
@@ -1786 +1787 @@
 
     /* Create a logviewer only if we don't have one already */
-    if (m_pGuestControlDialog)
-        return;
-
-    QIManagerDialog *pGuestControlDialog;
+    if (m_pFileManagerDialog)
+        return;
+
+    QIManagerDialog *pFileManagerDialog;
     UIGuestControlFileManagerDialogFactory dialogFactory(actionPool(), console().GetGuest(), machine().GetName());
-    dialogFactory.prepare(pGuestControlDialog, activeMachineWindow());
-    if (pGuestControlDialog)
-    {
-        m_pGuestControlDialog = pGuestControlDialog;
+    dialogFactory.prepare(pFileManagerDialog, activeMachineWindow());
+    if (pFileManagerDialog)
+    {
+        m_pFileManagerDialog = pFileManagerDialog;
 
         /* Show instance: */
-        pGuestControlDialog->show();
-        pGuestControlDialog->setWindowState(pGuestControlDialog->windowState() & ~Qt::WindowMinimized);
-        pGuestControlDialog->activateWindow();
-        connect(pGuestControlDialog, &QIManagerDialog::sigClose,
+        pFileManagerDialog->show();
+        pFileManagerDialog->setWindowState(pFileManagerDialog->windowState() & ~Qt::WindowMinimized);
+        pFileManagerDialog->activateWindow();
+        connect(pFileManagerDialog, &QIManagerDialog::sigClose,
                 this, &UIMachineLogic::sltCloseGuestControlFileManagerDialog);
     }
@@ -1808 +1809 @@
 {
     QIManagerDialog* pDialog = qobject_cast<QIManagerDialog*>(sender());
-    if (m_pGuestControlDialog != pDialog || !pDialog)
+    if (m_pFileManagerDialog != pDialog || !pDialog)
         return;
 
     /* Set the m_pLogViewerDialog to NULL before closing the dialog. or we will have redundant deletes*/
-    m_pGuestControlDialog = 0;
+    m_pFileManagerDialog = 0;
     pDialog->close();
     UIGuestControlFileManagerDialogFactory().cleanup(pDialog);
@@ -1823 +1824 @@
 
     /* Create a logviewer only if we don't have one already */
-    if (m_pGuestControlDialog)
-        return;
-
-    QIManagerDialog *pGuestControlDialog;
+    if (m_pProcessControlDialog)
+        return;
+
+    QIManagerDialog *pProcessControlDialog;
     UIGuestProcessControlDialogFactory dialogFactory(actionPool(), console().GetGuest(), machine().GetName());
-    dialogFactory.prepare(pGuestControlDialog, activeMachineWindow());
-    if (pGuestControlDialog)
-    {
-        m_pGuestControlDialog = pGuestControlDialog;
+    dialogFactory.prepare(pProcessControlDialog, activeMachineWindow());
+    if (pProcessControlDialog)
+    {
+        m_pProcessControlDialog = pProcessControlDialog;
 
         /* Show instance: */
-        pGuestControlDialog->show();
-        pGuestControlDialog->setWindowState(pGuestControlDialog->windowState() & ~Qt::WindowMinimized);
-        pGuestControlDialog->activateWindow();
-        connect(pGuestControlDialog, &QIManagerDialog::sigClose,
+        pProcessControlDialog->show();
+        pProcessControlDialog->setWindowState(pProcessControlDialog->windowState() & ~Qt::WindowMinimized);
+        pProcessControlDialog->activateWindow();
+        connect(pProcessControlDialog, &QIManagerDialog::sigClose,
                 this, &UIMachineLogic::sltCloseGuestProcessControlDialog);
     }
@@ -1845 +1846 @@
 {
     QIManagerDialog* pDialog = qobject_cast<QIManagerDialog*>(sender());
-    if (m_pGuestControlDialog != pDialog || !pDialog)
+    if (m_pProcessControlDialog != pDialog || !pDialog)
         return;
 
     /* Set the m_pLogViewerDialog to NULL before closing the dialog. or we will have redundant deletes*/
-    m_pGuestControlDialog = 0;
+    m_pProcessControlDialog = 0;
     pDialog->close();
     UIGuestProcessControlDialogFactory().cleanup(pDialog);

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

@@ -431 +431 @@
     /** Holds the log viewer dialog instance. */
     QIManagerDialog *m_pLogViewerDialog;
-    QIManagerDialog *m_pGuestControlDialog;
+    QIManagerDialog *m_pFileManagerDialog;
+    QIManagerDialog *m_pProcessControlDialog;
 
     /* Friend classes: */