Changeset 80103 in vbox for trunk/src

Timestamp:

Aug 1, 2019 2:59:49 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7720: VirtualBox Manager: Details pane: Possibility to edit VM menu-bar and status-bar presence on-the-fly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (2 diffs)
• manager/details/UIDetailsElement.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.cpp

@@ -804 +804 @@
     if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeUserInterface_MenuBar)
     {
+        const QString strAnchorType = QString("menu_bar");
         const QString strMenubarEnabled = comMachine.GetExtraData(UIExtraDataDefs::GUI_MenuBar_Enabled);
-        /* Try to convert loaded data to bool: */
         const bool fEnabled = !(   strMenubarEnabled.compare("false", Qt::CaseInsensitive) == 0
                                 || strMenubarEnabled.compare("no", Qt::CaseInsensitive) == 0
                                 || strMenubarEnabled.compare("off", Qt::CaseInsensitive) == 0
                                 || strMenubarEnabled == "0");
-        /* Append information: */
         table << UITextTableLine(QApplication::translate("UIDetails", "Menu-bar", "details (user interface)"),
-                                 fEnabled ? QApplication::translate("UIDetails", "Enabled", "details (user interface/menu-bar)")
-                                          : QApplication::translate("UIDetails", "Disabled", "details (user interface/menu-bar)"));
+                                 QString("<a href=#%1,%2>%3</a>")
+                                     .arg(strAnchorType)
+                                     .arg((int)fEnabled)
+                                     .arg(fEnabled ? QApplication::translate("UIDetails", "Enabled", "details (user interface/menu-bar)")
+                                                   : QApplication::translate("UIDetails", "Disabled", "details (user interface/menu-bar)")));
     }
 #endif /* !VBOX_WS_MAC */
@@ -820 +822 @@
     if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeUserInterface_StatusBar)
     {
+        const QString strAnchorType = QString("status_bar");
         const QString strStatusbarEnabled = comMachine.GetExtraData(UIExtraDataDefs::GUI_StatusBar_Enabled);
-        /* Try to convert loaded data to bool: */
         const bool fEnabled = !(   strStatusbarEnabled.compare("false", Qt::CaseInsensitive) == 0
                                 || strStatusbarEnabled.compare("no", Qt::CaseInsensitive) == 0
                                 || strStatusbarEnabled.compare("off", Qt::CaseInsensitive) == 0
                                 || strStatusbarEnabled == "0");
-        /* Append information: */
         table << UITextTableLine(QApplication::translate("UIDetails", "Status-bar", "details (user interface)"),
-                                 fEnabled ? QApplication::translate("UIDetails", "Enabled", "details (user interface/status-bar)")
-                                          : QApplication::translate("UIDetails", "Disabled", "details (user interface/status-bar)"));
+                                 QString("<a href=#%1,%2>%3</a>")
+                                     .arg(strAnchorType)
+                                     .arg((int)fEnabled)
+                                     .arg(fEnabled ? QApplication::translate("UIDetails", "Enabled", "details (user interface/status-bar)")
+                                                   : QApplication::translate("UIDetails", "Disabled", "details (user interface/status-bar)")));
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -61 +61 @@
     AnchorRole_AudioHostDriverType,
     AnchorRole_AudioControllerType,
+    AnchorRole_MenuBar,
+    AnchorRole_StatusBar,
 };
 
@@ -166 +168 @@
     m_pTextPane->setAnchorRoleRestricted("#video_memory", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#graphics_controller_type", cal != ConfigurationAccessLevel_Full);
+    m_pTextPane->setAnchorRoleRestricted("#mount", cal == ConfigurationAccessLevel_Null);
+    m_pTextPane->setAnchorRoleRestricted("#attach", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#audio_host_driver_type", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#audio_controller_type", cal != ConfigurationAccessLevel_Full);
-    m_pTextPane->setAnchorRoleRestricted("#mount", cal == ConfigurationAccessLevel_Null);
-    m_pTextPane->setAnchorRoleRestricted("#attach", cal != ConfigurationAccessLevel_Full);
+    m_pTextPane->setAnchorRoleRestricted("#menu_bar", cal == ConfigurationAccessLevel_Null);
+    m_pTextPane->setAnchorRoleRestricted("#status_bar", cal == ConfigurationAccessLevel_Null);
 }
 
@@ -454 +458 @@
     roles["#video_memory"] = AnchorRole_VideoMemory;
     roles["#graphics_controller_type"] = AnchorRole_GraphicsControllerType;
+    roles["#mount"] = AnchorRole_Storage;
+    roles["#attach"] = AnchorRole_Storage;
     roles["#audio_host_driver_type"] = AnchorRole_AudioHostDriverType;
     roles["#audio_controller_type"] = AnchorRole_AudioControllerType;
-    roles["#mount"] = AnchorRole_Storage;
-    roles["#attach"] = AnchorRole_Storage;
+    roles["#menu_bar"] = AnchorRole_MenuBar;
+    roles["#status_bar"] = AnchorRole_StatusBar;
 
     /* Current anchor role: */
@@ -736 +742 @@
             break;
         }
+        case AnchorRole_MenuBar:
+        case AnchorRole_StatusBar:
+        {
+            /* Parse whether we have it enabled, true if unable to parse: */
+            bool fParsed = false;
+            bool fEnabled = strData.section(',', 0, 0).toInt(&fParsed);
+            if (!fParsed)
+                fEnabled = true;
+
+            /* Fill menu with actions, use menu-bar NLS for both cases for simplicity: */
+            UIMenu menu;
+            QAction *pActionEnable = menu.addAction(QApplication::translate("UIDetails", "Enabled", "details (user interface/menu-bar)"));
+            pActionEnable->setCheckable(true);
+            pActionEnable->setChecked(fEnabled);
+            QAction *pActionDisable = menu.addAction(QApplication::translate("UIDetails", "Disabled", "details (user interface/menu-bar)"));
+            pActionDisable->setCheckable(true);
+            pActionDisable->setChecked(!fEnabled);
+
+            /* Execute menu, look for result: */
+            QAction *pTriggeredAction = menu.exec(QCursor::pos());
+            if (   pTriggeredAction
+                && (   fEnabled && pTriggeredAction == pActionDisable
+                    || !fEnabled && pTriggeredAction == pActionEnable))
+            {
+                switch (enmRole)
+                {
+                    case AnchorRole_MenuBar: gEDataManager->setMenuBarEnabled(!fEnabled, machine().GetId()); break;
+                    case AnchorRole_StatusBar: gEDataManager->setStatusBarEnabled(!fEnabled, machine().GetId()); break;
+                    default: break;
+                }
+            }
+            break;
+        }
         default:
             break;