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

Timestamp:

Dec 9, 2024 4:31:38 PM (6 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: VBox Manager: Get rid of some sliding animation object dependencies for VBox Manager widget header.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManagerWidget.cpp (modified) (4 diffs)
• manager/UIVirtualBoxManagerWidget.h (modified) (3 diffs)
• widgets/UISlidingAnimation.cpp (modified) (4 diffs)
• widgets/UISlidingAnimation.h (modified) (3 diffs)

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

@@ -47 +47 @@
 #include "UIMessageCenter.h"
 #include "UINotificationCenter.h"
+#include "UISlidingAnimation.h"
 #include "UITabBar.h"
 #include "UIToolPaneGlobal.h"
@@ -448 +449 @@
         m_pStackedWidget->setCurrentWidget(m_pPaneToolsGlobal); // rendering w/a
         m_pStackedWidget->setCurrentWidget(m_pSlidingAnimation);
-        m_pSlidingAnimation->animate(SlidingDirection_Reverse);
+        m_pSlidingAnimation->animate(false /* forward? */);
         return;
     }
@@ -461 +462 @@
         m_pStackedWidget->setCurrentWidget(m_pPaneToolsMachine); // rendering w/a
         m_pStackedWidget->setCurrentWidget(m_pSlidingAnimation);
-        m_pSlidingAnimation->animate(SlidingDirection_Forward);
+        m_pSlidingAnimation->animate(true /* forward? */);
         return;
     }
@@ -500 +501 @@
 }
 
-void UIVirtualBoxManagerWidget::sltHandleSlidingAnimationComplete(SlidingDirection enmDirection)
+void UIVirtualBoxManagerWidget::sltHandleSlidingAnimationComplete(bool fForward)
 {
     /* First switch the panes: */
-    switch (enmDirection)
-    {
-        case SlidingDirection_Forward:
-        {
-            /* 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());
-            break;
-        }
-        case SlidingDirection_Reverse:
-        {
-            /* 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());
-            break;
-        }
+    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!): */

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

@@ -38 +38 @@
 /* GUI includes: */
 #include "UIExtraDataDefs.h"
-#include "UISlidingAnimation.h"
 
 /* Forward declarations: */
@@ -47 +46 @@
 class UIActionPool;
 class UIChooser;
+class UISlidingAnimation;
 class UITabBar;
 class UIToolPaneGlobal;
@@ -309 +309 @@
         void sltHandleChooserPaneSelectionInvalidated() { recacheCurrentMachineItemInformation(true /* fDontRaiseErrorPane */); }
 
-        /** Handles sliding animation complete signal.
-          * @param  enmDirection  Brings which direction was animation finished for. */
-        void sltHandleSlidingAnimationComplete(SlidingDirection enmDirection);
+        /** Handles @a fForward sliding animation complete signal. */
+        void sltHandleSlidingAnimationComplete(bool fForward);
 
         /** Handles state change for cloud profile with certain @a strProviderShortName and @a strProfileName. */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISlidingAnimation.cpp

@@ -60 +60 @@
 }
 
-void UISlidingAnimation::animate(SlidingDirection enmDirection)
+void UISlidingAnimation::animate(bool fForward)
 {
     /* Mark animation started: */
@@ -100 +100 @@
 
     /* Update initial widget geometry: */
-    switch (enmDirection)
+    if (fForward)
     {
-        case SlidingDirection_Forward:
-        {
-            setWidgetGeometry(m_startWidgetGeometry);
-            emit sigForward();
-            break;
-        }
-        case SlidingDirection_Reverse:
-        {
-            setWidgetGeometry(m_finalWidgetGeometry);
-            emit sigReverse();
-            break;
-        }
+        setWidgetGeometry(m_startWidgetGeometry);
+        emit sigForward();
+    }
+    else
+    {
+        setWidgetGeometry(m_finalWidgetGeometry);
+        emit sigReverse();
     }
 }
@@ -125 +120 @@
         m_fIsInProgress = false;
         /* And notify listeners: */
-        emit sigAnimationComplete(SlidingDirection_Reverse);
+        emit sigAnimationComplete(false /* forward? */);
     }
 }
@@ -137 +132 @@
         m_fIsInProgress = false;
         /* And notify listeners: */
-        emit sigAnimationComplete(SlidingDirection_Forward);
+        emit sigAnimationComplete(true /* forward? */);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISlidingAnimation.h

@@ -42 +42 @@
 
 
-/** Sliding direction. */
-enum SlidingDirection
-{
-    SlidingDirection_Forward,
-    SlidingDirection_Reverse
-};
-
-
 /** QWidget extension which renders a sliding animation
   * while transiting from one widget to another. */
@@ -66 +58 @@
     void sigReverse();
 
-    /** Notifies listeners about animation in specified @a enmDirection is complete. */
-    void sigAnimationComplete(SlidingDirection enmDirection);
+    /** Notifies listeners about @a fForward animation is complete. */
+    void sigAnimationComplete(bool fForward);
 
 public:
@@ -79 +71 @@
     void setWidgets(QWidget *pWidget1, QWidget *pWidget2);
 
-    /** Animates cached pWidget1 and pWidget2 in passed @a enmDirection. */
-    void animate(SlidingDirection enmDirection);
+    /** Animates cached pWidget1 and pWidget2 in @a fForward direction. */
+    void animate(bool fForward);
 
 private slots: