Mercurial > hg > octave-terminal
changeset 13609:b355901aade4
Added username and password field to proxy settings.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Wed, 17 Aug 2011 01:42:00 +0200 |
parents | d3527a9dfe27 |
children | 506e24d12b63 |
files | gui/src/ResourceManager.cpp gui/src/SettingsDialog.cpp gui/src/SettingsDialog.ui |
diffstat | 3 files changed, 108 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/src/ResourceManager.cpp +++ b/gui/src/ResourceManager.cpp @@ -72,15 +72,7 @@ if (m_settings->value ("useProxyServer").toBool ()) { QString proxyTypeString = m_settings->value ("proxyType").toString (); - if (proxyTypeString == "NoProxy") - { - proxyType = QNetworkProxy::NoProxy; - } - else if (proxyTypeString == "DefaultProxy") - { - proxyType = QNetworkProxy::DefaultProxy; - } - else if (proxyTypeString == "Socks5Proxy") + if (proxyTypeString == "Socks5Proxy") { proxyType = QNetworkProxy::Socks5Proxy; } @@ -88,19 +80,13 @@ { proxyType = QNetworkProxy::HttpProxy; } - else if (proxyTypeString == "HttpCachingProxy") - { - proxyType = QNetworkProxy::HttpCachingProxy; - } - else if (proxyTypeString == "FtpCachingProxy") - { - proxyType = QNetworkProxy::FtpCachingProxy; - } } QNetworkProxy proxy; proxy.setType (proxyType); proxy.setHostName (m_settings->value ("proxyHostName").toString ()); proxy.setPort (m_settings->value ("proxyPort").toInt ()); + proxy.setUser (m_settings->value ("proxyUserName").toString ()); + proxy.setPassword (m_settings->value ("proxyPassword").toString ()); QNetworkProxy::setApplicationProxy (proxy); }
--- a/gui/src/SettingsDialog.cpp +++ b/gui/src/SettingsDialog.cpp @@ -34,6 +34,8 @@ } ui->proxyPort->setText (settings->value ("proxyPort").toString ()); + ui->proxyUserName->setText (settings->value ("proxyUserName").toString ()); + ui->proxyPassword->setText (settings->value ("proxyPassword").toString ()); } SettingsDialog::~SettingsDialog () @@ -56,5 +58,7 @@ settings->setValue ("proxyType", ui->proxyType->currentText ()); settings->setValue ("proxyHostName", ui->proxyHostName->text ()); settings->setValue ("proxyPort", ui->proxyPort->text ()); + settings->setValue ("proxyUserName", ui->proxyUserName->text ()); + settings->setValue ("proxyPassword", ui->proxyPassword->text ()); delete ui; }
--- a/gui/src/SettingsDialog.ui +++ b/gui/src/SettingsDialog.ui @@ -241,16 +241,6 @@ </property> <item> <property name="text"> - <string>NoProxy</string> - </property> - </item> - <item> - <property name="text"> - <string>DefaultProxy</string> - </property> - </item> - <item> - <property name="text"> <string>HttpProxy</string> </property> </item> @@ -259,16 +249,6 @@ <string>Socks5Proxy</string> </property> </item> - <item> - <property name="text"> - <string>HttpCachingProxy</string> - </property> - </item> - <item> - <property name="text"> - <string>FtpCachingProxy</string> - </property> - </item> </widget> </item> <item row="1" column="0"> @@ -305,6 +285,43 @@ </property> </widget> </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_6"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Username:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLineEdit" name="proxyUserName"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_7"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Password:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QLineEdit" name="proxyPassword"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="echoMode"> + <enum>QLineEdit::Password</enum> + </property> + </widget> + </item> </layout> </item> </layout> @@ -490,5 +507,69 @@ </hint> </hints> </connection> + <connection> + <sender>useProxyServer</sender> + <signal>toggled(bool)</signal> + <receiver>proxyUserName</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>249</x> + <y>59</y> + </hint> + <hint type="destinationlabel"> + <x>291</x> + <y>190</y> + </hint> + </hints> + </connection> + <connection> + <sender>useProxyServer</sender> + <signal>toggled(bool)</signal> + <receiver>proxyPassword</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>249</x> + <y>59</y> + </hint> + <hint type="destinationlabel"> + <x>291</x> + <y>223</y> + </hint> + </hints> + </connection> + <connection> + <sender>useProxyServer</sender> + <signal>toggled(bool)</signal> + <receiver>label_6</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>249</x> + <y>59</y> + </hint> + <hint type="destinationlabel"> + <x>56</x> + <y>190</y> + </hint> + </hints> + </connection> + <connection> + <sender>useProxyServer</sender> + <signal>toggled(bool)</signal> + <receiver>label_7</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>249</x> + <y>59</y> + </hint> + <hint type="destinationlabel"> + <x>55</x> + <y>223</y> + </hint> + </hints> + </connection> </connections> </ui>