Changeset 68212 in vbox

Timestamp:

Jul 31, 2017 4:39:22 PM (8 years ago)

Author:

vboxsync

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

117311

Message:

FE/Qt: bugref:8900: Selector UI: Allow to hide/show toolbar button text.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (5 diffs)
• selector/UIToolsToolbar.cpp (modified) (1 diff)
• selector/UIToolsToolbar.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -80 +80 @@
 const char* UIExtraDataDefs::GUI_SplitterSizes = "GUI/SplitterSizes";
 const char* UIExtraDataDefs::GUI_Toolbar = "GUI/Toolbar";
+const char* UIExtraDataDefs::GUI_Toolbar_Text = "GUI/Toolbar/Text";
 const char* UIExtraDataDefs::GUI_Statusbar = "GUI/Statusbar";
 const char* UIExtraDataDefs::GUI_GroupDefinitions = "GUI/GroupDefinitions";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -134 +134 @@
         /** Holds whether selector-window tool-bar visible. */
         extern const char* GUI_Toolbar;
+        /** Holds whether selector-window tool-bar text visible. */
+        extern const char* GUI_Toolbar_Text;
         /** Holds whether selector-window status-bar visible. */
         extern const char* GUI_Statusbar;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1948 +1948 @@
            << GUI_RecentListHD << GUI_RecentListCD << GUI_RecentListFD
            << GUI_LastSelectorWindowPosition << GUI_SplitterSizes
-           << GUI_Toolbar << GUI_Statusbar
+           << GUI_Toolbar << GUI_Toolbar_Text << GUI_Statusbar
            << GUI_GroupDefinitions << GUI_LastItemSelected
            << GUI_DetailsPageBoxes << GUI_PreviewUpdate
@@ -2675 +2675 @@
 }
 
+bool UIExtraDataManager::selectorWindowToolBarTextVisible()
+{
+    /* 'True' unless feature restricted: */
+    return !isFeatureRestricted(GUI_Toolbar_Text);
+}
+
+void UIExtraDataManager::setSelectorWindowToolBarTextVisible(bool fVisible)
+{
+    /* 'False' if feature restricted, null-string otherwise: */
+    setExtraDataString(GUI_Toolbar_Text, toFeatureRestricted(!fVisible));
+}
+
 bool UIExtraDataManager::selectorWindowStatusBarVisible()
 {

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -296 +296 @@
         /** Defines whether selector-window tool-bar @a fVisible. */
         void setSelectorWindowToolBarVisible(bool fVisible);
+
+        /** Returns whether selector-window tool-bar text visible. */
+        bool selectorWindowToolBarTextVisible();
+        /** Defines whether selector-window tool-bar text @a fVisible. */
+        void setSelectorWindowToolBarTextVisible(bool fVisible);
 
         /** Returns whether selector-window status-bar visible. */

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

@@ -157 +157 @@
     /* Populate toolbar/statusbar acctions: */
     QList<QAction*> actions;
+
+    /* Create 'Show Toolbar' action: */
     QAction *pShowToolBar = new QAction(tr("Show Toolbar"), 0);
-    pShowToolBar->setCheckable(true);
+    AssertPtrReturnVoid(pShowToolBar);
+    {
+        /* Configure action: */
+        pShowToolBar->setCheckable(true);
 #ifdef VBOX_WS_MAC
-    pShowToolBar->setChecked(m_pToolBar->isVisible());
+        pShowToolBar->setChecked(m_pToolBar->isVisible());
 #else /* VBOX_WS_MAC */
-    pShowToolBar->setChecked(m_pBar->isVisible());
+        pShowToolBar->setChecked(m_pBar->isVisible());
 #endif /* !VBOX_WS_MAC */
-    actions << pShowToolBar;
+
+        /* Add into action list: */
+        actions << pShowToolBar;
+    }
+
+    /* Create 'Show Toolbar Text' action: */
+    QAction *pShowToolBarText = new QAction(tr("Show Toolbar Text"), 0);
+    AssertPtrReturnVoid(pShowToolBarText);
+    {
+        /* Configure action: */
+        pShowToolBarText->setCheckable(true);
+        pShowToolBarText->setChecked(m_pToolBar->toolButtonStyle() == Qt::ToolButtonTextUnderIcon);
+
+        /* Add into action list: */
+        actions << pShowToolBarText;
+    }
+
+    /* Create 'Show Statusbar' action: */
     QAction *pShowStatusBar = new QAction(tr("Show Statusbar"), 0);
-    pShowStatusBar->setCheckable(true);
-    pShowStatusBar->setChecked(statusBar()->isVisible());
-    actions << pShowStatusBar;
-
+    AssertPtrReturnVoid(pShowStatusBar);
+    {
+        /* Configure action: */
+        pShowStatusBar->setCheckable(true);
+        pShowStatusBar->setChecked(statusBar()->isVisible());
+
+        /* Add into action list: */
+        actions << pShowStatusBar;
+    }
+
+    /* Prepare the menu position: */
     QPoint globalPosition = position;
     QWidget *pSender = static_cast<QWidget*>(sender());
@@ -193 +222 @@
 #endif /* !VBOX_WS_MAC */
         }
+    }
+    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)
@@ -2033 +2069 @@
     }
 
-    /* Restore toolbar and statusbar visibility: */
+    /* Restore toolbar and statusbar functionality: */
     {
 #ifdef VBOX_WS_MAC
@@ -2046 +2082 @@
         m_pBar->setHidden(!gEDataManager->selectorWindowToolBarVisible());
 #endif /* !VBOX_WS_MAC */
+        m_pToolBar->setToolButtonStyle(gEDataManager->selectorWindowToolBarTextVisible()
+                                       ? Qt::ToolButtonTextUnderIcon : Qt::ToolButtonIconOnly);
+        m_pToolbarTools->setToolButtonStyle(gEDataManager->selectorWindowToolBarTextVisible()
+                                            ? Qt::ToolButtonTextUnderIcon : Qt::ToolButtonIconOnly);
         statusBar()->setHidden(!gEDataManager->selectorWindowStatusBarVisible());
     }
@@ -2059 +2099 @@
         gEDataManager->setSelectorWindowToolBarVisible(!m_pBar->isHidden());
 #endif /* !VBOX_WS_MAC */
+        gEDataManager->setSelectorWindowToolBarTextVisible(m_pToolBar->toolButtonStyle() == Qt::ToolButtonTextUnderIcon);
         gEDataManager->setSelectorWindowStatusBarVisible(!statusBar()->isHidden());
     }

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

@@ -50 +50 @@
     /* Prepare: */
     prepare();
+}
+
+void UIToolsToolbar::setToolButtonStyle(Qt::ToolButtonStyle enmStyle)
+{
+    m_pToolBar->setToolButtonStyle(enmStyle);
 }
 

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

@@ -62 +62 @@
     UIToolsToolbar(UIActionPool *pActionPool, QWidget *pParent = 0);
 
+    /** Defines toolbar tool button @a enmStyle. */
+    void setToolButtonStyle(Qt::ToolButtonStyle enmStyle);
+
 private slots: