Skip to content

Commit 1bf9520

Browse files
committed
Add "Channel Select" UI in about section
1 parent 77e966e commit 1bf9520

File tree

1 file changed

+39
-18
lines changed

1 file changed

+39
-18
lines changed

Flow.Launcher/SettingWindow.xaml

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@
693693
</ItemsControl>
694694
</Border>
695695

696-
<Border
696+
<Border
697697
Margin="0,30,0,0"
698698
Padding="0"
699699
Style="{DynamicResource SettingGroupBox}">
@@ -720,7 +720,7 @@
720720
<ComboBox
721721
x:Name="SelectScreen"
722722
MinWidth="160"
723-
Margin="0,0,18,0"
723+
Margin="0,0,18,0"
724724
VerticalAlignment="Center"
725725
FontSize="14"
726726
ItemsSource="{Binding ScreenNumbers}"
@@ -738,14 +738,12 @@
738738
</ComboBox>
739739
</StackPanel>
740740
<TextBlock Style="{StaticResource Glyph}">
741-
&#xe7f4;
741+
&#xe7f4;
742742
</TextBlock>
743743
</ItemsControl>
744744
</Border>
745745

746-
<Separator
747-
Width="Auto"
748-
BorderThickness="1">
746+
<Separator Width="Auto" BorderThickness="1">
749747
<Separator.Style>
750748
<Style BasedOn="{StaticResource SettingSeparatorStyle}" TargetType="Separator">
751749
<Setter Property="Visibility" Value="Visible" />
@@ -758,9 +756,7 @@
758756
</Separator.Style>
759757
</Separator>
760758

761-
<Border
762-
Margin="0"
763-
BorderThickness="0">
759+
<Border Margin="0" BorderThickness="0">
764760
<Border.Style>
765761
<Style BasedOn="{StaticResource SettingGroupBox}" TargetType="Border">
766762
<Setter Property="Visibility" Value="Visible" />
@@ -786,8 +782,7 @@
786782
FontSize="14"
787783
ItemsSource="{Binding SearchWindowAligns}"
788784
SelectedValue="{Binding Settings.SearchWindowAlign}"
789-
SelectedValuePath="Value">
790-
</ComboBox>
785+
SelectedValuePath="Value" />
791786
<StackPanel Margin="0,0,18,0" Orientation="Horizontal">
792787
<StackPanel.Style>
793788
<Style TargetType="StackPanel">
@@ -817,7 +812,7 @@
817812
</StackPanel>
818813
</StackPanel>
819814
<TextBlock Style="{StaticResource Glyph}">
820-
&#xe7f4;
815+
&#xe7f4;
821816
</TextBlock>
822817
</ItemsControl>
823818
</Border>
@@ -3014,7 +3009,10 @@
30143009
TextAlignment="left" />
30153010

30163011

3017-
<Border Margin="0,9,0,0" Style="{DynamicResource SettingGroupBox}">
3012+
<Border
3013+
Margin="0,9,0,0"
3014+
CornerRadius="8 8 0 0"
3015+
Style="{DynamicResource SettingGroupBox}">
30183016
<ItemsControl Style="{StaticResource SettingGrid}">
30193017
<StackPanel Style="{StaticResource TextPanel}">
30203018
<TextBlock
@@ -3026,11 +3024,6 @@
30263024
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource version}" />
30273025
</StackPanel>
30283026
<StackPanel Grid.Column="2" Orientation="Horizontal">
3029-
<Button
3030-
Margin="0,0,10,0"
3031-
HorizontalAlignment="Right"
3032-
Click="OnCheckUpdates"
3033-
Content="{DynamicResource checkUpdates}" />
30343027
<Button
30353028
Margin="0,0,14,0"
30363029
Padding="0"
@@ -3054,6 +3047,34 @@
30543047
</ItemsControl>
30553048
</Border>
30563049

3050+
3051+
<Border
3052+
Margin="0,0,0,8"
3053+
CornerRadius="0 0 8 8"
3054+
Style="{DynamicResource SettingGroupBox}">
3055+
<ItemsControl Style="{StaticResource SettingGrid}">
3056+
<StackPanel Style="{StaticResource TextPanel}">
3057+
<TextBlock
3058+
Grid.Column="1"
3059+
VerticalAlignment="Center"
3060+
Style="{DynamicResource SettingTitleLabel}"
3061+
Text="Update Source" />
3062+
</StackPanel>
3063+
<StackPanel Grid.Column="2" Orientation="Horizontal">
3064+
<ComboBox Margin="0,0,8,0" SelectedIndex="0">
3065+
<ComboBoxItem>Release</ComboBoxItem>
3066+
<ComboBoxItem>Preview</ComboBoxItem>
3067+
</ComboBox>
3068+
<Button
3069+
Margin="0,0,14,0"
3070+
HorizontalAlignment="Right"
3071+
Click="OnCheckUpdates"
3072+
Content="{DynamicResource checkUpdates}" />
3073+
</StackPanel>
3074+
<TextBlock Width="50" Style="{StaticResource Glyph}" />
3075+
</ItemsControl>
3076+
</Border>
3077+
30573078
<Border Height="62" Style="{DynamicResource SettingGroupBox}">
30583079
<ItemsControl Style="{StaticResource SettingGrid}">
30593080
<StackPanel Style="{StaticResource TextPanel}">

0 commit comments

Comments
 (0)