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

expose disableSystemRoot certificate entry (#1008)

Browse Source 
* expose disableSystemRoot certificate entry
* reformat with clang-format
* Update StreamSettingsWidget.ui
* Update StreamSettingsWidget.ui
* Update BUILDVERSION

Co-authored-by: QxQ <59914293+U-v-U@users.noreply.github.com>
This commit is contained in:
DuckSoft 2020-10-03 01:07:32 +08:00 committed by GitHub
parent b9defd88ce
commit 880ec1cbb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5951 5957

7
src/ui/widgets/widgets/StreamSettingsWidget.cpp
View File

@ -43,6 +43,7 @@ void StreamSettingsWidget::SetStreamObject(const StreamSettingsObject &sso)
serverNameTxt->setText(stream.prefix##Settings.serverName); \ serverNameTxt->setText(stream.prefix##Settings.serverName); \
allowInsecureCB->setChecked(stream.prefix##Settings.allowInsecure); \ allowInsecureCB->setChecked(stream.prefix##Settings.allowInsecure); \
disableSessionResumptionCB->setChecked(stream.prefix##Settings.disableSessionResumption); \ disableSessionResumptionCB->setChecked(stream.prefix##Settings.disableSessionResumption); \
disableSystemRoot->setChecked(stream.prefix##Settings.disableSystemRoot); \
alpnTxt->setText(stream.prefix##Settings.alpn.join("|")); \ alpnTxt->setText(stream.prefix##Settings.alpn.join("|")); \
} }
@ -315,3 +316,9 @@ void StreamSettingsWidget::on_alpnTxt_textEdited(const QString &arg1)
stream.tlsSettings.alpn = arg1.split('|'); stream.tlsSettings.alpn = arg1.split('|');
stream.xtlsSettings.alpn = arg1.split('|'); stream.xtlsSettings.alpn = arg1.split('|');
} }
void StreamSettingsWidget::on_disableSystemRoot_stateChanged(int arg1)
{
stream.tlsSettings.disableSystemRoot = arg1;
stream.xtlsSettings.disableSystemRoot = arg1;
}

2
src/ui/widgets/widgets/StreamSettingsWidget.hpp
View File

@ -60,6 +60,8 @@ class StreamSettingsWidget
void on_wsHeadersTxt_textChanged(); void on_wsHeadersTxt_textChanged();
void on_wsPathTxt_textEdited(const QString &arg1); void on_wsPathTxt_textEdited(const QString &arg1);
void on_disableSystemRoot_stateChanged(int arg1);
private: private:
QvMessageBusSlotDecl; QvMessageBusSlotDecl;
StreamSettingsObject stream; StreamSettingsObject stream;

15
src/ui/widgets/widgets/StreamSettingsWidget.ui
View File

@ -691,26 +691,33 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Server Address (SNI)</string> <string>Server Address (SNI)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="4" column="1">
<widget class="QLineEdit" name="serverNameTxt"/> <widget class="QLineEdit" name="serverNameTxt"/>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label_14"> <widget class="QLabel" name="label_14">
<property name="text"> <property name="text">
<string>ALPN</string> <string>ALPN</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="5" column="1">
<widget class="QLineEdit" name="alpnTxt"/> <widget class="QLineEdit" name="alpnTxt"/>
</item> </item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="disableSystemRoot">
<property name="text">
<string>Disable System Root Certificates</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">