VirtualBox

Changeset 90407 in vbox for trunk/src


Ignore:
Timestamp:
Jul 29, 2021 1:17:06 PM (4 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9996. Cleaning

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

Legend:

Unmodified
Added
Removed

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

    r90403 r90407  
    1616 */
    1717
    18 /* Qt includes: */
    19 #include <QVariant>
    20 #include <QPushButton>
    21 
    2218/* GUI includes: */
    2319#include "UICommon.h"
    … …  
    3026#include "UIWizardNewVDPageSizeLocation.h"
    3127#include "UIWizardNewVDPageExpert.h"
    32 
    33 /* COM includes: */
    34 #include "CMediumFormat.h"
    3528
    3629
    … …  
    124117bool UIWizardNewVD::createVirtualDisk()
    125118{
    126     /* Gather attributes: */
    127     // const CMediumFormat comMediumFormat = field("mediumFormat").value<CMediumFormat>();
    128     // const qulonglong uVariant = field("mediumVariant").toULongLong();
    129     // const QString strMediumPath = field("mediumPath").toString();
    130     // const qulonglong uSize = field("mediumSize").toULongLong();
    131     /* Check attributes: */
    132119    AssertReturn(!m_strMediumPath.isNull(), false);
    133120    AssertReturn(m_uMediumSize > 0, false);

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageFileType.h

    r90370 r90407  
    2525#include "UINativeWizardPage.h"
    2626
    27 /* COM includes: */
    28 #include "COMEnums.h"
    29 #include "CMediumFormat.h"
    30 
    3127/* Forward declarations: */
    32 class QVBoxLayout;
    33 class QButtonGroup;
    34 class QRadioButton;
    3528class QIRichTextLabel;
    3629class UIDiskFormatsGroupBox;
    … …  
    3831namespace UIWizardNewVDFileType
    3932{
    40 
    41 //     CMediumFormat mediumFormat() const;
    42 //     void setMediumFormat(const CMediumFormat &mediumFormat);
    43 //     void retranslateWidgets();
    44 
    45 
    46 //     QList<CMediumFormat> m_formats;
    47 //     QStringList m_formatNames;
    48 //     QStringList m_formatExtensions;
    4933}
    5034
    … …  
    7357    bool isComplete() const;
    7458
    75 
    7659    QIRichTextLabel *m_pLabel;
    7760    UIDiskFormatsGroupBox *m_pFormatButtonGroup;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageSizeLocation.h

    r90400 r90407  
    2727/* Forward declarations: */
    2828class CMediumFormat;
    29 class QLabel;
    30 class QLineEdit;
    31 class QIToolButton;
    32 class QIRichTextLabel;
    33 class UIMediumSizeEditor;
    3429class UIMediumSizeAndPathGroupBox;
    3530
    36 // /* 3rd page of the New Virtual Hard Drive wizard (base part): */
    37 // class SHARED_LIBRARY_STUFF UIWizardNewVDPageBaseSizeLocation : public UIWizardPageBase
    38 // {
    39 
    40 // public:
    41 
    42 //     static QString defaultExtension(const CMediumFormat &mediumFormatRef);
    43 //     /* Checks if the medium file is bigger than what is allowed in FAT file systems. */
    44 //     static bool checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize);
    45 
    46 // protected:
    47 
    48 //     UIWizardNewVDPageBaseSizeLocation(const QString &strDefaultName, const QString &strDefaultPath);
    49 //     UIWizardNewVDPageBaseSizeLocation();
    50 
    51 //     void onSelectLocationButtonClicked();
    52 
    53 //     static QString toFileName(const QString &strName, const QString &strExtension);
    54 //     /** Returns the full image file path except the extension. */
    55 //     static QString absoluteFilePath(const QString &strFileName, const QString &strPath);
    56 //     /** Returns the full image file path including the extension. */
    57 //     static QString absoluteFilePath(const QString &strFileName, const QString &strPath, const QString &strExtension);
    58 
    59 //     virtual QString mediumPath() const;
    60 //     /** A utility function thar strips the format extension from the @p strFileName.
    61 //       * foo.dd.vdi becomes foo.dd. any extension which is not a format extension is left alone. */
    62 //     static QString stripFormatExtension(const QString &strFileName, const QStringList &formatExtensions);
    63 //     void updateLocationEditorAfterFormatChange(const CMediumFormat &mediumFormat, const QStringList &formatExtensions);
    64 
    65 //     qulonglong mediumSize() const;
    66 //     void setMediumSize(qulonglong uMediumSize);
    67 //     void retranslateWidgets();
    68 
    69 //     /** @name Widgets
    70 //      * @{ */
    71 //        QString m_strDefaultName;
    72 //        QString m_strDefaultPath;
    73 //        QString m_strDefaultExtension;
    74 
    75 //     /** @} */
    76 
    77 //     /** @name Widgets
    78 //      * @{ */
    79 //        QLineEdit *m_pLocationEditor;
    80 //        QIToolButton *m_pLocationOpenButton;
    81 //        UIMediumSizeEditor *m_pMediumSizeEditor;
    82 //        QLabel          *m_pMediumSizeEditorLabel;
    83 
    84 //     /** @} */
    85 // };
    86 
    87 
    88 /* 3rd page of the New Virtual Hard Drive wizard (basic extension): */
    8931class SHARED_LIBRARY_STUFF UIWizardNewVDPageSizeLocation : public UINativeWizardPage
    9032{

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

    r90400 r90407  
    1919#include <QVBoxLayout>
    2020#include <QButtonGroup>
    21 #include <QRadioButton>
    22 #include <QCheckBox>
    2321
    2422/* GUI includes: */
    … …  
    3028/* COM includes: */
    3129#include "CMediumFormat.h"
    32 
    33 // UIWizardNewVDPageBaseVariant::UIWizardNewVDPageBaseVariant()
    34 //     : m_pFixedCheckBox(0)
    35 //     , m_pSplitBox(0)
    36 //     , m_pDescriptionLabel(0)
    37 //     , m_pDynamicLabel(0)
    38 //     , m_pFixedLabel(0)
    39 //     , m_pSplitLabel(0)
    40 // {
    41 // }
    42 
    43 // QWidget *UIWizardNewVDPageBaseVariant::createMediumVariantWidgets(bool fWithLabels)
    44 // {
    45 //     QWidget *pContainerWidget = new QWidget;
    46 //     return pContainerWidget;
    47 // }
    48 
    49 // qulonglong UIWizardNewVDPageBaseVariant::mediumVariant() const
    50 // {
    51 //     /* Initial value: */
    52 //     qulonglong uMediumVariant = (qulonglong)KMediumVariant_Max;
    53 
    54 //     /* Exclusive options: */
    55 //     if (m_pFixedCheckBox && m_pFixedCheckBox->isChecked())
    56 //         uMediumVariant = (qulonglong)KMediumVariant_Fixed;
    57 //     else
    58 //         uMediumVariant = (qulonglong)KMediumVariant_Standard;
    59 
    60 //     /* Additional options: */
    61 //     if (m_pSplitBox && m_pSplitBox->isChecked())
    62 //         uMediumVariant |= (qulonglong)KMediumVariant_VmdkSplit2G;
    63 
    64 //     /* Return options: */
    65 //     return uMediumVariant;
    66 // }
    67 
    68 // void UIWizardNewVDPageBaseVariant::setMediumVariant(qulonglong uMediumVariant)
    69 // {
    70 //     /* Exclusive options: */
    71 //     if (uMediumVariant & (qulonglong)KMediumVariant_Fixed)
    72 //     {
    73 //         m_pFixedCheckBox->click();
    74 //         m_pFixedCheckBox->setFocus();
    75 //     }
    76 
    77 //     /* Additional options: */
    78 //     m_pSplitBox->setChecked(uMediumVariant & (qulonglong)KMediumVariant_VmdkSplit2G);
    79 // }
    80 
    81 // void UIWizardNewVDPageBaseVariant::retranslateWidgets()
    82 // {
    83 //     if (m_pFixedCheckBox)
    84 //     {
    85 //         m_pFixedCheckBox->setText(UIWizardNewVD::tr("Pre-allocate &Full Size"));
    86 //         m_pFixedCheckBox->setToolTip(UIWizardNewVD::tr("<p>When checked, the virtual disk image will be fully allocated at "
    87 //                                                        "VM creation time, rather than being allocated dynamically at VM run-time.</p>"));
    88 //     }
    89 
    90 //     if (m_pSplitBox)
    91 //         m_pSplitBox->setText(UIWizardNewVD::tr("&Split Into Files of Less Than 2GB"));
    92 
    93 
    94 // }
    95 
    96 // void UIWizardNewVDPageBaseVariant::updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat)
    97 // {
    98 //     /* Enable/disable widgets: */
    99 //     ULONG uCapabilities = 0;
    100 //     QVector<KMediumFormatCapabilities> capabilities;
    101 //     capabilities = mediumFormat.GetCapabilities();
    102 //     for (int i = 0; i < capabilities.size(); i++)
    103 //         uCapabilities |= capabilities[i];
    104 
    105 //     bool fIsCreateDynamicPossible = uCapabilities & KMediumFormatCapabilities_CreateDynamic;
    106 //     bool fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;
    107 //     bool fIsCreateSplitPossible = uCapabilities & KMediumFormatCapabilities_CreateSplit2G;
    108 
    109 //     if (m_pFixedCheckBox)
    110 //     {
    111 //         m_pFixedCheckBox->setEnabled(fIsCreateDynamicPossible || fIsCreateFixedPossible);
    112 //         if (!fIsCreateDynamicPossible)
    113 //             m_pFixedCheckBox->setChecked(true);
    114 //         if (!fIsCreateFixedPossible)
    115 //             m_pFixedCheckBox->setChecked(false);
    116 //     }
    117 //     m_pSplitBox->setEnabled(fIsCreateSplitPossible);
    118 // }
    11930
    12031UIWizardNewVDPageVariant::UIWizardNewVDPageVariant()
    … …  
    15162            this, &UIWizardNewVDPageVariant::sltMediumVariantChanged);
    15263    retranslateUi();
    153 
    154     /* Create widgets: */
    155     // QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    156     // pMainLayout->addWidget(createMediumVariantWidgets(true));
    157     // pMainLayout->addStretch();
    158 
    159     // /* Setup connections: */
    160     // connect(m_pFixedCheckBox, &QAbstractButton::toggled,
    161     //         this, &UIWizardNewVDPageVariant::completeChanged);
    162     // connect(m_pSplitBox, &QCheckBox::stateChanged,
    163     //         this, &UIWizardNewVDPageVariant::completeChanged);
    164 
    165     // /* Register fields: */
    166     // registerField("mediumVariant", this, "mediumVariant");
    16764}
    16865

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageVariant.h

    r90372 r90407  
    2727/* Forward declarations: */
    2828class CMediumFormat;
    29 class QButtonGroup;
    30 class QCheckBox;
    3129class QIRichTextLabel;
    3230class UIDiskVariantGroupBox;
    33 
    34 // /* 2nd page of the New Virtual Hard Drive wizard (base part): */
    35 // class SHARED_LIBRARY_STUFF UIWizardNewVDPageBaseVariant : public UIWizardPageBase
    36 // {
    37 // protected:
    38 
    39 //     /** Constructor: */
    40 //     UIWizardNewVDPageBaseVariant();
    41 
    42 //     QWidget *createMediumVariantWidgets(bool fWithLabels);
    43 //     qulonglong mediumVariant() const;
    44 //     void setMediumVariant(qulonglong uMediumVariant);
    45 //     void retranslateWidgets();
    46 //     /** Check Medium format capability and decide if certain widgets can be shown. */
    47 //     void setWidgetVisibility(CMediumFormat &mediumFormat);
    48 //     void updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat);
    49 
    50 // };
    5131
    5232class SHARED_LIBRARY_STUFF UIWizardNewVDPageVariant : public UINativeWizardPage

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

    r90401 r90407  
    3838#include "UIWizardNewVMDiskPageBasic.h"
    3939#include "UIWizardDiskEditors.h"
     40#include "UIWizardNewVM.h"
    4041
    4142/* COM includes: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMDiskPageBasic.h

    r90401 r90407  
    2929#include "QIFileDialog.h"
    3030#include "UINativeWizardPage.h"
    31 #include "UIWizardNewVDPageFileType.h"
    32 #include "UIWizardNewVDPageVariant.h"
    33 #include "UIWizardNewVDPageSizeLocation.h"
    34 #include "UIWizardNewVM.h"
     31//
    3532
    3633/* COM includes: */
    … …  
    4037/* Forward declarations: */
    4138class QButtonGroup;
     39class QCheckBox;
    4240class QRadioButton;
     41class QLabel;
    4342class QIRichTextLabel;
    4443class QIToolButton;
    4544class UIMediaComboBox;
     45class UIMediumSizeEditor;
     46class UIWizardNewVM;
    4647
    4748enum SelectedDiskSource
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