Changeset 47253 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 19, 2013 1:01:39 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings: System page: Cleanup/rework (part 1): Comments.

Location:

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

Files:

• UIMachineSettingsSystem.cpp (modified) (21 diffs)
• UIMachineSettingsSystem.h (modified) (7 diffs)

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

@@ -83 +83 @@
     }
 
-    /* Add all available devices types, so we could initially calculate the
-     * right size. */
+    /* Add all available devices types, so we could initially calculate the right size: */
     for (int i = 0; i < m_possibleBootItems.size(); ++i)
     {
@@ -91 +90 @@
     }
 
-    /* Setup validators */
+    /* Setup validators: */
     mLeMemory->setValidator (new QIntValidator (mSlMemory->minRAM(), mSlMemory->maxRAM(), this));
     mLeCPU->setValidator (new QIntValidator (mMinGuestCPU, mMaxGuestCPU, this));
     mLeCPUExecCap->setValidator(new QIntValidator(mMinGuestCPUExecCap, mMaxGuestCPUExecCap, this));
 
-    /* Setup connections */
+    /* Setup RAM connections: */
     connect (mSlMemory, SIGNAL (valueChanged (int)),
              this, SLOT (valueChangedRAM (int)));
@@ -102 +101 @@
              this, SLOT (textChangedRAM (const QString&)));
 
+    /* Setup boot-table connections: */
     connect (mTbBootItemUp, SIGNAL (clicked()),
              mTwBootOrder, SLOT(sltMoveItemUp()));
@@ -109 +109 @@
              this, SLOT (onCurrentBootItemChanged (int)));
 
+    /* Setup CPU connections: */
     connect (mSlCPU, SIGNAL (valueChanged (int)),
              this, SLOT (valueChangedCPU (int)));
     connect (mLeCPU, SIGNAL (textChanged (const QString&)),
              this, SLOT (textChangedCPU (const QString&)));
-
     connect(mSlCPUExecCap, SIGNAL(valueChanged(int)), this, SLOT(sltValueChangedCPUExecCap(int)));
     connect(mLeCPUExecCap, SIGNAL(textChanged(const QString&)), this, SLOT(sltTextChangedCPUExecCap(const QString&)));
 
-    /* Setup iconsets */
+    /* Setup boot-table iconsets: */
     mTbBootItemUp->setIcon(UIIconPool::iconSet(":/list_moveup_16px.png",
                                                ":/list_moveup_disabled_16px.png"));
@@ -124 +124 @@
 
 #ifdef Q_WS_MAC
-    /* We need a little space for the focus rect. */
+    /* We need a little space for the focus rect: */
     mLtBootOrder->setContentsMargins (3, 3, 3, 3);
     mLtBootOrder->setSpacing (3);
 #endif /* Q_WS_MAC */
 
-    /* Limit min/max. size of QLineEdit */
+    /* Limit min/max size of QLineEdit: */
     mLeMemory->setFixedWidthByText (QString().fill ('8', 5));
-    /* Ensure mLeMemory value and validation is updated */
+    /* Ensure mLeMemory value and validation is updated: */
     valueChangedRAM (mSlMemory->value());
 
-    /* Setup cpu slider */
+    /* Setup cpu slider: */
     mSlCPU->setPageStep (1);
     mSlCPU->setSingleStep (1);
     mSlCPU->setTickInterval (1);
-    /* Setup the scale so that ticks are at page step boundaries */
+    /* Setup the scale so that ticks are at page step boundaries: */
     mSlCPU->setMinimum (mMinGuestCPU);
     mSlCPU->setMaximum (mMaxGuestCPU);
     mSlCPU->setOptimalHint (1, hostCPUs);
     mSlCPU->setWarningHint (hostCPUs, mMaxGuestCPU);
-    /* Limit min/max. size of QLineEdit */
+    /* Limit min/max. size of QLineEdit: */
     mLeCPU->setFixedWidthByText(QString().fill('8', 4));
-    /* Ensure mLeMemory value and validation is updated */
+    /* Ensure mLeMemory value and validation is updated: */
     valueChangedCPU (mSlCPU->value());
 
@@ -166 +166 @@
     mCbChipset->insertItem(1, gpConverter->toString(KChipsetType_ICH9), QVariant(KChipsetType_ICH9));
 
-    /* Install global event filter */
+    /* Install global event filter: */
     qApp->installEventFilter (this);
 
-    /* Applying language settings */
+    /* Retranslate finally: */
     retranslateUi();
 }
@@ -283 +283 @@
     mSlCPU->setValue(systemData.m_cCPUCount);
     mSlCPUExecCap->setValue(systemData.m_cCPUExecCap);
-    int iChipsetPositionPos = mCbChipset->findData(systemData.m_chipsetType);
-    mCbChipset->setCurrentIndex(iChipsetPositionPos == -1 ? 0 : iChipsetPositionPos);
+    int iChipsetPosition = mCbChipset->findData(systemData.m_chipsetType);
+    mCbChipset->setCurrentIndex(iChipsetPosition == -1 ? 0 : iChipsetPosition);
 
     /* Polish page finally: */
@@ -384 +384 @@
 void UIMachineSettingsSystem::setValidator (QIWidgetValidator *aVal)
 {
+    /* Configure validation: */
     mValidator = aVal;
     connect (mCbApic, SIGNAL (stateChanged (int)), mValidator, SLOT (revalidate()));
@@ -393 +394 @@
 bool UIMachineSettingsSystem::revalidate (QString &aWarning, QString & /* aTitle */)
 {
+    /* RAM amount test: */
     ulong fullSize = vboxGlobal().host().GetMemorySize();
     if (mSlMemory->value() > (int)mSlMemory->maxRAMAlw())
@@ -415 +417 @@
     }
 
-    /* VCPU amount test */
+    /* VCPU amount test: */
     int totalCPUs = vboxGlobal().host().GetProcessorOnlineCount();
     if (mSlCPU->value() > 2 * totalCPUs)
@@ -437 +439 @@
     }
 
-    /* VCPU IO-APIC test */
+    /* VCPU IO-APIC test: */
     if (mSlCPU->value() > 1 && !mCbApic->isChecked())
     {
@@ -448 +450 @@
     }
 
-    /* VCPU VT-x/AMD-V test */
+    /* VCPU VT-x/AMD-V test: */
     if (mSlCPU->value() > 1 && !mCbVirt->isChecked())
     {
@@ -462 +464 @@
     if (mSlCPUExecCap->value() < (int)mMedGuestCPUExecCap)
     {
-        aWarning = tr("you have set the processor execution cap to a low value. "
-                      "This can make the machine feel slow to respond.");
+        aWarning = tr (
+            "you have set the processor execution cap to a low value. "
+            "This can make the machine feel slow to respond.");
         return true;
     }
 
-    /* Chipset type & IO-APIC test */
+    /* Chipset type & IO-APIC test: */
     if ((KChipsetType)mCbChipset->itemData(mCbChipset->currentIndex()).toInt() == KChipsetType_ICH9 && !mCbApic->isChecked())
     {
@@ -506 +509 @@
     setTabOrder (mCbTCUseUTC, mCbUseAbsHID);
 
-    /* Processor tab-order */
+    /* Processor tab-order: */
     setTabOrder (mCbUseAbsHID, mSlCPU);
     setTabOrder (mSlCPU, mLeCPU);
@@ -513 +516 @@
     setTabOrder(mLeCPUExecCap, mCbPae);
 
-    /* Acceleration tab-order */
+    /* Acceleration tab-order: */
     setTabOrder (mCbPae, mCbVirt);
     setTabOrder (mCbVirt, mCbNestedPaging);
@@ -520 +523 @@
 void UIMachineSettingsSystem::retranslateUi()
 {
-    /* Translate uic generated strings */
+    /* Translate uic generated strings: */
     Ui::UIMachineSettingsSystem::retranslateUi (this);
 
-    /* Readjust the tree widget items size */
+    /* Readjust the tree widget items size: */
     adjustBootOrderTWSize();
 
-    CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties();
-
-    /* Retranslate the memory slider legend */
+    /* Retranslate the memory slider legend: */
     mLbMemoryMin->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (mSlMemory->minRAM()));
     mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (mSlMemory->maxRAM()));
 
-    /* Retranslate the cpu slider legend */
+    /* Retranslate the cpu slider legend: */
     mLbCPUMin->setText (tr ("<qt>%1&nbsp;CPU</qt>", "%1 is 1 for now").arg (mMinGuestCPU));
     mLbCPUMax->setText (tr ("<qt>%1&nbsp;CPUs</qt>", "%1 is host cpu count * 2 for now").arg (mMaxGuestCPU));
@@ -553 +554 @@
 void UIMachineSettingsSystem::onCurrentBootItemChanged (int i)
 {
+    /* Update boot-order tool-buttons: */
     bool upEnabled   = i > 0;
     bool downEnabled = i < mTwBootOrder->count() - 1;
@@ -564 +566 @@
 void UIMachineSettingsSystem::adjustBootOrderTWSize()
 {
+    /* Adjust boot-table size: */
     mTwBootOrder->adjustSizeToFitContent();
-
     /* Update the layout system */
     if (mTabMotherboard->layout())
@@ -607 +609 @@
         case QEvent::FocusIn:
         {
-            /* Boot Table */
+            /* Boot Table: */
             if (widget == mTwBootOrder)
             {
@@ -657 +659 @@
     mCbTCUseUTC->setEnabled(isMachineOffline());
     mCbUseAbsHID->setEnabled(isMachineOffline());
+
     /* Processor tab: */
     mLbCPU->setEnabled(isMachineOffline());
@@ -670 +673 @@
     mLbProcessorExtended->setEnabled(isMachineOffline());
     mCbPae->setEnabled(isMachineOffline() && systemData.m_fPFPAESupported);
+
     /* Acceleration tab: */
     mTwSystem->setTabEnabled(2, systemData.m_fPFHwVirtExSupported);

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

@@ -24 +24 @@
 #include "UIMachineSettingsSystem.gen.h"
 
-/* Machine settings / System page / Boot item: */
+/* Machine settings / System page / Data / Boot item: */
 struct UIBootItemData
 {
@@ -100 +100 @@
 /* Machine settings / System page: */
 class UIMachineSettingsSystem : public UISettingsPageMachine,
-                             public Ui::UIMachineSettingsSystem
+                                public Ui::UIMachineSettingsSystem
 {
     Q_OBJECT;
@@ -106 +106 @@
 public:
 
+    /* Constructor: */
     UIMachineSettingsSystem();
 
+    /* API: Correlation stuff: */
     bool isHWVirtExEnabled() const;
     bool isHIDEnabled() const;
     KChipsetType chipsetType() const;
     void setOHCIEnabled(bool fEnabled);
-
-signals:
-
-    void tableChanged();
 
 protected:
@@ -133 +131 @@
     void saveFromCacheTo(QVariant &data);
 
-    /* Page changed: */
+    /* API: Cache stuff: */
     bool changed() const { return m_cache.wasChanged(); }
 
+    /* Helpers: Validation stuff: */
     void setValidator (QIWidgetValidator *aVal);
     bool revalidate (QString &aWarning, QString &aTitle);
 
+    /* Helper: Navigation stuff: */
     void setOrderAfter (QWidget *aWidget);
 
+    /* Helper: Translation stuff: */
     void retranslateUi();
 
 private slots:
 
+    /* Handlers: RAM stuff: */
     void valueChangedRAM (int aVal);
     void textChangedRAM (const QString &aText);
 
+    /* Handler: Boot stuff: */
     void onCurrentBootItemChanged (int);
 
+    /* Handlers: CPU stuff: */
     void valueChangedCPU (int aVal);
     void textChangedCPU (const QString &aText);
@@ -157 +161 @@
 private:
 
+    /* Handler: Event-filtration stuff: */
     bool eventFilter (QObject *aObject, QEvent *aEvent);
 
+    /* Helper: Boot stuff: */
     void adjustBootOrderTWSize();
 
+    /* Handler: Polishing stuff: */
     void polishPage();
 
+    /* Variable: Validation stuff: */
     QIWidgetValidator *mValidator;
 
+    /* Variables: CPU stuff: */
     uint mMinGuestCPU;
     uint mMaxGuestCPU;
@@ -171 +180 @@
     uint mMaxGuestCPUExecCap;
 
+    /* Variable: Boot stuff: */
     QList<KDeviceType> m_possibleBootItems;
 
+    /* Variable: Correlation stuff: */
     bool m_fOHCIEnabled;
 
@@ -180 +191 @@
 
 #endif // __UIMachineSettingsSystem_h__
-