VirtualBox

Changeset 101511 in vbox


Ignore:
Timestamp:
Oct 19, 2023 2:38:49 PM (12 months ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10513: Adjust layout for pages/editors with manual label hints.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/settings
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.cpp

    r101230 r101511  
    133133}
    134134
     135void UIAudioSettingsEditor::filterOut(bool fExpertMode, const QString &strFilter)
     136{
     137    /* Call to base-class: */
     138    UIEditor::filterOut(fExpertMode, strFilter);
     139
     140    updateMinimumLayoutHint();
     141}
     142
    135143void UIAudioSettingsEditor::retranslateUi()
    136144{
     
    142150    }
    143151
    144     /* These editors have own labels, but we want them to be properly layouted according to each other: */
    145     int iMinimumLayoutHint = 0;
    146     if (m_pEditorAudioHostDriver)
    147         iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioHostDriver->minimumLabelHorizontalHint());
    148     if (m_pEditorAudioController)
    149         iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioController->minimumLabelHorizontalHint());
    150     if (m_pEditorAudioFeatures)
    151         iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioFeatures->minimumLabelHorizontalHint());
    152     if (m_pEditorAudioHostDriver)
    153         m_pEditorAudioHostDriver->setMinimumLayoutIndent(iMinimumLayoutHint);
    154     if (m_pEditorAudioController)
    155         m_pEditorAudioController->setMinimumLayoutIndent(iMinimumLayoutHint);
    156     if (m_pEditorAudioFeatures)
    157         m_pEditorAudioFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     152    updateMinimumLayoutHint();
    158153}
    159154
     
    246241    m_pWidgetSettings->setEnabled(m_pCheckboxFeature->isChecked());
    247242}
     243
     244void UIAudioSettingsEditor::updateMinimumLayoutHint()
     245{
     246    /* These editors have own labels, but we want them to be properly layouted according to each other: */
     247    int iMinimumLayoutHint = 0;
     248    if (m_pEditorAudioHostDriver && !m_pEditorAudioHostDriver->isHidden())
     249        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioHostDriver->minimumLabelHorizontalHint());
     250    if (m_pEditorAudioController && !m_pEditorAudioController->isHidden())
     251        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioController->minimumLabelHorizontalHint());
     252    if (m_pEditorAudioFeatures && !m_pEditorAudioFeatures->isHidden())
     253        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioFeatures->minimumLabelHorizontalHint());
     254    if (m_pEditorAudioHostDriver)
     255        m_pEditorAudioHostDriver->setMinimumLayoutIndent(iMinimumLayoutHint);
     256    if (m_pEditorAudioController)
     257        m_pEditorAudioController->setMinimumLayoutIndent(iMinimumLayoutHint);
     258    if (m_pEditorAudioFeatures)
     259        m_pEditorAudioFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     260}
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.h

    r101011 r101511  
    106106protected:
    107107
     108    /** Filters out contents.
     109      * @param  fExpertMode  Brings whether settings expert mode is requested.
     110      * @param  strFilter    Brings the filter description should correspond to. */
     111    virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE;
     112
    108113    /** Handles translation event. */
    109114    virtual void retranslateUi() RT_OVERRIDE;
     
    125130    /** Updates feature availability. */
    126131    void updateFeatureAvailability();
     132    /** Updates minimum layout hint. */
     133    void updateMinimumLayoutHint();
    127134
    128135    /** @name Values
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.cpp

    r101497 r101511  
    222222}
    223223
     224void UINetworkSettingsEditor::filterOut(bool fExpertMode, const QString &strFilter)
     225{
     226    /* Call to base-class: */
     227    UIEditor::filterOut(fExpertMode, strFilter);
     228
     229    updateMinimumLayoutHint();
     230}
     231
    224232void UINetworkSettingsEditor::retranslateUi()
    225233{
     
    230238    }
    231239
    232     /* These editors have own labels, but we want them to be properly layouted according to each other: */
    233     int iMinimumLayoutHint = 0;
    234     if (m_pEditorNetworkAttachment)
    235         iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkAttachment->minimumLabelHorizontalHint());
    236     if (m_pEditorNetworkFeatures)
    237         iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkFeatures->minimumLabelHorizontalHint());
    238     if (m_pEditorNetworkAttachment)
    239         m_pEditorNetworkAttachment->setMinimumLayoutIndent(iMinimumLayoutHint);
    240     if (m_pEditorNetworkFeatures)
    241         m_pEditorNetworkFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     240    updateMinimumLayoutHint();
    242241}
    243242
     
    356355    m_pWidgetSettings->setEnabled(m_pCheckboxFeature->isChecked());
    357356}
     357
     358void UINetworkSettingsEditor::updateMinimumLayoutHint()
     359{
     360    /* These editors have own labels, but we want them to be properly layouted according to each other: */
     361    int iMinimumLayoutHint = 0;
     362    if (m_pEditorNetworkAttachment && !m_pEditorNetworkAttachment->isHidden())
     363        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkAttachment->minimumLabelHorizontalHint());
     364    if (m_pEditorNetworkFeatures && !m_pEditorNetworkFeatures->isHidden())
     365        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkFeatures->minimumLabelHorizontalHint());
     366    if (m_pEditorNetworkAttachment)
     367        m_pEditorNetworkAttachment->setMinimumLayoutIndent(iMinimumLayoutHint);
     368    if (m_pEditorNetworkFeatures)
     369        m_pEditorNetworkFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     370}
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.h

    r101011 r101511  
    158158protected:
    159159
     160    /** Filters out contents.
     161      * @param  fExpertMode  Brings whether settings expert mode is requested.
     162      * @param  strFilter    Brings the filter description should correspond to. */
     163    virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE;
     164
    160165    /** Handles translation event. */
    161166    virtual void retranslateUi() RT_OVERRIDE;
     
    179184    /** Updates feature availability. */
    180185    void updateFeatureAvailability();
     186    /** Updates minimum layout hint. */
     187    void updateMinimumLayoutHint();
    181188
    182189    /** @name Values
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp

    r101230 r101511  
    190190}
    191191
     192void UIGlobalSettingsDisplay::filterOut(bool fExpertMode, const QString &strFilter)
     193{
     194    /* Call to base-class: */
     195    UIEditor::filterOut(fExpertMode, strFilter);
     196
     197    updateMinimumLayoutHint();
     198}
     199
    192200void UIGlobalSettingsDisplay::retranslateUi()
    193201{
    194     /* These editors have own labels, but we want them to be properly layouted according to each other: */
    195     int iMinimumLayoutHint = 0;
    196     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMaximumGuestScreenSize->minimumLabelHorizontalHint());
    197     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint());
    198     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pFontScaleEditor->minimumLabelHorizontalHint());
    199     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDisplayFeatures->minimumLabelHorizontalHint());
    200     m_pEditorMaximumGuestScreenSize->setMinimumLayoutIndent(iMinimumLayoutHint);
    201     m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint);
    202     m_pFontScaleEditor->setMinimumLayoutIndent(iMinimumLayoutHint);
    203     m_pEditorDisplayFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     202    updateMinimumLayoutHint();
    204203}
    205204
     
    311310    return fSuccess;
    312311}
     312
     313void UIGlobalSettingsDisplay::updateMinimumLayoutHint()
     314{
     315    /* These editors have own labels, but we want them to be properly layouted according to each other: */
     316    int iMinimumLayoutHint = 0;
     317    if (m_pEditorMaximumGuestScreenSize && !m_pEditorMaximumGuestScreenSize->isHidden())
     318        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMaximumGuestScreenSize->minimumLabelHorizontalHint());
     319    if (m_pEditorScaleFactor && !m_pEditorScaleFactor->isHidden())
     320        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint());
     321    if (m_pFontScaleEditor && !m_pFontScaleEditor->isHidden())
     322        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pFontScaleEditor->minimumLabelHorizontalHint());
     323    if (m_pEditorDisplayFeatures && !m_pEditorDisplayFeatures->isHidden())
     324        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDisplayFeatures->minimumLabelHorizontalHint());
     325    if (m_pEditorMaximumGuestScreenSize)
     326        m_pEditorMaximumGuestScreenSize->setMinimumLayoutIndent(iMinimumLayoutHint);
     327    if (m_pEditorScaleFactor)
     328        m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint);
     329    if (m_pFontScaleEditor)
     330        m_pFontScaleEditor->setMinimumLayoutIndent(iMinimumLayoutHint);
     331    if (m_pEditorDisplayFeatures)
     332        m_pEditorDisplayFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     333}
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h

    r101071 r101511  
    7474    virtual void saveFromCacheTo(QVariant &data) RT_OVERRIDE;
    7575
     76    /** Filters out contents.
     77      * @param  fExpertMode  Brings whether settings expert mode is requested.
     78      * @param  strFilter    Brings the filter description should correspond to. */
     79    virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE;
     80
    7681    /** Handles translation event. */
    7782    virtual void retranslateUi() RT_OVERRIDE;
     
    8893    /** Saves existing data from cache. */
    8994    bool saveData();
     95
     96    /** Updates minimum layout hint. */
     97    void updateMinimumLayoutHint();
    9098
    9199    /** Holds the page data cache instance. */
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp

    r101230 r101511  
    154154}
    155155
     156void UIGlobalSettingsGeneral::filterOut(bool fExpertMode, const QString &strFilter)
     157{
     158    /* Call to base-class: */
     159    UIEditor::filterOut(fExpertMode, strFilter);
     160
     161    updateMinimumLayoutHint();
     162}
     163
    156164void UIGlobalSettingsGeneral::retranslateUi()
    157165{
    158     /* These editors have own labels, but we want them to be properly layouted according to each other: */
    159     int iMinimumLayoutHint = 0;
    160     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDefaultMachineFolder->minimumLabelHorizontalHint());
    161     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVRDEAuthLibrary->minimumLabelHorizontalHint());
    162     m_pEditorDefaultMachineFolder->setMinimumLayoutIndent(iMinimumLayoutHint);
    163     m_pEditorVRDEAuthLibrary->setMinimumLayoutIndent(iMinimumLayoutHint);
     166    updateMinimumLayoutHint();
    164167}
    165168
     
    250253    return fSuccess;
    251254}
     255
     256void UIGlobalSettingsGeneral::updateMinimumLayoutHint()
     257{
     258    /* These editors have own labels, but we want them to be properly layouted according to each other: */
     259    int iMinimumLayoutHint = 0;
     260    if (m_pEditorDefaultMachineFolder && !m_pEditorDefaultMachineFolder->isHidden())
     261        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDefaultMachineFolder->minimumLabelHorizontalHint());
     262    if (m_pEditorVRDEAuthLibrary && !m_pEditorVRDEAuthLibrary->isHidden())
     263        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVRDEAuthLibrary->minimumLabelHorizontalHint());
     264    if (m_pEditorDefaultMachineFolder)
     265        m_pEditorDefaultMachineFolder->setMinimumLayoutIndent(iMinimumLayoutHint);
     266    if (m_pEditorVRDEAuthLibrary)
     267        m_pEditorVRDEAuthLibrary->setMinimumLayoutIndent(iMinimumLayoutHint);
     268}
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h

    r98103 r101511  
    7272    virtual void saveFromCacheTo(QVariant &data) RT_OVERRIDE;
    7373
     74    /** Filters out contents.
     75      * @param  fExpertMode  Brings whether settings expert mode is requested.
     76      * @param  strFilter    Brings the filter description should correspond to. */
     77    virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE;
     78
    7479    /** Handles translation event. */
    7580    virtual void retranslateUi() RT_OVERRIDE;
     
    8792    bool saveData();
    8893
     94    /** Updates minimum layout hint. */
     95    void updateMinimumLayoutHint();
     96
    8997    /** Holds the page data cache instance. */
    9098    UISettingsCacheGlobalGeneral *m_pCache;
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

    r101445 r101511  
    751751}
    752752
     753void UIMachineSettingsDisplay::filterOut(bool fExpertMode, const QString &strFilter)
     754{
     755    /* Call to base-class: */
     756    UIEditor::filterOut(fExpertMode, strFilter);
     757
     758    updateMinimumLayoutHint();
     759}
     760
    753761void UIMachineSettingsDisplay::retranslateUi()
    754762{
     
    758766    m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabRecording), tr("Re&cording"));
    759767
    760     /* These editors have own labels, but we want them to be properly layouted according to each other: */
    761     int iMinimumLayoutHint = 0;
    762     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVideoMemorySize->minimumLabelHorizontalHint());
    763     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMonitorCount->minimumLabelHorizontalHint());
    764     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint());
    765     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorGraphicsController->minimumLabelHorizontalHint());
    766 #ifdef VBOX_WITH_3D_ACCELERATION
    767     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDisplayScreenFeatures->minimumLabelHorizontalHint());
    768 #endif
    769     m_pEditorVideoMemorySize->setMinimumLayoutIndent(iMinimumLayoutHint);
    770     m_pEditorMonitorCount->setMinimumLayoutIndent(iMinimumLayoutHint);
    771     m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint);
    772     m_pEditorGraphicsController->setMinimumLayoutIndent(iMinimumLayoutHint);
    773 #ifdef VBOX_WITH_3D_ACCELERATION
    774     m_pEditorDisplayScreenFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
    775 #endif
     768    updateMinimumLayoutHint();
    776769}
    777770
     
    14591452    return fSuccess;
    14601453}
     1454
     1455void UIMachineSettingsDisplay::updateMinimumLayoutHint()
     1456{
     1457    /* These editors have own labels, but we want them to be properly layouted according to each other: */
     1458    int iMinimumLayoutHint = 0;
     1459    if (m_pEditorVideoMemorySize && !m_pEditorVideoMemorySize->isHidden())
     1460        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVideoMemorySize->minimumLabelHorizontalHint());
     1461    if (m_pEditorMonitorCount && !m_pEditorMonitorCount->isHidden())
     1462        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMonitorCount->minimumLabelHorizontalHint());
     1463    if (m_pEditorScaleFactor && !m_pEditorScaleFactor->isHidden())
     1464        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint());
     1465    if (m_pEditorGraphicsController && !m_pEditorGraphicsController->isHidden())
     1466        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorGraphicsController->minimumLabelHorizontalHint());
     1467#ifdef VBOX_WITH_3D_ACCELERATION
     1468    if (m_pEditorDisplayScreenFeatures && !m_pEditorDisplayScreenFeatures->isHidden())
     1469        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDisplayScreenFeatures->minimumLabelHorizontalHint());
     1470#endif
     1471    if (m_pEditorVideoMemorySize)
     1472        m_pEditorVideoMemorySize->setMinimumLayoutIndent(iMinimumLayoutHint);
     1473    if (m_pEditorMonitorCount)
     1474        m_pEditorMonitorCount->setMinimumLayoutIndent(iMinimumLayoutHint);
     1475    if (m_pEditorScaleFactor)
     1476        m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint);
     1477    if (m_pEditorGraphicsController)
     1478        m_pEditorGraphicsController->setMinimumLayoutIndent(iMinimumLayoutHint);
     1479#ifdef VBOX_WITH_3D_ACCELERATION
     1480    if (m_pEditorDisplayScreenFeatures)
     1481        m_pEditorDisplayScreenFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     1482#endif
     1483}
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h

    r101265 r101511  
    9898    /** Defines TAB order for passed @a pWidget. */
    9999    virtual void setOrderAfter(QWidget *pWidget) RT_OVERRIDE;
     100
     101    /** Filters out contents.
     102      * @param  fExpertMode  Brings whether settings expert mode is requested.
     103      * @param  strFilter    Brings the filter description should correspond to. */
     104    virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE;
    100105
    101106    /** Handles translation event. */
     
    147152    bool saveRecordingData();
    148153
     154    /** Updates minimum layout hint. */
     155    void updateMinimumLayoutHint();
     156
    149157    /** Holds the guest OS type. */
    150158    QString m_strGuestOSTypeId;
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

    r101445 r101511  
    463463}
    464464
     465void UIMachineSettingsGeneral::filterOut(bool fExpertMode, const QString &strFilter)
     466{
     467    /* Call to base-class: */
     468    UIEditor::filterOut(fExpertMode, strFilter);
     469
     470    updateMinimumLayoutHint();
     471}
     472
    465473void UIMachineSettingsGeneral::retranslateUi()
    466474{
     
    470478    m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabEncryption), tr("Disk Enc&ryption"));
    471479
    472     /* These editors have own labels, but we want them to be properly layouted according to each other: */
    473     int iMinimumLayoutHint = 0;
    474     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorSnapshotFolder->minimumLabelHorizontalHint());
    475     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorClipboard->minimumLabelHorizontalHint());
    476     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDragAndDrop->minimumLabelHorizontalHint());
    477     m_pEditorSnapshotFolder->setMinimumLayoutIndent(iMinimumLayoutHint);
    478     m_pEditorClipboard->setMinimumLayoutIndent(iMinimumLayoutHint);
    479     m_pEditorDragAndDrop->setMinimumLayoutIndent(iMinimumLayoutHint);
     480    updateMinimumLayoutHint();
    480481}
    481482
     
    10511052    return fSuccess;
    10521053}
     1054
     1055void UIMachineSettingsGeneral::updateMinimumLayoutHint()
     1056{
     1057    /* These editors have own labels, but we want them to be properly layouted according to each other: */
     1058    int iMinimumLayoutHint = 0;
     1059    if (m_pEditorSnapshotFolder && !m_pEditorSnapshotFolder->isHidden())
     1060        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorSnapshotFolder->minimumLabelHorizontalHint());
     1061    if (m_pEditorClipboard && !m_pEditorClipboard->isHidden())
     1062        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorClipboard->minimumLabelHorizontalHint());
     1063    if (m_pEditorDragAndDrop && !m_pEditorDragAndDrop->isHidden())
     1064        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDragAndDrop->minimumLabelHorizontalHint());
     1065    if (m_pEditorSnapshotFolder)
     1066        m_pEditorSnapshotFolder->setMinimumLayoutIndent(iMinimumLayoutHint);
     1067    if (m_pEditorClipboard)
     1068        m_pEditorClipboard->setMinimumLayoutIndent(iMinimumLayoutHint);
     1069    if (m_pEditorDragAndDrop)
     1070        m_pEditorDragAndDrop->setMinimumLayoutIndent(iMinimumLayoutHint);
     1071}
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

    r101265 r101511  
    8686    virtual void setOrderAfter(QWidget *pWidget) RT_OVERRIDE;
    8787
     88    /** Filters out contents.
     89      * @param  fExpertMode  Brings whether settings expert mode is requested.
     90      * @param  strFilter    Brings the filter description should correspond to. */
     91    virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE;
     92
    8893    /** Handles translation event. */
    8994    virtual void retranslateUi() RT_OVERRIDE;
     
    128133    /** Saves existing 'Encryption' data from cache. */
    129134    bool saveEncryptionData();
     135
     136    /** Updates minimum layout hint. */
     137    void updateMinimumLayoutHint();
    130138
    131139    /** Holds whether the encryption cipher was changed.
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp

    r101230 r101511  
    333333}
    334334
     335void UIMachineSettingsInterface::filterOut(bool fExpertMode, const QString &strFilter)
     336{
     337    /* Call to base-class: */
     338    UIEditor::filterOut(fExpertMode, strFilter);
     339
     340    updateMinimumLayoutHint();
     341}
     342
    335343void UIMachineSettingsInterface::retranslateUi()
    336344{
    337     /* These editors have own labels, but we want them to be properly layouted according to each other: */
    338     int iMinimumLayoutHint = 0;
    339     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVisualState->minimumLabelHorizontalHint());
    340     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMiniToolabSettings->minimumLabelHorizontalHint());
    341     m_pEditorVisualState->setMinimumLayoutIndent(iMinimumLayoutHint);
    342     m_pEditorMiniToolabSettings->setMinimumLayoutIndent(iMinimumLayoutHint);
     345    updateMinimumLayoutHint();
    343346}
    344347
     
    599602    return fSuccess;
    600603}
     604
     605void UIMachineSettingsInterface::updateMinimumLayoutHint()
     606{
     607    /* These editors have own labels, but we want them to be properly layouted according to each other: */
     608    int iMinimumLayoutHint = 0;
     609    if (m_pEditorVisualState && !m_pEditorVisualState->isHidden())
     610        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVisualState->minimumLabelHorizontalHint());
     611    if (m_pEditorMiniToolabSettings && !m_pEditorMiniToolabSettings->isHidden())
     612        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMiniToolabSettings->minimumLabelHorizontalHint());
     613    if (m_pEditorVisualState)
     614        m_pEditorVisualState->setMinimumLayoutIndent(iMinimumLayoutHint);
     615    if (m_pEditorMiniToolabSettings)
     616        m_pEditorMiniToolabSettings->setMinimumLayoutIndent(iMinimumLayoutHint);
     617}
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h

    r98103 r101511  
    7676    virtual void saveFromCacheTo(QVariant &data) RT_OVERRIDE;
    7777
     78    /** Filters out contents.
     79      * @param  fExpertMode  Brings whether settings expert mode is requested.
     80      * @param  strFilter    Brings the filter description should correspond to. */
     81    virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE;
     82
    7883    /** Handles translation event. */
    7984    virtual void retranslateUi() RT_OVERRIDE;
     
    104109    bool saveVisualStateData();
    105110
     111    /** Updates minimum layout hint. */
     112    void updateMinimumLayoutHint();
     113
    106114    /** Holds the machine ID copy. */
    107115    const QUuid   m_uMachineId;
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

    r101445 r101511  
    610610}
    611611
     612void UIMachineSettingsSystem::filterOut(bool fExpertMode, const QString &strFilter)
     613{
     614    /* Call to base-class: */
     615    UIEditor::filterOut(fExpertMode, strFilter);
     616
     617    updateMinimumLayoutHint();
     618}
     619
    612620void UIMachineSettingsSystem::retranslateUi()
    613621{
     
    616624    m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabAcceleration), tr("Acce&leration"));
    617625
    618     /* These editors have own labels, but we want them to be properly layouted according to each other: */
    619     int iMinimumLayoutHint = 0;
    620     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorBaseMemory->minimumLabelHorizontalHint());
    621     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorBootOrder->minimumLabelHorizontalHint());
    622     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorChipset->minimumLabelHorizontalHint());
    623     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorTpm->minimumLabelHorizontalHint());
    624     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorPointingHID->minimumLabelHorizontalHint());
    625     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMotherboardFeatures->minimumLabelHorizontalHint());
    626     m_pEditorBaseMemory->setMinimumLayoutIndent(iMinimumLayoutHint);
    627     m_pEditorBootOrder->setMinimumLayoutIndent(iMinimumLayoutHint);
    628     m_pEditorChipset->setMinimumLayoutIndent(iMinimumLayoutHint);
    629     m_pEditorTpm->setMinimumLayoutIndent(iMinimumLayoutHint);
    630     m_pEditorPointingHID->setMinimumLayoutIndent(iMinimumLayoutHint);
    631     m_pEditorMotherboardFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
    632     iMinimumLayoutHint = 0;
    633     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVCPU->minimumLabelHorizontalHint());
    634     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorExecCap->minimumLabelHorizontalHint());
    635     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorProcessorFeatures->minimumLabelHorizontalHint());
    636     m_pEditorVCPU->setMinimumLayoutIndent(iMinimumLayoutHint);
    637     m_pEditorExecCap->setMinimumLayoutIndent(iMinimumLayoutHint);
    638     m_pEditorProcessorFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
    639     iMinimumLayoutHint = 0;
    640     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorParavirtProvider->minimumLabelHorizontalHint());
    641     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAccelerationFeatures->minimumLabelHorizontalHint());
    642     m_pEditorParavirtProvider->setMinimumLayoutIndent(iMinimumLayoutHint);
    643     m_pEditorAccelerationFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     626    updateMinimumLayoutHint();
    644627}
    645628
     
    11861169    return fSuccess;
    11871170}
     1171
     1172void UIMachineSettingsSystem::updateMinimumLayoutHint()
     1173{
     1174    /* These editors have own labels, but we want them to be properly layouted according to each other: */
     1175    int iMinimumLayoutHint = 0;
     1176    if (m_pEditorBaseMemory && !m_pEditorBaseMemory->isHidden())
     1177        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorBaseMemory->minimumLabelHorizontalHint());
     1178    if (m_pEditorBootOrder && !m_pEditorBootOrder->isHidden())
     1179        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorBootOrder->minimumLabelHorizontalHint());
     1180    if (m_pEditorChipset && !m_pEditorChipset->isHidden())
     1181        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorChipset->minimumLabelHorizontalHint());
     1182    if (m_pEditorTpm && !m_pEditorTpm->isHidden())
     1183        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorTpm->minimumLabelHorizontalHint());
     1184    if (m_pEditorPointingHID && !m_pEditorPointingHID->isHidden())
     1185        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorPointingHID->minimumLabelHorizontalHint());
     1186    if (m_pEditorMotherboardFeatures && !m_pEditorMotherboardFeatures->isHidden())
     1187        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMotherboardFeatures->minimumLabelHorizontalHint());
     1188    if (m_pEditorBaseMemory)
     1189        m_pEditorBaseMemory->setMinimumLayoutIndent(iMinimumLayoutHint);
     1190    if (m_pEditorBootOrder)
     1191        m_pEditorBootOrder->setMinimumLayoutIndent(iMinimumLayoutHint);
     1192    if (m_pEditorChipset)
     1193        m_pEditorChipset->setMinimumLayoutIndent(iMinimumLayoutHint);
     1194    if (m_pEditorTpm)
     1195        m_pEditorTpm->setMinimumLayoutIndent(iMinimumLayoutHint);
     1196    if (m_pEditorPointingHID)
     1197        m_pEditorPointingHID->setMinimumLayoutIndent(iMinimumLayoutHint);
     1198    if (m_pEditorMotherboardFeatures)
     1199        m_pEditorMotherboardFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     1200
     1201    iMinimumLayoutHint = 0;
     1202    if (m_pEditorVCPU && !m_pEditorVCPU->isHidden())
     1203        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVCPU->minimumLabelHorizontalHint());
     1204    if (m_pEditorExecCap && !m_pEditorExecCap->isHidden())
     1205        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorExecCap->minimumLabelHorizontalHint());
     1206    if (m_pEditorProcessorFeatures && !m_pEditorProcessorFeatures->isHidden())
     1207        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorProcessorFeatures->minimumLabelHorizontalHint());
     1208    if (m_pEditorVCPU)
     1209        m_pEditorVCPU->setMinimumLayoutIndent(iMinimumLayoutHint);
     1210    if (m_pEditorExecCap)
     1211        m_pEditorExecCap->setMinimumLayoutIndent(iMinimumLayoutHint);
     1212    if (m_pEditorProcessorFeatures)
     1213        m_pEditorProcessorFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     1214
     1215    iMinimumLayoutHint = 0;
     1216    if (m_pEditorParavirtProvider && !m_pEditorParavirtProvider->isHidden())
     1217        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorParavirtProvider->minimumLabelHorizontalHint());
     1218    if (m_pEditorAccelerationFeatures && !m_pEditorAccelerationFeatures->isHidden())
     1219        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAccelerationFeatures->minimumLabelHorizontalHint());
     1220    if (m_pEditorParavirtProvider)
     1221        m_pEditorParavirtProvider->setMinimumLayoutIndent(iMinimumLayoutHint);
     1222    if (m_pEditorAccelerationFeatures)
     1223        m_pEditorAccelerationFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     1224}
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

    r101231 r101511  
    110110    virtual void setOrderAfter(QWidget *pWidget) RT_OVERRIDE;
    111111
     112    /** Filters out contents.
     113      * @param  fExpertMode  Brings whether settings expert mode is requested.
     114      * @param  strFilter    Brings the filter description should correspond to. */
     115    virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE;
     116
    112117    /** Handles translation event. */
    113118    virtual void retranslateUi() RT_OVERRIDE;
     
    141146    /** Saves existing 'Acceleration' data from cache. */
    142147    bool saveAccelerationData();
     148
     149    /** Updates minimum layout hint. */
     150    void updateMinimumLayoutHint();
    143151
    144152    /** Holds whether the USB is enabled. */
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