Changeset 58726 in vbox

Timestamp:

Nov 17, 2015 4:37:24 PM (9 years ago)

Author:

vboxsync

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

104158

Message:

FE/Qt: ​​bugref:8088: Rework session-information window: Using new enum InformationElementType and basic implementation of new UI.

Location:

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

Files:

• UIGInformation.cpp (modified) (2 diffs)
• UIGInformationElement.cpp (modified) (5 diffs)
• UIGInformationElement.h (modified) (3 diffs)
• UIGInformationElements.cpp (modified) (3 diffs)
• UIGInformationElements.h (modified) (14 diffs)
• UIGInformationGroup.cpp (modified) (1 diff)
• UIGInformationModel.cpp (modified) (10 diffs)
• UIGInformationModel.h (modified) (5 diffs)
• UIGInformationSet.cpp (modified) (13 diffs)
• UIGInformationSet.h (modified) (4 diffs)
• UIGRuntimeInformation.cpp (modified) (1 diff)
• UIVMInformationDialog.cpp (modified) (5 diffs)

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

@@ -25 +25 @@
 
 /* GUI includes: */
+# include "UIExtraDataManager.h"
 # include "UIGInformation.h"
 # include "UIGInformationModel.h"
@@ -81 +82 @@
     /* Setup details-model: */
     m_pDetailsModel = new UIGInformationModel(this);
+    m_pDetailsModel->setInformationWindowElements(gEDataManager->informationWindowElements());
 }
 

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

@@ -42 +42 @@
 
 
-UIGInformationElement::UIGInformationElement(UIGInformationSet *pParent, DetailsElementType type, bool fOpened)
+UIGInformationElement::UIGInformationElement(UIGInformationSet *pParent, InformationElementType type, bool fOpened)
     : UIGInformationItem(pParent)
     , m_pSet(pParent)
@@ -438 +438 @@
     m_pHighlightMachine->start();
 
-    connect(this, SIGNAL(sigToggleElement(DetailsElementType, bool)), model(), SLOT(sltToggleElements(DetailsElementType, bool)));
+    connect(this, SIGNAL(sigToggleElement(InformationElementType, bool)), model(), SLOT(sltToggleElements(InformationElementType, bool)));
     connect(this, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)),
             model(), SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)));
@@ -458 +458 @@
     /* Create text-pane: */
     m_pTextPane = new UIGraphicsTextPane(this, model()->paintDevice());
+    /* Make sure item text is selectable: */
+    m_pTextPane->setFlag(QGraphicsItem::ItemIsSelectable);
     connect(m_pTextPane, SIGNAL(sigGeometryChanged()), this, SLOT(sltUpdateGeometry()));
     connect(m_pTextPane, SIGNAL(sigAnchorClicked(const QString&)), this, SLOT(sltHandleAnchorClicked(const QString&)));
@@ -621 +623 @@
     pEvent->accept();
     QString strCategory;
-    if (m_type >= DetailsElementType_General &&
-        m_type < DetailsElementType_Description)
+    if (m_type >= InformationElementType_General &&
+        m_type < InformationElementType_Description)
         strCategory = QString("#%1").arg(gpConverter->toInternalString(m_type));
-    else if (m_type == DetailsElementType_Description)
+    else if (m_type == InformationElementType_Description)
         strCategory = QString("#%1%%mTeDescription").arg(gpConverter->toInternalString(m_type));
+    else if (m_type >= InformationElementType_RuntimeAttributes &&
+             m_type < InformationElementType_NetworkStatistics)
+        strCategory = QString("#%1").arg(gpConverter->toInternalString(m_type));
     emit sigLinkClicked(strCategory, QString(), machine().GetId());
 }
@@ -650 +655 @@
 {
     /* Not for 'preview' element type: */
-    if (m_type == DetailsElementType_Preview)
+    if (m_type == InformationElementType_Preview)
         return;
 

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

@@ -54 +54 @@
 
     /* Notifiers: Toggle stuff: */
-    void sigToggleElement(DetailsElementType type, bool fToggled);
+    void sigToggleElement(InformationElementType type, bool fToggled);
     void sigToggleElementFinished();
 
@@ -67 +67 @@
 
     /* Constructor/destructor: */
-    UIGInformationElement(UIGInformationSet *pParent, DetailsElementType type, bool fOpened);
+    UIGInformationElement(UIGInformationSet *pParent, InformationElementType type, bool fOpened);
     ~UIGInformationElement();
 
     /* API: Element type: */
-    DetailsElementType elementType() const { return m_type; }
+    InformationElementType elementType() const { return m_type; }
 
     /* API: Open/close stuff: */
@@ -189 +189 @@
     /* Variables: */
     UIGInformationSet *m_pSet;
-    DetailsElementType m_type;
+    InformationElementType m_type;
     QPixmap m_pixmap;
     QString m_strName;

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

@@ -63 +63 @@
 }
 
-UIGInformationElementInterface::UIGInformationElementInterface(UIGInformationSet *pParent, DetailsElementType type, bool fOpened)
+UIGInformationElementInterface::UIGInformationElementInterface(UIGInformationSet *pParent, InformationElementType type, bool fOpened)
     : UIGInformationElement(pParent, type, fOpened)
     , m_pTask(0)
@@ -123 +123 @@
 
 UIGInformationElementPreview::UIGInformationElementPreview(UIGInformationSet *pParent, bool fOpened)
-    : UIGInformationElement(pParent, DetailsElementType_Preview, fOpened)
+    : UIGInformationElement(pParent, InformationElementType_Preview, fOpened)
 {
     /* Assign corresponding icon: */
@@ -958 +958 @@
 }
 
+void UIGInformationUpdateTaskRuntimeAttributes::run()
+{
+
+}
+

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

@@ -50 +50 @@
       * @param type    brings the details-element type this element belongs to.
       * @param fOpened brings whether the details-element should be visually opened. */
-    UIGInformationElementInterface(UIGInformationSet *pParent, DetailsElementType type, bool fOpened);
+    UIGInformationElementInterface(UIGInformationSet *pParent, InformationElementType type, bool fOpened);
 
 protected:
@@ -140 +140 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementGeneral(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_General, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_General, fOpened) {}
 
 private:
@@ -176 +176 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementSystem(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_System, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_System, fOpened) {}
 
 private:
@@ -212 +212 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementDisplay(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_Display, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_Display, fOpened) {}
 
 private:
@@ -248 +248 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementStorage(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_Storage, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_Storage, fOpened) {}
 
 private:
@@ -284 +284 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementAudio(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_Audio, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_Audio, fOpened) {}
 
 private:
@@ -323 +323 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementNetwork(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_Network, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_Network, fOpened) {}
 
 private:
@@ -359 +359 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementSerial(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_Serial, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_Serial, fOpened) {}
 
 private:
@@ -396 +396 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementParallel(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_Parallel, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_Parallel, fOpened) {}
 
 private:
@@ -433 +433 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementUSB(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_USB, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_USB, fOpened) {}
 
 private:
@@ -469 +469 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementSF(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_SF, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_SF, fOpened) {}
 
 private:
@@ -505 +505 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementUI(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_UI, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_UI, fOpened) {}
 
 private:
@@ -541 +541 @@
       * @param fOpened brings whether the details-element should be visually opened. */
     UIGInformationElementDescription(UIGInformationSet *pParent, bool fOpened)
-        : UIGInformationElementInterface(pParent, DetailsElementType_Description, fOpened) {}
+        : UIGInformationElementInterface(pParent, InformationElementType_Description, fOpened) {}
 
 private:
@@ -549 +549 @@
 };
 
+/** UITask extension used as update task for the details-element type 'Description'. */
+class UIGInformationUpdateTaskRuntimeAttributes : public UIGInformationUpdateTask
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs update task passing @a machine to the base-class. */
+    UIGInformationUpdateTaskRuntimeAttributes(const CMachine &machine)
+        : UIGInformationUpdateTask(machine) {}
+
+private:
+
+    /** Contains update task body. */
+    void run();
+};
+
+/** UIGInformationElementInterface extension for the details-element type 'Description'. */
+class UIGInformationElementRuntimeAttributes : public UIGInformationElementInterface
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs details-element object for passed @a pParent set.
+      * @param fOpened brings whether the details-element should be visually opened. */
+    UIGInformationElementRuntimeAttributes(UIGInformationSet *pParent, bool fOpened)
+        : UIGInformationElementInterface(pParent, InformationElementType_RuntimeAttributes, fOpened) {}
+
+private:
+
+    /** Creates update task for this element. */
+    UITask* createUpdateTask() { return new UIGInformationUpdateTaskRuntimeAttributes(machine()); }
+};
+
 #endif /* !___UIGInformationElements_h___ */
 

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

@@ -113 +113 @@
 
         /* Build set: */
-        pSet->buildSet(m_machineItems[iStepNumber], m_machineItems.size() == 1, model()->settings());
+        pSet->buildSet(m_machineItems[iStepNumber], m_machineItems.size() == 1, model()->informationWindowElements());
     }
     else

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

@@ -52 +52 @@
 
     /* Register meta-type: */
-    qRegisterMetaType<DetailsElementType>();
+    qRegisterMetaType<InformationElementType>();
 }
 
@@ -105 +105 @@
 }
 
+QMap<InformationElementType, bool> UIGInformationModel::informationWindowElements()
+{
+    return m_settings;
+}
+
+void UIGInformationModel::setInformationWindowElements(const QMap<InformationElementType, bool> &elements)
+{
+    //m_settings = elements;
+}
+
 void UIGInformationModel::sltHandleViewResize()
 {
@@ -111 +121 @@
 }
 
-void UIGInformationModel::sltToggleElements(DetailsElementType type, bool fToggled)
+void UIGInformationModel::sltToggleElements(InformationElementType type, bool fToggled)
 {
     /* Make sure it is not started yet: */
@@ -119 +129 @@
     /* Prepare/configure animation callback: */
     m_pAnimationCallback = new UIGInformationElementAnimationCallback(this, type, fToggled);
-    connect(m_pAnimationCallback, SIGNAL(sigAllAnimationFinished(DetailsElementType, bool)),
-            this, SLOT(sltToggleAnimationFinished(DetailsElementType, bool)), Qt::QueuedConnection);
+    connect(m_pAnimationCallback, SIGNAL(sigAllAnimationFinished(InformationElementType, bool)),
+            this, SLOT(sltToggleAnimationFinished(InformationElementType, bool)), Qt::QueuedConnection);
     /* For each the set of the group: */
     foreach (UIGInformationItem *pSetItem, m_pRoot->items())
@@ -149 +159 @@
 }
 
-void UIGInformationModel::sltToggleAnimationFinished(DetailsElementType type, bool fToggled)
+void UIGInformationModel::sltToggleAnimationFinished(InformationElementType type, bool fToggled)
 {
     /* Cleanup animation callback: */
@@ -177 +187 @@
     /* Which item was toggled? */
     QAction *pAction = qobject_cast<QAction*>(sender());
-    DetailsElementType type = pAction->data().value<DetailsElementType>();
+    InformationElementType type = pAction->data().value<InformationElementType>();
 
     /* Toggle element visibility status: */
@@ -227 +237 @@
 void UIGInformationModel::loadSettings()
 {
-    /* Load settings: */
-    m_settings = gEDataManager->selectorWindowDetailsElements();
     /* If settings are empty: */
-    if (m_settings.isEmpty())
+    //if (m_settings.isEmpty())
     {
         /* Propose the defaults: */
-        m_settings[DetailsElementType_General] = true;
-        m_settings[DetailsElementType_Preview] = true;
-        m_settings[DetailsElementType_System] = true;
-        m_settings[DetailsElementType_Display] = true;
-        m_settings[DetailsElementType_Storage] = true;
-        m_settings[DetailsElementType_Audio] = true;
-        m_settings[DetailsElementType_Network] = true;
-        m_settings[DetailsElementType_USB] = true;
-        m_settings[DetailsElementType_SF] = true;
-        m_settings[DetailsElementType_Description] = true;
+        m_settings[InformationElementType_General] = true;
+        m_settings[InformationElementType_System] = true;
+        m_settings[InformationElementType_Display] = true;
+        m_settings[InformationElementType_Storage] = true;
+        m_settings[InformationElementType_Audio] = true;
+        m_settings[InformationElementType_Network] = true;
+        m_settings[InformationElementType_USB] = true;
+        m_settings[InformationElementType_SF] = true;
+        m_settings[InformationElementType_Description] = true;
+        m_settings[InformationElementType_RuntimeAttributes] = true;
     }
 }
@@ -249 +257 @@
 {
     /* Save settings: */
-    gEDataManager->setSelectorWindowDetailsElements(m_settings);
+    //gEDataManager->setInformationWindowElements(m_settings);
 }
 
@@ -288 +296 @@
     QMenu contextMenu;
     /* Enumerate elements settings: */
-    for (int iType = DetailsElementType_General; iType <= DetailsElementType_Description; ++iType)
-    {
-        DetailsElementType currentElementType = (DetailsElementType)iType;
+    for (int iType = InformationElementType_General; iType <= InformationElementType_RuntimeAttributes; ++iType)
+    {
+        InformationElementType currentElementType = (InformationElementType)iType;
         QAction *pAction = contextMenu.addAction(gpConverter->toString(currentElementType), this, SLOT(sltElementTypeToggled()));
         pAction->setCheckable(true);
@@ -303 +311 @@
 }
 
-UIGInformationElementAnimationCallback::UIGInformationElementAnimationCallback(QObject *pParent, DetailsElementType type, bool fToggled)
+UIGInformationElementAnimationCallback::UIGInformationElementAnimationCallback(QObject *pParent, InformationElementType type, bool fToggled)
     : QObject(pParent)
     , m_type(type)

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

@@ -72 +72 @@
     void setItems(const QList<UIVMItem*> &items);
 
-    /** Returns the details settings. */
-    const QMap<DetailsElementType, bool>& settings() const { return m_settings; }
+    /** Returns information-window elements. */
+    QMap<InformationElementType, bool> informationWindowElements();
+    /** Defines information-window @a elements. */
+    void setInformationWindowElements(const QMap<InformationElementType, bool> &elements);
 
 private slots:
@@ -81 +83 @@
 
     /* Handlers: Element-items stuff: */
-    void sltToggleElements(DetailsElementType type, bool fToggled);
-    void sltToggleAnimationFinished(DetailsElementType type, bool fToggled);
+    void sltToggleElements(InformationElementType type, bool fToggled);
+    void sltToggleAnimationFinished(InformationElementType type, bool fToggled);
     void sltElementTypeToggled();
 
@@ -123 +125 @@
     UIGInformationElementAnimationCallback *m_pAnimationCallback;
     /** Holds the details settings. */
-    QMap<DetailsElementType, bool> m_settings;
+    QMap<InformationElementType, bool> m_settings;
 };
 
@@ -134 +136 @@
 
     /* Notifier: Complete stuff: */
-    void sigAllAnimationFinished(DetailsElementType type, bool fToggled);
+    void sigAllAnimationFinished(InformationElementType type, bool fToggled);
 
 public:
 
     /* Constructor: */
-    UIGInformationElementAnimationCallback(QObject *pParent, DetailsElementType type, bool fToggled);
+    UIGInformationElementAnimationCallback(QObject *pParent, InformationElementType type, bool fToggled);
 
     /* API: Notifiers stuff: */
@@ -153 +155 @@
     /* Variables: */
     QList<UIGInformationItem*> m_notifiers;
-    DetailsElementType m_type;
+    InformationElementType m_type;
     bool m_fToggled;
 };

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

@@ -63 +63 @@
 }
 
-void UIGInformationSet::buildSet(UIVMItem *pMachineItem, bool fFullSet, const QMap<DetailsElementType, bool> &settings)
+void UIGInformationSet::buildSet(UIVMItem *pMachineItem, bool fFullSet, const QMap<InformationElementType, bool> &settings)
 {
     /* Remember passed arguments: */
@@ -75 +75 @@
     if (!m_fFullSet || !m_fHasDetails)
     {
-        int iFirstItem = m_fHasDetails ? DetailsElementType_Display : DetailsElementType_General;
-        int iLastItem = DetailsElementType_Description;
+        int iFirstItem = m_fHasDetails ? InformationElementType_Display : InformationElementType_General;
+        int iLastItem = InformationElementType_RuntimeAttributes;
         bool fCleanupPerformed = false;
         for (int i = iFirstItem; i <= iLastItem; ++i)
@@ -99 +99 @@
 
     /* Choose last-step number: */
-    m_iLastStepNumber = m_fFullSet ? DetailsElementType_Description : DetailsElementType_Preview;
+    m_iLastStepNumber = m_fFullSet ? InformationElementType_Description : InformationElementType_Preview;
 
     /* Fetch USB controller restrictions: */
     const CUSBDeviceFilters &filters = m_machine.GetUSBDeviceFilters();
     if (filters.isNull() || !m_machine.GetUSBProxyAvailable())
-        m_settings.remove(DetailsElementType_USB);
+        m_settings.remove(InformationElementType_USB);
 
     /* Start building set: */
@@ -124 +124 @@
     {
         /* Load details settings: */
-        DetailsElementType elementType = (DetailsElementType)iStepNumber;
+        InformationElementType elementType = (InformationElementType)iStepNumber;
         /* Should the element be visible? */
         bool fVisible = m_settings.contains(elementType);
@@ -242 +242 @@
         {
             UIGInformationElement *pElement = pItem->toElement();
-            DetailsElementType type = pElement->elementType();
+            InformationElementType type = pElement->elementType();
             AssertMsg(!m_elements.contains(type), ("Element already added!"));
             m_elements.insert(type, pItem);
@@ -262 +262 @@
         {
             UIGInformationElement *pElement = pItem->toElement();
-            DetailsElementType type = pElement->elementType();
+            InformationElementType type = pElement->elementType();
             AssertMsg(m_elements.contains(type), ("Element do not present (type = %d)!", (int)type));
             m_elements.remove(type);
@@ -321 +321 @@
 }
 
-UIGInformationElement* UIGInformationSet::element(DetailsElementType elementType) const
+UIGInformationElement* UIGInformationSet::element(InformationElementType elementType) const
 {
     UIGInformationItem *pItem = m_elements.value(elementType, 0);
@@ -373 +373 @@
         switch (pElement->elementType())
         {
-            case DetailsElementType_General:
-            case DetailsElementType_System:
-            case DetailsElementType_Display:
-            case DetailsElementType_Storage:
-            case DetailsElementType_Audio:
-            case DetailsElementType_Network:
-            case DetailsElementType_Serial:
+            case InformationElementType_General:
+            case InformationElementType_System:
+            case InformationElementType_Display:
+            case InformationElementType_Storage:
+            case InformationElementType_Audio:
+            case InformationElementType_Network:
+            case InformationElementType_Serial:
 #ifdef VBOX_WITH_PARALLEL_PORTS
-            case DetailsElementType_Parallel:
+            case InformationElementType_Parallel:
 #endif /* VBOX_WITH_PARALLEL_PORTS */
-            case DetailsElementType_USB:
-            case DetailsElementType_SF:
-            case DetailsElementType_UI:
-            case DetailsElementType_Description:
+            case InformationElementType_USB:
+            case InformationElementType_SF:
+            case InformationElementType_UI:
+            case InformationElementType_Description:
+            case InformationElementType_RuntimeAttributes:
             {
                 iMinimumWidthHint = qMax(iMinimumWidthHint, pItem->minimumWidthHint());
                 break;
             }
-            case DetailsElementType_Preview:
+            case InformationElementType_Preview:
             {
-                UIGInformationItem *pGeneralItem = element(DetailsElementType_General);
-                UIGInformationItem *pSystemItem = element(DetailsElementType_System);
+                UIGInformationItem *pGeneralItem = element(InformationElementType_General);
+                UIGInformationItem *pSystemItem = element(InformationElementType_System);
                 int iGeneralElementWidth = pGeneralItem ? pGeneralItem->minimumWidthHint() : 0;
                 int iSystemElementWidth = pSystemItem ? pSystemItem->minimumWidthHint() : 0;
@@ -433 +434 @@
         switch (pElement->elementType())
         {
-            case DetailsElementType_General:
-            case DetailsElementType_System:
-            case DetailsElementType_Display:
-            case DetailsElementType_Storage:
-            case DetailsElementType_Audio:
-            case DetailsElementType_Network:
-            case DetailsElementType_Serial:
+            case InformationElementType_General:
+            case InformationElementType_System:
+            case InformationElementType_Display:
+            case InformationElementType_Storage:
+            case InformationElementType_Audio:
+            case InformationElementType_Network:
+            case InformationElementType_Serial:
 #ifdef VBOX_WITH_PARALLEL_PORTS
-            case DetailsElementType_Parallel:
+            case InformationElementType_Parallel:
 #endif /* VBOX_WITH_PARALLEL_PORTS */
-            case DetailsElementType_USB:
-            case DetailsElementType_SF:
-            case DetailsElementType_UI:
-            case DetailsElementType_Description:
+            case InformationElementType_USB:
+            case InformationElementType_SF:
+            case InformationElementType_UI:
+            case InformationElementType_Description:
+            case InformationElementType_RuntimeAttributes:
             {
                 iMinimumHeightHint += (pItem->minimumHeightHint() + iSpacing);
                 break;
             }
-            case DetailsElementType_Preview:
+            case InformationElementType_Preview:
             {
                 iMinimumHeightHint = qMax(iMinimumHeightHint, pItem->minimumHeightHint() + iSpacing);
@@ -488 +490 @@
         switch (pElement->elementType())
         {
-            case DetailsElementType_General:
-            case DetailsElementType_System:
-            case DetailsElementType_Display:
-            case DetailsElementType_Storage:
-            case DetailsElementType_Audio:
-            case DetailsElementType_Network:
-            case DetailsElementType_Serial:
+            case InformationElementType_General:
+            case InformationElementType_System:
+            case InformationElementType_Display:
+            case InformationElementType_Storage:
+            case InformationElementType_Audio:
+            case InformationElementType_Network:
+            case InformationElementType_Serial:
 #ifdef VBOX_WITH_PARALLEL_PORTS
-            case DetailsElementType_Parallel:
+            case InformationElementType_Parallel:
 #endif /* VBOX_WITH_PARALLEL_PORTS */
-            case DetailsElementType_USB:
-            case DetailsElementType_SF:
-            case DetailsElementType_UI:
-            case DetailsElementType_Description:
+            case InformationElementType_USB:
+            case InformationElementType_SF:
+            case InformationElementType_UI:
+            case InformationElementType_Description:
+            case InformationElementType_RuntimeAttributes:
             {
                 /* Move element: */
@@ -507 +510 @@
                 /* Calculate required width: */
                 int iWidth = iMaximumWidth - 2 * iMargin;
-                if (pElement->elementType() == DetailsElementType_General ||
-                    pElement->elementType() == DetailsElementType_System)
-                    if (UIGInformationElement *pPreviewElement = element(DetailsElementType_Preview))
+                if (pElement->elementType() == InformationElementType_General ||
+                    pElement->elementType() == InformationElementType_System)
+                    if (UIGInformationElement *pPreviewElement = element(InformationElementType_Preview))
                         if (pPreviewElement->isVisible())
                             iWidth -= (iSpacing + pPreviewElement->minimumWidthHint());
@@ -532 +535 @@
                 break;
             }
-            case DetailsElementType_Preview:
+            case InformationElementType_Preview:
             {
                 /* Prepare variables: */
@@ -568 +571 @@
 
     /* Request to build first step: */
-    emit sigBuildStep(m_strSetId, DetailsElementType_General);
-}
-
-UIGInformationElement* UIGInformationSet::createElement(DetailsElementType elementType, bool fOpen)
+    emit sigBuildStep(m_strSetId, InformationElementType_General);
+}
+
+UIGInformationElement* UIGInformationSet::createElement(InformationElementType elementType, bool fOpen)
 {
     /* Element factory: */
     switch (elementType)
     {
-        case DetailsElementType_General:     return new UIGInformationElementGeneral(this, fOpen);
-        case DetailsElementType_System:      return new UIGInformationElementSystem(this, fOpen);
-        case DetailsElementType_Preview:     return new UIGInformationElementPreview(this, fOpen);
-        case DetailsElementType_Display:     return new UIGInformationElementDisplay(this, fOpen);
-        case DetailsElementType_Storage:     return new UIGInformationElementStorage(this, fOpen);
-        case DetailsElementType_Audio:       return new UIGInformationElementAudio(this, fOpen);
-        case DetailsElementType_Network:     return new UIGInformationElementNetwork(this, fOpen);
-        case DetailsElementType_Serial:      return new UIGInformationElementSerial(this, fOpen);
+        case InformationElementType_General:     return new UIGInformationElementGeneral(this, fOpen);
+        case InformationElementType_System:      return new UIGInformationElementSystem(this, fOpen);
+        case InformationElementType_Preview:     return new UIGInformationElementPreview(this, fOpen);
+        case InformationElementType_Display:     return new UIGInformationElementDisplay(this, fOpen);
+        case InformationElementType_Storage:     return new UIGInformationElementStorage(this, fOpen);
+        case InformationElementType_Audio:       return new UIGInformationElementAudio(this, fOpen);
+        case InformationElementType_Network:     return new UIGInformationElementNetwork(this, fOpen);
+        case InformationElementType_Serial:      return new UIGInformationElementSerial(this, fOpen);
 #ifdef VBOX_WITH_PARALLEL_PORTS
-        case DetailsElementType_Parallel:    return new UIGInformationElementParallel(this, fOpen);
+        case InformationElementType_Parallel:    return new UIGInformationElementParallel(this, fOpen);
 #endif /* VBOX_WITH_PARALLEL_PORTS */
-        case DetailsElementType_USB:         return new UIGInformationElementUSB(this, fOpen);
-        case DetailsElementType_SF:          return new UIGInformationElementSF(this, fOpen);
-        case DetailsElementType_UI:          return new UIGInformationElementUI(this, fOpen);
-        case DetailsElementType_Description: return new UIGInformationElementDescription(this, fOpen);
+        case InformationElementType_USB:         return new UIGInformationElementUSB(this, fOpen);
+        case InformationElementType_SF:          return new UIGInformationElementSF(this, fOpen);
+        case InformationElementType_UI:          return new UIGInformationElementUI(this, fOpen);
+        case InformationElementType_Description: return new UIGInformationElementDescription(this, fOpen);
+        case InformationElementType_RuntimeAttributes:         return new UIGInformationElementRuntimeAttributes(this, fOpen);
     }
     return 0;

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

@@ -51 +51 @@
 
     /* API: Build stuff: */
-    void buildSet(UIVMItem *pMachineItem, bool fFullSet, const QMap<DetailsElementType, bool> &settings);
+    void buildSet(UIVMItem *pMachineItem, bool fFullSet, const QMap<InformationElementType, bool> &settings);
 
     /* API: Machine stuff: */
@@ -91 +91 @@
     bool hasItems(UIGInformationItemType type = UIGInformationItemType_Element) const;
     void clearItems(UIGInformationItemType type = UIGInformationItemType_Element);
-    UIGInformationElement* element(DetailsElementType elementType) const;
+    UIGInformationElement* element(InformationElementType elementType) const;
 
     /* Helpers: Prepare stuff: */
@@ -104 +104 @@
     /* Helpers: Build stuff: */
     void rebuildSet();
-    UIGInformationElement* createElement(DetailsElementType elementType, bool fOpen);
+    UIGInformationElement* createElement(InformationElementType elementType, bool fOpen);
 
     /** Machine-item this set built for. */
@@ -122 +122 @@
     int m_iLastStepNumber;
     QString m_strSetId;
-    QMap<DetailsElementType, bool> m_settings;
+    QMap<InformationElementType, bool> m_settings;
 };
 

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

@@ -81 +81 @@
     /* Setup details-model: */
     m_pDetailsModel = new UIGInformationModel(this);
+    QMap<InformationElementType, bool> settings;
+    settings.insert(InformationElementType_RuntimeAttributes, true);
+    m_pDetailsModel->setInformationWindowElements(settings);
 }
 

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

@@ -41 +41 @@
 # include "UIMachine.h"
 # include "UIVMItem.h"
+# include "UIGRuntimeInformation.h"
 
 /* COM includes: */
@@ -269 +270 @@
 
     /* Statistics page update: */
-    refreshStatistics();
+    //refreshStatistics();
 }
 
@@ -331 +332 @@
 
     /* Update VM statistics page: */
-    refreshStatistics();
+    //refreshStatistics();
 }
 
@@ -406 +407 @@
 void UIVMInformationDialog::prepareTabWidget()
 {
+    /* List of VM items: */
+    QList<UIVMItem*> items;
+    items << new UIVMItem(gpMachine->uisession()->machine());
+
     /* Create tab-widget: */
     m_pTabWidget = new QITabWidget;
     AssertPtrReturnVoid(m_pTabWidget);
     {
-        /* Create tabs: */
-        /* Create Configuration details tab: */
-
-        UIGInformation *pInformationWidget = new UIGInformation(this);
-        QList<UIVMItem*> items;
-        items << new UIVMItem(gpMachine->uisession()->machine());
-        pInformationWidget->setItems(items);
-        m_tabs.insert(0, pInformationWidget);
-
-        m_pTabWidget->addTab(m_tabs.value(0), QString());
-
-        for (int iTabIndex = 1; iTabIndex < 2; ++iTabIndex)
-            prepareTab(iTabIndex);
-        /* Configure tab-widget: */
+        /* Prepare tab-widget: */
         m_pTabWidget->setTabIcon(0, UIIconPool::iconSet(":/session_info_details_16px.png"));
         m_pTabWidget->setTabIcon(1, UIIconPool::iconSet(":/session_info_runtime_16px.png"));
@@ -429 +421 @@
         /* Add tab-widget into main-layout: */
         centralWidget()->layout()->addWidget(m_pTabWidget);
-    }
-}
-
-void UIVMInformationDialog::prepareTab(int iTabIndex)
-{
-    /* Create tab: */
-    m_tabs.insert(iTabIndex, new QWidget);
-    AssertPtrReturnVoid(m_tabs.value(iTabIndex));
-    {
-        /* Create tab-layout: */
-        QVBoxLayout *pLayout = new QVBoxLayout(m_tabs.value(iTabIndex));
-        {
-            /* Configure tab-layout: */
-            pLayout->setContentsMargins(0, 0, 0, 0);
-            /* Create browser: */
-            m_browsers.insert(iTabIndex, new QRichTextEdit);
-            AssertPtrReturnVoid(m_browsers.value(iTabIndex));
-            {
-                /* Configure browser: */
-                m_browsers[iTabIndex]->setReadOnly(true);
-                m_browsers[iTabIndex]->setFrameShadow(QFrame::Plain);
-                m_browsers[iTabIndex]->setFrameShape(QFrame::NoFrame);
-                m_browsers[iTabIndex]->setViewportMargins(5, 5, 5, 5);
-                m_browsers[iTabIndex]->viewport()->setAutoFillBackground(false);
-                m_tabs[iTabIndex]->setFocusProxy(m_browsers.value(iTabIndex));
-                /* Add browser into tab-layout: */
-                pLayout->addWidget(m_browsers.value(iTabIndex));
-            }
-        }
-        /* Add tab into tab-widget: */
-        m_pTabWidget->addTab(m_tabs.value(iTabIndex), QString());
+
+        /* Create tabs: */
+        /* Create Configuration details tab: */
+        UIGInformation *pInformationWidget = new UIGInformation(this);
+        AssertPtrReturnVoid(pInformationWidget);
+        {
+            pInformationWidget->setItems(items);
+            m_tabs.insert(0, pInformationWidget);
+            m_pTabWidget->addTab(m_tabs.value(0), QString());
+        }
+
+        /* Create Runtime information tab: */
+        UIGRuntimeInformation *pRuntimeInformationWidget = new UIGRuntimeInformation(this);
+        AssertPtrReturnVoid(pRuntimeInformationWidget);
+        {
+            pRuntimeInformationWidget->setItems(items);
+            m_tabs.insert(1, pRuntimeInformationWidget);
+            m_pTabWidget->addTab(m_tabs.value(1), QString());
+        }
     }
 }