Changeset 74445 in vbox

Timestamp:

Sep 24, 2018 3:35:26 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9252: We decided to remove port editor field as well, leaving one URL field to accept/reflect all the proxy settings.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsProxy.cpp (modified) (9 diffs)
• UIGlobalSettingsProxy.ui (modified) (2 diffs)

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

@@ -45 +45 @@
         : m_enmProxyMode(KProxyMode_System)
         , m_strProxyHost(QString())
-        , m_strProxyPort(QString())
     {}
 
@@ -54 +53 @@
                && (m_enmProxyMode == other.m_enmProxyMode)
                && (m_strProxyHost == other.m_strProxyHost)
-               && (m_strProxyPort == other.m_strProxyPort)
                ;
     }
@@ -67 +65 @@
     /** Holds the proxy host. */
     QString     m_strProxyHost;
-    /** Holds the proxy port. */
-    QString     m_strProxyPort;
 };
 
@@ -99 +95 @@
     oldProxyData.m_enmProxyMode = m_properties.GetProxyMode();
     oldProxyData.m_strProxyHost = m_properties.GetProxyURL();
-    oldProxyData.m_strProxyPort = "";
-    if (!oldProxyData.m_strProxyHost.isEmpty())
-    {
-        QUrl url(oldProxyData.m_strProxyHost);
-        if (url.port() != -1)
-        {
-            oldProxyData.m_strProxyPort = QString::number(url.port());
-            url.setPort(-1);
-            oldProxyData.m_strProxyHost = url.url();
-        }
-    }
 
     /* Cache old proxy data: */
@@ -132 +117 @@
     }
     m_pHostEditor->setText(oldProxyData.m_strProxyHost);
-    m_pPortEditor->setText(oldProxyData.m_strProxyPort);
     sltHandleProxyToggle();
 
@@ -148 +132 @@
                                 : m_pRadioProxyDisabled->isChecked() ? KProxyMode_NoProxy : KProxyMode_System;
     newProxyData.m_strProxyHost = m_pHostEditor->text();
-    newProxyData.m_strProxyPort = m_pPortEditor->text();
 
     /* Cache new proxy data: */
@@ -182 +165 @@
     {
         message.second << tr("No proxy host is currently specified.");
-        fPass = false;
-    }
-
-    /* Check for port value: */
-    if (   m_pPortEditor->text().trimmed().isEmpty()
-        && QUrl(m_pHostEditor->text()).port() == -1)
-    {
-        message.second << tr("No proxy port is currently specified.");
         fPass = false;
     }
@@ -245 +220 @@
             connect(m_pHostEditor, SIGNAL(textEdited(const QString &)), this, SLOT(revalidate()));
         }
-
-        /* Port editor created in the .ui file. */
-        AssertPtrReturnVoid(m_pPortEditor);
-        {
-            /* Configure editor: */
-            m_pPortEditor->setFixedWidthByText(QString().fill('0', 6));
-            m_pPortEditor->setValidator(new QRegExpValidator(QRegExp("\\d+"), m_pPortEditor));
-            connect(m_pPortEditor, SIGNAL(textEdited(const QString &)), this, SLOT(revalidate()));
-        }
     }
 
@@ -282 +248 @@
         m_properties.SetProxyMode(newProxyData.m_enmProxyMode);
         fSuccess &= m_properties.isOk();
-        if (newProxyData.m_strProxyPort.isEmpty())
-            m_properties.SetProxyURL(newProxyData.m_strProxyHost);
-        else
-        {
-            QUrl url(newProxyData.m_strProxyHost);
-            if (url.port() == -1)
-                url.setPort(newProxyData.m_strProxyPort.toUInt());
-            m_properties.SetProxyURL(url.url());
-        }
+        m_properties.SetProxyURL(newProxyData.m_strProxyHost);
         fSuccess &= m_properties.isOk();
 

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

@@ -80 +80 @@
        <widget class="QLabel" name="m_pHostLabel">
         <property name="text">
-         <string>Ho&amp;st:</string>
+         <string>&amp;URL:</string>
         </property>
         <property name="alignment">
@@ -94 +94 @@
         <property name="whatsThis">
          <string>Holds the proxy host.</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="m_pPortLabel">
-        <property name="text">
-         <string>&amp;Port:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-        <property name="buddy">
-         <cstring>m_pPortEditor</cstring>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QILineEdit" name="m_pPortEditor">
-        <property name="whatsThis">
-         <string>Holds the proxy port.</string>
         </property>
        </widget>