VirtualBox

Changeset 108084 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
Feb 5, 2025 5:59:02 PM (3 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
167378
Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Rebrand Welcome related menus and actions.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

    r108083 r108084  
    173173
    174174/** Simple action extension, used as 'Show Home Screen' action class. */
    175 class UIActionToggleManagerToolsGlobalShowWelcomeScreen : public UIActionToggle
    176 {
    177     Q_OBJECT;
    178 
    179 public:
    180 
    181     /** Constructs action passing @a pParent to the base-class. */
    182     UIActionToggleManagerToolsGlobalShowWelcomeScreen(UIActionPool *pParent)
     175class UIActionToggleManagerToolsGlobalShowHomeScreen : public UIActionToggle
     176{
     177    Q_OBJECT;
     178
     179public:
     180
     181    /** Constructs action passing @a pParent to the base-class. */
     182    UIActionToggleManagerToolsGlobalShowHomeScreen(UIActionPool *pParent)
    183183        : UIActionToggle(pParent)
    184184    {
    … …  
    194194    virtual QString shortcutExtraDataID() const RT_OVERRIDE
    195195    {
    196         return QString("WelcomeScreen");
    197     }
    198 
    199     /** Handles translation event. */
    200     virtual void retranslateUi() RT_OVERRIDE
    201     {
    202         setName(QApplication::translate("UIActionPool", "&Welcome Screen"));
    203         setStatusTip(QApplication::translate("UIActionPool", "Open the Welcome Screen"));
     196        return QString("HomeScreen");
     197    }
     198
     199    /** Handles translation event. */
     200    virtual void retranslateUi() RT_OVERRIDE
     201    {
     202        setName(QApplication::translate("UIActionPool", "&Home Screen"));
     203        setStatusTip(QApplication::translate("UIActionPool", "Open the Home Screen"));
    204204    }
    205205};
    … …  
    35273527    m_pool[UIActionIndexMN_M_File_S_ExportAppliance] = new UIActionSimpleManagerFileShowExportApplianceWizard(this);
    35283528    m_pool[UIActionIndexMN_M_File_M_Tools] = new UIActionMenuManagerToolsGlobal(this);
    3529     m_pool[UIActionIndexMN_M_File_M_Tools_T_WelcomeScreen] = new UIActionToggleManagerToolsGlobalShowWelcomeScreen(this);
     3529    m_pool[UIActionIndexMN_M_File_M_Tools_T_HomeScreen] = new UIActionToggleManagerToolsGlobalShowHomeScreen(this);
    35303530    m_pool[UIActionIndexMN_M_File_M_Tools_T_ExtensionPackManager] = new UIActionToggleManagerToolsGlobalShowExtensionPackManager(this);
    35313531    m_pool[UIActionIndexMN_M_File_M_Tools_T_VirtualMediaManager] = new UIActionToggleManagerToolsGlobalShowVirtualMediaManager(this);
    … …  
    35393539    m_pool[UIActionIndexMN_M_File_S_Close] = new UIActionSimpleManagerFilePerformExit(this);
    35403540
    3541     /* 'Welcome' actions: */
    3542     m_pool[UIActionIndexMN_M_Welcome] = new UIActionMenuManagerMachine(this);
    3543     m_pool[UIActionIndexMN_M_Welcome_S_New] = new UIActionSimpleManagerMachinePerformCreate(this);
    3544     m_pool[UIActionIndexMN_M_Welcome_S_Add] = new UIActionSimpleManagerMachinePerformAdd(this);
     3541    /* 'Home' actions: */
     3542    m_pool[UIActionIndexMN_M_Home] = new UIActionMenuManagerMachine(this);
     3543    m_pool[UIActionIndexMN_M_Home_S_New] = new UIActionSimpleManagerMachinePerformCreate(this);
     3544    m_pool[UIActionIndexMN_M_Home_S_Add] = new UIActionSimpleManagerMachinePerformAdd(this);
    35453545
    35463546    /* 'Group' actions: */
    … …  
    36873687    /* 'File' action groups: */
    36883688    m_groupPool[UIActionIndexMN_M_File_M_Tools] = new QActionGroup(m_pool.value(UIActionIndexMN_M_File_M_Tools));
    3689     m_groupPool[UIActionIndexMN_M_File_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_File_M_Tools_T_WelcomeScreen));
     3689    m_groupPool[UIActionIndexMN_M_File_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_File_M_Tools_T_HomeScreen));
    36903690    m_groupPool[UIActionIndexMN_M_File_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_File_M_Tools_T_ExtensionPackManager));
    36913691    m_groupPool[UIActionIndexMN_M_File_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_File_M_Tools_T_VirtualMediaManager));
    … …  
    37143714    m_menuUpdateHandlers[UIActionIndexMN_M_File].ptfm =                  &UIActionPoolManager::updateMenuFile;
    37153715    m_menuUpdateHandlers[UIActionIndexMN_M_File_M_Tools].ptfm =          &UIActionPoolManager::updateMenuFileTools;
    3716     m_menuUpdateHandlers[UIActionIndexMN_M_Welcome].ptfm =               &UIActionPoolManager::updateMenuWelcome;
     3716    m_menuUpdateHandlers[UIActionIndexMN_M_Home].ptfm =                  &UIActionPoolManager::updateMenuHome;
    37173717    m_menuUpdateHandlers[UIActionIndexMN_M_Group].ptfm =                 &UIActionPoolManager::updateMenuGroup;
    37183718    m_menuUpdateHandlers[UIActionIndexMN_M_Machine].ptfm =               &UIActionPoolManager::updateMenuMachine;
    … …  
    37843784    updateMenuFileTools();
    37853785
    3786     /* 'Welcome' menu: */
    3787     addMenu(m_mainMenus, action(UIActionIndexMN_M_Welcome));
    3788     updateMenuWelcome();
     3786    /* 'Home' menu: */
     3787    addMenu(m_mainMenus, action(UIActionIndexMN_M_Home));
     3788    updateMenuHome();
    37893789    /* 'Group' menu: */
    37903790    addMenu(m_mainMenus, action(UIActionIndexMN_M_Group));
    … …  
    38573857    switch (iIndex)
    38583858    {
    3859         case UIActionIndexMN_M_Welcome:
     3859        case UIActionIndexMN_M_Home:
    38603860        {
    3861             actions << action(UIActionIndexMN_M_Welcome_S_New)
    3862                     << action(UIActionIndexMN_M_Welcome_S_Add);
     3861            actions << action(UIActionIndexMN_M_Home_S_New)
     3862                    << action(UIActionIndexMN_M_Home_S_Add);
    38633863            break;
    38643864        }
    … …  
    40704070}
    40714071
    4072 void UIActionPoolManager::updateMenuWelcome()
     4072void UIActionPoolManager::updateMenuHome()
    40734073{
    40744074    /* Get corresponding menu: */
    4075     UIMenu *pMenu = action(UIActionIndexMN_M_Welcome)->menu();
     4075    UIMenu *pMenu = action(UIActionIndexMN_M_Home)->menu();
    40764076    AssertPtrReturnVoid(pMenu);
    40774077    /* Clear contents: */
    40784078    pMenu->clear();
    40794079
    4080     /* Populate 'Welcome' menu: */
    4081     pMenu->addAction(action(UIActionIndexMN_M_Welcome_S_New));
    4082     pMenu->addAction(action(UIActionIndexMN_M_Welcome_S_Add));
     4080    /* Populate 'Home' menu: */
     4081    pMenu->addAction(action(UIActionIndexMN_M_Home_S_New));
     4082    pMenu->addAction(action(UIActionIndexMN_M_Home_S_Add));
    40834083
    40844084    /* Mark menu as valid: */
    4085     m_invalidations.remove(UIActionIndexMN_M_Welcome);
     4085    m_invalidations.remove(UIActionIndexMN_M_Home);
    40864086}
    40874087

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h

    r107355 r108084  
    5050    UIActionIndexMN_M_File_S_ExportAppliance,
    5151    UIActionIndexMN_M_File_M_Tools,
    52     UIActionIndexMN_M_File_M_Tools_T_WelcomeScreen,
     52    UIActionIndexMN_M_File_M_Tools_T_HomeScreen,
    5353    UIActionIndexMN_M_File_M_Tools_T_ExtensionPackManager,
    5454    UIActionIndexMN_M_File_M_Tools_T_VirtualMediaManager,
    … …  
    6262    UIActionIndexMN_M_File_S_Close,
    6363
    64     /* 'Welcome' menu actions: */
    65     UIActionIndexMN_M_Welcome,
    66     UIActionIndexMN_M_Welcome_S_New,
    67     UIActionIndexMN_M_Welcome_S_Add,
     64    /* 'Home' menu actions: */
     65    UIActionIndexMN_M_Home,
     66    UIActionIndexMN_M_Home_S_New,
     67    UIActionIndexMN_M_Home_S_Add,
    6868
    6969    /* 'Group' menu actions: */
    … …  
    254254    /** Updates 'File' / 'Tools' menu. */
    255255    void updateMenuFileTools();
    256     /** Updates 'Welcome' menu. */
    257     void updateMenuWelcome();
     256    /** Updates 'Home' menu. */
     257    void updateMenuHome();
    258258    /** Updates 'Group' menu. */
    259259    void updateMenuGroup();

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

    r108083 r108084  
    25492549            this, &UIVirtualBoxManager::sltPerformSwitchToGlobalTool);
    25502550
    2551     /* 'Welcome' menu connections: */
    2552     connect(actionPool()->action(UIActionIndexMN_M_Welcome_S_New), &UIAction::triggered,
     2551    /* 'Home' menu connections: */
     2552    connect(actionPool()->action(UIActionIndexMN_M_Home_S_New), &UIAction::triggered,
    25532553            this, &UIVirtualBoxManager::sltOpenNewMachineWizard);
    2554     connect(actionPool()->action(UIActionIndexMN_M_Welcome_S_Add), &UIAction::triggered,
     2554    connect(actionPool()->action(UIActionIndexMN_M_Home_S_Add), &UIAction::triggered,
    25552555            this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
    25562556
    … …  
    28182818{
    28192819    /* Lock the actions preventing cascade calls: */
    2820     UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_Welcome_S_Add)
     2820    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_Home_S_Add)
    28212821                                                         << actionPool()->action(UIActionIndexMN_M_Machine_S_Add)
    28222822                                                         << actionPool()->action(UIActionIndexMN_M_Group_S_Add),
    … …  
    34293429    const bool fGroupMenuShown   = m_pWidget->isGroupItemSelected()   &&  isSingleGroupSelected();
    34303430    const bool fMachineMenuShown = m_pWidget->isMachineItemSelected() && !isSingleGroupSelected();
    3431     actionPool()->action(UIActionIndexMN_M_Welcome)->setVisible(fGlobalMenuShown);
     3431    actionPool()->action(UIActionIndexMN_M_Home)->setVisible(fGlobalMenuShown);
    34323432    actionPool()->action(UIActionIndexMN_M_Group)->setVisible(fGroupMenuShown);
    34333433    actionPool()->action(UIActionIndexMN_M_Machine)->setVisible(fMachineMenuShown);
    … …  
    34683468    /* Hide action shortcuts: */
    34693469    if (!fGlobalMenuShown)
    3470         actionPool()->setShortcutsVisible(UIActionIndexMN_M_Welcome, false);
     3470        actionPool()->setShortcutsVisible(UIActionIndexMN_M_Home, false);
    34713471    if (!fGroupMenuShown)
    34723472        actionPool()->setShortcutsVisible(UIActionIndexMN_M_Group, false);
    … …  
    34763476    /* Show action shortcuts: */
    34773477    if (fGlobalMenuShown)
    3478         actionPool()->setShortcutsVisible(UIActionIndexMN_M_Welcome, true);
     3478        actionPool()->setShortcutsVisible(UIActionIndexMN_M_Home, true);
    34793479    if (fGroupMenuShown)
    34803480        actionPool()->setShortcutsVisible(UIActionIndexMN_M_Group, true);
    … …  
    34943494
    34953495    /* Enable/disable welcome actions: */
    3496     actionPool()->action(UIActionIndexMN_M_Welcome_S_New)->setEnabled(isActionEnabled(UIActionIndexMN_M_Welcome_S_New, items));
    3497     actionPool()->action(UIActionIndexMN_M_Welcome_S_Add)->setEnabled(isActionEnabled(UIActionIndexMN_M_Welcome_S_Add, items));
     3496    actionPool()->action(UIActionIndexMN_M_Home_S_New)->setEnabled(isActionEnabled(UIActionIndexMN_M_Home_S_New, items));
     3497    actionPool()->action(UIActionIndexMN_M_Home_S_Add)->setEnabled(isActionEnabled(UIActionIndexMN_M_Home_S_Add, items));
    34983498
    34993499    /* Enable/disable group actions: */
    … …  
    36693669        case UIActionIndexMN_M_File_S_ExportAppliance:
    36703670        case UIActionIndexMN_M_File_S_ImportAppliance:
    3671         case UIActionIndexMN_M_Welcome_S_New:
    3672         case UIActionIndexMN_M_Welcome_S_Add:
     3671        case UIActionIndexMN_M_Home_S_New:
     3672        case UIActionIndexMN_M_Home_S_Add:
    36733673            return true;
    36743674        default:

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerAdvancedWidget.cpp

    r108083 r108084  
    501501            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ExportAppliance));
    502502            m_pToolBar->addSeparator();
    503             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Welcome_S_New));
    504             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Welcome_S_Add));
     503            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Home_S_New));
     504            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Home_S_Add));
    505505            break;
    506506        }

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

    r108083 r108084  
    926926                m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ExportAppliance));
    927927                m_pToolBar->addSeparator();
    928                 m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Welcome_S_New));
    929                 m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Welcome_S_Add));
     928                m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Home_S_New));
     929                m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Home_S_Add));
    930930                break;
    931931            }

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

    r108083 r108084  
    225225    const UIToolType enmType = currentItem() ? currentItem()->itemType() : UIToolType_Home;
    226226    QMap<UIToolType, UIAction*> actions;
    227     actions[UIToolType_Home] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_WelcomeScreen);
     227    actions[UIToolType_Home] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_HomeScreen);
    228228    actions[UIToolType_Extensions] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_ExtensionPackManager);
    229229    actions[UIToolType_Media] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_VirtualMediaManager);
    … …  
    353353            continue;
    354354
    355         /* In widget mode we should add spacing after Welcome item: */
     355        /* In widget mode we should add spacing after Home item: */
    356356        if (   !tools()->isPopup()
    357357            && enmLastType == UIToolType_Home)
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette