Changeset 79940 in vbox for trunk

Timestamp:

Jul 23, 2019 6:21:43 PM (6 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (1 diff)
• globals/UIMachineAttributeSetter.cpp (modified) (1 diff)
• globals/UIMachineAttributeSetter.h (modified) (1 diff)
• manager/details/UIDetailsElement.cpp (modified) (7 diffs)

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

@@ -81 +81 @@
     /* Settings file location: */
     if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral_Location)
+    {
+        /* Configure hovering anchor: */
+        const QString strAnchorType = QString("machine_location");
+        const QString strMachineLocation = comMachine.GetSettingsFilePath();
         table << UITextTableLine(QApplication::translate("UIDetails", "Settings File Location", "details (general)"),
-                                 QDir::toNativeSeparators(QFileInfo(comMachine.GetSettingsFilePath()).absolutePath()));
+                                 QString("<a href=#%1,%2>%3</a>").arg(strAnchorType,
+                                                                      strMachineLocation,
+                                                                      QDir::toNativeSeparators(QFileInfo(strMachineLocation).absolutePath())));
+    }
 
     /* Groups: */

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

@@ -55 +55 @@
                 break;
             }
+            case MachineAttribute_Location:
+            {
+                /* Do not save machine settings: */
+                fSaveSettings = false;
+                /* Prepare machine move progress: */
+                CProgress comProgress = comMachine.MoveTo(guiAttribute.toString(), "basic");
+                if (!comMachine.isOk())
+                {
+                    msgCenter().cannotMoveMachine(comMachine);
+                    fErrorHappened = true;
+                    break;
+                }
+                /* Show machine move progress: */
+                msgCenter().showModalProgressDialog(comProgress, comMachine.GetName(), ":/progress_clone_90px.png");
+                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+                {
+                    msgCenter().cannotMoveMachine(comProgress, comMachine.GetName());
+                    fErrorHappened = true;
+                    break;
+                }
+                break;
+            }
             case MachineAttribute_OSType:
             {

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

@@ -32 +32 @@
     MachineAttribute_Name,
     MachineAttribute_OSType,
+    MachineAttribute_Location,
 };
 

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

@@ -46 +46 @@
     AnchorRole_Invalid,
     AnchorRole_MachineName,
+    AnchorRole_MachineLocation,
     AnchorRole_OSType,
     AnchorRole_Storage,
@@ -147 +148 @@
     ConfigurationAccessLevel cal = m_pSet->configurationAccessLevel();
     m_pTextPane->setAnchorRoleRestricted("#machine_name", cal != ConfigurationAccessLevel_Full);
+    m_pTextPane->setAnchorRoleRestricted("#machine_location", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#os_type", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#mount", cal == ConfigurationAccessLevel_Null);
@@ -428 +430 @@
     QMap<QString, AnchorRole> roles;
     roles["#machine_name"] = AnchorRole_MachineName;
+    roles["#machine_location"] = AnchorRole_MachineLocation;
     roles["#os_type"] = AnchorRole_OSType;
     roles["#mount"] = AnchorRole_Storage;
@@ -441 +444 @@
     {
         case AnchorRole_MachineName:
+        case AnchorRole_MachineLocation:
         case AnchorRole_OSType:
         {
@@ -451 +455 @@
                     new UINameAndSystemEditor(pPopup,
                                               enmRole == AnchorRole_MachineName /* choose name? */,
-                                              false /* choose path? */,
+                                              enmRole == AnchorRole_MachineLocation /* choose path? */,
                                               enmRole == AnchorRole_OSType /* choose type? */);
                 if (pEditor)
@@ -458 +462 @@
                     {
                         case AnchorRole_MachineName: pEditor->setName(strData.section(',', 0, 0)); break;
+                        case AnchorRole_MachineLocation: pEditor->setPath(strData.section(',', 0, 0)); break;
                         case AnchorRole_OSType: pEditor->setTypeId(strData.section(',', 0, 0)); break;
                         default: break;
@@ -481 +486 @@
                     {
                         case AnchorRole_MachineName: setMachineAttribute(machine(), MachineAttribute_Name, QVariant::fromValue(pEditor->name())); break;
+                        case AnchorRole_MachineLocation: setMachineAttribute(machine(), MachineAttribute_Location, QVariant::fromValue(pEditor->path())); break;
                         case AnchorRole_OSType: setMachineAttribute(machine(), MachineAttribute_OSType, QVariant::fromValue(pEditor->typeId())); break;
                         default: break;