Changeset 27044 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2010 3:51:25 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: VM information dialog again

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxVMInformationDlg.cpp (modified) (3 diffs)
• VBoxVMInformationDlg.h (modified) (3 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UIMachineLogic.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• runtime/UIMachineWindow.h (modified) (2 diffs)

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

@@ -34 +34 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+#include "UIMachineLogic.h"
+#include "UIMachineWindow.h"
+#include "UIMachineView.h"
+#include "UISession.h"
+#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
+
 VBoxVMInformationDlg::InfoDlgMap VBoxVMInformationDlg::mSelfArray = InfoDlgMap();
 
+#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);
@@ -56 +76 @@
 }
 
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+VBoxVMInformationDlg::VBoxVMInformationDlg (UIMachineWindow *pMachineWindow, Qt::WindowFlags aFlags)
+# ifdef Q_WS_MAC
+    : QIWithRetranslateUI2 <QIMainDialog> (pMachineWindow->machineWindow(), aFlags)
+# else /* Q_WS_MAC */
+    : QIWithRetranslateUI2 <QIMainDialog> (0, aFlags)
+# 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
+# ifdef Q_WS_MAC
     : QIWithRetranslateUI2 <QIMainDialog> (aConsole, aFlags)
-#else /* Q_WS_MAC */
+# else /* Q_WS_MAC */
     : QIWithRetranslateUI2 <QIMainDialog> (0, aFlags)
-#endif /* Q_WS_MAC */
-    , mIsPolished (false)
+# 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))
 {
@@ -95 +127 @@
 
     /* 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()));
+    /* TODO_NEW_CORE: this is ofc not really right in the mm sense. There are
+     * more than one screens. */
+    connect (pMachineWindow->machineView(), SIGNAL (resizeHintDone()), this, SLOT (processStatistics()));
+#else /* VBOX_WITH_NEW_RUNTIME_CORE */
+    /* 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()));
-    connect (mConsole, SIGNAL (mediaDriveChanged (VBoxDefs::MediumType)), this, SLOT (updateDetails()));
-    connect (mConsole, SIGNAL (sharedFoldersChanged()), this, SLOT (updateDetails()));
     connect (mStatTimer, SIGNAL (timeout()), this, SLOT (processStatistics()));
-    connect (mConsole, SIGNAL (resizeHintDone()), this, SLOT (processStatistics()));
 
     /* Loading language constants */

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

@@ -30 +30 @@
 
 class VBoxConsoleView;
+class UIMachineWindow;
 class QTimer;
 
@@ -43 +44 @@
     typedef QMap <QString, VBoxVMInformationDlg*> InfoDlgMap;
 
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+    static void createInformationDlg(UIMachineWindow *pMachineWindow);
+#else /* VBOX_WITH_NEW_RUNTIME_CORE */
     static void createInformationDlg (const CSession &aSession, VBoxConsoleView *aConsole);
+#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
 
 protected:
 
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+    VBoxVMInformationDlg (UIMachineWindow *pMachineWindow, Qt::WindowFlags aFlags);
+#else /* VBOX_WITH_NEW_RUNTIME_CORE */
     VBoxVMInformationDlg (VBoxConsoleView *aConsole, const CSession &aSession, Qt::WindowFlags aFlags);
+#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
    ~VBoxVMInformationDlg();
 
@@ -75 +84 @@
     static InfoDlgMap  mSelfArray;
 
+#ifndef VBOX_WITH_NEW_RUNTIME_CORE
+    VBoxConsoleView   *mConsole;
+#endif /* !VBOX_WITH_NEW_RUNTIME_CORE */
+    CSession           mSession;
     bool               mIsPolished;
-    VBoxConsoleView   *mConsole;
-    CSession           mSession;
     QTimer            *mStatTimer;
 

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

@@ -895 +895 @@
 void UIMachineLogic::sltShowInformationDialog()
 {
-    // TODO: Call for singleton information dialog for this machine!
-    //VBoxVMInformationDlg::createInformationDlg(session());
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    VBoxVMInformationDlg::createInformationDlg(mainMachineWindow());
 }
 

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

@@ -65 +65 @@
 
     /* Main getters/setters: */
-    UISession* uisession() { return m_pSession; }
-    UIActionsPool* actionsPool() { return m_pActionsPool; }
+    UISession* uisession() const { return m_pSession; }
+    UIActionsPool* actionsPool() const { return m_pActionsPool; }
     UIVisualStateType visualStateType() const { return m_visualStateType; }
     QList<UIMachineWindow*>& machineWindows() { return m_machineWindowsList; }

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

@@ -103 +103 @@
 }
 
-UISession* UIMachineWindow::uisession()
+UISession* UIMachineWindow::uisession() const
 {
     return machineLogic()->uisession();
 }
 
-CSession& UIMachineWindow::session()
+CSession& UIMachineWindow::session() const
 {
     return uisession()->session();

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

@@ -51 +51 @@
 
     /* Public getters: */
-    virtual UIMachineLogic* machineLogic() { return m_pMachineLogic; }
-    virtual QWidget* machineWindow() { return m_pMachineWindow; }
-    virtual UIMachineView* machineView() { return m_pMachineView; }
+    virtual UIMachineLogic* machineLogic() const { return m_pMachineLogic; }
+    virtual QWidget* machineWindow() const { return m_pMachineWindow; }
+    virtual UIMachineView* machineView() const { return m_pMachineView; }
+    UISession* uisession() const;
+    CSession& session() const;
 
 protected:
@@ -60 +62 @@
     UIMachineWindow(UIMachineLogic *pMachineLogic, ulong uScreenId);
     virtual ~UIMachineWindow();
-
-    /* Protected wrappers: */
-    UISession* uisession();
-    CSession& session();
 
     /* Protected getters: */