Changeset 51002 in vbox

Timestamp:

Apr 8, 2014 3:03:47 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93188

Message:

FE/Qt: VM Information Dialog rework/cleanup: Re-parent VBoxVMInformationDialog class inheritance from QIMainDialog to QMainWindow.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxVMInformationDlg.cpp (modified) (9 diffs)
• VBoxVMInformationDlg.h (modified) (4 diffs)

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

@@ -25 +25 @@
 #include <QTimer>
 #include <QScrollBar>
+#include <QPushButton>
 
 /* GUI includes: */
@@ -60 +61 @@
     {
         /* Creating new information dialog if there is no one existing */
-        VBoxVMInformationDlg *id = new VBoxVMInformationDlg(pMachineWindow, Qt::Window);
-        id->centerAccording (pMachineWindow);
-        // TODO_NEW_CORE: this seems not necessary, cause we set WA_DeleteOnClose.
+        VBoxVMInformationDlg *id = new VBoxVMInformationDlg(pMachineWindow);
         id->setAttribute (Qt::WA_DeleteOnClose);
         mSelfArray [machine.GetName()] = id;
@@ -74 +73 @@
 }
 
-VBoxVMInformationDlg::VBoxVMInformationDlg (UIMachineWindow *pMachineWindow, Qt::WindowFlags aFlags)
-# ifdef Q_WS_MAC
-    : QIWithRetranslateUI2 <QIMainDialog> (pMachineWindow, aFlags)
-# else /* Q_WS_MAC */
-    : QIWithRetranslateUI2 <QIMainDialog> (0, aFlags)
-# endif /* Q_WS_MAC */
+VBoxVMInformationDlg::VBoxVMInformationDlg (UIMachineWindow *pMachineWindow)
+    : QIWithRetranslateUI<QMainWindow>(0)
+    , m_pPseudoParentWidget(pMachineWindow)
     , mSession (pMachineWindow->session())
     , mIsPolished (false)
@@ -96 +92 @@
 #endif
 
-    /* Enable size grip without using a status bar. */
-    setSizeGripEnabled (true);
-
     /* Setup focus-proxy for pages */
     mPage1->setFocusProxy (mDetailsText);
@@ -110 +103 @@
     mDetailsText->setViewportMargins (5, 5, 5, 5);
     mStatisticText->setViewportMargins (5, 5, 5, 5);
+
+    /* Configure dialog button-box: */
+    mButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
 
     /* Setup handlers */
@@ -331 +327 @@
 bool VBoxVMInformationDlg::event (QEvent *aEvent)
 {
-    bool result = QIMainDialog::event (aEvent);
+    bool result = QMainWindow::event (aEvent);
     switch (aEvent->type())
     {
@@ -350 +346 @@
 void VBoxVMInformationDlg::resizeEvent (QResizeEvent *aEvent)
 {
-    QIMainDialog::resizeEvent (aEvent);
+    QMainWindow::resizeEvent (aEvent);
 
     /* Store dialog size for this vm */
@@ -369 +365 @@
     if (!mIsPolished)
     {
-        /* Load window size and state */
+        /* Load window size, adjust position and load window state finally: */
         resize (mWidth, mHeight);
+        vboxGlobal().centerWidget(this, m_pPseudoParentWidget, false);
         if (mMax)
             QTimer::singleShot (0, this, SLOT (showMaximized()));
@@ -377 +374 @@
     }
 
-    QIMainDialog::showEvent (aEvent);
+    QMainWindow::showEvent (aEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.h

@@ -20 +20 @@
 #define __VBoxVMInformationDlg_h__
 
-/* Local includes: */
+/* Qt includes: */
+#include <QMainWindow>
+
+/* GUI includes: */
 #include "VBoxVMInformationDlg.gen.h"
-#include "QIMainDialog.h"
 #include "QIWithRetranslateUI.h"
 
@@ -32 +34 @@
 class QTimer;
 
-class VBoxVMInformationDlg : public QIWithRetranslateUI2 <QIMainDialog>, public Ui::VBoxVMInformationDlg
+class VBoxVMInformationDlg : public QIWithRetranslateUI<QMainWindow>, public Ui::VBoxVMInformationDlg
 {
     Q_OBJECT;
@@ -47 +49 @@
 protected:
 
-    VBoxVMInformationDlg (UIMachineWindow *pMachineWindow, Qt::WindowFlags aFlags);
+    VBoxVMInformationDlg(UIMachineWindow *pMachineWindow);
    ~VBoxVMInformationDlg();
 
@@ -75 +77 @@
     static InfoDlgMap  mSelfArray;
 
+    /** Widget to center UIMediumManager according. */
+    QWidget           *m_pPseudoParentWidget;
+
     CSession           mSession;
     bool               mIsPolished;