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

Timestamp:

Mar 5, 2010 1:28:41 PM (15 years ago)

Author:

vboxsync

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

58412

Message:

FE/Qt4: new core: make it possible to use this class in the old and new code at the same time

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxVMInformationDlg.cpp (modified) (5 diffs)
• VBoxVMInformationDlg.h (modified) (3 diffs)

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

@@ -45 +45 @@
 #ifdef VBOX_WITH_NEW_RUNTIME_CORE
 void VBoxVMInformationDlg::createInformationDlg(UIMachineWindow *pMachineWindow)
-#else /* VBOX_WITH_NEW_RUNTIME_CORE */
-void VBoxVMInformationDlg::createInformationDlg (const CSession &aSession, VBoxConsoleView *aConsole)
-#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
-{
-#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+{
     CMachine machine = pMachineWindow->machineLogic()->uisession()->session().GetMachine();
-#else /* VBOX_WITH_NEW_RUNTIME_CORE */
-    CMachine machine = aSession.GetMachine();
-#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
     if (mSelfArray.find (machine.GetName()) == mSelfArray.end())
     {
         /* Creating new information dialog if there is no one existing */
-#ifdef VBOX_WITH_NEW_RUNTIME_CORE
         VBoxVMInformationDlg *id = new VBoxVMInformationDlg(pMachineWindow, Qt::Window);
         id->centerAccording (pMachineWindow->machineWindow());
-#else /* VBOX_WITH_NEW_RUNTIME_CORE */
-        VBoxVMInformationDlg *id = new VBoxVMInformationDlg (aConsole, aSession, Qt::Window);
-        id->centerAccording (aConsole);
-#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
         connect (vboxGlobal().mainWindow(), SIGNAL (closing()), id, SLOT (close()));
         id->setAttribute (Qt::WA_DeleteOnClose);
@@ -76 +64 @@
 }
 
-#ifdef VBOX_WITH_NEW_RUNTIME_CORE
 VBoxVMInformationDlg::VBoxVMInformationDlg (UIMachineWindow *pMachineWindow, Qt::WindowFlags aFlags)
 # ifdef Q_WS_MAC
@@ -84 +71 @@
 # endif /* Q_WS_MAC */
     , mSession (pMachineWindow->session())
-#else /* VBOX_WITH_NEW_RUNTIME_CORE */
-VBoxVMInformationDlg::VBoxVMInformationDlg (VBoxConsoleView *aConsole, const CSession &aSession, Qt::WindowFlags aFlags)
-# ifdef Q_WS_MAC
-    : QIWithRetranslateUI2 <QIMainDialog> (aConsole, aFlags)
-# else /* Q_WS_MAC */
-    : QIWithRetranslateUI2 <QIMainDialog> (0, aFlags)
-# endif /* Q_WS_MAC */
-#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
-#ifndef VBOX_WITH_NEW_RUNTIME_CORE
-    , mConsole (aConsole)
-    , mSession (aSession)
-#endif /* !VBOX_WITH_NEW_RUNTIME_CORE */
     , mIsPolished (false)
     , mStatTimer (new QTimer (this))
@@ -127 +102 @@
 
     /* Setup handlers */
-#ifdef VBOX_WITH_NEW_RUNTIME_CORE
     connect (pMachineWindow->uisession(), SIGNAL (sigMediumChange(const CMediumAttachment&)), this, SLOT (updateDetails()));
     connect (pMachineWindow->uisession(), SIGNAL (sigSharedFolderChange()), this, SLOT (updateDetails()));
@@ -133 +107 @@
      * more than one screens. */
     connect (pMachineWindow->machineView(), SIGNAL (resizeHintDone()), this, SLOT (processStatistics()));
-#else /* VBOX_WITH_NEW_RUNTIME_CORE */
+    connect (mInfoStack, SIGNAL (currentChanged (int)), this, SLOT (onPageChanged (int)));
+    connect (&vboxGlobal(), SIGNAL (mediumEnumFinished (const VBoxMediaList &)), this, SLOT (updateDetails()));
+    connect (mStatTimer, SIGNAL (timeout()), this, SLOT (processStatistics()));
+
+    /* Loading language constants */
+    retranslateUi();
+
+    /* Details page update */
+    updateDetails();
+
+    /* Statistics page update */
+    processStatistics();
+    mStatTimer->start (5000);
+
+    /* Preload dialog attributes for this vm */
+    QString dlgsize = mSession.GetMachine().GetExtraData (VBoxDefs::GUI_InfoDlgState);
+    if (dlgsize.isEmpty())
+    {
+        mWidth = 400;
+        mHeight = 450;
+        mMax = false;
+    }
+    else
+    {
+        QStringList list = dlgsize.split (',');
+        mWidth = list [0].toInt(), mHeight = list [1].toInt();
+        mMax = list [2] == "max";
+    }
+
+    /* Make statistics page the default one */
+    mInfoStack->setCurrentIndex (1);
+}
+#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
+
+void VBoxVMInformationDlg::createInformationDlg (const CSession &aSession, VBoxConsoleView *aConsole)
+{
+    CMachine machine = aSession.GetMachine();
+    if (mSelfArray.find (machine.GetName()) == mSelfArray.end())
+    {
+        /* Creating new information dialog if there is no one existing */
+        VBoxVMInformationDlg *id = new VBoxVMInformationDlg (aConsole, aSession, Qt::Window);
+        id->centerAccording (aConsole);
+        connect (vboxGlobal().mainWindow(), SIGNAL (closing()), id, SLOT (close()));
+        id->setAttribute (Qt::WA_DeleteOnClose);
+        mSelfArray [machine.GetName()] = id;
+    }
+
+    VBoxVMInformationDlg *info = mSelfArray [machine.GetName()];
+    info->show();
+    info->raise();
+    info->setWindowState (info->windowState() & ~Qt::WindowMinimized);
+    info->activateWindow();
+}
+
+VBoxVMInformationDlg::VBoxVMInformationDlg (VBoxConsoleView *aConsole, const CSession &aSession, Qt::WindowFlags aFlags)
+# ifdef Q_WS_MAC
+    : QIWithRetranslateUI2 <QIMainDialog> (aConsole, aFlags)
+# else /* Q_WS_MAC */
+    : QIWithRetranslateUI2 <QIMainDialog> (0, aFlags)
+# endif /* Q_WS_MAC */
+    , mConsole (aConsole)
+    , mSession (aSession)
+    , mIsPolished (false)
+    , mStatTimer (new QTimer (this))
+{
+    /* Apply UI decorations */
+    Ui::VBoxVMInformationDlg::setupUi (this);
+
+#ifdef Q_WS_MAC
+    /* No icon for this window on the mac, cause this would act as proxy icon which isn't necessary here. */
+    setWindowIcon (QIcon());
+#else
+    /* Apply window icons */
+    setWindowIcon (vboxGlobal().iconSetFull (QSize (32, 32), QSize (16, 16),
+                                             ":/session_info_32px.png", ":/session_info_16px.png"));
+#endif
+
+    /* Enable size grip without using a status bar. */
+    setSizeGripEnabled (true);
+
+    /* Setup focus-proxy for pages */
+    mPage1->setFocusProxy (mDetailsText);
+    mPage2->setFocusProxy (mStatisticText);
+
+    /* Setup browsers */
+    mDetailsText->viewport()->setAutoFillBackground (false);
+    mStatisticText->viewport()->setAutoFillBackground (false);
+
+    /* Setup margins */
+    mDetailsText->setViewportMargins (5, 5, 5, 5);
+    mStatisticText->setViewportMargins (5, 5, 5, 5);
+
+    /* Setup handlers */
     /* Setup handlers */
     connect (mConsole, SIGNAL (mediaDriveChanged (VBoxDefs::MediumType)), this, SLOT (updateDetails()));
     connect (mConsole, SIGNAL (sharedFoldersChanged()), this, SLOT (updateDetails()));
     connect (mConsole, SIGNAL (resizeHintDone()), this, SLOT (processStatistics()));
-#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
     connect (mInfoStack, SIGNAL (currentChanged (int)), this, SLOT (onPageChanged (int)));
     connect (&vboxGlobal(), SIGNAL (mediumEnumFinished (const VBoxMediaList &)), this, SLOT (updateDetails()));

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

@@ -46 +46 @@
 #ifdef VBOX_WITH_NEW_RUNTIME_CORE
     static void createInformationDlg(UIMachineWindow *pMachineWindow);
-#else /* VBOX_WITH_NEW_RUNTIME_CORE */
+#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
     static void createInformationDlg (const CSession &aSession, VBoxConsoleView *aConsole);
-#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
 
 protected:
@@ -54 +53 @@
 #ifdef VBOX_WITH_NEW_RUNTIME_CORE
     VBoxVMInformationDlg (UIMachineWindow *pMachineWindow, Qt::WindowFlags aFlags);
-#else /* VBOX_WITH_NEW_RUNTIME_CORE */
+#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
     VBoxVMInformationDlg (VBoxConsoleView *aConsole, const CSession &aSession, Qt::WindowFlags aFlags);
-#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
    ~VBoxVMInformationDlg();
 
@@ -84 +82 @@
     static InfoDlgMap  mSelfArray;
 
-#ifndef VBOX_WITH_NEW_RUNTIME_CORE
     VBoxConsoleView   *mConsole;
-#endif /* !VBOX_WITH_NEW_RUNTIME_CORE */
     CSession           mSession;
     bool               mIsPolished;