Changeset 92415 in vbox
- Timestamp:
- Nov 14, 2021 4:48:02 PM (3 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src
- Files:
-
- 4 edited
-
globals/UIActionPool.cpp (modified) (5 diffs)
-
globals/UIActionPool.h (modified) (1 diff)
-
medium/viso/UIVisoCreator.cpp (modified) (9 diffs)
-
medium/viso/UIVisoCreator.h (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
r92352 r92415 2242 2242 { 2243 2243 setShortcutContext(Qt::WidgetWithChildrenShortcut); 2244 setIcon(UIIconPool::iconSetFull(":/file_manager_session_32px.png", ":/file_manager_session_16px.png", 2245 ":/file_manager_session_disabled_32px.png", ":/file_manager_session_disabled_16px.png")); 2244 setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png", 2245 ":/%file_manager_options_16px.png", 2246 ":/file_manager_options_disabled_32px.png", 2247 ":/file_manager_options_disabled_16px.png")); 2246 2248 } 2247 2249 … … 2266 2268 setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); 2267 2269 setStatusTip(QApplication::translate("UIActionPool", "Open panel for VISO Creator configuration")); 2268 setToolTip( QApplication::translate("UIActionPool", "Open Configuration Panel")2270 setToolTip(QApplication::translate("UIActionPool", "Open Configuration Panel") 2269 2271 + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); 2270 2272 } … … 2283 2285 { 2284 2286 setShortcutContext(Qt::WidgetWithChildrenShortcut); 2285 setIcon(UIIconPool::iconSetFull(":/file_manager_session_32px.png", ":/file_manager_session_16px.png", 2286 ":/file_manager_session_disabled_32px.png", ":/file_manager_session_disabled_16px.png")); 2287 } 2288 2289 protected: 2290 2291 /** Returns shortcut extra-data ID. */ 2292 virtual QString shortcutExtraDataID() const /* override */ 2293 { 2294 return QString("ToggleVISOCreatorOptionsurationPanel"); 2287 setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png", 2288 ":/%file_manager_options_16px.png", 2289 ":/file_manager_options_disabled_32px.png", 2290 ":/file_manager_options_disabled_16px.png")); 2291 } 2292 2293 protected: 2294 2295 /** Returns shortcut extra-data ID. */ 2296 virtual QString shortcutExtraDataID() const /* override */ 2297 { 2298 return QString("ToggleVISOCreatorOptionsPanel"); 2295 2299 } 2296 2300 … … 2307 2311 setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); 2308 2312 setStatusTip(QApplication::translate("UIActionPool", "Open panel for VISO Creator options")); 2309 setToolTip( QApplication::translate("UIActionPool", "Open Options Panel") 2313 setToolTip(QApplication::translate("UIActionPool", "Open Options Panel") 2314 + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); 2315 } 2316 }; 2317 2318 class UIActionMenuVISOCreatorAdd : public UIActionSimple 2319 { 2320 Q_OBJECT; 2321 2322 public: 2323 /** Constructs action passing @a pParent to the base-class. */ 2324 UIActionMenuVISOCreatorAdd(UIActionPool *pParent) 2325 : UIActionSimple(pParent, 2326 ":/file_manager_copy_to_guest_24px.png", 2327 ":/file_manager_copy_to_guest_16px.png", 2328 ":/file_manager_copy_to_guest_disabled_24px.png", 2329 ":/file_manager_copy_to_guest_disabled_16px.png") 2330 { 2331 setShortcutContext(Qt::WidgetWithChildrenShortcut); 2332 } 2333 2334 protected: 2335 2336 /** Returns shortcut extra-data ID. */ 2337 virtual QString shortcutExtraDataID() const /* override */ 2338 { 2339 return QString("Add"); 2340 } 2341 2342 /** Handles translation event. */ 2343 virtual void retranslateUi() /* override */ 2344 { 2345 setName(QApplication::translate("UIActionPool", "&Add")); 2346 setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); 2347 setStatusTip(QApplication::translate("UIActionPool", "Add selected item(s) to VISO")); 2348 setToolTip(QApplication::translate("UIActionPool", "Add Selected Item(s) to VISO") 2349 + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); 2350 } 2351 }; 2352 2353 class UIActionMenuVISOCreatorRemove : public UIActionSimple 2354 { 2355 Q_OBJECT; 2356 2357 public: 2358 /** Constructs action passing @a pParent to the base-class. */ 2359 UIActionMenuVISOCreatorRemove(UIActionPool *pParent) 2360 : UIActionSimple(pParent, 2361 ":/file_manager_delete_24px.png", 2362 ":/file_manager_delete_16px.png", 2363 ":/file_manager_delete_disabled_24px.png", 2364 ":/file_manager_delete_disabled_16px.png") 2365 { 2366 setShortcutContext(Qt::WidgetWithChildrenShortcut); 2367 } 2368 2369 protected: 2370 2371 /** Returns shortcut extra-data ID. */ 2372 virtual QString shortcutExtraDataID() const /* override */ 2373 { 2374 return QString("Remove"); 2375 } 2376 2377 /** Handles translation event. */ 2378 virtual void retranslateUi() /* override */ 2379 { 2380 setName(QApplication::translate("UIActionPool", "&Remove")); 2381 setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); 2382 setStatusTip(QApplication::translate("UIActionPool", "Remove selected item(s) from VISO")); 2383 setToolTip(QApplication::translate("UIActionPool", "Remove Selected Item(s) from VISO") 2384 + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); 2385 } 2386 }; 2387 2388 class UIActionMenuVISOCreatorCreateNewDirectory : public UIActionSimple 2389 { 2390 Q_OBJECT; 2391 2392 public: 2393 /** Constructs action passing @a pParent to the base-class. */ 2394 UIActionMenuVISOCreatorCreateNewDirectory(UIActionPool *pParent) 2395 : UIActionSimple(pParent, 2396 ":/file_manager_new_directory_24px.png", 2397 ":/file_manager_new_directory_16px.png", 2398 ":/file_manager_new_directory_disabled_24px.png", 2399 ":/file_manager_new_directory_disabled_16px.png") 2400 { 2401 setShortcutContext(Qt::WidgetWithChildrenShortcut); 2402 } 2403 2404 protected: 2405 2406 /** Returns shortcut extra-data ID. */ 2407 virtual QString shortcutExtraDataID() const /* override */ 2408 { 2409 return QString("NewDirectory"); 2410 } 2411 2412 /** Handles translation event. */ 2413 virtual void retranslateUi() /* override */ 2414 { 2415 setName(QApplication::translate("UIActionPool", "&New Directory")); 2416 setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); 2417 setStatusTip(QApplication::translate("UIActionPool", "Create a new directory under the current location")); 2418 setToolTip(QApplication::translate("UIActionPool", "Create a New Directory Under the Current Location") 2419 + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); 2420 } 2421 }; 2422 2423 class UIActionMenuVISOCreatorRename : public UIActionSimple 2424 { 2425 Q_OBJECT; 2426 2427 public: 2428 /** Constructs action passing @a pParent to the base-class. */ 2429 UIActionMenuVISOCreatorRename(UIActionPool *pParent) 2430 : UIActionSimple(pParent, 2431 ":/file_manager_rename_24px.png", 2432 ":/file_manager_rename_16px.png", 2433 ":/file_manager_rename_disabled_24px.png", 2434 ":/file_manager_rename_disabled_16px.png") 2435 { 2436 setShortcutContext(Qt::WidgetWithChildrenShortcut); 2437 } 2438 2439 protected: 2440 2441 /** Returns shortcut extra-data ID. */ 2442 virtual QString shortcutExtraDataID() const /* override */ 2443 { 2444 return QString("Rename"); 2445 } 2446 2447 /** Handles translation event. */ 2448 virtual void retranslateUi() /* override */ 2449 { 2450 setName(QApplication::translate("UIActionPool", "&New Directory")); 2451 setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); 2452 setStatusTip(QApplication::translate("UIActionPool", "Rename the selected object")); 2453 setToolTip(QApplication::translate("UIActionPool", "Rename the Selected Object") 2454 + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); 2455 } 2456 }; 2457 2458 class UIActionMenuVISOCreatorReset : public UIActionSimple 2459 { 2460 Q_OBJECT; 2461 2462 public: 2463 /** Constructs action passing @a pParent to the base-class. */ 2464 UIActionMenuVISOCreatorReset(UIActionPool *pParent) 2465 : UIActionSimple(pParent, 2466 ":/cd_remove_16px.png", ":/cd_remove_disabled_16px.png") 2467 { 2468 setShortcutContext(Qt::WidgetWithChildrenShortcut); 2469 } 2470 2471 protected: 2472 2473 /** Returns shortcut extra-data ID. */ 2474 virtual QString shortcutExtraDataID() const /* override */ 2475 { 2476 return QString("Reset"); 2477 } 2478 2479 /** Handles translation event. */ 2480 virtual void retranslateUi() /* override */ 2481 { 2482 setName(QApplication::translate("UIActionPool", "&New Directory")); 2483 setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); 2484 setStatusTip(QApplication::translate("UIActionPool", "Reset the VISO content.")); 2485 setToolTip(QApplication::translate("UIActionPool", "Reset the VISO content.") 2310 2486 + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); 2311 2487 } … … 2695 2871 m_pool[UIActionIndex_M_VISOCreator_ToggleConfigPanel] = new UIActionMenuVISOCreatorToggleConfigPanel(this); 2696 2872 m_pool[UIActionIndex_M_VISOCreator_ToggleOptionsPanel] = new UIActionMenuVISOCreatorToggleOptionsPanel(this); 2873 m_pool[UIActionIndex_M_VISOCreator_Add] = new UIActionMenuVISOCreatorAdd(this); 2874 m_pool[UIActionIndex_M_VISOCreator_Remove] = new UIActionMenuVISOCreatorRemove(this); 2875 m_pool[UIActionIndex_M_VISOCreator_CreateNewDirectory] = new UIActionMenuVISOCreatorCreateNewDirectory(this); 2876 m_pool[UIActionIndex_M_VISOCreator_Rename] = new UIActionMenuVISOCreatorRename(this); 2877 m_pool[UIActionIndex_M_VISOCreator_Reset] = new UIActionMenuVISOCreatorReset(this); 2697 2878 2698 2879 /* Prepare update-handlers for known menus: */ -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
r92352 r92415 142 142 UIActionIndex_M_VISOCreator_ToggleConfigPanel, 143 143 UIActionIndex_M_VISOCreator_ToggleOptionsPanel, 144 UIActionIndex_M_VISOCreator_Add, 145 UIActionIndex_M_VISOCreator_Remove, 146 UIActionIndex_M_VISOCreator_CreateNewDirectory, 147 UIActionIndex_M_VISOCreator_Rename, 148 UIActionIndex_M_VISOCreator_Reset, 144 149 145 150 /* Maximum index: */ -
trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp
r92412 r92415 53 53 , m_pAddAction(0) 54 54 , m_pRemoveAction(0) 55 , m_p NewDirectoryAction(0)55 , m_pCreateNewDirectoryAction(0) 56 56 , m_pRenameAction(0) 57 57 , m_pResetAction(0) … … 106 106 } 107 107 108 QMenu *UIVisoCreatorWidget::menu() const 109 { 110 return m_pMainMenu; 111 } 112 108 113 void UIVisoCreatorWidget::retranslateUi() 109 114 { 110 if (m_pActionConfiguration)111 {112 m_pActionConfiguration->setText(tr("&Configuration..."));113 m_pActionConfiguration->setToolTip(tr("VISO Configuration"));114 m_pActionConfiguration->setStatusTip(tr("Manage VISO Configuration"));115 }116 if (m_pActionOptions)117 {118 m_pActionOptions->setText(tr("&Options..."));119 m_pActionOptions->setToolTip(tr("Dialog Options"));120 m_pActionOptions->setStatusTip(tr("Manage Dialog Options"));121 }122 if (m_pMainMenu)123 m_pMainMenu->setTitle(tr("VISO"));124 125 if (m_pAddAction)126 {127 m_pAddAction->setToolTip(QApplication::translate("UIVisoCreator", "Add selected file objects to VISO"));128 m_pAddAction->setText(QApplication::translate("UIVisoCreator", "Add"));129 }130 131 if (m_pRemoveAction)132 {133 m_pRemoveAction->setToolTip(QApplication::translate("UIVisoCreator", "Remove selected file objects from VISO"));134 m_pRemoveAction->setText(QApplication::translate("UIVisoCreator", "Remove"));135 }136 if (m_pNewDirectoryAction)137 {138 m_pNewDirectoryAction->setToolTip(QApplication::translate("UIVisoCreator", "Create a new directory under the current location"));139 m_pNewDirectoryAction->setText(QApplication::translate("UIVisoCreator", "New Directory"));140 }141 if (m_pResetAction)142 {143 m_pResetAction->setToolTip(QApplication::translate("UIVisoCreator", "Reset VISO content."));144 m_pResetAction->setText(QApplication::translate("UIVisoCreator", "Reset"));145 }146 if (m_pRenameAction)147 m_pRenameAction->setToolTip(QApplication::translate("UIVisoCreator", "Rename the selected object"));148 115 } 149 116 … … 236 203 { 237 204 menu.addAction(m_pRemoveAction); 238 menu.addAction(m_p NewDirectoryAction);205 menu.addAction(m_pCreateNewDirectoryAction); 239 206 menu.addAction(m_pResetAction); 240 207 } … … 261 228 #endif 262 229 263 // m_pMainMenu = menuBar()->addMenu(tr("VISO")); 264 265 // if (m_pActionConfiguration) 266 // m_pMainMenu->addAction(m_pActionConfiguration); 267 // if (m_pActionOptions) 268 // m_pMainMenu->addAction(m_pActionOptions); 230 if (m_pActionPool && m_pActionPool->action(UIActionIndex_M_VISOCreator)) 231 m_pMainMenu = m_pActionPool->action(UIActionIndex_M_VISOCreator)->menu(); 269 232 270 233 m_pToolBar = new QIToolBar(parentWidget()); … … 369 332 m_pHostBrowser, &UIVisoHostBrowser::sltHandleAddAction); 370 333 371 if (m_p NewDirectoryAction)372 connect(m_p NewDirectoryAction, &QAction::triggered,334 if (m_pCreateNewDirectoryAction) 335 connect(m_pCreateNewDirectoryAction, &QAction::triggered, 373 336 m_pVisoBrowser, &UIVisoContentBrowser::sltHandleCreateNewDirectory); 374 337 if (m_pRemoveAction) … … 386 349 { 387 350 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); 456 } 351 return; 352 353 m_pActionConfiguration = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleConfigPanel); 354 m_pActionOptions = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel); 355 356 m_pAddAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Add); 357 m_pRemoveAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Remove); 358 m_pCreateNewDirectoryAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_CreateNewDirectory); 359 m_pRenameAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Rename); 360 m_pResetAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Reset); 457 361 } 458 362 … … 467 371 m_pToolBar->addAction(m_pActionOptions); 468 372 } 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); 373 if (m_pMainMenu) 374 { 375 m_pMainMenu->addAction(m_pActionConfiguration); 376 m_pMainMenu->addAction(m_pActionOptions); 377 m_pMainMenu->addSeparator(); 378 m_pMainMenu->addAction(m_pAddAction); 379 m_pMainMenu->addAction(m_pRemoveAction); 380 m_pMainMenu->addAction(m_pCreateNewDirectoryAction); 381 m_pMainMenu->addAction(m_pResetAction); 382 } 383 384 if (m_pVerticalToolBar) 385 { 386 /* Add to dummy QWidget to toolbar to center the action icons vertically: */ 387 QWidget *topSpacerWidget = new QWidget(this); 388 topSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); 389 topSpacerWidget->setVisible(true); 390 QWidget *bottomSpacerWidget = new QWidget(this); 391 bottomSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); 392 bottomSpacerWidget->setVisible(true); 393 394 m_pVerticalToolBar->addWidget(topSpacerWidget); 395 if (m_pAddAction) 396 m_pVerticalToolBar->addAction(m_pAddAction); 397 if (m_pRemoveAction) 398 m_pVerticalToolBar->addAction(m_pRemoveAction); 399 if (m_pCreateNewDirectoryAction) 400 m_pVerticalToolBar->addAction(m_pCreateNewDirectoryAction); 401 if (m_pResetAction) 402 m_pVerticalToolBar->addAction(m_pResetAction); 403 404 m_pVerticalToolBar->addWidget(bottomSpacerWidget); 405 } 476 406 } 477 407 … … 543 473 544 474 m_pVerticalToolBar->setOrientation(Qt::Vertical); 545 546 /* Add to dummy QWidget to toolbar to center the action icons vertically: */547 QWidget *topSpacerWidget = new QWidget(this);548 topSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);549 topSpacerWidget->setVisible(true);550 QWidget *bottomSpacerWidget = new QWidget(this);551 bottomSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);552 bottomSpacerWidget->setVisible(true);553 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);559 560 m_pVerticalToolBar->addWidget(bottomSpacerWidget);561 475 } 562 476 … … 644 558 if (m_pVisoCreatorWidget) 645 559 { 560 menuBar()->addMenu(m_pVisoCreatorWidget->menu()); 646 561 pMainLayout->addWidget(m_pVisoCreatorWidget); 647 562 } -
trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h
r92397 r92415 61 61 QString currentPath() const; 62 62 void setCurrentPath(const QString &strPath); 63 QMenu *menu() const; 63 64 64 65 #ifdef VBOX_WS_MAC … … 77 78 static int visoWriteQuotedString(PRTSTREAM pStrmDst, const char *pszPrefix, 78 79 QString const &rStr, const char *pszPostFix); 80 79 81 protected: 80 82 … … 143 145 QAction *m_pAddAction; 144 146 QAction *m_pRemoveAction; 145 QAction *m_p NewDirectoryAction;147 QAction *m_pCreateNewDirectoryAction; 146 148 QAction *m_pRenameAction; 147 149 QAction *m_pResetAction;
Note:
See TracChangeset
for help on using the changeset viewer.

