VirtualBox

Changeset 90902 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Aug 26, 2021 8:15:30 AM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
146538
Message:

FE/Qt: bugref:9996. Small fixes.

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

Legend:

Unmodified
Added
Removed

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

    r90854 r90902  
    112112
    113113    UIDiskVariantGroupBox(bool fExpertMode, QWidget *pParent = 0);
     114    /** Enable/disable medium variant radio button depending on the capabilities of the medium format. */
    114115    void updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat);
    115116    qulonglong mediumVariant() const;

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

    r90714 r90902  
    8888    const QString &machineGroup() const;
    8989
    90     const QString &machineFilePath() const;
    91     void setMachineFilePath(const QString &strMachineFilePath);
    92 
    93     const QString &machineFolder() const;
    94     void setMachineFolder(const QString &strMachineFolder);
    95 
    96     const QString &machineBaseName() const;
    97     void setMachineBaseName(const QString &strMachineBaseName);
    98 
    99     const QString &createdMachineFolder() const;
    100     void setCreatedMachineFolder(const QString &strCreatedMachineFolder);
    101 
    102     const QString &detectedOSTypeId() const;
    103     void setDetectedOSTypeId(const QString &strDetectedOSTypeId);
    104 
    105     const QString &guestOSFamilyId() const;
    106     void setGuestOSFamilyId(const QString &strGuestOSFamilyId);
    107 
    108     const CGuestOSType &guestOSType() const;
    109     void setGuestOSType(const CGuestOSType &guestOSType);
    110 
    111     bool installGuestAdditions() const;
    112     void setInstallGuestAdditions(bool fInstallGA);
    113 
    114     bool startHeadless() const;
    115     void setStartHeadless(bool fStartHeadless);
    116 
    117     bool skipUnattendedInstall() const;
    118     void setSkipUnattendedInstall(bool fSkipUnattendedInstall);
    119 
    120     bool EFIEnabled() const;
    121     void setEFIEnabled(bool fEnabled);
    122 
    123     const QString &ISOFilePath() const;
    124     void setISOFilePath(const QString &strISOFilePath);
    125 
    126     const QString &userName() const;
    127     void setUserName(const QString &strUserName);
    128 
    129     const QString &password() const;
    130     void setPassword(const QString &strPassword);
    131 
    132     const QString &guestAdditionsISOPath() const;
    133     void setGuestAdditionsISOPath(const QString &strGAISOPath);
    134 
    135     const QString &hostnameDomainName() const;
    136     void setHostnameDomainName(const QString &strHostnameDomainName);
    137 
    138     const QString &productKey() const;
    139     void setProductKey(const QString &productKey);
    140 
    141     int CPUCount() const;
    142     void setCPUCount(int iCPUCount);
    143 
    144     int memorySize() const;
    145     void setMemorySize(int iMemory);
    146 
    147     qulonglong mediumVariant() const;
    148     void setMediumVariant(qulonglong uMediumVariant);
    149 
    150     const CMediumFormat &mediumFormat();
    151     void setMediumFormat(const CMediumFormat &mediumFormat);
    152 
    153     const QString &mediumPath() const;
    154     void setMediumPath(const QString &strMediumPath);
    155 
    156     qulonglong mediumSize() const;
    157     void setMediumSize(qulonglong mediumSize);
     90    /** @name Setter/getters for vm parameters
     91     * @{ */
     92       const QString &machineFilePath() const;
     93       void setMachineFilePath(const QString &strMachineFilePath);
     94
     95       const QString &machineFolder() const;
     96       void setMachineFolder(const QString &strMachineFolder);
     97
     98       const QString &machineBaseName() const;
     99       void setMachineBaseName(const QString &strMachineBaseName);
     100
     101      const QString &createdMachineFolder() const;
     102      void setCreatedMachineFolder(const QString &strCreatedMachineFolder);
     103
     104      const QString &detectedOSTypeId() const;
     105      void setDetectedOSTypeId(const QString &strDetectedOSTypeId);
     106
     107      const QString &guestOSFamilyId() const;
     108      void setGuestOSFamilyId(const QString &strGuestOSFamilyId);
     109
     110      const CGuestOSType &guestOSType() const;
     111      void setGuestOSType(const CGuestOSType &guestOSType);
     112
     113      bool installGuestAdditions() const;
     114      void setInstallGuestAdditions(bool fInstallGA);
     115
     116      bool startHeadless() const;
     117      void setStartHeadless(bool fStartHeadless);
     118
     119      bool skipUnattendedInstall() const;
     120      void setSkipUnattendedInstall(bool fSkipUnattendedInstall);
     121
     122      bool EFIEnabled() const;
     123      void setEFIEnabled(bool fEnabled);
     124
     125      const QString &ISOFilePath() const;
     126      void setISOFilePath(const QString &strISOFilePath);
     127
     128      const QString &userName() const;
     129      void setUserName(const QString &strUserName);
     130
     131      const QString &password() const;
     132      void setPassword(const QString &strPassword);
     133
     134      const QString &guestAdditionsISOPath() const;
     135      void setGuestAdditionsISOPath(const QString &strGAISOPath);
     136
     137      const QString &hostnameDomainName() const;
     138      void setHostnameDomainName(const QString &strHostnameDomainName);
     139
     140      const QString &productKey() const;
     141      void setProductKey(const QString &productKey);
     142
     143      int CPUCount() const;
     144      void setCPUCount(int iCPUCount);
     145
     146      int memorySize() const;
     147      void setMemorySize(int iMemory);
     148
     149      qulonglong mediumVariant() const;
     150      void setMediumVariant(qulonglong uMediumVariant);
     151
     152      const CMediumFormat &mediumFormat();
     153      void setMediumFormat(const CMediumFormat &mediumFormat);
     154
     155      const QString &mediumPath() const;
     156      void setMediumPath(const QString &strMediumPath);
     157
     158      qulonglong mediumSize() const;
     159      void setMediumSize(qulonglong mediumSize);
     160    /** @} */
    158161
    159162protected:
    … …  
    188191       int m_iUSBCount;
    189192       mutable UIUnattendedInstallData m_unattendedInstallData;
     193
     194      /** Path of the ISO file attached to the new vm. Possibly used for the unattended install. */
     195      QString m_strISOFilePath;
     196
     197      /** Path of the folder created by this wizard page. Used to remove previously created
     198        *  folder. see cleanupMachineFolder();*/
     199      QString m_strCreatedFolder;
     200
     201      /** Full path (including the file name) of the machine's configuration file. */
     202      QString m_strMachineFilePath;
     203      /** Path of the folder hosting the machine's configuration file. Generated from m_strMachineFilePath. */
     204      QString m_strMachineFolder;
     205      /** Base name of the machine is generated from the m_strMachineFilePath. */
     206      QString m_strMachineBaseName;
     207
     208      /** Type Id od the OS detected from the ISO file by IUnattended. */
     209      QString m_strDetectedOSTypeId;
     210
     211      /** Holds the VM OS family ID. */
     212      QString  m_strGuestOSFamilyId;
     213      /** Holds the VM OS type. */
     214      CGuestOSType m_comGuestOSType;
     215
     216      /** True if guest additions are to be installed during unattended install. */
     217      bool m_fInstallGuestAdditions;
     218      bool m_fSkipUnattendedInstall;
     219      bool m_fEFIEnabled;
     220
     221      int m_iCPUCount;
     222      int m_iMemorySize;
     223      int m_iUnattendedInstallPageIndex;
     224
     225      qulonglong m_uMediumVariant;
     226      CMediumFormat m_comMediumFormat;
     227      QString m_strMediumPath;
     228      qulonglong m_uMediumSize;
    190229    /** @} */
    191 
    192     /** Path of the ISO file attached to the new vm. Possibly used for the unattended install. */
    193     QString m_strISOFilePath;
    194 
    195     /** Path of the folder created by this wizard page. Used to remove previously created
    196      *  folder. see cleanupMachineFolder();*/
    197     QString m_strCreatedFolder;
    198 
    199     /** Full path (including the file name) of the machine's configuration file. */
    200     QString m_strMachineFilePath;
    201     /** Path of the folder hosting the machine's configuration file. Generated from m_strMachineFilePath. */
    202     QString m_strMachineFolder;
    203     /** Base name of the machine is generated from the m_strMachineFilePath. */
    204     QString m_strMachineBaseName;
    205 
    206     /** Type Id od the OS detected from the ISO file by IUnattended. */
    207     QString m_strDetectedOSTypeId;
    208 
    209     /** Holds the VM OS family ID. */
    210     QString  m_strGuestOSFamilyId;
    211     /** Holds the VM OS type. */
    212     CGuestOSType m_comGuestOSType;
    213 
    214     /** True if guest additions are to be installed during unattended install. */
    215     bool m_fInstallGuestAdditions;
    216     bool m_fSkipUnattendedInstall;
    217     bool m_fEFIEnabled;
    218 
    219     int m_iCPUCount;
    220     int m_iMemorySize;
    221     int m_iUnattendedInstallPageIndex;
    222 
    223     qulonglong m_uMediumVariant;
    224     CMediumFormat m_comMediumFormat;
    225     QString m_strMediumPath;
    226     qulonglong m_uMediumSize;
    227230};
    228231

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

    r90763 r90902  
    332332}
    333333
    334 void UIWizardNewVMDiskPageBasic::cleanupPage()
    335 {
    336     //UIWizardPage::cleanupPage();
    337 }
    338 
    339334bool UIWizardNewVMDiskPageBasic::isComplete() const
    340335{
    … …  
    388383        }
    389384    }
    390 
    391     // startProcessing();
    392385    if (pWizard)
    393386    {

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

    r90763 r90902  
    2323
    2424/* Qt includes: */
    25 #include <QVariant>
    2625#include <QSet>
    2726
    … …  
    8685    void createConnections();
    8786    QWidget *createNewDiskWidgets();
    88     void cleanupPage();
    8987    void setEnableNewDiskWidgets(bool fEnable);
    9088    QWidget *createDiskWidgets();
    … …  
    116114    /** @} */
    117115
    118     SelectedDiskSource m_enmSelectedDiskSource;
    119     bool m_fRecommendedNoDisk;
    120 
    121     QSet<QString> m_userModifiedParameters;
    122     bool m_fVDIFormatFound;
    123     qulonglong m_uMediumSizeMin;
    124     qulonglong m_uMediumSizeMax;
    125 
     116    /** @name Variables
     117     * @{ */
     118      SelectedDiskSource m_enmSelectedDiskSource;
     119      bool m_fRecommendedNoDisk;
     120      QSet<QString> m_userModifiedParameters;
     121      bool m_fVDIFormatFound;
     122      qulonglong m_uMediumSizeMin;
     123      qulonglong m_uMediumSizeMax;
     124    /** @} */
    126125};
    127126
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