Changeset 73233 in vbox for trunk/src/VBox/Frontends/VirtualBox
- Timestamp:
- Jul 19, 2018 10:41:33 AM (6 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp
r73229 r73233 425 425 426 426 UIWizardExportAppPageBasic3::UIWizardExportAppPageBasic3() 427 : m_pLabel(0) 427 428 { 428 429 /* Create main layout: */ … … 450 451 if (pSettingsLayout1) 451 452 { 452 pSettingsLayout1->setContentsMargins(0, 0, 0, 0); 453 #ifdef VBOX_WS_MAC 454 pSettingsLayout1->setContentsMargins(0, 10, 0, 10); 455 pSettingsLayout1->setSpacing(10); 456 #else 457 pSettingsLayout1->setContentsMargins(0, qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin), 458 0, qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin)); 459 #endif 453 460 pSettingsLayout1->setColumnStretch(0, 0); 454 461 pSettingsLayout1->setColumnStretch(1, 1); … … 464 471 465 472 /* Add into layout: */ 466 pSettingsLayout1->addWidget(m_pFileSelector, 0, 1 );473 pSettingsLayout1->addWidget(m_pFileSelector, 0, 1, 1, 2); 467 474 } 468 475 /* Create file selector label: */ … … 482 489 { 483 490 /* Add into layout: */ 484 pSettingsLayout1->addWidget(m_pFormatComboBox, 1, 1 );491 pSettingsLayout1->addWidget(m_pFormatComboBox, 1, 1, 1, 2); 485 492 } 486 493 /* Create format combo-box label: */ … … 500 507 { 501 508 /* Add into layout: */ 502 pSettingsLayout1->addWidget(m_pMACComboBox, 2, 1 );509 pSettingsLayout1->addWidget(m_pMACComboBox, 2, 1, 1, 2); 503 510 } 504 511 /* Create format combo-box label: */ … … 542 549 { 543 550 /* Add into layout: */ 544 pSettingsLayout1->addWidget(pPlaceholder, 5, 0, 1, 2);551 pSettingsLayout1->addWidget(pPlaceholder, 5, 0, 1, 3); 545 552 } 546 553 } … … 558 565 if (pSettingsLayout2) 559 566 { 560 pSettingsLayout2->setContentsMargins(0, 0, 0, 0); 567 #ifdef VBOX_WS_MAC 568 pSettingsLayout2->setContentsMargins(0, 10, 0, 10); 569 pSettingsLayout2->setSpacing(10); 570 571 #else 572 pSettingsLayout2->setContentsMargins(0, qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin), 573 0, qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin)); 574 #endif 561 575 pSettingsLayout2->setColumnStretch(0, 0); 562 576 pSettingsLayout2->setColumnStretch(1, 1); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp
r73226 r73233 149 149 { 150 150 pSettingsCntLayout->setContentsMargins(0, 0, 0, 0); 151 #ifdef VBOX_WS_MAC 152 pSettingsCntLayout->setSpacing(5); 153 #endif 151 154 152 155 /* Create settings widget: */ … … 162 165 if (pSettingsLayout1) 163 166 { 167 #ifdef VBOX_WS_MAC 168 pSettingsLayout1->setSpacing(10); 169 #endif 170 pSettingsLayout1->setContentsMargins(0, 0, 0, 0); 164 171 pSettingsLayout1->setColumnStretch(0, 0); 165 172 pSettingsLayout1->setColumnStretch(1, 1); … … 175 182 176 183 /* Add into layout: */ 177 pSettingsLayout1->addWidget(m_pFileSelector, 0, 1 );184 pSettingsLayout1->addWidget(m_pFileSelector, 0, 1, 1, 2); 178 185 } 179 186 /* Create file selector label: */ … … 193 200 { 194 201 /* Add into layout: */ 195 pSettingsLayout1->addWidget(m_pFormatComboBox, 1, 1 );202 pSettingsLayout1->addWidget(m_pFormatComboBox, 1, 1, 1, 2); 196 203 } 197 204 /* Create format combo-box label: */ … … 211 218 { 212 219 /* Add into layout: */ 213 pSettingsLayout1->addWidget(m_pMACComboBox, 2, 1 );220 pSettingsLayout1->addWidget(m_pMACComboBox, 2, 1, 1, 2); 214 221 } 215 222 /* Create format combo-box label: */ … … 253 260 { 254 261 /* Add into layout: */ 255 pSettingsLayout1->addWidget(pPlaceholder, 5, 0, 1, 2);262 pSettingsLayout1->addWidget(pPlaceholder, 5, 0, 1, 3); 256 263 } 257 264 } … … 269 276 if (pSettingsLayout2) 270 277 { 278 #ifdef VBOX_WS_MAC 279 pSettingsLayout2->setSpacing(10); 280 #endif 281 pSettingsLayout2->setContentsMargins(0, 0, 0, 0); 271 282 pSettingsLayout2->setColumnStretch(0, 0); 272 283 pSettingsLayout2->setColumnStretch(1, 1); … … 311 322 m_pAccountPropertyTable->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); 312 323 313 324 /* Add into layout: */ 314 325 pSettingsLayout2->addWidget(m_pAccountPropertyTable, 1, 1); 315 326 }
Note:
See TracChangeset
for help on using the changeset viewer.