Changeset 15185 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 9, 2008 3:21:55 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3368: Closing Selector leaves VMM (and other top widgets) open - fixed.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxConsoleWnd.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)
• src/VBoxMediaManagerDlg.cpp (modified) (1 diff)
• src/VBoxRegistrationDlg.cpp (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)
• src/VBoxVMInformationDlg.cpp (modified) (2 diffs)
• src/VBoxVMLogViewer.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h

@@ -93 +93 @@
 
 public slots:
+
     void changeDockIconUpdate (const VBoxChangeDockIconUpdateEvent &e);
+
+signals:
+
+    void closing();
 
 protected:

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -1169 +1169 @@
     csession.Close();
     csession.detach();
+    emit closing();
 
     LogFlowFuncLeave();

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -5090 +5090 @@
             /* We've got the "mutex", create a new registration dialog */
             VBoxRegistrationDlg *dlg =
-                new VBoxRegistrationDlg (&mRegDlg, 0);
+                new VBoxRegistrationDlg (&mRegDlg, mMainWindow);
             dlg->setAttribute (Qt::WA_DeleteOnClose);
             Assert (dlg == mRegDlg);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxMediaManagerDlg.cpp

@@ -558 +558 @@
         mModelessDialog = new VBoxMediaManagerDlg (0, Qt::Window);
         mModelessDialog->centerAccording (aCenterWidget);
-        if (aCenterWidget)
-            connect (aCenterWidget, SIGNAL (closing()), mModelessDialog, SLOT (close()));
+        connect (vboxGlobal().mainWindow(), SIGNAL (closing()), mModelessDialog, SLOT (close()));
         mModelessDialog->setAttribute (Qt::WA_DeleteOnClose);
         mModelessDialog->setup (VBoxDefs::MediaType_All,

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxRegistrationDlg.cpp

@@ -197 +197 @@
 
 VBoxRegistrationDlg::VBoxRegistrationDlg (VBoxRegistrationDlg **aSelf, QWidget *aParent)
-    : QIWithRetranslateUI <QIAbstractWizard> (aParent)
+    : QIWithRetranslateUI <QIAbstractWizard> (0)
     , mSelf (aSelf)
     , mWvalReg (0)
@@ -240 +240 @@
     connect (mWvalReg, SIGNAL (isValidRequested (QIWidgetValidator *)),
              this, SLOT (revalidate (QIWidgetValidator *)));
+    connect (vboxGlobal().mainWindow(), SIGNAL (closing()), this, SLOT (reject()));
 
     /* Setup initial dialog parameters. */

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -734 +734 @@
 void VBoxSelectorWnd::fileMediaMgr()
 {
-    VBoxMediaManagerDlg::showModeless();
+    VBoxMediaManagerDlg::showModeless (this);
 }
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMInformationDlg.cpp

@@ -40 +40 @@
                                                              aSession, Qt::Window);
         id->centerAccording (aConsole);
-        connect (aConsole, SIGNAL (destroyed (QObject*)), id, SLOT (suicide()));
+        connect (vboxGlobal().mainWindow(), SIGNAL (closing()), id, SLOT (close()));
         id->setAttribute (Qt::WA_DeleteOnClose);
         mSelfArray [machine.GetName()] = id;
@@ -102 +102 @@
     connect (&vboxGlobal(), SIGNAL (mediumEnumFinished (const VBoxMediaList &)),
              this, SLOT (updateDetails()));
-    connect (mConsole, SIGNAL (mediumChanged (VBoxDefs::MediaType)),
+    connect (mConsole, SIGNAL (mediaDriveChanged (VBoxDefs::MediaType)),
              this, SLOT (updateDetails()));
     connect (mConsole, SIGNAL (sharedFoldersChanged()),

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMLogViewer.cpp

@@ -53 +53 @@
 
         lv->centerAccording (aCenterWidget);
-        connect (aCenterWidget, SIGNAL (closing()), lv, SLOT (close()));
+        connect (vboxGlobal().mainWindow(), SIGNAL (closing()), lv, SLOT (close()));
         lv->setAttribute (Qt::WA_DeleteOnClose);
         mSelfArray [aMachine.GetName()] = lv;