Changeset 81094 in vbox

Timestamp:

Oct 1, 2019 11:34:45 AM (5 years ago)

Author:

vboxsync

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

133703

Message:

FE/Qt: bugref:9510. Some refactoring

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.cpp (modified) (3 diffs)

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

@@ -87 +87 @@
     void updateUpTime();
     void updateTitleRow();
+    void updateOSTypeRow();
+    void updateVirtualizationInfo();
 
     /** Searches the table for the @p item of enmLine and replaces its text. if not found inserts a new
@@ -324 +326 @@
 }
 
-void UIRuntimeInfoWidget::updateGAsVersion()
-{
-    CGuest guest = m_console.GetGuest();
-    QString strGAVersion = guest.GetAdditionsVersion();
-    if (strGAVersion.isEmpty())
-        strGAVersion = m_strNotDetected;
+void UIRuntimeInfoWidget::updateOSTypeRow()
+{
+   QString strOSType = m_console.GetGuest().GetOSTypeId();
+    if (strOSType.isEmpty())
+        strOSType = m_strNotDetected;
     else
-    {
-        ULONG uRevision = guest.GetAdditionsRevision();
-        if (uRevision != 0)
-            strGAVersion += QString(" r%1").arg(uRevision);
-    }
-   updateInfoRow(InfoRow_GuestAdditions, QString("%1:").arg(m_strGuestAdditionsLabel), strGAVersion);
-}
-
-void UIRuntimeInfoWidget::updateVRDE()
-{
-    int iVRDEPort = m_console.GetVRDEServerInfo().GetPort();
-    QString strVRDEInfo = (iVRDEPort == 0 || iVRDEPort == -1) ?
-        m_strNotAvailable : QString("%1").arg(iVRDEPort);
-   updateInfoRow(InfoRow_RemoteDesktop, QString("%1:").arg(m_strRemoteDesktopLabel), strVRDEInfo);
-}
-
-void UIRuntimeInfoWidget::updateClipboardMode(KClipboardMode enmMode /* = KClipboardMode_Max */)
-{
-    if (enmMode == KClipboardMode_Max)
-        updateInfoRow(InfoRow_ClipboardMode, QString("%1:").arg(m_strClipboardModeLabel),
-                      gpConverter->toString(m_machine.GetClipboardMode()));
-    else
-        updateInfoRow(InfoRow_ClipboardMode, QString("%1:").arg(m_strClipboardModeLabel),
-                      gpConverter->toString(enmMode));
-}
-
-void UIRuntimeInfoWidget::updateDnDMode(KDnDMode enmMode /* = KDnDMode_Max */)
-{
-    if (enmMode == KDnDMode_Max)
-        updateInfoRow(InfoRow_DnDMode, QString("%1:").arg(m_strDragAndDropLabel),
-                  gpConverter->toString(m_machine.GetDnDMode()));
-    else
-        updateInfoRow(InfoRow_DnDMode, QString("%1:").arg(m_strDragAndDropLabel),
-                      gpConverter->toString(enmMode));
-}
-
-void UIRuntimeInfoWidget::updateInfoRow(InfoRow enmLine, const QString &strColumn0, const QString &strColumn1)
-{
-    QTableWidgetItem *pItem = 0;
-    for (int i = 0; i < rowCount() && !pItem; ++i)
-    {
-        pItem = item(i, 1);
-        if (!pItem)
-            continue;
-        if (pItem->type() != enmLine)
-            pItem = 0;
-    }
-    if (!pItem)
-        insertInfoRow(enmLine, strColumn0, strColumn1);
-    else
-        pItem->setText(strColumn1);
-}
-
-void UIRuntimeInfoWidget::createInfoRows()
-{
-    clear();
-    setRowCount(0);
-    setColumnCount(2);
-    updateTitleRow();
-    updateScreenInfo();
-    updateUpTime();
+        strOSType = uiCommon().vmGuestOSTypeDescription(strOSType);
+   updateInfoRow(InfoRow_GuestOSType, QString("%1:").arg(m_strGuestOSTypeLabel), strOSType);
+}
+
+void UIRuntimeInfoWidget::updateVirtualizationInfo()
+{
 
     /* Determine virtualization attributes: */
@@ -420 +366 @@
     QString strNestedPaging = debugger.GetHWVirtExNestedPagingEnabled() ?
         m_strActive : m_strInactive;
-
     QString strUnrestrictedExecution = debugger.GetHWVirtExUXEnabled() ?
         m_strActive : m_strInactive;
-
     QString strParavirtProvider = gpConverter->toString(m_machine.GetEffectiveParavirtProvider());
 
-    QString strOSType = m_console.GetGuest().GetOSTypeId();
-    if (strOSType.isEmpty())
-        strOSType = m_strNotDetected;
+    updateInfoRow(InfoRow_ExecutionEngine, QString("%1:").arg(m_strExcutionEngineLabel), strExecutionEngine);
+    updateInfoRow(InfoRow_NestedPaging, QString("%1:").arg(m_strNestedPagingLabel), strNestedPaging);
+    updateInfoRow(InfoRow_UnrestrictedExecution, QString("%1:").arg(m_strUnrestrictedExecutionLabel), strUnrestrictedExecution);
+    updateInfoRow(InfoRow_Paravirtualization, QString("%1:").arg(m_strParavirtualizationLabel), strParavirtProvider);
+
+}
+
+void UIRuntimeInfoWidget::updateGAsVersion()
+{
+    CGuest guest = m_console.GetGuest();
+    QString strGAVersion = guest.GetAdditionsVersion();
+    if (strGAVersion.isEmpty())
+        strGAVersion = m_strNotDetected;
     else
-        strOSType = uiCommon().vmGuestOSTypeDescription(strOSType);
-
+    {
+        ULONG uRevision = guest.GetAdditionsRevision();
+        if (uRevision != 0)
+            strGAVersion += QString(" r%1").arg(uRevision);
+    }
+   updateInfoRow(InfoRow_GuestAdditions, QString("%1:").arg(m_strGuestAdditionsLabel), strGAVersion);
+}
+
+void UIRuntimeInfoWidget::updateVRDE()
+{
+    int iVRDEPort = m_console.GetVRDEServerInfo().GetPort();
+    QString strVRDEInfo = (iVRDEPort == 0 || iVRDEPort == -1) ?
+        m_strNotAvailable : QString("%1").arg(iVRDEPort);
+   updateInfoRow(InfoRow_RemoteDesktop, QString("%1:").arg(m_strRemoteDesktopLabel), strVRDEInfo);
+}
+
+void UIRuntimeInfoWidget::updateClipboardMode(KClipboardMode enmMode /* = KClipboardMode_Max */)
+{
+    if (enmMode == KClipboardMode_Max)
+        updateInfoRow(InfoRow_ClipboardMode, QString("%1:").arg(m_strClipboardModeLabel),
+                      gpConverter->toString(m_machine.GetClipboardMode()));
+    else
+        updateInfoRow(InfoRow_ClipboardMode, QString("%1:").arg(m_strClipboardModeLabel),
+                      gpConverter->toString(enmMode));
+}
+
+void UIRuntimeInfoWidget::updateDnDMode(KDnDMode enmMode /* = KDnDMode_Max */)
+{
+    if (enmMode == KDnDMode_Max)
+        updateInfoRow(InfoRow_DnDMode, QString("%1:").arg(m_strDragAndDropLabel),
+                  gpConverter->toString(m_machine.GetDnDMode()));
+    else
+        updateInfoRow(InfoRow_DnDMode, QString("%1:").arg(m_strDragAndDropLabel),
+                      gpConverter->toString(enmMode));
+}
+
+void UIRuntimeInfoWidget::updateInfoRow(InfoRow enmLine, const QString &strColumn0, const QString &strColumn1)
+{
+    QTableWidgetItem *pItem = 0;
+    for (int i = 0; i < rowCount() && !pItem; ++i)
+    {
+        pItem = item(i, 1);
+        if (!pItem)
+            continue;
+        if (pItem->type() != enmLine)
+            pItem = 0;
+    }
+    if (!pItem)
+        insertInfoRow(enmLine, strColumn0, strColumn1);
+    else
+        pItem->setText(strColumn1);
+}
+
+void UIRuntimeInfoWidget::createInfoRows()
+{
+    clear();
+    setRowCount(0);
+    setColumnCount(2);
+    updateTitleRow();
+    updateScreenInfo();
+    updateUpTime();
     updateClipboardMode();
     updateDnDMode();
-    insertInfoRow(InfoRow_ExecutionEngine, QString("%1:").arg(m_strExcutionEngineLabel), strExecutionEngine);
-    insertInfoRow(InfoRow_NestedPaging, QString("%1:").arg(m_strNestedPagingLabel), strNestedPaging);
-    insertInfoRow(InfoRow_UnrestrictedExecution, QString("%1:").arg(m_strUnrestrictedExecutionLabel), strUnrestrictedExecution);
-    insertInfoRow(InfoRow_Paravirtualization, QString("%1:").arg(m_strParavirtualizationLabel), strParavirtProvider);
+    updateVirtualizationInfo();
     updateGAsVersion();
-    insertInfoRow(InfoRow_GuestOSType, QString("%1:").arg(m_strGuestOSTypeLabel), strOSType);
+    updateOSTypeRow();
     updateVRDE();
     resizeColumnToContents(1);