VirtualBox

Ignore:
Timestamp:
Mar 22, 2022 12:50:14 PM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:6899: A bit of cleanup for Global Preferences pages.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/settings/global
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp

    r94248 r94323  
    1717
    1818/* Qt includes: */
    19 #include <QCheckBox>
    20 #include <QLabel>
    2119#include <QVBoxLayout>
    2220
    … …  
    2725#include "UIGlobalSettingsDisplay.h"
    2826#include "UIMaximumGuestScreenSizeEditor.h"
    29 #include "UIMessageCenter.h"
    3027#include "UIScaleFactorEditor.h"
    3128
    … …  
    10198#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
    10299    oldData.m_fDisableHostScreenSaver = gEDataManager->disableHostScreenSaver();
    103 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */
     100#endif
    104101    m_pCache->cacheInitialData(oldData);
    105102
    … …  
    175172    if (pLayout)
    176173    {
    177         /* Prepare maximum guest screen size editor: */
     174        /* Prepare 'maximum guest screen size' editor: */
    178175        m_pEditorMaximumGuestScreenSize = new UIMaximumGuestScreenSizeEditor(this);
    179176        if (m_pEditorMaximumGuestScreenSize)
    180177            pLayout->addWidget(m_pEditorMaximumGuestScreenSize);
    181178
    182         /* Prepare scale-factor editor: */
     179        /* Prepare 'scale-factor' editor: */
    183180        m_pEditorScaleFactor = new UIScaleFactorEditor(this, true /* with label */);
    184181        if (m_pEditorScaleFactor)
    185182            pLayout->addWidget(m_pEditorScaleFactor);
    186183
    187         /* Prepare global display features editor: */
     184        /* Prepare 'global display features' editor: */
    188185        m_pEditorGlobalDisplayFeatures = new UIGlobalDisplayFeaturesEditor(this);
    189186        if (m_pEditorGlobalDisplayFeatures)

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h

    r94248 r94323  
    2626
    2727/* Forward declarations: */
    28 class QCheckBox;
    29 class QLabel;
    3028class UIGlobalDisplayFeaturesEditor;
    3129class UIMaximumGuestScreenSizeEditor;

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

    r94288 r94323  
    1717
    1818/* Qt includes: */
    19 #include <QCheckBox>
    2019#include <QVBoxLayout>
    2120
    2221/* GUI includes: */
    2322#include "UIAutoCaptureKeyboardEditor.h"
    24 #include "UICommon.h"
    2523#include "UIExtraDataManager.h"
    2624#include "UIGlobalSettingsInput.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInterface.cpp

    r94288 r94323  
    1717
    1818/* Qt includes: */
    19 #include <QLabel>
    2019#include <QVBoxLayout>
    2120
    … …  
    2423#include "UIExtraDataManager.h"
    2524#include "UIGlobalSettingsInterface.h"
     25
    2626
    2727/** Global settings: User Interface page data structure. */
    … …  
    139139    if (pLayout)
    140140    {
    141         /* Prepare color-theme editor: */
     141        /* Prepare 'color-theme' editor: */
    142142        m_pEditorColorTheme = new UIColorThemeEditor(this);
    143143        if (m_pEditorColorTheme)

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInterface.h

    r94145 r94323  
    2626
    2727/* Forward declarations: */
    28 class QLabel;
    2928class UIColorThemeEditor;
    3029struct UIDataSettingsGlobalInterface;

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp

    r94288 r94323  
    136136    if (pLayout)
    137137    {
    138         /* Prepare language settings editor: */
     138        /* Prepare 'language settings' editor: */
    139139        m_pEditorLanguageSettings = new UILanguageSettingsEditor(this);
    140140        if (m_pEditorLanguageSettings)

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp

    r94251 r94323  
    2222#include "UIGlobalProxyFeaturesEditor.h"
    2323#include "UIGlobalSettingsProxy.h"
     24#include "UIErrorString.h"
    2425#include "UIExtraDataManager.h"
    2526
    … …  
    197198    if (pLayout)
    198199    {
    199         /* Prepare global proxy features editor: */
     200        /* Prepare 'global proxy features' editor: */
    200201        m_pEditorGlobalProxyFeatures = new UIGlobalProxyFeaturesEditor(this);
    201202        if (m_pEditorGlobalProxyFeatures)
    … …  
    253254            && !gEDataManager->proxySettings().isEmpty())
    254255            /* fSuccess = */ gEDataManager->setProxySettings(QString());
     256
     257        /* Show error message if necessary: */
     258        if (!fSuccess)
     259            notifyOperationProgressError(UIErrorString::formatErrorInfo(m_properties));
    255260    }
    256261    /* Return result: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.h

    r94251 r94323  
    4141    UIGlobalSettingsProxy();
    4242    /** Destructs Proxy settings page. */
    43     ~UIGlobalSettingsProxy();
     43    virtual ~UIGlobalSettingsProxy() RT_OVERRIDE;
    4444
    4545protected:

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp

    r94288 r94323  
    136136    if (pLayout)
    137137    {
    138         /* Prepare update settings editor: */
     138        /* Prepare 'update settings' editor: */
    139139        m_pEditorUpdateSettings = new UIUpdateSettingsEditor(this);
    140140        if (m_pEditorUpdateSettings)
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