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

Timestamp:

Feb 16, 2016 12:26:05 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​bugref:8088: Rework session-information window: Cleanups.

Location:

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

Files:

• UIInformation.cpp (modified) (4 diffs)
• UIInformation.h (modified) (1 diff)
• UIInformationDataItem.cpp (modified) (10 diffs)
• UIInformationDataItem.h (modified) (8 diffs)
• UIInformationModel.cpp (modified) (1 diff)

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

@@ -42 +42 @@
 {
     /* Prepare main-layout: */
-    prepareLayout();
+    prepareMainLayout();
 
     /* Prepare model: */
@@ -51 +51 @@
 }
 
-void UIInformation::prepareLayout()
+void UIInformation::prepareMainLayout()
 {
     /* Create main-layout: */
@@ -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);
+        }
 
-    /* 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);
-    }
+        /* 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);
-    }
+        /* 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);
+
+        /* 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);
+        }
     }
 }
@@ -150 +160 @@
         }
         /* Connect datachanged signal: */
-        connect(m_pModel, SIGNAL(dataChanged(const QModelIndex, const QModelIndex)), m_pView, SLOT(updateData(const QModelIndex, const QModelIndex)));
+        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

@@ -49 +49 @@
 
     /** Prepares main-layout. */
-    void prepareLayout();
+    void prepareMainLayout();
 
     /** Prepares model. */

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

@@ -72 +72 @@
 QVariant UIInformationDataItem::data(const QModelIndex &index, int role) const
 {
-    switch (role)
-    {
-        case Qt::DisplayRole:
-        {
-            return tr("General", "details report");
-        }
-        break;
-
-        case Qt::DecorationRole:
-        {
-            return QIcon(":/machine_16px.png");
-        }
-        break;
-
-        default:
-        break;
-    }
+    Q_UNUSED(index);
+    Q_UNUSED(role);
+    /* Return null QVariant by default: */
     return QVariant();
 }
@@ -113 +99 @@
         break;
 
-        case Qt::UserRole+1:
+        case Qt::UserRole + 1:
         {
             UITextTable p_text;
@@ -122 +108 @@
         break;
 
-        case Qt::UserRole+2:
+        case Qt::UserRole + 2:
         {
             return m_type;
@@ -155 +141 @@
         break;
 
-        case Qt::UserRole+1:
+        case Qt::UserRole + 1:
         {
 #ifdef VBOX_WITH_FULL_DETAILS_REPORT
@@ -161 +147 @@
             CBIOSSettings biosSettings = aMachine.GetBIOSSettings();
             /* ACPI: */
-            QString acpi = biosSettings.GetACPIEnabled()
-                           ? tr("Enabled", "details report (ACPI)")
-                           : tr("Disabled", "details report (ACPI)");
+            QString acpi = biosSettings.GetACPIEnabled() ? tr("Enabled", "details report (ACPI)") :
+                                                           tr("Disabled", "details report (ACPI)");
             /* I/O APIC: */
-            QString ioapic = biosSettings.GetIOAPICEnabled()
-                             ? tr("Enabled", "details report (I/O APIC)")
-                             : tr("Disabled", "details report (I/O APIC)");
+            QString ioapic = biosSettings.GetIOAPICEnabled() ? tr("Enabled", "details report (I/O APIC)") :
+                                                               tr("Disabled", "details report (I/O APIC)");
             /* PAE/NX: */
-            QString pae = aMachine.GetCpuProperty(KCpuPropertyType_PAE)
-                          ? tr("Enabled", "details report (PAE/NX)")
-                          : tr("Disabled", "details report (PAE/NX)");
+            QString pae = aMachine.GetCpuProperty(KCpuPropertyType_PAE) ? tr("Enabled", "details report (PAE/NX)") :
+                                                                          tr("Disabled", "details report (PAE/NX)");
 
             iRowCount += 3; /* Full report rows: */
@@ -179 +162 @@
             for (ulong i = 1; i <= vboxGlobal().virtualBox().GetSystemProperties().GetMaxBootPosition(); ++i)
             {
-                KDeviceType device = m_machine.GetBootOrder (i);
+                KDeviceType device = m_machine.GetBootOrder(i);
                 if (device == KDeviceType_Null)
                     continue;
                 if (!bootOrder.isEmpty())
                     bootOrder += ", ";
-                bootOrder += gpConverter->toString (device);
+                bootOrder += gpConverter->toString(device);
             }
             if (bootOrder.isEmpty())
-                bootOrder = gpConverter->toString (KDeviceType_Null);
+                bootOrder = gpConverter->toString(KDeviceType_Null);
 
             /* Prepare data: */
@@ -206 +189 @@
             {
                 /* VT-x/AMD-V: */
-                QString virt = m_machine.GetHWVirtExProperty(KHWVirtExPropertyType_Enabled)
-                    ? tr ("Enabled", "details report (VT-x/AMD-V)")
-                    : tr ("Disabled", "details report (VT-x/AMD-V)");
+                QString virt = m_machine.GetHWVirtExProperty(KHWVirtExPropertyType_Enabled) ?
+                               tr("Enabled", "details report (VT-x/AMD-V)") :
+                               tr("Disabled", "details report (VT-x/AMD-V)");
                 p_text << UITextTableLine(tr("VT-x/AMD-V", "details report"), virt);
                 /* Nested Paging: */
-                QString nested = m_machine.GetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging)
-                    ? tr ("Enabled", "details report (Nested Paging)")
-                    : tr ("Disabled", "details report (Nested Paging)");
+                QString nested = m_machine.GetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging) ?
+                                 tr("Enabled", "details report (Nested Paging)") :
+                                 tr("Disabled", "details report (Nested Paging)");
                 p_text << UITextTableLine(tr("Nested Paging", "details report"), nested);
             }
@@ -224 +207 @@
         break;
 
-        case Qt::UserRole+2:
+        case Qt::UserRole + 2:
         {
             return m_type;
@@ -267 +250 @@
                 p_text << UITextTableLine(tr("Screens", "details report"), QString::number(cGuestScreens));
 
-            QString acc3d = m_machine.GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable()
-                            ? tr("Enabled", "details report (3D Acceleration)")
-                            : tr("Disabled", "details report (3D Acceleration)");
+            QString acc3d = m_machine.GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable() ?
+                            tr("Enabled", "details report (3D Acceleration)") :
+                            tr("Disabled", "details report (3D Acceleration)");
             p_text << UITextTableLine(tr("3D Acceleration", "details report"), acc3d);
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-            QString acc2dVideo = m_machine.GetAccelerate2DVideoEnabled()
-                                ? tr("Enabled", "details report (2D Video Acceleration)")
-                                : tr("Disabled", "details report (2D Video Acceleration)");
+            QString acc2dVideo = m_machine.GetAccelerate2DVideoEnabled() ?
+                                 tr("Enabled", "details report (2D Video Acceleration)") :
+                                 tr("Disabled", "details report (2D Video Acceleration)");
             p_text << UITextTableLine(tr("2D Video Acceleration", "details report"), acc2dVideo);
 #endif
@@ -293 +276 @@
         break;
 
-        case Qt::UserRole+2:
+        case Qt::UserRole + 2:
         {
             return m_type;

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

@@ -85 +85 @@
     CConsole m_console;
 
-    /** Holds the model. */
+    /** Holds the instance of model. */
     UIInformationModel *m_pModel;
 };
@@ -234 +234 @@
 };
 
-/** UIInformationDataRuntimeAttributes extension for the details-element type 'runtime attributes'. */
+/** UIInformationDataItem extension for the details-element type 'runtime attributes'. */
 class UIInformationDataRuntimeAttributes : public UIInformationDataItem
 {
@@ -248 +248 @@
 };
 
-/** UIInformationDataNetworkStatistics extension for the details-element type 'network statistics'. */
+/** UIInformationDataItem extension for the details-element type 'network statistics'. */
 class UIInformationDataNetworkStatistics : public UIInformationDataItem
 {
@@ -254 +254 @@
 
 public:
+
+    /** Constructs details-element object for passed @a pParent set. */
+    UIInformationDataNetworkStatistics(const CMachine &machine, const CConsole &console, UIInformationModel *pModel);
+
+    /** Returns data for item specified by @a idx for the @a role. */
+    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+private slots:
+    /** Handles processing of statistics. */
+    void sltProcessStatistics();
+
+private:
+
+    /** Returns parsed-data of statistics. */
+    QString parseStatistics(const QString &strText);
 
     /** VM statistics counter data map. */
@@ -261 +276 @@
     /** VM statistics counter struct. */
     struct CounterElementType { QString type; DataMapType list; };
-
-    /** Constructs details-element object for passed @a pParent set. */
-    UIInformationDataNetworkStatistics(const CMachine &machine, const CConsole &console, UIInformationModel *pModel);
-
-    /** Returns data for item specified by @a idx for the @a role. */
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-
-    QString parseStatistics(const QString &strText);
-
-public slots:
-    void sltProcessStatistics();
-
-private:
 
     /** VM statistics counter names. */
@@ -287 +289 @@
 };
 
-/** UIInformationDataStorageStatistics extension for the details-element type 'storage statistics'. */
+/** UIInformationDataItem extension for the details-element type 'storage statistics'. */
 class UIInformationDataStorageStatistics : public UIInformationDataItem
 {
@@ -293 +295 @@
 
 public:
+
+    /** Constructs details-element object for passed @a pParent set. */
+    UIInformationDataStorageStatistics(const CMachine &machine, const CConsole &console, UIInformationModel *pModel);
+
+    /** Returns data for item specified by @a idx for the @a role. */
+    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+private slots:
+    /** Handles processing of statistics. */
+    void sltProcessStatistics();
+
+private:
+
+    /** Returns parsed-data of statistics. */
+    QString parseStatistics(const QString &strText);
 
     /** VM statistics counter data map. */
@@ -300 +317 @@
     /** VM statistics counter struct. */
     struct CounterElementType { QString type; DataMapType list; };
-
-    /** Constructs details-element object for passed @a pParent set. */
-    UIInformationDataStorageStatistics(const CMachine &machine, const CConsole &console, UIInformationModel *pModel);
-
-    /** Returns data for item specified by @a idx for the @a role. */
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-
-    QString parseStatistics(const QString &strText);
-
-public slots:
-    void sltProcessStatistics();
-
-private:
 
     /** VM statistics counter names. */

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

@@ -71 +71 @@
     roleNames[Qt::UserRole + 1] = "";
     roleNames[Qt::UserRole + 2] = "";
+    # if QT_VERSION < 0x050000
     setRoleNames(roleNames);
+    # endif /* QT_VERSION < 0x050000 */
 
     /* Register meta-type: */