VirtualBox

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


Ignore:
Timestamp:
Mar 10, 2025 4:23:00 PM (6 weeks ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
167892
Message:

FE/Qt: bugref:10814: VBox Manager: Renaming Global Tool Pane to Tool Pane as I'm going to merge machine related functionality there as well.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
7 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r108501 r108504  
    583583        src/manager/UIProgressTaskReadCloudMachineList.h \
    584584        src/manager/UITaskCloudGetSettingsForm.h \
    585         src/manager/UIToolPaneGlobal.h \
     585        src/manager/UIToolPane.h \
    586586        src/manager/UIToolPaneMachine.h \
    587587        src/manager/UIVirtualBoxManager.h \
    … …  
    11061106        src/manager/UIProgressTaskReadCloudMachineList.cpp \
    11071107        src/manager/UITaskCloudGetSettingsForm.cpp \
    1108         src/manager/UIToolPaneGlobal.cpp \
     1108        src/manager/UIToolPane.cpp \
    11091109        src/manager/UIToolPaneMachine.cpp \
    11101110        src/manager/UIVirtualBoxManager.cpp \

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

    r108501 r108504  
    3636#include "UIGlobalToolsWidget.h"
    3737#include "UIMachineToolsWidget.h"
    38 #include "UIToolPaneGlobal.h"
     38#include "UIToolPane.h"
    3939#include "UIToolPaneMachine.h"
    4040#include "UITools.h"
    … …  
    6363}
    6464
    65 UIToolPaneGlobal *UIGlobalToolsWidget::toolPane() const
     65UIToolPane *UIGlobalToolsWidget::toolPane() const
    6666{
    6767    return m_pPane;
    … …  
    320320
    321321        /* Create tool-pane: */
    322         m_pPane = new UIToolPaneGlobal(actionPool());
     322        m_pPane = new UIToolPane(actionPool());
    323323        if (toolPane())
    324324        {

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

    r108501 r108504  
    4444class UIChooser;
    4545class UIMachineToolsWidget;
    46 class UIToolPaneGlobal;
     46class UIToolPane;
    4747class UIToolPaneMachine;
    4848class UITools;
    … …  
    8787      * @{ */
    8888        /** Returns tool-pane instance. */
    89         UIToolPaneGlobal *toolPane() const;
     89        UIToolPane *toolPane() const;
    9090        /** Returns Machine Tools Widget reference. */
    9191        UIMachineToolsWidget *machineToolsWidget() const;
    … …  
    189189    QGridLayout *m_pLayout;
    190190
    191     /** Holds the Tools-menu instance. */
    192     UITools          *m_pMenu;
    193     /** Holds the Tools-pane instance. */
    194     UIToolPaneGlobal *m_pPane;
     191    /** Holds the tools-menu instance. */
     192    UITools    *m_pMenu;
     193    /** Holds the tool-pane instance. */
     194    UIToolPane *m_pPane;
    195195};
    196196

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

    r108499 r108504  
    3838#include "UIGlobalSession.h"
    3939#include "UIMachineToolsWidget.h"
    40 #include "UIToolPaneGlobal.h"
     40#include "UIToolPane.h"
    4141#include "UIToolPaneMachine.h"
    4242#include "UITools.h"
    … …  
    4646
    4747
    48 UIMachineToolsWidget::UIMachineToolsWidget(UIToolPaneGlobal *pParent, UIActionPool *pActionPool)
     48UIMachineToolsWidget::UIMachineToolsWidget(UIToolPane *pParent, UIActionPool *pActionPool)
    4949    : QWidget(pParent)
    5050    , m_pParent(pParent)
    … …  
    487487
    488488    /* Parent connections: */
    489     connect(m_pParent, &UIToolPaneGlobal::sigSwitchToMachineActivityPane,
     489    connect(m_pParent, &UIToolPane::sigSwitchToMachineActivityPane,
    490490            this, &UIMachineToolsWidget::sltSwitchToVMActivityTool);
    491491
    … …  
    542542
    543543    /* Parent connections: */
    544     disconnect(m_pParent, &UIToolPaneGlobal::sigSwitchToMachineActivityPane,
     544    disconnect(m_pParent, &UIToolPane::sigSwitchToMachineActivityPane,
    545545               this, &UIMachineToolsWidget::sltSwitchToVMActivityTool);
    546546

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

    r108499 r108504  
    4444class UIActionPool;
    4545class UIChooser;
    46 class UIToolPaneGlobal;
     46class UIToolPane;
    4747class UIToolPaneMachine;
    4848class UITools;
    … …  
    9090    /** Constructs Machine Tools Widget passing @a pParent to the base-class.
    9191      * @param  pActionPool  Brings the action-pool reference. */
    92     UIMachineToolsWidget(UIToolPaneGlobal *pParent, UIActionPool *pActionPool);
     92    UIMachineToolsWidget(UIToolPane *pParent, UIActionPool *pActionPool);
    9393
    9494    /** @name Common stuff.
    … …  
    244244
    245245    /** Holds the parent reference. */
    246     UIToolPaneGlobal *m_pParent;
     246    UIToolPane  *m_pParent;
    247247    /** Holds the action-pool reference. */
    248     UIActionPool     *m_pActionPool;
     248    UIActionPool *m_pActionPool;
    249249
    250250    /** Holds the central splitter instance. */

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

    r108503 r108504  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIToolPaneGlobal class implementation.
     3 * VBox Qt GUI - UIToolPane class implementation.
    44 */
    55
    66/*
    7  * Copyright (C) 2017-2024 Oracle and/or its affiliates.
     7 * Copyright (C) 2017-2025 Oracle and/or its affiliates.
    88 *
    99 * This file is part of VirtualBox base platform packages, as
    … …  
    4242#include "UIMediumManager.h"
    4343#include "UINetworkManager.h"
    44 #include "UIToolPaneGlobal.h"
     44#include "UIToolPane.h"
    4545#include "UIVMActivityOverviewWidget.h"
    4646
    … …  
    4949
    5050
    51 UIToolPaneGlobal::UIToolPaneGlobal(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
     51UIToolPane::UIToolPane(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
    5252    : QWidget(pParent)
    5353    , m_pActionPool(pActionPool)
    … …  
    6565}
    6666
    67 UIToolPaneGlobal::~UIToolPaneGlobal()
     67UIToolPane::~UIToolPane()
    6868{
    6969    cleanup();
    7070}
    7171
    72 void UIToolPaneGlobal::setActive(bool fActive)
     72void UIToolPane::setActive(bool fActive)
    7373{
    7474    /* Save activity: */
    … …  
    8282}
    8383
    84 UIToolType UIToolPaneGlobal::currentTool() const
     84UIToolType UIToolPane::currentTool() const
    8585{
    8686    return   m_pLayout && m_pLayout->currentWidget()
    … …  
    8989}
    9090
    91 bool UIToolPaneGlobal::isToolOpened(UIToolType enmType) const
     91bool UIToolPane::isToolOpened(UIToolType enmType) const
    9292{
    9393    for (int iIndex = 0; iIndex < m_pLayout->count(); ++iIndex)
    … …  
    9797}
    9898
    99 void UIToolPaneGlobal::openTool(UIToolType enmType)
     99void UIToolPane::openTool(UIToolType enmType)
    100100{
    101101    /* Search through the stacked widgets: */
    … …  
    180180                    m_pPaneMedia->setProperty("ToolType", QVariant::fromValue(UIToolType_Media));
    181181                    connect(m_pPaneMedia, &UIMediumManagerWidget::sigCreateMedium,
    182                             this, &UIToolPaneGlobal::sigCreateMedium);
     182                            this, &UIToolPane::sigCreateMedium);
    183183                    connect(m_pPaneMedia, &UIMediumManagerWidget::sigCopyMedium,
    184                             this, &UIToolPaneGlobal::sigCopyMedium);
     184                            this, &UIToolPane::sigCopyMedium);
    185185#ifndef VBOX_WS_MAC
    186186                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
    … …  
    241241                    m_pPaneActivities->setProperty("ToolType", QVariant::fromValue(UIToolType_Activities));
    242242                    connect(m_pPaneActivities, &UIVMActivityOverviewWidget::sigSwitchToMachineActivityPane,
    243                             this, &UIToolPaneGlobal::sigSwitchToMachineActivityPane);
     243                            this, &UIToolPane::sigSwitchToMachineActivityPane);
    244244                    m_pPaneActivities->setCloudMachineItems(m_cloudItems);
    245245#ifndef VBOX_WS_MAC
    … …  
    263263}
    264264
    265 void UIToolPaneGlobal::closeTool(UIToolType enmType)
     265void UIToolPane::closeTool(UIToolType enmType)
    266266{
    267267    /* Search through the stacked widgets: */
    … …  
    296296}
    297297
    298 QString UIToolPaneGlobal::currentHelpKeyword() const
     298QString UIToolPane::currentHelpKeyword() const
    299299{
    300300    QWidget *pCurrentToolWidget = 0;
    … …  
    328328}
    329329
    330 void UIToolPaneGlobal::setCloudMachineItems(const QList<UIVirtualMachineItemCloud*> &cloudItems)
     330void UIToolPane::setCloudMachineItems(const QList<UIVirtualMachineItemCloud*> &cloudItems)
    331331{
    332332    /* Cache passed value: */
    … …  
    341341}
    342342
    343 UIMachineToolsWidget *UIToolPaneGlobal::machineToolsWidget() const
     343UIMachineToolsWidget *UIToolPane::machineToolsWidget() const
    344344{
    345345    return m_pPaneMachines;
    346346}
    347347
    348 void UIToolPaneGlobal::prepare()
     348void UIToolPane::prepare()
    349349{
    350350    /* Create stacked-layout: */
    … …  
    357357}
    358358
    359 void UIToolPaneGlobal::cleanup()
     359void UIToolPane::cleanup()
    360360{
    361361    /* Remove all widgets prematurelly: */
    … …  
    368368}
    369369
    370 void UIToolPaneGlobal::handleTokenChange()
     370void UIToolPane::handleTokenChange()
    371371{
    372372    /* Determine whether resource monitor is currently active tool: */

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

    r108503 r108504  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIToolPaneGlobal class declaration.
     3 * VBox Qt GUI - UIToolPane class declaration.
    44 */
    55
    66/*
    7  * Copyright (C) 2017-2024 Oracle and/or its affiliates.
     7 * Copyright (C) 2017-2025 Oracle and/or its affiliates.
    88 *
    99 * This file is part of VirtualBox base platform packages, as
    … …  
    2626 */
    2727
    28 #ifndef FEQT_INCLUDED_SRC_manager_UIToolPaneGlobal_h
    29 #define FEQT_INCLUDED_SRC_manager_UIToolPaneGlobal_h
     28#ifndef FEQT_INCLUDED_SRC_manager_UIToolPane_h
     29#define FEQT_INCLUDED_SRC_manager_UIToolPane_h
    3030#ifndef RT_WITHOUT_PRAGMA_ONCE
    3131# pragma once
    … …  
    5353
    5454/** QWidget subclass representing container for Global tool panes. */
    55 class UIToolPaneGlobal : public QWidget
     55class UIToolPane : public QWidget
    5656{
    5757    Q_OBJECT;
    … …  
    7070
    7171    /** Constructs tools pane passing @a pParent to the base-class. */
    72     UIToolPaneGlobal(UIActionPool *pActionPool, QWidget *pParent = 0);
     72    UIToolPane(UIActionPool *pActionPool, QWidget *pParent = 0);
    7373    /** Destructs tools pane. */
    74     virtual ~UIToolPaneGlobal() RT_OVERRIDE;
     74    virtual ~UIToolPane() RT_OVERRIDE;
    7575
    7676    /** Returns the action-pool reference. */
    … …  
    139139};
    140140
    141 #endif /* !FEQT_INCLUDED_SRC_manager_UIToolPaneGlobal_h */
     141#endif /* !FEQT_INCLUDED_SRC_manager_UIToolPane_h */

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

    r108501 r108504  
    4141#include "UIMachineToolsWidget.h"
    4242#include "UINotificationCenter.h"
    43 #include "UIToolPaneGlobal.h"
     43#include "UIToolPane.h"
    4444#include "UIToolPaneMachine.h"
    4545#include "UIVirtualBoxManager.h"
    … …  
    432432            this, &UIVirtualBoxManagerAdvancedWidget::sigToolTypeChangeGlobal);
    433433    /* Global Tool Pane connections: */
    434     connect(globalToolPane(), &UIToolPaneGlobal::sigCreateMedium,
     434    connect(globalToolPane(), &UIToolPane::sigCreateMedium,
    435435            this, &UIVirtualBoxManagerAdvancedWidget::sigCreateMedium);
    436     connect(globalToolPane(), &UIToolPaneGlobal::sigCopyMedium,
     436    connect(globalToolPane(), &UIToolPane::sigCopyMedium,
    437437            this, &UIVirtualBoxManagerAdvancedWidget::sigCopyMedium);
    438438
    … …  
    670670               this, &UIVirtualBoxManagerAdvancedWidget::sigToolTypeChangeGlobal);
    671671    /* Global Tool Pane connections: */
    672     disconnect(globalToolPane(), &UIToolPaneGlobal::sigCreateMedium,
     672    disconnect(globalToolPane(), &UIToolPane::sigCreateMedium,
    673673               this, &UIVirtualBoxManagerAdvancedWidget::sigCreateMedium);
    674     disconnect(globalToolPane(), &UIToolPaneGlobal::sigCopyMedium,
     674    disconnect(globalToolPane(), &UIToolPane::sigCopyMedium,
    675675               this, &UIVirtualBoxManagerAdvancedWidget::sigCopyMedium);
    676676
    … …  
    716716}
    717717
    718 UIToolPaneGlobal *UIVirtualBoxManagerAdvancedWidget::globalToolPane() const
     718UIToolPane *UIVirtualBoxManagerAdvancedWidget::globalToolPane() const
    719719{
    720720    return globalToolsWidget()->toolPane();

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

    r108501 r108504  
    4545class UIGlobalToolsWidget;
    4646class UIMachineToolsWidget;
    47 class UIToolPaneGlobal;
     47class UIToolPane;
    4848class UIToolPaneMachine;
    4949class UIVirtualBoxManager;
    … …  
    273273        UIGlobalToolsWidget *globalToolsWidget() const;
    274274        /** Returns Global Tool Pane reference. */
    275         UIToolPaneGlobal *globalToolPane() const;
     275        UIToolPane *globalToolPane() const;
    276276
    277277        /** Returns Machine Tools Widget reference. */
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