Changeset 85818 in vbox

Timestamp:

Aug 18, 2020 12:02:48 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9812. Removing UIGlobalSettingsProxy.ui

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• src/settings/global/UIGlobalSettingsProxy.cpp (modified) (5 diffs)
• src/settings/global/UIGlobalSettingsProxy.h (modified) (3 diffs)
• src/settings/global/UIGlobalSettingsProxy.ui (deleted)

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -24 +24 @@
     src/settings/UISettingsDialog.ui \
     src/settings/global/UIGlobalSettingsLanguage.ui \
-    src/settings/global/UIGlobalSettingsExtension.ui \
-    src/settings/global/UIGlobalSettingsProxy.ui
+    src/settings/global/UIGlobalSettingsExtension.ui
 
 TRANSLATIONS = \

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

@@ -18 +18 @@
 /* Qt includes: */
 #include <QButtonGroup>
+#include <QGridLayout>
+#include <QLabel>
+#include <QRadioButton>
 #include <QRegExpValidator>
 
 /* GUI includes: */
+#include "QILineEdit.h"
 #include "QIWidgetValidator.h"
 #include "UIGlobalSettingsProxy.h"
@@ -64 +68 @@
 UIGlobalSettingsProxy::UIGlobalSettingsProxy()
     : m_pCache(0)
+    , m_pRadioProxyAuto(0)
+    , m_pRadioProxyDisabled(0)
+    , m_pRadioProxyEnabled(0)
+    , m_pHostEditor(0)
+    , m_pHostLabel(0)
+    , m_pContainerProxy(0)
 {
     /* Prepare: */
@@ -193 +203 @@
 void UIGlobalSettingsProxy::retranslateUi()
 {
-    /* Translate uic generated strings: */
-    Ui::UIGlobalSettingsProxy::retranslateUi(this);
+    m_pRadioProxyAuto->setWhatsThis(tr("When chosen, VirtualBox will try to auto-detect host proxy settings for tasks like "
+                                       "downloading Guest Additions from the network or checking for updates."));
+    m_pRadioProxyAuto->setText(tr("&Auto-detect Host Proxy Settings"));
+    m_pRadioProxyDisabled->setWhatsThis(tr("When chosen, VirtualBox will use direct Internet connection for tasks like downloading "
+                                           "Guest Additions from the network or checking for updates."));
+    m_pRadioProxyDisabled->setText(tr("&Direct Connection to the Internet"));
+    m_pRadioProxyEnabled->setWhatsThis(tr("When chosen, VirtualBox will use the proxy settings supplied for tasks like downloading "
+                                          "Guest Additions from the network or checking for updates."));
+    m_pRadioProxyEnabled->setText(tr("&Manual Proxy Configuration"));
+    m_pHostLabel->setText(tr("&URL:"));
 
     /* Translate proxy URL editor: */
@@ -216 +234 @@
 void UIGlobalSettingsProxy::prepare()
 {
-    /* Apply UI decorations: */
-    Ui::UIGlobalSettingsProxy::setupUi(this);
+    prepareWidgets();
 
     /* Prepare cache: */
@@ -250 +267 @@
 }
 
+void UIGlobalSettingsProxy::prepareWidgets()
+{
+    if (objectName().isEmpty())
+        setObjectName(QStringLiteral("UIGlobalSettingsProxy"));
+    QGridLayout *pMainLayout = new QGridLayout(this);
+    pMainLayout->setContentsMargins(0, 0, 0, 0);
+    pMainLayout->setObjectName(QStringLiteral("pMainLayout"));
+    m_pRadioProxyAuto = new QRadioButton();
+    m_pRadioProxyAuto->setObjectName(QStringLiteral("m_pRadioProxyAuto"));
+    pMainLayout->addWidget(m_pRadioProxyAuto, 0, 0, 1, 2);
+
+    m_pRadioProxyDisabled = new QRadioButton();
+    m_pRadioProxyDisabled->setObjectName(QStringLiteral("m_pRadioProxyDisabled"));
+    pMainLayout->addWidget(m_pRadioProxyDisabled, 1, 0, 1, 2);
+
+    m_pRadioProxyEnabled = new QRadioButton();
+    m_pRadioProxyEnabled->setObjectName(QStringLiteral("m_pRadioProxyEnabled"));
+    pMainLayout->addWidget(m_pRadioProxyEnabled, 2, 0, 1, 2);
+
+    QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
+    pMainLayout->addItem(pSpacerItem, 3, 0, 1, 1);
+
+    m_pContainerProxy = new QWidget();
+    m_pContainerProxy->setObjectName(QStringLiteral("m_pContainerProxy"));
+    QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+    sizePolicy.setHorizontalStretch(1);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(m_pContainerProxy->sizePolicy().hasHeightForWidth());
+    m_pContainerProxy->setSizePolicy(sizePolicy);
+    QHBoxLayout *pHBoxLayout = new QHBoxLayout(m_pContainerProxy);
+    pHBoxLayout->setContentsMargins(0, 0, 0, 0);
+    pHBoxLayout->setObjectName(QStringLiteral("pHBoxLayout"));
+    pHBoxLayout->setContentsMargins(0, 0, 0, 0);
+    m_pHostLabel = new QLabel(m_pContainerProxy);
+    m_pHostLabel->setObjectName(QStringLiteral("m_pHostLabel"));
+    m_pHostLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    pHBoxLayout->addWidget(m_pHostLabel);
+
+    m_pHostEditor = new QILineEdit(m_pContainerProxy);
+    m_pHostEditor->setObjectName(QStringLiteral("m_pHostEditor"));
+    pHBoxLayout->addWidget(m_pHostEditor);
+    pMainLayout->addWidget(m_pContainerProxy, 3, 1, 1, 1);
+
+    QSpacerItem *pSpacerItem1 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+    pMainLayout->addItem(pSpacerItem1, 4, 0, 1, 2);
+
+    m_pHostLabel->setBuddy(m_pHostEditor);
+}
+
 void UIGlobalSettingsProxy::cleanup()
 {

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

@@ -24 +24 @@
 /* GUI includes: */
 #include "UISettingsPage.h"
-#include "UIGlobalSettingsProxy.gen.h"
 #include "VBoxUtils.h"
 
 /* Forward declarations: */
+class QLabel;
+class QRadioButton;
+class QILineEdit;
 struct UIDataSettingsGlobalProxy;
 typedef UISettingsCache<UIDataSettingsGlobalProxy> UISettingsCacheGlobalProxy;
 
 /** Global settings: Proxy page. */
-class SHARED_LIBRARY_STUFF UIGlobalSettingsProxy : public UISettingsPageGlobal,
-                                                   public Ui::UIGlobalSettingsProxy
+class SHARED_LIBRARY_STUFF UIGlobalSettingsProxy : public UISettingsPageGlobal
 {
     Q_OBJECT;
@@ -75 +76 @@
     /** Prepares all. */
     void prepare();
+    /** Prepares wıdgets. */
+    void prepareWidgets();
     /** Cleanups all. */
     void cleanup();
@@ -83 +86 @@
     /** Holds the page data cache instance. */
     UISettingsCacheGlobalProxy *m_pCache;
+
+    /** @name Widgets
+     * @{ */
+       QRadioButton *m_pRadioProxyAuto;
+       QRadioButton *m_pRadioProxyDisabled;
+       QRadioButton *m_pRadioProxyEnabled;
+       QILineEdit *m_pHostEditor;
+       QLabel *m_pHostLabel;
+       QWidget *m_pContainerProxy;
+    /** @} */
 };