Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

SBI_Proxy: Remove option to set NoProxy

Browse Source 
QtWebEngine doesn't support NoProxy option, it will always
try to use SystemProxy if no proxy is specified
This commit is contained in:
David Rosca 2015-10-15 11:33:48 +02:00
parent f8525f2533
commit 1c63a90e1a
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/StatusBarIcons/sbi_proxywidget.cpp
View File

@ -34,7 +34,7 @@ void SBI_ProxyWidget::clear()
ui->proxyPassword->clear(); ui->proxyPassword->clear();
ui->proxyType->setCurrentIndex(0); ui->proxyType->setCurrentIndex(0);
ui->noProxy->setChecked(true); ui->systemProxy->setChecked(true);
} }
SBI_NetworkProxy* SBI_ProxyWidget::getProxy() const SBI_NetworkProxy* SBI_ProxyWidget::getProxy() const
@ -46,10 +46,8 @@ SBI_NetworkProxy* SBI_ProxyWidget::getProxy() const
proxy->setUserName(ui->proxyUsername->text()); proxy->setUserName(ui->proxyUsername->text());
proxy->setPassword(ui->proxyPassword->text()); proxy->setPassword(ui->proxyPassword->text());
if (ui->noProxy->isChecked()) { if (ui->systemProxy->isChecked()) {
proxy->setType(QNetworkProxy::NoProxy); proxy->setType(QNetworkProxy::NoProxy);
} else if (ui->systemProxy->isChecked()) {
proxy->setType(QNetworkProxy::DefaultProxy);
} else { } else {
proxy->setType(ui->proxyType->currentIndex() == 0 ? QNetworkProxy::HttpProxy : QNetworkProxy::Socks5Proxy); proxy->setType(ui->proxyType->currentIndex() == 0 ? QNetworkProxy::HttpProxy : QNetworkProxy::Socks5Proxy);
} }
@ -67,10 +65,6 @@ void SBI_ProxyWidget::setProxy(const SBI_NetworkProxy &proxy)
switch (proxy.type()) { switch (proxy.type()) {
case QNetworkProxy::NoProxy: case QNetworkProxy::NoProxy:
ui->noProxy->setChecked(true);
break;
case QNetworkProxy::DefaultProxy:
ui->systemProxy->setChecked(true); ui->systemProxy->setChecked(true);
break; break;

21
src/plugins/StatusBarIcons/sbi_proxywidget.ui
View File

@ -14,14 +14,7 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2"> <item row="2" column="1">
<widget class="QRadioButton" name="noProxy">
<property name="text">
<string>Do &amp;not use proxy</string>
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_9"> <layout class="QHBoxLayout" name="horizontalLayout_9">
<item> <item>
<widget class="QComboBox" name="proxyType"> <widget class="QComboBox" name="proxyType">
@ -59,7 +52,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -75,7 +68,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="4" column="1"> <item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_24"> <layout class="QHBoxLayout" name="horizontalLayout_24">
<item> <item>
<widget class="QLabel" name="label_56"> <widget class="QLabel" name="label_56">
@ -112,21 +105,21 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QRadioButton" name="systemProxy"> <widget class="QRadioButton" name="systemProxy">
<property name="text"> <property name="text">
<string>S&amp;ystem proxy configuration</string> <string>S&amp;ystem proxy configuration</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QRadioButton" name="manualProxy"> <widget class="QRadioButton" name="manualProxy">
<property name="text"> <property name="text">
<string>&amp;Manual configuration</string> <string>&amp;Manual configuration</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="6" column="1">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -139,7 +132,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="6" column="1"> <item row="5" column="1">
<widget class="QFrame" name="httpsCredentialsLayout_2"> <widget class="QFrame" name="httpsCredentialsLayout_2">
<layout class="QHBoxLayout" name="httpsCredentialsLayout"/> <layout class="QHBoxLayout" name="httpsCredentialsLayout"/>
</widget> </widget>