VirtualBox

Changeset 91293 in vbox


Ignore:
Timestamp:
Sep 17, 2021 6:48:40 AM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9996. Some more refactoring.

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

Legend:

Unmodified
Added
Removed

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

    r91272 r91293  
    8787    CMediumFormat comMediumFormat(pWizard->mediumFormat());
    8888    QString strSelectedPath =
    89         UIDiskEditorGroupBox::openFileDialogForDiskFile(pWizard->mediumPath(), comMediumFormat, pWizard->deviceType(), pWizard);
     89        UIWizardDiskEditors::openFileDialogForDiskFile(pWizard->mediumPath(), comMediumFormat, pWizard->deviceType(), pWizard);
    9090
    9191    if (strSelectedPath.isEmpty())
    9292        return;
    9393    QString strMediumPath =
    94         UIDiskEditorGroupBox::appendExtension(strSelectedPath,
    95                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     94        UIWizardDiskEditors::appendExtension(strSelectedPath,
     95                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
    9696    QFileInfo mediumPath(strMediumPath);
    9797    m_pMediumSizePathGroupBox->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
    … …  
    117117    AssertReturnVoid(pWizard);
    118118    QString strMediumPath =
    119         UIDiskEditorGroupBox::appendExtension(strPath,
    120                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     119        UIWizardDiskEditors::appendExtension(strPath,
     120                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
    121121    pWizard->setMediumPath(strMediumPath);
    122122    emit completeChanged();
    … …  
    141141    m_pMediumSizePathGroupBox->setMediumSize(pWizard->sourceDiskLogicalSize());
    142142    pWizard->setMediumSize(m_pMediumSizePathGroupBox->mediumSize());
    143     QString strExtension = UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType());
     143    QString strExtension = UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType());
    144144    QString strSourceDiskPath = QDir::toNativeSeparators(QFileInfo(pWizard->sourceDiskFilePath()).absolutePath());
    145145    /* Disk name without the format extension: */
    146146    QString strDiskName = QString("%1_%2").arg(QFileInfo(pWizard->sourceDiskName()).completeBaseName()).arg(tr("copy"));
    147147    QString strMediumFilePath =
    148         UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(strDiskName,
     148        UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(strDiskName,
    149149                                                                                            strExtension), strSourceDiskPath);
    150150    m_pMediumSizePathGroupBox->setMediumFilePath(strMediumFilePath);

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

    r91272 r91293  
    7373    if (!m_userModifiedParameters.contains("MediumPath"))
    7474    {
    75         QString strExtension = UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType());
     75        QString strExtension = UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType());
    7676        QString strSourceDiskPath = QDir::toNativeSeparators(QFileInfo(pWizard->sourceDiskFilePath()).absolutePath());
    7777        /* Disk name without the format extension: */
    … …  
    7979
    8080        QString strMediumFilePath =
    81             UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(strDiskName,
     81            UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(strDiskName,
    8282                                                                                                strExtension), strSourceDiskPath);
    8383        m_pMediumSizePathGroupBox->setMediumFilePath(strMediumFilePath);
    … …  
    113113    CMediumFormat comMediumFormat(pWizard->mediumFormat());
    114114    QString strSelectedPath =
    115         UIDiskEditorGroupBox::openFileDialogForDiskFile(pWizard->mediumPath(), comMediumFormat, pWizard->deviceType(), pWizard);
     115        UIWizardDiskEditors::openFileDialogForDiskFile(pWizard->mediumPath(), comMediumFormat, pWizard->deviceType(), pWizard);
    116116
    117117    if (strSelectedPath.isEmpty())
    118118        return;
    119119    QString strMediumPath =
    120         UIDiskEditorGroupBox::appendExtension(strSelectedPath,
    121                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     120        UIWizardDiskEditors::appendExtension(strSelectedPath,
     121                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
    122122    QFileInfo mediumPath(strMediumPath);
    123123    m_pMediumSizePathGroupBox->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
    … …  
    130130    m_userModifiedParameters << "MediumPath";
    131131    QString strMediumPath =
    132         UIDiskEditorGroupBox::appendExtension(strPath,
    133                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     132        UIWizardDiskEditors::appendExtension(strPath,
     133                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
    134134    pWizard->setMediumPath(strMediumPath);
    135135    emit completeChanged();

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

    r91278 r91293  
    4747
    4848/*********************************************************************************************************************************
    49 *   UIDiskEditorGroupBox implementation.                                                                                   *
     49*   UIWizardDiskEditors implementation.                                                                                   *
    5050*********************************************************************************************************************************/
    5151
    52 /* static */
    53 QString UIDiskEditorGroupBox::appendExtension(const QString &strName, const QString &strExtension)
     52QString UIWizardDiskEditors::appendExtension(const QString &strName, const QString &strExtension)
    5453{
    5554    /* Convert passed name to native separators: */
    … …  
    6968}
    7069
    71 /* static */
    72 QString UIDiskEditorGroupBox::constructMediumFilePath(const QString &strFileName, const QString &strPath)
     70QString UIWizardDiskEditors::constructMediumFilePath(const QString &strFileName, const QString &strPath)
    7371{
    7472    /* Wrap file-info around received file name: */
    … …  
    8482}
    8583
    86 /* static */
    87 bool UIDiskEditorGroupBox::checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize)
     84bool UIWizardDiskEditors::checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize)
    8885{
    8986    /* If the hard disk is split into 2GB parts then no need to make further checks: */
    … …  
    105102}
    106103
    107 /* static */
    108 QString UIDiskEditorGroupBox::openFileDialogForDiskFile(const QString &strInitialPath, const CMediumFormat &comMediumFormat,
     104QString UIWizardDiskEditors::openFileDialogForDiskFile(const QString &strInitialPath, const CMediumFormat &comMediumFormat,
    109105                                                        KDeviceType enmDeviceType, QWidget *pParent)
    110106{
    … …  
    140136}
    141137
    142 /* static */
    143 QString UIDiskEditorGroupBox::defaultExtension(const CMediumFormat &mediumFormatRef, KDeviceType enmDeviceType)
     138QString UIWizardDiskEditors::defaultExtension(const CMediumFormat &mediumFormatRef, KDeviceType enmDeviceType)
    144139{
    145140    if (!mediumFormatRef.isNull())
    … …  
    156151    AssertMsgFailed(("Extension can't be NULL!\n"));
    157152    return QString();
     153}
     154
     155QString UIWizardDiskEditors::stripFormatExtension(const QString &strFileName, const QStringList &formatExtensions)
     156{
     157    QString result(strFileName);
     158    foreach (const QString &strExtension, formatExtensions)
     159    {
     160        if (strFileName.endsWith(strExtension, Qt::CaseInsensitive))
     161        {
     162            /* Add the dot to extenstion: */
     163            QString strExtensionWithDot(strExtension);
     164            strExtensionWithDot.prepend('.');
     165            int iIndex = strFileName.lastIndexOf(strExtensionWithDot, -1, Qt::CaseInsensitive);
     166            result.remove(iIndex, strExtensionWithDot.length());
     167        }
     168    }
     169    return result;
    158170}
    159171
    … …  
    403415{
    404416    /* Compose virtual-disk extension: */
    405     QString strDefaultExtension = UIDiskEditorGroupBox::defaultExtension(mediumFormat, enmDeviceType);
     417    QString strDefaultExtension = UIWizardDiskEditors::defaultExtension(mediumFormat, enmDeviceType);
    406418    /* Update m_pLocationEditor's text if necessary: */
    407419    if (!m_pLocationEditor->text().isEmpty() && !strDefaultExtension.isEmpty())
    … …  
    412424            QFileInfo newFileInfo(QDir(fileInfo.absolutePath()),
    413425                                  QString("%1.%2").
    414                                   arg(stripFormatExtension(fileInfo.fileName(), formatExtensions)).
     426                                  arg(UIWizardDiskEditors::stripFormatExtension(fileInfo.fileName(), formatExtensions)).
    415427                                  arg(strDefaultExtension));
    416428            setMediumFilePath(newFileInfo.absoluteFilePath());
    … …  
    437449    if (m_pMediumSizeEditor)
    438450        return m_pMediumSizeEditor->setMediumSize(uSize);
    439 }
    440 
    441 /* static */
    442 QString UIMediumSizeAndPathGroupBox::stripFormatExtension(const QString &strFileName, const QStringList &formatExtensions)
    443 {
    444     QString result(strFileName);
    445     foreach (const QString &strExtension, formatExtensions)
    446     {
    447         if (strFileName.endsWith(strExtension, Qt::CaseInsensitive))
    448         {
    449             /* Add the dot to extenstion: */
    450             QString strExtensionWithDot(strExtension);
    451             strExtensionWithDot.prepend('.');
    452             int iIndex = strFileName.lastIndexOf(strExtensionWithDot, -1, Qt::CaseInsensitive);
    453             result.remove(iIndex, strExtensionWithDot.length());
    454         }
    455     }
    456     return result;
    457451}
    458452
    … …  
    531525    if (!deviceTypes.contains(m_enmDeviceType))
    532526        return;
    533     m_formatList << Format(medFormat, UIDiskEditorGroupBox::defaultExtension(medFormat, m_enmDeviceType), fPreferred);
     527    m_formatList << Format(medFormat, UIWizardDiskEditors::defaultExtension(medFormat, m_enmDeviceType), fPreferred);
    534528}
    535529

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.h

    r91279 r91293  
    5353
    5454/** A set of static utility functions used by several wizard in the context of virtual media. */
    55 namespace UIDiskEditorGroupBox
    56 {
     55namespace UIWizardDiskEditors
     56{
     57    /** Makes sure that @strFileName is suffixed witht the @strExtension. */
    5758    SHARED_LIBRARY_STUFF QString appendExtension(const QString &strName, const QString &strExtension);
    5859    SHARED_LIBRARY_STUFF QString constructMediumFilePath(const QString &strFileName, const QString &strPath);
    … …  
    6364      * returned by CMediumFormat::DescribeFileExtensions(..). */
    6465    SHARED_LIBRARY_STUFF  QString defaultExtension(const CMediumFormat &mediumFormatRef, KDeviceType enmDeviceType);
     66    /** Removes the file extension from @strFileName if @p formatExtensions contains it. */
     67    SHARED_LIBRARY_STUFF QString stripFormatExtension(const QString &strFileName,
     68                                                      const QStringList &formatExtensions);
    6569};
    6670
    … …  
    134138    void prepare(qulonglong uMinimumMediumSize);
    135139    virtual void retranslateUi() /* override final */;
    136     static QString stripFormatExtension(const QString &strFileName,
    137                                         const QStringList &formatExtensions);
    138140
    139141    QILineEdit *m_pLocationEditor;

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

    r91277 r91293  
    8686    AssertReturnVoid(pWizard);
    8787    QString strMediumPath =
    88         UIDiskEditorGroupBox::appendExtension(strPath,
    89                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
     88        UIWizardDiskEditors::appendExtension(strPath,
     89                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
    9090    pWizard->setMediumPath(strMediumPath);
    9191    emit completeChanged();
    … …  
    114114    CMediumFormat comMediumFormat(pWizard->mediumFormat());
    115115    QString strSelectedPath =
    116         UIDiskEditorGroupBox::openFileDialogForDiskFile(pWizard->mediumPath(), comMediumFormat,
     116        UIWizardDiskEditors::openFileDialogForDiskFile(pWizard->mediumPath(), comMediumFormat,
    117117                                                        KDeviceType_HardDisk, pWizard);
    118118    if (strSelectedPath.isEmpty())
    119119        return;
    120120    QString strMediumPath =
    121         UIDiskEditorGroupBox::appendExtension(strSelectedPath,
    122                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
     121        UIWizardDiskEditors::appendExtension(strSelectedPath,
     122                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
    123123    QFileInfo mediumPath(strMediumPath);
    124124    m_pSizeAndPathGroup->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
    … …  
    142142    pWizard->setMediumFormat(comMediumFormat);
    143143
    144     QString strExtension = UIDiskEditorGroupBox::defaultExtension(comMediumFormat, KDeviceType_HardDisk);
     144    QString strExtension = UIWizardDiskEditors::defaultExtension(comMediumFormat, KDeviceType_HardDisk);
    145145    QString strMediumFilePath =
    146         UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(m_strDefaultName,
     146        UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(m_strDefaultName,
    147147                                                                                            strExtension), m_strDefaultPath);
    148148    m_pSizeAndPathGroup->blockSignals(true);
    … …  
    195195
    196196    /* Make sure we are passing FAT size limitation: */
    197     fResult = UIDiskEditorGroupBox::checkFATSizeLimitation(pWizard->mediumVariant(),
     197    fResult = UIWizardDiskEditors::checkFATSizeLimitation(pWizard->mediumVariant(),
    198198                                     pWizard->mediumPath(),
    199199                                     pWizard->mediumSize());

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

    r91272 r91293  
    6363    AssertReturnVoid(pWizard);
    6464    QString strSelectedPath =
    65         UIDiskEditorGroupBox::openFileDialogForDiskFile(pWizard->mediumPath(), pWizard->mediumFormat(),
     65        UIWizardDiskEditors::openFileDialogForDiskFile(pWizard->mediumPath(), pWizard->mediumFormat(),
    6666                                                                KDeviceType_HardDisk, pWizard);
    6767
    … …  
    6969        return;
    7070    QString strMediumPath =
    71         UIDiskEditorGroupBox::appendExtension(strSelectedPath,
    72                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
     71        UIWizardDiskEditors::appendExtension(strSelectedPath,
     72                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
    7373    QFileInfo mediumPath(strMediumPath);
    7474    m_pMediumSizePathGroup->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
    … …  
    8989    m_userModifiedParameters << "MediumPath";
    9090    QString strMediumPath =
    91         UIDiskEditorGroupBox::appendExtension(strPath,
    92                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
     91        UIWizardDiskEditors::appendExtension(strPath,
     92                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
    9393    pWizard->setMediumPath(strMediumPath);
    9494    emit completeChanged();
    … …  
    105105    AssertReturnVoid(pWizard && m_pMediumSizePathGroup);
    106106
    107     QString strExtension = UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
     107    QString strExtension = UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
    108108    QString strMediumFilePath;
    109109    /* Initialize the medium file path with default name and path if user has not exclusively modified them yet: */
    110110    if (!m_userModifiedParameters.contains("MediumPath"))
    111111        strMediumFilePath =
    112             UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(m_strDefaultName,
     112            UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(m_strDefaultName,
    113113                                                                                                strExtension), m_strDefaultPath);
    114114    /* Initialize the medium file path with file path and file name from the location editor. This part is to update the
    … …  
    116116    else
    117117        strMediumFilePath =
    118             UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(m_pMediumSizePathGroup->mediumName(),
     118            UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(m_pMediumSizePathGroup->mediumName(),
    119119                                                                                                strExtension), m_pMediumSizePathGroup->mediumPath());
    120120    m_pMediumSizePathGroup->blockSignals(true);
    … …  
    159159
    160160    /* Make sure we are passing FAT size limitation: */
    161     fResult = UIDiskEditorGroupBox::checkFATSizeLimitation(pWizard->mediumVariant(),
     161    fResult = UIWizardDiskEditors::checkFATSizeLimitation(pWizard->mediumVariant(),
    162162                                     pWizard->mediumPath(),
    163163                                     pWizard->mediumSize());

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMDiskPage.cpp

    r91256 r91293  
    296296        setWidgetVisibility(pWizard->mediumFormat());
    297297    }
    298     QString strDefaultExtension =  UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
     298    QString strDefaultExtension =  UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
    299299
    300300    /* We set the medium name and path according to machine name/path and do not allow user change these in the guided mode: */
    … …  
    302302    const QString &strMachineFolder = pWizard->machineFolder();
    303303    QString strMediumPath =
    304         UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(strDefaultName,
     304        UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(strDefaultName,
    305305                                                                                  strDefaultExtension), strMachineFolder);
    306306    pWizard->setMediumPath(strMediumPath);

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

    r91277 r91293  
    612612        qulonglong uVariant = pWizard->mediumVariant();
    613613        /* Check FAT size limitation of the host hard drive: */
    614         fResult =  UIDiskEditorGroupBox::checkFATSizeLimitation(uVariant, strMediumPath, uSize);
     614        fResult =  UIWizardDiskEditors::checkFATSizeLimitation(uVariant, strMediumPath, uSize);
    615615        if (!fResult)
    616616        {
    … …  
    695695    CMediumFormat comMediumFormat(pWizard->mediumFormat());
    696696    QString strSelectedPath =
    697         UIDiskEditorGroupBox::openFileDialogForDiskFile(pWizard->mediumPath(), comMediumFormat, KDeviceType_HardDisk, pWizard);
     697        UIWizardDiskEditors::openFileDialogForDiskFile(pWizard->mediumPath(), comMediumFormat, KDeviceType_HardDisk, pWizard);
    698698    if (strSelectedPath.isEmpty())
    699699        return;
    700700    QString strMediumPath =
    701         UIDiskEditorGroupBox::appendExtension(strSelectedPath,
    702                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
     701        UIWizardDiskEditors::appendExtension(strSelectedPath,
     702                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
    703703    QFileInfo mediumPath(strMediumPath);
    704704    m_pSizeAndLocationGroup->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
    … …  
    818818            strMediumPath = uiCommon().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
    819819    }
    820     QString strExtension = UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
     820    QString strExtension = UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
    821821    if (m_pSizeAndLocationGroup)
    822822    {
    823823        QString strMediumFilePath =
    824             UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(strDiskFileName,
     824            UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(strDiskFileName,
    825825                                                                                      strExtension), strMediumPath);
    826826        m_pSizeAndLocationGroup->blockSignals(true);

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMSummaryPage.cpp

    r91167 r91293  
    493493        }
    494494        /* Check FAT size limitation of the host hard drive: */
    495         fResult = UIDiskEditorGroupBox::checkFATSizeLimitation(pWizard->mediumVariant(),
     495        fResult = UIWizardDiskEditors::checkFATSizeLimitation(pWizard->mediumVariant(),
    496496                                                                strMediumPath,
    497497                                                                pWizard->mediumSize());
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