Changeset 94757 in vbox for trunk/src

Timestamp:

Apr 29, 2022 9:40:45 AM (3 years ago)

Author:

vboxsync

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

151139

Message:

FE/Qt/Ds: bugref:10205: Reworking settings page interface to hold IHost wrapper providing required IUpdateAgent facility.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• settings/UISettingsDialogSpecific.cpp (modified) (2 diffs)
• settings/UISettingsPage.cpp (modified) (2 diffs)
• settings/UISettingsPage.h (modified) (5 diffs)

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

@@ -692 +692 @@
           UIErrorString::formatErrorInfo(machine));
     return false;
+}
+
+void UIMessageCenter::cannotSetHostSettings(const CHost &comHost, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Critical,
+          tr("Failed to set global host settings."),
+          UIErrorString::formatErrorInfo(comHost));
 }
 

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

@@ -283 +283 @@
                                  bool fMount, bool fRetry, QWidget *pParent = 0) const;
 
+        void cannotSetHostSettings(const CHost &comHost, QWidget *pParent = 0) const;
         void cannotSetSystemProperties(const CSystemProperties &properties, QWidget *pParent = 0) const;
         void cannotSaveMachineSettings(const CMachine &machine, QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -124 +124 @@
 void UISettingsDialogGlobal::loadOwnData()
 {
-    /* Get properties: */
+    /* Get host & properties: */
+    CHost comHost = uiCommon().host();
     CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
     /* Prepare global data: */
     qRegisterMetaType<UISettingsDataGlobal>();
-    UISettingsDataGlobal data(comProperties);
+    UISettingsDataGlobal data(comHost, comProperties);
     QVariant varData = QVariant::fromValue(data);
 
@@ -137 +138 @@
 void UISettingsDialogGlobal::saveOwnData()
 {
-    /* Get properties: */
+    /* Get host & properties: */
+    CHost comHost = uiCommon().host();
     CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
     /* Prepare global data: */
     qRegisterMetaType<UISettingsDataGlobal>();
-    UISettingsDataGlobal data(comProperties);
+    UISettingsDataGlobal data(comHost, comProperties);
     QVariant varData = QVariant::fromValue(data);
 
     /* Call to base-class: */
     UISettingsDialog::saveData(varData);
+
+    /* Get updated host: */
+    CHost comNewHost = varData.value<UISettingsDataGlobal>().m_host;
+    /* If host is not OK => show the error: */
+    if (!comNewHost.isOk())
+        msgCenter().cannotSetHostSettings(comNewHost, this);
 
     /* Get updated properties: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp

@@ -95 +95 @@
 void UISettingsPageGlobal::fetchData(const QVariant &data)
 {
-    /* Fetch data to m_properties: */
+    /* Fetch data to m_host & m_properties: */
+    m_host = data.value<UISettingsDataGlobal>().m_host;
     m_properties = data.value<UISettingsDataGlobal>().m_properties;
 }
@@ -101 +102 @@
 void UISettingsPageGlobal::uploadData(QVariant &data) const
 {
-    /* Upload m_properties to data: */
-    data = QVariant::fromValue(UISettingsDataGlobal(m_properties));
+    /* Upload m_host & m_properties to data: */
+    data = QVariant::fromValue(UISettingsDataGlobal(m_host, m_properties));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h

@@ -34 +34 @@
 #include "COMEnums.h"
 #include "CConsole.h"
+#include "CHost.h"
 #include "CMachine.h"
 #include "CSystemProperties.h"
@@ -53 +54 @@
     /** Constructs NULL global settings data struct. */
     UISettingsDataGlobal() {}
-    /** Constructs global settings data struct on the basis of @a comProperties. */
-    UISettingsDataGlobal(const CSystemProperties &comProperties)
-        : m_properties(comProperties) {}
-    /** Holds the global VirtualBox properties. */
-    CSystemProperties m_properties;
+    /** Constructs global settings data struct on the basis of @a comHost and @a comProperties. */
+    UISettingsDataGlobal(const CHost &comHost, const CSystemProperties &comProperties)
+        : m_host(comHost), m_properties(comProperties) {}
+    /** Holds the host reference. */
+    CHost              m_host;
+    /** Holds the properties reference. */
+    CSystemProperties  m_properties;
 };
 Q_DECLARE_METATYPE(UISettingsDataGlobal);
@@ -71 +74 @@
         : m_machine(comMachine), m_console(comConsole) {}
     /** Holds the machine reference. */
-    CMachine m_machine;
+    CMachine  m_machine;
     /** Holds the console reference. */
-    CConsole m_console;
+    CConsole  m_console;
 };
 Q_DECLARE_METATYPE(UISettingsDataMachine);
@@ -234 +237 @@
     void uploadData(QVariant &data) const;
 
+    /** Holds the source of host preferences. */
+    CHost              m_host;
     /** Holds the source of global preferences. */
-    CSystemProperties m_properties;
+    CSystemProperties  m_properties;
 };
 
@@ -264 +269 @@
 
     /** Holds the source of machine settings. */
-    CMachine m_machine;
+    CMachine  m_machine;
     /** Holds the source of console settings. */
-    CConsole m_console;
+    CConsole  m_console;
 };