Changeset 67422 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 15, 2017 11:10:02 AM (8 years ago)

Author:

vboxsync

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

116149

Message:

FE/Qt: Selector UI: Make sure segmented-button is updated when corresponding stacked-widget is.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• selector/UISelectorWindow.cpp (modified) (3 diffs)
• selector/UISelectorWindow.h (modified) (1 diff)
• widgets/UISpecialControls.cpp (modified) (1 diff)
• widgets/UISpecialControls.h (modified) (1 diff)

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

@@ -247 +247 @@
         /* Make sure at least Details-pane raised: */
         if (m_pContainerDetails->currentWidget() == m_pPaneDesktop)
-            m_pContainerDetails->setCurrentWidget(m_pPaneDetails);
+            sltPerformSegmentedButtonSwitch(SegmentType_Details);
 
         /* Refresh Tools-pane if requested: */
@@ -257 +257 @@
         /* Make sure Desktop-pane raised: */
         if (m_pContainerDetails->currentWidget() != m_pPaneDesktop)
-            m_pContainerDetails->setCurrentWidget(m_pPaneDesktop);
+            sltPerformSegmentedButtonSwitch(SegmentType_None);
 
         /* Note that the machine becomes inaccessible (or if the last VM gets
@@ -1085 +1085 @@
 {
     /* Perform silent segmented-button switch: */
-    m_pSegmentedButton->setSelected(iSegment);
+    if (iSegment >= 0 && iSegment < m_pSegmentedButton->count())
+        m_pSegmentedButton->setSelected(iSegment);
     /* Manually handle that switch as well: */
     sltHandleSegmentedButtonSwitch(iSegment);

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

@@ -56 +56 @@
         SegmentType_Details,
         SegmentType_Tools,
+        SegmentType_None,
     };
 

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

@@ -269 +269 @@
 }
 
+int UIRoundRectSegmentedButton::count() const
+{
+    return m_pButtons.size();
+}
+
 void UIRoundRectSegmentedButton::setTitle(int iSegment, const QString &aTitle)
 {

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

@@ -231 +231 @@
     ~UIRoundRectSegmentedButton();
 
+    int count() const;
+
     void setTitle(int iSegment, const QString &aTitle);
     void setToolTip(int iSegment, const QString &strTip);