Changeset 59644 in vbox

Timestamp:

Feb 12, 2016 10:48:52 AM (9 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UIInformationModel.cpp (modified) (3 diffs)
• UIInformationModel.h (modified) (1 diff)

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

@@ -44 +44 @@
     /* Prepare information-model: */
     prepare();
-
-    /* Prepare data for information-model: */
-    prepareData();
 }
 
@@ -72 +69 @@
     roleNames[Qt::DisplayRole] = "";
     roleNames[Qt::DecorationRole] = "";
-    roleNames[Qt::SizeHintRole] = "";
-    roleNames[Qt::UserRole+1] = "";
+    roleNames[Qt::UserRole + 1] = "";
+    roleNames[Qt::UserRole + 2] = "";
     setRoleNames(roleNames);
 
     /* Register meta-type: */
     qRegisterMetaType<InformationElementType>();
-}
-
-void UIInformationModel::prepareData()
-{
-    /* Prepare data for information-model: */
-    UIInformationDataItem *pGeneral = new UIInformationDataGeneral(m_machine, m_console);
-    AssertPtrReturnVoid(pGeneral);
-    {
-        m_list.append(pGeneral);
-    }
-    UIInformationDataSystem *pSystem = new UIInformationDataSystem(m_machine, m_console);
-    AssertPtrReturnVoid(pSystem);
-    {
-        m_list.append(pSystem);
-    }
-    UIInformationDataDisplay *pDisplay = new UIInformationDataDisplay(m_machine, m_console);
-    AssertPtrReturnVoid(pDisplay);
-    {
-        m_list.append(pDisplay);
-    }
 }
 
@@ -105 +82 @@
     roleNames[Qt::DisplayRole] = "";
     roleNames[Qt::DecorationRole] = "";
-    roleNames[Qt::SizeHintRole] = "";
-    roleNames[Qt::UserRole+1] = "";
+    roleNames[Qt::UserRole + 1] = "";
+    roleNames[Qt::UserRole + 2] = "";
     return roleNames;
 }
 
+void UIInformationModel::addItem(UIInformationDataItem *pItem)
+{
+    AssertPtrReturnVoid(pItem);
+    m_list.append(pItem);
+}
+
+void UIInformationModel::updateData(const QModelIndex &idx)
+{
+    emit dataChanged(idx, idx);
+}
+

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

@@ -67 +67 @@
     QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const;
 
+    /** Adds the item. */
+    void addItem(UIInformationDataItem *pItem);
+
+    /** Updates Data. */
+    void updateData(const QModelIndex &idx);
+
 private:
 
     /** Prepares information-model. */
     void prepare();
-
-    /** Prepares data for information-model. */
-    void prepareData();
 
     /** Returns the list of role-names supported by model. */