Changeset 66442 in vbox

Timestamp:

Apr 5, 2017 2:17:49 PM (8 years ago)

Author:

vboxsync

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

114413

Message:

FE/Qt: Machine settings: Serial Port page: Proper loading, caching, saving (2nd iteration, s.a. r114309).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp (modified) (6 diffs)

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

@@ -365 +365 @@
     m_pCache->clear();
 
-    /* Prepare initial data: */
-    UIDataSettingsMachineSerial initialData;
-
-    /* For each serial port: */
+    /* Prepare old parallel data: */
+    UIDataSettingsMachineSerial oldSerialData;
+
+    /* For each port: */
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
     {
-        /* Prepare port data: */
-        UIDataSettingsMachineSerialPort initialPortData;
-
-        /* Check if port is valid: */
-        const CSerialPort &port = m_machine.GetSerialPort(iSlot);
-        if (!port.isNull())
+        /* Prepare old port data: */
+        UIDataSettingsMachineSerialPort oldPortData;
+
+        /* Check whether port is valid: */
+        const CSerialPort &comPort = m_machine.GetSerialPort(iSlot);
+        if (!comPort.isNull())
         {
-            /* Gather options: */
-            initialPortData.m_iSlot = iSlot;
-            initialPortData.m_fPortEnabled = port.GetEnabled();
-            initialPortData.m_uIRQ = port.GetIRQ();
-            initialPortData.m_uIOBase = port.GetIOBase();
-            initialPortData.m_hostMode = port.GetHostMode();
-            initialPortData.m_fServer = port.GetServer();
-            initialPortData.m_strPath = port.GetPath();
+            /* Gather old port data: */
+            oldPortData.m_iSlot = iSlot;
+            oldPortData.m_fPortEnabled = comPort.GetEnabled();
+            oldPortData.m_uIRQ = comPort.GetIRQ();
+            oldPortData.m_uIOBase = comPort.GetIOBase();
+            oldPortData.m_hostMode = comPort.GetHostMode();
+            oldPortData.m_fServer = comPort.GetServer();
+            oldPortData.m_strPath = comPort.GetPath();
         }
 
-        /* Append initial port data: */
-        initialData.m_ports << initialPortData;
-    }
-
-    /* Cache initial data: */
-    m_pCache->cacheInitialData(initialData);
+        /* Cache old port data: */
+        oldSerialData.m_ports << oldPortData;
+    }
+
+    /* Cache old serial data: */
+    m_pCache->cacheInitialData(oldSerialData);
 
     /* Upload machine to data: */
@@ -406 +406 @@
     QWidget *pLastFocusWidget = m_pTabWidget->focusProxy();
 
-    /* For each serial port: */
+    /* For each port: */
     for (int iPort = 0; iPort < m_pTabWidget->count(); ++iPort)
     {
@@ -412 +412 @@
         UIMachineSettingsSerial *pPage = qobject_cast<UIMachineSettingsSerial*>(m_pTabWidget->widget(iPort));
 
-        /* Load port data to page: */
+        /* Load old port data to the page: */
         pPage->loadPortData(m_pCache->base().m_ports.at(iPort));
 
@@ -431 +431 @@
 void UIMachineSettingsSerialPage::putToCache()
 {
-    /* Prepare current data: */
-    UIDataSettingsMachineSerial currentData;
-
-    /* For each serial port: */
+    /* Prepare new serial data: */
+    UIDataSettingsMachineSerial newSerialData;
+
+    /* For each port: */
     for (int iPort = 0; iPort < m_pTabWidget->count(); ++iPort)
     {
@@ -440 +440 @@
         UIMachineSettingsSerial *pTab = qobject_cast<UIMachineSettingsSerial*>(m_pTabWidget->widget(iPort));
 
-        /* Prepare current port data: */
-        UIDataSettingsMachineSerialPort currentPortData;
-
-        /* Gather current port data: */
-        pTab->savePortData(currentPortData);
-
-        /* Cache current port data: */
-        currentData.m_ports << currentPortData;
-    }
-
-    /* Cache current data: */
-    m_pCache->cacheCurrentData(currentData);
+        /* Prepare new port data: */
+        UIDataSettingsMachineSerialPort newPortData;
+
+        /* Gather new port data: */
+        pTab->savePortData(newPortData);
+
+        /* Cache new port data: */
+        newSerialData.m_ports << newPortData;
+    }
+
+    /* Cache new serial data: */
+    m_pCache->cacheCurrentData(newSerialData);
 }
 
@@ -459 +459 @@
     UISettingsPageMachine::fetchData(data);
 
-    /* Check if ports data was changed: */
-    if (m_pCache->wasChanged())
+    /* Make sure machine is offline & serial data was changed: */
+    if (isMachineOffline() && m_pCache->wasChanged())
     {
         /* For each serial port: */
         for (int iPort = 0; iPort < m_pTabWidget->count(); ++iPort)
         {
-            /* Check if port data was changed: */
-            const UIDataSettingsMachineSerialPort &initialPortData = m_pCache->base().m_ports.at(iPort);
-            const UIDataSettingsMachineSerialPort &currentPortData = m_pCache->data().m_ports.at(iPort);
-            if (currentPortData != initialPortData)
+            /* Get old serial data from the cache: */
+            const UIDataSettingsMachineSerialPort &oldPortData = m_pCache->base().m_ports.at(iPort);
+            /* Get new serial data from the cache: */
+            const UIDataSettingsMachineSerialPort &newPortData = m_pCache->data().m_ports.at(iPort);
+
+            /* Make sure port data was changed: */
+            if (newPortData != oldPortData)
             {
                 /* Check if port still valid: */
-                CSerialPort port = m_machine.GetSerialPort(iPort);
-                if (!port.isNull())
+                CSerialPort comPort = m_machine.GetSerialPort(iPort);
+                /* Store new adapter data: */
+                if (!comPort.isNull())
                 {
-                    /* Store adapter data: */
-                    if (isMachineOffline())
-                    {
-                        /* Whether the port is enabled: */
-                        if (   port.isOk()
-                            && currentPortData.m_fPortEnabled != initialPortData.m_fPortEnabled)
-                            port.SetEnabled(currentPortData.m_fPortEnabled);
-                        /* Port IRQ: */
-                        if (   port.isOk()
-                            && currentPortData.m_uIRQ != initialPortData.m_uIRQ)
-                            port.SetIRQ(currentPortData.m_uIRQ);
-                        /* Port IO base: */
-                        if (   port.isOk()
-                            && currentPortData.m_uIOBase != initialPortData.m_uIOBase)
-                            port.SetIOBase(currentPortData.m_uIOBase);
-                        /* Whether the port is server: */
-                        if (   port.isOk()
-                            && currentPortData.m_fServer != initialPortData.m_fServer)
-                            port.SetServer(currentPortData.m_fServer);
-                        /* Port path: */
-                        if (   port.isOk()
-                            && currentPortData.m_strPath != initialPortData.m_strPath)
-                            port.SetPath(currentPortData.m_strPath);
-                        /* This *must* be last. The host mode will be changed to disconnected if
-                         * some of the necessary settings above will not meet the requirements for
-                         * the selected mode. */
-                        if (   port.isOk()
-                            && currentPortData.m_hostMode != initialPortData.m_hostMode)
-                            port.SetHostMode(currentPortData.m_hostMode);
-                    }
+                    /* Whether the port is enabled: */
+                    if (   comPort.isOk()
+                        && newPortData.m_fPortEnabled != oldPortData.m_fPortEnabled)
+                        comPort.SetEnabled(newPortData.m_fPortEnabled);
+                    /* Port IRQ: */
+                    if (   comPort.isOk()
+                        && newPortData.m_uIRQ != oldPortData.m_uIRQ)
+                        comPort.SetIRQ(newPortData.m_uIRQ);
+                    /* Port IO base: */
+                    if (   comPort.isOk()
+                        && newPortData.m_uIOBase != oldPortData.m_uIOBase)
+                        comPort.SetIOBase(newPortData.m_uIOBase);
+                    /* Whether the port is server: */
+                    if (   comPort.isOk()
+                        && newPortData.m_fServer != oldPortData.m_fServer)
+                        comPort.SetServer(newPortData.m_fServer);
+                    /* Port path: */
+                    if (   comPort.isOk()
+                        && newPortData.m_strPath != oldPortData.m_strPath)
+                        comPort.SetPath(newPortData.m_strPath);
+                    /* This *must* be last. The host mode will be changed to disconnected if
+                     * some of the necessary settings above will not meet the requirements for
+                     * the selected mode. */
+                    if (   comPort.isOk()
+                        && newPortData.m_hostMode != oldPortData.m_hostMode)
+                        comPort.SetHostMode(newPortData.m_hostMode);
                 }
             }