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

Timestamp:

Aug 22, 2018 6:27:21 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Rework sliding animation to use more convenient UISlidingAnimation instead of UISlidingWidget.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (7 diffs)
• UIVirtualBoxManagerWidget.h (modified) (4 diffs)

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

@@ -22 +22 @@
 /* Qt includes: */
 # include <QHBoxLayout>
+# include <QStackedWidget>
 # include <QStyle>
 # include <QVBoxLayout>
@@ -33 +34 @@
 # include "UIVirtualBoxManager.h"
 # include "UIVirtualBoxManagerWidget.h"
-# include "UISlidingWidget.h"
 # include "UITabBar.h"
 # include "UIToolBar.h"
@@ -48 +48 @@
     : m_fPolished(false)
     , m_pActionPool(pParent->actionPool())
-    , m_pSlidingWidget(0)
     , m_pSplitter(0)
     , m_pToolBar(0)
     , m_pToolbarTools(0)
     , m_pPaneChooser(0)
+    , m_pStackedWidget(0)
+    , m_pPaneToolsGlobal(0)
     , m_pPaneToolsMachine(0)
-    , m_pPaneToolsGlobal(0)
+    , m_pSlidingAnimation(0)
 {
     prepare();
@@ -237 +238 @@
     /* If global item is selected and we are on machine tools pane => switch to global tools pane: */
     if (   isGlobalItemSelected()
-        && m_pSlidingWidget->state() == UISlidingWidget::State_Start)
-    {
-        m_pSlidingWidget->moveForward();
-        m_pToolbarTools->switchToTabBar(UIToolbarTools::TabBarType_Global);
+        && m_pStackedWidget->currentWidget() != m_pPaneToolsGlobal)
+    {
+        m_pStackedWidget->setCurrentWidget(m_pPaneToolsGlobal); // rendering w/a
+        m_pStackedWidget->setCurrentWidget(m_pSlidingAnimation);
+        m_pSlidingAnimation->animate(SlidingDirection_Reverse);
     }
 
@@ -247 +249 @@
     /* If machine or group item is selected and we are on global tools pane => switch to machine tools pane: */
     if (   (isMachineItemSelected() || isGroupItemSelected())
-        && m_pSlidingWidget->state() == UISlidingWidget::State_Final)
-    {
-        m_pSlidingWidget->moveBackward();
-        m_pToolbarTools->switchToTabBar(UIToolbarTools::TabBarType_Machine);
+        && m_pStackedWidget->currentWidget() != m_pPaneToolsMachine)
+    {
+        m_pStackedWidget->setCurrentWidget(m_pPaneToolsMachine); // rendering w/a
+        m_pStackedWidget->setCurrentWidget(m_pSlidingAnimation);
+        m_pSlidingAnimation->animate(SlidingDirection_Forward);
     }
 
@@ -312 +315 @@
 }
 
+void UIVirtualBoxManagerWidget::sltHandleSlidingAnimationComplete(SlidingDirection enmDirection)
+{
+    switch (enmDirection)
+    {
+        case SlidingDirection_Forward:
+        {
+            m_pToolbarTools->switchToTabBar(UIToolbarTools::TabBarType_Machine);
+            m_pStackedWidget->setCurrentWidget(m_pPaneToolsMachine);
+            break;
+        }
+        case SlidingDirection_Reverse:
+        {
+            m_pToolbarTools->switchToTabBar(UIToolbarTools::TabBarType_Global);
+            m_pStackedWidget->setCurrentWidget(m_pPaneToolsGlobal);
+            break;
+        }
+    }
+}
+
 void UIVirtualBoxManagerWidget::sltHandleToolOpenedMachine(ToolTypeMachine enmType)
 {
@@ -467 +489 @@
                     }
 
-                    /* Create sliding-widget: */
-                    m_pSlidingWidget = new UISlidingWidget(Qt::Vertical);
-                    if (m_pSlidingWidget)
+                    /* Create stacked-widget: */
+                    m_pStackedWidget = new QStackedWidget;
+                    if (m_pStackedWidget)
                     {
+                        /* Create Global Tools-pane: */
+                        m_pPaneToolsGlobal = new UIToolPaneGlobal(actionPool());
+                        if (m_pPaneToolsGlobal)
+                        {
+                            /* Add into stack: */
+                            m_pStackedWidget->addWidget(m_pPaneToolsGlobal);
+                        }
+
                         /* Create Machine Tools-pane: */
                         m_pPaneToolsMachine = new UIToolPaneMachine(actionPool());
-                        /* Create Global Tools-pane: */
-                        m_pPaneToolsGlobal = new UIToolPaneGlobal(actionPool());
-
-                        /* Add left/right widgets into sliding widget: */
-                        m_pSlidingWidget->setWidgets(m_pPaneToolsMachine, m_pPaneToolsGlobal);
+                        if (m_pPaneToolsMachine)
+                        {
+                            /* Add into stack: */
+                            m_pStackedWidget->addWidget(m_pPaneToolsMachine);
+                        }
+
+                        /* Create sliding-widget: */
+                        m_pSlidingAnimation = new UISlidingAnimation(Qt::Vertical, true);
+                        if (m_pSlidingAnimation)
+                        {
+                            /* Add first/second widgets into sliding animation: */
+                            m_pSlidingAnimation->setWidgets(m_pPaneToolsGlobal, m_pPaneToolsMachine);
+                            connect(m_pSlidingAnimation, &UISlidingAnimation::sigAnimationComplete,
+                                    this, &UIVirtualBoxManagerWidget::sltHandleSlidingAnimationComplete);
+
+                            /* Add into stack: */
+                            m_pStackedWidget->addWidget(m_pSlidingAnimation);
+                        }
+
+                        /* Make Machine Tools pane active initially: */
+                        m_pStackedWidget->setCurrentWidget(m_pPaneToolsMachine);
 
                         /* Add into layout: */
-                        pLayoutRight->addWidget(m_pSlidingWidget, 1);
+                        pLayoutRight->addWidget(m_pStackedWidget, 1);
                     }
                 }

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

@@ -24 +24 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
+#include "UISlidingAnimation.h"
 #include "UIToolPaneGlobal.h"
 #include "UIToolPaneMachine.h"
 
 /* Forward declarations: */
+class QStackedWidget;
 class QISplitter;
 class UIActionPool;
 class UIChooser;
-class UISlidingWidget;
 class UITabBar;
 class UIToolBar;
@@ -137 +138 @@
         /** Handles signal about Chooser-pane index change the default way. */
         void sltHandleChooserPaneIndexChangeDefault() { sltHandleChooserPaneIndexChange(); }
+
+        /** Handles sliding animation complete signal.
+          * @param  enmDirection  Brings which direction was animation finished for. */
+        void sltHandleSlidingAnimationComplete(SlidingDirection enmDirection);
     /** @} */
 
@@ -182 +187 @@
     UIActionPool *m_pActionPool;
 
-    /** Holds the sliding-widget isntance. */
-    UISlidingWidget *m_pSlidingWidget;
-
     /** Holds the central splitter instance. */
     QISplitter *m_pSplitter;
@@ -200 +202 @@
 
     /** Holds the Chooser-pane instance. */
-    UIChooser         *m_pPaneChooser;
+    UIChooser          *m_pPaneChooser;
+    /** Holds the stacked-widget. */
+    QStackedWidget     *m_pStackedWidget;
+    /** Holds the Global Tools-pane instance. */
+    UIToolPaneGlobal   *m_pPaneToolsGlobal;
     /** Holds the Machine Tools-pane instance. */
-    UIToolPaneMachine *m_pPaneToolsMachine;
-    /** Holds the Global Tools-pane instance. */
-    UIToolPaneGlobal  *m_pPaneToolsGlobal;
+    UIToolPaneMachine  *m_pPaneToolsMachine;
+    /** Holds the sliding-animation widget instance. */
+    UISlidingAnimation *m_pSlidingAnimation;
 };