Changeset 47276 in vbox

Timestamp:

Jul 19, 2013 5:47:43 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings: System page: Cleanup/rework (part 10): Some stuff reordering.

Location:

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

Files:

• UIMachineSettingsDisplay.h (modified) (3 diffs)
• UIMachineSettingsSystem.cpp (modified) (2 diffs)
• UIMachineSettingsSystem.h (modified) (2 diffs)

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

@@ -120 +120 @@
     UIMachineSettingsDisplay();
 
-    /* API: Guest OS type stuff: */
+    /* API: Correlation stuff: */
     void setGuestOSType(CGuestOSType guestOSType);
-
-    /* API: 2D video acceleration stuff: */
 #ifdef VBOX_WITH_VIDEOHWACCEL
     bool isAcceleration2DVideoSelected() const;
@@ -133 +131 @@
     bool changed() const { return m_cache.wasChanged(); }
 
-    /* Load data to cache from corresponding external object(s),
+    /* API: Load data to cache from corresponding external object(s),
      * this task COULD be performed in other than GUI thread: */
     void loadToCacheFrom(QVariant &data);
-    /* Load data to corresponding widgets from cache,
+    /* API: Load data to corresponding widgets from cache,
      * this task SHOULD be performed in GUI thread only: */
     void getFromCache();
 
-    /* Save data from corresponding widgets to cache,
+    /* API: Save data from corresponding widgets to cache,
      * this task SHOULD be performed in GUI thread only: */
     void putToCache();
-    /* Save data from cache to corresponding external object(s),
+    /* API: Save data from cache to corresponding external object(s),
      * this task COULD be performed in other than GUI thread: */
     void saveFromCacheTo(QVariant &data);
@@ -151 +149 @@
     bool revalidate(QString &strWarning, QString &strTitle);
 
-    /* API: Focus-order stuff: */
+    /* Helper: Navigation stuff: */
     void setOrderAfter(QWidget *pWidget);
 
-    /* Helper: Translate stuff: */
+    /* Helper: Translation stuff: */
     void retranslateUi();
 
-    /* Helper: Polish stuff: */
+    /* Helper: Polishing stuff: */
     void polishPage();
 

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

@@ -564 +564 @@
 }
 
-void UIMachineSettingsSystem::sltHandleMemorySizeSliderChange()
-{
-    /* Apply new memory-size value: */
-    m_pEditorMemorySize->blockSignals(true);
-    m_pEditorMemorySize->setValue(m_pSliderMemorySize->value());
-    m_pEditorMemorySize->blockSignals(false);
-
-    /* Revalidate if possible: */
-    if (m_pValidator)
-        m_pValidator->revalidate();
-}
-
-void UIMachineSettingsSystem::sltHandleMemorySizeEditorChange()
-{
-    /* Apply new memory-size value: */
-    m_pSliderMemorySize->blockSignals(true);
-    m_pSliderMemorySize->setValue(m_pEditorMemorySize->value());
-    m_pSliderMemorySize->blockSignals(false);
-
-    /* Revalidate if possible: */
-    if (m_pValidator)
-        m_pValidator->revalidate();
-}
-
-void UIMachineSettingsSystem::onCurrentBootItemChanged(int iCurrentItem)
-{
-    /* Update boot-order tool-buttons: */
-    bool fEnabledUP = iCurrentItem > 0;
-    bool fEnabledDOWN = iCurrentItem < mTwBootOrder->count() - 1;
-    if ((mTbBootItemUp->hasFocus() && !fEnabledUP) ||
-        (mTbBootItemDown->hasFocus() && !fEnabledDOWN))
-        mTwBootOrder->setFocus();
-    mTbBootItemUp->setEnabled(fEnabledUP);
-    mTbBootItemDown->setEnabled(fEnabledDOWN);
-}
-
-void UIMachineSettingsSystem::adjustBootOrderTWSize()
-{
-    /* Adjust boot-table size: */
-    mTwBootOrder->adjustSizeToFitContent();
-    /* Update the layout system */
-    if (m_pTabMotherboard->layout())
-    {
-        m_pTabMotherboard->layout()->activate();
-        m_pTabMotherboard->layout()->update();
-    }
-}
-
-void UIMachineSettingsSystem::repopulateComboPointingHIDType()
-{
-    /* Is there any value currently present/selected? */
-    KPointingHIDType currentValue = KPointingHIDType_None;
-    {
-        int iCurrentIndex = m_pComboPointingHIDType->currentIndex();
-        if (iCurrentIndex != -1)
-            currentValue = (KPointingHIDType)m_pComboPointingHIDType->itemData(iCurrentIndex).toInt();
-    }
-
-    /* Clear combo: */
-    m_pComboPointingHIDType->clear();
-
-    /* Repopulate combo taking into account currently cached value: */
-    KPointingHIDType cachedValue = m_cache.base().m_pointingHIDType;
-    {
-        /* "PS/2 Mouse" value is always here: */
-        m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_PS2Mouse), (int)KPointingHIDType_PS2Mouse);
-
-        /* "USB Mouse" value is here only if it is currently selected: */
-        if (cachedValue == KPointingHIDType_USBMouse)
-            m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_USBMouse), (int)KPointingHIDType_USBMouse);
-
-        /* "USB Mouse/Tablet" value is always here: */
-        m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_USBTablet), (int)KPointingHIDType_USBTablet);
-
-        /* "PS/2 and USB Mouse" value is here only if it is currently selected: */
-        if (cachedValue == KPointingHIDType_ComboMouse)
-            m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_ComboMouse), (int)KPointingHIDType_ComboMouse);
-
-        /* "USB Multi-Touch Mouse/Tablet" value is always here: */
-        m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_USBMultiTouch), (int)KPointingHIDType_USBMultiTouch);
-    }
-
-    /* Was there any value previously present/selected? */
-    if (currentValue != KPointingHIDType_None)
-    {
-        int iPreviousIndex = m_pComboPointingHIDType->findData((int)currentValue);
-        if (iPreviousIndex != -1)
-            m_pComboPointingHIDType->setCurrentIndex(iPreviousIndex);
-    }
-}
-
-void UIMachineSettingsSystem::sltHandleCPUCountSliderChange()
-{
-    /* Apply new memory-size value: */
-    m_pEditorCPUCount->blockSignals(true);
-    m_pEditorCPUCount->setValue(m_pSliderCPUCount->value());
-    m_pEditorCPUCount->blockSignals(false);
-
-    /* Revalidate if possible: */
-    if (m_pValidator)
-        m_pValidator->revalidate();
-}
-
-void UIMachineSettingsSystem::sltHandleCPUCountEditorChange()
-{
-    /* Apply new memory-size value: */
-    m_pSliderCPUCount->blockSignals(true);
-    m_pSliderCPUCount->setValue(m_pEditorCPUCount->value());
-    m_pSliderCPUCount->blockSignals(false);
-
-    /* Revalidate if possible: */
-    if (m_pValidator)
-        m_pValidator->revalidate();
-}
-
-void UIMachineSettingsSystem::sltHandleCPUExecCapSliderChange()
-{
-    /* Apply new memory-size value: */
-    m_pEditorCPUExecCap->blockSignals(true);
-    m_pEditorCPUExecCap->setValue(m_pSliderCPUExecCap->value());
-    m_pEditorCPUExecCap->blockSignals(false);
-
-    /* Revalidate if possible: */
-    if (m_pValidator)
-        m_pValidator->revalidate();
-}
-
-void UIMachineSettingsSystem::sltHandleCPUExecCapEditorChange()
-{
-    /* Apply new memory-size value: */
-    m_pSliderCPUExecCap->blockSignals(true);
-    m_pSliderCPUExecCap->setValue(m_pEditorCPUExecCap->value());
-    m_pSliderCPUExecCap->blockSignals(false);
-
-    /* Revalidate if possible: */
-    if (m_pValidator)
-        m_pValidator->revalidate();
-}
-
-void UIMachineSettingsSystem::retranslateComboPointingChipsetType()
-{
-    /* For each the element in KPointingHIDType enum: */
-    for (int iIndex = (int)KChipsetType_Null; iIndex < (int)KChipsetType_Max; ++iIndex)
-    {
-        /* Cast to the corresponding type: */
-        KChipsetType type = (KChipsetType)iIndex;
-        /* Look for the corresponding item: */
-        int iCorrespondingIndex = m_pComboChipsetType->findData((int)type);
-        /* Re-translate if corresponding item was found: */
-        if (iCorrespondingIndex != -1)
-            m_pComboChipsetType->setItemText(iCorrespondingIndex, gpConverter->toString(type));
-    }
-}
-
-void UIMachineSettingsSystem::retranslateComboPointingHIDType()
-{
-    /* For each the element in KPointingHIDType enum: */
-    for (int iIndex = (int)KPointingHIDType_None; iIndex < (int)KPointingHIDType_Max; ++iIndex)
-    {
-        /* Cast to the corresponding type: */
-        KPointingHIDType type = (KPointingHIDType)iIndex;
-        /* Look for the corresponding item: */
-        int iCorrespondingIndex = m_pComboPointingHIDType->findData((int)type);
-        /* Re-translate if corresponding item was found: */
-        if (iCorrespondingIndex != -1)
-            m_pComboPointingHIDType->setItemText(iCorrespondingIndex, gpConverter->toString(type));
-    }
-}
-
 void UIMachineSettingsSystem::polishPage()
 {
@@ -777 +608 @@
     m_pCheckBoxVirtualization->setEnabled(isMachineOffline());
     m_pCheckBoxNestedPaging->setEnabled(isMachineOffline() && m_pCheckBoxVirtualization->isChecked());
+}
+
+void UIMachineSettingsSystem::sltHandleMemorySizeSliderChange()
+{
+    /* Apply new memory-size value: */
+    m_pEditorMemorySize->blockSignals(true);
+    m_pEditorMemorySize->setValue(m_pSliderMemorySize->value());
+    m_pEditorMemorySize->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
+}
+
+void UIMachineSettingsSystem::sltHandleMemorySizeEditorChange()
+{
+    /* Apply new memory-size value: */
+    m_pSliderMemorySize->blockSignals(true);
+    m_pSliderMemorySize->setValue(m_pEditorMemorySize->value());
+    m_pSliderMemorySize->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
+}
+
+void UIMachineSettingsSystem::onCurrentBootItemChanged(int iCurrentItem)
+{
+    /* Update boot-order tool-buttons: */
+    bool fEnabledUP = iCurrentItem > 0;
+    bool fEnabledDOWN = iCurrentItem < mTwBootOrder->count() - 1;
+    if ((mTbBootItemUp->hasFocus() && !fEnabledUP) ||
+        (mTbBootItemDown->hasFocus() && !fEnabledDOWN))
+        mTwBootOrder->setFocus();
+    mTbBootItemUp->setEnabled(fEnabledUP);
+    mTbBootItemDown->setEnabled(fEnabledDOWN);
+}
+
+void UIMachineSettingsSystem::adjustBootOrderTWSize()
+{
+    /* Adjust boot-table size: */
+    mTwBootOrder->adjustSizeToFitContent();
+    /* Update the layout system */
+    if (m_pTabMotherboard->layout())
+    {
+        m_pTabMotherboard->layout()->activate();
+        m_pTabMotherboard->layout()->update();
+    }
+}
+
+void UIMachineSettingsSystem::repopulateComboPointingHIDType()
+{
+    /* Is there any value currently present/selected? */
+    KPointingHIDType currentValue = KPointingHIDType_None;
+    {
+        int iCurrentIndex = m_pComboPointingHIDType->currentIndex();
+        if (iCurrentIndex != -1)
+            currentValue = (KPointingHIDType)m_pComboPointingHIDType->itemData(iCurrentIndex).toInt();
+    }
+
+    /* Clear combo: */
+    m_pComboPointingHIDType->clear();
+
+    /* Repopulate combo taking into account currently cached value: */
+    KPointingHIDType cachedValue = m_cache.base().m_pointingHIDType;
+    {
+        /* "PS/2 Mouse" value is always here: */
+        m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_PS2Mouse), (int)KPointingHIDType_PS2Mouse);
+
+        /* "USB Mouse" value is here only if it is currently selected: */
+        if (cachedValue == KPointingHIDType_USBMouse)
+            m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_USBMouse), (int)KPointingHIDType_USBMouse);
+
+        /* "USB Mouse/Tablet" value is always here: */
+        m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_USBTablet), (int)KPointingHIDType_USBTablet);
+
+        /* "PS/2 and USB Mouse" value is here only if it is currently selected: */
+        if (cachedValue == KPointingHIDType_ComboMouse)
+            m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_ComboMouse), (int)KPointingHIDType_ComboMouse);
+
+        /* "USB Multi-Touch Mouse/Tablet" value is always here: */
+        m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_USBMultiTouch), (int)KPointingHIDType_USBMultiTouch);
+    }
+
+    /* Was there any value previously present/selected? */
+    if (currentValue != KPointingHIDType_None)
+    {
+        int iPreviousIndex = m_pComboPointingHIDType->findData((int)currentValue);
+        if (iPreviousIndex != -1)
+            m_pComboPointingHIDType->setCurrentIndex(iPreviousIndex);
+    }
+}
+
+void UIMachineSettingsSystem::sltHandleCPUCountSliderChange()
+{
+    /* Apply new memory-size value: */
+    m_pEditorCPUCount->blockSignals(true);
+    m_pEditorCPUCount->setValue(m_pSliderCPUCount->value());
+    m_pEditorCPUCount->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
+}
+
+void UIMachineSettingsSystem::sltHandleCPUCountEditorChange()
+{
+    /* Apply new memory-size value: */
+    m_pSliderCPUCount->blockSignals(true);
+    m_pSliderCPUCount->setValue(m_pEditorCPUCount->value());
+    m_pSliderCPUCount->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
+}
+
+void UIMachineSettingsSystem::sltHandleCPUExecCapSliderChange()
+{
+    /* Apply new memory-size value: */
+    m_pEditorCPUExecCap->blockSignals(true);
+    m_pEditorCPUExecCap->setValue(m_pSliderCPUExecCap->value());
+    m_pEditorCPUExecCap->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
+}
+
+void UIMachineSettingsSystem::sltHandleCPUExecCapEditorChange()
+{
+    /* Apply new memory-size value: */
+    m_pSliderCPUExecCap->blockSignals(true);
+    m_pSliderCPUExecCap->setValue(m_pEditorCPUExecCap->value());
+    m_pSliderCPUExecCap->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
+}
+
+void UIMachineSettingsSystem::retranslateComboPointingChipsetType()
+{
+    /* For each the element in KPointingHIDType enum: */
+    for (int iIndex = (int)KChipsetType_Null; iIndex < (int)KChipsetType_Max; ++iIndex)
+    {
+        /* Cast to the corresponding type: */
+        KChipsetType type = (KChipsetType)iIndex;
+        /* Look for the corresponding item: */
+        int iCorrespondingIndex = m_pComboChipsetType->findData((int)type);
+        /* Re-translate if corresponding item was found: */
+        if (iCorrespondingIndex != -1)
+            m_pComboChipsetType->setItemText(iCorrespondingIndex, gpConverter->toString(type));
+    }
+}
+
+void UIMachineSettingsSystem::retranslateComboPointingHIDType()
+{
+    /* For each the element in KPointingHIDType enum: */
+    for (int iIndex = (int)KPointingHIDType_None; iIndex < (int)KPointingHIDType_Max; ++iIndex)
+    {
+        /* Cast to the corresponding type: */
+        KPointingHIDType type = (KPointingHIDType)iIndex;
+        /* Look for the corresponding item: */
+        int iCorrespondingIndex = m_pComboPointingHIDType->findData((int)type);
+        /* Re-translate if corresponding item was found: */
+        if (iCorrespondingIndex != -1)
+            m_pComboPointingHIDType->setItemText(iCorrespondingIndex, gpConverter->toString(type));
+    }
 }
 

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

@@ -162 +162 @@
     void retranslateUi();
 
+    /* Helper: Polishing stuff: */
+    void polishPage();
+
 private slots:
 
@@ -182 +185 @@
     void retranslateComboPointingChipsetType();
     void retranslateComboPointingHIDType();
-
-    /* Handler: Polishing stuff: */
-    void polishPage();
 
     /* Handler: Event-filtration stuff: */