|
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/Trojan-Go" Width="120" Height="30"> |
| 137 | + <TabItem Header="Trojan" Width="100" 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 |
| - <Button x:Name="ButtonTrojanGoTemplate" Content="Trojan-Go参数设置" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTrojanGoTemplate_Click"/> |
| 155 | + <!--<Button x:Name="ButtonTrojanGoTemplate" Content="Trojan-Go参数设置" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTrojanGoTemplate_Click"/>--> |
156 | 156 |
|
157 | 157 |
|
158 | 158 | <Button x:Name="ButtonTrojanSetUp" Content="Trojan一键安装" Grid.ColumnSpan="1" Margin="10" Grid.Column="0" Grid.Row="2" Click="ButtonTrojanSetUp_Click"/>
|
|
277 | 277 | <Button x:Name="Button_canel3in1" Content="取消" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
|
278 | 278 | </Grid>
|
279 | 279 | </TabItem>
|
| 280 | + <TabItem Header="Trojan-Go" Width="100" Height="30"> |
| 281 | + <Grid> |
| 282 | + <Grid.ColumnDefinitions> |
| 283 | + <ColumnDefinition></ColumnDefinition> |
| 284 | + <ColumnDefinition></ColumnDefinition> |
| 285 | + <ColumnDefinition></ColumnDefinition> |
| 286 | + |
| 287 | + </Grid.ColumnDefinitions> |
| 288 | + <Grid.RowDefinitions> |
| 289 | + <RowDefinition></RowDefinition> |
| 290 | + <RowDefinition></RowDefinition> |
| 291 | + <RowDefinition></RowDefinition> |
| 292 | + |
| 293 | + </Grid.RowDefinitions> |
| 294 | + <Button x:Name="ButtonUpdateTrojanGo" Content="检测/升级Trojan-Go版本" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonUpdateTrojanGo_Click"></Button> |
| 295 | + <!--<Button x:Name="ButtonTrojanTemplate" Content="Trojan参数设置" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTrojanTemplate_Click"/>--> |
| 296 | + <!--<TextBlock Text="Trojan参数设置" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>--> |
| 297 | + <Button x:Name="ButtonTrojanGoTemplate" Content="Trojan-Go参数设置" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTrojanGoTemplate_Click"/> |
| 298 | + |
| 299 | + |
| 300 | + <Button x:Name="ButtonTrojanGoSetUp" Content="Trojan-Go一键安装" Grid.ColumnSpan="1" Margin="10" Grid.Column="0" Grid.Row="2" Click="ButtonTrojanGoSetUp_Click"/> |
| 301 | + <Button x:Name="ButtonTrojanGoCancel" Content="取消" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button> |
| 302 | + </Grid> |
| 303 | + </TabItem> |
280 | 304 | <TabItem Header="系统工具" Width="100" Height="30">
|
281 | 305 | <Grid>
|
282 | 306 | <Grid.ColumnDefinitions>
|
|
387 | 411 | <RowDefinition></RowDefinition>
|
388 | 412 | <RowDefinition></RowDefinition>
|
389 | 413 | </Grid.RowDefinitions>
|
390 |
| - <TextBlock Text="程序版本:1.6.4" Grid.Column="0" Grid.Row="0"></TextBlock> |
| 414 | + <TextBlock Text="程序版本:1.7.0" Grid.Column="0" Grid.Row="0"></TextBlock> |
391 | 415 |
|
392 | 416 | </Grid>
|
393 | 417 |
|
|
0 commit comments