mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-29 04:08:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Proxies: Enable ownBrander to force system proxy usage #4458

Browse source
This commit is contained in:
Markus Goetz 2016-03-11 16:21:40 +01:00
parent 62d4ed8087
commit 6c07f08175
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gui/networksettings.cpp
View file

@ -86,6 +86,11 @@ QSize NetworkSettings::sizeHint() const {
void NetworkSettings::loadProxySettings() void NetworkSettings::loadProxySettings()
{ {
if (Theme::instance()->forceSystemNetworkProxy()) {
_ui->systemProxyRadioButton->setChecked(true);
_ui->proxyGroupBox->setEnabled(false);
return;
}
// load current proxy settings // load current proxy settings
OCC::ConfigFile cfgFile; OCC::ConfigFile cfgFile;
int type = cfgFile.proxyType(); int type = cfgFile.proxyType();

3
src/libsync/configfile.cpp
View file

@ -508,6 +508,9 @@ void ConfigFile::setValue(const QString& key, const QVariant &value)
int ConfigFile::proxyType() const int ConfigFile::proxyType() const
{ {
if (Theme::instance()->forceSystemNetworkProxy()) {
return QNetworkProxy::DefaultProxy;
}
return getValue(QLatin1String(proxyTypeC)).toInt(); return getValue(QLatin1String(proxyTypeC)).toInt();
} }

6
src/libsync/theme.cpp
View file

@ -427,6 +427,12 @@ bool Theme::userGroupSharing() const
return true; return true;
} }
bool Theme::forceSystemNetworkProxy() const
{
return false;
}
} // end namespace client } // end namespace client

2
src/libsync/theme.h
View file

@ -237,6 +237,8 @@ public:
virtual bool linkSharing() const; virtual bool linkSharing() const;
virtual bool userGroupSharing() const; virtual bool userGroupSharing() const;
virtual bool forceSystemNetworkProxy() const;
protected: protected:
#ifndef TOKEN_AUTH_ONLY #ifndef TOKEN_AUTH_ONLY
QIcon themeIcon(const QString& name, bool sysTray = false) const; QIcon themeIcon(const QString& name, bool sysTray = false) const;