Changeset 66365 in vbox

Timestamp:

Mar 30, 2017 2:06:36 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings: Parallel Port page: Proper loading, caching, saving.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsParallel.cpp (modified) (18 diffs)
• UIMachineSettingsParallel.h (modified) (1 diff)

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

@@ -81 +81 @@
 {
     /** Constructs data. */
-    UIDataSettingsMachineParallel() {}
+    UIDataSettingsMachineParallel()
+        : m_ports(QList<UIDataSettingsMachineParallelPort>())
+    {}
 
     /** Returns whether the @a other passed data is equal to this one. */
-    bool operator==(const UIDataSettingsMachineParallel & /* other */) const { return true; }
+    bool equal(const UIDataSettingsMachineParallel &other) const
+    {
+        return true
+               && (m_ports == other.m_ports)
+               ;
+    }
+
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool operator==(const UIDataSettingsMachineParallel &other) const { return equal(other); }
     /** Returns whether the @a other passed data is different from this one. */
-    bool operator!=(const UIDataSettingsMachineParallel & /* other */) const { return false; }
+    bool operator!=(const UIDataSettingsMachineParallel &other) const { return !equal(other); }
+
+    /** Holds the port list. */
+    QList<UIDataSettingsMachineParallelPort> m_ports;
 };
 
@@ -102 +115 @@
     void polishTab();
 
-    void fetchPortData(const UISettingsCacheMachineParallelPort &portCache);
-    void uploadPortData(UISettingsCacheMachineParallelPort &portCache);
-
-    QWidget* setOrderAfter (QWidget *aAfter);
+    void loadPortData(const UIDataSettingsMachineParallelPort &portData);
+    void savePortData(UIDataSettingsMachineParallelPort &portData);
+
+    QWidget *setOrderAfter(QWidget *pAfter);
 
     QString pageTitle() const;
@@ -116 +129 @@
 private slots:
 
-    void mGbParallelToggled (bool aOn);
-    void mCbNumberActivated (const QString &aText);
+    void sltGbParallelToggled(bool fOn);
+    void sltCbNumberActivated(const QString &strText);
 
 private:
@@ -134 +147 @@
 
 UIMachineSettingsParallel::UIMachineSettingsParallel(UIMachineSettingsParallelPage *pParent)
-    : QIWithRetranslateUI<QWidget> (0)
+    : QIWithRetranslateUI<QWidget>(0)
     , m_pParent(pParent)
     , m_iSlot(-1)
 {
-    /* Apply UI decorations */
-    Ui::UIMachineSettingsParallel::setupUi (this);
-
-    /* Setup validation */
-    mLeIRQ->setValidator (new QIULongValidator (0, 255, this));
-    mLeIOPort->setValidator (new QIULongValidator (0, 0xFFFF, this));
-    mLePath->setValidator (new QRegExpValidator (QRegExp (".+"), this));
-
-    /* Setup constraints */
-    mLeIRQ->setFixedWidth (mLeIRQ->fontMetrics().width ("8888"));
-    mLeIOPort->setFixedWidth (mLeIOPort->fontMetrics().width ("8888888"));
-
-    /* Set initial values */
+    /* Apply UI decorations: */
+    Ui::UIMachineSettingsParallel::setupUi(this);
+
+    /* Setup validation: */
+    mLeIRQ->setValidator(new QIULongValidator(0, 255, this));
+    mLeIOPort->setValidator(new QIULongValidator(0, 0xFFFF, this));
+    mLePath->setValidator(new QRegExpValidator(QRegExp(".+"), this));
+
+    /* Setup constraints: */
+    mLeIRQ->setFixedWidth(mLeIRQ->fontMetrics().width("8888"));
+    mLeIOPort->setFixedWidth(mLeIOPort->fontMetrics().width("8888888"));
+
+    /* Set initial values: */
     /* Note: If you change one of the following don't forget retranslateUi. */
-    mCbNumber->insertItem (0, vboxGlobal().toCOMPortName (0, 0));
-    mCbNumber->insertItems (0, vboxGlobal().COMPortNames());
-
-    /* Setup connections */
-    connect (mGbParallel, SIGNAL (toggled (bool)),
-             this, SLOT (mGbParallelToggled (bool)));
-    connect (mCbNumber, SIGNAL (activated (const QString &)),
-             this, SLOT (mCbNumberActivated (const QString &)));
+    mCbNumber->insertItem(0, vboxGlobal().toCOMPortName(0, 0));
+    mCbNumber->insertItems(0, vboxGlobal().COMPortNames());
+
+    /* Setup connections: */
+    connect(mGbParallel, SIGNAL(toggled(bool)),
+            this, SLOT(sltGbParallelToggled(bool)));
+    connect(mCbNumber, SIGNAL(activated(const QString &)),
+            this, SLOT(sltCbNumberActivated(const QString &)));
 
     /* Prepare validation: */
     prepareValidation();
 
-    /* Applying language settings */
+    /* Apply language settings: */
     retranslateUi();
 }
@@ -172 +185 @@
     /* Polish port page: */
     ulong uIRQ, uIOBase;
-    bool fStd = vboxGlobal().toCOMPortNumbers(mCbNumber->currentText(), uIRQ, uIOBase);
+    const bool fStd = vboxGlobal().toCOMPortNumbers(mCbNumber->currentText(), uIRQ, uIOBase);
     mGbParallel->setEnabled(m_pParent->isMachineOffline());
     mLbNumber->setEnabled(m_pParent->isMachineOffline());
@@ -184 +197 @@
 }
 
-void UIMachineSettingsParallel::fetchPortData(const UISettingsCacheMachineParallelPort &portCache)
-{
-    /* Get port data: */
-    const UIDataSettingsMachineParallelPort &portData = portCache.base();
-
+void UIMachineSettingsParallel::loadPortData(const UIDataSettingsMachineParallelPort &portData)
+{
     /* Load port number: */
     m_iSlot = portData.m_iSlot;
@@ -199 +209 @@
     mLePath->setText(portData.m_strPath);
 
-    /* Ensure everything is up-to-date */
-    mGbParallelToggled(mGbParallel->isChecked());
-}
-
-void UIMachineSettingsParallel::uploadPortData(UISettingsCacheMachineParallelPort &portCache)
-{
-    /* Prepare port data: */
-    UIDataSettingsMachineParallelPort portData = portCache.base();
-
+    /* Ensure everything is up-to-date: */
+    sltGbParallelToggled(mGbParallel->isChecked());
+}
+
+void UIMachineSettingsParallel::savePortData(UIDataSettingsMachineParallelPort &portData)
+{
     /* Save port data: */
     portData.m_fPortEnabled = mGbParallel->isChecked();
@@ -213 +220 @@
     portData.m_uIOBase = mLeIOPort->text().toULong(NULL, 0);
     portData.m_strPath = QDir::toNativeSeparators(mLePath->text());
-
-    /* Cache port data: */
-    portCache.cacheCurrentData(portData);
-}
-
-QWidget* UIMachineSettingsParallel::setOrderAfter (QWidget *aAfter)
-{
-    setTabOrder (aAfter, mGbParallel);
-    setTabOrder (mGbParallel, mCbNumber);
-    setTabOrder (mCbNumber, mLeIRQ);
-    setTabOrder (mLeIRQ, mLeIOPort);
-    setTabOrder (mLeIOPort, mLePath);
+}
+
+QWidget *UIMachineSettingsParallel::setOrderAfter(QWidget *pAfter)
+{
+    setTabOrder(pAfter, mGbParallel);
+    setTabOrder(mGbParallel, mCbNumber);
+    setTabOrder(mCbNumber, mLeIRQ);
+    setTabOrder(mLeIRQ, mLeIOPort);
+    setTabOrder(mLeIOPort, mLePath);
     return mLePath;
 }
@@ -236 +240 @@
 {
     ulong a, b;
-    return !vboxGlobal().toCOMPortNumbers (mCbNumber->currentText(), a, b);
+    return !vboxGlobal().toCOMPortNumbers(mCbNumber->currentText(), a, b);
 }
 
 void UIMachineSettingsParallel::retranslateUi()
 {
-    /* Translate uic generated strings */
-    Ui::UIMachineSettingsParallel::retranslateUi (this);
-
-    mCbNumber->setItemText (mCbNumber->count() - 1, vboxGlobal().toCOMPortName (0, 0));
-}
-
-void UIMachineSettingsParallel::mGbParallelToggled (bool aOn)
-{
-    if (aOn)
-        mCbNumberActivated (mCbNumber->currentText());
+    /* Translate uic generated strings: */
+    Ui::UIMachineSettingsParallel::retranslateUi(this);
+
+    mCbNumber->setItemText(mCbNumber->count() - 1, vboxGlobal().toCOMPortName(0, 0));
+}
+
+void UIMachineSettingsParallel::sltGbParallelToggled(bool fOn)
+{
+    if (fOn)
+        sltCbNumberActivated(mCbNumber->currentText());
 
     /* Revalidate: */
@@ -256 +260 @@
 }
 
-void UIMachineSettingsParallel::mCbNumberActivated (const QString &aText)
-{
-    ulong IRQ, IOBase;
-    bool std = vboxGlobal().toCOMPortNumbers (aText, IRQ, IOBase);
-
-    mLeIRQ->setEnabled (!std);
-    mLeIOPort->setEnabled (!std);
-    if (std)
-    {
-        mLeIRQ->setText (QString::number (IRQ));
-        mLeIOPort->setText ("0x" + QString::number (IOBase, 16).toUpper());
+void UIMachineSettingsParallel::sltCbNumberActivated(const QString &strText)
+{
+    ulong uIRQ, uIOBase;
+    bool fStd = vboxGlobal().toCOMPortNumbers(strText, uIRQ, uIOBase);
+
+    mLeIRQ->setEnabled(!fStd);
+    mLeIOPort->setEnabled(!fStd);
+    if (fStd)
+    {
+        mLeIRQ->setText(QString::number(uIRQ));
+        mLeIOPort->setText("0x" + QString::number(uIOBase, 16).toUpper());
     }
 
@@ -313 +317 @@
     m_pCache->clear();
 
+    /* Prepare initial data: */
+    UIDataSettingsMachineParallel initialData;
+
     /* For each parallel port: */
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
     {
         /* Prepare port data: */
-        UIDataSettingsMachineParallelPort portData;
+        UIDataSettingsMachineParallelPort initialPortData;
 
         /* Check if port is valid: */
@@ -324 +331 @@
         {
             /* Gather options: */
-            portData.m_iSlot = iSlot;
-            portData.m_fPortEnabled = port.GetEnabled();
-            portData.m_uIRQ = port.GetIRQ();
-            portData.m_uIOBase = port.GetIOBase();
-            portData.m_strPath = port.GetPath();
-        }
-
-        /* Cache port data: */
-        m_pCache->child(iSlot).cacheInitialData(portData);
-    }
+            initialPortData.m_iSlot = iSlot;
+            initialPortData.m_fPortEnabled = port.GetEnabled();
+            initialPortData.m_uIRQ = port.GetIRQ();
+            initialPortData.m_uIOBase = port.GetIOBase();
+            initialPortData.m_strPath = port.GetPath();
+        }
+
+        /* Append initial port data: */
+        initialData.m_ports << initialPortData;
+    }
+
+    /* Cache initial data: */
+    m_pCache->cacheInitialData(initialData);
 
     /* Upload machine to data: */
@@ -342 +352 @@
 {
     /* Setup tab order: */
-    Assert(firstWidget());
+    AssertPtrReturnVoid(firstWidget());
     setTabOrder(firstWidget(), m_pTabWidget->focusProxy());
     QWidget *pLastFocusWidget = m_pTabWidget->focusProxy();
@@ -353 +363 @@
 
         /* Load port data to page: */
-        pPage->fetchPortData(m_pCache->child(iPort));
+        pPage->loadPortData(m_pCache->base().m_ports.at(iPort));
 
         /* Setup tab order: */
@@ -371 +381 @@
 void UIMachineSettingsParallelPage::putToCache()
 {
+    /* Prepare current data: */
+    UIDataSettingsMachineParallel currentData;
+
     /* For each parallel port: */
     for (int iPort = 0; iPort < m_pTabWidget->count(); ++iPort)
     {
         /* Getting port page: */
-        UIMachineSettingsParallel *pPage = qobject_cast<UIMachineSettingsParallel*>(m_pTabWidget->widget(iPort));
-
-        /* Gather & cache port data: */
-        pPage->uploadPortData(m_pCache->child(iPort));
-    }
+        UIMachineSettingsParallel *pTab = qobject_cast<UIMachineSettingsParallel*>(m_pTabWidget->widget(iPort));
+
+        /* Prepare current port data: */
+        UIDataSettingsMachineParallelPort currentPortData;
+
+        /* Gather current port data: */
+        pTab->savePortData(currentPortData);
+
+        /* Cache current port data: */
+        currentData.m_ports << currentPortData;
+    }
+
+    /* Cache current data: */
+    m_pCache->cacheCurrentData(currentData);
 }
 
@@ -394 +416 @@
         {
             /* Check if port data was changed: */
-            const UISettingsCacheMachineParallelPort &portCache = m_pCache->child(iPort);
-            if (portCache.wasChanged())
+            const UIDataSettingsMachineParallelPort &initialPortData = m_pCache->base().m_ports.at(iPort);
+            const UIDataSettingsMachineParallelPort &currentPortData = m_pCache->data().m_ports.at(iPort);
+            if (currentPortData != initialPortData)
             {
                 /* Check if port still valid: */
@@ -401 +424 @@
                 if (!port.isNull())
                 {
-                    /* Get port data from cache: */
-                    const UIDataSettingsMachineParallelPort &portData = portCache.data();
-
-                    /* Store adapter data: */
+                    /* Store port data: */
                     if (isMachineOffline())
                     {
-                        port.SetIRQ(portData.m_uIRQ);
-                        port.SetIOBase(portData.m_uIOBase);
-                        port.SetPath(portData.m_strPath);
-                        port.SetEnabled(portData.m_fPortEnabled);
+                        /* 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);
+                        /* Port path: */
+                        if (   port.isOk()
+                            && currentPortData.m_strPath != initialPortData.m_strPath)
+                            port.SetPath(currentPortData.m_strPath);
                     }
                 }
@@ -503 +535 @@
     {
         m_pTabWidget->setTabEnabled(iPort,
-                                  isMachineOffline() ||
-                                  (isMachineInValidMode() && m_pCache->child(iPort).base().m_fPortEnabled));
+                                    isMachineOffline() ||
+                                    (isMachineInValidMode() && m_pCache->base().m_ports.at(iPort).m_fPortEnabled));
         UIMachineSettingsParallel *pTab = qobject_cast<UIMachineSettingsParallel*>(m_pTabWidget->widget(iPort));
         pTab->polishTab();

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

@@ -27 +27 @@
 class UIMachineSettingsParallelPage;
 struct UIDataSettingsMachineParallel;
-struct UIDataSettingsMachineParallelPort;
-typedef UISettingsCache<UIDataSettingsMachineParallelPort> UISettingsCacheMachineParallelPort;
-typedef UISettingsCachePool<UIDataSettingsMachineParallel, UISettingsCacheMachineParallelPort> UISettingsCacheMachineParallel;
+typedef UISettingsCache<UIDataSettingsMachineParallel> UISettingsCacheMachineParallel;