VirtualBox

Changeset 89094 in vbox for trunk/src/VBox


Ignore:
Timestamp:
May 17, 2021 11:56:34 AM (4 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9930. Some renaming

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

    r89039 r89094  
    15411541    updateColumnsMenu();
    15421542    m_pVMActivityMonitorAction =
    1543         m_pActionPool->action(UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachinePerformance);
     1543        m_pActionPool->action(UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachineActivity);
    15441544
    15451545    if (m_pVMActivityMonitorAction)
    … …  
    16771677    if (uMachineId.isNull())
    16781678        return;
    1679     emit sigSwitchToMachinePerformancePane(uMachineId);
     1679    emit sigSwitchToMachineActivityPane(uMachineId);
    16801680}
    16811681

  • trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.h

    r89000 r89094  
    5252signals:
    5353
    54     void sigSwitchToMachinePerformancePane(const QUuid &uMachineId);
     54    void sigSwitchToMachineActivityPane(const QUuid &uMachineId);
    5555
    5656public:

  • trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityToolWidget.cpp

    r89093 r89094  
    150150        m_pActionPool->action(UIActionIndex_M_Activity_S_ToVMActivityOverview);
    151151    if (pToResourcesAction)
    152         connect(pToResourcesAction, &QAction::triggered, this, &UIVMActivityToolWidget::sigSwitchToResourcesPane);
     152        connect(pToResourcesAction, &QAction::triggered, this, &UIVMActivityToolWidget::sigSwitchToActivityOverviewPane);
    153153
    154154    m_pExportToFileAction =

  • trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityToolWidget.h

    r89093 r89094  
    4545signals:
    4646
    47     void sigSwitchToResourcesPane();
     47    void sigSwitchToActivityOverviewPane();
    4848
    4949public:

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

    r88242 r89094  
    34463446};
    34473447
    3448 /** Simple action extension, used as 'Switch to Machine Performance' action class. */
    3449 class UIActionMenuManagerVMActivityOverviewSwitchToMachinePerformance : public UIActionSimple
    3450 {
    3451     Q_OBJECT;
    3452 
    3453 public:
    3454 
    3455     /** Constructs action passing @a pParent to the base-class. */
    3456     UIActionMenuManagerVMActivityOverviewSwitchToMachinePerformance(UIActionPool *pParent)
     3448/** Simple action extension, used as 'Switch to Machine Activity' action class. */
     3449class UIActionMenuManagerVMActivityOverviewSwitchToMachineActivity : public UIActionSimple
     3450{
     3451    Q_OBJECT;
     3452
     3453public:
     3454
     3455    /** Constructs action passing @a pParent to the base-class. */
     3456    UIActionMenuManagerVMActivityOverviewSwitchToMachineActivity(UIActionPool *pParent)
    34573457        : UIActionSimple(pParent,
    34583458                         ":/resources_monitor_jump_to_vm_32px.png",          ":/resources_monitor_jump_to_vm_16px.png",
    … …  
    34673467    virtual QString shortcutExtraDataID() const /* override */
    34683468    {
    3469         return QString("VMActivityOverviewSwitchToMachinePerformance");
     3469        return QString("VMActivityOverviewSwitchToMachineActivity");
    34703470    }
    34713471
    … …  
    36523652    m_pool[UIActionIndexMN_M_VMActivityOverview] = new UIActionMenuVMActivityOverview(this);
    36533653    m_pool[UIActionIndexMN_M_VMActivityOverview_M_Columns] = new UIActionMenuManagerVMActivityOverviewColumns(this);
    3654     m_pool[UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachinePerformance] = new UIActionMenuManagerVMActivityOverviewSwitchToMachinePerformance(this);
     3654    m_pool[UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachineActivity] = new UIActionMenuManagerVMActivityOverviewSwitchToMachineActivity(this);
    36553655
    36563656    /* 'File' action groups: */
    … …  
    44964496    pMenu->clear();
    44974497    addAction(pMenu, action(UIActionIndexMN_M_VMActivityOverview_M_Columns));
    4498     addAction(pMenu, action(UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachinePerformance));
     4498    addAction(pMenu, action(UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachineActivity));
    44994499}
    45004500

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

    r88242 r89094  
    193193    UIActionIndexMN_M_VMActivityOverview,
    194194    UIActionIndexMN_M_VMActivityOverview_M_Columns,
    195     UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachinePerformance,
     195    UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachineActivity,
    196196
    197197    /* Maximum index: */

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

    r88173 r89094  
    216216                    /* Configure pane: */
    217217                    m_pPaneVMActivityOverview->setProperty("ToolType", QVariant::fromValue(UIToolType_VMActivityOverview));
    218                     connect(m_pPaneVMActivityOverview, &UIVMActivityOverviewWidget::sigSwitchToMachinePerformancePane,
    219                             this, &UIToolPaneGlobal::sigSwitchToMachinePerformancePane);
     218                    connect(m_pPaneVMActivityOverview, &UIVMActivityOverviewWidget::sigSwitchToMachineActivityPane,
     219                            this, &UIToolPaneGlobal::sigSwitchToMachineActivityPane);
    220220
    221221                    /* Add into layout: */

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

    r88173 r89094  
    5050signals:
    5151
    52     /** Notifies listeners about request to switch to Performance pane of machine with @a uMachineId. */
    53     void sigSwitchToMachinePerformancePane(const QUuid &uMachineId);
     52    /** Notifies listeners about request to switch to Activity pane of machine with @a uMachineId. */
     53    void sigSwitchToMachineActivityPane(const QUuid &uMachineId);
    5454
    5555public:

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

    r89036 r89094  
    208208                m_pLayout->setCurrentWidget(m_pPaneVMActivityMonitor);
    209209
    210                 connect(m_pPaneVMActivityMonitor, &UIVMActivityToolWidget::sigSwitchToResourcesPane,
    211                         this, &UIToolPaneMachine::sigSwitchToResourcesPane);
     210                connect(m_pPaneVMActivityMonitor, &UIVMActivityToolWidget::sigSwitchToActivityOverviewPane,
     211                        this, &UIToolPaneMachine::sigSwitchToActivityOverviewPane);
    212212                break;
    213213            }

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h

    r89036 r89094  
    6262    void sigCurrentSnapshotItemChange();
    6363
    64     /** Notifies listeners about request to switch to Resources pane. */
    65     void sigSwitchToResourcesPane();
     64    /** Notifies listeners about request to switch to Activity Overview pane. */
     65    void sigSwitchToActivityOverviewPane();
    6666
    6767public:

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

    r89037 r89094  
    532532}
    533533
    534 void UIVirtualBoxManagerWidget::sltSwitchToMachinePerformancePane(const QUuid &uMachineId)
     534void UIVirtualBoxManagerWidget::sltSwitchToMachineActivityPane(const QUuid &uMachineId)
    535535{
    536536    AssertPtrReturnVoid(m_pPaneChooser);
    … …  
    540540}
    541541
    542 void UIVirtualBoxManagerWidget::sltSwitchToResourcesPane()
     542void UIVirtualBoxManagerWidget::sltSwitchToActivityOverviewPane()
    543543{
    544544    AssertPtrReturnVoid(m_pPaneChooser);
    … …  
    643643                            if (m_pPaneChooser->isGlobalItemSelected())
    644644                                m_pPaneToolsGlobal->setActive(true);
    645                             connect(m_pPaneToolsGlobal, &UIToolPaneGlobal::sigSwitchToMachinePerformancePane,
    646                                     this, &UIVirtualBoxManagerWidget::sltSwitchToMachinePerformancePane);
     645                            connect(m_pPaneToolsGlobal, &UIToolPaneGlobal::sigSwitchToMachineActivityPane,
     646                                    this, &UIVirtualBoxManagerWidget::sltSwitchToMachineActivityPane);
    647647
    648648                            /* Add into stack: */
    … …  
    658658                            connect(m_pPaneToolsMachine, &UIToolPaneMachine::sigCurrentSnapshotItemChange,
    659659                                    this, &UIVirtualBoxManagerWidget::sigCurrentSnapshotItemChange);
    660                             connect(m_pPaneToolsMachine, &UIToolPaneMachine::sigSwitchToResourcesPane,
    661                                     this, &UIVirtualBoxManagerWidget::sltSwitchToResourcesPane);
     660                            connect(m_pPaneToolsMachine, &UIToolPaneMachine::sigSwitchToActivityOverviewPane,
     661                                    this, &UIVirtualBoxManagerWidget::sltSwitchToActivityOverviewPane);
    662662
    663663                            /* Add into stack: */
    … …  
    873873                {
    874874                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_M_Columns));
    875                     m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachinePerformance));
     875                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachineActivity));
    876876                    QToolButton *pButton =
    877877                        qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_M_Columns)));

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

    r88520 r89094  
    280280        void sltHandleToolsPaneIndexChange();
    281281
    282         /** Handles signal requesting switch to Performance pane of machine with @a uMachineId. */
    283         void sltSwitchToMachinePerformancePane(const QUuid &uMachineId);
     282        /** Handles signal requesting switch to Activity pane of machine with @a uMachineId. */
     283        void sltSwitchToMachineActivityPane(const QUuid &uMachineId);
    284284        /** Handles signal requesting switch to Resources pane. */
    285         void sltSwitchToResourcesPane();
     285        void sltSwitchToActivityOverviewPane();
    286286    /** @} */
    287287
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