- Timestamp:
- Oct 18, 2018 1:49:12 PM (6 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src
- Files:
-
- 6 edited
-
cloud/UICloudProfileManager.cpp (modified) (5 diffs)
-
cloud/UICloudProfileManager.h (modified) (1 diff)
-
globals/UIActionPoolSelector.cpp (modified) (4 diffs)
-
globals/UIActionPoolSelector.h (modified) (1 diff)
-
manager/UIVirtualBoxManager.cpp (modified) (1 diff)
-
manager/UIVirtualBoxManagerWidget.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp
r74917 r74920 258 258 } 259 259 260 void UICloudProfileManagerWidget::slt CreateCloudProfile()260 void UICloudProfileManagerWidget::sltAddCloudProfile() 261 261 { 262 262 /// @todo create cloud profile! … … 298 298 299 299 /* Update actions availability: */ 300 m_pActionPool->action(UIActionIndexST_M_Cloud_S_ Create)->setEnabled(!pItem || pItemProvider);300 m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add)->setEnabled(!pItem || pItemProvider); 301 301 m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove)->setEnabled(pItemProfile); 302 302 m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->setEnabled(pItemProfile); … … 333 333 else if (pItemProvider) 334 334 { 335 menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_ Create));335 menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add)); 336 336 // menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Refresh)); 337 337 } … … 361 361 { 362 362 /* Connect actions: */ 363 connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_ Create), &QAction::triggered,364 this, &UICloudProfileManagerWidget::slt CreateCloudProfile);363 connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add), &QAction::triggered, 364 this, &UICloudProfileManagerWidget::sltAddCloudProfile); 365 365 connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove), &QAction::triggered, 366 366 this, &UICloudProfileManagerWidget::sltRemoveCloudProfile); … … 407 407 408 408 /* Add toolbar actions: */ 409 m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_ Create));409 m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add)); 410 410 m_pToolBar->addSeparator(); 411 411 m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove)); -
trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.h
r74896 r74920 90 90 * @{ */ 91 91 /** Handles command to create cloud profile. */ 92 void slt CreateCloudProfile();92 void sltAddCloudProfile(); 93 93 /** Handles command to remove cloud profile. */ 94 94 void sltRemoveCloudProfile(); -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolSelector.cpp
r74889 r74920 2375 2375 }; 2376 2376 2377 /** Simple action extension, used as 'Perform Create' action class. */2378 class UIActionMenuSelectorCloudPerform Create: public UIActionSimple2379 { 2380 Q_OBJECT; 2381 2382 public: 2383 2384 /** Constructs action passing @a pParent to the base-class. */ 2385 UIActionMenuSelectorCloudPerform Create(UIActionPool *pParent)2377 /** Simple action extension, used as 'Perform Add' action class. */ 2378 class UIActionMenuSelectorCloudPerformAdd : public UIActionSimple 2379 { 2380 Q_OBJECT; 2381 2382 public: 2383 2384 /** Constructs action passing @a pParent to the base-class. */ 2385 UIActionMenuSelectorCloudPerformAdd(UIActionPool *pParent) 2386 2386 : UIActionSimple(pParent, 2387 2387 ":/cloud_profile_add_32px.png", ":/cloud_profile_add_16px.png", … … 2394 2394 virtual QString shortcutExtraDataID() const /* override */ 2395 2395 { 2396 return QString(" CreateCloudProfile");2397 } 2398 2399 /** Returns default shortcut. */ 2400 virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */ 2401 { 2402 return QKeySequence("Ctrl+Shift+ C");2403 } 2404 2405 /** Handles translation event. */ 2406 virtual void retranslateUi() /* override */ 2407 { 2408 setIconText(QApplication::translate("UIActionPool", " Create"));2409 setName(QApplication::translate("UIActionPool", "& CreateProfile..."));2396 return QString("AddCloudProfile"); 2397 } 2398 2399 /** Returns default shortcut. */ 2400 virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */ 2401 { 2402 return QKeySequence("Ctrl+Shift+A"); 2403 } 2404 2405 /** Handles translation event. */ 2406 virtual void retranslateUi() /* override */ 2407 { 2408 setIconText(QApplication::translate("UIActionPool", "Add")); 2409 setName(QApplication::translate("UIActionPool", "&Add Profile...")); 2410 2410 setShortcutScope(QApplication::translate("UIActionPool", "Cloud Profile Manager")); 2411 setStatusTip(QApplication::translate("UIActionPool", " Createnew cloud profile"));2412 setToolTip(tr(" CreateCloud Profile (%1)").arg(shortcut().toString()));2411 setStatusTip(QApplication::translate("UIActionPool", "Add new cloud profile")); 2412 setToolTip(tr("Add Cloud Profile (%1)").arg(shortcut().toString())); 2413 2413 } 2414 2414 }; … … 2650 2650 m_pool[UIActionIndexST_M_CloudWindow] = new UIActionMenuSelectorCloud(this); 2651 2651 m_pool[UIActionIndexST_M_Cloud] = new UIActionMenuSelectorCloud(this); 2652 m_pool[UIActionIndexST_M_Cloud_S_ Create] = new UIActionMenuSelectorCloudPerformCreate(this);2652 m_pool[UIActionIndexST_M_Cloud_S_Add] = new UIActionMenuSelectorCloudPerformAdd(this); 2653 2653 m_pool[UIActionIndexST_M_Cloud_S_Remove] = new UIActionMenuSelectorCloudPerformRemove(this); 2654 2654 m_pool[UIActionIndexST_M_Cloud_T_Details] = new UIActionMenuSelectorCloudToggleProperties(this); … … 2830 2830 bool fSeparator = false; 2831 2831 2832 /* 'Create' action: */ 2833 fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Create)) || fSeparator; 2832 /* 'Add' action: */ 2833 fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Add)) || fSeparator; 2834 2835 /* Separator? */ 2836 if (fSeparator) 2837 { 2838 pMenu->addSeparator(); 2839 fSeparator = false; 2840 } 2841 2834 2842 /* 'Remove' action: */ 2835 2843 fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Remove)) || fSeparator; 2836 2837 /* Separator? */2838 if (fSeparator)2839 {2840 pMenu->addSeparator();2841 fSeparator = false;2842 }2843 2844 2844 /* 'Properties' action: */ 2845 2845 fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_T_Details)) || fSeparator; -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolSelector.h
r74868 r74920 140 140 UIActionIndexST_M_CloudWindow, 141 141 UIActionIndexST_M_Cloud, 142 UIActionIndexST_M_Cloud_S_ Create,142 UIActionIndexST_M_Cloud_S_Add, 143 143 UIActionIndexST_M_Cloud_S_Remove, 144 144 UIActionIndexST_M_Cloud_T_Details, -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
r74885 r74920 1766 1766 1767 1767 /* Remember action list: */ 1768 m_cloudProfileManagerActions << actionPool()->action(UIActionIndexST_M_Cloud_S_ Create)1768 m_cloudProfileManagerActions << actionPool()->action(UIActionIndexST_M_Cloud_S_Add) 1769 1769 << actionPool()->action(UIActionIndexST_M_Cloud_S_Remove) 1770 1770 << actionPool()->action(UIActionIndexST_M_Cloud_T_Details) -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
r74870 r74920 622 622 { 623 623 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Add)); 624 m_pToolBar->addSeparator(); 624 625 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Copy)); 625 626 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Move)); … … 627 628 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Release)); 628 629 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_T_Details)); 630 m_pToolBar->addSeparator(); 629 631 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Refresh)); 630 632 break; … … 633 635 { 634 636 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_S_Create)); 637 m_pToolBar->addSeparator(); 635 638 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_S_Remove)); 636 639 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_T_Details)); … … 640 643 case ToolTypeGlobal_Cloud: 641 644 { 642 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Create)); 645 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Add)); 646 m_pToolBar->addSeparator(); 643 647 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Remove)); 644 648 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_T_Details));
Note:
See TracChangeset
for help on using the changeset viewer.

