Changeset 79959 in vbox

Timestamp:

Jul 24, 2019 1:57:03 PM (6 years ago)

Author:

vboxsync

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

132390

Message:

FE/Qt: bugref:7720: VirtualBox Manager: Details pane: Possibility to edit VM base memory size on-the-fly.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/globals/UIDetailsGenerator.cpp (modified) (1 diff)
• src/globals/UIMachineAttributeSetter.cpp (modified) (1 diff)
• src/globals/UIMachineAttributeSetter.h (modified) (1 diff)
• src/manager/details/UIDetailsElement.cpp (modified) (5 diffs)
• src/widgets/UIBaseMemoryEditor.cpp (added)
• src/widgets/UIBaseMemoryEditor.h (added)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -888 +888 @@
         src/settings/machine/UIMachineSettingsUSBFilterDetails.h \
         src/widgets/UIAddDiskEncryptionPasswordDialog.h \
+        src/widgets/UIBaseMemoryEditor.h \
         src/widgets/UIBaseMemorySlider.h \
         src/widgets/UIBootTable.h \
@@ -1378 +1379 @@
         src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp \
         src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
+        src/widgets/UIBaseMemoryEditor.cpp \
         src/widgets/UIBaseMemorySlider.cpp \
         src/widgets/UIBootTable.cpp \

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

@@ -132 +132 @@
     /* Base memory: */
     if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_RAM)
+    {
+        /* Configure hovering anchor: */
+        const QString strAnchorType = QString("base_memory");
+        const int iBaseMemory = comMachine.GetMemorySize();
         table << UITextTableLine(QApplication::translate("UIDetails", "Base Memory", "details (system)"),
-                                 QApplication::translate("UIDetails", "%1 MB", "details").arg(comMachine.GetMemorySize()));
+                                 QApplication::translate("UIDetails", "<a href=#%1,%2>%2 MB</a>", "details")
+                                    .arg(strAnchorType).arg(iBaseMemory));
+    }
 
     /* Processors: */

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

@@ -88 +88 @@
                 break;
             }
+            case MachineAttribute_BaseMemory:
+            {
+                /* Change machine base memory (RAM): */
+                comMachine.SetMemorySize(guiAttribute.toInt());
+                if (!comMachine.isOk())
+                {
+                    msgCenter().cannotChangeMachineAttribute(comMachine);
+                    fErrorHappened = true;
+                }
+                break;
+            }
             default:
                 break;

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

@@ -33 +33 @@
     MachineAttribute_OSType,
     MachineAttribute_Location,
+    MachineAttribute_BaseMemory,
 };
 

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

@@ -27 +27 @@
 #include "QIDialogContainer.h"
 #include "UIActionPool.h"
+#include "UIBaseMemoryEditor.h"
 #include "UICommon.h"
 #include "UIConverter.h"
@@ -48 +49 @@
     AnchorRole_MachineLocation,
     AnchorRole_OSType,
+    AnchorRole_BaseMemory,
     AnchorRole_Storage,
 };
@@ -150 +152 @@
     m_pTextPane->setAnchorRoleRestricted("#machine_location", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#os_type", cal != ConfigurationAccessLevel_Full);
+    m_pTextPane->setAnchorRoleRestricted("#base_memory", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#mount", cal == ConfigurationAccessLevel_Null);
     m_pTextPane->setAnchorRoleRestricted("#attach", cal != ConfigurationAccessLevel_Full);
@@ -432 +435 @@
     roles["#machine_location"] = AnchorRole_MachineLocation;
     roles["#os_type"] = AnchorRole_OSType;
+    roles["#base_memory"] = AnchorRole_BaseMemory;
     roles["#mount"] = AnchorRole_Storage;
     roles["#attach"] = AnchorRole_Storage;
@@ -497 +501 @@
             break;
         }
+        case AnchorRole_BaseMemory:
+        {
+            /* Prepare popup: */
+            QPointer<QIDialogContainer> pPopup = new QIDialogContainer(0, Qt::Tool);
+            if (pPopup)
+            {
+                /* Prepare editor: */
+                UIBaseMemoryEditor *pEditor = new UIBaseMemoryEditor(pPopup);
+                if (pEditor)
+                {
+                    pEditor->setValue(strData.section(',', 0, 0).toInt());
+                    connect(pEditor, &UIBaseMemoryEditor::sigValidChanged,
+                            pPopup, &QIDialogContainer::setOkButtonEnabled);
+                    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_BaseMemory, QVariant::fromValue(pEditor->value()));
+
+                /* Delete popup: */
+                delete pPopup;
+            }
+            break;
+        }
         case AnchorRole_Storage:
         {