Changeset 12695 in vbox

Timestamp:

Sep 24, 2008 3:25:31 PM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: (defect #3187) VDM window doesn't have a WM task entry.
Due to the only possibility to make some window has its own task-bar entry under windows - is to make this window the root window, such windows as Virtual Disk Manager, Log Viewer, Session Information Dialog are become root.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/QIMainDialog.h (modified) (2 diffs)
• include/VBoxSelectorWnd.h (modified) (2 diffs)
• include/VBoxVMInformationDlg.h (modified) (1 diff)
• src/QIMainDialog.cpp (modified) (3 diffs)
• src/VBoxDiskImageManagerDlg.cpp (modified) (1 diff)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)
• src/VBoxVMInformationDlg.cpp (modified) (5 diffs)
• src/VBoxVMLogViewer.cpp (modified) (6 diffs)

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

@@ -65 +65 @@
     QPushButton* searchDefaultButton() const;
 
+    void centerAccording (QWidget *aWidget) { mCenterWidget = aWidget; }
+
 protected slots:
 
@@ -87 +89 @@
 
     bool mPolished;
+    QWidget *mCenterWidget;
 };
 

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

@@ -59 +59 @@
     bool startMachine (const QUuid &aId);
 
+signals:
+
+    void closing();
+
 public slots:
 
@@ -86 +90 @@
     /* Events */
     bool event (QEvent *aEvent);
+    void closeEvent (QCloseEvent *aEvent);
 
     void retranslateUi();

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

@@ -64 +64 @@
     void processStatistics();
     void onPageChanged (int aIndex);
+    void suicide();
 
 private:

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

@@ -44 +44 @@
     , mRescode (QDialog::Rejected)
     , mPolished (false)
+    , mCenterWidget (aParent)
 {
     qApp->installEventFilter (this);
@@ -216 +217 @@
 void QIMainDialog::showEvent (QShowEvent *aEvent)
 {
-        QMainWindow::showEvent (aEvent);
+    QMainWindow::showEvent (aEvent);
 
     /* Polishing border */
@@ -223 +224 @@
     mPolished = true;
 
-    /* Explicit widget centering relatively to it's parent
-     * if any or desktop if parent is missed. */
-    vboxGlobal().centerWidget (this, parentWidget(), false);
+    /* Explicit widget centering relatively to it's centering
+     * widget if any or desktop if centering widget is missed. */
+    vboxGlobal().centerWidget (this, mCenterWidget, false);
 }
 

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

@@ -490 +490 @@
 
 /* static */
-void VBoxDiskImageManagerDlg::showModeless (QWidget *aParent /* = NULL */, bool aRefresh /* = true */)
+void VBoxDiskImageManagerDlg::showModeless (QWidget *aCenterWidget /* = NULL */,
+                                            bool aRefresh /* = true */)
 {
     if (!mModelessDialog)
     {
-        mModelessDialog =
-            new VBoxDiskImageManagerDlg (aParent, Qt::Window);
+        mModelessDialog = new VBoxDiskImageManagerDlg (0, Qt::Window);
+        mModelessDialog->centerAccording (aCenterWidget);
+        connect (aCenterWidget, SIGNAL (closing()), mModelessDialog, SLOT (close()));
         mModelessDialog->setAttribute (Qt::WA_DeleteOnClose);
         mModelessDialog->setup (VBoxDefs::HD | VBoxDefs::CD | VBoxDefs::FD,

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

@@ -1104 +1104 @@
 }
 
+void VBoxSelectorWnd::closeEvent (QCloseEvent *aEvent)
+{
+    emit closing();
+    return QMainWindow::closeEvent (aEvent);
+}
+
 /**
  *  Sets the strings of the subwidgets using the current

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

@@ -37 +37 @@
     {
         /* Creating new information dialog if there is no one existing */
-        mSelfArray [machine.GetName()] = new VBoxVMInformationDlg (
-            aConsole, aSession, Qt::Window);
-        mSelfArray [machine.GetName()]->setAttribute (Qt::WA_DeleteOnClose);
+        VBoxVMInformationDlg *id = new VBoxVMInformationDlg (aConsole,
+                                                             aSession, Qt::Window);
+        id->centerAccording (aConsole);
+        connect (aConsole, SIGNAL (destroyed (QObject*)), id, SLOT (suicide()));
+        id->setAttribute (Qt::WA_DeleteOnClose);
+        mSelfArray [machine.GetName()] = id;
     }
 
@@ -53 +56 @@
                                             const CSession &aSession,
                                             Qt::WindowFlags aFlags)
-    : QIWithRetranslateUI2<QIMainDialog> (aConsole, aFlags)
+    : QIWithRetranslateUI2<QIMainDialog> (0, aFlags)
     , mIsPolished (false)
     , mConsole (aConsole)
@@ -294 +297 @@
 void VBoxVMInformationDlg::showEvent (QShowEvent *aEvent)
 {
-    QIMainDialog::showEvent (aEvent);
-
     /* One may think that QWidget::polish() is the right place to do things
      * below, but apparently, by the time when QWidget::polish() is called,
@@ -301 +302 @@
      * size hint is not properly calculated. Since this is sometimes necessary,
      * we provide our own "polish" implementation */
-
-    if (mIsPolished)
-        return;
-
-    /* Load window size and state */
-    resize (mWidth, mHeight);
-    if (mMax)
-        QTimer::singleShot (0, this, SLOT (showMaximized()));
-    else
-        mIsPolished = true;
-
-    VBoxGlobal::centerWidget (this, parentWidget());
+    if (!mIsPolished)
+    {
+        /* Load window size and state */
+        resize (mWidth, mHeight);
+        if (mMax)
+            QTimer::singleShot (0, this, SLOT (showMaximized()));
+        else
+            mIsPolished = true;
+    }
+
+    QIMainDialog::showEvent (aEvent);
 }
 
@@ -345 +345 @@
     /* Focusing the browser on shown page */
     mInfoStack->widget (aIndex)->setFocus();
+}
+
+/**
+ * Opposing to deleteLater() slot this one makes it immediately.
+ */
+void VBoxVMInformationDlg::suicide()
+{
+    delete this;
 }
 

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

@@ -41 +41 @@
 VBoxVMLogViewer::LogViewersMap VBoxVMLogViewer::mSelfArray = LogViewersMap();
 
-void VBoxVMLogViewer::createLogViewer (QWidget *aParent, CMachine &aMachine)
-{
-    if (!mSelfArray.contains (aMachine.GetName())) 
-    {
-        /* creating new log viewer if there is no one existing */
-        VBoxVMLogViewer *lv = new VBoxVMLogViewer (aParent,
-            Qt::Window, aMachine);
-        /* Self destroy on close event */
+void VBoxVMLogViewer::createLogViewer (QWidget *aCenterWidget, CMachine &aMachine)
+{
+    if (!mSelfArray.contains (aMachine.GetName()))
+    {
+        /* Creating new log viewer if there is no one existing */
+        VBoxVMLogViewer *lv = new VBoxVMLogViewer (0, Qt::Window, aMachine);
+        lv->centerAccording (aCenterWidget);
+        connect (aCenterWidget, SIGNAL (closing()), lv, SLOT (close()));
         lv->setAttribute (Qt::WA_DeleteOnClose);
         mSelfArray [aMachine.GetName()] = lv;
@@ -91 +91 @@
     /* Add missing buttons & retrieve standard buttons */
     mBtnHelp = mButtonBox->button (QDialogButtonBox::Help);
-    mBtnFind = mButtonBox->addButton (QString::null, QDialogButtonBox::ActionRole); 
+    mBtnFind = mButtonBox->addButton (QString::null, QDialogButtonBox::ActionRole);
     mBtnSave = mButtonBox->button (QDialogButtonBox::Save);
-    mBtnRefresh = mButtonBox->addButton (QString::null, QDialogButtonBox::ActionRole); 
+    mBtnRefresh = mButtonBox->addButton (QString::null, QDialogButtonBox::ActionRole);
     mBtnClose = mButtonBox->button (QDialogButtonBox::Close);
-
-    /* Fix the tab order to ensure the dialog keys are always the last */
-    /* @todo: Not sure if this is necessary any longer. On Linux this looks
-     * good in the default order. Keep in mind that with the QDialogButtonBox
-     * the order isn't fixed any more. */
-//    setTabOrder (mSearchPanel->focusProxy(), mBtnHelp);
-//    setTabOrder (mBtnHelp, mBtnFind);
-//    setTabOrder (mBtnFind, mBtnSave);
-//    setTabOrder (mBtnSave, mBtnRefresh);
-//    setTabOrder (mBtnRefresh, mBtnClose);
-//    setTabOrder (mBtnClose, mLogList);
 
     /* Setup connections */
@@ -125 +114 @@
     /* Loading language constants */
     retranslateUi();
-
 }
 
@@ -247 +235 @@
 void VBoxVMLogViewer::currentLogPageChanged (int aIndex)
 {
-    if (aIndex >= 0 && 
+    if (aIndex >= 0 &&
         aIndex < mLogFilesList.count())
         setFileForProxyIcon (mLogFilesList.at (aIndex));
@@ -263 +251 @@
     mBtnFind->setText (tr ("&Find"));
     mBtnRefresh->setText (tr ("&Refresh"));
-    mBtnSave->setText (tr ("&Save")); 
-    mBtnClose->setText (tr ("Close")); 
+    mBtnSave->setText (tr ("&Save"));
+    mBtnClose->setText (tr ("Close"));
 }
 
@@ -299 +287 @@
         }
     }
-
-    VBoxGlobal::centerWidget (this, parentWidget());
 }