VirtualBox

Changeset 95938 in vbox


Ignore:
Timestamp:
Jul 29, 2022 8:53:02 AM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
152693
Message:

FE/Qt/Ds: Rename UIGlobalProxyFeaturesEditor => UIProxyFeaturesEditor for NLS context consistency.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r95937 r95938  
    909909        src/settings/editors/UIDragAndDropEditor.h \
    910910        src/settings/editors/UIExecutionCapEditor.h \
    911         src/settings/editors/UIGlobalProxyFeaturesEditor.h \
    912911        src/settings/editors/UIGraphicsControllerEditor.h \
    913912        src/settings/editors/UIHostComboEditor.h \
    … …  
    927926        src/settings/editors/UIPointingHIDEditor.h \
    928927        src/settings/editors/UIProcessorFeaturesEditor.h \
     928        src/settings/editors/UIProxyFeaturesEditor.h \
    929929        src/settings/editors/UIRecordingSettingsEditor.h \
    930930        src/settings/editors/UIScaleFactorEditor.h \
    … …  
    14911491        src/settings/editors/UIDragAndDropEditor.cpp \
    14921492        src/settings/editors/UIExecutionCapEditor.cpp \
    1493         src/settings/editors/UIGlobalProxyFeaturesEditor.cpp \
    14941493        src/settings/editors/UIGraphicsControllerEditor.cpp \
    14951494        src/settings/editors/UIHostComboEditor.cpp \
    … …  
    15091508        src/settings/editors/UIPointingHIDEditor.cpp \
    15101509        src/settings/editors/UIProcessorFeaturesEditor.cpp \
     1510        src/settings/editors/UIProxyFeaturesEditor.cpp \
    15111511        src/settings/editors/UIRecordingSettingsEditor.cpp \
    15121512        src/settings/editors/UIScaleFactorEditor.cpp \

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

    r95937 r95938  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGlobalProxyFeaturesEditor class implementation.
     3 * VBox Qt GUI - UIProxyFeaturesEditor class implementation.
    44 */
    55
    … …  
    2525/* GUI includes: */
    2626#include "QILineEdit.h"
    27 #include "UIGlobalProxyFeaturesEditor.h"
    28 
    29 
    30 UIGlobalProxyFeaturesEditor::UIGlobalProxyFeaturesEditor(QWidget *pParent /* = 0 */)
     27#include "UIProxyFeaturesEditor.h"
     28
     29
     30UIProxyFeaturesEditor::UIProxyFeaturesEditor(QWidget *pParent /* = 0 */)
    3131    : QIWithRetranslateUI<QWidget>(pParent)
    3232    , m_enmProxyMode(KProxyMode_Max)
    … …  
    4242}
    4343
    44 void UIGlobalProxyFeaturesEditor::setProxyMode(KProxyMode enmMode)
     44void UIProxyFeaturesEditor::setProxyMode(KProxyMode enmMode)
    4545{
    4646    /* Update cached value and
    … …  
    7272}
    7373
    74 KProxyMode UIGlobalProxyFeaturesEditor::proxyMode() const
     74KProxyMode UIProxyFeaturesEditor::proxyMode() const
    7575{
    7676    return   m_pRadioButtonProxyEnabled && m_pRadioButtonProxyEnabled->isChecked()
    … …  
    8383}
    8484
    85 void UIGlobalProxyFeaturesEditor::setProxyHost(const QString &strHost)
     85void UIProxyFeaturesEditor::setProxyHost(const QString &strHost)
    8686{
    8787    /* Update cached value and
    … …  
    9595}
    9696
    97 QString UIGlobalProxyFeaturesEditor::proxyHost() const
     97QString UIProxyFeaturesEditor::proxyHost() const
    9898{
    9999    return m_pEditorHost ? m_pEditorHost->text() : m_strProxyHost;
    100100}
    101101
    102 void UIGlobalProxyFeaturesEditor::retranslateUi()
     102void UIProxyFeaturesEditor::retranslateUi()
    103103{
    104104    /* Translate proxy mode editor: */
    … …  
    134134}
    135135
    136 void UIGlobalProxyFeaturesEditor::sltHandleProxyModeChanged()
     136void UIProxyFeaturesEditor::sltHandleProxyModeChanged()
    137137{
    138138    /* Update widgets availability: */
    … …  
    143143}
    144144
    145 void UIGlobalProxyFeaturesEditor::prepare()
     145void UIProxyFeaturesEditor::prepare()
    146146{
    147147    /* Prepare main layout: */
    … …  
    218218    /* Prepare connections: */
    219219    connect(m_pButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
    220             this, &UIGlobalProxyFeaturesEditor::sltHandleProxyModeChanged);
     220            this, &UIProxyFeaturesEditor::sltHandleProxyModeChanged);
    221221    connect(m_pEditorHost, &QILineEdit::textEdited,
    222             this, &UIGlobalProxyFeaturesEditor::sigProxyHostChanged);
     222            this, &UIProxyFeaturesEditor::sigProxyHostChanged);
    223223
    224224    /* Apply language settings: */

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

    r95937 r95938  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGlobalProxyFeaturesEditor class declaration.
     3 * VBox Qt GUI - UIProxyFeaturesEditor class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_settings_editors_UIGlobalProxyFeaturesEditor_h
    19 #define FEQT_INCLUDED_SRC_settings_editors_UIGlobalProxyFeaturesEditor_h
     18#ifndef FEQT_INCLUDED_SRC_settings_editors_UIProxyFeaturesEditor_h
     19#define FEQT_INCLUDED_SRC_settings_editors_UIProxyFeaturesEditor_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3535
    3636/** QWidget subclass used as global proxy features editor. */
    37 class SHARED_LIBRARY_STUFF UIGlobalProxyFeaturesEditor : public QIWithRetranslateUI<QWidget>
     37class SHARED_LIBRARY_STUFF UIProxyFeaturesEditor : public QIWithRetranslateUI<QWidget>
    3838{
    3939    Q_OBJECT;
    … …  
    4949
    5050    /** Constructs editor passing @a pParent to the base-class. */
    51     UIGlobalProxyFeaturesEditor(QWidget *pParent = 0);
     51    UIProxyFeaturesEditor(QWidget *pParent = 0);
    5252
    5353    /** Defines proxy @a enmMode. */
    … …  
    103103};
    104104
    105 #endif /* !FEQT_INCLUDED_SRC_settings_editors_UIGlobalProxyFeaturesEditor_h */
     105#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIProxyFeaturesEditor_h */

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

    r94666 r95938  
    2020
    2121/* GUI includes: */
    22 #include "UIGlobalProxyFeaturesEditor.h"
    2322#include "UIGlobalSettingsProxy.h"
    2423#include "UIErrorString.h"
    2524#include "UIExtraDataManager.h"
     25#include "UIProxyFeaturesEditor.h"
    2626
    2727/* COM includes: */
    … …  
    104104    /* Load old data from cache: */
    105105    const UIDataSettingsGlobalProxy &oldData = m_pCache->base();
    106     if (m_pEditorGlobalProxyFeatures)
    107     {
    108         m_pEditorGlobalProxyFeatures->setProxyMode(oldData.m_enmProxyMode);
    109         m_pEditorGlobalProxyFeatures->setProxyHost(oldData.m_strProxyHost);
     106    if (m_pEditorProxyFeatures)
     107    {
     108        m_pEditorProxyFeatures->setProxyMode(oldData.m_enmProxyMode);
     109        m_pEditorProxyFeatures->setProxyHost(oldData.m_strProxyHost);
    110110    }
    111111
    … …  
    124124
    125125    /* Cache new data: */
    126     if (m_pEditorGlobalProxyFeatures)
    127     {
    128         newData.m_enmProxyMode = m_pEditorGlobalProxyFeatures->proxyMode();
    129         newData.m_strProxyHost = m_pEditorGlobalProxyFeatures->proxyHost();
     126    if (m_pEditorProxyFeatures)
     127    {
     128        newData.m_enmProxyMode = m_pEditorProxyFeatures->proxyMode();
     129        newData.m_strProxyHost = m_pEditorProxyFeatures->proxyHost();
    130130    }
    131131    m_pCache->cacheCurrentData(newData);
    … …  
    147147{
    148148    /* Pass if proxy is disabled: */
    149     if (m_pEditorGlobalProxyFeatures->proxyMode() != KProxyMode_Manual)
     149    if (m_pEditorProxyFeatures->proxyMode() != KProxyMode_Manual)
    150150        return true;
    151151
    … …  
    157157
    158158    /* Check for URL presence: */
    159     if (m_pEditorGlobalProxyFeatures->proxyHost().trimmed().isEmpty())
     159    if (m_pEditorProxyFeatures->proxyHost().trimmed().isEmpty())
    160160    {
    161161        message.second << tr("No proxy URL is currently specified.");
    … …  
    166166
    167167    /* Check for URL validness: */
    168     if (!QUrl(m_pEditorGlobalProxyFeatures->proxyHost().trimmed()).isValid())
     168    if (!QUrl(m_pEditorProxyFeatures->proxyHost().trimmed()).isValid())
    169169    {
    170170        message.second << tr("Invalid proxy URL is currently specified.");
    … …  
    175175
    176176    /* Check for password presence: */
    177     if (!QUrl(m_pEditorGlobalProxyFeatures->proxyHost().trimmed()).password().isEmpty())
     177    if (!QUrl(m_pEditorProxyFeatures->proxyHost().trimmed()).password().isEmpty())
    178178    {
    179179        message.second << tr("You have provided a proxy password. "
    … …  
    216216    if (pLayout)
    217217    {
    218         /* Prepare 'global proxy features' editor: */
    219         m_pEditorGlobalProxyFeatures = new UIGlobalProxyFeaturesEditor(this);
    220         if (m_pEditorGlobalProxyFeatures)
    221             pLayout->addWidget(m_pEditorGlobalProxyFeatures);
     218        /* Prepare 'proxy features' editor: */
     219        m_pEditorProxyFeatures = new UIProxyFeaturesEditor(this);
     220        if (m_pEditorProxyFeatures)
     221            pLayout->addWidget(m_pEditorProxyFeatures);
    222222
    223223        /* Add stretch to the end: */
    … …  
    228228void UIGlobalSettingsProxy::prepareConnections()
    229229{
    230     connect(m_pEditorGlobalProxyFeatures, &UIGlobalProxyFeaturesEditor::sigProxyModeChanged,
     230    connect(m_pEditorProxyFeatures, &UIProxyFeaturesEditor::sigProxyModeChanged,
    231231            this, &UIGlobalSettingsProxy::revalidate);
    232     connect(m_pEditorGlobalProxyFeatures, &UIGlobalProxyFeaturesEditor::sigProxyHostChanged,
     232    connect(m_pEditorProxyFeatures, &UIProxyFeaturesEditor::sigProxyHostChanged,
    233233            this, &UIGlobalSettingsProxy::revalidate);
    234234}

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

    r95390 r95938  
    2727
    2828/* Forward declarations: */
    29 class UIGlobalProxyFeaturesEditor;
     29class UIProxyFeaturesEditor;
    3030struct UIDataSettingsGlobalProxy;
    3131typedef UISettingsCache<UIDataSettingsGlobalProxy> UISettingsCacheGlobalProxy;
    … …  
    8484    /** @name Widgets
    8585     * @{ */
    86         /** Holds the global proxy features editor instance. */
    87         UIGlobalProxyFeaturesEditor *m_pEditorGlobalProxyFeatures;
     86        /** Holds the proxy features editor instance. */
     87        UIProxyFeaturesEditor *m_pEditorProxyFeatures;
    8888    /** @} */
    8989};
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