github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 02:40:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:Qv2ray/Qv2ray into tproxy

Browse Source
This commit is contained in:
fancy 2020-04-19 21:59:50 +08:00
commit b72dfbd32c
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5264 5266

5
src/ui/editors/w_OutboundEditor.cpp
View File

@ -118,6 +118,7 @@ OUTBOUND OutboundEditor::GenerateConnectionJson()
} }
else else
{ {
streaming = QJsonObject();
bool processed = false; bool processed = false;
for (const auto &plugin : pluginWidgets) for (const auto &plugin : pluginWidgets)
{ {
@ -204,6 +205,8 @@ void OutboundEditor::ReloadGUI()
const auto &plugin = pluginWidgets.value(index); const auto &plugin = pluginWidgets.value(index);
if (plugin.first.protocol == outboundType) if (plugin.first.protocol == outboundType)
{ {
useFPCB->setEnabled(false);
useFPCB->setToolTip(tr("Forward proxy has been disabled when using plugin outbound"));
plugin.second->SetContent(settings); plugin.second->SetContent(settings);
outBoundTypeCombo->setCurrentIndex(index); outBoundTypeCombo->setCurrentIndex(index);
auto [_address, _port] = plugin.second->GetHostInfo(); auto [_address, _port] = plugin.second->GetHostInfo();
@ -284,12 +287,14 @@ void OutboundEditor::on_alterLineEdit_valueChanged(int arg1)
void OutboundEditor::on_useFPCB_stateChanged(int arg1) void OutboundEditor::on_useFPCB_stateChanged(int arg1)
{ {
useForwardProxy = arg1 == Qt::Checked; useForwardProxy = arg1 == Qt::Checked;
streamSettingsWidget->setEnabled(!useForwardProxy);
} }
void OutboundEditor::on_outBoundTypeCombo_currentIndexChanged(int index) void OutboundEditor::on_outBoundTypeCombo_currentIndexChanged(int index)
{ {
// 0, 1, 2 as built-in vmess, ss, socks // 0, 1, 2 as built-in vmess, ss, socks
outboundTypeStackView->setCurrentIndex(index); outboundTypeStackView->setCurrentIndex(index);
streamSettingsWidget->setEnabled(index < 3);
if (index < 3) if (index < 3)
{ {
outboundType = outBoundTypeCombo->currentText().toLower(); outboundType = outBoundTypeCombo->currentText().toLower();

2
src/ui/editors/w_OutboundEditor.ui
View File

@ -30,7 +30,7 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout_4" columnstretch="2,4"> <layout class="QGridLayout" name="gridLayout_4" columnstretch="2,4">
<item row="1" column="1"> <item row="1" column="1">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="streamSettingsGroupBox">
<property name="title"> <property name="title">
<string>Stream Settings</string> <string>Stream Settings</string>
</property> </property>