Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformation.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformation.cpp (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformation.cpp (revision 58726) @@ -25,4 +25,5 @@ /* GUI includes: */ +# include "UIExtraDataManager.h" # include "UIGInformation.h" # include "UIGInformationModel.h" @@ -81,4 +82,5 @@ /* Setup details-model: */ m_pDetailsModel = new UIGInformationModel(this); + m_pDetailsModel->setInformationWindowElements(gEDataManager->informationWindowElements()); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElement.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElement.cpp (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElement.cpp (revision 58726) @@ -42,5 +42,5 @@ -UIGInformationElement::UIGInformationElement(UIGInformationSet *pParent, DetailsElementType type, bool fOpened) +UIGInformationElement::UIGInformationElement(UIGInformationSet *pParent, InformationElementType type, bool fOpened) : UIGInformationItem(pParent) , m_pSet(pParent) @@ -438,5 +438,5 @@ 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,4 +458,6 @@ /* 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,9 +623,12 @@ 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,5 +655,5 @@ { /* Not for 'preview' element type: */ - if (m_type == DetailsElementType_Preview) + if (m_type == InformationElementType_Preview) return; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElement.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElement.h (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElement.h (revision 58726) @@ -54,5 +54,5 @@ /* Notifiers: Toggle stuff: */ - void sigToggleElement(DetailsElementType type, bool fToggled); + void sigToggleElement(InformationElementType type, bool fToggled); void sigToggleElementFinished(); @@ -67,9 +67,9 @@ /* 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,5 +189,5 @@ /* Variables: */ UIGInformationSet *m_pSet; - DetailsElementType m_type; + InformationElementType m_type; QPixmap m_pixmap; QString m_strName; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElements.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElements.cpp (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElements.cpp (revision 58726) @@ -63,5 +63,5 @@ } -UIGInformationElementInterface::UIGInformationElementInterface(UIGInformationSet *pParent, DetailsElementType type, bool fOpened) +UIGInformationElementInterface::UIGInformationElementInterface(UIGInformationSet *pParent, InformationElementType type, bool fOpened) : UIGInformationElement(pParent, type, fOpened) , m_pTask(0) @@ -123,5 +123,5 @@ UIGInformationElementPreview::UIGInformationElementPreview(UIGInformationSet *pParent, bool fOpened) - : UIGInformationElement(pParent, DetailsElementType_Preview, fOpened) + : UIGInformationElement(pParent, InformationElementType_Preview, fOpened) { /* Assign corresponding icon: */ @@ -958,2 +958,7 @@ } +void UIGInformationUpdateTaskRuntimeAttributes::run() +{ + +} + Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElements.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElements.h (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationElements.h (revision 58726) @@ -50,5 +50,5 @@ * @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,5 +140,5 @@ * @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,5 +176,5 @@ * @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,5 +212,5 @@ * @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,5 +248,5 @@ * @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,5 +284,5 @@ * @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,5 +323,5 @@ * @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,5 +359,5 @@ * @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,5 +396,5 @@ * @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,5 +433,5 @@ * @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,5 +469,5 @@ * @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,5 +505,5 @@ * @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,5 +541,5 @@ * @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,4 +549,39 @@ }; +/** 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___ */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationGroup.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationGroup.cpp (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationGroup.cpp (revision 58726) @@ -113,5 +113,5 @@ /* 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 Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationModel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationModel.cpp (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationModel.cpp (revision 58726) @@ -52,5 +52,5 @@ /* Register meta-type: */ - qRegisterMetaType(); + qRegisterMetaType(); } @@ -105,4 +105,14 @@ } +QMap UIGInformationModel::informationWindowElements() +{ + return m_settings; +} + +void UIGInformationModel::setInformationWindowElements(const QMap &elements) +{ + //m_settings = elements; +} + void UIGInformationModel::sltHandleViewResize() { @@ -111,5 +121,5 @@ } -void UIGInformationModel::sltToggleElements(DetailsElementType type, bool fToggled) +void UIGInformationModel::sltToggleElements(InformationElementType type, bool fToggled) { /* Make sure it is not started yet: */ @@ -119,6 +129,6 @@ /* 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,5 +159,5 @@ } -void UIGInformationModel::sltToggleAnimationFinished(DetailsElementType type, bool fToggled) +void UIGInformationModel::sltToggleAnimationFinished(InformationElementType type, bool fToggled) { /* Cleanup animation callback: */ @@ -177,5 +187,5 @@ /* Which item was toggled? */ QAction *pAction = qobject_cast(sender()); - DetailsElementType type = pAction->data().value(); + InformationElementType type = pAction->data().value(); /* Toggle element visibility status: */ @@ -227,20 +237,18 @@ 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,5 +257,5 @@ { /* Save settings: */ - gEDataManager->setSelectorWindowDetailsElements(m_settings); + //gEDataManager->setInformationWindowElements(m_settings); } @@ -288,7 +296,7 @@ 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,5 +311,5 @@ } -UIGInformationElementAnimationCallback::UIGInformationElementAnimationCallback(QObject *pParent, DetailsElementType type, bool fToggled) +UIGInformationElementAnimationCallback::UIGInformationElementAnimationCallback(QObject *pParent, InformationElementType type, bool fToggled) : QObject(pParent) , m_type(type) Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationModel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationModel.h (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationModel.h (revision 58726) @@ -72,6 +72,8 @@ void setItems(const QList &items); - /** Returns the details settings. */ - const QMap& settings() const { return m_settings; } + /** Returns information-window elements. */ + QMap informationWindowElements(); + /** Defines information-window @a elements. */ + void setInformationWindowElements(const QMap &elements); private slots: @@ -81,6 +83,6 @@ /* 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,5 +125,5 @@ UIGInformationElementAnimationCallback *m_pAnimationCallback; /** Holds the details settings. */ - QMap m_settings; + QMap m_settings; }; @@ -134,10 +136,10 @@ /* 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,5 +155,5 @@ /* Variables: */ QList m_notifiers; - DetailsElementType m_type; + InformationElementType m_type; bool m_fToggled; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationSet.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationSet.cpp (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationSet.cpp (revision 58726) @@ -63,5 +63,5 @@ } -void UIGInformationSet::buildSet(UIVMItem *pMachineItem, bool fFullSet, const QMap &settings) +void UIGInformationSet::buildSet(UIVMItem *pMachineItem, bool fFullSet, const QMap &settings) { /* Remember passed arguments: */ @@ -75,6 +75,6 @@ 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,10 +99,10 @@ /* 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,5 +124,5 @@ { /* Load details settings: */ - DetailsElementType elementType = (DetailsElementType)iStepNumber; + InformationElementType elementType = (InformationElementType)iStepNumber; /* Should the element be visible? */ bool fVisible = m_settings.contains(elementType); @@ -242,5 +242,5 @@ { 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,5 +262,5 @@ { 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,5 +321,5 @@ } -UIGInformationElement* UIGInformationSet::element(DetailsElementType elementType) const +UIGInformationElement* UIGInformationSet::element(InformationElementType elementType) const { UIGInformationItem *pItem = m_elements.value(elementType, 0); @@ -373,26 +373,27 @@ 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,23 +434,24 @@ 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,18 +490,19 @@ 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,7 +510,7 @@ /* 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,5 +535,5 @@ break; } - case DetailsElementType_Preview: + case InformationElementType_Preview: { /* Prepare variables: */ @@ -568,27 +571,28 @@ /* 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; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationSet.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationSet.h (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGInformationSet.h (revision 58726) @@ -51,5 +51,5 @@ /* API: Build stuff: */ - void buildSet(UIVMItem *pMachineItem, bool fFullSet, const QMap &settings); + void buildSet(UIVMItem *pMachineItem, bool fFullSet, const QMap &settings); /* API: Machine stuff: */ @@ -91,5 +91,5 @@ 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,5 +104,5 @@ /* Helpers: Build stuff: */ void rebuildSet(); - UIGInformationElement* createElement(DetailsElementType elementType, bool fOpen); + UIGInformationElement* createElement(InformationElementType elementType, bool fOpen); /** Machine-item this set built for. */ @@ -122,5 +122,5 @@ int m_iLastStepNumber; QString m_strSetId; - QMap m_settings; + QMap m_settings; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGRuntimeInformation.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGRuntimeInformation.cpp (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGRuntimeInformation.cpp (revision 58726) @@ -81,4 +81,7 @@ /* Setup details-model: */ m_pDetailsModel = new UIGInformationModel(this); + QMap settings; + settings.insert(InformationElementType_RuntimeAttributes, true); + m_pDetailsModel->setInformationWindowElements(settings); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp (revision 58725) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp (revision 58726) @@ -41,4 +41,5 @@ # include "UIMachine.h" # include "UIVMItem.h" +# include "UIGRuntimeInformation.h" /* COM includes: */ @@ -269,5 +270,5 @@ /* Statistics page update: */ - refreshStatistics(); + //refreshStatistics(); } @@ -331,5 +332,5 @@ /* Update VM statistics page: */ - refreshStatistics(); + //refreshStatistics(); } @@ -406,22 +407,13 @@ void UIVMInformationDialog::prepareTabWidget() { + /* List of VM items: */ + QList 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 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,35 +421,23 @@ /* 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()); + } } }