prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Settings- Proxy tab update layout

Browse source
This commit is contained in:
Jeremy Wu 2020-05-04 19:57:11 +10:00
parent 900ba13443
commit 4f36cd9714
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Flow.Launcher/SettingWindow.xaml
View file

@ -339,9 +339,9 @@
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="{DynamicResource proxy}"> <TabItem Header="{DynamicResource proxy}">
<StackPanel> <StackPanel Height="400" Margin="65,0">
<CheckBox Margin="10" IsChecked="{Binding Settings.Proxy.Enabled}"> <CheckBox Margin="10" IsChecked="{Binding Settings.Proxy.Enabled}">
<TextBlock Text="{DynamicResource enableProxy}" /> <TextBlock Text="{DynamicResource enableProxy}" FontSize="14" />
</CheckBox> </CheckBox>
<Grid Margin="10" IsEnabled="{Binding Settings.Proxy.Enabled}"> <Grid Margin="10" IsEnabled="{Binding Settings.Proxy.Enabled}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -351,20 +351,21 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100" /> <ColumnDefinition Width="100" />
<ColumnDefinition Width="200" /> <ColumnDefinition Width="200" />
<ColumnDefinition Width="100" /> <ColumnDefinition Width="135" />
<ColumnDefinition Width="200" /> <ColumnDefinition Width="200" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{DynamicResource server}" Grid.Row="0" Grid.Column="0" Padding="5" /> <TextBlock Text="{DynamicResource server}" Grid.Row="0" Grid.Column="0" Padding="5" FontSize="14" />
<TextBox Text="{Binding Settings.Proxy.Server}" Grid.Row="0" Grid.Column="1" Padding="5" /> <TextBox Text="{Binding Settings.Proxy.Server}" Grid.Row="0" Grid.Column="1" Padding="5" Margin="0 0 0 20" />
<TextBlock Text="{DynamicResource port}" Grid.Row="0" Grid.Column="2" Padding="5" /> <TextBlock Text="{DynamicResource port}" Grid.Row="0" Grid.Column="2" Padding="5" Margin ="40 0 0 0" FontSize="14" />
<TextBox Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty} }" Grid.Row="0" Grid.Column="3" Padding="5" /> <TextBox Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty} }" Grid.Row="0"
<TextBlock Text="{DynamicResource userName}" Grid.Row="1" Grid.Column="0" Padding="5" /> Grid.Column="3" Padding="5" Margin="0 0 0 20"/>
<TextBlock Text="{DynamicResource userName}" Grid.Row="1" Grid.Column="0" Padding="5" FontSize="14" />
<TextBox Text="{Binding Settings.Proxy.UserName}" Grid.Row="1" Grid.Column="1" Padding="5" /> <TextBox Text="{Binding Settings.Proxy.UserName}" Grid.Row="1" Grid.Column="1" Padding="5" />
<TextBlock Text="{DynamicResource password}" Grid.Row="1" Grid.Column="2" Padding="5" /> <TextBlock Text="{DynamicResource password}" Grid.Row="1" Grid.Column="2" Padding="5" Margin ="40 0 0 0" FontSize="14" />
<TextBox Text="{Binding Settings.Proxy.Password}" Grid.Row="1" Grid.Column="3" Padding="5" /> <TextBox Text="{Binding Settings.Proxy.Password}" Grid.Row="1" Grid.Column="3" Padding="5" />
</Grid> </Grid>
<Button Content="{DynamicResource testProxy}" IsEnabled="{Binding Settings.Proxy.Enabled}" <Button Content="{DynamicResource testProxy}" IsEnabled="{Binding Settings.Proxy.Enabled}"
Width="80" HorizontalAlignment="Left" Margin="10" Click="OnTestProxyClick" /> HorizontalAlignment="Right" Margin="10 15 10 10" Click="OnTestProxyClick" />
</StackPanel> </StackPanel>
</TabItem> </TabItem>
<TabItem Header="{DynamicResource about}"> <TabItem Header="{DynamicResource about}">