Changeset 58879 in vbox

Timestamp:

Nov 26, 2015 12:49:07 PM (9 years ago)

Author:

vboxsync

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

104368

Message:

FE/Qt: ​​​bugref:8088: Rework session-information window: Cleanup and removing not-required (animation and events) code (part 1).

Location:

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

Files:

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

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

@@ -31 +31 @@
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 
 UIGInformation::UIGInformation(QWidget *pParent)
@@ -102 +101 @@
     connect(m_pDetailsModel, SIGNAL(sigRootItemMinimumHeightHintChanged(int)),
             m_pDetailsView, SLOT(sltMinimumHeightHintChanged(int)));
-    connect(m_pDetailsModel, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)),
-            this, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)));
-    connect(this, SIGNAL(sigSlidingStarted()),
-            m_pDetailsModel, SLOT(sltHandleSlidingStarted()));
-    connect(this, SIGNAL(sigToggleStarted()),
-            m_pDetailsModel, SLOT(sltHandleToggleStarted()));
-    connect(this, SIGNAL(sigToggleFinished()),
-            m_pDetailsModel, SLOT(sltHandleToggleFinished()));
 
     /* Setup details-view connections: */

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

@@ -35 +35 @@
 signals:
 
-    /* Notifier: Link processing stuff: */
-    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QString &strId);
-
     /* Notifier: Sliding stuff: */
     void sigSlidingStarted();

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

@@ -41 +41 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-
 UIGInformationElement::UIGInformationElement(UIGInformationSet *pParent, InformationElementType type, bool fOpened)
     : UIGInformationItem(pParent)
     , m_pSet(pParent)
     , m_type(type)
-    , m_iCornerRadius(10)
+    , m_iCornerRadius(0)
     , m_iMinimumHeaderWidth(0)
     , m_iMinimumHeaderHeight(0)
-    , m_pButton(0)
-    , m_fClosed(!fOpened)
-    , m_iAdditionalHeight(0)
-    , m_fAnimationRunning(false)
     , m_pTextPane(0)
-    , m_fHovered(false)
-    , m_fNameHovered(false)
-    , m_pHighlightMachine(0)
-    , m_pForwardAnimation(0)
-    , m_pBackwardAnimation(0)
-    , m_iAnimationDuration(400)
-    , m_iDefaultDarkness(100)
-    , m_iHighlightDarkness(90)
-    , m_iAnimationDarkness(m_iDefaultDarkness)
 {
     /* Prepare element: */
     prepareElement();
-    /* Prepare button: */
-    prepareButton();
     /* Prepare text-pane: */
     prepareTextPane();
-
     /* Setup size-policy: */
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-
     /* Add item to the parent: */
     AssertMsg(parentItem(), ("No parent set for details element!"));
@@ -86 +68 @@
 }
 
-void UIGInformationElement::close(bool fAnimated /* = true */)
-{
-    m_pButton->setToggled(false, fAnimated);
-}
-
-void UIGInformationElement::open(bool fAnimated /* = true */)
-{
-    m_pButton->setToggled(true, fAnimated);
-}
-
 void UIGInformationElement::updateAppearance()
 {
-    /* Reset name hover state: */
-    m_fNameHovered = false;
-    updateNameHoverLink();
-
     /* Update anchor role restrictions: */
     ConfigurationAccessLevel cal = m_pSet->configurationAccessLevel();
     m_pTextPane->setAnchorRoleRestricted("#mount", cal == ConfigurationAccessLevel_Null);
     m_pTextPane->setAnchorRoleRestricted("#attach", cal != ConfigurationAccessLevel_Full);
-}
-
-void UIGInformationElement::markAnimationFinished()
-{
-    /* Mark animation as non-running: */
-    m_fAnimationRunning = false;
-
-    /* Recursively update size-hint: */
-    updateGeometry();
-    /* Repaint: */
-    update();
-}
-
-void UIGInformationElement::sltToggleButtonClicked()
-{
-    emit sigToggleElement(m_type, closed());
-}
-
-void UIGInformationElement::sltElementToggleStart()
-{
-    /* Mark animation running: */
-    m_fAnimationRunning = true;
-
-    /* Setup animation: */
-    updateAnimationParameters();
-
-    /* Invert toggle-state: */
-    m_fClosed = !m_fClosed;
-}
-
-void UIGInformationElement::sltElementToggleFinish(bool fToggled)
-{
-    /* Update toggle-state: */
-    m_fClosed = !fToggled;
-
-    /* Notify about finishing: */
-    emit sigToggleElementFinished();
-}
-
-void UIGInformationElement::sltHandleAnchorClicked(const QString &strAnchor)
-{
-    /* Current anchor role: */
-    const QString strRole = strAnchor.section(',', 0, 0);
-    const QString strData = strAnchor.section(',', 1);
-
-    /* Handle known anchor roles: */
-    if (   strRole == "#mount"  // Optical and floppy attachments..
-        || strRole == "#attach" // Hard-drive attachments..
-        )
-    {
-        /* Prepare storage-menu: */
-        UIMenu menu;
-        menu.setShowToolTip(true);
-
-        /* Storage-controller name: */
-        QString strControllerName = strData.section(',', 0, 0);
-        /* Storage-slot: */
-        StorageSlot storageSlot = gpConverter->fromString<StorageSlot>(strData.section(',', 1));
-
-        /* Fill storage-menu: */
-        vboxGlobal().prepareStorageMenu(menu, this, SLOT(sltMountStorageMedium()),
-                                        machine(), strControllerName, storageSlot);
-
-        /* Exec menu: */
-        menu.exec(QCursor::pos());
-    }
-}
-
-void UIGInformationElement::sltMountStorageMedium()
-{
-    /* Sender action: */
-    QAction *pAction = qobject_cast<QAction*>(sender());
-    AssertMsgReturnVoid(pAction, ("This slot should only be called by menu action!\n"));
-
-    /* Current mount-target: */
-    const UIMediumTarget target = pAction->data().value<UIMediumTarget>();
-
-    /* Update current machine mount-target: */
-    vboxGlobal().updateMachineStorage(machine(), target);
 }
 
@@ -215 +104 @@
     /* Update minimum-header-width: */
     m_iMinimumHeaderWidth = m_pixmapSize.width() +
-                            iSpacing + m_nameSize.width() +
-                            iSpacing + m_buttonSize.width();
+                            iSpacing + m_nameSize.width();
 }
 
@@ -223 +111 @@
     /* Update minimum-header-height: */
     m_iMinimumHeaderHeight = qMax(m_pixmapSize.height(), m_nameSize.height());
-    m_iMinimumHeaderHeight = qMax(m_iMinimumHeaderHeight, m_buttonSize.height());
 }
 
@@ -305 +192 @@
 
     /* Header height: */
-    iMinimumHeightHint += m_iMinimumHeaderHeight;
-
-    /* Element is opened? */
-    if (!fClosed)
-    {
-        /* Add text height: */
-        if (!m_pTextPane->isEmpty())
-            iMinimumHeightHint += 2 * iMargin + (int)m_pTextPane->minimumSizeHint().height();
-    }
-
-    /* Additional height during animation: */
-    if (m_fAnimationRunning)
-        iMinimumHeightHint += m_iAdditionalHeight;
+    iMinimumHeightHint += m_iMinimumHeaderHeight + m_pTextPane->minimumSizeHint().height() + 10;
 
     /* Return value: */
@@ -325 +200 @@
 int UIGInformationElement::minimumHeightHint() const
 {
-    return minimumHeightHint(m_fClosed);
+    return minimumHeightHint(false);
 }
 
@@ -333 +208 @@
     QSize size = geometry().size().toSize();
     int iMargin = data(ElementData_Margin).toInt();
-
-    /* Layout button: */
-    int iButtonWidth = m_buttonSize.width();
-    int iButtonHeight = m_buttonSize.height();
-    int iButtonX = size.width() - 2 * iMargin - iButtonWidth;
-    int iButtonY = iButtonHeight == m_iMinimumHeaderHeight ? iMargin :
-                   iMargin + (m_iMinimumHeaderHeight - iButtonHeight) / 2;
-    m_pButton->setPos(iButtonX, iButtonY);
-
-    /* If closed: */
-    if (closed())
-    {
-        /* Hide text-pane if still visible: */
-        if (m_pTextPane->isVisible())
-            m_pTextPane->hide();
-    }
-    /* If opened: */
-    else
-    {
-        /* Layout text-pane: */
-        int iTextPaneX = 2 * iMargin;
-        int iTextPaneY = iMargin + m_iMinimumHeaderHeight + 2 * iMargin;
-        m_pTextPane->setPos(iTextPaneX, iTextPaneY);
-        m_pTextPane->resize(size.width() - 4 * iMargin,
-                            size.height() - 4 * iMargin - m_iMinimumHeaderHeight);
-        /* Show text-pane if still invisible and animation finished: */
-        if (!m_pTextPane->isVisible() && !isAnimationRunning())
-            m_pTextPane->show();
-    }
-}
-
-void UIGInformationElement::setAdditionalHeight(int iAdditionalHeight)
-{
-    /* Cache new value: */
-    m_iAdditionalHeight = iAdditionalHeight;
-    /* Update layout: */
-    updateLayout();
-    /* Repaint: */
-    update();
+    /* Layout text-pane: */
+    int iTextPaneX = 2 * iMargin;
+    int iTextPaneY = iMargin + m_iMinimumHeaderHeight + 2 * iMargin;
+    m_pTextPane->setPos(iTextPaneX, iTextPaneY);
+    m_pTextPane->resize(size.width() - 4 * iMargin,
+                        size.height() - 4 * iMargin - m_iMinimumHeaderHeight);
+    /* Show text-pane if still invisible and animation finished: */
+    if (!m_pTextPane->isVisible())
+        m_pTextPane->show();
 }
 
@@ -407 +252 @@
     m_nameFont.setWeight(QFont::Bold);
     m_textFont = font();
-
-    /* Create highlight machine: */
-    m_pHighlightMachine = new QStateMachine(this);
-    /* Create 'default' state: */
-    QState *pStateDefault = new QState(m_pHighlightMachine);
-    /* Create 'highlighted' state: */
-    QState *pStateHighlighted = new QState(m_pHighlightMachine);
-
-    /* Forward animation: */
-    m_pForwardAnimation = new QPropertyAnimation(this, "animationDarkness", this);
-    m_pForwardAnimation->setDuration(m_iAnimationDuration);
-    m_pForwardAnimation->setStartValue(m_iDefaultDarkness);
-    m_pForwardAnimation->setEndValue(m_iHighlightDarkness);
-
-    /* Backward animation: */
-    m_pBackwardAnimation = new QPropertyAnimation(this, "animationDarkness", this);
-    m_pBackwardAnimation->setDuration(m_iAnimationDuration);
-    m_pBackwardAnimation->setStartValue(m_iHighlightDarkness);
-    m_pBackwardAnimation->setEndValue(m_iDefaultDarkness);
-
-    /* Add state transitions: */
-    QSignalTransition *pDefaultToHighlighted = pStateDefault->addTransition(this, SIGNAL(sigHoverEnter()), pStateHighlighted);
-    pDefaultToHighlighted->addAnimation(m_pForwardAnimation);
-    QSignalTransition *pHighlightedToDefault = pStateHighlighted->addTransition(this, SIGNAL(sigHoverLeave()), pStateDefault);
-    pHighlightedToDefault->addAnimation(m_pBackwardAnimation);
-
-    /* Initial state is 'default': */
-    m_pHighlightMachine->setInitialState(pStateDefault);
-    /* Start state-machine: */
-    m_pHighlightMachine->start();
-
-    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&)));
-}
-
-void UIGInformationElement::prepareButton()
-{
-    /* Setup toggle-button: */
-    m_pButton = new UIGraphicsRotatorButton(this, "additionalHeight", !m_fClosed, true /* reflected */);
-    m_pButton->setAutoHandleButtonClick(false);
-    connect(m_pButton, SIGNAL(sigButtonClicked()), this, SLOT(sltToggleButtonClicked()));
-    connect(m_pButton, SIGNAL(sigRotationStart()), this, SLOT(sltElementToggleStart()));
-    connect(m_pButton, SIGNAL(sigRotationFinish(bool)), this, SLOT(sltElementToggleFinish(bool)));
-    m_buttonSize = m_pButton->minimumSizeHint().toSize();
 }
 
@@ -461 +261 @@
     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&)));
 }
 
 void UIGInformationElement::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget*)
 {
-    /* Update button visibility: */
-    updateButtonVisibility();
-
-    /* Configure painter shape: */
-    configurePainterShape(pPainter, pOption, m_iCornerRadius);
-
     /* Paint decorations: */
     paintDecorations(pPainter, pOption);
@@ -499 +292 @@
     QPalette pal = palette();
     QColor buttonTextColor = pal.color(QPalette::Active, QPalette::ButtonText);
-    QColor linkTextColor = pal.color(QPalette::Active, QPalette::Link);
 
     /* Paint pixmap: */
@@ -528 +320 @@
               /* Text to paint: */
               m_strName,
-              /* Name hovered? */
-              m_fNameHovered ? linkTextColor : buttonTextColor);
+              /* buttonTextColor: */
+              buttonTextColor);
 }
 
@@ -541 +333 @@
     int iHeaderHeight = 2 * iMargin + m_iMinimumHeaderHeight;
     QRect optionRect = pOption->rect;
-    QRect fullRect = !m_fAnimationRunning ? optionRect :
-                     QRect(optionRect.topLeft(), QSize(optionRect.width(), iHeaderHeight + m_iAdditionalHeight));
+    QRect fullRect = optionRect;
     int iFullHeight = fullRect.height();
 
@@ -574 +365 @@
     QLinearGradient tGradient(tRect.bottomLeft(), tRect.topLeft());
     tGradient.setColorAt(0, headerColor.darker(110));
-    tGradient.setColorAt(1, headerColor.darker(animationDarkness()));
 
     /* Paint all the stuff: */
@@ -588 +378 @@
 }
 
-void UIGInformationElement::hoverMoveEvent(QGraphicsSceneHoverEvent *pEvent)
-{
-    /* Update hover state: */
-    if (!m_fHovered)
-    {
-        m_fHovered = true;
-        emit sigHoverEnter();
-    }
-
-    /* Update name-hover state: */
-    handleHoverEvent(pEvent);
-}
-
-void UIGInformationElement::hoverLeaveEvent(QGraphicsSceneHoverEvent *pEvent)
-{
-    /* Update hover state: */
-    if (m_fHovered)
-    {
-        m_fHovered = false;
-        emit sigHoverLeave();
-    }
-
-    /* Update name-hover state: */
-    handleHoverEvent(pEvent);
-}
-
-void UIGInformationElement::mousePressEvent(QGraphicsSceneMouseEvent *pEvent)
-{
-    /* Only for hovered header: */
-    if (!m_fNameHovered)
-        return;
-
-    /* Process link click: */
-    pEvent->accept();
-    QString strCategory;
-    if (m_type >= InformationElementType_General &&
-        m_type < InformationElementType_Description)
-        strCategory = QString("#%1").arg(gpConverter->toInternalString(m_type));
-    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());
-}
-
-void UIGInformationElement::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *pEvent)
-{
-    /* Only for left-button: */
-    if (pEvent->button() != Qt::LeftButton)
-        return;
-
-    /* Process left-button double-click: */
-    emit sigToggleElement(m_type, closed());
-}
-
-void UIGInformationElement::updateButtonVisibility()
-{
-    if (m_fHovered && !m_pButton->isVisible())
-        m_pButton->show();
-    else if (!m_fHovered && m_pButton->isVisible())
-        m_pButton->hide();
-}
-
-void UIGInformationElement::handleHoverEvent(QGraphicsSceneHoverEvent *pEvent)
-{
-    /* Not for 'preview' element type: */
-    if (m_type == InformationElementType_Preview)
-        return;
-
-    /* Prepare variables: */
-    int iMargin = data(ElementData_Margin).toInt();
-    int iSpacing = data(ElementData_Spacing).toInt();
-    int iNameHeight = m_nameSize.height();
-    int iElementNameX = 2 * iMargin + m_pixmapSize.width() + iSpacing;
-    int iElementNameY = iNameHeight == m_iMinimumHeaderHeight ?
-                        iMargin : iMargin + (m_iMinimumHeaderHeight - iNameHeight) / 2;
-
-    /* Simulate hyperlink hovering: */
-    QPoint point = pEvent->pos().toPoint();
-    bool fNameHovered = QRect(QPoint(iElementNameX, iElementNameY), m_nameSize).contains(point);
-    if (   m_pSet->configurationAccessLevel() != ConfigurationAccessLevel_Null
-        && m_fNameHovered != fNameHovered)
-    {
-        m_fNameHovered = fNameHovered;
-        updateNameHoverLink();
-    }
-}
-
-void UIGInformationElement::updateNameHoverLink()
-{
-    if (m_fNameHovered)
-        setCursor(Qt::PointingHandCursor);
-    else
-        unsetCursor();
-    update();
-}
-
-void UIGInformationElement::updateAnimationParameters()
-{
-    /* Recalculate animation parameters: */
-    int iOpenedHeight = minimumHeightHint(false);
-    int iClosedHeight = minimumHeightHint(true);
-    int iAdditionalHeight = iOpenedHeight - iClosedHeight;
-    if (m_fClosed)
-        m_iAdditionalHeight = 0;
-    else
-        m_iAdditionalHeight = iAdditionalHeight;
-    m_pButton->setAnimationRange(0, iAdditionalHeight);
-}
-

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

@@ -33 +33 @@
 class QTextLayout;
 class QStateMachine;
-class QPropertyAnimation;
 
 /* Typedefs: */
@@ -44 +43 @@
 {
     Q_OBJECT;
-    Q_PROPERTY(int animationDarkness READ animationDarkness WRITE setAnimationDarkness);
-    Q_PROPERTY(int additionalHeight READ additionalHeight WRITE setAdditionalHeight);
 
 signals:
 
     /* Notifiers: Hover stuff: */
-    void sigHoverEnter();
     void sigHoverLeave();
 
@@ -56 +52 @@
     void sigToggleElement(InformationElementType type, bool fToggled);
     void sigToggleElementFinished();
-
-    /* Notifier: Link-click stuff: */
-    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QString &strId);
 
 public:
@@ -73 +66 @@
     InformationElementType elementType() const { return m_type; }
 
-    /* API: Open/close stuff: */
-    bool closed() const { return m_fClosed; }
-    bool opened() const { return !m_fClosed; }
-    void close(bool fAnimated = true);
-    void open(bool fAnimated = true);
-
     /* API: Update stuff: */
     virtual void updateAppearance();
 
-    /* API: Animation stuff: */
-    void markAnimationFinished();
-
 protected slots:
-
-    /* Handlers: Toggle stuff: */
-    void sltToggleButtonClicked();
-    void sltElementToggleStart();
-    void sltElementToggleFinish(bool fToggled);
 
     /** Handles children geometry changes. */
     void sltUpdateGeometry() { updateGeometry(); }
-
-    /** Handles children anchor clicks. */
-    void sltHandleAnchorClicked(const QString &strAnchor);
-
-    /** Handles mount storage medium requests. */
-    void sltMountStorageMedium();
 
 protected:
@@ -143 +116 @@
     void updateLayout();
 
-    /* Helpers: Hover stuff: */
-    int animationDarkness() const { return m_iAnimationDarkness; }
-    void setAnimationDarkness(int iAnimationDarkness) { m_iAnimationDarkness = iAnimationDarkness; update(); }
-
-    /* Helpers: Animation stuff: */
-    void setAdditionalHeight(int iAdditionalHeight);
-    int additionalHeight() const { return m_iAdditionalHeight; }
-    UIGraphicsRotatorButton* button() const { return m_pButton; }
-    bool isAnimationRunning() const { return m_fAnimationRunning; }
-
 private:
 
@@ -164 +127 @@
     /* Helpers: Prepare stuff: */
     void prepareElement();
-    void prepareButton();
     void prepareTextPane();
 
@@ -172 +134 @@
     void paintElementInfo(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption);
     void paintBackground(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption);
-
-    /* Handlers: Mouse stuff: */
-    void hoverMoveEvent(QGraphicsSceneHoverEvent *pEvent);
-    void hoverLeaveEvent(QGraphicsSceneHoverEvent *pEvent);
-    void mousePressEvent(QGraphicsSceneMouseEvent *pEvent);
-    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *pEvent);
-
-    /* Helpers: Mouse stuff: */
-    void updateButtonVisibility();
-    void handleHoverEvent(QGraphicsSceneHoverEvent *pEvent);
-    void updateNameHoverLink();
-
-    /* Helper: Animation stuff: */
-    void updateAnimationParameters();
 
     /* Variables: */
@@ -201 +149 @@
     int m_iMinimumHeaderHeight;
 
-    /* Variables: Toggle-button stuff: */
-    UIGraphicsRotatorButton *m_pButton;
-    bool m_fClosed;
-    int m_iAdditionalHeight;
-    bool m_fAnimationRunning;
-
     /* Variables: Text-pane stuff: */
     UIGraphicsTextPane *m_pTextPane;
-
-    /* Variables: Hover stuff: */
-    bool m_fHovered;
-    bool m_fNameHovered;
-    QStateMachine *m_pHighlightMachine;
-    QPropertyAnimation *m_pForwardAnimation;
-    QPropertyAnimation *m_pBackwardAnimation;
-    int m_iAnimationDuration;
-    int m_iDefaultDarkness;
-    int m_iHighlightDarkness;
-    int m_iAnimationDarkness;
 
     /* Friends: */

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

@@ -121 +121 @@
 }
 
-
 UIGInformationElementPreview::UIGInformationElementPreview(UIGInformationSet *pParent, bool fOpened)
     : UIGInformationElement(pParent, InformationElementType_Preview, fOpened)
@@ -201 +200 @@
     /* Header height: */
     iProposedHeight += minimumHeaderHeight();
-
-    /* Element is opened? */
-    if (!fClosed)
-    {
-        iProposedHeight += iMargin;
-        iProposedHeight += m_pPreview->minimumSizeHint().toSize().height();
-    }
-    else
-    {
-        /* Additional height during animation: */
-        if (button()->isAnimationRunning())
-            iProposedHeight += additionalHeight();
-    }
+    iProposedHeight += iMargin;
+    iProposedHeight += m_pPreview->minimumSizeHint().toSize().height();
 
     /* Return result: */
@@ -223 +211 @@
     /* Call to base-class: */
     UIGInformationElement::updateLayout();
-
-    /* Show/hide preview: */
-    if (closed() && m_pPreview->isVisible())
-        m_pPreview->hide();
-    if (opened() && !m_pPreview->isVisible() && !isAnimationRunning())
-        m_pPreview->show();
 }
 
@@ -240 +222 @@
     emit sigBuildDone();
 }
-
 
 void UIGInformationUpdateTaskGeneral::run()
@@ -288 +269 @@
 }
 
-
 void UIGInformationUpdateTaskSystem::run()
 {
@@ -364 +344 @@
     setProperty("table", QVariant::fromValue(table));
 }
-
 
 void UIGInformationUpdateTaskDisplay::run()
@@ -467 +446 @@
     setProperty("table", QVariant::fromValue(table));
 }
-
 
 void UIGInformationUpdateTaskStorage::run()
@@ -548 +526 @@
 }
 
-
 void UIGInformationUpdateTaskAudio::run()
 {
@@ -584 +561 @@
     setProperty("table", QVariant::fromValue(table));
 }
-
 
 void UIGInformationUpdateTaskNetwork::run()
@@ -681 +657 @@
 }
 
-
 void UIGInformationUpdateTaskSerial::run()
 {
@@ -724 +699 @@
 }
 
-
 #ifdef VBOX_WITH_PARALLEL_PORTS
 void UIGInformationUpdateTaskParallel::run()
@@ -762 +736 @@
 }
 #endif /* VBOX_WITH_PARALLEL_PORTS */
-
 
 void UIGInformationUpdateTaskUSB::run()
@@ -813 +786 @@
 }
 
-
 void UIGInformationUpdateTaskSF::run()
 {
@@ -840 +812 @@
     setProperty("table", QVariant::fromValue(table));
 }
-
 
 void UIGInformationUpdateTaskUI::run()
@@ -930 +901 @@
 }
 
-
 void UIGInformationUpdateTaskDescription::run()
 {
@@ -960 +930 @@
 void UIGInformationUpdateTaskRuntimeAttributes::run()
 {
-
-}
-
+}
+

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

@@ -32 +32 @@
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 
 UIGInformationGroup::UIGInformationGroup(QGraphicsScene *pParent)

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

@@ -40 +40 @@
     , m_pScene(0)
     , m_pRoot(0)
-    , m_pAnimationCallback(0)
 {
     /* Prepare scene: */
@@ -121 +120 @@
 }
 
-void UIGInformationModel::sltToggleElements(InformationElementType type, bool fToggled)
-{
-    /* Make sure it is not started yet: */
-    if (m_pAnimationCallback)
-        return;
-
-    /* Prepare/configure animation callback: */
-    m_pAnimationCallback = new UIGInformationElementAnimationCallback(this, type, fToggled);
-    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())
-    {
-        /* For each the element of the set: */
-        foreach (UIGInformationItem *pElementItem, pSetItem->items())
-        {
-            /* Get each element: */
-            UIGInformationElement *pElement = pElementItem->toElement();
-            /* Check if this element is of required type: */
-            if (pElement->elementType() == type)
-            {
-                if (fToggled && pElement->closed())
-                {
-                    m_pAnimationCallback->addNotifier(pElement);
-                    pElement->open();
-                }
-                else if (!fToggled && pElement->opened())
-                {
-                    m_pAnimationCallback->addNotifier(pElement);
-                    pElement->close();
-                }
-            }
-        }
-    }
-    /* Update layout: */
-    updateLayout();
-}
-
-void UIGInformationModel::sltToggleAnimationFinished(InformationElementType type, bool fToggled)
-{
-    /* Cleanup animation callback: */
-    delete m_pAnimationCallback;
-    m_pAnimationCallback = 0;
-
-    /* Mark animation finished: */
-    foreach (UIGInformationItem *pSetItem, m_pRoot->items())
-    {
-        foreach (UIGInformationItem *pElementItem, pSetItem->items())
-        {
-            UIGInformationElement *pElement = pElementItem->toElement();
-            if (pElement->elementType() == type)
-                pElement->markAnimationFinished();
-        }
-    }
-    /* Update layout: */
-    updateLayout();
-
-    /* Update element open/close status: */
-    if (m_settings.contains(type))
-        m_settings[type] = fToggled;
-}
-
-void UIGInformationModel::sltElementTypeToggled()
-{
-    /* Which item was toggled? */
-    QAction *pAction = qobject_cast<QAction*>(sender());
-    InformationElementType type = pAction->data().value<InformationElementType>();
-
-    /* Toggle element visibility status: */
-    if (m_settings.contains(type))
-        m_settings.remove(type);
-    else
-        m_settings[type] = true;
-
-    /* Rebuild group: */
-    m_pRoot->rebuildGroup();
-}
-
-void UIGInformationModel::sltHandleSlidingStarted()
-{
-    m_pRoot->stopBuildingGroup();
-}
-
-void UIGInformationModel::sltHandleToggleStarted()
-{
-    m_pRoot->stopBuildingGroup();
-}
-
-void UIGInformationModel::sltHandleToggleFinished()
-{
-    m_pRoot->rebuildGroup();
-}
-
 QVariant UIGInformationModel::data(int iKey) const
 {
@@ -227 +133 @@
 {
     m_pScene = new QGraphicsScene(this);
-    m_pScene->installEventFilter(this);
 }
 
@@ -272 +177 @@
 }
 
-bool UIGInformationModel::eventFilter(QObject *pObject, QEvent *pEvent)
-{
-    /* Ignore if no scene object: */
-    if (pObject != scene())
-        return QObject::eventFilter(pObject, pEvent);
-
-    /* Ignore if no context-menu event: */
-    if (pEvent->type() != QEvent::GraphicsSceneContextMenu)
-        return QObject::eventFilter(pObject, pEvent);
-
-    /* Process context menu event: */
-    return processContextMenuEvent(static_cast<QGraphicsSceneContextMenuEvent*>(pEvent));
-}
-
-bool UIGInformationModel::processContextMenuEvent(QGraphicsSceneContextMenuEvent *pEvent)
-{
-    /* Pass preview context menu instead: */
-    if (QGraphicsItem *pItem = itemAt(pEvent->scenePos()))
-        if (pItem->type() == UIGInformationItemType_Preview)
-            return false;
-
-    /* Prepare context-menu: */
-    QMenu contextMenu;
-    /* Enumerate elements settings: */
-    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);
-        pAction->setChecked(m_settings.contains(currentElementType));
-        pAction->setData(QVariant::fromValue(currentElementType));
-    }
-    /* Exec context-menu: */
-    contextMenu.exec(pEvent->screenPos());
-
-    /* Filter: */
-    return true;
-}
-
-UIGInformationElementAnimationCallback::UIGInformationElementAnimationCallback(QObject *pParent, InformationElementType type, bool fToggled)
-    : QObject(pParent)
-    , m_type(type)
-    , m_fToggled(fToggled)
-{
-}
-
-void UIGInformationElementAnimationCallback::addNotifier(UIGInformationItem *pItem)
-{
-    /* Connect notifier: */
-    connect(pItem, SIGNAL(sigToggleElementFinished()), this, SLOT(sltAnimationFinished()));
-    /* Remember notifier: */
-    m_notifiers << pItem;
-}
-
-void UIGInformationElementAnimationCallback::sltAnimationFinished()
-{
-    /* Determine notifier: */
-    UIGInformationItem *pItem = qobject_cast<UIGInformationItem*>(sender());
-    /* Disconnect notifier: */
-    disconnect(pItem, SIGNAL(sigToggleElementFinished()), this, SLOT(sltAnimationFinished()));
-    /* Remove notifier: */
-    m_notifiers.removeAll(pItem);
-    /* Check if we finished: */
-    if (m_notifiers.isEmpty())
-        emit sigAllAnimationFinished(m_type, m_fToggled);
-}
-

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

@@ -38 +38 @@
 class UIGInformationGroup;
 class UIVMItem;
-class UIGInformationElementAnimationCallback;
+//class UIGInformationElementAnimationCallback;
 class UIGInformationItem;
 
@@ -53 +53 @@
 
     /* Notifier: Link processing stuff: */
-    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QString &strId);
+    //void sigLinkClicked(const QString &strCategory, const QString &strControl, const QString &strId);
 
 public:
@@ -82 +82 @@
     void sltHandleViewResize();
 
-    /* Handlers: Element-items stuff: */
-    void sltToggleElements(InformationElementType type, bool fToggled);
-    void sltToggleAnimationFinished(InformationElementType type, bool fToggled);
-    void sltElementTypeToggled();
-
-    /* Handlers: Chooser stuff: */
-    void sltHandleSlidingStarted();
-    void sltHandleToggleStarted();
-    void sltHandleToggleFinished();
-
 private:
 
@@ -115 +105 @@
 
     /* Handler: Event-filter: */
-    bool eventFilter(QObject *pObject, QEvent *pEvent);
-
-    /* Handler: Context-menu stuff: */
-    bool processContextMenuEvent(QGraphicsSceneContextMenuEvent *pEvent);
+    //bool eventFilter(QObject *pObject, QEvent *pEvent);
 
     /* Variables: */
     QGraphicsScene *m_pScene;
     UIGInformationGroup *m_pRoot;
-    UIGInformationElementAnimationCallback *m_pAnimationCallback;
+    //UIGInformationElementAnimationCallback *m_pAnimationCallback;
     /** Holds the details settings. */
     QMap<InformationElementType, bool> m_settings;
 };
 
-/* Details-element animation callback: */
-class UIGInformationElementAnimationCallback : public QObject
-{
-    Q_OBJECT;
-
-signals:
-
-    /* Notifier: Complete stuff: */
-    void sigAllAnimationFinished(InformationElementType type, bool fToggled);
-
-public:
-
-    /* Constructor: */
-    UIGInformationElementAnimationCallback(QObject *pParent, InformationElementType type, bool fToggled);
-
-    /* API: Notifiers stuff: */
-    void addNotifier(UIGInformationItem *pItem);
-
-private slots:
-
-    /* Handler: Progress stuff: */
-    void sltAnimationFinished();
-
-private:
-
-    /* Variables: */
-    QList<UIGInformationItem*> m_notifiers;
-    InformationElementType m_type;
-    bool m_fToggled;
-};
-
 #endif /* __UIGInformationModel_h__ */
 

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

@@ -34 +34 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-
 UIGInformationSet::UIGInformationSet(UIGInformationItem *pParent)
     : UIGInformationItem(pParent)
@@ -128 +127 @@
         bool fVisible = m_settings.contains(elementType);
         /* Should the element be opened? */
-        bool fOpen = fVisible && m_settings[elementType];
+        //bool fOpen = fVisible && m_settings[elementType];
 
         /* Check if element is present already: */
         UIGInformationElement *pElement = element(elementType);
-        if (pElement && fOpen)
-            pElement->open(false);
+        //if (pElement && fOpen)
+            //pElement->open(false);
         /* Create element if necessary: */
         bool fJustCreated = false;
@@ -139 +138 @@
         {
             fJustCreated = true;
-            pElement = createElement(elementType, fOpen);
+            pElement = createElement(elementType, true);
         }
 

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

@@ -103 +103 @@
     connect(m_pDetailsModel, SIGNAL(sigRootItemMinimumHeightHintChanged(int)),
             m_pDetailsView, SLOT(sltMinimumHeightHintChanged(int)));
-    connect(m_pDetailsModel, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)),
-            this, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)));
-    connect(this, SIGNAL(sigSlidingStarted()),
-            m_pDetailsModel, SLOT(sltHandleSlidingStarted()));
-    connect(this, SIGNAL(sigToggleStarted()),
-            m_pDetailsModel, SLOT(sltHandleToggleStarted()));
-    connect(this, SIGNAL(sigToggleFinished()),
-            m_pDetailsModel, SLOT(sltHandleToggleFinished()));
 
     /* Setup details-view connections: */

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

@@ -36 +36 @@
 
     /* Notifier: Link processing stuff: */
-    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QString &strId);
+    //void sigLinkClicked(const QString &strCategory, const QString &strControl, const QString &strId);
 
     /* Notifier: Sliding stuff: */

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

@@ -158 +158 @@
 
 #endif /* !___UIVMInformationDialog_h___ */
+