Skip to content

Commit a6ff33e

Browse files
committed
修复BBR启用时的BUG
1 parent bbc9219 commit a6ff33e

File tree

4 files changed

+599
-12
lines changed

4 files changed

+599
-12
lines changed

ProxySU/MainWindow.xaml

+9-7
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@
6868
<TextBlock x:Name="TextBlockPassword" Text="密码:" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5" Grid.Column="2" Grid.Row="1"></TextBlock>
6969
<TextBox x:Name="TextBoxUserName" Text="root" Margin="5" Grid.Column="1" Grid.Row="1"></TextBox>
7070
<PasswordBox x:Name="PasswordBoxHostPassword" Password="" Margin="5" Grid.Column="3" Grid.Row="1"></PasswordBox>
71-
<RadioButton x:Name="RadioButtonPasswordLogin" GroupName="CertIsYesNo" Content="密码登录" Grid.Column="0" Grid.Row="2" Checked="RadioButtonPasswordLogin_Checked"></RadioButton>
72-
<RadioButton x:Name="RadioButtonCertLogin" GroupName="CertIsYesNo" Content="密钥登录" Grid.Column="1" Grid.Row="2" Checked="RadioButtonCertLogin_Checked"></RadioButton>
73-
<Button x:Name="ButtonOpenFileDialog" Content="浏览..." Margin="8" Grid.Column="2" Grid.Row="2" Click="ButtonOpenFileDialog_Click"></Button>
74-
<TextBox x:Name="TextBoxCertFilePath" Text="" Style="{StaticResource TitleText}" Tag="密钥文件存放路径(不可为空)" Margin="10" Grid.Column="3" Grid.Row="2"></TextBox>
71+
<RadioButton x:Name="RadioButtonPasswordLogin" GroupName="CertIsYesNo" Content="密码登录" Visibility="Hidden" Grid.Column="0" Grid.Row="2" Checked="RadioButtonPasswordLogin_Checked"></RadioButton>
72+
<RadioButton x:Name="RadioButtonCertLogin" GroupName="CertIsYesNo" Content="密钥登录" Visibility="Hidden" Grid.Column="1" Grid.Row="2" Checked="RadioButtonCertLogin_Checked"></RadioButton>
73+
<Button x:Name="ButtonOpenFileDialog" Content="浏览..." Visibility="Hidden" Margin="8" Grid.Column="2" Grid.Row="2" Click="ButtonOpenFileDialog_Click"></Button>
74+
<TextBox x:Name="TextBoxCertFilePath" Text="" Style="{StaticResource TitleText}" Tag="密钥文件存放路径(不可为空)" Visibility="Hidden" Margin="10" Grid.Column="3" Grid.Row="2"></TextBox>
7575
<!--代理设置-->
7676
<Grid Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4">
7777
<Grid.ColumnDefinitions>
@@ -134,7 +134,7 @@
134134
<Button x:Name="Button_canel" Content="取消" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
135135
</Grid>
136136
</TabItem>
137-
<TabItem Header="Trojan" Width="100" Height="30">
137+
<TabItem Header="Trojan/Trojan-Go" Width="120" Height="30">
138138
<Grid>
139139
<Grid.ColumnDefinitions>
140140
<ColumnDefinition></ColumnDefinition>
@@ -152,7 +152,9 @@
152152
<Button x:Name="ButtonUpdateTrojan" Content="检测/升级Trojan版本" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonUpdateTrojan_Click"></Button>
153153
<Button x:Name="ButtonTrojanTemplate" Content="Trojan参数设置" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTrojanTemplate_Click"/>
154154
<!--<TextBlock Text="Trojan参数设置" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>-->
155-
155+
<Button x:Name="ButtonTrojanGoTemplate" Content="Trojan-Go参数设置" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTrojanGoTemplate_Click"/>
156+
157+
156158
<Button x:Name="ButtonTrojanSetUp" Content="Trojan一键安装" Grid.ColumnSpan="1" Margin="10" Grid.Column="0" Grid.Row="2" Click="ButtonTrojanSetUp_Click"/>
157159
<Button x:Name="ButtonTrojanCancel" Content="取消" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
158160
</Grid>
@@ -385,7 +387,7 @@
385387
<RowDefinition></RowDefinition>
386388
<RowDefinition></RowDefinition>
387389
</Grid.RowDefinitions>
388-
<TextBlock Text="程序版本:1.6.3" Grid.Column="0" Grid.Row="0"></TextBlock>
390+
<TextBlock Text="程序版本:1.6.4" Grid.Column="0" Grid.Row="0"></TextBlock>
389391

390392
</Grid>
391393

0 commit comments

Comments
 (0)