|
68 | 68 | <TextBlock x:Name="TextBlockPassword" Text="密码:" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5" Grid.Column="2" Grid.Row="1"></TextBlock>
|
69 | 69 | <TextBox x:Name="TextBoxUserName" Text="root" Margin="5" Grid.Column="1" Grid.Row="1"></TextBox>
|
70 | 70 | <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> |
75 | 75 | <!--代理设置-->
|
76 | 76 | <Grid Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4">
|
77 | 77 | <Grid.ColumnDefinitions>
|
|
134 | 134 | <Button x:Name="Button_canel" Content="取消" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
|
135 | 135 | </Grid>
|
136 | 136 | </TabItem>
|
137 |
| - <TabItem Header="Trojan" Width="100" Height="30"> |
| 137 | + <TabItem Header="Trojan/Trojan-Go" Width="120" Height="30"> |
138 | 138 | <Grid>
|
139 | 139 | <Grid.ColumnDefinitions>
|
140 | 140 | <ColumnDefinition></ColumnDefinition>
|
|
152 | 152 | <Button x:Name="ButtonUpdateTrojan" Content="检测/升级Trojan版本" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonUpdateTrojan_Click"></Button>
|
153 | 153 | <Button x:Name="ButtonTrojanTemplate" Content="Trojan参数设置" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTrojanTemplate_Click"/>
|
154 | 154 | <!--<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 | + |
156 | 158 | <Button x:Name="ButtonTrojanSetUp" Content="Trojan一键安装" Grid.ColumnSpan="1" Margin="10" Grid.Column="0" Grid.Row="2" Click="ButtonTrojanSetUp_Click"/>
|
157 | 159 | <Button x:Name="ButtonTrojanCancel" Content="取消" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
|
158 | 160 | </Grid>
|
|
385 | 387 | <RowDefinition></RowDefinition>
|
386 | 388 | <RowDefinition></RowDefinition>
|
387 | 389 | </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> |
389 | 391 |
|
390 | 392 | </Grid>
|
391 | 393 |
|
|
0 commit comments