Changeset 54794 in vbox for trunk/src

Timestamp:

Mar 16, 2015 5:16:38 PM (10 years ago)

Author:

vboxsync

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

98989

Message:

FE/Qt: 6660: Advanced extra-data management tool: When saving extra-data changes - choose proper kind of machine depending on machine/session states.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (8 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -46 +46 @@
 # include "UIActionPool.h"
 # include "UIConverter.h"
+# include "UISettingsDefs.h"
+# include "UIMessageCenter.h"
 # ifdef DEBUG
 #  include "VBoxUtils.h"
-#  include "UIMessageCenter.h"
 #  include "UIVirtualBoxEventHandler.h"
 #  include "UIIconPool.h"
@@ -76 +77 @@
 /* Namespaces: */
 using namespace UIExtraDataDefs;
+using namespace UISettingsDefs;
 
 
@@ -1913 +1915 @@
         /* Update global extra-data: */
         vbox.SetExtraData(strKey, strValue);
+        if (!vbox.isOk())
+            msgCenter().cannotSetExtraData(vbox, strKey, strValue);
     }
     /* Machine extra-data: */
@@ -1919 +1923 @@
         /* Search for corresponding machine: */
         CVirtualBox vbox = vboxGlobal().virtualBox();
-        CMachine machine = vbox.FindMachine(strID);
+        const CMachine machine = vbox.FindMachine(strID);
         AssertReturnVoid(vbox.isOk() && !machine.isNull());
+        /* Check the configuration access-level: */
+        const KMachineState machineState = machine.GetState();
+        const KSessionState sessionState = machine.GetSessionState();
+        const ConfigurationAccessLevel cLevel = configurationAccessLevel(sessionState, machineState);
+        /* Prepare machine session: */
+        CSession session;
+        if (cLevel == ConfigurationAccessLevel_Full)
+            session = vboxGlobal().openSession(strID);
+        else
+            session = vboxGlobal().openExistingSession(strID);
+        AssertReturnVoid(!session.isNull());
+        /* Get machine from that session: */
+        CMachine sessionMachine = session.GetMachine();
         /* Update machine extra-data: */
-        machine.SetExtraData(strKey, strValue);
+        sessionMachine.SetExtraData(strKey, strValue);
+        if (!sessionMachine.isOk())
+            msgCenter().cannotSetExtraData(sessionMachine, strKey, strValue);
+        session.UnlockMachine();
     }
 }
@@ -1944 +1964 @@
 }
 
-void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID /* = GlobalID */)
+void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &value, const QString &strID /* = GlobalID */)
 {
     /* Make sure VBoxSVC is available: */
@@ -1958 +1978 @@
 
     /* [Re]cache passed value: */
-    data[strKey] = strValue.join(",");
+    data[strKey] = value.join(",");
 
     /* Global extra-data: */
@@ -1966 +1986 @@
         CVirtualBox vbox = vboxGlobal().virtualBox();
         /* Update global extra-data: */
-        vbox.SetExtraDataStringList(strKey, strValue);
+        vbox.SetExtraDataStringList(strKey, value);
+        if (!vbox.isOk())
+            msgCenter().cannotSetExtraData(vbox, strKey, value.join(","));
     }
     /* Machine extra-data: */
@@ -1973 +1995 @@
         /* Search for corresponding machine: */
         CVirtualBox vbox = vboxGlobal().virtualBox();
-        CMachine machine = vbox.FindMachine(strID);
+        const CMachine machine = vbox.FindMachine(strID);
         AssertReturnVoid(vbox.isOk() && !machine.isNull());
+        /* Check the configuration access-level: */
+        const KMachineState machineState = machine.GetState();
+        const KSessionState sessionState = machine.GetSessionState();
+        const ConfigurationAccessLevel cLevel = configurationAccessLevel(sessionState, machineState);
+        /* Prepare machine session: */
+        CSession session;
+        if (cLevel == ConfigurationAccessLevel_Full)
+            session = vboxGlobal().openSession(strID);
+        else
+            session = vboxGlobal().openExistingSession(strID);
+        AssertReturnVoid(!session.isNull());
+        /* Get machine from that session: */
+        CMachine sessionMachine = session.GetMachine();
         /* Update machine extra-data: */
-        machine.SetExtraDataStringList(strKey, strValue);
+        sessionMachine.SetExtraDataStringList(strKey, value);
+        if (!sessionMachine.isOk())
+            msgCenter().cannotSetExtraData(sessionMachine, strKey, value.join(","));
+        session.UnlockMachine();
     }
 }

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

@@ -124 +124 @@
           * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
         QStringList extraDataStringList(const QString &strKey, const QString &strID = GlobalID);
-        /** Defines extra-data value corresponding to passed @a strKey as strValue.
+        /** Defines extra-data value corresponding to passed @a strKey as value.
           * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-        void setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID = GlobalID);
+        void setExtraDataStringList(const QString &strKey, const QStringList &value, const QString &strID = GlobalID);
     /** @} */
 

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

@@ -514 +514 @@
              "Make sure your desktop environment can properly handle URLs of this type.")
              .arg(strUrl));
+}
+
+void UIMessageCenter::cannotSetExtraData(const CVirtualBox &vbox, const QString &strKey, const QString &strValue)
+{
+    error(0, MessageType_Error,
+          tr("Failed to set the global VirtualBox extra data for key <i>%1</i> to value <i>{%2}</i>.")
+             .arg(strKey, strValue),
+          formatErrorInfo(vbox));
+}
+
+void UIMessageCenter::cannotSetExtraData(const CMachine &machine, const QString &strKey, const QString &strValue)
+{
+    error(0, MessageType_Error,
+          tr("Failed to set the extra data for key <i>%1</i> of machine <i>%2</i> to value <i>{%3}</i>.")
+             .arg(strKey, CMachine(machine).GetName(), strValue),
+          formatErrorInfo(machine));
 }
 

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

@@ -171 +171 @@
     void cannotGetMediaAccessibility(const UIMedium &medium) const;
     void cannotOpenURL(const QString &strUrl) const;
+    void cannotSetExtraData(const CVirtualBox &vbox, const QString &strKey, const QString &strValue);
+    void cannotSetExtraData(const CMachine &machine, const QString &strKey, const QString &strValue);
 
     /* API: Selector warnings: */