VirtualBox

Changeset 104904 in vbox


Ignore:
Timestamp:
Jun 12, 2024 5:06:56 PM (10 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
163506
Message:

FE/Qt: UICommon: Get rid of rest of media related stuff (especially medium-enumeration signals and slots) by moving it to UIMediumEnumerator; Adjust the GUI to work accodringly.

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

Legend:

Unmodified
Added
Removed

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

    r104902 r104904  
    5656#include "UIIconPool.h"
    5757#include "UILoggingDefs.h"
    58 #include "UIMedium.h"
    5958#include "UIMediumEnumerator.h"
    6059#include "UIMessageCenter.h"
    … …  
    8887#include "CHostVideoInputDevice.h"
    8988#include "CMachine.h"
    90 #include "CMedium.h"
    91 #include "CMediumAttachment.h"
    9289#include "CSystemProperties.h"
    9390#include "CUSBDevice.h"
    … …  
    124121/* Namespaces: */
    125122using namespace UIExtraDataDefs;
    126 using namespace UIMediumDefs;
    127123
    128124
    … …  
    677673    /* Create medium-enumerator but don't do any immediate caching: */
    678674    UIMediumEnumerator::create();
    679     {
    680         /* Prepare medium-enumerator: */
    681         connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumCreated,
    682                 this, &UICommon::sigMediumCreated);
    683         connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumDeleted,
    684                 this, &UICommon::sigMediumDeleted);
    685         connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationStarted,
    686                 this, &UICommon::sigMediumEnumerationStarted);
    687         connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerated,
    688                 this, &UICommon::sigMediumEnumerated);
    689         connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationFinished,
    690                 this, &UICommon::sigMediumEnumerationFinished);
    691     }
    692675
    693676    /* Create shortcut pool: */
    … …  
    19211904}
    19221905
    1923 void UICommon::sltHandleMediumCreated(const CMedium &comMedium)
    1924 {
    1925     /* Acquire device type: */
    1926     const KDeviceType enmDeviceType = comMedium.GetDeviceType();
    1927     if (!comMedium.isOk())
    1928         UINotificationMessage::cannotAcquireMediumParameter(comMedium);
    1929     else
    1930     {
    1931         /* Convert to medium type: */
    1932         const UIMediumDeviceType enmMediumType = mediumTypeToLocal(enmDeviceType);
    1933 
    1934         /* Make sure we cached created medium in GUI: */
    1935         gpMediumEnumerator->createMedium(UIMedium(comMedium, enmMediumType, KMediumState_Created));
    1936     }
    1937 }
    1938 
    19391906void UICommon::sltHandleMachineCreated(const CMachine &comMachine)
    19401907{

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

    r104902 r104904  
    3838#include "UIDefs.h"
    3939#include "UILibraryDefs.h"
    40 #include "UIMediumDefs.h"
    4140#ifdef VBOX_WS_NIX
    4241# include "VBoxUtils-nix.h"
    … …  
    5453class CHostVideoInputDevice;
    5554class CMachine;
    56 class CMedium;
    5755class CUSBDevice;
    5856class UIThreadPool;
    … …  
    10199                                       const QString &strProfileName,
    102100                                       const CCloudMachine &comMachine);
    103     /** @} */
    104 
    105     /** @name COM: Virtual Media stuff.
    106      * @{ */
    107         /** Notifies listeners about medium with certain @a uMediumID created. */
    108         void sigMediumCreated(const QUuid &uMediumID);
    109         /** Notifies listeners about medium with certain @a uMediumID deleted. */
    110         void sigMediumDeleted(const QUuid &uMediumID);
    111 
    112         /** Notifies listeners about medium-enumeration started. */
    113         void sigMediumEnumerationStarted();
    114         /** Notifies listeners about medium with certain @a uMediumID enumerated. */
    115         void sigMediumEnumerated(const QUuid &uMediumID);
    116         /** Notifies listeners about medium-enumeration finished. */
    117         void sigMediumEnumerationFinished();
    118101    /** @} */
    119102
    … …  
    388371    /** @} */
    389372
    390     /** @name Media related stuff.
    391      * @{ */
    392         /** Handles signal about medium was created. */
    393         void sltHandleMediumCreated(const CMedium &comMedium);
    394     /** @} */
    395 
    396373    /** @name Machine related stuff.
    397374     * @{ */

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

    r104899 r104904  
    25082508    connect(&uiCommon(), &UICommon::sigAskToCommitData,
    25092509            this, &UIVirtualBoxManager::sltHandleCommitData);
    2510     connect(&uiCommon(), &UICommon::sigMediumEnumerationFinished,
     2510    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationFinished,
    25112511            this, &UIVirtualBoxManager::sltHandleMediumEnumerationFinish);
    25122512

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp

    r104891 r104904  
    3333
    3434/* GUI includes: */
    35 #include "UICommon.h"
    3635#include "UIDetailsElements.h"
    3736#include "UIDetailsModel.h"
    … …  
    691690
    692691    /* Meidum-enumeration connections: */
    693     connect(&uiCommon(), &UICommon::sigMediumEnumerated, this, &UIDetailsSet::sltMediumEnumerated);
     692    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerated, this, &UIDetailsSet::sltMediumEnumerated);
    694693}
    695694

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIFDCreationDialog.cpp

    r104899 r104904  
    133133        new UINotificationProgressMediumCreate(comMedium, m_pSizeCombo->currentData().toLongLong(), variants);
    134134    connect(pNotification, &UINotificationProgressMediumCreate::sigMediumCreated,
    135             &uiCommon(), &UICommon::sltHandleMediumCreated);
     135            gpMediumEnumerator, &UIMediumEnumerator::sltHandleMediumCreated);
    136136    connect(pNotification, &UINotificationProgressMediumCreate::sigMediumCreated,
    137137            this, &UIFDCreationDialog::sltHandleMediumCreated);

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

    r104899 r104904  
    356356}
    357357
     358void UIMediumEnumerator::sltHandleMediumCreated(const CMedium &comMedium)
     359{
     360    /* Acquire device type: */
     361    const KDeviceType enmDeviceType = comMedium.GetDeviceType();
     362    if (!comMedium.isOk())
     363        UINotificationMessage::cannotAcquireMediumParameter(comMedium);
     364    else
     365    {
     366        /* Convert to medium type: */
     367        const UIMediumDeviceType enmMediumType = mediumTypeToLocal(enmDeviceType);
     368
     369        /* Make sure we cached created medium in GUI: */
     370        createMedium(UIMedium(comMedium, enmMediumType, KMediumState_Created));
     371    }
     372}
     373
    358374void UIMediumEnumerator::sltRetranslateUI()
    359375{

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

    r104899 r104904  
    123123      * @param  strMediumLocation   Passes the medium location. */
    124124    void updateRecentlyUsedMediumListAndFolder(UIMediumDeviceType enmMediumType, QString strMediumLocation);
     125
     126public slots:
     127
     128    /** Handles signal about @a comMedium was created. */
     129    void sltHandleMediumCreated(const CMedium &comMedium);
    125130
    126131private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

    r104901 r104904  
    768768
    769769    /* Configure medium-processing connections: */
    770     connect(&uiCommon(), &UICommon::sigMediumCreated,
     770    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumCreated,
    771771            this, &UIMediumManagerWidget::sltHandleMediumCreated);
    772     connect(&uiCommon(), &UICommon::sigMediumDeleted,
     772    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumDeleted,
    773773            this, &UIMediumManagerWidget::sltHandleMediumDeleted);
    774774
    775775    /* Configure medium-enumeration connections: */
    776     connect(&uiCommon(), &UICommon::sigMediumEnumerationStarted,
     776    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationStarted,
    777777            this, &UIMediumManagerWidget::sltHandleMediumEnumerationStart);
    778     connect(&uiCommon(), &UICommon::sigMediumEnumerated,
     778    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerated,
    779779            this, &UIMediumManagerWidget::sltHandleMediumEnumerated);
    780     connect(&uiCommon(), &UICommon::sigMediumEnumerationFinished,
     780    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationFinished,
    781781            this, &UIMediumManagerWidget::sltHandleMediumEnumerationFinish);
    782782

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

    r104226 r104904  
    160160    /** @name Medium operation stuff.
    161161      * @{ */
    162         /** Handles UICommon::sigMediumCreated signal. */
     162        /** Handles UIMediumEnumerator::sigMediumCreated signal. */
    163163        void sltHandleMediumCreated(const QUuid &uMediumID);
    164         /** Handles UICommon::sigMediumDeleted signal. */
     164        /** Handles UIMediumEnumerator::sigMediumDeleted signal. */
    165165        void sltHandleMediumDeleted(const QUuid &uMediumID);
    166166    /** @} */
    … …  
    168168    /** @name Medium enumeration stuff.
    169169      * @{ */
    170         /** Handles UICommon::sigMediumEnumerationStarted signal. */
     170        /** Handles UIMediumEnumerator::sigMediumEnumerationStarted signal. */
    171171        void sltHandleMediumEnumerationStart();
    172         /** Handles UICommon::sigMediumEnumerated signal. */
     172        /** Handles UIMediumEnumerator::sigMediumEnumerated signal. */
    173173        void sltHandleMediumEnumerated(const QUuid &uMediumID);
    174         /** Handles UICommon::sigMediumEnumerationFinished signal. */
     174        /** Handles UIMediumEnumerator::sigMediumEnumerationFinished signal. */
    175175        void sltHandleMediumEnumerationFinish();
    176176        void sltHandleMachineStateChange(const QUuid &uId, const KMachineState state);

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

    r104901 r104904  
    4242#include "QIToolButton.h"
    4343#include "UIActionPool.h"
    44 #include "UICommon.h"
    4544#include "UIDesktopWidgetWatchdog.h"
    4645#include "UIExtraDataManager.h"
    … …  
    284283{
    285284    /* Configure medium-enumeration connections: */
    286     connect(&uiCommon(), &UICommon::sigMediumCreated,
     285    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumCreated,
    287286            this, &UIMediumSelector::sltHandleMediumCreated);
    288     connect(&uiCommon(), &UICommon::sigMediumEnumerationStarted,
     287    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationStarted,
    289288            this, &UIMediumSelector::sltHandleMediumEnumerationStart);
    290     connect(&uiCommon(), &UICommon::sigMediumEnumerated,
     289    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerated,
    291290            this, &UIMediumSelector::sltHandleMediumEnumerated);
    292     connect(&uiCommon(), &UICommon::sigMediumEnumerationFinished,
     291    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationFinished,
    293292            this, &UIMediumSelector::sltHandleMediumEnumerationFinish);
    294293    if (m_pActionAdd)

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationConfiguration.cpp

    r104585 r104904  
    4040#include "QITableWidget.h"
    4141#include "UIDetailsGenerator.h"
    42 #include "UICommon.h"
    4342#include "UIExtraDataManager.h"
    4443#include "UIIconPool.h"
    4544#include "UIInformationConfiguration.h"
    4645#include "UIMachine.h"
     46#include "UIMediumEnumerator.h"
    4747#include "UITranslationEventListener.h"
    4848#include "UIVirtualBoxEventHandler.h"
    … …  
    6565    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineDataChange,
    6666            this, &UIInformationConfiguration::sltMachineDataChanged);
    67     connect(&uiCommon(), &UICommon::sigMediumEnumerationFinished,
     67    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationFinished,
    6868            this, &UIInformationConfiguration::sltMachineDataChanged);
    6969}

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp

    r104901 r104904  
    5555#include "QIToolButton.h"
    5656#include "QITreeView.h"
    57 #include "UICommon.h"
    5857#include "UIConverter.h"
    5958#include "UIExtraDataManager.h"
    … …  
    50555054{
    50565055    /* Configure this: */
    5057     connect(&uiCommon(), &UICommon::sigMediumEnumerated,
     5056    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerated,
    50585057            this, &UIStorageSettingsEditor::sltHandleMediumEnumerated);
    5059     connect(&uiCommon(), &UICommon::sigMediumDeleted,
     5058    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumDeleted,
    50605059            this, &UIStorageSettingsEditor::sltHandleMediumDeleted);
    50615060

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp

    r104891 r104904  
    3232
    3333/* GUI includes: */
    34 #include "UICommon.h"
    3534#include "UIGlobalSession.h"
    3635#include "UIMediaComboBox.h"
    … …  
    221220
    222221    /* Setup medium-processing handlers: */
    223     connect(&uiCommon(), &UICommon::sigMediumCreated,
     222    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumCreated,
    224223            this, &UIMediaComboBox::sltHandleMediumCreated);
    225     connect(&uiCommon(), &UICommon::sigMediumDeleted,
     224    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumDeleted,
    226225            this, &UIMediaComboBox::sltHandleMediumDeleted);
    227226
    228227    /* Setup medium-enumeration handlers: */
    229     connect(&uiCommon(), &UICommon::sigMediumEnumerationStarted,
     228    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationStarted,
    230229            this, &UIMediaComboBox::sltHandleMediumEnumerationStart);
    231     connect(&uiCommon(), &UICommon::sigMediumEnumerated,
     230    connect(gpMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerated,
    232231            this, &UIMediaComboBox::sltHandleMediumEnumerated);
    233232

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp

    r104891 r104904  
    2727
    2828/* GUI includes: */
    29 #include "UICommon.h"
    3029#include "UIGlobalSession.h"
    3130#include "UIMedium.h"
    … …  
    103102                                                                                           variants);
    104103    connect(pNotification, &UINotificationProgressMediumCopy::sigMediumCopied,
    105             &uiCommon(), &UICommon::sltHandleMediumCreated);
     104            gpMediumEnumerator, &UIMediumEnumerator::sltHandleMediumCreated);
    106105    gpNotificationCenter->append(pNotification);
    107106

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

    r104899 r104904  
    161161                                                                                               variants);
    162162    connect(pNotification, &UINotificationProgressMediumCreate::sigMediumCreated,
    163             &uiCommon(), &UICommon::sltHandleMediumCreated);
     163            gpMediumEnumerator, &UIMediumEnumerator::sltHandleMediumCreated);
    164164
    165165    m_uMediumId = comVirtualDisk.GetId();
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