VirtualBox

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


Ignore:
Timestamp:
Sep 13, 2024 12:50:24 PM (8 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
164803
Message:

FE/Qt: bugref:10513: VM Settings / Storage page: Split widgets common for CD and FD attachments into properly arranged separate pairs; That is necessary to move them later into appropriate stacked widget containers to use vertical space more effectively.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/settings/editors
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r106045 r106046  
    55
    66/*
    7  * Copyright (C) 2006-2023 Oracle and/or its affiliates.
     7 * Copyright (C) 2006-2024 Oracle and/or its affiliates.
    88 *
    99 * This file is part of VirtualBox base platform packages, as
    … …  
    29662966    , m_pLabelHDFormat(0)
    29672967    , m_pFieldHDFormat(0)
    2968     , m_pLabelCDFDType(0)
    2969     , m_pFieldCDFDType(0)
     2968    , m_pLabelCDType(0)
     2969    , m_pFieldCDType(0)
     2970    , m_pLabelFDType(0)
     2971    , m_pFieldFDType(0)
    29702972    , m_pLabelHDVirtualSize(0)
    29712973    , m_pFieldHDVirtualSize(0)
    29722974    , m_pLabelHDActualSize(0)
    29732975    , m_pFieldHDActualSize(0)
    2974     , m_pLabelCDFDSize(0)
    2975     , m_pFieldCDFDSize(0)
     2976    , m_pLabelCDSize(0)
     2977    , m_pFieldCDSize(0)
     2978    , m_pLabelFDSize(0)
     2979    , m_pFieldFDSize(0)
    29762980    , m_pLabelHDDetails(0)
    29772981    , m_pFieldHDDetails(0)
    … …  
    30803084    m_pLabelHDFormat->setEnabled(fMachineInValidMode);
    30813085    m_pFieldHDFormat->setEnabled(fMachineInValidMode);
    3082     m_pLabelCDFDType->setEnabled(fMachineInValidMode);
    3083     m_pFieldCDFDType->setEnabled(fMachineInValidMode);
     3086    m_pLabelCDType->setEnabled(fMachineInValidMode);
     3087    m_pFieldCDType->setEnabled(fMachineInValidMode);
     3088    m_pLabelFDType->setEnabled(fMachineInValidMode);
     3089    m_pFieldFDType->setEnabled(fMachineInValidMode);
    30843090    m_pLabelHDVirtualSize->setEnabled(fMachineInValidMode);
    30853091    m_pFieldHDVirtualSize->setEnabled(fMachineInValidMode);
    30863092    m_pLabelHDActualSize->setEnabled(fMachineInValidMode);
    30873093    m_pFieldHDActualSize->setEnabled(fMachineInValidMode);
    3088     m_pLabelCDFDSize->setEnabled(fMachineInValidMode);
    3089     m_pFieldCDFDSize->setEnabled(fMachineInValidMode);
     3094    m_pLabelCDSize->setEnabled(fMachineInValidMode);
     3095    m_pFieldCDSize->setEnabled(fMachineInValidMode);
     3096    m_pLabelFDSize->setEnabled(fMachineInValidMode);
     3097    m_pFieldFDSize->setEnabled(fMachineInValidMode);
    30903098    m_pLabelHDDetails->setEnabled(fMachineInValidMode);
    30913099    m_pFieldHDDetails->setEnabled(fMachineInValidMode);
    … …  
    32693277    m_pLabelSeparatorInformation->setText(tr("Information"));
    32703278    m_pLabelHDFormat->setText(tr("Type (Format):"));
    3271     m_pLabelCDFDType->setText(tr("Type:"));
     3279    m_pLabelCDType->setText(tr("Type:"));
     3280    m_pLabelFDType->setText(tr("Type:"));
    32723281    m_pLabelHDVirtualSize->setText(tr("Virtual size:"));
    32733282    m_pLabelHDActualSize->setText(tr("Actual size:"));
    3274     m_pLabelCDFDSize->setText(tr("Size:"));
     3283    m_pLabelCDSize->setText(tr("Size:"));
     3284    m_pLabelFDSize->setText(tr("Size:"));
    32753285    m_pLabelHDDetails->setText(tr("Storage details:"));
    32763286    m_pLabelLocation->setText(tr("Location:"));
    … …  
    37203730                m_pLabelHDFormat->setVisible(enmDeviceType == KDeviceType_HardDisk);
    37213731                m_pFieldHDFormat->setVisible(enmDeviceType == KDeviceType_HardDisk);
    3722                 m_pLabelCDFDType->setVisible(enmDeviceType != KDeviceType_HardDisk);
    3723                 m_pFieldCDFDType->setVisible(enmDeviceType != KDeviceType_HardDisk);
     3732                m_pLabelCDType->setVisible(enmDeviceType == KDeviceType_DVD);
     3733                m_pFieldCDType->setVisible(enmDeviceType == KDeviceType_DVD);
     3734                m_pLabelFDType->setVisible(enmDeviceType == KDeviceType_Floppy);
     3735                m_pFieldFDType->setVisible(enmDeviceType == KDeviceType_Floppy);
    37243736                m_pLabelHDVirtualSize->setVisible(enmDeviceType == KDeviceType_HardDisk);
    37253737                m_pFieldHDVirtualSize->setVisible(enmDeviceType == KDeviceType_HardDisk);
    37263738                m_pLabelHDActualSize->setVisible(enmDeviceType == KDeviceType_HardDisk);
    37273739                m_pFieldHDActualSize->setVisible(enmDeviceType == KDeviceType_HardDisk);
    3728                 m_pLabelCDFDSize->setVisible(enmDeviceType != KDeviceType_HardDisk);
    3729                 m_pFieldCDFDSize->setVisible(enmDeviceType != KDeviceType_HardDisk);
     3740                m_pLabelCDSize->setVisible(enmDeviceType == KDeviceType_DVD);
     3741                m_pFieldCDSize->setVisible(enmDeviceType == KDeviceType_DVD);
     3742                m_pLabelFDSize->setVisible(enmDeviceType == KDeviceType_Floppy);
     3743                m_pFieldFDSize->setVisible(enmDeviceType == KDeviceType_Floppy);
    37303744                m_pLabelHDDetails->setVisible(enmDeviceType == KDeviceType_HardDisk);
    37313745                m_pFieldHDDetails->setVisible(enmDeviceType == KDeviceType_HardDisk);
    … …  
    37353749                /* Getting other information: */
    37363750                m_pFieldHDFormat->setText(compressText(pModel->data(index, StorageModel::R_AttFormat).toString()));
    3737                 m_pFieldCDFDType->setText(compressText(pModel->data(index, StorageModel::R_AttFormat).toString()));
     3751                m_pFieldCDType->setText(compressText(pModel->data(index, StorageModel::R_AttFormat).toString()));
     3752                m_pFieldFDType->setText(compressText(pModel->data(index, StorageModel::R_AttFormat).toString()));
    37383753                m_pFieldHDVirtualSize->setText(compressText(pModel->data(index, StorageModel::R_AttLogicalSize).toString()));
    37393754                m_pFieldHDActualSize->setText(compressText(pModel->data(index, StorageModel::R_AttSize).toString()));
    3740                 m_pFieldCDFDSize->setText(compressText(pModel->data(index, StorageModel::R_AttSize).toString()));
     3755                m_pFieldCDSize->setText(compressText(pModel->data(index, StorageModel::R_AttSize).toString()));
     3756                m_pFieldFDSize->setText(compressText(pModel->data(index, StorageModel::R_AttSize).toString()));
    37413757                m_pFieldHDDetails->setText(compressText(pModel->data(index, StorageModel::R_AttDetails).toString()));
    37423758                m_pFieldLocation->setText(compressText(pModel->data(index, StorageModel::R_AttLocation).toString()));
    … …  
    48214837            m_pLayoutAttachment->setContentsMargins(10, 0, 0, 0);
    48224838            m_pLayoutAttachment->setColumnStretch(2, 1);
    4823             m_pLayoutAttachment->setRowStretch(14, 1);
     4839            m_pLayoutAttachment->setRowStretch(16, 1);
    48244840
    48254841            /* Prepare separator for attachment case: */
    … …  
    49274943            }
    49284944
    4929             /* Prepare CD/FD type label: */
    4930             m_pLabelCDFDType = new QLabel(pWidgetAttachment);
    4931             if (m_pLabelCDFDType)
    4932             {
    4933                 m_pLabelCDFDType->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
    4934                 m_pLayoutAttachment->addWidget(m_pLabelCDFDType, 6, 1);
    4935             }
    4936             /* Prepare CD/FD type field: */
    4937             m_pFieldCDFDType = new QILabel(pWidgetAttachment);
    4938             if (m_pFieldCDFDType)
    4939             {
    4940                 m_pFieldCDFDType->setFullSizeSelection(true);
    4941                 m_pFieldCDFDType->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
    4942                 m_pLayoutAttachment->addWidget(m_pFieldCDFDType, 6, 2);
     4945            /* Prepare CD type label: */
     4946            m_pLabelCDType = new QLabel(pWidgetAttachment);
     4947            if (m_pLabelCDType)
     4948            {
     4949                m_pLabelCDType->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
     4950                m_pLayoutAttachment->addWidget(m_pLabelCDType, 6, 1);
     4951            }
     4952            /* Prepare CD type field: */
     4953            m_pFieldCDType = new QILabel(pWidgetAttachment);
     4954            if (m_pFieldCDType)
     4955            {
     4956                m_pFieldCDType->setFullSizeSelection(true);
     4957                m_pFieldCDType->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
     4958                m_pLayoutAttachment->addWidget(m_pFieldCDType, 6, 2);
     4959            }
     4960
     4961            /* Prepare FD type label: */
     4962            m_pLabelFDType = new QLabel(pWidgetAttachment);
     4963            if (m_pLabelFDType)
     4964            {
     4965                m_pLabelFDType->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
     4966                m_pLayoutAttachment->addWidget(m_pLabelFDType, 7, 1);
     4967            }
     4968            /* Prepare FD type field: */
     4969            m_pFieldFDType = new QILabel(pWidgetAttachment);
     4970            if (m_pFieldFDType)
     4971            {
     4972                m_pFieldFDType->setFullSizeSelection(true);
     4973                m_pFieldFDType->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
     4974                m_pLayoutAttachment->addWidget(m_pFieldFDType, 7, 2);
    49434975            }
    49444976
    … …  
    49484980            {
    49494981                m_pLabelHDVirtualSize->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
    4950                 m_pLayoutAttachment->addWidget(m_pLabelHDVirtualSize, 7, 1);
     4982                m_pLayoutAttachment->addWidget(m_pLabelHDVirtualSize, 8, 1);
    49514983            }
    49524984            /* Prepare HD virtual size field: */
    … …  
    49564988                m_pFieldHDVirtualSize->setFullSizeSelection(true);
    49574989                m_pFieldHDVirtualSize->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
    4958                 m_pLayoutAttachment->addWidget(m_pFieldHDVirtualSize, 7, 2);
     4990                m_pLayoutAttachment->addWidget(m_pFieldHDVirtualSize, 8, 2);
    49594991            }
    49604992
    … …  
    49644996            {
    49654997                m_pLabelHDActualSize->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
    4966                 m_pLayoutAttachment->addWidget(m_pLabelHDActualSize, 8, 1);
     4998                m_pLayoutAttachment->addWidget(m_pLabelHDActualSize, 9, 1);
    49674999            }
    49685000            /* Prepare HD actual size field: */
    … …  
    49725004                m_pFieldHDActualSize->setFullSizeSelection(true);
    49735005                m_pFieldHDActualSize->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
    4974                 m_pLayoutAttachment->addWidget(m_pFieldHDActualSize, 8, 2);
    4975             }
    4976 
    4977             /* Prepare CD/FD size label: */
    4978             m_pLabelCDFDSize = new QLabel(pWidgetAttachment);
    4979             if (m_pLabelCDFDSize)
    4980             {
    4981                 m_pLabelCDFDSize->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
    4982                 m_pLayoutAttachment->addWidget(m_pLabelCDFDSize, 9, 1);
    4983             }
    4984             /* Prepare CD/FD size field: */
    4985             m_pFieldCDFDSize = new QILabel(pWidgetAttachment);
    4986             if (m_pFieldCDFDSize)
    4987             {
    4988                 m_pFieldCDFDSize->setFullSizeSelection(true);
    4989                 m_pFieldCDFDSize->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
    4990                 m_pLayoutAttachment->addWidget(m_pFieldCDFDSize, 9, 2);
     5006                m_pLayoutAttachment->addWidget(m_pFieldHDActualSize, 9, 2);
     5007            }
     5008
     5009            /* Prepare CD size label: */
     5010            m_pLabelCDSize = new QLabel(pWidgetAttachment);
     5011            if (m_pLabelCDSize)
     5012            {
     5013                m_pLabelCDSize->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
     5014                m_pLayoutAttachment->addWidget(m_pLabelCDSize, 10, 1);
     5015            }
     5016            /* Prepare CD size field: */
     5017            m_pFieldCDSize = new QILabel(pWidgetAttachment);
     5018            if (m_pFieldCDSize)
     5019            {
     5020                m_pFieldCDSize->setFullSizeSelection(true);
     5021                m_pFieldCDSize->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
     5022                m_pLayoutAttachment->addWidget(m_pFieldCDSize, 10, 2);
     5023            }
     5024
     5025            /* Prepare FD size label: */
     5026            m_pLabelFDSize = new QLabel(pWidgetAttachment);
     5027            if (m_pLabelFDSize)
     5028            {
     5029                m_pLabelFDSize->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
     5030                m_pLayoutAttachment->addWidget(m_pLabelFDSize, 11, 1);
     5031            }
     5032            /* Prepare FD size field: */
     5033            m_pFieldFDSize = new QILabel(pWidgetAttachment);
     5034            if (m_pFieldFDSize)
     5035            {
     5036                m_pFieldFDSize->setFullSizeSelection(true);
     5037                m_pFieldFDSize->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
     5038                m_pLayoutAttachment->addWidget(m_pFieldFDSize, 11, 2);
    49915039            }
    49925040
    … …  
    49965044            {
    49975045                m_pLabelHDDetails->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
    4998                 m_pLayoutAttachment->addWidget(m_pLabelHDDetails, 10, 1);
     5046                m_pLayoutAttachment->addWidget(m_pLabelHDDetails, 12, 1);
    49995047            }
    50005048            /* Prepare HD details field: */
    … …  
    50045052                m_pFieldHDDetails->setFullSizeSelection(true);
    50055053                m_pFieldHDDetails->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
    5006                 m_pLayoutAttachment->addWidget(m_pFieldHDDetails, 10, 2);
     5054                m_pLayoutAttachment->addWidget(m_pFieldHDDetails, 12, 2);
    50075055            }
    50085056
    … …  
    50125060            {
    50135061                m_pLabelLocation->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
    5014                 m_pLayoutAttachment->addWidget(m_pLabelLocation, 11, 1);
     5062                m_pLayoutAttachment->addWidget(m_pLabelLocation, 13, 1);
    50155063            }
    50165064            /* Prepare location field: */
    … …  
    50205068                m_pFieldLocation->setFullSizeSelection(true);
    50215069                m_pFieldLocation->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
    5022                 m_pLayoutAttachment->addWidget(m_pFieldLocation, 11, 2);
     5070                m_pLayoutAttachment->addWidget(m_pFieldLocation, 13, 2);
    50235071            }
    50245072
    … …  
    50285076            {
    50295077                m_pLabelUsage->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
    5030                 m_pLayoutAttachment->addWidget(m_pLabelUsage, 12, 1);
     5078                m_pLayoutAttachment->addWidget(m_pLabelUsage, 14, 1);
    50315079            }
    50325080            /* Prepare usage field: */
    … …  
    50365084                m_pFieldUsage->setFullSizeSelection(true);
    50375085                m_pFieldUsage->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
    5038                 m_pLayoutAttachment->addWidget(m_pFieldUsage, 12, 2);
     5086                m_pLayoutAttachment->addWidget(m_pFieldUsage, 14, 2);
    50395087            }
    50405088
    … …  
    50445092            {
    50455093                m_pLabelEncryption->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
    5046                 m_pLayoutAttachment->addWidget(m_pLabelEncryption, 13, 1);
     5094                m_pLayoutAttachment->addWidget(m_pLabelEncryption, 15, 1);
    50475095            }
    50485096            /* Prepare encryption field: */
    … …  
    50525100                m_pFieldEncryption->setFullSizeSelection(true);
    50535101                m_pFieldEncryption->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
    5054                 m_pLayoutAttachment->addWidget(m_pFieldEncryption, 13, 2);
     5102                m_pLayoutAttachment->addWidget(m_pFieldEncryption, 15, 2);
    50555103            }
    50565104

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

    r106045 r106046  
    55
    66/*
    7  * Copyright (C) 2006-2023 Oracle and/or its affiliates.
     7 * Copyright (C) 2006-2024 Oracle and/or its affiliates.
    88 *
    99 * This file is part of VirtualBox base platform packages, as
    … …  
    501501        /** Holds the HD format field instance. */
    502502        QILabel          *m_pFieldHDFormat;
    503         /** Holds the CD/FD type label instance. */
    504         QLabel           *m_pLabelCDFDType;
    505         /** Holds the CD/FD type field instance. */
    506         QILabel          *m_pFieldCDFDType;
     503        /** Holds the CD type label instance. */
     504        QLabel           *m_pLabelCDType;
     505        /** Holds the CD type field instance. */
     506        QILabel          *m_pFieldCDType;
     507        /** Holds the FD type label instance. */
     508        QLabel           *m_pLabelFDType;
     509        /** Holds the FD type field instance. */
     510        QILabel          *m_pFieldFDType;
    507511        /** Holds the HD virtual size label instance. */
    508512        QLabel           *m_pLabelHDVirtualSize;
    … …  
    513517        /** Holds the HD actual size field instance. */
    514518        QILabel          *m_pFieldHDActualSize;
    515         /** Holds the CD/FD size label instance. */
    516         QLabel           *m_pLabelCDFDSize;
    517         /** Holds the CD/FD size field instance. */
    518         QILabel          *m_pFieldCDFDSize;
     519        /** Holds the CD size label instance. */
     520        QLabel           *m_pLabelCDSize;
     521        /** Holds the CD size field instance. */
     522        QILabel          *m_pFieldCDSize;
     523        /** Holds the FD size label instance. */
     524        QLabel           *m_pLabelFDSize;
     525        /** Holds the FD size field instance. */
     526        QILabel          *m_pFieldFDSize;
    519527        /** Holds the HD details label instance. */
    520528        QLabel           *m_pLabelHDDetails;
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