Changeset 66475 in vbox

Timestamp:

Apr 7, 2017 2:38:57 PM (8 years ago)

Author:

vboxsync

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

114464

Message:

FE/Qt: Machine settings: Audio page: Error handling (settings save).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• settings/machine/UIMachineSettingsAudio.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsAudio.h (modified) (1 diff)

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

@@ -57 +57 @@
 
 /* COM includes: */
+# include "CAudioAdapter.h"
 # include "CConsole.h"
 # include "CMachine.h"
@@ -1150 +1151 @@
                           QString() /* cancel button text */,
                           false /* ok button by default? */);
+}
+
+void UIMessageCenter::cannotSaveAudioSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)
+{
+    error(pParent, MessageType_Error,
+          tr("Cannot save audio settings."),
+          formatErrorInfo(comMachine));
+}
+
+void UIMessageCenter::cannotSaveAudioAdapterSettings(const CAudioAdapter &comAdapter, QWidget *pParent /* = 0 */)
+{
+    error(pParent, MessageType_Error,
+          tr("Cannot save audio adapter settings."),
+          formatErrorInfo(comAdapter));
 }
 

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

@@ -239 +239 @@
     int confirmFloppyAttachmentCreation(const QString &strControllerName, QWidget *pParent = 0) const;
     int confirmRemovingOfLastDVDDevice(QWidget *pParent = 0) const;
+    void cannotSaveAudioSettings(const CMachine &comMachine, QWidget *pParent = 0);
+    void cannotSaveAudioAdapterSettings(const CAudioAdapter &comAdapter, QWidget *pParent = 0);
     void cannotAttachDevice(const CMachine &machine, UIMediumType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0);
     bool warnAboutIncorrectPort(QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp

@@ -23 +23 @@
 # include "UIConverter.h"
 # include "UIMachineSettingsAudio.h"
+# include "UIMessageCenter.h"
 
 /* COM includes: */
@@ -143 +144 @@
     UISettingsPageMachine::fetchData(data);
 
-    /* Make sure machine is offline & audio data was changed: */
-    if (isMachineOffline() && m_pCache->wasChanged())
-    {
-        /* Check whether adapter still valid: */
-        CAudioAdapter comAdapter = m_machine.GetAudioAdapter();
-        if (!comAdapter.isNull())
-        {
-            /* Get old audio data from the cache: */
-            const UIDataSettingsMachineAudio &oldAudioData = m_pCache->base();
-            /* Get new audio data from the cache: */
-            const UIDataSettingsMachineAudio &newAudioData = m_pCache->data();
-
-            /* Store whether audio is enabled: */
-            if (newAudioData.m_fAudioEnabled != oldAudioData.m_fAudioEnabled)
-                comAdapter.SetEnabled(newAudioData.m_fAudioEnabled);
-            /* Store audio driver type: */
-            if (newAudioData.m_audioDriverType != oldAudioData.m_audioDriverType)
-                comAdapter.SetAudioDriver(newAudioData.m_audioDriverType);
-            /* Store audio controller type: */
-            if (newAudioData.m_audioControllerType != oldAudioData.m_audioControllerType)
-                comAdapter.SetAudioController(newAudioData.m_audioControllerType);
-        }
-    }
+    /* Update audio data and failing state: */
+    setFailed(!saveAudioData());
 
     /* Upload machine to data: */
@@ -275 +255 @@
 }
 
+bool UIMachineSettingsAudio::saveAudioData()
+{
+    /* Prepare result: */
+    bool fSuccess = true;
+    /* Save audio settings from the cache: */
+    if (fSuccess && isMachineInValidMode() && m_pCache->wasChanged())
+    {
+        /* Get old audio data from the cache: */
+        const UIDataSettingsMachineAudio &oldAudioData = m_pCache->base();
+        /* Get new audio data from the cache: */
+        const UIDataSettingsMachineAudio &newAudioData = m_pCache->data();
+
+        /* Get audio adapter for further activities: */
+        CAudioAdapter comAdapter = m_machine.GetAudioAdapter();
+        fSuccess = m_machine.isOk() && comAdapter.isNotNull();
+        /* Show error message if necessary: */
+        if (!fSuccess)
+            msgCenter().cannotSaveAudioSettings(m_machine, this);
+
+        /* Save whether audio is enabled: */
+        if (fSuccess && isMachineOffline() && newAudioData.m_fAudioEnabled != oldAudioData.m_fAudioEnabled)
+        {
+            comAdapter.SetEnabled(newAudioData.m_fAudioEnabled);
+            fSuccess = comAdapter.isOk();
+        }
+        /* Save audio driver type: */
+        if (fSuccess && isMachineOffline() && newAudioData.m_audioDriverType != oldAudioData.m_audioDriverType)
+        {
+            comAdapter.SetAudioDriver(newAudioData.m_audioDriverType);
+            fSuccess = comAdapter.isOk();
+        }
+        /* Save audio controller type: */
+        if (fSuccess && isMachineOffline() && newAudioData.m_audioControllerType != oldAudioData.m_audioControllerType)
+        {
+            comAdapter.SetAudioController(newAudioData.m_audioControllerType);
+            fSuccess = comAdapter.isOk();
+        }
+        /* Show error message if necessary: */
+        if (!fSuccess)
+            msgCenter().cannotSaveAudioAdapterSettings(comAdapter, this);
+    }
+    /* Return result: */
+    return fSuccess;
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h

@@ -73 +73 @@
     void cleanup();
 
+    /** Saves existing audio data from the cache. */
+    bool saveAudioData();
+
     /** Holds the page data cache instance. */
     UISettingsCacheMachineAudio *m_pCache;