Skip to content

Commit bba616b

Browse files
VShawnVShawn
committed
feat: Added the feature to switch the UI font. close #772
fix: #766
1 parent c29376b commit bba616b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+382
-192
lines changed

‎Shawn.Utils‎

‎Ui/Controls/NoteDisplay/NoteDisplayAndEditor.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
</Border.CornerRadius>
3535
<Grid>
3636
<TextBlock Text="{DynamicResource Note}"
37+
Style="{StaticResource TextBlockBase}"
3738
FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Center"
3839
Foreground="{DynamicResource PrimaryTextBrush}"></TextBlock>
3940

‎Ui/Controls/NoteDisplay/NoteIcon.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
</Border>
3030
<Grid Name="GridBriefNote" Visibility="Collapsed" MouseEnter="ButtonShowNote_OnMouseEnter">
3131
<TextBlock Margin="25 5 5 5"
32+
Style="{StaticResource TextBlockBase}"
3233
HorizontalAlignment="Left"
3334
MaxWidth="400"
3435
Text="{Binding Server.Note, Converter={StaticResource ConverterNoteToSingleLineNote}}"

‎Ui/Controls/ServerLineItem.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<MouseBinding Gesture="Ctrl+LeftClick" Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=serverList:ServerListPageView}, Path=DataContext.CmdTagAddIncluded}" CommandParameter="{Binding}" />
105105
<MouseBinding Gesture="Alt+LeftClick" Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=serverList:ServerListPageView}, Path=DataContext.CmdTagAddExcluded}" CommandParameter="{Binding}" />
106106
</Border.InputBindings>
107-
<TextBlock Style="{DynamicResource TextBlockBase}" Text="{Binding Name}" Foreground="{DynamicResource AccentTextBrush}"></TextBlock>
107+
<TextBlock Style="{StaticResource TextBlockBase}" Text="{Binding Name}" Foreground="{DynamicResource AccentTextBrush}"></TextBlock>
108108
</Border>
109109
</DataTemplate>
110110

@@ -181,7 +181,7 @@
181181

182182
<!--protocol name-->
183183
<TextBlock Grid.Column="1" Margin="5 0 10 0"
184-
Style="{DynamicResource TextBlockBase}"
184+
Style="{StaticResource TextBlockBase}"
185185
Text="{Binding Server.ProtocolDisplayName}"
186186
FontSize="{DynamicResource GlobalFontSizeSubtitle}" FontWeight="Bold"
187187
Opacity="0.6"
@@ -212,7 +212,7 @@
212212

213213
<!--display name-->
214214
<TextBlock Grid.Column="3" ToolTip="{Binding DisplayName}" Background="Transparent"
215-
Style="{DynamicResource TextBlockBase}"
215+
Style="{StaticResource TextBlockBase}"
216216
FontSize="{DynamicResource GlobalFontSizeSubtitle}"
217217
Margin="5 0 10 0"
218218
VerticalAlignment="Center"
@@ -242,7 +242,7 @@
242242

243243
<!--address-->
244244
<TextBlock Margin="5 0" MaxWidth="500"
245-
Style="{DynamicResource TextBlockBase}"
245+
Style="{StaticResource TextBlockBase}"
246246
Grid.Column="6"
247247
Background="Transparent"
248248
ToolTip="{Binding Server.SubTitle}"

‎Ui/Resources/Languages/cs-cz.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<s:String x:Key="server_editor_advantage_clipboard">Schránka</s:String>
166166
<s:String x:Key="server_editor_advantage_key_combinations">Kombinace kláves</s:String>
167167
<s:String x:Key="server_editor_advantage_disk_drives">Diskové jednotky</s:String>
168-
<s:String x:Key="Drives plug in latter">Drives plug in latter</s:String>
168+
<s:String x:Key="Drives plug in later">Drives plug in later</s:String>
169169
<s:String x:Key="server_editor_advantage_sounds">Zvuky</s:String>
170170
<s:String x:Key="server_editor_advantage_sounds_disabled">Vypnuto</s:String>
171171
<s:String x:Key="server_editor_advantage_sounds_on_local">Přehrávat lokálně</s:String>

‎Ui/Resources/Languages/de-de.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<s:String x:Key="server_editor_advantage_clipboard">Zwischenablage</s:String>
166166
<s:String x:Key="server_editor_advantage_key_combinations">Tastenkombinationen</s:String>
167167
<s:String x:Key="server_editor_advantage_disk_drives">Laufwerke</s:String>
168-
<s:String x:Key="Drives plug in latter">Laufwerke, die nachträglich angeschlossen wurden</s:String>
168+
<s:String x:Key="Drives plug in later">Laufwerke, die nachträglich angeschlossen wurden</s:String>
169169
<s:String x:Key="server_editor_advantage_sounds">Ton</s:String>
170170
<s:String x:Key="server_editor_advantage_sounds_disabled">Nicht wiedergeben</s:String>
171171
<s:String x:Key="server_editor_advantage_sounds_on_local">Lokal wiedergeben</s:String>

‎Ui/Resources/Languages/en-us.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<s:String x:Key="server_editor_advantage_clipboard">Clipboard</s:String>
166166
<s:String x:Key="server_editor_advantage_key_combinations">Key Combinations</s:String>
167167
<s:String x:Key="server_editor_advantage_disk_drives">Drives</s:String>
168-
<s:String x:Key="Drives plug in latter">Drives plug in latter</s:String>
168+
<s:String x:Key="Drives plug in later">Drives plug in later</s:String>
169169
<s:String x:Key="server_editor_advantage_sounds">Sounds</s:String>
170170
<s:String x:Key="server_editor_advantage_sounds_disabled">Disabled</s:String>
171171
<s:String x:Key="server_editor_advantage_sounds_on_local">Play on local</s:String>

‎Ui/Resources/Languages/fr-fr.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<s:String x:Key="server_editor_advantage_clipboard">Presse-papiers</s:String>
166166
<s:String x:Key="server_editor_advantage_key_combinations">Combinaisons de clés</s:String>
167167
<s:String x:Key="server_editor_advantage_disk_drives">Disques durs</s:String>
168-
<s:String x:Key="Drives plug in latter">Drives plug in latter</s:String>
168+
<s:String x:Key="Drives plug in later">Drives plug in later</s:String>
169169
<s:String x:Key="server_editor_advantage_sounds">Sons</s:String>
170170
<s:String x:Key="server_editor_advantage_sounds_disabled">Désactivée</s:String>
171171
<s:String x:Key="server_editor_advantage_sounds_on_local">Jouez en local</s:String>

‎Ui/Resources/Languages/gl-es.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<s:String x:Key="server_editor_advantage_clipboard">Portapapeis</s:String>
166166
<s:String x:Key="server_editor_advantage_key_combinations">Combiacións de teclas</s:String>
167167
<s:String x:Key="server_editor_advantage_disk_drives">Unidades</s:String>
168-
<s:String x:Key="Drives plug in latter">Conectar unidades máis tarde</s:String>
168+
<s:String x:Key="Drives plug in later">Conectar unidades máis tarde</s:String>
169169
<s:String x:Key="server_editor_advantage_sounds">Sons</s:String>
170170
<s:String x:Key="server_editor_advantage_sounds_disabled">Deshabilitado</s:String>
171171
<s:String x:Key="server_editor_advantage_sounds_on_local">Soar en local</s:String>

‎Ui/Resources/Languages/glossary.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ server_editor_advantage_resources;Resources;共享到远程桌面;Prostředky;Re
165165
server_editor_advantage_clipboard;Clipboard;剪贴板;Schránka;Zwischenablage;Presse-papiers;Área de transferência;クリップボード;剪貼簿;Portapapeis;Schowek;Буфер обмена
166166
server_editor_advantage_key_combinations;Key Combinations;组合键;Kombinace kláves;Tastenkombinationen;Combinaisons de clés;Combinações de teclas;キーの組み合わせ;按鍵組合;Combiacións de teclas;Kombinacje klawiszy;Комбинации клавиш
167167
server_editor_advantage_disk_drives;Drives;本地磁盘;Diskové jednotky;Laufwerke;Disques durs;Unidades de disco;ドライブ;本機磁碟;Unidades;Dyski;Диски
168-
Drives plug in latter;Drives plug in latter;稍后插入的U盘;Drives plug in latter;Laufwerke, die nachträglich angeschlossen wurden;Drives plug in latter;Drives plug in latter;後で接続したドライブ;稍後連接的磁碟機;Conectar unidades máis tarde;Dyski podłączone później;Диски подключаются позже
168+
Drives plug in later;Drives plug in later;稍后插入的U盘;Drives plug in later;Laufwerke, die nachträglich angeschlossen wurden;Drives plug in later;Drives plug in later;後で接続したドライブ;稍後連接的磁碟機;Conectar unidades máis tarde;Dyski podłączone później;Диски подключаются позже
169169
server_editor_advantage_sounds;Sounds;声音;Zvuky;Ton;Sons;Sons;リモートのオーディオ;音效;Sons;Dźwięk;Звуки
170170
server_editor_advantage_sounds_disabled;Disabled;禁用;Vypnuto;Nicht wiedergeben;Désactivée;Desabilitado;出力しない;停用;Deshabilitado;Dezaktywowane;Выключены
171171
server_editor_advantage_sounds_on_local;Play on local;在本地播放;Přehrávat lokálně;Lokal wiedergeben;Jouez en local;Rode localmente;このコンピューターで出力する;在本機播放;Soar en local;Słuchaj na lokalym;Проигрывать на локальном ПК

0 commit comments

Comments
 (0)