aiden
/
settings
mirror of https://github.com/cutefishos/settings
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Finished proxy

Browse Source
pull/55/head
reionwong 4 years ago
parent cfa63637e7
commit e1e83fbfdd
5 changed files with 68 additions and 45 deletions
Show Stats Download Patch File Download Diff File

26
src/networkproxy.cpp
Unescape Escape View File

@ -1,4 +1,7 @@
#include "networkproxy.h" #include "networkproxy.h"
#include <QDBusInterface>
#include <QDBusPendingCall>
#include <QTimer>
NetworkProxy::NetworkProxy(QObject *parent) NetworkProxy::NetworkProxy(QObject *parent)
: QObject(parent) : QObject(parent)
@ -25,6 +28,7 @@ void NetworkProxy::setFlag(int flag)
if (m_flag != flag) { if (m_flag != flag) {
m_flag = flag; m_flag = flag;
m_settings.setValue("ProxyFlag", flag); m_settings.setValue("ProxyFlag", flag);
delayUpdateProxy();
emit flagChanged(); emit flagChanged();
} }
} }
@ -39,6 +43,7 @@ void NetworkProxy::setUseSameProxy(bool enabled)
if (m_useSameProxy != enabled) { if (m_useSameProxy != enabled) {
m_useSameProxy = enabled; m_useSameProxy = enabled;
m_settings.setValue("UseSameProxy", enabled); m_settings.setValue("UseSameProxy", enabled);
delayUpdateProxy();
emit useSameProxyChanged(); emit useSameProxyChanged();
} }
} }
@ -53,6 +58,7 @@ void NetworkProxy::setScriptProxy(const QString &path)
if (m_scriptProxy != path) { if (m_scriptProxy != path) {
m_scriptProxy = path; m_scriptProxy = path;
m_settings.setValue("ProxyScriptProxy", path); m_settings.setValue("ProxyScriptProxy", path);
delayUpdateProxy();
emit scriptProxyChanged(); emit scriptProxyChanged();
} }
} }
@ -67,6 +73,7 @@ void NetworkProxy::setHttpProxy(const QString &path)
if (m_httpProxy != path) { if (m_httpProxy != path) {
m_httpProxy = path; m_httpProxy = path;
m_settings.setValue("HttpProxy", path); m_settings.setValue("HttpProxy", path);
delayUpdateProxy();
emit httpProxyChanged(); emit httpProxyChanged();
} }
} }
@ -81,6 +88,7 @@ void NetworkProxy::setFtpProxy(const QString &path)
if (m_ftpProxy != path) { if (m_ftpProxy != path) {
m_ftpProxy = path; m_ftpProxy = path;
m_settings.setValue("FtpProxy", path); m_settings.setValue("FtpProxy", path);
delayUpdateProxy();
emit ftpProxyChanged(); emit ftpProxyChanged();
} }
} }
@ -95,6 +103,7 @@ void NetworkProxy::setSocksProxy(const QString &path)
if (m_socksProxy != path) { if (m_socksProxy != path) {
m_socksProxy = path; m_socksProxy = path;
m_settings.setValue("SocksProxy", path); m_settings.setValue("SocksProxy", path);
delayUpdateProxy();
emit socksProxyChanged(); emit socksProxyChanged();
} }
} }
@ -109,6 +118,7 @@ void NetworkProxy::setHttpProxyPort(const QString &port)
if (m_httpProxyPort != port) { if (m_httpProxyPort != port) {
m_httpProxyPort = port; m_httpProxyPort = port;
m_settings.setValue("HttpProxyPort", port); m_settings.setValue("HttpProxyPort", port);
delayUpdateProxy();
emit httpProxyPortChanged(); emit httpProxyPortChanged();
} }
} }
@ -123,6 +133,7 @@ void NetworkProxy::setFtpProxyPort(const QString &port)
if (m_ftpProxyPort != port) { if (m_ftpProxyPort != port) {
m_ftpProxyPort = port; m_ftpProxyPort = port;
m_settings.setValue("FtpProxyPort", port); m_settings.setValue("FtpProxyPort", port);
delayUpdateProxy();
emit ftpProxyPortChanged(); emit ftpProxyPortChanged();
} }
} }
@ -137,6 +148,21 @@ void NetworkProxy::setSocksProxyPort(const QString &port)
if (m_socksProxyPort != port) { if (m_socksProxyPort != port) {
m_socksProxyPort = port; m_socksProxyPort = port;
m_settings.setValue("SocksProxyPort", port); m_settings.setValue("SocksProxyPort", port);
delayUpdateProxy();
emit socksProxyPortChanged(); emit socksProxyPortChanged();
} }
} }
void NetworkProxy::updateProxy()
{
QDBusInterface iface("com.cutefish.Session", "/Session", "com.cutefish.Session");
if (iface.isValid()) {
iface.asyncCall("updateNetworkProxy");
}
}
void NetworkProxy::delayUpdateProxy()
{
QTimer::singleShot(50, this, &NetworkProxy::updateProxy);
}

3
src/networkproxy.h
Unescape Escape View File

@ -47,6 +47,9 @@ public:
QString socksProxyPort() const; QString socksProxyPort() const;
void setSocksProxyPort(const QString &port); void setSocksProxyPort(const QString &port);
Q_INVOKABLE void updateProxy();
Q_INVOKABLE void delayUpdateProxy();
signals: signals:
void flagChanged(); void flagChanged();
void useSameProxyChanged(); void useSameProxyChanged();

38
src/qml/Proxy/Main.qml
Unescape Escape View File

@ -72,37 +72,28 @@ ItemPage {
} }
} }
RadioButton {
id: autoDiscoverProxyRadioButton
checked: networkProxy.flag === 1
text: qsTr("Detect proxy configuration automatically")
onClicked: {
networkProxy.flag = 1
}
}
RadioButton { RadioButton {
id: autoScriptProxyRadioButton id: autoScriptProxyRadioButton
checked: networkProxy.flag === 2 checked: networkProxy.flag === 1
text: qsTr("Use proxy auto configuration URL") text: qsTr("Use proxy auto configuration URL")
onClicked: { onClicked: {
networkProxy.flag = 2 networkProxy.flag = 1
} }
} }
RadioButton { RadioButton {
id: manualProxyRadioButton id: manualProxyRadioButton
checked: networkProxy.flag === 3 checked: networkProxy.flag === 2
text: qsTr("Use manually specified proxy configuration") text: qsTr("Use manually specified proxy configuration")
onClicked: { onClicked: {
networkProxy.flag = 3 networkProxy.flag = 2
} }
} }
} }
RoundedItem { RoundedItem {
id: proxyItem id: proxyItem
visible: !noProxyRadioButton.checked && !autoDiscoverProxyRadioButton.checked visible: !noProxyRadioButton.checked
RowLayout { RowLayout {
id: autoScriptProxyLayout id: autoScriptProxyLayout
@ -143,6 +134,9 @@ ItemPage {
Layout.fillWidth: true Layout.fillWidth: true
height: 40 height: 40
text: networkProxy.httpProxy text: networkProxy.httpProxy
validator: RegExpValidator {
regExp: /(?=(\b|\D))(((\d{1,2})|(1\d{1,2})|(2[0-4]\d)|(25[0-5]))\.){3}((\d{1,2})|(1\d{1,2})|(2[0-4]\d)|(25[0-5]))(?=(\b|\D))/
}
onEditingFinished: { onEditingFinished: {
networkProxy.httpProxy = httpProxyField.text networkProxy.httpProxy = httpProxyField.text
@ -160,6 +154,8 @@ ItemPage {
text: networkProxy.httpProxyPort text: networkProxy.httpProxyPort
validator: IntValidator { bottom: 0; top: 999999}
onEditingFinished: { onEditingFinished: {
networkProxy.httpProxyPort = httpProxyPortField.text networkProxy.httpProxyPort = httpProxyPortField.text
} }
@ -174,7 +170,9 @@ ItemPage {
text: qsTr("Also use this proxy for FTP") text: qsTr("Also use this proxy for FTP")
Layout.fillWidth: true Layout.fillWidth: true
checked: networkProxy.useSameProxy checked: networkProxy.useSameProxy
onClicked: networkProxy.useSameProxy = forFtpCheckBox.checked onClicked: {
networkProxy.useSameProxy = forFtpCheckBox.checked
}
} }
Item { Item {
@ -195,9 +193,10 @@ ItemPage {
Layout.fillWidth: true Layout.fillWidth: true
height: 40 height: 40
enabled: !forFtpCheckBox.checked enabled: !forFtpCheckBox.checked
text: networkProxy.ftpProxy text: networkProxy.ftpProxy
validator: RegExpValidator {
regExp: /(?=(\b|\D))(((\d{1,2})|(1\d{1,2})|(2[0-4]\d)|(25[0-5]))\.){3}((\d{1,2})|(1\d{1,2})|(2[0-4]\d)|(25[0-5]))(?=(\b|\D))/
}
onEditingFinished: { onEditingFinished: {
networkProxy.ftpProxy = ftpProxyTextField.text networkProxy.ftpProxy = ftpProxyTextField.text
} }
@ -214,6 +213,7 @@ ItemPage {
enabled: !forFtpCheckBox.checked enabled: !forFtpCheckBox.checked
text: networkProxy.ftpProxyPort text: networkProxy.ftpProxyPort
validator: IntValidator { bottom: 0; top: 999999}
onEditingFinished: { onEditingFinished: {
networkProxy.ftpProxyPort = ftpProxyPortField.text networkProxy.ftpProxyPort = ftpProxyPortField.text
@ -230,6 +230,9 @@ ItemPage {
Layout.fillWidth: true Layout.fillWidth: true
height: 40 height: 40
validator: RegExpValidator {
regExp: /(?=(\b|\D))(((\d{1,2})|(1\d{1,2})|(2[0-4]\d)|(25[0-5]))\.){3}((\d{1,2})|(1\d{1,2})|(2[0-4]\d)|(25[0-5]))(?=(\b|\D))/
}
text: networkProxy.socksProxy text: networkProxy.socksProxy
onEditingFinished: { onEditingFinished: {
@ -247,6 +250,7 @@ ItemPage {
Layout.preferredWidth: 80 Layout.preferredWidth: 80
text: networkProxy.socksProxyPort text: networkProxy.socksProxyPort
validator: IntValidator { bottom: 0; top: 999999}
onEditingFinished: { onEditingFinished: {
networkProxy.socksProxyPort = socksProxyPortField.text networkProxy.socksProxyPort = socksProxyPortField.text

23
translations/en_US.ts
Unescape Escape View File

@ -704,48 +704,43 @@
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="78"/> <location filename="../src/qml/Proxy/Main.qml" line="78"/>
<source>Detect proxy configuration automatically</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Proxy/Main.qml" line="87"/>
<source>Use proxy auto configuration URL</source> <source>Use proxy auto configuration URL</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="96"/> <location filename="../src/qml/Proxy/Main.qml" line="87"/>
<source>Use manually specified proxy configuration</source> <source>Use manually specified proxy configuration</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="124"/> <location filename="../src/qml/Proxy/Main.qml" line="115"/>
<source>Select file</source> <source>Select file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="138"/> <location filename="../src/qml/Proxy/Main.qml" line="129"/>
<source>HTTP Proxy</source> <source>HTTP Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="153"/> <location filename="../src/qml/Proxy/Main.qml" line="144"/>
<location filename="../src/qml/Proxy/Main.qml" line="207"/> <location filename="../src/qml/Proxy/Main.qml" line="198"/>
<location filename="../src/qml/Proxy/Main.qml" line="241"/> <location filename="../src/qml/Proxy/Main.qml" line="232"/>
<source>Port</source> <source>Port</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="174"/> <location filename="../src/qml/Proxy/Main.qml" line="165"/>
<source>Also use this proxy for FTP</source> <source>Also use this proxy for FTP</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="190"/> <location filename="../src/qml/Proxy/Main.qml" line="181"/>
<source>FTP Proxy</source> <source>FTP Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="225"/> <location filename="../src/qml/Proxy/Main.qml" line="216"/>
<source>SOCKS Proxy</source> <source>SOCKS Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

23
translations/zh_CN.ts
Unescape Escape View File

@ -704,48 +704,43 @@
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="78"/> <location filename="../src/qml/Proxy/Main.qml" line="78"/>
<source>Detect proxy configuration automatically</source>
<translation>自动检测代理配置</translation>
</message>
<message>
<location filename="../src/qml/Proxy/Main.qml" line="87"/>
<source>Use proxy auto configuration URL</source> <source>Use proxy auto configuration URL</source>
<translation>使用代理自动配置 URL</translation> <translation>使用代理自动配置 URL</translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="96"/> <location filename="../src/qml/Proxy/Main.qml" line="87"/>
<source>Use manually specified proxy configuration</source> <source>Use manually specified proxy configuration</source>
<translation>使用手动配置的代理服务器</translation> <translation>使用手动配置的代理服务器</translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="124"/> <location filename="../src/qml/Proxy/Main.qml" line="115"/>
<source>Select file</source> <source>Select file</source>
<translation>选择文件</translation> <translation>选择文件</translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="138"/> <location filename="../src/qml/Proxy/Main.qml" line="129"/>
<source>HTTP Proxy</source> <source>HTTP Proxy</source>
<translation>HTTP 代理</translation> <translation>HTTP 代理</translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="153"/> <location filename="../src/qml/Proxy/Main.qml" line="144"/>
<location filename="../src/qml/Proxy/Main.qml" line="207"/> <location filename="../src/qml/Proxy/Main.qml" line="198"/>
<location filename="../src/qml/Proxy/Main.qml" line="241"/> <location filename="../src/qml/Proxy/Main.qml" line="232"/>
<source>Port</source> <source>Port</source>
<translation>端口</translation> <translation>端口</translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="174"/> <location filename="../src/qml/Proxy/Main.qml" line="165"/>
<source>Also use this proxy for FTP</source> <source>Also use this proxy for FTP</source>
<translation>将此代理用于 FTP</translation> <translation>将此代理用于 FTP</translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="190"/> <location filename="../src/qml/Proxy/Main.qml" line="181"/>
<source>FTP Proxy</source> <source>FTP Proxy</source>
<translation>FTP 代理</translation> <translation>FTP 代理</translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Proxy/Main.qml" line="225"/> <location filename="../src/qml/Proxy/Main.qml" line="216"/>
<source>SOCKS Proxy</source> <source>SOCKS Proxy</source>
<translation>SOCKS 代理</translation> <translation>SOCKS 代理</translation>
</message> </message>

Write Preview
Loading…
Cancel
Save