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

Timestamp:

Dec 11, 2024 1:34:50 PM (5 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: VBox Manager: No sliding animation for advanced VBox Manager widget as structure will be heavily changed.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManagerAdvancedWidget.cpp (modified) (5 diffs)
• UIVirtualBoxManagerAdvancedWidget.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerAdvancedWidget.cpp

@@ -80 +80 @@
     , m_pPaneToolsGlobal(0)
     , m_pPaneToolsMachine(0)
-    , m_pSlidingAnimation(0)
     , m_pMenuToolsGlobal(0)
     , m_pMenuToolsMachine(0)
@@ -473 +472 @@
         && m_pStackedWidget->currentWidget() != m_pPaneToolsGlobal)
     {
-        /* Just start animation and return, do nothing else.. */
-        m_pStackedWidget->setCurrentWidget(m_pPaneToolsGlobal); // rendering w/a
-        m_pStackedWidget->setCurrentWidget(m_pSlidingAnimation);
-        m_pSlidingAnimation->animate(false /* forward? */);
-        return;
+        m_pStackedWidget->setCurrentWidget(m_pPaneToolsGlobal);
+        m_pPaneToolsMachine->setActive(false);
+        m_pPaneToolsGlobal->setActive(true);
+        /* Handle current tool type change: */
+        handleCurrentToolTypeChange(m_pMenuToolsGlobal->toolsType());
     }
 
@@ -486 +485 @@
         && m_pStackedWidget->currentWidget() != m_pPaneToolsMachine)
     {
-        /* Just start animation and return, do nothing else.. */
-        m_pStackedWidget->setCurrentWidget(m_pPaneToolsMachine); // rendering w/a
-        m_pStackedWidget->setCurrentWidget(m_pSlidingAnimation);
-        m_pSlidingAnimation->animate(true /* forward? */);
-        return;
+        m_pStackedWidget->setCurrentWidget(m_pPaneToolsMachine);
+        m_pPaneToolsGlobal->setActive(false);
+        m_pPaneToolsMachine->setActive(true);
+        /* Handle current tool type change: */
+        handleCurrentToolTypeChange(m_pMenuToolsMachine->toolsType());
     }
 
@@ -515 +514 @@
     m_enmSelectionType = enmSelectedItemType;
     m_fSelectedMachineItemAccessible = fCurrentItemIsOk;
-}
-
-void UIVirtualBoxManagerAdvancedWidget::sltHandleSlidingAnimationComplete(bool fForward)
-{
-    /* First switch the panes: */
-    if (fForward)
-    {
-        /* Switch stacked widget to machine tool pane: */
-        m_pStackedWidget->setCurrentWidget(m_pPaneToolsMachine);
-        m_pPaneToolsGlobal->setActive(false);
-        m_pPaneToolsMachine->setActive(true);
-        /* Handle current tool type change: */
-        handleCurrentToolTypeChange(m_pMenuToolsMachine->toolsType());
-    }
-    else
-    {
-        /* Switch stacked widget to global tool pane: */
-        m_pStackedWidget->setCurrentWidget(m_pPaneToolsGlobal);
-        m_pPaneToolsMachine->setActive(false);
-        m_pPaneToolsGlobal->setActive(true);
-        /* Handle current tool type change: */
-        handleCurrentToolTypeChange(m_pMenuToolsGlobal->toolsType());
-    }
-    /* Then handle current item change (again!): */
-    sltHandleChooserPaneIndexChange();
 }
 
@@ -763 +737 @@
                             /* Add into stack: */
                             m_pStackedWidget->addWidget(m_pPaneToolsMachine);
-                        }
-
-                        /* Create sliding-widget: */
-                        // Reverse initial animation direction if group or machine selected!
-                        const bool fReverse = !m_pPaneChooser->isGlobalItemSelected();
-                        m_pSlidingAnimation = new UISlidingAnimation(Qt::Vertical, fReverse);
-                        if (m_pSlidingAnimation)
-                        {
-                            /* Add first/second widgets into sliding animation: */
-                            m_pSlidingAnimation->setWidgets(m_pPaneToolsGlobal, m_pPaneToolsMachine);
-                            connect(m_pSlidingAnimation, &UISlidingAnimation::sigAnimationComplete,
-                                    this, &UIVirtualBoxManagerAdvancedWidget::sltHandleSlidingAnimationComplete);
-
-                            /* Add into stack: */
-                            m_pStackedWidget->addWidget(m_pSlidingAnimation);
                         }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerAdvancedWidget.h

@@ -46 +46 @@
 class UIActionPool;
 class UIChooser;
-class UISlidingAnimation;
 class UIToolPaneGlobal;
 class UIToolPaneMachine;
@@ -312 +311 @@
         void sltHandleChooserPaneSelectionInvalidated() { recacheCurrentMachineItemInformation(true /* fDontRaiseErrorPane */); }
 
-        /** Handles @a fForward sliding animation complete signal. */
-        void sltHandleSlidingAnimationComplete(bool fForward);
-
         /** Handles state change for cloud profile with certain @a strProviderShortName and @a strProfileName. */
         void sltHandleCloudProfileStateChange(const QString &strProviderShortName,
@@ -396 +392 @@
     /** Holds the Machine Tools-pane instance. */
     UIToolPaneMachine  *m_pPaneToolsMachine;
-    /** Holds the sliding-animation widget instance. */
-    UISlidingAnimation *m_pSlidingAnimation;
     /** Holds the Global Tools-menu instance. */
     UITools            *m_pMenuToolsGlobal;