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

Timestamp:

May 28, 2020 2:47:42 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Tool-bar functionality cleanup.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (1 diff)
• UIVirtualBoxManagerWidget.cpp (modified) (4 diffs)
• UIVirtualBoxManagerWidget.h (modified) (3 diffs)
• chooser/UIChooser.cpp (modified) (3 diffs)
• chooser/UIChooser.h (modified) (3 diffs)

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

@@ -1545 +1545 @@
             this, &UIVirtualBoxManager::sltCurrentSnapshotItemChange);
     connect(menuBar(), &QMenuBar::customContextMenuRequested,
-            m_pWidget, &UIVirtualBoxManagerWidget::sltHandleContextMenuRequest);
+            m_pWidget, &UIVirtualBoxManagerWidget::sltHandleToolBarContextMenuRequest);
 
     /* Global VBox event handlers: */

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

@@ -230 +230 @@
 }
 
-void UIVirtualBoxManagerWidget::sltHandleContextMenuRequest(const QPoint &position)
+void UIVirtualBoxManagerWidget::sltHandleToolBarContextMenuRequest(const QPoint &position)
 {
     /* Populate toolbar actions: */
@@ -277 +277 @@
     m_pToolBar->updateLayout();
 #endif
+}
+
+void UIVirtualBoxManagerWidget::sltHandleToolBarResize(const QSize &newSize)
+{
+    emit sigToolBarHeightChange(newSize.height());
 }
 
@@ -623 +628 @@
 {
     /* Tool-bar connections: */
+    connect(m_pToolBar, &UIToolBar::customContextMenuRequested,
+            this, &UIVirtualBoxManagerWidget::sltHandleToolBarContextMenuRequest);
     connect(m_pToolBar, &UIToolBar::sigResized,
-            m_pPaneChooser, &UIChooser::sltHandleToolbarResize);
-    connect(m_pToolBar, &UIToolBar::customContextMenuRequested,
-            this, &UIVirtualBoxManagerWidget::sltHandleContextMenuRequest);
+            this, &UIVirtualBoxManagerWidget::sltHandleToolBarResize);
 
     /* Chooser-pane connections: */
+    connect(this, &UIVirtualBoxManagerWidget::sigToolBarHeightChange,
+            m_pPaneChooser, &UIChooser::setGlobalItemHeightHint);
     connect(m_pPaneChooser, &UIChooser::sigSelectionChanged,
             this, &UIVirtualBoxManagerWidget::sltHandleChooserPaneIndexChange);
@@ -877 +884 @@
 {
     /* Tool-bar connections: */
+    disconnect(m_pToolBar, &UIToolBar::customContextMenuRequested,
+               this, &UIVirtualBoxManagerWidget::sltHandleToolBarContextMenuRequest);
     disconnect(m_pToolBar, &UIToolBar::sigResized,
-               m_pPaneChooser, &UIChooser::sltHandleToolbarResize);
-    disconnect(m_pToolBar, &UIToolBar::customContextMenuRequested,
-               this, &UIVirtualBoxManagerWidget::sltHandleContextMenuRequest);
+               this, &UIVirtualBoxManagerWidget::sltHandleToolBarResize);
 
     /* Chooser-pane connections: */
+    disconnect(this, &UIVirtualBoxManagerWidget::sigToolBarHeightChange,
+               m_pPaneChooser, &UIChooser::setGlobalItemHeightHint);
     disconnect(m_pPaneChooser, &UIChooser::sigSelectionChanged,
                this, &UIVirtualBoxManagerWidget::sltHandleChooserPaneIndexChange);

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

@@ -57 +57 @@
 
 signals:
+
+    /** @name Tool-bar stuff.
+      * @{ */
+        /* Notifies listeners about tool-bar height change. */
+        void sigToolBarHeightChange(int iHeight);
+    /** @} */
 
     /** @name Chooser pane stuff.
@@ -193 +199 @@
 public slots:
 
-    /** @name Chooser pane stuff.
-      * @{ */
-        /** Handles context-menu request for passed @a position. */
-        void sltHandleContextMenuRequest(const QPoint &position);
+    /** @name Tool-bar stuff.
+      * @{ */
+        /** Handles tool-bar context-menu request for passed @a position. */
+        void sltHandleToolBarContextMenuRequest(const QPoint &position);
     /** @} */
 
@@ -208 +214 @@
 
 private slots:
+
+    /** @name Tool-bar stuff.
+      * @{ */
+        /** Handles signal about tool-bar resize to @a newSize. */
+        void sltHandleToolBarResize(const QSize &newSize);
+    /** @} */
 
     /** @name Chooser pane stuff.

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp

@@ -40 +40 @@
 }
 
+bool UIChooser::isGroupSavingInProgress() const
+{
+    AssertPtrReturn(model(), false);
+    return model()->isGroupSavingInProgress();
+}
+
 UIVirtualMachineItem *UIChooser::currentItem() const
 {
@@ -100 +106 @@
 }
 
-bool UIChooser::isGroupSavingInProgress() const
-{
-    AssertPtrReturn(model(), false);
-    return model()->isGroupSavingInProgress();
-}
-
 void UIChooser::openGroupNameEditor()
 {
@@ -160 +160 @@
 }
 
-void UIChooser::sltHandleToolbarResize(const QSize &newSize)
-{
-    /* Pass height to a model: */
-    AssertPtrReturnVoid(model());
-    model()->setGlobalItemHeightHint(newSize.height());
+void UIChooser::setGlobalItemHeightHint(int iHeight)
+{
+    AssertPtrReturnVoid(model());
+    model()->setGlobalItemHeightHint(iHeight);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h

@@ -99 +99 @@
     /** @} */
 
+    /** @name Group saving stuff.
+      * @{ */
+        /** Returns whether group saving is in progress. */
+        bool isGroupSavingInProgress() const;
+    /** @} */
+
     /** @name Current-item stuff.
       * @{ */
@@ -124 +130 @@
         /** Returns full name of currently selected group. */
         QString fullGroupName() const;
-    /** @} */
-
-    /** @name Group saving stuff.
-      * @{ */
-        /** Returns whether group saving is in progress. */
-        bool isGroupSavingInProgress() const;
     /** @} */
 
@@ -156 +156 @@
 public slots:
 
-    /** @name General stuff.
-      * @{ */
-        /** Handles toolbar resize to @a newSize. */
-        void sltHandleToolbarResize(const QSize &newSize);
+    /** @name Layout stuff.
+      * @{ */
+        /** Defines global item @a iHeight. */
+        void setGlobalItemHeightHint(int iHeight);
     /** @} */