Changeset 59641 in vbox for trunk

Timestamp:

Feb 12, 2016 9:34:11 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​bugref:8088: Rework session-information window: UIInformation classes cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information

Files:

• UIInformation.cpp (modified) (4 diffs)
• UIInformation.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformation.cpp

@@ -44 +44 @@
     prepareLayout();
 
+    /* Prepare model: */
+    prepareModel();
+
     /* Prepare view: */
     prepareView();
-
-    /* Prepare model: */
-    prepareModel();
 }
 
@@ -69 +69 @@
     m_pModel = new UIInformationModel(this, m_machine, m_console);
     AssertPtrReturnVoid(m_pModel);
+
+    /* Prepare data for information-model: */
+    /* General data-item: */
+    UIInformationDataItem *pGeneral = new UIInformationDataGeneral(m_machine, m_console, m_pModel);
+    AssertPtrReturnVoid(pGeneral);
+    {
+        m_pModel->addItem(pGeneral);
+    }
+    /* System data-item: */
+    UIInformationDataItem *pSystem = new UIInformationDataSystem(m_machine, m_console, m_pModel);
+    AssertPtrReturnVoid(pSystem);
+    {
+        m_pModel->addItem(pSystem);
+    }
+    /* Display data-item: */
+    UIInformationDataItem *pDisplay = new UIInformationDataDisplay(m_machine, m_console, m_pModel);
+    AssertPtrReturnVoid(pDisplay);
+    {
+        m_pModel->addItem(pDisplay);
+    }
+    /* Storage data-item: */
+    UIInformationDataItem *pStorage = new UIInformationDataStorage(m_machine, m_console, m_pModel);
+    AssertPtrReturnVoid(pStorage);
+    {
+        m_pModel->addItem(pStorage);
+    }
+    /* Audio data-item: */
+    UIInformationDataItem *pAudio = new UIInformationDataAudio(m_machine, m_console, m_pModel);
+    AssertPtrReturnVoid(pAudio);
+    {
+        m_pModel->addItem(pAudio);
+    }
+    /* Network data-item: */
+    UIInformationDataItem *pNetwork = new UIInformationDataNetwork(m_machine, m_console, m_pModel);
+    AssertPtrReturnVoid(pNetwork);
+    {
+        m_pModel->addItem(pNetwork);
+    }
+    /* Serial ports data-item: */
+    UIInformationDataItem *pSerialPorts = new UIInformationDataSerialPorts(m_machine, m_console, m_pModel);
+    AssertPtrReturnVoid(pSerialPorts);
+    {
+        m_pModel->addItem(pSerialPorts);
+    }
+#ifdef VBOX_WITH_PARALLEL_PORTS
+    /* Parallel ports data-item: */
+    UIInformationDataItem *pParallelPorts = new UIInformationDataParallelPorts(m_machine, m_console, m_pModel);
+    AssertPtrReturnVoid(pParallelPorts);
+    {
+        m_list.append(pParallelPorts);
+    }
+#endif /* VBOX_WITH_PARALLEL_PORTS */
+    /* USB data-item: */
+    UIInformationDataItem *pUSB = new UIInformationDataUSB(m_machine, m_console, m_pModel);
+    AssertPtrReturnVoid(pUSB);
+    {
+        m_pModel->addItem(pUSB);
+    }
+    /* Shared folders data-item: */
+    UIInformationDataItem *pSharedFolders = new UIInformationDataSharedFolders(m_machine, m_console, m_pModel);
+    AssertPtrReturnVoid(pSharedFolders);
+    {
+        m_pModel->addItem(pSharedFolders);
+    }
 }
 
@@ -79 +143 @@
         /* Prepare view: */
         m_pView->setResizeMode(QListView::Adjust);
-
         /* Create information-delegate item: */
         UIInformationItem* pItem = new UIInformationItem(m_pView);
@@ -86 +149 @@
             m_pView->setItemDelegate(pItem);
         }
+        /* Connect datachanged signal: */
+        connect(m_pModel, SIGNAL(dataChanged(const QModelIndex, const QModelIndex)), m_pView, SLOT(updateData(const QModelIndex, const QModelIndex)));
 
         /* Set model: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformation.h

@@ -29 +29 @@
 
 /* Forward declartions: */
-class UIVMItem;
 class QVBoxLayout;
 class UIInformationView;