Changeset 63928 in vbox

Timestamp:

Sep 21, 2016 4:07:54 PM (8 years ago)

Author:

vboxsync

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

110812

Message:

FE/Qt: bugref:6899: Accessibility support (step 46): Selector UI: Moving segmented-button from UIVMDesktop to UISelectorWindow where it really belongs to.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (10 diffs)
• UISelectorWindow.h (modified) (5 diffs)
• UIVMDesktop.cpp (modified) (4 diffs)
• UIVMDesktop.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -55 +55 @@
 # include "UISelectorWindow.h"
 # include "UISettingsDialogSpecific.h"
+# include "UISpacerWidgets.h"
+# include "UISpecialControls.h"
 # include "UIToolBar.h"
 # include "UIVMLogViewer.h"
@@ -121 +123 @@
 #endif /* !VBOX_WS_MAC */
     , m_pToolBar(0)
+    , m_pSegmentedButton(0)
     , m_pContainerDetails(0)
     , m_pPaneChooser(0)
@@ -202 +205 @@
             statusBar()->hide();
     }
-}
-
-void UISelectorWindow::sltHandleDetailsContainerIndexChange(int iIndex)
-{
-    if (iIndex)
-        m_pContainerDetails->setCurrentWidget(m_pPaneDesktop);
-    else
-        m_pContainerDetails->setCurrentWidget(m_pPaneDetails);
 }
 
@@ -1043 +1038 @@
 }
 
+void UISelectorWindow::sltHandleSegmentedButtonSwitch(int iSegment)
+{
+    /* Get current item: */
+    const UIVMItem *pItem = currentItem();
+
+    /* If current item exists & accessible: */
+    if (pItem && pItem->accessible())
+    {
+        /* Raise the required widget: */
+        switch (iSegment)
+        {
+            case SegmentType_Details:
+            {
+                /* Raise the details pane: */
+                m_pContainerDetails->setCurrentWidget(m_pPaneDetails);
+                break;
+            }
+            case SegmentType_Snapshots:
+            {
+                /* Raise the desktop pane which contains snapshot pane for now: */
+                m_pContainerDetails->setCurrentWidget(m_pPaneDesktop);
+                break;
+            }
+            default:
+                break;
+        }
+        /* And pass the request to desktop pane afterwards: */
+        m_pPaneDesktop->setWidgetIndex(iSegment);
+    }
+    else
+    {
+        /* Raise the desktop pane which contains text/error details: */
+        m_pContainerDetails->setCurrentWidget(m_pPaneDesktop);
+        /* And pass the request to desktop pane afterwards: */
+        m_pPaneDesktop->setWidgetIndex(SegmentType_Details);
+    }
+}
+
+void UISelectorWindow::sltPerformSegmentedButtonSwitch(int iSegment)
+{
+    m_pSegmentedButton->animateClick(iSegment);
+}
+
 UIVMItem* UISelectorWindow::currentItem() const
 {
@@ -1055 +1093 @@
 void UISelectorWindow::updateSnapshots(UIVMItem *pItem, const CMachine &comMachine)
 {
-    /* Redirect call to Desktop-pane: */
-    m_pPaneDesktop->updateSnapshots(pItem, comMachine);
+    /* Update segmented-button text: */
+    // TODO: Bring that NLS to "&Snapshots" / "&Snapshots (%1)" form
+    //       as translator should be able to translate whole sentence.
+    //       And move it from UIVMDesktop to UISelectorWindow context.
+    QString strName = QApplication::translate("UIVMDesktop", "&Snapshots");
+    if (pItem)
+    {
+        /* Append the snapshot count (if any): */
+        const ULONG count = pItem->snapshotCount();
+        if (count)
+            strName += QString(" (%1)").arg(count);
+    }
+    m_pSegmentedButton->setTitle(SegmentType_Snapshots, strName);
+
+    /* Update snapshot pane availability: */
+    if (comMachine.isNotNull())
+        m_pSegmentedButton->setEnabled(SegmentType_Snapshots, true);
+    else
+        lockSnapshots();
+
+    /* Redirect call to Desktop-pane finally: */
+    m_pPaneDesktop->updateSnapshots(comMachine);
 }
 
 void UISelectorWindow::lockSnapshots()
 {
-    /* Redirect call to Desktop-pane: */
-    m_pPaneDesktop->lockSnapshots();
+    /* First switch to details pane: */
+    sltPerformSegmentedButtonSwitchToDetails();
+    /* Then lock the snapshot pane: */
+    m_pSegmentedButton->setEnabled(SegmentType_Snapshots, false);
 }
 
@@ -1079 +1139 @@
     setWindowTitle(strTitle);
 
+    /* Translate segmented-button: */
+    // TODO: Move that NLS from UIVMDesktop to UISelectorWindow context.
+    m_pSegmentedButton->setTitle(SegmentType_Details, QApplication::translate("UIVMDesktop", "&Details"));
+
     /* Make sure details and snapshot panes are updated: */
     sltHandleChooserPaneIndexChange();
@@ -1243 +1307 @@
     qApp->installEventFilter(this);
 #endif /* VBOX_WS_MAC */
+
+//#ifdef VBOX_WS_MAC
+//    /* Cocoa stuff should be async..
+//     * Do not ask me why but otherwise
+//     * it conflicts with native handlers. */
+//    QMetaObject::invokeMethod(this, "sltPerformSegmentedButtonSwitchToDetails", Qt::QueuedConnection);
+//#else /* !VBOX_WS_MAC */
+    sltPerformSegmentedButtonSwitchToDetails();
+//#endif /* !VBOX_WS_MAC */
 }
 
@@ -1689 +1762 @@
     m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
 
+    /* Create/add horizontal spacer widget to align subsequent controls right: */
+    m_pToolBar->addWidget(new UIHorizontalSpacerWidget(this));
+
+    /* Create/add segmented-button: */
+    m_pSegmentedButton = new UITexturedSegmentedButton(this, 2);
+    m_pSegmentedButton->setIcon(SegmentType_Details, UIIconPool::iconSet(":/vm_settings_16px.png",
+                                                                         ":/vm_settings_disabled_16px.png"));
+    m_pSegmentedButton->setIcon(SegmentType_Snapshots, UIIconPool::iconSet(":/snapshot_take_16px.png",
+                                                                           ":/snapshot_take_disabled_16px.png"));
+    m_pToolBar->addWidget(m_pSegmentedButton);
+
+    /* Create/add horizontal spacer widget of fixed size for the beta label: */
+    QWidget *pSpace = new QWidget(this);
+    if (vboxGlobal().isBeta())
+        pSpace->setFixedSize(28, 1);
+    else
+        pSpace->setFixedSize(10, 1);
+    m_pToolBar->addWidget(pSpace);
+
+#ifdef VBOX_WS_MAC
+    /* Update toolbar on Mac OS X: */
+    m_pToolBar->updateLayout();
+#endif /* VBOX_WS_MAC */
+
     /* Prepare graphics VM list: */
     m_pPaneChooser = new UIGChooser(this);
@@ -1700 +1797 @@
 
     /* Prepare details and snapshots tabs: */
-    m_pPaneDesktop = new UIVMDesktop(m_pToolBar, actionPool()->action(UIActionIndexST_M_Group_S_Refresh), this);
+    m_pPaneDesktop = new UIVMDesktop(actionPool()->action(UIActionIndexST_M_Group_S_Refresh), this);
 
     /* Crate container: */
@@ -1823 +1920 @@
 #endif /* VBOX_WS_MAC */
 
+    /* Segmented-button connections: */
+    connect(m_pSegmentedButton, SIGNAL(clicked(int)), this, SLOT(sltHandleSegmentedButtonSwitch(int)));
+
     /* VM desktop connections: */
-    connect(m_pPaneDesktop, SIGNAL(sigCurrentChanged(int)), this, SLOT(sltHandleDetailsContainerIndexChange(int)));
     connect(m_pPaneDetails, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)),
             this, SLOT(sltOpenMachineSettingsDialog(const QString&, const QString&, const QString&)));

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -40 +40 @@
 class QMenu;
 class QStackedWidget;
+class UITexturedSegmentedButton;
 
 /** Singleton QIMainWindow extension
@@ -46 +47 @@
 {
     Q_OBJECT;
+
+    /** Segmented-button segment types. */
+    enum SegmentType
+    {
+        SegmentType_Details   = 0,
+        SegmentType_Snapshots
+    };
 
 public:
@@ -78 +86 @@
     /** Handles selector-window context-menu call for passed @a position. */
     void sltShowSelectorWindowContextMenu(const QPoint &position);
-
-    /** Handles signal about Details-container @a iIndex change. */
-    void sltHandleDetailsContainerIndexChange(int iIndex);
 
     /** Handles signal about Chooser-pane index change.
@@ -177 +182 @@
     /** @} */
 
+    /** @name Segmented-button stuff.
+      * @{ */
+        /** Handles segmented-button switch. */
+        void sltHandleSegmentedButtonSwitch(int iSegment);
+        /** Performs segmented-button switch. */
+        void sltPerformSegmentedButtonSwitch(int iSegment);
+        /** Performs segmented-button switch to details pane. */
+        void sltPerformSegmentedButtonSwitchToDetails() { sltPerformSegmentedButtonSwitch(SegmentType_Details); }
+    /** @} */
+
 private:
 
@@ -299 +314 @@
     UIToolBar *m_pToolBar;
 
+    /** Holds the segmented-button instance. */
+    UITexturedSegmentedButton *m_pSegmentedButton;
+
     /** Holds the Details-container instance. */
     QStackedWidget *m_pContainerDetails;

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

@@ -31 +31 @@
 # include "UIBar.h"
 # include "UIIconPool.h"
-# include "UISpacerWidgets.h"
-# include "UISpecialControls.h"
 # include "UIVMDesktop.h"
 # include "UIVMItem.h"
@@ -220 +218 @@
 }
 
-UIVMDesktop::UIVMDesktop(UIToolBar *pToolBar, QAction *pRefreshAction, QWidget *pParent)
+UIVMDesktop::UIVMDesktop(QAction *pRefreshAction, QWidget *pParent)
     : QIWithRetranslateUI<QWidget>(pParent)
 {
-    /* Create container: */
-    QWidget *pContainer = new QWidget;
-    {
-        /* Create layout: */
-        QHBoxLayout *pLayout = new QHBoxLayout(pContainer);
-        {
-            /* Configure layout: */
-            pLayout->setContentsMargins(0, 0, 0, 0);
-            /* Create segmented-button: */
-            m_pHeaderBtn = new UITexturedSegmentedButton(pContainer, 2);
-            {
-                /* Configure segmented-button: */
-                m_pHeaderBtn->setIcon(SegmentType_Details, UIIconPool::iconSet(":/vm_settings_16px.png",
-                                                                               ":/vm_settings_disabled_16px.png"));
-                m_pHeaderBtn->setIcon(SegmentType_Snapshots, UIIconPool::iconSet(":/snapshot_take_16px.png",
-                                                                                 ":/snapshot_take_disabled_16px.png"));
-                /* Add segmented-buttons into layout: */
-                pLayout->addWidget(m_pHeaderBtn);
-            }
-        }
-    }
-
-#ifdef VBOX_WS_MAC
-    /* Cocoa stuff should be async...
-     * Do not ask me why but otherwise
-     * it conflicts with native handlers. */
-    QTimer::singleShot(0, this, SLOT(sltInit()));
-#else /* !VBOX_WS_MAC */
-    sltInit();
-#endif /* !VBOX_WS_MAC */
-
     /* Prepare main layout: */
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     pMainLayout->setContentsMargins(0, 0, 0, 0);
-
-    /* The header to select the different pages.
-     * Has different styles on the different platforms. */
-    if (pToolBar)
-    {
-        pToolBar->addWidget(new UIHorizontalSpacerWidget(this));
-        pToolBar->addWidget(pContainer);
-        QWidget *pSpace = new QWidget(this);
-        /* We need a little bit more space for the beta label. */
-        if (vboxGlobal().isBeta())
-            pSpace->setFixedSize(28, 1);
-        else
-            pSpace->setFixedSize(10, 1);
-        pToolBar->addWidget(pSpace);
-#ifdef VBOX_WS_MAC
-        pToolBar->updateLayout();
-#endif /* VBOX_WS_MAC */
-    }
-    else
-    {
-        UIBar *pBar = new UIBar(this);
-        pBar->setContentWidget(pContainer);
-        pMainLayout->addWidget(pBar);
-    }
 
     /* Create desktop pane: */
@@ -294 +237 @@
     m_pStackedLayout->addWidget(m_pSnapshotsPane);
 
-    /* Connect the header buttons with the stack layout: */
-    connect(m_pHeaderBtn, SIGNAL(clicked(int)), m_pStackedLayout, SLOT(setCurrentIndex(int)));
-    connect(m_pStackedLayout, SIGNAL(currentChanged(int)), this, SIGNAL(sigCurrentChanged(int)));
-
     /* Translate finally: */
     retranslateUi();
@@ -322 +261 @@
 }
 
-void UIVMDesktop::updateSnapshots(UIVMItem *pVMItem, const CMachine &comMachine)
-{
-    /* Update snapshot segment name: */
-    QString strName = tr("&Snapshots");
-    if (pVMItem)
-    {
-        const ULONG count = pVMItem->snapshotCount();
-        if (count)
-            strName += QString(" (%1)").arg(count);
-    }
-    m_pHeaderBtn->setTitle(SegmentType_Snapshots, strName);
-
-    /* Update segmented-button availability: */
-    if (comMachine.isNotNull())
-        m_pHeaderBtn->setEnabled(SegmentType_Snapshots, true);
-    else
-        lockSnapshots();
-
-    /* Update snapshot pane: */
+void UIVMDesktop::updateSnapshots(const CMachine &comMachine)
+{
     m_pSnapshotsPane->setMachine(comMachine);
 }
 
-void UIVMDesktop::lockSnapshots()
-{
-    m_pHeaderBtn->animateClick(SegmentType_Details);
-    m_pHeaderBtn->setEnabled(SegmentType_Snapshots, false);
-}
-
-void UIVMDesktop::sltInit()
-{
-    m_pHeaderBtn->animateClick(0);
-}
-
 void UIVMDesktop::retranslateUi()
 {
-    m_pHeaderBtn->setTitle(SegmentType_Details, tr("&Details"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.h

@@ -30 +30 @@
 class CMachine;
 class UIVMDesktopPrivate;
-class UITexturedSegmentedButton;
 class UIVMItem;
 class UISnapshotPane;
@@ -45 +44 @@
     Q_OBJECT;
 
-    /** Segmented-button segment types. */
-    enum SegmentType
-    {
-        SegmentType_Details   = 0,
-        SegmentType_Snapshots
-    };
-
-signals:
-
-    /* Notifier: Current widget stuff: */
-    void sigCurrentChanged(int iWidgetIndex);
-
 public:
 
     /* Constructor: */
-    UIVMDesktop(UIToolBar *pToolBar, QAction *pRefreshAction, QWidget *pParent);
+    UIVMDesktop(QAction *pRefreshAction, QWidget *pParent);
 
     /** Returns current widget index. */
@@ -70 +57 @@
     void updateDetailsText(const QString &strText);
     void updateDetailsError(const QString &strError);
-    void updateSnapshots(UIVMItem *pVMItem, const CMachine& machine);
-    void lockSnapshots();
-
-private slots:
-
-    /** Initialization handler. */
-    void sltInit();
+    void updateSnapshots(const CMachine &comMachine);
 
 private:
@@ -85 +66 @@
     /* Variables: */
     QStackedLayout *m_pStackedLayout;
-    UITexturedSegmentedButton *m_pHeaderBtn;
     UIVMDesktopPrivate *m_pDesktopPrivate;
     UISnapshotPane *m_pSnapshotsPane;