- Timestamp:
- Oct 19, 2023 2:38:49 PM (11 months ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/settings
- Files:
-
- 16 edited
-
editors/UIAudioSettingsEditor.cpp (modified) (3 diffs)
-
editors/UIAudioSettingsEditor.h (modified) (2 diffs)
-
editors/UINetworkSettingsEditor.cpp (modified) (3 diffs)
-
editors/UINetworkSettingsEditor.h (modified) (2 diffs)
-
global/UIGlobalSettingsDisplay.cpp (modified) (2 diffs)
-
global/UIGlobalSettingsDisplay.h (modified) (2 diffs)
-
global/UIGlobalSettingsGeneral.cpp (modified) (2 diffs)
-
global/UIGlobalSettingsGeneral.h (modified) (2 diffs)
-
machine/UIMachineSettingsDisplay.cpp (modified) (3 diffs)
-
machine/UIMachineSettingsDisplay.h (modified) (2 diffs)
-
machine/UIMachineSettingsGeneral.cpp (modified) (3 diffs)
-
machine/UIMachineSettingsGeneral.h (modified) (2 diffs)
-
machine/UIMachineSettingsInterface.cpp (modified) (2 diffs)
-
machine/UIMachineSettingsInterface.h (modified) (2 diffs)
-
machine/UIMachineSettingsSystem.cpp (modified) (3 diffs)
-
machine/UIMachineSettingsSystem.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.cpp
r101230 r101511 133 133 } 134 134 135 void UIAudioSettingsEditor::filterOut(bool fExpertMode, const QString &strFilter) 136 { 137 /* Call to base-class: */ 138 UIEditor::filterOut(fExpertMode, strFilter); 139 140 updateMinimumLayoutHint(); 141 } 142 135 143 void UIAudioSettingsEditor::retranslateUi() 136 144 { … … 142 150 } 143 151 144 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 145 int iMinimumLayoutHint = 0; 146 if (m_pEditorAudioHostDriver) 147 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioHostDriver->minimumLabelHorizontalHint()); 148 if (m_pEditorAudioController) 149 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioController->minimumLabelHorizontalHint()); 150 if (m_pEditorAudioFeatures) 151 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioFeatures->minimumLabelHorizontalHint()); 152 if (m_pEditorAudioHostDriver) 153 m_pEditorAudioHostDriver->setMinimumLayoutIndent(iMinimumLayoutHint); 154 if (m_pEditorAudioController) 155 m_pEditorAudioController->setMinimumLayoutIndent(iMinimumLayoutHint); 156 if (m_pEditorAudioFeatures) 157 m_pEditorAudioFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 152 updateMinimumLayoutHint(); 158 153 } 159 154 … … 246 241 m_pWidgetSettings->setEnabled(m_pCheckboxFeature->isChecked()); 247 242 } 243 244 void UIAudioSettingsEditor::updateMinimumLayoutHint() 245 { 246 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 247 int iMinimumLayoutHint = 0; 248 if (m_pEditorAudioHostDriver && !m_pEditorAudioHostDriver->isHidden()) 249 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioHostDriver->minimumLabelHorizontalHint()); 250 if (m_pEditorAudioController && !m_pEditorAudioController->isHidden()) 251 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioController->minimumLabelHorizontalHint()); 252 if (m_pEditorAudioFeatures && !m_pEditorAudioFeatures->isHidden()) 253 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioFeatures->minimumLabelHorizontalHint()); 254 if (m_pEditorAudioHostDriver) 255 m_pEditorAudioHostDriver->setMinimumLayoutIndent(iMinimumLayoutHint); 256 if (m_pEditorAudioController) 257 m_pEditorAudioController->setMinimumLayoutIndent(iMinimumLayoutHint); 258 if (m_pEditorAudioFeatures) 259 m_pEditorAudioFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 260 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.h
r101011 r101511 106 106 protected: 107 107 108 /** Filters out contents. 109 * @param fExpertMode Brings whether settings expert mode is requested. 110 * @param strFilter Brings the filter description should correspond to. */ 111 virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE; 112 108 113 /** Handles translation event. */ 109 114 virtual void retranslateUi() RT_OVERRIDE; … … 125 130 /** Updates feature availability. */ 126 131 void updateFeatureAvailability(); 132 /** Updates minimum layout hint. */ 133 void updateMinimumLayoutHint(); 127 134 128 135 /** @name Values -
trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.cpp
r101497 r101511 222 222 } 223 223 224 void UINetworkSettingsEditor::filterOut(bool fExpertMode, const QString &strFilter) 225 { 226 /* Call to base-class: */ 227 UIEditor::filterOut(fExpertMode, strFilter); 228 229 updateMinimumLayoutHint(); 230 } 231 224 232 void UINetworkSettingsEditor::retranslateUi() 225 233 { … … 230 238 } 231 239 232 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 233 int iMinimumLayoutHint = 0; 234 if (m_pEditorNetworkAttachment) 235 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkAttachment->minimumLabelHorizontalHint()); 236 if (m_pEditorNetworkFeatures) 237 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkFeatures->minimumLabelHorizontalHint()); 238 if (m_pEditorNetworkAttachment) 239 m_pEditorNetworkAttachment->setMinimumLayoutIndent(iMinimumLayoutHint); 240 if (m_pEditorNetworkFeatures) 241 m_pEditorNetworkFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 240 updateMinimumLayoutHint(); 242 241 } 243 242 … … 356 355 m_pWidgetSettings->setEnabled(m_pCheckboxFeature->isChecked()); 357 356 } 357 358 void UINetworkSettingsEditor::updateMinimumLayoutHint() 359 { 360 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 361 int iMinimumLayoutHint = 0; 362 if (m_pEditorNetworkAttachment && !m_pEditorNetworkAttachment->isHidden()) 363 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkAttachment->minimumLabelHorizontalHint()); 364 if (m_pEditorNetworkFeatures && !m_pEditorNetworkFeatures->isHidden()) 365 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkFeatures->minimumLabelHorizontalHint()); 366 if (m_pEditorNetworkAttachment) 367 m_pEditorNetworkAttachment->setMinimumLayoutIndent(iMinimumLayoutHint); 368 if (m_pEditorNetworkFeatures) 369 m_pEditorNetworkFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 370 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.h
r101011 r101511 158 158 protected: 159 159 160 /** Filters out contents. 161 * @param fExpertMode Brings whether settings expert mode is requested. 162 * @param strFilter Brings the filter description should correspond to. */ 163 virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE; 164 160 165 /** Handles translation event. */ 161 166 virtual void retranslateUi() RT_OVERRIDE; … … 179 184 /** Updates feature availability. */ 180 185 void updateFeatureAvailability(); 186 /** Updates minimum layout hint. */ 187 void updateMinimumLayoutHint(); 181 188 182 189 /** @name Values -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp
r101230 r101511 190 190 } 191 191 192 void UIGlobalSettingsDisplay::filterOut(bool fExpertMode, const QString &strFilter) 193 { 194 /* Call to base-class: */ 195 UIEditor::filterOut(fExpertMode, strFilter); 196 197 updateMinimumLayoutHint(); 198 } 199 192 200 void UIGlobalSettingsDisplay::retranslateUi() 193 201 { 194 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 195 int iMinimumLayoutHint = 0; 196 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMaximumGuestScreenSize->minimumLabelHorizontalHint()); 197 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint()); 198 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pFontScaleEditor->minimumLabelHorizontalHint()); 199 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDisplayFeatures->minimumLabelHorizontalHint()); 200 m_pEditorMaximumGuestScreenSize->setMinimumLayoutIndent(iMinimumLayoutHint); 201 m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint); 202 m_pFontScaleEditor->setMinimumLayoutIndent(iMinimumLayoutHint); 203 m_pEditorDisplayFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 202 updateMinimumLayoutHint(); 204 203 } 205 204 … … 311 310 return fSuccess; 312 311 } 312 313 void UIGlobalSettingsDisplay::updateMinimumLayoutHint() 314 { 315 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 316 int iMinimumLayoutHint = 0; 317 if (m_pEditorMaximumGuestScreenSize && !m_pEditorMaximumGuestScreenSize->isHidden()) 318 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMaximumGuestScreenSize->minimumLabelHorizontalHint()); 319 if (m_pEditorScaleFactor && !m_pEditorScaleFactor->isHidden()) 320 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint()); 321 if (m_pFontScaleEditor && !m_pFontScaleEditor->isHidden()) 322 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pFontScaleEditor->minimumLabelHorizontalHint()); 323 if (m_pEditorDisplayFeatures && !m_pEditorDisplayFeatures->isHidden()) 324 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDisplayFeatures->minimumLabelHorizontalHint()); 325 if (m_pEditorMaximumGuestScreenSize) 326 m_pEditorMaximumGuestScreenSize->setMinimumLayoutIndent(iMinimumLayoutHint); 327 if (m_pEditorScaleFactor) 328 m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint); 329 if (m_pFontScaleEditor) 330 m_pFontScaleEditor->setMinimumLayoutIndent(iMinimumLayoutHint); 331 if (m_pEditorDisplayFeatures) 332 m_pEditorDisplayFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 333 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h
r101071 r101511 74 74 virtual void saveFromCacheTo(QVariant &data) RT_OVERRIDE; 75 75 76 /** Filters out contents. 77 * @param fExpertMode Brings whether settings expert mode is requested. 78 * @param strFilter Brings the filter description should correspond to. */ 79 virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE; 80 76 81 /** Handles translation event. */ 77 82 virtual void retranslateUi() RT_OVERRIDE; … … 88 93 /** Saves existing data from cache. */ 89 94 bool saveData(); 95 96 /** Updates minimum layout hint. */ 97 void updateMinimumLayoutHint(); 90 98 91 99 /** Holds the page data cache instance. */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp
r101230 r101511 154 154 } 155 155 156 void UIGlobalSettingsGeneral::filterOut(bool fExpertMode, const QString &strFilter) 157 { 158 /* Call to base-class: */ 159 UIEditor::filterOut(fExpertMode, strFilter); 160 161 updateMinimumLayoutHint(); 162 } 163 156 164 void UIGlobalSettingsGeneral::retranslateUi() 157 165 { 158 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 159 int iMinimumLayoutHint = 0; 160 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDefaultMachineFolder->minimumLabelHorizontalHint()); 161 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVRDEAuthLibrary->minimumLabelHorizontalHint()); 162 m_pEditorDefaultMachineFolder->setMinimumLayoutIndent(iMinimumLayoutHint); 163 m_pEditorVRDEAuthLibrary->setMinimumLayoutIndent(iMinimumLayoutHint); 166 updateMinimumLayoutHint(); 164 167 } 165 168 … … 250 253 return fSuccess; 251 254 } 255 256 void UIGlobalSettingsGeneral::updateMinimumLayoutHint() 257 { 258 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 259 int iMinimumLayoutHint = 0; 260 if (m_pEditorDefaultMachineFolder && !m_pEditorDefaultMachineFolder->isHidden()) 261 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDefaultMachineFolder->minimumLabelHorizontalHint()); 262 if (m_pEditorVRDEAuthLibrary && !m_pEditorVRDEAuthLibrary->isHidden()) 263 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVRDEAuthLibrary->minimumLabelHorizontalHint()); 264 if (m_pEditorDefaultMachineFolder) 265 m_pEditorDefaultMachineFolder->setMinimumLayoutIndent(iMinimumLayoutHint); 266 if (m_pEditorVRDEAuthLibrary) 267 m_pEditorVRDEAuthLibrary->setMinimumLayoutIndent(iMinimumLayoutHint); 268 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h
r98103 r101511 72 72 virtual void saveFromCacheTo(QVariant &data) RT_OVERRIDE; 73 73 74 /** Filters out contents. 75 * @param fExpertMode Brings whether settings expert mode is requested. 76 * @param strFilter Brings the filter description should correspond to. */ 77 virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE; 78 74 79 /** Handles translation event. */ 75 80 virtual void retranslateUi() RT_OVERRIDE; … … 87 92 bool saveData(); 88 93 94 /** Updates minimum layout hint. */ 95 void updateMinimumLayoutHint(); 96 89 97 /** Holds the page data cache instance. */ 90 98 UISettingsCacheGlobalGeneral *m_pCache; -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
r101445 r101511 751 751 } 752 752 753 void UIMachineSettingsDisplay::filterOut(bool fExpertMode, const QString &strFilter) 754 { 755 /* Call to base-class: */ 756 UIEditor::filterOut(fExpertMode, strFilter); 757 758 updateMinimumLayoutHint(); 759 } 760 753 761 void UIMachineSettingsDisplay::retranslateUi() 754 762 { … … 758 766 m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabRecording), tr("Re&cording")); 759 767 760 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 761 int iMinimumLayoutHint = 0; 762 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVideoMemorySize->minimumLabelHorizontalHint()); 763 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMonitorCount->minimumLabelHorizontalHint()); 764 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint()); 765 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorGraphicsController->minimumLabelHorizontalHint()); 766 #ifdef VBOX_WITH_3D_ACCELERATION 767 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDisplayScreenFeatures->minimumLabelHorizontalHint()); 768 #endif 769 m_pEditorVideoMemorySize->setMinimumLayoutIndent(iMinimumLayoutHint); 770 m_pEditorMonitorCount->setMinimumLayoutIndent(iMinimumLayoutHint); 771 m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint); 772 m_pEditorGraphicsController->setMinimumLayoutIndent(iMinimumLayoutHint); 773 #ifdef VBOX_WITH_3D_ACCELERATION 774 m_pEditorDisplayScreenFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 775 #endif 768 updateMinimumLayoutHint(); 776 769 } 777 770 … … 1459 1452 return fSuccess; 1460 1453 } 1454 1455 void UIMachineSettingsDisplay::updateMinimumLayoutHint() 1456 { 1457 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 1458 int iMinimumLayoutHint = 0; 1459 if (m_pEditorVideoMemorySize && !m_pEditorVideoMemorySize->isHidden()) 1460 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVideoMemorySize->minimumLabelHorizontalHint()); 1461 if (m_pEditorMonitorCount && !m_pEditorMonitorCount->isHidden()) 1462 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMonitorCount->minimumLabelHorizontalHint()); 1463 if (m_pEditorScaleFactor && !m_pEditorScaleFactor->isHidden()) 1464 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint()); 1465 if (m_pEditorGraphicsController && !m_pEditorGraphicsController->isHidden()) 1466 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorGraphicsController->minimumLabelHorizontalHint()); 1467 #ifdef VBOX_WITH_3D_ACCELERATION 1468 if (m_pEditorDisplayScreenFeatures && !m_pEditorDisplayScreenFeatures->isHidden()) 1469 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDisplayScreenFeatures->minimumLabelHorizontalHint()); 1470 #endif 1471 if (m_pEditorVideoMemorySize) 1472 m_pEditorVideoMemorySize->setMinimumLayoutIndent(iMinimumLayoutHint); 1473 if (m_pEditorMonitorCount) 1474 m_pEditorMonitorCount->setMinimumLayoutIndent(iMinimumLayoutHint); 1475 if (m_pEditorScaleFactor) 1476 m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint); 1477 if (m_pEditorGraphicsController) 1478 m_pEditorGraphicsController->setMinimumLayoutIndent(iMinimumLayoutHint); 1479 #ifdef VBOX_WITH_3D_ACCELERATION 1480 if (m_pEditorDisplayScreenFeatures) 1481 m_pEditorDisplayScreenFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 1482 #endif 1483 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h
r101265 r101511 98 98 /** Defines TAB order for passed @a pWidget. */ 99 99 virtual void setOrderAfter(QWidget *pWidget) RT_OVERRIDE; 100 101 /** Filters out contents. 102 * @param fExpertMode Brings whether settings expert mode is requested. 103 * @param strFilter Brings the filter description should correspond to. */ 104 virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE; 100 105 101 106 /** Handles translation event. */ … … 147 152 bool saveRecordingData(); 148 153 154 /** Updates minimum layout hint. */ 155 void updateMinimumLayoutHint(); 156 149 157 /** Holds the guest OS type. */ 150 158 QString m_strGuestOSTypeId; -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp
r101445 r101511 463 463 } 464 464 465 void UIMachineSettingsGeneral::filterOut(bool fExpertMode, const QString &strFilter) 466 { 467 /* Call to base-class: */ 468 UIEditor::filterOut(fExpertMode, strFilter); 469 470 updateMinimumLayoutHint(); 471 } 472 465 473 void UIMachineSettingsGeneral::retranslateUi() 466 474 { … … 470 478 m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabEncryption), tr("Disk Enc&ryption")); 471 479 472 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 473 int iMinimumLayoutHint = 0; 474 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorSnapshotFolder->minimumLabelHorizontalHint()); 475 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorClipboard->minimumLabelHorizontalHint()); 476 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDragAndDrop->minimumLabelHorizontalHint()); 477 m_pEditorSnapshotFolder->setMinimumLayoutIndent(iMinimumLayoutHint); 478 m_pEditorClipboard->setMinimumLayoutIndent(iMinimumLayoutHint); 479 m_pEditorDragAndDrop->setMinimumLayoutIndent(iMinimumLayoutHint); 480 updateMinimumLayoutHint(); 480 481 } 481 482 … … 1051 1052 return fSuccess; 1052 1053 } 1054 1055 void UIMachineSettingsGeneral::updateMinimumLayoutHint() 1056 { 1057 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 1058 int iMinimumLayoutHint = 0; 1059 if (m_pEditorSnapshotFolder && !m_pEditorSnapshotFolder->isHidden()) 1060 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorSnapshotFolder->minimumLabelHorizontalHint()); 1061 if (m_pEditorClipboard && !m_pEditorClipboard->isHidden()) 1062 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorClipboard->minimumLabelHorizontalHint()); 1063 if (m_pEditorDragAndDrop && !m_pEditorDragAndDrop->isHidden()) 1064 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDragAndDrop->minimumLabelHorizontalHint()); 1065 if (m_pEditorSnapshotFolder) 1066 m_pEditorSnapshotFolder->setMinimumLayoutIndent(iMinimumLayoutHint); 1067 if (m_pEditorClipboard) 1068 m_pEditorClipboard->setMinimumLayoutIndent(iMinimumLayoutHint); 1069 if (m_pEditorDragAndDrop) 1070 m_pEditorDragAndDrop->setMinimumLayoutIndent(iMinimumLayoutHint); 1071 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h
r101265 r101511 86 86 virtual void setOrderAfter(QWidget *pWidget) RT_OVERRIDE; 87 87 88 /** Filters out contents. 89 * @param fExpertMode Brings whether settings expert mode is requested. 90 * @param strFilter Brings the filter description should correspond to. */ 91 virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE; 92 88 93 /** Handles translation event. */ 89 94 virtual void retranslateUi() RT_OVERRIDE; … … 128 133 /** Saves existing 'Encryption' data from cache. */ 129 134 bool saveEncryptionData(); 135 136 /** Updates minimum layout hint. */ 137 void updateMinimumLayoutHint(); 130 138 131 139 /** Holds whether the encryption cipher was changed. -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp
r101230 r101511 333 333 } 334 334 335 void UIMachineSettingsInterface::filterOut(bool fExpertMode, const QString &strFilter) 336 { 337 /* Call to base-class: */ 338 UIEditor::filterOut(fExpertMode, strFilter); 339 340 updateMinimumLayoutHint(); 341 } 342 335 343 void UIMachineSettingsInterface::retranslateUi() 336 344 { 337 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 338 int iMinimumLayoutHint = 0; 339 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVisualState->minimumLabelHorizontalHint()); 340 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMiniToolabSettings->minimumLabelHorizontalHint()); 341 m_pEditorVisualState->setMinimumLayoutIndent(iMinimumLayoutHint); 342 m_pEditorMiniToolabSettings->setMinimumLayoutIndent(iMinimumLayoutHint); 345 updateMinimumLayoutHint(); 343 346 } 344 347 … … 599 602 return fSuccess; 600 603 } 604 605 void UIMachineSettingsInterface::updateMinimumLayoutHint() 606 { 607 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 608 int iMinimumLayoutHint = 0; 609 if (m_pEditorVisualState && !m_pEditorVisualState->isHidden()) 610 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVisualState->minimumLabelHorizontalHint()); 611 if (m_pEditorMiniToolabSettings && !m_pEditorMiniToolabSettings->isHidden()) 612 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMiniToolabSettings->minimumLabelHorizontalHint()); 613 if (m_pEditorVisualState) 614 m_pEditorVisualState->setMinimumLayoutIndent(iMinimumLayoutHint); 615 if (m_pEditorMiniToolabSettings) 616 m_pEditorMiniToolabSettings->setMinimumLayoutIndent(iMinimumLayoutHint); 617 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h
r98103 r101511 76 76 virtual void saveFromCacheTo(QVariant &data) RT_OVERRIDE; 77 77 78 /** Filters out contents. 79 * @param fExpertMode Brings whether settings expert mode is requested. 80 * @param strFilter Brings the filter description should correspond to. */ 81 virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE; 82 78 83 /** Handles translation event. */ 79 84 virtual void retranslateUi() RT_OVERRIDE; … … 104 109 bool saveVisualStateData(); 105 110 111 /** Updates minimum layout hint. */ 112 void updateMinimumLayoutHint(); 113 106 114 /** Holds the machine ID copy. */ 107 115 const QUuid m_uMachineId; -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp
r101445 r101511 610 610 } 611 611 612 void UIMachineSettingsSystem::filterOut(bool fExpertMode, const QString &strFilter) 613 { 614 /* Call to base-class: */ 615 UIEditor::filterOut(fExpertMode, strFilter); 616 617 updateMinimumLayoutHint(); 618 } 619 612 620 void UIMachineSettingsSystem::retranslateUi() 613 621 { … … 616 624 m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabAcceleration), tr("Acce&leration")); 617 625 618 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 619 int iMinimumLayoutHint = 0; 620 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorBaseMemory->minimumLabelHorizontalHint()); 621 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorBootOrder->minimumLabelHorizontalHint()); 622 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorChipset->minimumLabelHorizontalHint()); 623 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorTpm->minimumLabelHorizontalHint()); 624 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorPointingHID->minimumLabelHorizontalHint()); 625 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMotherboardFeatures->minimumLabelHorizontalHint()); 626 m_pEditorBaseMemory->setMinimumLayoutIndent(iMinimumLayoutHint); 627 m_pEditorBootOrder->setMinimumLayoutIndent(iMinimumLayoutHint); 628 m_pEditorChipset->setMinimumLayoutIndent(iMinimumLayoutHint); 629 m_pEditorTpm->setMinimumLayoutIndent(iMinimumLayoutHint); 630 m_pEditorPointingHID->setMinimumLayoutIndent(iMinimumLayoutHint); 631 m_pEditorMotherboardFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 632 iMinimumLayoutHint = 0; 633 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVCPU->minimumLabelHorizontalHint()); 634 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorExecCap->minimumLabelHorizontalHint()); 635 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorProcessorFeatures->minimumLabelHorizontalHint()); 636 m_pEditorVCPU->setMinimumLayoutIndent(iMinimumLayoutHint); 637 m_pEditorExecCap->setMinimumLayoutIndent(iMinimumLayoutHint); 638 m_pEditorProcessorFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 639 iMinimumLayoutHint = 0; 640 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorParavirtProvider->minimumLabelHorizontalHint()); 641 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAccelerationFeatures->minimumLabelHorizontalHint()); 642 m_pEditorParavirtProvider->setMinimumLayoutIndent(iMinimumLayoutHint); 643 m_pEditorAccelerationFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 626 updateMinimumLayoutHint(); 644 627 } 645 628 … … 1186 1169 return fSuccess; 1187 1170 } 1171 1172 void UIMachineSettingsSystem::updateMinimumLayoutHint() 1173 { 1174 /* These editors have own labels, but we want them to be properly layouted according to each other: */ 1175 int iMinimumLayoutHint = 0; 1176 if (m_pEditorBaseMemory && !m_pEditorBaseMemory->isHidden()) 1177 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorBaseMemory->minimumLabelHorizontalHint()); 1178 if (m_pEditorBootOrder && !m_pEditorBootOrder->isHidden()) 1179 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorBootOrder->minimumLabelHorizontalHint()); 1180 if (m_pEditorChipset && !m_pEditorChipset->isHidden()) 1181 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorChipset->minimumLabelHorizontalHint()); 1182 if (m_pEditorTpm && !m_pEditorTpm->isHidden()) 1183 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorTpm->minimumLabelHorizontalHint()); 1184 if (m_pEditorPointingHID && !m_pEditorPointingHID->isHidden()) 1185 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorPointingHID->minimumLabelHorizontalHint()); 1186 if (m_pEditorMotherboardFeatures && !m_pEditorMotherboardFeatures->isHidden()) 1187 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMotherboardFeatures->minimumLabelHorizontalHint()); 1188 if (m_pEditorBaseMemory) 1189 m_pEditorBaseMemory->setMinimumLayoutIndent(iMinimumLayoutHint); 1190 if (m_pEditorBootOrder) 1191 m_pEditorBootOrder->setMinimumLayoutIndent(iMinimumLayoutHint); 1192 if (m_pEditorChipset) 1193 m_pEditorChipset->setMinimumLayoutIndent(iMinimumLayoutHint); 1194 if (m_pEditorTpm) 1195 m_pEditorTpm->setMinimumLayoutIndent(iMinimumLayoutHint); 1196 if (m_pEditorPointingHID) 1197 m_pEditorPointingHID->setMinimumLayoutIndent(iMinimumLayoutHint); 1198 if (m_pEditorMotherboardFeatures) 1199 m_pEditorMotherboardFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 1200 1201 iMinimumLayoutHint = 0; 1202 if (m_pEditorVCPU && !m_pEditorVCPU->isHidden()) 1203 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVCPU->minimumLabelHorizontalHint()); 1204 if (m_pEditorExecCap && !m_pEditorExecCap->isHidden()) 1205 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorExecCap->minimumLabelHorizontalHint()); 1206 if (m_pEditorProcessorFeatures && !m_pEditorProcessorFeatures->isHidden()) 1207 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorProcessorFeatures->minimumLabelHorizontalHint()); 1208 if (m_pEditorVCPU) 1209 m_pEditorVCPU->setMinimumLayoutIndent(iMinimumLayoutHint); 1210 if (m_pEditorExecCap) 1211 m_pEditorExecCap->setMinimumLayoutIndent(iMinimumLayoutHint); 1212 if (m_pEditorProcessorFeatures) 1213 m_pEditorProcessorFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 1214 1215 iMinimumLayoutHint = 0; 1216 if (m_pEditorParavirtProvider && !m_pEditorParavirtProvider->isHidden()) 1217 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorParavirtProvider->minimumLabelHorizontalHint()); 1218 if (m_pEditorAccelerationFeatures && !m_pEditorAccelerationFeatures->isHidden()) 1219 iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAccelerationFeatures->minimumLabelHorizontalHint()); 1220 if (m_pEditorParavirtProvider) 1221 m_pEditorParavirtProvider->setMinimumLayoutIndent(iMinimumLayoutHint); 1222 if (m_pEditorAccelerationFeatures) 1223 m_pEditorAccelerationFeatures->setMinimumLayoutIndent(iMinimumLayoutHint); 1224 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h
r101231 r101511 110 110 virtual void setOrderAfter(QWidget *pWidget) RT_OVERRIDE; 111 111 112 /** Filters out contents. 113 * @param fExpertMode Brings whether settings expert mode is requested. 114 * @param strFilter Brings the filter description should correspond to. */ 115 virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE; 116 112 117 /** Handles translation event. */ 113 118 virtual void retranslateUi() RT_OVERRIDE; … … 141 146 /** Saves existing 'Acceleration' data from cache. */ 142 147 bool saveAccelerationData(); 148 149 /** Updates minimum layout hint. */ 150 void updateMinimumLayoutHint(); 143 151 144 152 /** Holds whether the USB is enabled. */
Note:
See TracChangeset
for help on using the changeset viewer.

