Changeset 92412 in vbox
- Timestamp:
- Nov 14, 2021 10:32:25 AM (3 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/medium
- Files:
-
- 2 edited
-
UIMediumSelector.cpp (modified) (1 diff)
-
viso/UIVisoCreator.cpp (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp
r92397 r92412 452 452 void UIMediumSelector::sltCreateMedium() 453 453 { 454 QUuid uMediumId ;// = uiCommon().openMediumCreatorDialog(this, m_enmMediumType, m_strMachineFolder,455 //m_strMachineName, m_strMachineGuestOSTypeId);454 QUuid uMediumId = uiCommon().openMediumCreatorDialog(0 /* action pool */, this, m_enmMediumType, m_strMachineFolder, 455 m_strMachineName, m_strMachineGuestOSTypeId); 456 456 /* Make sure that the data structure is updated and newly created medium is selected and visible: */ 457 457 sltHandleMediumCreated(uMediumId); -
trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp
r92397 r92412 68 68 { 69 69 m_visoOptions.m_strVisoName = !strMachineName.isEmpty() ? strMachineName : "ad-hoc"; 70 prepareActions();71 70 prepareWidgets(); 72 71 populateMenuMainToolbar(); … … 269 268 // m_pMainMenu->addAction(m_pActionOptions); 270 269 271 // m_pToolBar = new QIToolBar;272 //if (m_pToolBar)273 //{274 ///* Configure toolbar: */275 //const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize));276 //m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));277 //m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);278 //m_pMainLayout->addWidget(m_pToolBar, 0, 0, 1, 5);279 //}270 m_pToolBar = new QIToolBar(parentWidget()); 271 if (m_pToolBar) 272 { 273 /* Configure toolbar: */ 274 const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize)); 275 m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric)); 276 m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); 277 m_pMainLayout->addWidget(m_pToolBar, 0, 0, 1, 5); 278 } 280 279 281 280 m_pHostBrowser = new UIVisoHostBrowser; 282 281 if (m_pHostBrowser) 283 282 { 284 m_pMainLayout->addWidget(m_pHostBrowser, 0, 0, 1, 2);283 m_pMainLayout->addWidget(m_pHostBrowser, 1, 0, 1, 2); 285 284 m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pHostBrowser), 2); 286 285 } … … 289 288 if (m_pVerticalToolBar) 290 289 { 291 m_pMainLayout->addWidget(m_pVerticalToolBar, 0, 2, 1, 1);290 m_pMainLayout->addWidget(m_pVerticalToolBar, 1, 2, 1, 1); 292 291 m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVerticalToolBar), 1); 293 292 } … … 296 295 if (m_pVisoBrowser) 297 296 { 298 m_pMainLayout->addWidget(m_pVisoBrowser, 0, 3, 1, 2);297 m_pMainLayout->addWidget(m_pVisoBrowser, 1, 3, 1, 2); 299 298 m_pVisoBrowser->setVisoName(m_visoOptions.m_strVisoName); 300 299 m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVisoBrowser), 2); … … 304 303 if (m_pConfigurationPanel) 305 304 { 306 m_pMainLayout->addWidget(m_pConfigurationPanel, 1, 0, 1, 5);305 m_pMainLayout->addWidget(m_pConfigurationPanel, 2, 0, 1, 5); 307 306 m_pConfigurationPanel->hide(); 308 307 m_pConfigurationPanel->setVisoName(m_visoOptions.m_strVisoName); … … 314 313 { 315 314 m_pCreatorOptionsPanel->setShowHiddenbjects(m_browserOptions.m_fShowHiddenObjects); 316 m_pMainLayout->addWidget(m_pCreatorOptionsPanel, 2, 0, 1, 5);315 m_pMainLayout->addWidget(m_pCreatorOptionsPanel, 3, 0, 1, 5); 317 316 m_pCreatorOptionsPanel->hide(); 318 317 } … … 386 385 void UIVisoCreatorWidget::prepareActions() 387 386 { 388 m_pActionConfiguration = new QAction(this); 389 if (m_pActionConfiguration) 390 { 391 m_pActionConfiguration->setCheckable(true); 392 m_pActionConfiguration->setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png", 393 ":/%file_manager_options_16px.png", 394 ":/file_manager_options_disabled_32px.png", 395 ":/file_manager_options_disabled_16px.png")); 396 } 397 398 m_pActionOptions = new QAction(this); 399 if (m_pActionOptions) 400 { 401 m_pActionOptions->setCheckable(true); 402 403 m_pActionOptions->setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png", 404 ":/%file_manager_options_16px.png", 405 ":/file_manager_options_disabled_32px.png", 406 ":/file_manager_options_disabled_16px.png")); 407 } 408 409 m_pAddAction = new QAction(this); 410 if (m_pAddAction) 411 { 412 m_pAddAction->setIcon(UIIconPool::iconSetFull(":/file_manager_copy_to_guest_24px.png", 413 ":/file_manager_copy_to_guest_16px.png", 414 ":/file_manager_copy_to_guest_disabled_24px.png", 415 ":/file_manager_copy_to_guest_disabled_16px.png")); 416 m_pAddAction->setText(QApplication::translate("UIVisoCreator", "Add")); 417 m_pAddAction->setEnabled(false); 418 } 419 m_pRemoveAction = new QAction(this); 420 if (m_pRemoveAction) 421 { 422 m_pRemoveAction->setIcon(UIIconPool::iconSetFull(":/file_manager_delete_24px.png", ":/file_manager_delete_16px.png", 423 ":/file_manager_delete_disabled_24px.png", ":/file_manager_delete_disabled_16px.png")); 424 m_pRemoveAction->setEnabled(false); 425 } 426 427 m_pNewDirectoryAction = new QAction(this); 428 if (m_pNewDirectoryAction) 429 { 430 m_pNewDirectoryAction->setIcon(UIIconPool::iconSetFull(":/file_manager_new_directory_24px.png", ":/file_manager_new_directory_16px.png", 431 ":/file_manager_new_directory_disabled_24px.png", ":/file_manager_new_directory_disabled_16px.png")); 432 m_pNewDirectoryAction->setEnabled(true); 433 } 434 435 //m_pRenameAction = new QAction(this); 436 if (m_pRenameAction) 437 { 438 /** @todo Handle rename correctly in the m_entryMap as well and then enable this rename action. */ 439 /* m_pVerticalToolBar->addAction(m_pRenameAction); */ 440 m_pRenameAction->setIcon(UIIconPool::iconSet(":/file_manager_rename_16px.png", ":/file_manager_rename_disabled_16px.png")); 441 m_pRenameAction->setEnabled(false); 442 } 443 444 m_pResetAction = new QAction(this); 445 if (m_pResetAction) 446 { 447 m_pResetAction->setIcon(UIIconPool::iconSet(":/cd_remove_16px.png", ":/cd_remove_disabled_16px.png")); 448 m_pResetAction->setEnabled(true); 387 if (!m_pActionPool) 388 { 389 m_pActionConfiguration = new QAction(this); 390 if (m_pActionConfiguration) 391 { 392 m_pActionConfiguration->setCheckable(true); 393 m_pActionConfiguration->setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png", 394 ":/%file_manager_options_16px.png", 395 ":/file_manager_options_disabled_32px.png", 396 ":/file_manager_options_disabled_16px.png")); 397 } 398 399 m_pActionOptions = new QAction(this); 400 if (m_pActionOptions) 401 { 402 m_pActionOptions->setCheckable(true); 403 404 m_pActionOptions->setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png", 405 ":/%file_manager_options_16px.png", 406 ":/file_manager_options_disabled_32px.png", 407 ":/file_manager_options_disabled_16px.png")); 408 } 409 410 // m_pAddAction = new QAction(this); 411 // if (m_pAddAction) 412 // { 413 // m_pAddAction->setIcon(UIIconPool::iconSetFull(":/file_manager_copy_to_guest_24px.png", 414 // ":/file_manager_copy_to_guest_16px.png", 415 // ":/file_manager_copy_to_guest_disabled_24px.png", 416 // ":/file_manager_copy_to_guest_disabled_16px.png")); 417 // m_pAddAction->setText(QApplication::translate("UIVisoCreator", "Add")); 418 // m_pAddAction->setEnabled(false); 419 // } 420 // m_pRemoveAction = new QAction(this); 421 // if (m_pRemoveAction) 422 // { 423 // m_pRemoveAction->setIcon(UIIconPool::iconSetFull(":/file_manager_delete_24px.png", ":/file_manager_delete_16px.png", 424 // ":/file_manager_delete_disabled_24px.png", ":/file_manager_delete_disabled_16px.png")); 425 // m_pRemoveAction->setEnabled(false); 426 // } 427 428 // m_pNewDirectoryAction = new QAction(this); 429 // if (m_pNewDirectoryAction) 430 // { 431 // m_pNewDirectoryAction->setIcon(UIIconPool::iconSetFull(":/file_manager_new_directory_24px.png", ":/file_manager_new_directory_16px.png", 432 // ":/file_manager_new_directory_disabled_24px.png", ":/file_manager_new_directory_disabled_16px.png")); 433 // m_pNewDirectoryAction->setEnabled(true); 434 // } 435 436 // //m_pRenameAction = new QAction(this); 437 // if (m_pRenameAction) 438 // { 439 // /** @todo Handle rename correctly in the m_entryMap as well and then enable this rename action. */ 440 // /* m_pVerticalToolBar->addAction(m_pRenameAction); */ 441 // m_pRenameAction->setIcon(UIIconPool::iconSet(":/file_manager_rename_16px.png", ":/file_manager_rename_disabled_16px.png")); 442 // m_pRenameAction->setEnabled(false); 443 // } 444 445 // m_pResetAction = new QAction(this); 446 // if (m_pResetAction) 447 // { 448 // m_pResetAction->setIcon(UIIconPool::iconSet(":/cd_remove_16px.png", ":/cd_remove_disabled_16px.png")); 449 // m_pResetAction->setEnabled(true); 450 // } 451 }// if (m_pActionPool) 452 else 453 { 454 m_pActionConfiguration = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleConfigPanel); 455 m_pActionOptions = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel); 449 456 } 450 457 } … … 452 459 void UIVisoCreatorWidget::populateMenuMainToolbar() 453 460 { 454 if (!m_pMainMenu || !m_pToolBar) 455 return; 456 457 m_pToolBar->addAction(m_pActionConfiguration); 458 m_pMainMenu->addAction(m_pActionConfiguration); 459 460 m_pToolBar->addAction(m_pActionOptions); 461 m_pMainMenu->addAction(m_pActionOptions); 462 m_pMainMenu->addSeparator(); 463 m_pMainMenu->addAction(m_pAddAction); 464 m_pMainMenu->addAction(m_pRemoveAction); 465 m_pMainMenu->addAction(m_pNewDirectoryAction); 466 m_pMainMenu->addAction(m_pResetAction); 461 prepareActions(); 462 if (m_pToolBar) 463 { 464 if (m_pActionConfiguration) 465 m_pToolBar->addAction(m_pActionConfiguration); 466 if (m_pActionOptions) 467 m_pToolBar->addAction(m_pActionOptions); 468 } 469 // m_pMainMenu->addAction(m_pActionConfiguration); 470 // m_pMainMenu->addAction(m_pActionOptions); 471 // m_pMainMenu->addSeparator(); 472 // m_pMainMenu->addAction(m_pAddAction); 473 // m_pMainMenu->addAction(m_pRemoveAction); 474 // m_pMainMenu->addAction(m_pNewDirectoryAction); 475 // m_pMainMenu->addAction(m_pResetAction); 467 476 } 468 477 … … 543 552 bottomSpacerWidget->setVisible(true); 544 553 545 m_pVerticalToolBar->addWidget(topSpacerWidget);546 m_pVerticalToolBar->addAction(m_pAddAction);547 m_pVerticalToolBar->addAction(m_pRemoveAction);548 m_pVerticalToolBar->addAction(m_pNewDirectoryAction);549 m_pVerticalToolBar->addAction(m_pResetAction);554 // m_pVerticalToolBar->addWidget(topSpacerWidget); 555 // m_pVerticalToolBar->addAction(m_pAddAction); 556 // m_pVerticalToolBar->addAction(m_pRemoveAction); 557 // m_pVerticalToolBar->addAction(m_pNewDirectoryAction); 558 // m_pVerticalToolBar->addAction(m_pResetAction); 550 559 551 560 m_pVerticalToolBar->addWidget(bottomSpacerWidget);
Note:
See TracChangeset
for help on using the changeset viewer.
