Changeset 96877 in vbox for trunk

Timestamp:

Sep 26, 2022 4:31:17 PM (2 years ago)

Author:

vboxsync

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

153784

Message:

FE/Qt: bugref:10293: A bit of reordering on Machine settings / System page to make sure EFI and secure boot stuff goes the last one.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors

Files:

• UIMotherboardFeaturesEditor.cpp (modified) (8 diffs)
• UIMotherboardFeaturesEditor.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMotherboardFeaturesEditor.cpp

@@ -38 +38 @@
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fEnableIoApic(false)
+    , m_fEnableUtcTime(false)
     , m_fEnableEfi(false)
     , m_fEnableSecureBoot(false)
-    , m_fEnableUtcTime(false)
     , m_pLabel(0)
     , m_pCheckBoxEnableIoApic(0)
+    , m_pCheckBoxEnableUtcTime(0)
     , m_pCheckBoxEnableEfi(0)
     , m_pCheckBoxEnableSecureBoot(0)
-    , m_pCheckBoxEnableUtcTime(0)
 {
     prepare();
@@ -69 +69 @@
 }
 
+void UIMotherboardFeaturesEditor::setEnableUtcTime(bool fOn)
+{
+    /* Update cached value and
+     * check-box if value has changed: */
+    if (m_fEnableUtcTime != fOn)
+    {
+        m_fEnableUtcTime = fOn;
+        if (m_pCheckBoxEnableUtcTime)
+            m_pCheckBoxEnableUtcTime->setCheckState(m_fEnableUtcTime ? Qt::Checked : Qt::Unchecked);
+    }
+}
+
+bool UIMotherboardFeaturesEditor::isEnabledUtcTime() const
+{
+    return   m_pCheckBoxEnableUtcTime
+           ? m_pCheckBoxEnableUtcTime->checkState() == Qt::Checked
+           : m_fEnableUtcTime;
+}
+
 void UIMotherboardFeaturesEditor::setEnableEfi(bool fOn)
 {
@@ -105 +124 @@
            ? m_pCheckBoxEnableSecureBoot->checkState() == Qt::Checked
            : m_fEnableSecureBoot;
-}
-
-void UIMotherboardFeaturesEditor::setEnableUtcTime(bool fOn)
-{
-    /* Update cached value and
-     * check-box if value has changed: */
-    if (m_fEnableUtcTime != fOn)
-    {
-        m_fEnableUtcTime = fOn;
-        if (m_pCheckBoxEnableUtcTime)
-            m_pCheckBoxEnableUtcTime->setCheckState(m_fEnableUtcTime ? Qt::Checked : Qt::Unchecked);
-    }
-}
-
-bool UIMotherboardFeaturesEditor::isEnabledUtcTime() const
-{
-    return   m_pCheckBoxEnableUtcTime
-           ? m_pCheckBoxEnableUtcTime->checkState() == Qt::Checked
-           : m_fEnableUtcTime;
 }
 
@@ -148 +148 @@
                                                "after having installed a Windows guest operating system!"));
     }
+    if (m_pCheckBoxEnableUtcTime)
+    {
+        m_pCheckBoxEnableUtcTime->setText(tr("Enable Hardware Clock in &UTC Time"));
+        m_pCheckBoxEnableUtcTime->setToolTip(tr("When checked, the RTC device will report the time in UTC, otherwise in local "
+                                                "(host) time. Unix usually expects the hardware clock to be set to UTC."));
+    }
     if (m_pCheckBoxEnableEfi)
     {
@@ -160 +166 @@
         m_pCheckBoxEnableSecureBoot->setToolTip(tr("When checked, the secure boot emulation will be enabled."));
     }
-    if (m_pCheckBoxEnableUtcTime)
-    {
-        m_pCheckBoxEnableUtcTime->setText(tr("Hardware Clock in &UTC Time"));
-        m_pCheckBoxEnableUtcTime->setToolTip(tr("When checked, the RTC device will report the time in UTC, otherwise in local "
-                                                "(host) time. Unix usually expects the hardware clock to be set to UTC."));
-    }
 }
 
@@ -205 +205 @@
             m_pLayout->addWidget(m_pCheckBoxEnableIoApic, 0, 1);
         }
+        /* Prepare 'enable UTC time' check-box: */
+        m_pCheckBoxEnableUtcTime = new QCheckBox(this);
+        if (m_pCheckBoxEnableUtcTime)
+        {
+            connect(m_pCheckBoxEnableUtcTime, &QCheckBox::stateChanged,
+                    this, &UIMotherboardFeaturesEditor::sigChangedUtcTime);
+            m_pLayout->addWidget(m_pCheckBoxEnableUtcTime, 1, 1);
+        }
         /* Prepare 'enable EFI' check-box: */
         m_pCheckBoxEnableEfi = new QCheckBox(this);
@@ -211 +219 @@
             connect(m_pCheckBoxEnableEfi, &QCheckBox::stateChanged,
                     this, &UIMotherboardFeaturesEditor::sltHandleEnableEfiToggling);
-            m_pLayout->addWidget(m_pCheckBoxEnableEfi, 1, 1);
+            m_pLayout->addWidget(m_pCheckBoxEnableEfi, 2, 1);
         }
         /* Prepare 'enable secure boot' check-box: */
@@ -219 +227 @@
             connect(m_pCheckBoxEnableSecureBoot, &QCheckBox::stateChanged,
                     this, &UIMotherboardFeaturesEditor::sigChangedSecureBoot);
-            m_pLayout->addWidget(m_pCheckBoxEnableSecureBoot, 2, 1);
-        }
-        /* Prepare 'enable UTC time' check-box: */
-        m_pCheckBoxEnableUtcTime = new QCheckBox(this);
-        if (m_pCheckBoxEnableUtcTime)
-        {
-            connect(m_pCheckBoxEnableUtcTime, &QCheckBox::stateChanged,
-                    this, &UIMotherboardFeaturesEditor::sigChangedUtcTime);
-            m_pLayout->addWidget(m_pCheckBoxEnableUtcTime, 3, 1);
+            m_pLayout->addWidget(m_pCheckBoxEnableSecureBoot, 3, 1);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMotherboardFeaturesEditor.h

@@ -49 +49 @@
     /** Notifies listeners about IO APIC change. */
     void sigChangedIoApic();
+    /** Notifies listeners about UTC time change. */
+    void sigChangedUtcTime();
     /** Notifies listeners about EFI change. */
     void sigChangedEfi();
     /** Notifies listeners about secure boot change. */
     void sigChangedSecureBoot();
-    /** Notifies listeners about UTC time change. */
-    void sigChangedUtcTime();
 
 public:
@@ -66 +66 @@
     bool isEnabledIoApic() const;
 
+    /** Defines whether 'enable UTC time' feature in @a fOn. */
+    void setEnableUtcTime(bool fOn);
+    /** Returns 'enable UTC time' feature value. */
+    bool isEnabledUtcTime() const;
+
     /** Defines whether 'enable EFI' feature in @a fOn. */
     void setEnableEfi(bool fOn);
@@ -75 +80 @@
     /** Returns 'enable secure boot' feature value. */
     bool isEnabledSecureBoot() const;
-
-    /** Defines whether 'enable UTC time' feature in @a fOn. */
-    void setEnableUtcTime(bool fOn);
-    /** Returns 'enable UTC time' feature value. */
-    bool isEnabledUtcTime() const;
 
     /** Returns minimum layout hint. */
@@ -105 +105 @@
         /** Holds the 'enable IO APIC' feature value. */
         bool  m_fEnableIoApic;
+        /** Holds the 'enable UTC time' feature value. */
+        bool  m_fEnableUtcTime;
         /** Holds the 'enable EFI' feature value. */
         bool  m_fEnableEfi;
         /** Holds the 'enable secure boot' feature value. */
         bool  m_fEnableSecureBoot;
-        /** Holds the 'enable UTC time' feature value. */
-        bool  m_fEnableUtcTime;
     /** @} */
 
@@ -121 +121 @@
         /** Holds the 'enable IO APIC' check-box instance. */
         QCheckBox   *m_pCheckBoxEnableIoApic;
+        /** Holds the 'enable UTC time' check-box instance. */
+        QCheckBox   *m_pCheckBoxEnableUtcTime;
         /** Holds the 'enable EFI' check-box instance. */
         QCheckBox   *m_pCheckBoxEnableEfi;
-        /** Holds the 'secure boot' check-box instance. */
+        /** Holds the 'enable secure boot' check-box instance. */
         QCheckBox   *m_pCheckBoxEnableSecureBoot;
-        /** Holds the 'enable UTC time' check-box instance. */
-        QCheckBox   *m_pCheckBoxEnableUtcTime;
     /** @} */
 };