Changeset 78323 in vbox for trunk/src/VBox/Frontends
- Timestamp:
- Apr 26, 2019 1:07:58 PM (6 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 7 edited
- 8 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
r77366 r78323 93 93 <file alias="cloud_profile_restore_disabled_16px.png">images/cloud_profile_restore_disabled_16px.png</file> 94 94 <file alias="cloud_profile_restore_disabled_32px.png">images/cloud_profile_restore_disabled_32px.png</file> 95 <file alias="cloud_profile_try_16px.png">images/cloud_profile_try_16px.png</file> 96 <file alias="cloud_profile_try_32px.png">images/cloud_profile_try_32px.png</file> 97 <file alias="cloud_profile_try_disabled_16px.png">images/cloud_profile_try_disabled_16px.png</file> 98 <file alias="cloud_profile_try_disabled_32px.png">images/cloud_profile_try_disabled_32px.png</file> 95 99 <file alias="collapse_all_16px.png">images/collapse_all_16px.png</file> 96 100 <file alias="connect_16px.png">images/connect_16px.png</file> -
trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc
r77366 r78323 93 93 <file alias="cloud_profile_restore_disabled_16px_x2.png">images/x2/cloud_profile_restore_disabled_16px_x2.png</file> 94 94 <file alias="cloud_profile_restore_disabled_32px_x2.png">images/x2/cloud_profile_restore_disabled_32px_x2.png</file> 95 <file alias="cloud_profile_try_16px_x2.png">images/x2/cloud_profile_try_16px_x2.png</file> 96 <file alias="cloud_profile_try_32px_x2.png">images/x2/cloud_profile_try_32px_x2.png</file> 97 <file alias="cloud_profile_try_disabled_16px_x2.png">images/x2/cloud_profile_try_disabled_16px_x2.png</file> 98 <file alias="cloud_profile_try_disabled_32px_x2.png">images/x2/cloud_profile_try_disabled_32px_x2.png</file> 95 99 <file alias="collapse_all_16px_x2.png">images/x2/collapse_all_16px_x2.png</file> 96 100 <file alias="connect_16px_x2.png">images/x2/connect_16px_x2.png</file> -
trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp
r76606 r78323 480 480 } 481 481 482 void UICloudProfileManagerWidget::sltShowCloudProfileTryPage() 483 { 484 vboxGlobal().openURL("https://myservices.us.oraclecloud.com/mycloud/signup"); 485 } 486 482 487 void UICloudProfileManagerWidget::sltShowCloudProfileHelp() 483 488 { … … 566 571 addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove)); 567 572 addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)); 573 addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage)); 568 574 addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help)); 569 575 … … 577 583 connect(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details), &QAction::toggled, 578 584 this, &UICloudProfileManagerWidget::sltToggleCloudProfileDetailsVisibility); 585 connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage), &QAction::triggered, 586 this, &UICloudProfileManagerWidget::sltShowCloudProfileTryPage); 579 587 connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help), &QAction::triggered, 580 588 this, &UICloudProfileManagerWidget::sltShowCloudProfileHelp); … … 623 631 m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)); 624 632 m_pToolBar->addSeparator(); 633 m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage)); 625 634 m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help)); 626 635 -
trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.h
r76581 r78323 103 103 /** Handles command to make cloud profile details @a fVisible. */ 104 104 void sltToggleCloudProfileDetailsVisibility(bool fVisible); 105 /** Handles command to show cloud profile help. */ 106 void sltShowCloudProfileTryPage(); 105 107 /** Handles command to show cloud profile help. */ 106 108 void sltShowCloudProfileHelp(); -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp
r77677 r78323 2614 2614 setStatusTip(QApplication::translate("UIActionPool", "Open pane with selected cloud profile properties")); 2615 2615 setToolTip(QApplication::translate("UIActionPool", "Open Cloud Profile Properties (%1)").arg(shortcut().toString())); 2616 } 2617 }; 2618 2619 /** Simple action extension, used as 'Try Page' action class. */ 2620 class UIActionMenuSelectorCloudShowTryPage : public UIActionSimple 2621 { 2622 Q_OBJECT; 2623 2624 public: 2625 2626 /** Constructs action passing @a pParent to the base-class. */ 2627 UIActionMenuSelectorCloudShowTryPage(UIActionPool *pParent) 2628 : UIActionSimple(pParent, 2629 ":/cloud_profile_try_32px.png", ":/cloud_profile_try_16px.png", 2630 ":/cloud_profile_try_disabled_32px.png", ":/cloud_profile_try_disabled_16px.png") 2631 { 2632 setShortcutContext(Qt::WidgetWithChildrenShortcut); 2633 } 2634 2635 protected: 2636 2637 /** Returns shortcut extra-data ID. */ 2638 virtual QString shortcutExtraDataID() const /* override */ 2639 { 2640 return QString("ShowCloudProfileTryPage"); 2641 } 2642 2643 /** Returns default shortcut. */ 2644 virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */ 2645 { 2646 return QKeySequence("Ctrl+Shift+T"); 2647 } 2648 2649 /** Handles translation event. */ 2650 virtual void retranslateUi() /* override */ 2651 { 2652 setIconText(QApplication::translate("UIActionPool", "Try")); 2653 setName(QApplication::translate("UIActionPool", "&Try Oracle Cloud for Free...")); 2654 setShortcutScope(QApplication::translate("UIActionPool", "Cloud Profile Manager")); 2655 setStatusTip(QApplication::translate("UIActionPool", "Try Oracle cloud for free")); 2656 const QString strToolTip = QApplication::translate("UIActionPool", "Try Oracle Cloud for Free"); 2657 setToolTip(shortcut().isEmpty() ? strToolTip : QString("%1 (%2)").arg(strToolTip, shortcut().toString())); 2616 2658 } 2617 2659 }; … … 2790 2832 m_pool[UIActionIndexST_M_Cloud_S_Remove] = new UIActionMenuSelectorCloudPerformRemove(this); 2791 2833 m_pool[UIActionIndexST_M_Cloud_T_Details] = new UIActionMenuSelectorCloudToggleProperties(this); 2834 m_pool[UIActionIndexST_M_Cloud_S_TryPage] = new UIActionMenuSelectorCloudShowTryPage(this); 2792 2835 m_pool[UIActionIndexST_M_Cloud_S_Help] = new UIActionMenuSelectorCloudShowHelp(this); 2793 2836 … … 3360 3403 } 3361 3404 3405 /* 'Try Page' action: */ 3406 fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_TryPage)) || fSeparator; 3362 3407 /* 'Help' action: */ 3363 3408 fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Help)) || fSeparator; -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h
r77677 r78323 159 159 UIActionIndexST_M_Cloud_S_Remove, 160 160 UIActionIndexST_M_Cloud_T_Details, 161 UIActionIndexST_M_Cloud_S_TryPage, 161 162 UIActionIndexST_M_Cloud_S_Help, 162 163 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
r77337 r78323 599 599 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_T_Details)); 600 600 m_pToolBar->addSeparator(); 601 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_TryPage)); 601 602 m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Help)); 602 603 break;
Note:
See TracChangeset
for help on using the changeset viewer.