Skip to content

Commit

Permalink
fix: correct long-standing spelling mistakes
Browse files Browse the repository at this point in the history
  • Loading branch information
yuto-trd committed Jan 8, 2025
1 parent b925d75 commit 048a483
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 28 deletions.
10 changes: 5 additions & 5 deletions src/Beutl/Pages/SettingsDialog.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private static List<NavigationViewItem> GetItems()
new NavigationViewItem()
{
Content = Strings.Info,
Tag = typeof(InfomationPage),
Tag = typeof(InformationPage),
IconSource = new FluentIcons.FluentAvalonia.SymbolIconSource()
{
Symbol = FluentIcons.Common.Symbol.Info
Expand Down Expand Up @@ -164,7 +164,7 @@ private void OnItemInvoked(NavigationViewItem nvi)
"EditorSettingsPage" => settingsPage.Editor,
"FontSettingsPage" => settingsPage.Font,
"ExtensionsSettingsPage" => settingsPage.ExtensionsPage,
"InfomationPage" => settingsPage.Infomation,
"InformationPage" => settingsPage.Information,
"KeyMapSettingsPage" => settingsPage.KeyMap,
_ => null,
};
Expand Down Expand Up @@ -203,7 +203,7 @@ public int GetDepth(Type pagetype)
|| pagetype == typeof(KeyMapSettingsPage)
|| pagetype == typeof(FontSettingsPage)
|| pagetype == typeof(ExtensionsSettingsPage)
|| pagetype == typeof(InfomationPage))
|| pagetype == typeof(InformationPage))
{
return 0;
}
Expand Down Expand Up @@ -232,7 +232,7 @@ public int GetOrder(Type pagetype)
"ExtensionsSettingsPage" or "EditorExtensionPriorityPage" or "DecoderPriorityPage"
or "AnExtensionSettingsPage" => 5,
"StorageSettingsPage" or "StorageDetailPage" => 6,
"InfomationPage" or "TelemetrySettingsPage" => 7,
"InformationPage" or "TelemetrySettingsPage" => 7,
_ => 0,
};
}
Expand All @@ -251,7 +251,7 @@ public Type GetPageType(Type contextType)
"DecoderPriorityPageViewModel" => typeof(DecoderPriorityPage),
"TelemetrySettingsPageViewModel" => typeof(TelemetrySettingsPage),
"AnExtensionSettingsPageViewModel" => typeof(AnExtensionSettingsPage),
_ => typeof(InfomationPage),
_ => typeof(InformationPage),
};
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<UserControl x:Class="Beutl.Pages.SettingsPages.InfomationPage"
<UserControl x:Class="Beutl.Pages.SettingsPages.InformationPage"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ctrls="using:Beutl.Controls"
Expand All @@ -11,7 +11,7 @@
d:DesignHeight="700"
d:DesignWidth="800"
x:CompileBindings="True"
x:DataType="viewModel:InfomationPageViewModel"
x:DataType="viewModel:InformationPageViewModel"
mc:Ignorable="d">
<ScrollViewer Padding="18">
<StackPanel Margin="10,0"
Expand Down Expand Up @@ -82,7 +82,7 @@
</ctrls:OptionsDisplayItem.Content>
</ctrls:OptionsDisplayItem>
<ctrls:OptionsDisplayItem Expands="True"
Header="{x:Static lang:SettingsPage.DeviceInfomation}"
Header="{x:Static lang:SettingsPage.DeviceInformation}"
IsExpanded="True">
<ctrls:OptionsDisplayItem.Icon>
<icons:SymbolIcon Symbol="Desktop" />
Expand All @@ -99,7 +99,7 @@
<SelectableTextBlock Grid.Column="1" Text="{Binding GlVersion.Value}" />
</Grid>
<Grid RowDefinitions="Auto,Auto">
<TextBlock Text="{x:Static lang:SettingsPage.GpuInfomation}" />
<TextBlock Text="{x:Static lang:SettingsPage.GpuInformation}" />
<SelectableTextBlock Grid.Row="1"
Margin="16,0"
FontFamily="Cascadia Code,Consolas,Menlo,Monospace"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@

namespace Beutl.Pages.SettingsPages;

public sealed partial class InfomationPage : UserControl
public sealed partial class InformationPage : UserControl
{
public InfomationPage()
public InformationPage()
{
InitializeComponent();
}

private async void CopyVersion_Click(object? sender, RoutedEventArgs e)
{
if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard
&& DataContext is InfomationPageViewModel vm)
&& DataContext is InformationPageViewModel vm)
{
await clipboard.SetTextAsync(vm.BuildMetadata);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl/Pages/SettingsPages/ViewSettingsPage.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

<TextBlock Margin="4,16,0,4"
IsVisible="{Binding UseCustomAccent.Value}"
Text="{x:Static lang:Strings.ColorPallete}" />
Text="{x:Static lang:Strings.ColorPalette}" />

<ListBox MaxWidth="441"
Margin="4,0,4,12"
Expand Down
5 changes: 0 additions & 5 deletions src/Beutl/Services/OutputService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@ public sealed class OutputService(EditViewModel editViewModel)

public void AddItem(string file, OutputExtension extension)
{
if (Items.Any(x => x.Context.TargetFile == file))
{
throw new Exception("Already added");
}

if (!extension.TryCreateContext(file, out IOutputContext? context))
{
throw new Exception("Failed to create context");
Expand Down
8 changes: 4 additions & 4 deletions src/Beutl/ViewModels/SettingsDialogViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public sealed class SettingsDialogViewModel
private readonly Lazy<EditorSettingsPageViewModel> _editor;
private readonly Lazy<FontSettingsPageViewModel> _font;
private readonly Lazy<ExtensionsSettingsPageViewModel> _extensionsPage;
private readonly Lazy<InfomationPageViewModel> _infomation;
private readonly Lazy<InformationPageViewModel> _information;
private readonly Lazy<KeyMapSettingsPageViewModel> _keyMap;

public SettingsDialogViewModel(BeutlApiApplication clients)
Expand All @@ -24,7 +24,7 @@ public SettingsDialogViewModel(BeutlApiApplication clients)
_view = new(() => new ViewSettingsPageViewModel(_editor));
_font = new(() => new FontSettingsPageViewModel());
_extensionsPage = new(() => new ExtensionsSettingsPageViewModel());
_infomation = new(() => new InfomationPageViewModel());
_information = new(() => new InformationPageViewModel());
_keyMap = new(() => new KeyMapSettingsPageViewModel(clients.GetResource<ContextCommandManager>()));
}

Expand All @@ -38,15 +38,15 @@ public SettingsDialogViewModel(BeutlApiApplication clients)

public ExtensionsSettingsPageViewModel ExtensionsPage => _extensionsPage.Value;

public InfomationPageViewModel Infomation => _infomation.Value;
public InformationPageViewModel Information => _information.Value;

public KeyMapSettingsPageViewModel KeyMap => _keyMap.Value;

public IObservable<object> NavigateRequested => _navigateRequested;

public void GoToSettingsPage()
{
_navigateRequested.OnNext(Infomation);
_navigateRequested.OnNext(Information);
}

public void GoToAccountSettingsPage()
Expand Down
6 changes: 3 additions & 3 deletions src/Beutl/ViewModels/SettingsPages/InfomationPageViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

namespace Beutl.ViewModels.SettingsPages;

public sealed class InfomationPageViewModel : PageContext
public sealed class InformationPageViewModel : PageContext
{
private TelemetrySettingsPageViewModel? _telemetry;

public InfomationPageViewModel()
public InformationPageViewModel()
{
RenderThread.Dispatcher.Dispatch(() =>
{
Expand All @@ -42,7 +42,7 @@ await nav.NavigateAsync(
() => Telemetry);
});

BuildMetadata = typeof(InfomationPageViewModel).Assembly
BuildMetadata = typeof(InformationPageViewModel).Assembly
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
?.InformationalVersion ?? "Unknown";
}
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl/Views/Dialogs/AddOutputProfileDialog.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="using:FluentAvalonia.UI.Controls"
xmlns:vm="using:Beutl.ViewModels.Dialogs"
Title="{x:Static lang:Strings.AddOutputQueue}"
Title="{x:Static lang:Strings.AddOutputProfile}"
d:DesignHeight="450"
d:DesignWidth="800"
x:CompileBindings="True"
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl/Views/MainView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
<MenuItem Click="ThrowUnhandledException_Click"
Header="Throw Unhandled Exception"
IsVisible="{Binding IsDebuggerAttached}" />
<MenuItem Click="GoToInfomationPage" Header="{x:Static lang:Strings.Info}" />
<MenuItem Click="GoToInformationPage" Header="{x:Static lang:Strings.Info}" />
</MenuItem>
</Menu>

Expand Down
2 changes: 1 addition & 1 deletion src/Beutl/Views/MainView.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ private void ThrowUnhandledException_Click(object? sender, RoutedEventArgs e)
throw new Exception("An unhandled exception occurred.");
}

private async void GoToInfomationPage(object? sender, RoutedEventArgs e)
private async void GoToInformationPage(object? sender, RoutedEventArgs e)
{
if (DataContext is MainViewModel viewModel && TopLevel.GetTopLevel(this) is Window window)
{
Expand Down

0 comments on commit 048a483

Please sign in to comment.