Changeset 73450 in vbox for trunk/src/VBox

Timestamp:

Aug 2, 2018 11:58:14 AM (7 years ago)

Author:

vboxsync

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

124077

Message:

FE/Qt: VirtualBox Manager UI: Not using status-bar anymore.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (9 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)

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

@@ -57 +57 @@
 # include "UIWizardExportApp.h"
 # include "UIWizardImportApp.h"
-# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-#  include "UINetworkManager.h"
-#  include "UINetworkManagerIndicator.h"
-# endif
 # ifdef VBOX_WS_MAC
 #  include "UIImageTools.h"
@@ -218 +214 @@
     }
 
-    /* Create 'Show Statusbar' action: */
-    QAction *pShowStatusBar = new QAction(tr("Show Statusbar"), 0);
-    AssertPtrReturnVoid(pShowStatusBar);
-    {
-        /* Configure action: */
-        pShowStatusBar->setCheckable(true);
-        pShowStatusBar->setChecked(statusBar()->isVisible());
-
-        /* Add into action list: */
-        actions << pShowStatusBar;
-    }
-
     /* Prepare the menu position: */
     QPoint globalPosition = position;
@@ -245 +229 @@
     else if (pResult == pShowToolBarText)
     {
-        m_pToolBar->setToolButtonStyle(pResult->isChecked()
-                                       ? Qt::ToolButtonTextUnderIcon : Qt::ToolButtonIconOnly);
-        m_pToolbarTools->setToolButtonStyle(pResult->isChecked()
-                                            ? Qt::ToolButtonTextUnderIcon : Qt::ToolButtonIconOnly);
-    }
-    else if (pResult == pShowStatusBar)
-    {
-        if (pResult->isChecked())
-            statusBar()->show();
-        else
-            statusBar()->hide();
+        m_pToolBar->setToolButtonStyle(  pResult->isChecked()
+                                       ? Qt::ToolButtonTextUnderIcon
+                                       : Qt::ToolButtonIconOnly);
+        m_pToolbarTools->setToolButtonStyle(  pResult->isChecked()
+                                            ? Qt::ToolButtonTextUnderIcon
+                                            : Qt::ToolButtonIconOnly);
     }
 }
@@ -419 +398 @@
 }
 
-#ifdef VBOX_WS_MAC
-void UIVirtualBoxManager::sltActionHovered(UIAction *pAction)
-{
-    /* Show the action message for a ten seconds: */
-    statusBar()->showMessage(pAction->statusTip(), 10000);
-}
-#endif /* VBOX_WS_MAC */
-
 void UIVirtualBoxManager::sltHandleStateChange(const QString &)
 {
@@ -1347 +1318 @@
 #endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */
             }
-            break;
-        }
-        case QEvent::WindowDeactivate:
-        {
-            /* Make sure every status bar hint is cleared when the window lost focus. */
-            statusBar()->clearMessage();
             break;
         }
@@ -1907 +1872 @@
 void UIVirtualBoxManager::prepareStatusBar()
 {
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-    /* Setup statusbar policy: */
-    statusBar()->setContextMenuPolicy(Qt::CustomContextMenu);
-
-    /* Add network-manager indicator: */
-    UINetworkManagerIndicator *pIndicator = gNetworkManager->createIndicator();
-    statusBar()->addPermanentWidget(pIndicator);
-    pIndicator->updateAppearance();
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-
-#ifdef VBOX_WS_MAC
-    /* Make sure the status-bar is aware of action hovering: */
-    connect(actionPool(), SIGNAL(sigActionHovered(UIAction *)),
-            this, SLOT(sltActionHovered(UIAction *)));
-#endif /* VBOX_WS_MAC */
+    /* We are not using status-bar anymore: */
+    statusBar()->setHidden(true);
 }
 
@@ -2177 +2129 @@
             this, &UIVirtualBoxManager::sltHandleToolsTypeSwitch);
 
-    /* Status-bar connections: */
-    connect(statusBar(), SIGNAL(customContextMenuRequested(const QPoint&)),
-            this, SLOT(sltHandleContextMenuRequest(const QPoint&)));
-
     /* Graphics VM chooser connections: */
     connect(m_pPaneChooser, SIGNAL(sigSelectionChanged()), this, SLOT(sltHandleChooserPaneIndexChange()));
@@ -2254 +2202 @@
         m_pToolbarTools->setToolButtonStyle(gEDataManager->selectorWindowToolBarTextVisible()
                                             ? Qt::ToolButtonTextUnderIcon : Qt::ToolButtonIconOnly);
-        statusBar()->setHidden(!gEDataManager->selectorWindowStatusBarVisible());
     }
 
@@ -2289 +2236 @@
         gEDataManager->setSelectorWindowToolBarVisible(!m_pToolBar->isHidden());
         gEDataManager->setSelectorWindowToolBarTextVisible(m_pToolBar->toolButtonStyle() == Qt::ToolButtonTextUnderIcon);
-        gEDataManager->setSelectorWindowStatusBarVisible(!statusBar()->isHidden());
     }
 

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

@@ -110 +110 @@
         /** Handles signal about group saving progress change. */
         void sltHandleGroupSavingProgressChange();
-
-#ifdef VBOX_WS_MAC
-        /** Handles signal about some @a pAction hovered. */
-        void sltActionHovered(UIAction *pAction);
-#endif
     /** @} */