VirtualBox

Changeset 107289 in vbox


Ignore:
Timestamp:
Dec 11, 2024 4:29:51 PM (7 weeks ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10814: Large GUI re-compiling! Renaming UIToolType_VMActivityOverview to UIToolType_Activities.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

    r107148 r107289  
    16471647    switch (enmToolType)
    16481648    {
    1649         case UIToolType_Welcome:            strResult = "Welcome"; break;
    1650         case UIToolType_Extensions:         strResult = "Extensions"; break;
    1651         case UIToolType_Media:              strResult = "Media"; break;
    1652         case UIToolType_Network:            strResult = "Network"; break;
    1653         case UIToolType_Cloud:              strResult = "Cloud"; break;
    1654         case UIToolType_CloudConsole:       strResult = "CloudConsole"; break;
    1655         case UIToolType_VMActivityOverview: strResult = "Activities"; break;
    1656         case UIToolType_Details:            strResult = "Details"; break;
    1657         case UIToolType_Snapshots:          strResult = "Snapshots"; break;
    1658         case UIToolType_Logs:               strResult = "Logs"; break;
    1659         case UIToolType_VMActivity:         strResult = "Activity"; break;
    1660         case UIToolType_FileManager:        strResult = "FileManager"; break;
     1649        case UIToolType_Welcome:      strResult = "Welcome"; break;
     1650        case UIToolType_Extensions:   strResult = "Extensions"; break;
     1651        case UIToolType_Media:        strResult = "Media"; break;
     1652        case UIToolType_Network:      strResult = "Network"; break;
     1653        case UIToolType_Cloud:        strResult = "Cloud"; break;
     1654        case UIToolType_CloudConsole: strResult = "CloudConsole"; break;
     1655        case UIToolType_Activities:  strResult = "Activities"; break;
     1656        case UIToolType_Details:      strResult = "Details"; break;
     1657        case UIToolType_Snapshots:    strResult = "Snapshots"; break;
     1658        case UIToolType_Logs:         strResult = "Logs"; break;
     1659        case UIToolType_VMActivity:   strResult = "Activity"; break;
     1660        case UIToolType_FileManager:  strResult = "FileManager"; break;
    16611661        default:
    16621662        {
    … …  
    16841684        return UIToolType_CloudConsole;
    16851685    if (strToolType.compare("Activities", Qt::CaseInsensitive) == 0)
    1686         return UIToolType_VMActivityOverview;
     1686        return UIToolType_Activities;
    16871687    if (strToolType.compare("Details", Qt::CaseInsensitive) == 0)
    16881688        return UIToolType_Details;

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

    r107148 r107289  
    296296                case UIToolType_Cloud:
    297297                case UIToolType_CloudConsole:
    298                 case UIToolType_VMActivityOverview:
     298                case UIToolType_Activities:
    299299                    return true;
    300300                default:

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

    r107148 r107289  
    954954    UIToolType_Cloud,
    955955    UIToolType_CloudConsole,
    956     UIToolType_VMActivityOverview,
     956    UIToolType_Activities,
    957957    /* Machine types: */
    958958    UIToolType_Error,

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

    r106709 r107289  
    372372        : UIActionToggle(pParent)
    373373    {
    374         setProperty("UIToolType", QVariant::fromValue(UIToolType_VMActivityOverview));
     374        setProperty("UIToolType", QVariant::fromValue(UIToolType_Activities));
    375375        /// @todo use icons with check-boxes
    376376        setIcon(UIIconPool::iconSetFull(":/resources_monitor_24px.png", ":/resources_monitor_16px.png",

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

    r106061 r107289  
    218218                break;
    219219            }
    220             case UIToolType_VMActivityOverview:
     220            case UIToolType_Activities:
    221221            {
    222222                /* Create VM Activity Overview: */
    … …  
    230230
    231231                    /* Configure pane: */
    232                     m_pPaneVMActivityOverview->setProperty("ToolType", QVariant::fromValue(UIToolType_VMActivityOverview));
     232                    m_pPaneVMActivityOverview->setProperty("ToolType", QVariant::fromValue(UIToolType_Activities));
    233233                    connect(m_pPaneVMActivityOverview, &UIVMActivityOverviewWidget::sigSwitchToMachineActivityPane,
    234234                            this, &UIToolPaneGlobal::sigSwitchToMachineActivityPane);
    … …  
    265265        switch (enmType)
    266266        {
    267             case UIToolType_Welcome:            m_pPaneWelcome = 0; break;
    268             case UIToolType_Extensions:         m_pPaneExtensions = 0; break;
    269             case UIToolType_Media:              m_pPaneMedia = 0; break;
    270             case UIToolType_Network:            m_pPaneNetwork = 0; break;
    271             case UIToolType_Cloud:              m_pPaneCloud = 0; break;
    272             case UIToolType_VMActivityOverview: m_pPaneVMActivityOverview = 0; break;
     267            case UIToolType_Welcome:    m_pPaneWelcome = 0; break;
     268            case UIToolType_Extensions: m_pPaneExtensions = 0; break;
     269            case UIToolType_Media:      m_pPaneMedia = 0; break;
     270            case UIToolType_Network:    m_pPaneNetwork = 0; break;
     271            case UIToolType_Cloud:      m_pPaneCloud = 0; break;
     272            case UIToolType_Activities: m_pPaneVMActivityOverview = 0; break;
    273273            default: break;
    274274        }
    … …  
    304304            pCurrentToolWidget = m_pPaneCloud;
    305305            break;
    306         case UIToolType_VMActivityOverview:
     306        case UIToolType_Activities:
    307307            pCurrentToolWidget = m_pPaneVMActivityOverview;
    308308            break;
    … …  
    319319
    320320    /* Update activity overview pane if open: */
    321     if (isToolOpened(UIToolType_VMActivityOverview))
     321    if (isToolOpened(UIToolType_Activities))
    322322    {
    323323        AssertPtrReturnVoid(m_pPaneVMActivityOverview);
    … …  
    350350    /* Determine whether resource monitor is currently active tool: */
    351351    if (m_pPaneVMActivityOverview)
    352         m_pPaneVMActivityOverview->setIsCurrentTool(m_fActive && currentTool() == UIToolType_VMActivityOverview);
    353 }
     352        m_pPaneVMActivityOverview->setIsCurrentTool(m_fActive && currentTool() == UIToolType_Activities);
     353}

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

    r107286 r107289  
    34463446    const bool fCloudMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Cloud;
    34473447    actionPool()->action(UIActionIndexMN_M_Cloud)->setVisible(fCloudMenuShown);
    3448     /* Determine whether Resources menu should be visible: */
    3449     const bool fResourcesMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_VMActivityOverview;
     3448    /* Determine whether Activities menu should be visible: */
     3449    const bool fResourcesMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Activities;
    34503450    actionPool()->action(UIActionIndexMN_M_VMActivityOverview)->setVisible(fResourcesMenuShown);
    34513451

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

    r107288 r107289  
    517517
    518518void UIVirtualBoxManagerAdvancedWidget::sltHandleCloudProfileStateChange(const QString &strProviderShortName,
    519                                                                  const QString &strProfileName)
     519                                                                         const QString &strProfileName)
    520520{
    521521    RT_NOREF(strProviderShortName, strProfileName);
    … …  
    523523    /* If Global Activity Overview tool is currently chosen: */
    524524    if (   m_pStackedWidget->currentWidget() == m_pPaneToolsGlobal
    525         && m_pPaneToolsGlobal->currentTool() == UIToolType_VMActivityOverview)
     525        && m_pPaneToolsGlobal->currentTool() == UIToolType_Activities)
    526526        m_pPaneToolsGlobal->setCloudMachineItems(m_pPaneChooser->cloudMachineItems());
    527527}
    … …  
    608608    AssertPtrReturnVoid(m_pPaneChooser);
    609609    AssertPtrReturnVoid(m_pMenuToolsGlobal);
    610     m_pMenuToolsGlobal->setToolsType(UIToolType_VMActivityOverview);
     610    m_pMenuToolsGlobal->setToolsType(UIToolType_Activities);
    611611    m_pPaneChooser->setCurrentGlobal();
    612612}
    … …  
    930930                break;
    931931            }
    932             case UIToolType_VMActivityOverview:
     932            case UIToolType_Activities:
    933933            {
    934934                m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_M_Columns));
    … …  
    11961196        if (UIToolStuff::isTypeOfClass(enmType, UIToolClass_Global))
    11971197        {
    1198             bool fActivityOverviewActive = enmType == UIToolType_VMActivityOverview;
     1198            bool fActivityOverviewActive = enmType == UIToolType_Activities;
    11991199            m_pPaneChooser->setKeepCloudNodesUpdated(fActivityOverviewActive);
    12001200            if (fActivityOverviewActive)

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

    r107284 r107289  
    549549    /* If Global Activity Overview tool is currently chosen: */
    550550    if (   m_pStackedWidget->currentWidget() == m_pPaneToolsGlobal
    551         && m_pPaneToolsGlobal->currentTool() == UIToolType_VMActivityOverview)
     551        && m_pPaneToolsGlobal->currentTool() == UIToolType_Activities)
    552552        m_pPaneToolsGlobal->setCloudMachineItems(m_pPaneChooser->cloudMachineItems());
    553553}
    … …  
    634634    AssertPtrReturnVoid(m_pPaneChooser);
    635635    AssertPtrReturnVoid(m_pMenuToolsGlobal);
    636     m_pMenuToolsGlobal->setToolsType(UIToolType_VMActivityOverview);
     636    m_pMenuToolsGlobal->setToolsType(UIToolType_Activities);
    637637    m_pPaneChooser->setCurrentGlobal();
    638638}
    … …  
    971971                break;
    972972            }
    973             case UIToolType_VMActivityOverview:
     973            case UIToolType_Activities:
    974974            {
    975975                m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_M_Columns));
    … …  
    12371237        if (UIToolStuff::isTypeOfClass(enmType, UIToolClass_Global))
    12381238        {
    1239             bool fActivityOverviewActive = enmType == UIToolType_VMActivityOverview;
     1239            bool fActivityOverviewActive = enmType == UIToolType_Activities;
    12401240            m_pPaneChooser->setKeepCloudNodesUpdated(fActivityOverviewActive);
    12411241            if (fActivityOverviewActive)

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

    r106061 r107289  
    233233    actions[UIToolType_Network] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_NetworkManager);
    234234    actions[UIToolType_Cloud] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_CloudProfileManager);
    235     actions[UIToolType_VMActivityOverview] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_VMActivityOverview);
     235    actions[UIToolType_Activities] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_VMActivityOverview);
    236236    if (actions.contains(enmType))
    237237        actions.value(enmType)->setChecked(true);
    … …  
    421421        switch (pItem->itemType())
    422422        {
    423             case UIToolType_Welcome:            pItem->reconfigure(tr("Welcome")); break;
    424             case UIToolType_Extensions:         pItem->reconfigure(tr("Extensions")); break;
    425             case UIToolType_Media:              pItem->reconfigure(tr("Media")); break;
    426             case UIToolType_Network:            pItem->reconfigure(tr("Network")); break;
    427             case UIToolType_Cloud:              pItem->reconfigure(tr("Cloud")); break;
    428             case UIToolType_VMActivityOverview: pItem->reconfigure(tr("Activities")); break;
    429             case UIToolType_Details:            pItem->reconfigure(tr("Details")); break;
    430             case UIToolType_Snapshots:          pItem->reconfigure(tr("Snapshots")); break;
    431             case UIToolType_Logs:               pItem->reconfigure(tr("Logs")); break;
    432             case UIToolType_VMActivity:         pItem->reconfigure(tr("Activity")); break;
    433             case UIToolType_FileManager:        pItem->reconfigure(tr("File Manager")); break;
     423            case UIToolType_Welcome:     pItem->reconfigure(tr("Welcome")); break;
     424            case UIToolType_Extensions:  pItem->reconfigure(tr("Extensions")); break;
     425            case UIToolType_Media:       pItem->reconfigure(tr("Media")); break;
     426            case UIToolType_Network:     pItem->reconfigure(tr("Network")); break;
     427            case UIToolType_Cloud:       pItem->reconfigure(tr("Cloud")); break;
     428            case UIToolType_Activities: pItem->reconfigure(tr("Activities")); break;
     429            case UIToolType_Details:     pItem->reconfigure(tr("Details")); break;
     430            case UIToolType_Snapshots:   pItem->reconfigure(tr("Snapshots")); break;
     431            case UIToolType_Logs:        pItem->reconfigure(tr("Logs")); break;
     432            case UIToolType_VMActivity:  pItem->reconfigure(tr("Activity")); break;
     433            case UIToolType_FileManager: pItem->reconfigure(tr("File Manager")); break;
    434434            default: break;
    435435        }
    … …  
    496496
    497497            /* Activities: */
    498             m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_VMActivityOverview, QString(),
     498            m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Activities, QString(),
    499499                                       UIIconPool::iconSet(":/resources_monitor_24px.png",
    500500                                                           ":/resources_monitor_disabled_24px.png"));
Note: See TracChangeset for help on using the changeset viewer.

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