mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 16:31:21 +00:00
Merge remote branch 'origin/KDE/4.12'
This commit is contained in:
commit
40bc548566
|
@ -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)
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -61,6 +61,7 @@ void setProxyConfigScript (const QString&);
|
|||
|
||||
void setProxyFor (const QString&, const QString&);
|
||||
|
||||
QString noProxyFor();
|
||||
void setNoProxyFor (const QString&);
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue