Skip to content

Commit b7195c5

Browse files
qwqcodeqwqcode
authored
fix(ui): adjust settings window (#64) (#74)
1 parent 12417f0 commit b7195c5

File tree

1 file changed

+96
-72
lines changed

1 file changed

+96
-72
lines changed

‎SubRenamer/Views/SettingsWindow.axaml‎

Lines changed: 96 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
xmlns:vm="using:SubRenamer.ViewModels"
66
mc:Ignorable="d"
77
WindowStartupLocation="CenterOwner"
8-
Width="500"
8+
Width="800"
9+
MinWidth="860"
10+
MinHeight="500"
911
SizeToContent="Height"
12+
CanResize="True"
1013
x:Class="SubRenamer.Views.SettingsWindow"
1114
x:DataType="vm:SettingsViewModel"
1215
Title="{DynamicResource App.Strings.SettingsTitle}">
@@ -33,89 +36,110 @@
3336
</Style>
3437
</Window.Styles>
3538

36-
<StackPanel Margin="20">
37-
<StackPanel Orientation="Horizontal" Spacing="15">
39+
<DockPanel Margin="20" LastChildFill="True">
40+
41+
<!-- Bottom Section -->
42+
<StackPanel DockPanel.Dock="Bottom" Margin="0,20,0,0">
43+
<Border BorderThickness=".5" BorderBrush="#D2D4D5"/>
44+
<Border Height="15" />
45+
46+
<Grid ColumnDefinitions="*,Auto">
47+
<!-- Left Side Text -->
48+
<TextBlock Grid.Column="0" TextWrapping="Wrap" FontSize="13" LineHeight="26" Foreground="#5f6b7c">
49+
<TextBlock.Inlines>
50+
<TextBlock Text="{DynamicResource App.Strings.SettingsOpenSourceProgram}" />
51+
<LineBreak />
52+
<TextBlock Text="{DynamicResource App.Strings.SettingsConsiderStar1}" />
53+
<Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsConsiderStar2}" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer" />
54+
<TextBlock Text="{DynamicResource App.Strings.SettingsConsiderStar3}" />
55+
</TextBlock.Inlines>
56+
</TextBlock>
57+
58+
<!-- Right Side Buttons -->
59+
<StackPanel Grid.Column="1" Margin="20,0,0,0" Orientation="Vertical" Spacing="10" HorizontalAlignment="Right">
60+
<Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsFeedback}" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer/issues/new" HorizontalAlignment="Right" />
61+
<Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsChangelog}" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer/releases" HorizontalAlignment="Right" />
62+
</StackPanel>
63+
</Grid>
64+
</StackPanel>
65+
66+
<!-- Main Content -->
67+
<Grid ColumnDefinitions="*, 30, *">
68+
<!-- Left Column -->
69+
<StackPanel Grid.Column="0">
70+
<StackPanel Orientation="Horizontal" Spacing="15">
3871
<TextBlock Text="{DynamicResource App.Strings.SettingsLanguage}" FontSize="14" VerticalAlignment="Center" />
3972
<ComboBox MaxDropDownHeight="200" SelectedIndex="{Binding LanguageIndex}" ItemsSource="{Binding LanguageTitles}">
40-
<ComboBox.ItemTemplate>
41-
<DataTemplate>
42-
<TextBlock Text="{Binding}" />
43-
</DataTemplate>
44-
</ComboBox.ItemTemplate>
73+
<ComboBox.ItemTemplate>
74+
<DataTemplate>
75+
<TextBlock Text="{Binding}" />
76+
</DataTemplate>
77+
</ComboBox.ItemTemplate>
4578
</ComboBox>
46-
</StackPanel>
47-
<Border Height="15" />
48-
<Border BorderThickness=".5" BorderBrush="#D2D4D5"></Border>
49-
<Border Height="15" />
50-
<CheckBox IsChecked="{Binding BackupEnabled}" Content="{DynamicResource App.Strings.SettingsBackupOriginalSubtitles}" />
51-
<TextBlock Text="{DynamicResource App.Strings.SettingsBackupHint}" Foreground="Gray" Margin="30 0 30 10" FontSize="13" Padding="0" TextWrapping="Wrap" />
52-
<!-- <CheckBox>确认删除对话框</CheckBox> -->
53-
<!-- <CheckBox>显示文件完整路径</CheckBox> -->
54-
<CheckBox IsChecked="{Binding FileConflictFilter}" Content="{DynamicResource App.Strings.SettingsLanguageFilterDialog}" />
55-
<TextBlock Text="{DynamicResource App.Strings.SettingsLanguageFilterHint}" Foreground="Gray" FontSize="13" Padding="0" Margin="30 0 30 10" TextWrapping="Wrap" />
56-
<CheckBox IsChecked="{Binding KeepLangExt}" IsEnabled="{Binding !CustomLangExtEnabled}" Content="{DynamicResource App.Strings.SettingsKeepLanguageSuffix}" />
57-
<TextBlock Text="{DynamicResource App.Strings.SettingsKeepLanguageSuffixHint}" Foreground="Gray" Margin="30 0 30 10" FontSize="13" Padding="0" TextWrapping="Wrap" />
58-
<CheckBox IsChecked="{Binding CustomLangExtEnabled}" Content="{DynamicResource App.Strings.SettingsAddCustomSuffix}" />
59-
<StackPanel Margin="30 0 0 0">
79+
</StackPanel>
80+
81+
<Border Height="15" />
82+
<Border BorderThickness=".5" BorderBrush="#D2D4D5"/>
83+
<Border Height="15" />
84+
85+
<CheckBox IsChecked="{Binding BackupEnabled}" Content="{DynamicResource App.Strings.SettingsBackupOriginalSubtitles}" />
86+
<TextBlock Text="{DynamicResource App.Strings.SettingsBackupHint}" Foreground="Gray" Margin="30 0 30 10" FontSize="13" Padding="0" TextWrapping="Wrap" />
87+
88+
<CheckBox IsChecked="{Binding FileConflictFilter}" Content="{DynamicResource App.Strings.SettingsLanguageFilterDialog}" />
89+
<TextBlock Text="{DynamicResource App.Strings.SettingsLanguageFilterHint}" Foreground="Gray" FontSize="13" Padding="0" Margin="30 0 30 10" TextWrapping="Wrap" />
90+
91+
<CheckBox IsChecked="{Binding KeepLangExt}" IsEnabled="{Binding !CustomLangExtEnabled}" Content="{DynamicResource App.Strings.SettingsKeepLanguageSuffix}" />
92+
<TextBlock Text="{DynamicResource App.Strings.SettingsKeepLanguageSuffixHint}" Foreground="Gray" Margin="30 0 30 10" FontSize="13" Padding="0" TextWrapping="Wrap" />
93+
94+
<CheckBox IsChecked="{Binding CustomLangExtEnabled}" Content="{DynamicResource App.Strings.SettingsAddCustomSuffix}" />
95+
<StackPanel Margin="30 0 0 0">
6096
<TextBlock Text="{DynamicResource App.Strings.SettingsAddCustomSuffixHint}" Foreground="Gray" FontSize="13" Padding="0" Margin="0 0 0 10" TextWrapping="Wrap" />
6197
<TextBox IsEnabled="{Binding CustomLangExtEnabled}" Watermark="{DynamicResource App.Strings.SettingsCustomSuffixWatermark}" Text="{Binding CustomLangExt}" />
98+
</StackPanel>
6299
</StackPanel>
63-
<Border Height="15" />
64-
<CheckBox IsChecked="{Binding FileClsExtAppendEnabled}" Content="{DynamicResource App.Strings.SettingsFileFormatExtension}" />
65-
<TextBlock Text="{DynamicResource App.Strings.SettingsFileFormatExtensionHint}" Foreground="Gray" Margin="30 0 30 8" FontSize="13" Padding="0" TextWrapping="Wrap" />
66-
<Grid IsEnabled="{Binding FileClsExtAppendEnabled}" Margin="30 0 0 0" HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*">
100+
101+
<!-- Right Column -->
102+
<StackPanel Grid.Column="2">
103+
<CheckBox IsChecked="{Binding FileClsExtAppendEnabled}" Content="{DynamicResource App.Strings.SettingsFileFormatExtension}" />
104+
<TextBlock Text="{DynamicResource App.Strings.SettingsFileFormatExtensionHint}" Foreground="Gray" Margin="30 0 30 8" FontSize="13" Padding="0" TextWrapping="Wrap" />
105+
<Grid IsEnabled="{Binding FileClsExtAppendEnabled}" Margin="30 0 0 0" HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*">
67106
<StackPanel Grid.Column="0">
68-
<TextBlock Margin="0 5 0 10" FontSize="13" Text="{DynamicResource App.Strings.SettingsSubtitleFormatExtension}" />
69-
<TextBox Watermark="{DynamicResource App.Strings.SettingsSubtitleFormatWatermark}" Text="{Binding SubtitleExtAppend}" />
107+
<TextBlock Margin="0 5 0 10" FontSize="13" Text="{DynamicResource App.Strings.SettingsSubtitleFormatExtension}" />
108+
<TextBox Watermark="{DynamicResource App.Strings.SettingsSubtitleFormatWatermark}" Text="{Binding SubtitleExtAppend}" />
70109
</StackPanel>
71110
<StackPanel Grid.Column="2">
72-
<TextBlock Margin="0 5 0 10" FontSize="13" Text="{DynamicResource App.Strings.SettingsVideoFormatExtension}" />
73-
<TextBox Watermark="{DynamicResource App.Strings.SettingsVideoFormatWatermark}" Text="{Binding VideoExtAppend}" />
111+
<TextBlock Margin="0 5 0 10" FontSize="13" Text="{DynamicResource App.Strings.SettingsVideoFormatExtension}" />
112+
<TextBox Watermark="{DynamicResource App.Strings.SettingsVideoFormatWatermark}" Text="{Binding VideoExtAppend}" />
74113
</StackPanel>
75-
</Grid>
76-
<Border Height="15" />
77-
<CheckBox IsChecked="{Binding UpdateCheckEnabled}" Content="{DynamicResource App.Strings.SettingsUpdateCheck}" />
78-
79-
<Border Height="15" />
80-
<Border BorderThickness=".5" BorderBrush="#D2D4D5"></Border>
81-
<Border Height="15" />
82-
83-
<Grid ColumnDefinitions="3*,40,*">
84-
<StackPanel Grid.Column="0" Orientation="Vertical">
85-
<StackPanel Orientation="Horizontal">
86-
<TextBlock Text="{DynamicResource App.Strings.SettingsSubSyncProgram}" FontSize="14" VerticalAlignment="Center" />
87-
<TextBlock IsVisible="{Binding SubSyncExeDownloaded}" FontSize="14" VerticalAlignment="Center" Foreground="{StaticResource SystemAccentColor}" Text="{DynamicResource App.Strings.SettingsSubSyncInstalled}" />
88-
<TextBlock IsVisible="{Binding !SubSyncExeDownloaded}" FontSize="14" VerticalAlignment="Center" Text="{DynamicResource App.Strings.SettingsSubSyncNotInstalled}" />
89-
</StackPanel>
90-
<TextBlock Text="{DynamicResource App.Strings.SettingsSubSyncDesc}" Foreground="Gray" Margin="0 10 0 0" FontSize="13" Padding="0" TextWrapping="Wrap" />
114+
</Grid>
115+
116+
<Border Height="50" />
117+
118+
<Border Height="15" />
119+
<Border BorderThickness=".5" BorderBrush="#D2D4D5"/>
120+
<Border Height="15" />
121+
122+
<Grid ColumnDefinitions="2.5*,20,*">
123+
<StackPanel Grid.Column="0" Orientation="Vertical" VerticalAlignment="Center">
124+
<TextBlock TextWrapping="Wrap" FontSize="14">
125+
<TextBlock.Inlines>
126+
<TextBlock Text="{DynamicResource App.Strings.SettingsSubSyncProgram}" /><TextBlock IsVisible="{Binding SubSyncExeDownloaded}" Foreground="{StaticResource SystemAccentColor}" Text="{DynamicResource App.Strings.SettingsSubSyncInstalled}" /><TextBlock IsVisible="{Binding !SubSyncExeDownloaded}" Text="{DynamicResource App.Strings.SettingsSubSyncNotInstalled}" />
127+
</TextBlock.Inlines>
128+
</TextBlock>
129+
<TextBlock Text="{DynamicResource App.Strings.SettingsSubSyncDesc}" Foreground="Gray" Margin="0 10 0 0" FontSize="12" Padding="0" TextWrapping="Wrap" />
91130
</StackPanel>
92131
<StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
93-
<Button FontSize="12" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Command="{Binding DownloadSubSyncExeCommand}" Content="{DynamicResource App.Strings.SettingsSubSyncDownload}" />
94-
<Button FontSize="12" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/ffsubsync-bin" Content="{DynamicResource App.Strings.SettingsSubSyncViewReadme}" />
132+
<Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Command="{Binding DownloadSubSyncExeCommand}" Content="{DynamicResource App.Strings.SettingsSubSyncDownload}" />
133+
<Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/ffsubsync-bin" Content="{DynamicResource App.Strings.SettingsSubSyncViewReadme}" />
95134
</StackPanel>
96-
</Grid>
97-
98-
<Border Height="15" />
99-
<Border BorderThickness=".5" BorderBrush="#D2D4D5"></Border>
100-
<Border Height="15" />
101-
102-
<TextBlock TextWrapping="Wrap" FontSize="13" LineHeight="26" Foreground="#5f6b7c">
103-
<TextBlock.Inlines>
104-
<Run Text="{DynamicResource App.Strings.SettingsOpenSourceProgram}" />
105-
<LineBreak />
106-
<Run Text="{DynamicResource App.Strings.SettingsConsiderStar1}" />
107-
<Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsConsiderStar2}" Margin="0 5 0 0" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer" />
108-
<Run Text="{DynamicResource App.Strings.SettingsConsiderStar3}" />
109-
</TextBlock.Inlines>
110-
</TextBlock>
111-
112-
<Border Height="15" />
113-
<Border BorderThickness=".5" BorderBrush="#D2D4D5"></Border>
114-
115-
<Border Height="15" />
116-
<StackPanel Orientation="Horizontal" Spacing="15">
117-
<Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsFeedback}" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer/issues/new" />
118-
<Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsChangelog}" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer/releases" />
135+
</Grid>
136+
137+
<Border Height="15" />
138+
<Border BorderThickness=".5" BorderBrush="#D2D4D5"/>
139+
<Border Height="15" />
140+
141+
<CheckBox IsChecked="{Binding UpdateCheckEnabled}" Content="{DynamicResource App.Strings.SettingsUpdateCheck}" />
119142
</StackPanel>
120-
</StackPanel>
143+
</Grid>
144+
</DockPanel>
121145
</Window>

0 commit comments

Comments
 (0)