Changeset 74497 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 27, 2018 1:10:38 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9252: A warning for a case when invalid proxy URL is specified; tool-tip for the URL editor.

Location:

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

Files:

• UIGlobalSettingsProxy.cpp (modified) (2 diffs)
• UIGlobalSettingsProxy.ui (modified) (1 diff)

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

@@ -161 +161 @@
     UIValidationMessage message;
 
-    /* Check for host value: */
+    /* Check for URL presence: */
     if (m_pHostEditor->text().trimmed().isEmpty())
     {
-        message.second << tr("No proxy host is currently specified.");
+        message.second << tr("No proxy URL is currently specified.");
         fPass = false;
     }
+
+    else
+
+    /* Check for URL validness: */
+    if (!QUrl(m_pHostEditor->text().trimmed()).isValid())
+    {
+        message.second << tr("Invalid proxy URL is currently specified.");
+        fPass = true;
+    }
+
+    else
 
     /* Check for password presence: */
@@ -190 +201 @@
     /* Translate uic generated strings: */
     Ui::UIGlobalSettingsProxy::retranslateUi(this);
+
+    /* Translate proxy URL editor: */
+    m_pHostEditor->setWhatsThis(tr("Holds the proxy URL. "
+                                   "The format is: "
+                                   "<table cellspacing=0 style='white-space:pre'>"
+                                   "<tr><td>[{type}://][{userid}[:{password}]@]{server}[:{port}]</td></tr>"
+                                   "<tr><td>http://username:[email protected]:port</td></tr>"
+                                   "</table>"));
 }
 

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

@@ -91 +91 @@
       </item>
       <item>
-       <widget class="QILineEdit" name="m_pHostEditor">
-        <property name="whatsThis">
-         <string>Holds the proxy host.</string>
-        </property>
-       </widget>
+       <widget class="QILineEdit" name="m_pHostEditor"/>
       </item>
      </layout>