VirtualBox

Ignore:
Timestamp:
Mar 10, 2021 6:14:34 PM (4 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9510 Renaming Resources Monitor to VM Activity Overview

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

Legend:

Unmodified
Added
Removed

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

    r88071 r88074  
    15121512    switch (enmToolType)
    15131513    {
    1514         case UIToolType_Welcome:      strResult = "Welcome"; break;
    1515         case UIToolType_Extensions:   strResult = "Extensions"; break;
    1516         case UIToolType_Media:        strResult = "Media"; break;
    1517         case UIToolType_Network:      strResult = "Network"; break;
    1518         case UIToolType_Cloud:        strResult = "Cloud"; break;
    1519         case UIToolType_CloudConsole: strResult = "CloudConsole"; break;
    1520         case UIToolType_Resources:    strResult = "Resources"; break;
    1521         case UIToolType_Details:      strResult = "Details"; break;
    1522         case UIToolType_Snapshots:    strResult = "Snapshots"; break;
    1523         case UIToolType_Logs:         strResult = "Logs"; break;
    1524         case UIToolType_VMActivity:   strResult = "Performance"; break;
     1514        case UIToolType_Welcome:            strResult = "Welcome"; break;
     1515        case UIToolType_Extensions:         strResult = "Extensions"; break;
     1516        case UIToolType_Media:              strResult = "Media"; break;
     1517        case UIToolType_Network:            strResult = "Network"; break;
     1518        case UIToolType_Cloud:              strResult = "Cloud"; break;
     1519        case UIToolType_CloudConsole:       strResult = "CloudConsole"; break;
     1520        case UIToolType_VMActivityOverview: strResult = "Activities"; break;
     1521        case UIToolType_Details:            strResult = "Details"; break;
     1522        case UIToolType_Snapshots:          strResult = "Snapshots"; break;
     1523        case UIToolType_Logs:               strResult = "Logs"; break;
     1524        case UIToolType_VMActivity:         strResult = "Performance"; break;
    15251525        default:
    15261526        {
    … …  
    15381538     * to search through the keys using 'case-insensitive' rule: */
    15391539    QStringList keys;       QList<UIToolType> values;
    1540     keys << "Welcome";      values << UIToolType_Welcome;
    1541     keys << "Extensions";   values << UIToolType_Extensions;
    1542     keys << "Media";        values << UIToolType_Media;
    1543     keys << "Network";      values << UIToolType_Network;
    1544     keys << "Cloud";        values << UIToolType_Cloud;
    1545     keys << "CloudConsole"; values << UIToolType_CloudConsole;
    1546     keys << "Resources";    values << UIToolType_Resources;
    1547     keys << "Details";      values << UIToolType_Details;
    1548     keys << "Snapshots";    values << UIToolType_Snapshots;
    1549     keys << "Logs";         values << UIToolType_Logs;
    1550     keys << "Performance";  values << UIToolType_VMActivity;
     1540    keys << "Welcome";       values << UIToolType_Welcome;
     1541    keys << "Extensions";    values << UIToolType_Extensions;
     1542    keys << "Media";         values << UIToolType_Media;
     1543    keys << "Network";       values << UIToolType_Network;
     1544    keys << "Cloud";         values << UIToolType_Cloud;
     1545    keys << "CloudConsole";  values << UIToolType_CloudConsole;
     1546    keys << "Activities";    values << UIToolType_VMActivityOverview;
     1547    keys << "Details";       values << UIToolType_Details;
     1548    keys << "Snapshots";     values << UIToolType_Snapshots;
     1549    keys << "Logs";          values << UIToolType_Logs;
     1550    keys << "Performance";   values << UIToolType_VMActivity;
    15511551    /* Invalid type for unknown words: */
    15521552    if (!keys.contains(strToolType, Qt::CaseInsensitive))

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

    r88071 r88074  
    271271                case UIToolType_Cloud:
    272272                case UIToolType_CloudConsole:
    273                 case UIToolType_Resources:
     273                case UIToolType_VMActivityOverview:
    274274                    return true;
    275275                default:

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

    r88071 r88074  
    897897    UIToolType_Cloud,
    898898    UIToolType_CloudConsole,
    899     UIToolType_Resources,
     899    UIToolType_VMActivityOverview,
    900900    /* Machine types: */
    901901    UIToolType_Error,

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

    r88071 r88074  
    22642264};
    22652265
    2266 /** Simple action extension, used as 'To Resources' action class. */
    2267 class UIActionMenuSelectorPerformanceToResources : public UIActionSimple
    2268 {
    2269     Q_OBJECT;
    2270 
    2271 public:
    2272 
    2273     /** Constructs action passing @a pParent to the base-class. */
    2274     UIActionMenuSelectorPerformanceToResources(UIActionPool *pParent)
     2266/** Simple action extension, used as 'To VM Activity Oveview' action class. */
     2267class UIActionMenuSelectorPerformanceToVMActivityOverview : public UIActionSimple
     2268{
     2269    Q_OBJECT;
     2270
     2271public:
     2272
     2273    /** Constructs action passing @a pParent to the base-class. */
     2274    UIActionMenuSelectorPerformanceToVMActivityOverview(UIActionPool *pParent)
    22752275        : UIActionSimple(pParent,
    22762276                         ":/resources_monitor_24px.png", ":/resource_monitor_16px.png",
    … …  
    22852285    virtual QString shortcutExtraDataID() const /* override */
    22862286    {
    2287         return QString("ToResources");
    2288     }
    2289 
    2290     /** Handles translation event. */
    2291     virtual void retranslateUi() /* override */
    2292     {
    2293         setName(QApplication::translate("UIActionPool", "&To Resurces..."));
    2294         setShortcutScope(QApplication::translate("UIActionPool", "Performance Monitor"));
    2295         setStatusTip(QApplication::translate("UIActionPool", "Navigate to the resources widget"));
    2296         setToolTip(  QApplication::translate("UIActionPool", "Navigate to Resources Widget")
     2287        return QString("ToVMActivityOverview");
     2288    }
     2289
     2290    /** Handles translation event. */
     2291    virtual void retranslateUi() /* override */
     2292    {
     2293        setName(QApplication::translate("UIActionPool", "&Activity Overview..."));
     2294        setShortcutScope(QApplication::translate("UIActionPool", "Activity Monitor"));
     2295        setStatusTip(QApplication::translate("UIActionPool", "Navigate to the vm activity overview widget"));
     2296        setToolTip(  QApplication::translate("UIActionPool", "Navigate to the VM Activity Overview Widget")
    22972297                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
    22982298    }
    … …  
    25442544    m_pool[UIActionIndex_M_Performance] = new UIActionMenuSelectorPerformance(this);
    25452545    m_pool[UIActionIndex_M_Performance_S_Export] = new UIActionMenuSelectorPerformancePerformExport(this);
    2546     m_pool[UIActionIndex_M_Performance_S_ToResources] = new UIActionMenuSelectorPerformanceToResources(this);
     2546    m_pool[UIActionIndex_M_Performance_S_ToVMActivityOverview] = new UIActionMenuSelectorPerformanceToVMActivityOverview(this);
    25472547
    25482548    /* Create 'File Manager' actions: */
    … …  
    29752975    /* 'Export' action: */
    29762976    pMenu->addAction(action(UIActionIndex_M_Performance_S_Export));
    2977     pMenu->addAction(action(UIActionIndex_M_Performance_S_ToResources));
     2977    pMenu->addAction(action(UIActionIndex_M_Performance_S_ToVMActivityOverview));
    29782978
    29792979    /* Mark menu as valid: */

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

    r88071 r88074  
    101101    UIActionIndex_M_Performance,
    102102    UIActionIndex_M_Performance_S_Export,
    103     UIActionIndex_M_Performance_S_ToResources,
     103    UIActionIndex_M_Performance_S_ToVMActivityOverview,
    104104
    105105    /* File Manager actions: */

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

    r88071 r88074  
    365365        : UIActionToggle(pParent)
    366366    {
    367         setProperty("UIToolType", QVariant::fromValue(UIToolType_Resources));
     367        setProperty("UIToolType", QVariant::fromValue(UIToolType_VMActivityOverview));
    368368        /// @todo use icons with check-boxes
    369369        setIcon(UIIconPool::iconSetFull(":/resources_monitor_24px.png", ":/resources_monitor_16px.png",
    … …  
    34733473    virtual void retranslateUi() /* override */
    34743474    {
    3475         setName(QApplication::translate("UIActionPool", "To Performance"));
     3475        setName(QApplication::translate("UIActionPool", "VM Activity"));
    34763476        setShortcutScope(QApplication::translate("UIActionPool", "Resource Monitor"));
    3477         setStatusTip(QApplication::translate("UIActionPool", "Switch to selected machine's performance pane"));
    3478         setToolTip(  QApplication::translate("UIActionPool", "Switch to selected machine's performance pane")
     3477        setStatusTip(QApplication::translate("UIActionPool", "Switch to selected virtual machine's activity monitor pane"));
     3478        setToolTip(  QApplication::translate("UIActionPool", "Switch to selected virtual machine's activity monitor pane")
    34793479                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
    34803480    }

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

    r87354 r88074  
    203203                break;
    204204            }
    205             case UIToolType_Resources:
     205            case UIToolType_VMActivityOverview:
    206206            {
    207207                /* Create VM Resource Monitor: */
    … …  
    215215
    216216                    /* Configure pane: */
    217                     m_pPaneResourceMonitor->setProperty("ToolType", QVariant::fromValue(UIToolType_Resources));
     217                    m_pPaneResourceMonitor->setProperty("ToolType", QVariant::fromValue(UIToolType_VMActivityOverview));
    218218                    connect(m_pPaneResourceMonitor, &UIResourceMonitorWidget::sigSwitchToMachinePerformancePane,
    219219                            this, &UIToolPaneGlobal::sigSwitchToMachinePerformancePane);
    … …  
    287287            pCurrentToolWidget = m_pPaneCloud;
    288288            break;
    289         case UIToolType_Resources:
     289        case UIToolType_VMActivityOverview:
    290290            pCurrentToolWidget = m_pPaneResourceMonitor;
    291291            break;
    … …  
    320320    /* Determine whether resource monitor is currently active tool: */
    321321    if (m_pPaneResourceMonitor)
    322         m_pPaneResourceMonitor->setIsCurrentTool(m_fActive && currentTool() == UIToolType_Resources);
    323 }
     322        m_pPaneResourceMonitor->setIsCurrentTool(m_fActive && currentTool() == UIToolType_VMActivityOverview);
     323}

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

    r88071 r88074  
    31113111    actionPool()->action(UIActionIndexMN_M_Cloud)->setVisible(fCloudMenuShown);
    31123112    /* Determine whether Resources menu should be visible: */
    3113     const bool fResourcesMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Resources;
     3113    const bool fResourcesMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_VMActivityOverview;
    31143114    actionPool()->action(UIActionIndexMN_M_VMResourceMonitor)->setVisible(fResourcesMenuShown);
    31153115

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

    r88071 r88074  
    518518    AssertPtrReturnVoid(m_pPaneChooser);
    519519    AssertPtrReturnVoid(m_pPaneTools);
    520     m_pPaneTools->setToolsType(UIToolType_Resources);
     520    m_pPaneTools->setToolsType(UIToolType_VMActivityOverview);
    521521    m_pPaneChooser->setCurrentGlobal();
    522522}
    … …  
    841841                    break;
    842842                }
    843                 case UIToolType_Resources:
     843                case UIToolType_VMActivityOverview:
    844844                {
    845845                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMResourceMonitor_M_Columns));
    … …  
    923923                {
    924924                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Performance_S_Export));
    925                     m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Performance_S_ToResources));
     925                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Performance_S_ToVMActivityOverview));
    926926                    m_pToolBar->addSeparator();
    927927                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));

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

    r88071 r88074  
    248248    actions[UIToolType_Network] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_NetworkManager);
    249249    actions[UIToolType_Cloud] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_CloudProfileManager);
    250     actions[UIToolType_Resources] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_VMResourceMonitor);
     250    actions[UIToolType_VMActivityOverview] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_VMResourceMonitor);
    251251    if (actions.contains(enmType))
    252252        actions.value(enmType)->setChecked(true);
    … …  
    457457            case UIToolType_Network:     pItem->reconfigure(tr("Network")); break;
    458458            case UIToolType_Cloud:       pItem->reconfigure(tr("Cloud")); break;
    459             case UIToolType_Resources:   pItem->reconfigure(tr("Resources")); break;
     459            case UIToolType_VMActivityOverview:   pItem->reconfigure(tr("Activities")); break;
    460460            case UIToolType_Details:     pItem->reconfigure(tr("Details")); break;
    461461            case UIToolType_Snapshots:   pItem->reconfigure(tr("Snapshots")); break;
    … …  
    520520
    521521    /* Resources: */
    522     m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Resources, QString(),
     522    m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_VMActivityOverview, QString(),
    523523                               UIIconPool::iconSet(":/resources_monitor_24px.png", ":/resources_monitor_disabled_24px.png"));
    524524

  • trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

    r88071 r88074  
    470470        if (m_hostStats.m_iFSTotal != 0)
    471471        {
    472             quint64 iUsedRamPer = 100 * (iUsedFS / (float) m_hostStats.m_iFSTotal);
    473             QString strCenter = QString("%1%\n%2").arg(iUsedRamPer).arg(UIResourceMonitorWidget::tr("Used"));
     472            quint64 iUsedFSPer = 100 * (iUsedFS / (float) m_hostStats.m_iFSTotal);
     473            QString strCenter = QString("%1%\n%2").arg(iUsedFSPer).arg(UIResourceMonitorWidget::tr("Used"));
    474474            m_pHostFSChart->setChartCenterString(strCenter);
    475475        }

  • trunk/src/VBox/Frontends/VirtualBox/src/monitor/vmactivity/UIVMActivityMonitor.cpp

    r88071 r88074  
    11561156
    11571157    QAction *pToResourcesAction =
    1158         m_pActionPool->action(UIActionIndex_M_Performance_S_ToResources);
     1158        m_pActionPool->action(UIActionIndex_M_Performance_S_ToVMActivityOverview);
    11591159    if (pToResourcesAction)
    11601160        connect(pToResourcesAction, &QAction::triggered, this, &UIVMActivityMonitor::sigSwitchToResourcesPane);
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