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

Timestamp:

Aug 5, 2019 11:35:21 AM (6 years ago)

Author:

vboxsync

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

132570

Message:

FE/Qt: bugref:7720: VirtualBox Manager: Details pane: Possibility to edit VM mini-toolbar on-the-fly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.h (modified) (1 diff)
• globals/UIDetailsGenerator.cpp (modified) (2 diffs)
• manager/details/UIDetailsElement.cpp (modified) (4 diffs)

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

@@ -1008 +1008 @@
 enum MiniToolbarAlignment
 {
+    MiniToolbarAlignment_Disabled,
     MiniToolbarAlignment_Bottom,
     MiniToolbarAlignment_Top

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

@@ -840 +840 @@
     if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeUserInterface_MiniToolbar)
     {
+        const QString strAnchorType = QString("mini_toolbar");
         const QString strMiniToolbarEnabled = comMachine.GetExtraData(UIExtraDataDefs::GUI_ShowMiniToolBar);
-        /* Try to convert loaded data to bool: */
         const bool fEnabled = !(   strMiniToolbarEnabled.compare("false", Qt::CaseInsensitive) == 0
                                 || strMiniToolbarEnabled.compare("no", Qt::CaseInsensitive) == 0
                                 || strMiniToolbarEnabled.compare("off", Qt::CaseInsensitive) == 0
                                 || strMiniToolbarEnabled == "0");
-        /* Append information: */
         if (fEnabled)
         {
@@ -855 +854 @@
                 switch (gpConverter->fromInternalString<MiniToolbarAlignment>(strMiniToolbarPosition))
                 {
-                    /* Append information: */
                     case MiniToolbarAlignment_Top:
                         table << UITextTableLine(QApplication::translate("UIDetails", "Mini-toolbar Position", "details (user interface)"),
-                                                 QApplication::translate("UIDetails", "Top", "details (user interface/mini-toolbar position)"));
+                                                 QString("<a href=#%1,%2>%3</a>")
+                                                     .arg(strAnchorType)
+                                                     .arg((int)MiniToolbarAlignment_Top)
+                                                     .arg(QApplication::translate("UIDetails", "Top", "details (user interface/mini-toolbar position)")));
                         break;
-                        /* Append information: */
                     case MiniToolbarAlignment_Bottom:
                         table << UITextTableLine(QApplication::translate("UIDetails", "Mini-toolbar Position", "details (user interface)"),
-                                                 QApplication::translate("UIDetails", "Bottom", "details (user interface/mini-toolbar position)"));
+                                                 QString("<a href=#%1,%2>%3</a>")
+                                                     .arg(strAnchorType)
+                                                     .arg((int)MiniToolbarAlignment_Bottom)
+                                                     .arg(QApplication::translate("UIDetails", "Bottom", "details (user interface/mini-toolbar position)")));
+                        break;
+                    default:
                         break;
                 }
             }
         }
-        /* Append information: */
         else
             table << UITextTableLine(QApplication::translate("UIDetails", "Mini-toolbar", "details (user interface)"),
-                                     QApplication::translate("UIDetails", "Disabled", "details (user interface/mini-toolbar)"));
+                                     QString("<a href=#%1,%2>%3</a>")
+                                         .arg(strAnchorType)
+                                         .arg((int)MiniToolbarAlignment_Disabled)
+                                         .arg(QApplication::translate("UIDetails", "Disabled", "details (user interface/mini-toolbar)")));
     }
 #endif /* !VBOX_WS_MAC */

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

@@ -65 +65 @@
 #endif
     AnchorRole_StatusBar,
+#ifndef VBOX_WS_MAC
+    AnchorRole_MiniToolbar,
+#endif
 };
 
@@ -178 +181 @@
 #endif
     m_pTextPane->setAnchorRoleRestricted("#status_bar", cal == ConfigurationAccessLevel_Null);
+#ifndef VBOX_WS_MAC
+    m_pTextPane->setAnchorRoleRestricted("#mini_toolbar", cal == ConfigurationAccessLevel_Null);
+#endif
 }
 
@@ -470 +476 @@
 #endif
     roles["#status_bar"] = AnchorRole_StatusBar;
+#ifndef VBOX_WS_MAC
+    roles["#mini_toolbar"] = AnchorRole_MiniToolbar;
+#endif
 
     /* Current anchor role: */
@@ -785 +794 @@
             break;
         }
+#ifndef VBOX_WS_MAC
+        case AnchorRole_MiniToolbar:
+        {
+            /* Parse whether we have it enabled: */
+            bool fParsed = false;
+            MiniToolbarAlignment enmAlignment = static_cast<MiniToolbarAlignment>(strData.section(',', 0, 0).toInt(&fParsed));
+            if (!fParsed)
+                enmAlignment = MiniToolbarAlignment_Disabled;
+
+            /* Fill menu with actions: */
+            UIMenu menu;
+            QAction *pActionDisabled = menu.addAction(QApplication::translate("UIDetails", "Disabled", "details (user interface/mini-toolbar)"));
+            pActionDisabled->setCheckable(true);
+            pActionDisabled->setChecked(enmAlignment == MiniToolbarAlignment_Disabled);
+            QAction *pActionTop = menu.addAction(QApplication::translate("UIDetails", "Top", "details (user interface/mini-toolbar position)"));
+            pActionTop->setCheckable(true);
+            pActionTop->setChecked(enmAlignment == MiniToolbarAlignment_Top);
+            QAction *pActionBottom = menu.addAction(QApplication::translate("UIDetails", "Bottom", "details (user interface/mini-toolbar position)"));
+            pActionBottom->setCheckable(true);
+            pActionBottom->setChecked(enmAlignment == MiniToolbarAlignment_Bottom);
+
+            /* Execute menu, look for result: */
+            QAction *pTriggeredAction = menu.exec(QCursor::pos());
+            if (pTriggeredAction)
+            {
+                const QUuid uMachineId = machine().GetId();
+                if (pTriggeredAction == pActionDisabled)
+                    gEDataManager->setMiniToolbarEnabled(false, uMachineId);
+                else if (pTriggeredAction == pActionTop)
+                {
+                    gEDataManager->setMiniToolbarEnabled(true, uMachineId);
+                    gEDataManager->setMiniToolbarAlignment(Qt::AlignTop, uMachineId);
+                }
+                else if (pTriggeredAction == pActionBottom)
+                {
+                    gEDataManager->setMiniToolbarEnabled(true, uMachineId);
+                    gEDataManager->setMiniToolbarAlignment(Qt::AlignBottom, uMachineId);
+                }
+            }
+            break;
+        }
+#endif
         default:
             break;