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

Timestamp:

Jul 25, 2019 4:09:39 PM (6 years ago)

Author:

vboxsync

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

132416

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (2 diffs)
• globals/UIMachineAttributeSetter.cpp (modified) (2 diffs)
• globals/UIMachineAttributeSetter.h (modified) (1 diff)
• manager/details/UIDetailsElement.cpp (modified) (5 diffs)
• widgets/UIBootOrderEditor.cpp (modified) (1 diff)
• widgets/UIBootOrderEditor.h (modified) (2 diffs)

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

@@ -21 +21 @@
 
 /* GUI includes: */
+#include "UIBootOrderEditor.h"
 #include "UIConverter.h"
 #include "UIDetailsGenerator.h"
@@ -162 +163 @@
     if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_BootOrder)
     {
-        QStringList bootOrder;
-        for (ulong i = 1; i <= uiCommon().virtualBox().GetSystemProperties().GetMaxBootPosition(); ++i)
-        {
-            const KDeviceType enmDeviceType = comMachine.GetBootOrder(i);
-            if (enmDeviceType == KDeviceType_Null)
-                continue;
-            bootOrder << gpConverter->toString(enmDeviceType);
-        }
-        if (bootOrder.isEmpty())
-            bootOrder << gpConverter->toString(KDeviceType_Null);
-        table << UITextTableLine(QApplication::translate("UIDetails", "Boot Order", "details (system)"), bootOrder.join(", "));
+        /* Configure hovering anchor: */
+        const QString strAnchorType = QString("boot_order");
+        const UIBootItemDataList bootItems = loadBootItems(comMachine);
+        table << UITextTableLine(QApplication::translate("UIDetails", "Boot Order", "details (system)"),
+                                 QApplication::translate("UIDetails", "<a href=#%1,%2>%3</a>", "details")
+                                    .arg(strAnchorType,
+                                         bootItemsToSerializedString(bootItems),
+                                         bootItemsToReadableString(bootItems)));
     }
 

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

@@ -20 +20 @@
 
 /* GUI includes: */
+#include "UIBootOrderEditor.h"
 #include "UICommon.h"
 #include "UIMachineAttributeSetter.h"
@@ -99 +100 @@
                 break;
             }
+            case MachineAttribute_BootOrder:
+            {
+                /* Change machine boot order: */
+                saveBootItems(guiAttribute.value<UIBootItemDataList>(), comMachine);
+                if (!comMachine.isOk())
+                {
+                    msgCenter().cannotChangeMachineAttribute(comMachine);
+                    fErrorHappened = true;
+                }
+                break;
+            }
             default:
                 break;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMachineAttributeSetter.h

@@ -34 +34 @@
     MachineAttribute_Location,
     MachineAttribute_BaseMemory,
+    MachineAttribute_BootOrder,
 };
 

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

@@ -28 +28 @@
 #include "UIActionPool.h"
 #include "UIBaseMemoryEditor.h"
+#include "UIBootOrderEditor.h"
 #include "UICommon.h"
 #include "UIConverter.h"
@@ -50 +51 @@
     AnchorRole_OSType,
     AnchorRole_BaseMemory,
+    AnchorRole_BootOrder,
     AnchorRole_Storage,
 };
@@ -153 +155 @@
     m_pTextPane->setAnchorRoleRestricted("#os_type", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#base_memory", cal != ConfigurationAccessLevel_Full);
+    m_pTextPane->setAnchorRoleRestricted("#boot_order", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#mount", cal == ConfigurationAccessLevel_Null);
     m_pTextPane->setAnchorRoleRestricted("#attach", cal != ConfigurationAccessLevel_Full);
@@ -436 +439 @@
     roles["#os_type"] = AnchorRole_OSType;
     roles["#base_memory"] = AnchorRole_BaseMemory;
+    roles["#boot_order"] = AnchorRole_BootOrder;
     roles["#mount"] = AnchorRole_Storage;
     roles["#attach"] = AnchorRole_Storage;
@@ -535 +539 @@
             break;
         }
+        case AnchorRole_BootOrder:
+        {
+            /* Prepare popup: */
+            QPointer<QIDialogContainer> pPopup = new QIDialogContainer(0, Qt::Tool);
+            if (pPopup)
+            {
+                /* Prepare editor: */
+                UIBootOrderEditor *pEditor = new UIBootOrderEditor(pPopup, true /* with label */);
+                if (pEditor)
+                {
+                    pEditor->setValue(bootItemsFromSerializedString(strData.section(',', 0, 0)));
+                    pPopup->setWidget(pEditor);
+                }
+
+                /* Adjust popup geometry: */
+                pPopup->move(QCursor::pos());
+                pPopup->adjustSize();
+
+                // WORKAROUND:
+                // On Windows, Tool dialogs aren't activated by default by some reason.
+                // So we have created sltActivateWindow wrapping actual activateWindow
+                // to fix that annoying issue.
+                QMetaObject::invokeMethod(pPopup, "sltActivateWindow", Qt::QueuedConnection);
+                /* Execute popup, change machine name if confirmed: */
+                if (pPopup->exec() == QDialog::Accepted)
+                    setMachineAttribute(machine(), MachineAttribute_BootOrder, QVariant::fromValue(pEditor->value()));
+
+                /* Delete popup: */
+                delete pPopup;
+            }
+            break;
+        }
         case AnchorRole_Storage:
         {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootOrderEditor.cpp

@@ -367 +367 @@
 }
 
+QString UIBootDataTools::bootItemsToReadableString(const UIBootItemDataList &bootItems)
+{
+    /* Prepare list: */
+    QStringList list;
+    /* We are reflecting only enabled items: */
+    foreach (const UIBootItemData &bootItem, bootItems)
+        if (bootItem.m_fEnabled)
+            list << gpConverter->toString(bootItem.m_enmType);
+    /* But if list is empty we are adding Null item at least: */
+    if (list.isEmpty())
+        list << gpConverter->toString(KDeviceType_Null);
+    /* Join list to string: */
+    return list.join(", ");
+}
+
+QString UIBootDataTools::bootItemsToSerializedString(const UIBootItemDataList &bootItems)
+{
+    /* Prepare list: */
+    QStringList list;
+    /* This is simple, we are adding '+' before enabled types and '-' before disabled: */
+    foreach (const UIBootItemData &bootItem, bootItems)
+        list << (bootItem.m_fEnabled ? QString("+%1").arg(bootItem.m_enmType) : QString("-%1").arg(bootItem.m_enmType));
+    /* Join list to string: */
+    return list.join(';');
+}
+
+UIBootItemDataList UIBootDataTools::bootItemsFromSerializedString(const QString &strBootItems)
+{
+    /* Prepare list: */
+    UIBootItemDataList list;
+    /* First of all, split passed string to arguments: */
+    const QStringList arguments = strBootItems.split(';');
+    /* Now parse in backward direction, we have added '+' before enabled types and '-' before disabled: */
+    foreach (QString strArgument, arguments)
+    {
+        UIBootItemData data;
+        data.m_fEnabled = strArgument.startsWith('+');
+        strArgument.remove(QRegExp("[+-]"));
+        data.m_enmType = static_cast<KDeviceType>(strArgument.toInt());
+        list << data;
+    }
+    /* Return list: */
+    return list;
+}
+
 
 /*********************************************************************************************************************************

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootOrderEditor.h

@@ -63 +63 @@
 };
 typedef QList<UIBootItemData> UIBootItemDataList;
+Q_DECLARE_METATYPE(UIBootItemDataList);
 
 
@@ -72 +73 @@
     /** Saves @a bootItems list to passed @a comMachine. */
     SHARED_LIBRARY_STUFF void saveBootItems(const UIBootItemDataList &bootItems, CMachine &comMachine);
+
+    /** Converts passed @a bootItems list into human readable string. */
+    SHARED_LIBRARY_STUFF QString bootItemsToReadableString(const UIBootItemDataList &bootItems);
+
+    /** Performs serialization for passed @a bootItems list. */
+    SHARED_LIBRARY_STUFF QString bootItemsToSerializedString(const UIBootItemDataList &bootItems);
+    /** Performs deserialization for passed @a strBootItems string. */
+    SHARED_LIBRARY_STUFF UIBootItemDataList bootItemsFromSerializedString(const QString &strBootItems);
 }
 using namespace UIBootDataTools;