Changeset 37544 in vbox

Timestamp:

Jun 17, 2011 1:54:47 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 4029: Allow to set http proxy information, initial commit.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxUI.pro (modified) (2 diffs)
• src/VBoxGlobalSettings.cpp (modified) (4 diffs)
• src/VBoxGlobalSettings.h (modified) (3 diffs)
• src/VBoxUpdateDlg.cpp (modified) (4 diffs)
• src/extensions/QIHttp.h (modified) (2 diffs)
• src/globals/VBoxUtils.h (modified) (2 diffs)
• src/settings/UISettingsDialogSpecific.cpp (modified) (3 diffs)
• src/settings/UISettingsDialogSpecific.h (modified) (1 diff)
• src/settings/global/UIGlobalSettingsProxy.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp ) (6 diffs)
• src/settings/global/UIGlobalSettingsProxy.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h ) (4 diffs)
• src/settings/global/UIGlobalSettingsProxy.ui (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.ui ) (6 diffs)
• src/widgets/UIDownloader.cpp (modified) (4 diffs)

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

@@ -312 +312 @@
         src/settings/global/UIGlobalSettingsNetworkDetails.h \
         src/settings/global/UIGlobalSettingsExtension.h \
+        src/settings/global/UIGlobalSettingsProxy.h \
         src/settings/machine/UIMachineSettingsGeneral.h \
         src/settings/machine/UIMachineSettingsSystem.h \
@@ -479 +480 @@
         src/settings/global/UIGlobalSettingsNetworkDetails.cpp \
         src/settings/global/UIGlobalSettingsExtension.cpp \
+        src/settings/global/UIGlobalSettingsProxy.cpp \
         src/settings/machine/UIMachineSettingsGeneral.cpp \
         src/settings/machine/UIMachineSettingsSystem.cpp \

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

@@ -7 +7 @@
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -36 +36 @@
     src/settings/global/UIGlobalSettingsNetworkDetails.ui \
     src/settings/global/UIGlobalSettingsExtension.ui \
+    src/settings/global/UIGlobalSettingsProxy.ui \
     src/settings/machine/UIMachineSettingsGeneral.ui \
     src/settings/machine/UIMachineSettingsSystem.ui \

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp

@@ -54 +54 @@
     maxGuestRes = "auto";
     remapScancodes = QString::null;
+    proxySettings = QString::null;
     trayIconEnabled = false;
     presentationModeEnabled = false;
@@ -67 +68 @@
     maxGuestRes = that.maxGuestRes;
     remapScancodes = that.remapScancodes;
+    proxySettings = that.proxySettings;
     trayIconEnabled = that.trayIconEnabled;
     presentationModeEnabled = that.presentationModeEnabled;
@@ -85 +87 @@
          maxGuestRes == that.maxGuestRes &&
          remapScancodes == that.remapScancodes &&
+         proxySettings == that.proxySettings &&
          trayIconEnabled == that.trayIconEnabled &&
          presentationModeEnabled == that.presentationModeEnabled &&
@@ -115 +118 @@
     { "GUI/MaxGuestResolution",                    "maxGuestRes",             "\\d*[1-9]\\d*,\\d*[1-9]\\d*|any|auto", true },
     { "GUI/RemapScancodes",                        "remapScancodes",          "(\\d+=\\d+,)*\\d+=\\d+", true },
+    { "GUI/ProxySettings",                         "proxySettings",           "[\\s\\S]*", true },
     { "GUI/TrayIcon/Enabled",                      "trayIconEnabled",         "true|false", true },
 #ifdef Q_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h

@@ -44 +44 @@
     QString maxGuestRes;
     QString remapScancodes;
+    QString proxySettings;
     bool trayIconEnabled;
     bool presentationModeEnabled;
@@ -62 +63 @@
     Q_PROPERTY (QString maxGuestRes READ maxGuestRes WRITE setMaxGuestRes)
     Q_PROPERTY (QString remapScancodes READ remapScancodes WRITE setRemapScancodes)
+    Q_PROPERTY (QString proxySettings READ proxySettings WRITE setProxySettings)
     Q_PROPERTY (bool trayIconEnabled READ trayIconEnabled WRITE setTrayIconEnabled)
     Q_PROPERTY (bool presentationModeEnabled READ presentationModeEnabled WRITE setPresentationModeEnabled)
@@ -114 +116 @@
     }
 
+    QString proxySettings() const { return data()->proxySettings; }
+    void setProxySettings (const QString &aProxySettings)
+    {
+        mData()->proxySettings = aProxySettings;
+    }
 
     bool trayIconEnabled() const { return data()->trayIconEnabled; }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
 #include "VBoxUpdateDlg.h"
 #include "UIIconPool.h"
+#include "VBoxUtils.h"
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -244 +245 @@
     , mSelf (aSelf)
     , mUrl ("http://update.virtualbox.org/query.php")
-    , mHttp (new QIHttp (this, mUrl.host()))
+    , mHttp (new QIHttp (this))
     , mForceRun (aForceRun)
 {
@@ -256 +257 @@
     setWindowIcon(UIIconPool::iconSetFull(QSize (32, 32), QSize (16, 16),
                                           ":/refresh_32px.png", ":/refresh_16px.png"));
+
+    /* Setup HTTP proxy: */
+    UIProxyManager proxyManager(vboxGlobal().settings().proxySettings());
+    if (proxyManager.proxyEnabled())
+    {
+        mHttp->setProxy(proxyManager.proxyHost(), proxyManager.proxyPort().toInt(),
+                        proxyManager.authEnabled() ? proxyManager.authLogin() : QString(),
+                        proxyManager.authEnabled() ? proxyManager.authPassword() : QString());
+    }
+    /* Set HTTP host: */
+    mHttp->setHost(mUrl.host());
 
     /* Setup other connections */

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIHttp.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -57 +57 @@
     };
 
-    QIHttp (QObject *aParent, const QString &aHostName, quint16 aPort = 80)
-        : QHttp (aHostName, aPort, aParent)
+    QIHttp (QObject *aParent)
+        : QHttp (aParent)
         , mStatusCode (0)
         , mErrorCode (NoError)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2008 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -123 +123 @@
 };
 
+class UIProxyManager
+{
+public:
+
+    UIProxyManager(const QString &strProxySettings = QString())
+    {
+        /* Parse settings: */
+        if (!strProxySettings.isEmpty())
+        {
+            QStringList proxySettings = strProxySettings.split(",");
+            if (proxySettings.size() > 0)
+                m_fProxyEnabled = proxySettings[0] == "proxyEnabled";
+            if (proxySettings.size() > 1)
+                m_strProxyHost = proxySettings[1];
+            if (proxySettings.size() > 2)
+                m_strProxyPort = proxySettings[2];
+            if (proxySettings.size() > 3)
+                m_fAuthEnabled = proxySettings[3] == "authEnabled";
+            if (proxySettings.size() > 4)
+                m_strAuthLogin = proxySettings[4];
+            if (proxySettings.size() > 5)
+                m_strAuthPassword = proxySettings[5];
+        }
+    }
+
+    QString toString() const
+    {
+        /* Serialize settings: */
+        QString strResult;
+        if (m_fProxyEnabled || !m_strProxyHost.isEmpty() || !m_strProxyPort.isEmpty() ||
+            m_fAuthEnabled || !m_strAuthLogin.isEmpty() || !m_strAuthPassword.isEmpty())
+        {
+            QStringList proxySettings;
+            proxySettings << QString(m_fProxyEnabled ? "proxyEnabled" : "proxyDisabled");
+            proxySettings << m_strProxyHost;
+            proxySettings << m_strProxyPort;
+            proxySettings << QString(m_fAuthEnabled ? "authEnabled" : "authDisabled");
+            proxySettings << m_strAuthLogin;
+            proxySettings << m_strAuthPassword;
+            strResult = proxySettings.join(",");
+        }
+        return strResult;
+    }
+
+    /* Proxy attribute getters: */
+    bool proxyEnabled() const { return m_fProxyEnabled; }
+    const QString& proxyHost() const { return m_strProxyHost; }
+    const QString& proxyPort() const { return m_strProxyPort; }
+    bool authEnabled() const { return m_fAuthEnabled; }
+    const QString& authLogin() const { return m_strAuthLogin; }
+    const QString& authPassword() const { return m_strAuthPassword; }
+
+    /* Proxy attribute setters: */
+    void setProxyEnabled(bool fProxyEnabled) { m_fProxyEnabled = fProxyEnabled; }
+    void setProxyHost(const QString &strProxyHost) { m_strProxyHost = strProxyHost; }
+    void setProxyPort(const QString &strProxyPort) { m_strProxyPort = strProxyPort; }
+    void setAuthEnabled(bool fAuthEnabled) { m_fAuthEnabled = fAuthEnabled; }
+    void setAuthLogin(const QString &strAuthLogin) { m_strAuthLogin = strAuthLogin; }
+    void setAuthPassword(const QString &strAuthPassword) { m_strAuthPassword = strAuthPassword; }
+
+private:
+
+    /* Proxy attribute variables: */
+    bool m_fProxyEnabled;
+    QString m_strProxyHost;
+    QString m_strProxyPort;
+    bool m_fAuthEnabled;
+    QString m_strAuthLogin;
+    QString m_strAuthPassword;
+};
+
 #ifdef Q_WS_MAC
 # include "VBoxUtils-darwin.h"

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -40 +40 @@
 #include "UIGlobalSettingsNetwork.h"
 #include "UIGlobalSettingsExtension.h"
+#include "UIGlobalSettingsProxy.h"
 
 #include "UIMachineSettingsGeneral.h"
@@ -385 +386 @@
                     break;
                 }
+                /* Proxy page: */
+                case GLSettingsPage_Proxy:
+                {
+                    pSettingsPage = new UIGlobalSettingsProxy;
+                    addItem(":/extension_pack_32px.png", ":/extension_pack_disabled_32px.png",
+                            ":/extension_pack_16px.png", ":/extension_pack_disabled_16px.png",
+                            iPageIndex, "#proxy", pSettingsPage);
+                    break;
+                }
                 default:
                     break;
@@ -483 +493 @@
     /* Extension page: */
     m_pSelector->setItemText(GLSettingsPage_Extension, tr("Extensions"));
+
+    /* Proxy page: */
+    m_pSelector->setItemText(GLSettingsPage_Proxy, tr("Proxy"));
 
     /* Translate the selector: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

@@ -40 +40 @@
         GLSettingsPage_Network,
         GLSettingsPage_Extension,
+        GLSettingsPage_Proxy,
         GLSettingsPage_MAX
     };

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

@@ -3 +3 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * UIGlobalSettingsGeneral class implementation
+ * UIGlobalSettingsProxy class implementation
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18 +18 @@
  */
 
-/* Global includes */
-#include <QDir>
-
 /* Local includes */
-#include "UIGlobalSettingsGeneral.h"
-#include "VBoxGlobal.h"
+#include "UIGlobalSettingsProxy.h"
+#include "VBoxUtils.h"
 
 /* General page constructor: */
-UIGlobalSettingsGeneral::UIGlobalSettingsGeneral()
+UIGlobalSettingsProxy::UIGlobalSettingsProxy()
 {
     /* Apply UI decorations: */
-    Ui::UIGlobalSettingsGeneral::setupUi(this);
-
-#ifndef VBOX_GUI_WITH_SYSTRAY
-    m_pEnableTrayIconCheckbox->hide();
-    m_pSpacerWidget1->hide();
-#endif /* !VBOX_GUI_WITH_SYSTRAY */
-#ifndef Q_WS_MAC
-    m_pEnablePresentationModeCheckbox->hide();
-    m_pSpacerWidget2->hide();
-#endif /* !Q_WS_MAC */
-//#ifndef Q_WS_WIN /* Checkbox hidden for now! */
-    m_pDisableHostScreenSaverCheckbox->hide();
-    m_pSpacerWidget3->hide();
-//#endif /* !Q_WS_WIN */
-
-    /* If all checkboxes hidden, hide separator too: */
-    if (m_pEnableTrayIconCheckbox->isHidden() &&
-        m_pEnablePresentationModeCheckbox->isHidden() &&
-        m_pDisableHostScreenSaverCheckbox->isHidden())
-        m_pLineSeparator2->hide();
+    Ui::UIGlobalSettingsProxy::setupUi(this);
 
     /* Setup widgets: */
-    m_pMachineFolderSelector->setHomeDir(vboxGlobal().virtualBox().GetHomeFolder());
-    m_pVRDPLibNameSelector->setHomeDir(vboxGlobal().virtualBox().GetHomeFolder());
-    m_pVRDPLibNameSelector->setMode(VBoxFilePathSelectorWidget::Mode_File_Open);
+    m_pPortEditor->setFixedWidthByText(QString().fill('0', 6));
+    m_pHostEditor->setValidator(new QRegExpValidator(QRegExp("\\S*"), m_pPortEditor));
+    m_pPortEditor->setValidator(new QRegExpValidator(QRegExp("\\d*"), m_pPortEditor));
+    m_pLoginEditor->setValidator(new QRegExpValidator(QRegExp("\\S*"), m_pPortEditor));
+    m_pPasswordEditor->setValidator(new QRegExpValidator(QRegExp("\\S*"), m_pPortEditor));
+
+    /* Setup connections: */
+    connect(m_pProxyCheckbox, SIGNAL(stateChanged(int)), this, SLOT(sltProxyToggled()));
+    connect(m_pAuthCheckbox, SIGNAL(stateChanged(int)), this, SLOT(sltAuthToggled()));
 
     /* Apply language settings: */
@@ -61 +45 @@
 /* Load data to cashe from corresponding external object(s),
  * this task COULD be performed in other than GUI thread: */
-void UIGlobalSettingsGeneral::loadToCacheFrom(QVariant &data)
+void UIGlobalSettingsProxy::loadToCacheFrom(QVariant &data)
 {
     /* Fetch data to properties & settings: */
@@ -67 +51 @@
 
     /* Load to cache: */
-    m_cache.m_strDefaultMachineFolder = m_properties.GetDefaultMachineFolder();
-    m_cache.m_strVRDEAuthLibrary = m_properties.GetVRDEAuthLibrary();
-    m_cache.m_fTrayIconEnabled = m_settings.trayIconEnabled();
-#ifdef Q_WS_MAC
-    m_cache.m_fPresentationModeEnabled = m_settings.presentationModeEnabled();
-#endif /* Q_WS_MAC */
-    m_cache.m_fHostScreenSaverDisables = m_settings.hostScreenSaverDisabled();
+    UIProxyManager proxyManager(m_settings.proxySettings());
+    m_cache.m_fProxyEnabled = proxyManager.proxyEnabled();
+    m_cache.m_strProxyHost = proxyManager.proxyHost();
+    m_cache.m_strProxyPort = proxyManager.proxyPort();
+    m_cache.m_fAuthEnabled = proxyManager.authEnabled();
+    m_cache.m_strAuthLogin = proxyManager.authLogin();
+    m_cache.m_strAuthPassword = proxyManager.authPassword();
 
     /* Upload properties & settings to data: */
@@ -81 +65 @@
 /* Load data to corresponding widgets from cache,
  * this task SHOULD be performed in GUI thread only: */
-void UIGlobalSettingsGeneral::getFromCache()
+void UIGlobalSettingsProxy::getFromCache()
 {
     /* Fetch from cache: */
-    m_pMachineFolderSelector->setPath(m_cache.m_strDefaultMachineFolder);
-    m_pVRDPLibNameSelector->setPath(m_cache.m_strVRDEAuthLibrary);
-    m_pEnableTrayIconCheckbox->setChecked(m_cache.m_fTrayIconEnabled);
-#ifdef Q_WS_MAC
-    m_pEnablePresentationModeCheckbox->setChecked(m_cache.m_fPresentationModeEnabled);
-#endif /* Q_WS_MAC */
-    m_pDisableHostScreenSaverCheckbox->setChecked(m_cache.m_fHostScreenSaverDisables);
+    m_pProxyCheckbox->setChecked(m_cache.m_fProxyEnabled);
+    m_pHostEditor->setText(m_cache.m_strProxyHost);
+    m_pPortEditor->setText(m_cache.m_strProxyPort);
+    m_pAuthCheckbox->setChecked(m_cache.m_fAuthEnabled);
+    m_pLoginEditor->setText(m_cache.m_strAuthLogin);
+    m_pPasswordEditor->setText(m_cache.m_strAuthPassword);
+    sltProxyToggled();
 }
 
 /* Save data from corresponding widgets to cache,
  * this task SHOULD be performed in GUI thread only: */
-void UIGlobalSettingsGeneral::putToCache()
+void UIGlobalSettingsProxy::putToCache()
 {
     /* Upload to cache: */
-    m_cache.m_strDefaultMachineFolder = m_pMachineFolderSelector->path();
-    m_cache.m_strVRDEAuthLibrary = m_pVRDPLibNameSelector->path();
-    m_cache.m_fTrayIconEnabled = m_pEnableTrayIconCheckbox->isChecked();
-#ifdef Q_WS_MAC
-    m_cache.m_fPresentationModeEnabled = m_pEnablePresentationModeCheckbox->isChecked();
-#endif /* Q_WS_MAC */
-    m_cache.m_fHostScreenSaverDisables = m_pDisableHostScreenSaverCheckbox->isChecked();
+    m_cache.m_fProxyEnabled = m_pProxyCheckbox->isChecked();
+    m_cache.m_strProxyHost = m_pHostEditor->text();
+    m_cache.m_strProxyPort = m_pPortEditor->text();
+    m_cache.m_fAuthEnabled = m_pAuthCheckbox->isChecked();
+    m_cache.m_strAuthLogin = m_pLoginEditor->text();
+    m_cache.m_strAuthPassword = m_pPasswordEditor->text();
 }
 
 /* Save data from cache to corresponding external object(s),
  * this task COULD be performed in other than GUI thread: */
-void UIGlobalSettingsGeneral::saveFromCacheTo(QVariant &data)
+void UIGlobalSettingsProxy::saveFromCacheTo(QVariant &data)
 {
     /* Fetch data to properties & settings: */
     UISettingsPageGlobal::fetchData(data);
 
-    /* Save from cache: */
-    if (m_properties.isOk() && m_pMachineFolderSelector->isModified())
-        m_properties.SetDefaultMachineFolder(m_cache.m_strDefaultMachineFolder);
-    if (m_properties.isOk() && m_pVRDPLibNameSelector->isModified())
-        m_properties.SetVRDEAuthLibrary(m_cache.m_strVRDEAuthLibrary);
-    m_settings.setTrayIconEnabled(m_cache.m_fTrayIconEnabled);
-#ifdef Q_WS_MAC
-    m_settings.setPresentationModeEnabled(m_cache.m_fPresentationModeEnabled);
-#endif /* Q_WS_MAC */
-    m_settings.setHostScreenSaverDisabled(m_cache.m_fHostScreenSaverDisables);
+    UIProxyManager proxyManager;
+    proxyManager.setProxyEnabled(m_cache.m_fProxyEnabled);
+    proxyManager.setProxyHost(m_cache.m_strProxyHost);
+    proxyManager.setProxyPort(m_cache.m_strProxyPort);
+    proxyManager.setAuthEnabled(m_cache.m_fAuthEnabled);
+    proxyManager.setAuthLogin(m_cache.m_strAuthLogin);
+    proxyManager.setAuthPassword(m_cache.m_strAuthPassword);
+    m_settings.setProxySettings(proxyManager.toString());
 
     /* Upload properties & settings to data: */
@@ -130 +111 @@
 
 /* Navigation stuff: */
-void UIGlobalSettingsGeneral::setOrderAfter(QWidget *pWidget)
+void UIGlobalSettingsProxy::setOrderAfter(QWidget *pWidget)
 {
-    setTabOrder(pWidget, m_pMachineFolderSelector);
-    setTabOrder(m_pMachineFolderSelector, m_pVRDPLibNameSelector);
-    setTabOrder(m_pVRDPLibNameSelector, m_pEnableTrayIconCheckbox);
-    setTabOrder(m_pEnableTrayIconCheckbox, m_pEnablePresentationModeCheckbox);
-    setTabOrder(m_pEnablePresentationModeCheckbox, m_pDisableHostScreenSaverCheckbox);
+    setTabOrder(pWidget, m_pProxyCheckbox);
+    setTabOrder(m_pProxyCheckbox, m_pHostEditor);
+    setTabOrder(m_pHostEditor, m_pPortEditor);
+    setTabOrder(m_pPortEditor, m_pAuthCheckbox);
+    setTabOrder(m_pAuthCheckbox, m_pLoginEditor);
+    setTabOrder(m_pLoginEditor, m_pPasswordEditor);
 }
 
 /* Translation stuff: */
-void UIGlobalSettingsGeneral::retranslateUi()
+void UIGlobalSettingsProxy::retranslateUi()
 {
     /* Translate uic generated strings: */
-    Ui::UIGlobalSettingsGeneral::retranslateUi(this);
-
-    m_pMachineFolderSelector->setWhatsThis(tr("Displays the path to the default virtual "
-                                              "machine folder. This folder is used, if not "
-                                              "explicitly specified otherwise, when creating "
-                                              "new virtual machines."));
-    m_pVRDPLibNameSelector->setWhatsThis(tr("Displays the path to the library that "
-                                            "provides authentication for Remote Display "
-                                            "(VRDP) clients."));
+    Ui::UIGlobalSettingsProxy::retranslateUi(this);
 }
 
+void UIGlobalSettingsProxy::sltProxyToggled()
+{
+    m_pHostLabel->setEnabled(m_pProxyCheckbox->isChecked());
+    m_pHostEditor->setEnabled(m_pProxyCheckbox->isChecked());
+    m_pPortLabel->setEnabled(m_pProxyCheckbox->isChecked());
+    m_pPortEditor->setEnabled(m_pProxyCheckbox->isChecked());
+    m_pAuthCheckbox->setEnabled(m_pProxyCheckbox->isChecked());
+    sltAuthToggled();
+}
+
+void UIGlobalSettingsProxy::sltAuthToggled()
+{
+    m_pLoginLabel->setEnabled(m_pProxyCheckbox->isChecked() && m_pAuthCheckbox->isChecked());
+    m_pLoginEditor->setEnabled(m_pProxyCheckbox->isChecked() && m_pAuthCheckbox->isChecked());
+    m_pPasswordLabel->setEnabled(m_pProxyCheckbox->isChecked() && m_pAuthCheckbox->isChecked());
+    m_pPasswordEditor->setEnabled(m_pProxyCheckbox->isChecked() && m_pAuthCheckbox->isChecked());
+}
+

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

@@ -2 +2 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * UIGlobalSettingsGeneral class declaration
+ * UIGlobalSettingsProxy class declaration
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
  */
 
-#ifndef __UIGlobalSettingsGeneral_h__
-#define __UIGlobalSettingsGeneral_h__
+#ifndef __UIGlobalSettingsProxy_h__
+#define __UIGlobalSettingsProxy_h__
 
 /* Local includes */
 #include "UISettingsPage.h"
-#include "UIGlobalSettingsGeneral.gen.h"
+#include "UIGlobalSettingsProxy.gen.h"
 
-/* Global settings / General page / Cache: */
-struct UISettingsCacheGlobalGeneral
+/* Global settings / Proxy page / Cache: */
+struct UISettingsCacheGlobalProxy
 {
-    QString m_strDefaultMachineFolder;
-    QString m_strVRDEAuthLibrary;
-    bool m_fTrayIconEnabled;
-#ifdef Q_WS_MAC
-    bool m_fPresentationModeEnabled;
-#endif /* Q_WS_MAC */
-    bool m_fHostScreenSaverDisables;
+    UISettingsCacheGlobalProxy() : m_fProxyEnabled(false), m_fAuthEnabled(false) {}
+    bool m_fProxyEnabled;
+    QString m_strProxyHost;
+    QString m_strProxyPort;
+    bool m_fAuthEnabled;
+    QString m_strAuthLogin;
+    QString m_strAuthPassword;
 };
 
-/* Global settings / General page: */
-class UIGlobalSettingsGeneral : public UISettingsPageGlobal, public Ui::UIGlobalSettingsGeneral
+/* Global settings / Proxy page: */
+class UIGlobalSettingsProxy : public UISettingsPageGlobal, public Ui::UIGlobalSettingsProxy
 {
     Q_OBJECT;
@@ -44 +44 @@
 
     /* Constructor: */
-    UIGlobalSettingsGeneral();
+    UIGlobalSettingsProxy();
 
 protected:
@@ -68 +68 @@
     void retranslateUi();
 
+private slots:
+
+    void sltProxyToggled();
+    void sltAuthToggled();
+
 private:
 
     /* Cache: */
-    UISettingsCacheGlobalGeneral m_cache;
+    UISettingsCacheGlobalProxy m_cache;
 };
 
-#endif // __UIGlobalSettingsGeneral_h__
+#endif // __UIGlobalSettingsProxy_h__
 

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

@@ -3 +3 @@
  VBox frontends: Qt4 GUI ("VirtualBox"):
 
-     Copyright (C) 2008-2010 Oracle Corporation
+     Copyright (C) 2011 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
@@ -13 +13 @@
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  </comment>
- <class>UIGlobalSettingsGeneral</class>
- <widget class="QWidget" name="UIGlobalSettingsGeneral">
+ <class>UIGlobalSettingsProxy</class>
+ <widget class="QWidget" name="UIGlobalSettingsProxy">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>200</height>
+    <width>300</width>
+    <height>150</height>
    </rect>
   </property>
@@ -27 +27 @@
     <number>0</number>
    </property>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="m_pMachineFolderLabel">
-     <property name="text">
-      <string>Default &amp;Machine Folder:</string>
+   <item row="0" column="0">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" colspan="4">
+    <widget class="QCheckBox" name="m_pProxyCheckbox">
+     <property name="whatsThis">
+      <string>When checked, VirtualBox will use the proxy settings supplied for tasks like downloading Guest Additions from the network or checking for updates.</string>
+     </property>
+     <property name="text">
+      <string>&amp;Enable proxy</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint">
+      <size>
+       <width>16</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="2" colspan="3">
+    <layout class="QHBoxLayout">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="m_pHostLabel">
+       <property name="text">
+        <string>Ho&amp;st:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="buddy">
+        <cstring>m_pHostEditor</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QILineEdit" name="m_pHostEditor">
+       <property name="whatsThis">
+        <string>Changes 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>Changes the proxy port.</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="2" colspan="3">
+    <widget class="QCheckBox" name="m_pAuthCheckbox">
+     <property name="whatsThis">
+      <string>When checked the authentication supplied will be used with the proxy server.</string>
+     </property>
+     <property name="text">
+      <string>&amp;Use authentication</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2" rowspan="2">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint">
+      <size>
+       <width>16</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="3">
+    <widget class="QLabel" name="m_pLoginLabel">
+     <property name="text">
+      <string>User &amp;name:</string>
      </property>
      <property name="alignment">
@@ -36 +157 @@
      </property>
      <property name="buddy">
-      <cstring>m_pMachineFolderSelector</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <widget class="VBoxFilePathSelectorWidget" name="m_pMachineFolderSelector">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="3">
-    <widget class="Line" name="m_pLineSeparator1">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QLabel" name="m_pVRDPLibLabel">
-     <property name="text">
-      <string>V&amp;RDP Authentication Library:</string>
+      <cstring>m_pLoginEditor</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="4">
+    <widget class="QILineEdit" name="m_pLoginEditor">
+     <property name="whatsThis">
+      <string>Changes the user name used for authentication.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="3">
+    <widget class="QLabel" name="m_pPasswordLabel">
+     <property name="text">
+      <string>Pass&amp;word:</string>
      </property>
      <property name="alignment">
@@ -66 +177 @@
      </property>
      <property name="buddy">
-      <cstring>m_pVRDPLibNameSelector</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="VBoxFilePathSelectorWidget" name="m_pVRDPLibNameSelector">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="3">
-    <widget class="Line" name="m_pLineSeparator2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QWidget" name="m_pSpacerWidget1">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumWidth">
-      <number>34</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1" colspan="2">
-    <widget class="QCheckBox" name="m_pEnableTrayIconCheckbox">
-     <property name="whatsThis">
-      <string>When checked, the application will provide an icon with the context menu in the system tray.</string>
-     </property>
-     <property name="text">
-      <string>&amp;Show System Tray Icon</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
-    <widget class="QWidget" name="m_pSpacerWidget2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumWidth">
-      <number>34</number>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1" colspan="2">
-    <widget class="QCheckBox" name="m_pEnablePresentationModeCheckbox">
-     <property name="text">
-      <string>&amp;Auto show Dock and Menubar in fullscreen</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QWidget" name="m_pSpacerWidget3">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumWidth">
-      <number>34</number>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" colspan="2">
-    <widget class="QCheckBox" name="m_pDisableHostScreenSaverCheckbox">
-     <property name="whatsThis">
-      <string>When checked, the host screen saver will be disabled whenever a virtual machine is running.</string>
-     </property>
-     <property name="text">
-      <string>Disable Host &amp;ScreenSaver</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" colspan="3">
+      <cstring>m_pPasswordEditor</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="4">
+    <widget class="QILineEdit" name="m_pPasswordEditor">
+     <property name="whatsThis">
+      <string>Changes the password used for authentication.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" colspan="4">
     <spacer>
      <property name="orientation">
@@ -170 +205 @@
  <customwidgets>
   <customwidget>
-   <class>VBoxFilePathSelectorWidget</class>
-   <extends>QComboBox</extends>
-   <header>VBoxFilePathSelectorWidget.h</header>
-   <container>1</container>
+   <class>QILineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>QILineEdit.h</header>
   </customwidget>
  </customwidgets>

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 #include "VBoxProblemReporter.h"
 #include "UISpecialControls.h"
+#include "VBoxUtils.h"
 
 /* Global includes */
@@ -150 +151 @@
 void UIDownloader::acknowledgeStart()
 {
+    /* Recreate HTTP: */
     delete m_pHttp;
-    m_pHttp = new QIHttp(this, m_source.host());
+    m_pHttp = new QIHttp(this);
+    /* Setup HTTP proxy: */
+    UIProxyManager proxyManager(vboxGlobal().settings().proxySettings());
+    if (proxyManager.proxyEnabled())
+    {
+        m_pHttp->setProxy(proxyManager.proxyHost(), proxyManager.proxyPort().toInt(),
+                          proxyManager.authEnabled() ? proxyManager.authLogin() : QString(),
+                          proxyManager.authEnabled() ? proxyManager.authPassword() : QString());
+    }
+    /* Set HTTP host: */
+    m_pHttp->setHost(m_source.host());
+    /* Setup connections: */
     connect(m_pHttp, SIGNAL(responseHeaderReceived(const QHttpResponseHeader &)),
             this, SLOT(acknowledgeProcess(const QHttpResponseHeader &)));
     connect(m_pHttp, SIGNAL(allIsDone(bool)),
             this, SLOT(acknowledgeFinished(bool)));
+    /* Make a request: */
     m_pHttp->get(m_source.toEncoded());
 }
@@ -206 +220 @@
 void UIDownloader::downloadStart()
 {
+    /* Recreate HTTP: */
     delete m_pHttp;
-    m_pHttp = new QIHttp(this, m_source.host());
+    m_pHttp = new QIHttp(this);
+    /* Setup HTTP proxy: */
+    UIProxyManager proxyManager(vboxGlobal().settings().proxySettings());
+    if (proxyManager.proxyEnabled())
+    {
+        m_pHttp->setProxy(proxyManager.proxyHost(), proxyManager.proxyPort().toInt(),
+                          proxyManager.authEnabled() ? proxyManager.authLogin() : QString(),
+                          proxyManager.authEnabled() ? proxyManager.authPassword() : QString());
+    }
+    /* Set HTTP host: */
+    m_pHttp->setHost(m_source.host());
+    /* Setup connections: */
     connect(m_pHttp, SIGNAL(dataReadProgress (int, int)),
             this, SLOT (downloadProcess(int, int)));
     connect(m_pHttp, SIGNAL(allIsDone(bool)),
             this, SLOT(downloadFinished(bool)));
+    /* Make a request: */
     m_pHttp->get(m_source.toEncoded());
 }