kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'origin/KDE/4.11' into KDE/4.12

Browse source
This commit is contained in:
Andrea Iacovitti 2013-11-28 17:18:48 +01:00
commit d7848233bb
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
konqueror/settings/kio/kproxydlg.cpp
View file

@ -192,7 +192,7 @@ static void setProxyInformation(const QString& value,
portNum = -1;
}
urlStr = value.left(index).trimmed();
} else {
} else {
urlStr = value.trimmed();
}
@ -292,7 +292,7 @@ void KProxyDialog::load()
mProxyMap[QL1S("FtpProxy")] = KProtocolManager::proxyFor(QL1S("ftp"));
mProxyMap[QL1S("SocksProxy")] = KProtocolManager::proxyFor(QL1S("socks"));
mProxyMap[QL1S("ProxyScript")] = KProtocolManager::proxyConfigScript();
mProxyMap[QL1S("NoProxy")] = KProtocolManager::noProxyFor();
mProxyMap[QL1S("NoProxy")] = KSaveIOConfig::noProxyFor();
const int proxyType = KProtocolManager::proxyType();
@ -446,8 +446,9 @@ void KProxyDialog::on_autoDetectButton_clicked()
count += (autoDetectSystemProxy(mUi.systemProxySocksEdit, ENV_SOCKS_PROXY) ? 1 : 0);
count += (autoDetectSystemProxy(mUi.systemNoProxyEdit, ENV_NO_PROXY) ? 1 : 0);
if (count)
emit changed (true);
if (count) {
emit changed(true);
}
}
void KProxyDialog::on_manualProxyHttpEdit_textChanged(const QString& text)

6
konqueror/settings/kio/ksaveioconfig.cpp
View file

@ -184,6 +184,12 @@ void KSaveIOConfig::setProxyType(KProtocolManager::ProxyType type)
cfg.sync();
}
QString KSaveIOConfig::noProxyFor()
{
KConfigGroup cfg(config(), "Proxy Settings");
return cfg.readEntry("NoProxyFor");
}
void KSaveIOConfig::setNoProxyFor( const QString& _noproxy )
{
KConfigGroup cfg (config(), "Proxy Settings");

1
konqueror/settings/kio/ksaveioconfig.h
View file

@ -61,6 +61,7 @@ void setProxyConfigScript (const QString&);
void setProxyFor (const QString&, const QString&);
QString noProxyFor();
void setNoProxyFor (const QString&);