diff --git a/FluentTerminal.App.Services/Utilities/StringsHelper.cs b/FluentTerminal.App.Services/Utilities/StringsHelper.cs new file mode 100644 index 0000000..c9b45aa --- /dev/null +++ b/FluentTerminal.App.Services/Utilities/StringsHelper.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Windows.ApplicationModel.Resources; + +namespace FluentTerminal.App.Services.Utilities +{ + /// + /// Get strings in different languages. + /// Author: Zuozishi + /// + public static class StringsHelper + { + public static string GetString(string resource) + { + var resourceLoader = ResourceLoader.GetForCurrentView(); + return resourceLoader.GetString(resource); + } + } +} diff --git a/FluentTerminal.App.ViewModels/MainViewModel.cs b/FluentTerminal.App.ViewModels/MainViewModel.cs index 2f66782..95361cd 100644 --- a/FluentTerminal.App.ViewModels/MainViewModel.cs +++ b/FluentTerminal.App.ViewModels/MainViewModel.cs @@ -10,7 +10,8 @@ using System.Collections.Specialized; using System.Linq; using System.Threading.Tasks; using FluentTerminal.App.Services.Implementation; - +using FluentTerminal.App.Services.Utilities; + namespace FluentTerminal.App.ViewModels { public class MainViewModel : ViewModelBase @@ -245,7 +246,7 @@ namespace FluentTerminal.App.ViewModels var error = profile.ValidateAndGetErrors(); if( ! String.IsNullOrEmpty(error) ) { - await _dialogService.ShowMessageDialogAsnyc("Error", "The operation cannot be completed due to the following error: " + error, DialogButton.OK).ConfigureAwait(false); + await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("Error"), StringsHelper.GetString("ErrorString1") + error, DialogButton.OK).ConfigureAwait(false); } else { @@ -358,7 +359,7 @@ namespace FluentTerminal.App.ViewModels { if (_applicationSettings.ConfirmClosingWindows) { - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this window?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmCloseWindow"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false); if (result == DialogButton.OK) { diff --git a/FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs b/FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs index ad67182..01b7020 100644 --- a/FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs +++ b/FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs @@ -1,4 +1,5 @@ using FluentTerminal.App.Services; +using FluentTerminal.App.Services.Utilities; using FluentTerminal.Models; using FluentTerminal.Models.Enums; using GalaSoft.MvvmLight; @@ -281,7 +282,7 @@ namespace FluentTerminal.App.ViewModels.Settings private async Task RestoreDefaults() { - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the general settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmRestoreGeneralSettings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.OK) { @@ -317,13 +318,13 @@ namespace FluentTerminal.App.ViewModels.Settings case StartupTaskStatus.DisabledByUser: StartupTaskEnabled = false; - StartupTaskErrorMessage = "Disabled by user. Please reactivate it in the Startup tab of the Task Manager."; + StartupTaskErrorMessage = StringsHelper.GetString("DisabledByUser"); CanEnableStartupTask = false; break; case StartupTaskStatus.DisabledByPolicy: StartupTaskEnabled = false; - StartupTaskErrorMessage = "Disabled by policy."; + StartupTaskErrorMessage = StringsHelper.GetString("DisabledByPolicy"); CanEnableStartupTask = false; break; } diff --git a/FluentTerminal.App.ViewModels/Settings/KeyBindingViewModel.cs b/FluentTerminal.App.ViewModels/Settings/KeyBindingViewModel.cs index 92bad7b..7c4ad92 100644 --- a/FluentTerminal.App.ViewModels/Settings/KeyBindingViewModel.cs +++ b/FluentTerminal.App.ViewModels/Settings/KeyBindingViewModel.cs @@ -1,4 +1,5 @@ using FluentTerminal.App.Services; +using FluentTerminal.App.Services.Utilities; using FluentTerminal.App.ViewModels.Infrastructure; using FluentTerminal.Models; using GalaSoft.MvvmLight; @@ -118,7 +119,7 @@ namespace FluentTerminal.App.ViewModels.Settings private async Task Delete() { - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this keybinding?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmDeleteKeybindings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.OK) { diff --git a/FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs b/FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs index 67e2b14..ee6c847 100644 --- a/FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs +++ b/FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs @@ -61,7 +61,7 @@ namespace FluentTerminal.App.ViewModels.Settings foreach (var value in Enum.GetValues(typeof(Command))) { var command = (Command)value; - var viewModel = new KeyBindingsViewModel(command.ToString(), _dialogService, EnumHelper.GetEnumDescription(command), true); + var viewModel = new KeyBindingsViewModel(command.ToString(), _dialogService, StringsHelper.GetString(EnumHelper.GetEnumDescription(command)), true); foreach (var keyBinding in _keyBindings[command.ToString()]) { viewModel.Add(keyBinding); @@ -79,7 +79,7 @@ namespace FluentTerminal.App.ViewModels.Settings private async Task RestoreDefaults() { - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the default keybindings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmRestoreKeybindings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.OK) { diff --git a/FluentTerminal.App.ViewModels/Settings/MousePageViewModel.cs b/FluentTerminal.App.ViewModels/Settings/MousePageViewModel.cs index f523d68..5337ffe 100644 --- a/FluentTerminal.App.ViewModels/Settings/MousePageViewModel.cs +++ b/FluentTerminal.App.ViewModels/Settings/MousePageViewModel.cs @@ -1,4 +1,5 @@ using FluentTerminal.App.Services; +using FluentTerminal.App.Services.Utilities; using FluentTerminal.Models; using FluentTerminal.Models.Enums; using GalaSoft.MvvmLight; @@ -121,7 +122,7 @@ namespace FluentTerminal.App.ViewModels.Settings private async Task RestoreDefaults() { - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the mouse settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmRestoreMouseSettings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.OK) { diff --git a/FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs b/FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs index c5af0b2..8f56c18 100644 --- a/FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs +++ b/FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs @@ -1,4 +1,5 @@ using FluentTerminal.App.Services; +using FluentTerminal.App.Services.Utilities; using FluentTerminal.Models; using FluentTerminal.Models.Enums; using GalaSoft.MvvmLight; @@ -224,7 +225,7 @@ namespace FluentTerminal.App.ViewModels.Settings private async Task RestoreDefaults() { - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the default terminal options?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmRestoreTerminalOptions"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.OK) { diff --git a/FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs b/FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs index d0efee4..c9fe127 100644 --- a/FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs +++ b/FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs @@ -1,4 +1,5 @@ using FluentTerminal.App.Services; +using FluentTerminal.App.Services.Utilities; using FluentTerminal.Models; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; @@ -118,7 +119,7 @@ namespace FluentTerminal.App.ViewModels.Settings if (parser == null) { - await _dialogService.ShowMessageDialogAsnyc("Import theme failed", "No suitable parser found", DialogButton.OK).ConfigureAwait(false); + await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("ImportThemeFailed"), StringsHelper.GetString("NoSuitableParserFound"), DialogButton.OK).ConfigureAwait(false); return; } @@ -130,7 +131,7 @@ namespace FluentTerminal.App.ViewModels.Settings } catch (Exception exception) { - await _dialogService.ShowMessageDialogAsnyc("Import theme failed", exception.Message, DialogButton.OK).ConfigureAwait(false); + await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("ImportThemeFailed"), exception.Message, DialogButton.OK).ConfigureAwait(false); } } } diff --git a/FluentTerminal.App.ViewModels/ShellProfileViewModel.cs b/FluentTerminal.App.ViewModels/ShellProfileViewModel.cs index 8f185e5..710101f 100644 --- a/FluentTerminal.App.ViewModels/ShellProfileViewModel.cs +++ b/FluentTerminal.App.ViewModels/ShellProfileViewModel.cs @@ -1,4 +1,5 @@ using FluentTerminal.App.Services; +using FluentTerminal.App.Services.Utilities; using FluentTerminal.App.ViewModels.Infrastructure; using FluentTerminal.App.ViewModels.Settings; using FluentTerminal.Models; @@ -250,7 +251,7 @@ namespace FluentTerminal.App.ViewModels throw new InvalidOperationException(); } - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore this profile?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmRestoreProfile"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.OK) { @@ -305,7 +306,7 @@ namespace FluentTerminal.App.ViewModels if (!_fallbackProfile.Equals(changedProfile)) { - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmDiscardChanges"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.OK) { @@ -342,7 +343,7 @@ namespace FluentTerminal.App.ViewModels private async Task Delete() { - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this theme?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmDeleteTheme"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.OK) { diff --git a/FluentTerminal.App.ViewModels/TerminalViewModel.cs b/FluentTerminal.App.ViewModels/TerminalViewModel.cs index a62ca81..3b6d47c 100644 --- a/FluentTerminal.App.ViewModels/TerminalViewModel.cs +++ b/FluentTerminal.App.ViewModels/TerminalViewModel.cs @@ -1,4 +1,5 @@ using FluentTerminal.App.Services; +using FluentTerminal.App.Services.Utilities; using FluentTerminal.App.ViewModels.Infrastructure; using FluentTerminal.Models; using FluentTerminal.Models.Enums; @@ -217,7 +218,7 @@ namespace FluentTerminal.App.ViewModels public async Task EditTitle() { - var result = await DialogService.ShowInputDialogAsync("Edit Title"); + var result = await DialogService.ShowInputDialogAsync(StringsHelper.GetString("EditTitleString")); if (result != null) { if (string.IsNullOrWhiteSpace(result)) @@ -310,7 +311,7 @@ namespace FluentTerminal.App.ViewModels ClipboardService.SetText(selection); if(_terminalOptions.ShowTextCopied) { - Overlay.Show("Text copied"); + Overlay.Show(StringsHelper.GetString("TextCopied")); } break; } @@ -374,7 +375,7 @@ namespace FluentTerminal.App.ViewModels { if (ApplicationSettings.ConfirmClosingTabs) { - var result = await DialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this tab?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await DialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmCloseTab"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.Cancel) { diff --git a/FluentTerminal.App.ViewModels/ThemeViewModel.cs b/FluentTerminal.App.ViewModels/ThemeViewModel.cs index 91fbf99..547524a 100644 --- a/FluentTerminal.App.ViewModels/ThemeViewModel.cs +++ b/FluentTerminal.App.ViewModels/ThemeViewModel.cs @@ -344,7 +344,7 @@ namespace FluentTerminal.App.ViewModels if (!_fallbackTheme.Equals(changedTheme)) { - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmDiscardChanges"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.OK) { @@ -392,7 +392,7 @@ namespace FluentTerminal.App.ViewModels private async Task Delete() { - var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this theme?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); + var result = await _dialogService.ShowMessageDialogAsnyc(StringsHelper.GetString("PleaseConfirm"), StringsHelper.GetString("ConfirmDeleteTheme"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true); if (result == DialogButton.OK) { diff --git a/FluentTerminal.App/App.xaml.cs b/FluentTerminal.App/App.xaml.cs index a54c1c5..9d4b797 100644 --- a/FluentTerminal.App/App.xaml.cs +++ b/FluentTerminal.App/App.xaml.cs @@ -66,7 +66,6 @@ namespace FluentTerminal.App ShellProfiles = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings.CreateContainer(Constants.ShellProfilesContainerName, ApplicationDataCreateDisposition.Always)), Themes = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.ThemesContainerName, ApplicationDataCreateDisposition.Always)) }; - var builder = new ContainerBuilder(); builder.RegisterType().As().SingleInstance(); builder.RegisterType().As().SingleInstance(); diff --git a/FluentTerminal.App/Dialogs/CreateKeyBindingDialog.xaml b/FluentTerminal.App/Dialogs/CreateKeyBindingDialog.xaml index 77e8cc1..cf0a012 100644 --- a/FluentTerminal.App/Dialogs/CreateKeyBindingDialog.xaml +++ b/FluentTerminal.App/Dialogs/CreateKeyBindingDialog.xaml @@ -10,7 +10,7 @@ SecondaryButtonText="Cancel" mc:Ignorable="d"> - + diff --git a/FluentTerminal.App/Dialogs/CreateKeyBindingDialog.xaml.cs b/FluentTerminal.App/Dialogs/CreateKeyBindingDialog.xaml.cs index 8b94ec8..db1ecfd 100644 --- a/FluentTerminal.App/Dialogs/CreateKeyBindingDialog.xaml.cs +++ b/FluentTerminal.App/Dialogs/CreateKeyBindingDialog.xaml.cs @@ -1,4 +1,5 @@ using FluentTerminal.App.Services.Dialogs; +using FluentTerminal.App.Services.Utilities; using FluentTerminal.Models; using GalaSoft.MvvmLight.Command; using System; @@ -55,6 +56,9 @@ namespace FluentTerminal.App.Dialogs ResetCommand = new RelayCommand(Reset); PreviewKeyDown += RegisterKeyBindingDialog_PreviewKeyDown; Reset(); + + this.PrimaryButtonText = StringsHelper.GetString("OK"); + this.SecondaryButtonText = StringsHelper.GetString("Cancel"); } public RelayCommand ResetCommand { get; } diff --git a/FluentTerminal.App/Dialogs/InputDialog.xaml.cs b/FluentTerminal.App/Dialogs/InputDialog.xaml.cs index 36fa141..535d3d2 100644 --- a/FluentTerminal.App/Dialogs/InputDialog.xaml.cs +++ b/FluentTerminal.App/Dialogs/InputDialog.xaml.cs @@ -4,6 +4,7 @@ using Windows.UI.Xaml.Controls; using System; using Windows.UI.Xaml.Input; using Windows.System; +using FluentTerminal.App.Services.Utilities; namespace FluentTerminal.App.Dialogs { @@ -16,6 +17,8 @@ namespace FluentTerminal.App.Dialogs public InputDialog() { this.InitializeComponent(); + this.PrimaryButtonText = StringsHelper.GetString("OK"); + this.CloseButtonText = StringsHelper.GetString("Cancel"); } public async Task GetInput() diff --git a/FluentTerminal.App/Dialogs/ShellProfileSelectionDialog.xaml b/FluentTerminal.App/Dialogs/ShellProfileSelectionDialog.xaml index 8d3255c..250b114 100644 --- a/FluentTerminal.App/Dialogs/ShellProfileSelectionDialog.xaml +++ b/FluentTerminal.App/Dialogs/ShellProfileSelectionDialog.xaml @@ -4,6 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + x:Uid="SelectProfileUI" Title="Select Profile" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" CloseButtonText="Cancel" diff --git a/FluentTerminal.App/FluentTerminal.App.csproj b/FluentTerminal.App/FluentTerminal.App.csproj index 30d55f3..48c47c1 100644 --- a/FluentTerminal.App/FluentTerminal.App.csproj +++ b/FluentTerminal.App/FluentTerminal.App.csproj @@ -245,6 +245,8 @@ + + diff --git a/FluentTerminal.App/Strings/en/Resources.resw b/FluentTerminal.App/Strings/en/Resources.resw new file mode 100644 index 0000000..d133371 --- /dev/null +++ b/FluentTerminal.App/Strings/en/Resources.resw @@ -0,0 +1,864 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + About + MainPage.xaml + + + Always show tabs + GeneralSettings.xaml + + + Off + GeneralSettings.xaml + + + On + GeneralSettings.xaml + + + Background + GeneralSettings.xaml + + + Blue + TabBar.xaml + + + Close + TabBar.xaml + + + Ask before closing windows + GeneralSettings.xaml + + + Off + GeneralSettings.xaml + + + On + GeneralSettings.xaml + + + Ask before closing tabs + GeneralSettings.xaml + + + Off + GeneralSettings.xaml + + + On + GeneralSettings.xaml + + + Color + TabBar.xaml + + + Color on inactive tabs + GeneralSettings.xaml + + + Copy + XtermTerminalView.xaml.cs + + + Show custom tab title also in titlebar + GeneralSettings.xaml + + + Off + GeneralSettings.xaml + + + On + GeneralSettings.xaml + + + Edit Title + TabBar.xaml + + + General + GeneralSettings.xaml + + + Green + TabBar.xaml + + + Show new output indicator on background tabs + GeneralSettings.xaml + + + Off + GeneralSettings.xaml + + + On + GeneralSettings.xaml + + + Relaunch required to apply setting + GeneralSettings.xaml + + + New tab + MainPage.xaml + + + None + TabBar.xaml + + + Tabs + GeneralSettings.xaml + + + Windows + GeneralSettings.xaml + + + Open new terminals as + GeneralSettings.xaml + + + Orange + TabBar.xaml + + + Paste + XtermTerminalView.xaml.cs + + + Purple + TabBar.xaml + + + Red + TabBar.xaml + + + Restore Defaults + GeneralSettings.xaml + + + Run on startup + GeneralSettings.xaml + + + Off + GeneralSettings.xaml + + + On + GeneralSettings.xaml + + + Settings + SettingsPage.xaml.cs + + + Settings + MainPage.xaml + + + Show in system tray + GeneralSettings.xaml + + + Off + GeneralSettings.xaml + + + On + GeneralSettings.xaml + + + Show tabs on + GeneralSettings.xaml + + + Teal + TabBar.xaml + + + Bottom + GeneralSettings.xaml + + + Top + GeneralSettings.xaml + + + Underline + GeneralSettings.xaml + + + Underline selected tab + GeneralSettings.xaml + + + Off + GeneralSettings.xaml + + + On + GeneralSettings.xaml + + + Windows 10 1809+: Always use WinPty + GeneralSettings.xaml + + + Off + GeneralSettings.xaml + + + On + GeneralSettings.xaml + + + About + SettingsPage.xaml + + + General + SettingsPage.xaml + + + Keybindings + SettingsPage.xaml + + + Mouse + SettingsPage.xaml + + + Profiles + SettingsPage.xaml + + + Terminal + SettingsPage.xaml + + + Themes + SettingsPage.xaml + + + Add + ShellProfileSettings.xaml + + + Arguments + ShellProfileSettings.xaml + + + Background opacity + TerminalSettings.xaml + + + Blinking cursor + TerminalSettings.xaml + + + Off + TerminalSettings.xaml + + + On + TerminalSettings.xaml + + + Bold text + TerminalSettings.xaml + + + Off + TerminalSettings.xaml + + + On + TerminalSettings.xaml + + + Cancel + ShellProfileSettings.xaml + + + Checking for updates... + About.xaml + + + Check for updates + About.xaml + + + Click on a color to edit + ThemeSettings.xaml + + + Clone + ShellProfileSettings.xaml + + + Color palette + ThemeSettings.xaml + + + Text copied notification + TerminalSettings.xaml + + + Off + TerminalSettings.xaml + + + On + TerminalSettings.xaml + + + Copy on select + MouseSettings.xaml + + + Off + MouseSettings.xaml + + + On + MouseSettings.xaml + + + Create new + ShellProfileSettings.xaml + + + Current version + About.xaml + + + Bar + TerminalSettings.xaml + + + Block + TerminalSettings.xaml + + + Cursor style + TerminalSettings.xaml + + + Underline + TerminalSettings.xaml + + + Delete + ShellProfileSettings.xaml + + + Do not modify line endings + ShellProfileSettings.xaml + + + Edit + ShellProfileSettings.xaml + + + Export + ThemeSettings.xaml + + + Font family + TerminalSettings.xaml + + + Font size + TerminalSettings.xaml + + + Import + ThemeSettings.xaml + + + Keyboard shortcut + ShellProfileSettings.xaml + + + Keyboard shortcut + ShellProfileSettings.xaml + + + Latest version + About.xaml + + + License + About.xaml + + + Line ending translation mode + ShellProfileSettings.xaml + + + Line ending translation mode on paste + ShellProfileSettings.xaml + + + Middle button action + MouseSettings.xaml + + + Mouse + MouseSettings.xaml + + + Context menu + MouseSettings.xaml + + + Nothing + MouseSettings.xaml + + + Paste + MouseSettings.xaml + + + Create new + ThemeSettings.xaml + + + Padding + TerminalSettings.xaml + + + Name + ShellProfileSettings.xaml + + + Profiles + ShellProfileSettings.xaml + + + Theme + ShellProfileSettings.xaml + + + Release notes + About.xaml + + + Right button action + MouseSettings.xaml + + + Save + ShellProfileSettings.xaml + + + Scrollback limit + TerminalSettings.xaml + + + Auto hiding + TerminalSettings.xaml + + + Hidden + TerminalSettings.xaml + + + Scrollbar style + TerminalSettings.xaml + + + Visible + TerminalSettings.xaml + + + Set Active + ThemeSettings.xaml + + + Set Default + ShellProfileSettings.xaml + + + Shell executable location + ShellProfileSettings.xaml + + + Tab color + ShellProfileSettings.xaml + + + Terminal + TerminalSettings.xaml + + + Theme + ThemeSettings.xaml + + + Author + ThemeSettings.xaml + + + Name + ThemeSettings.xaml + + + Convert line endings to CR + ShellProfileSettings.xaml + + + Convert line endings to CR+LF + ShellProfileSettings.xaml + + + Convert line endings to LF + ShellProfileSettings.xaml + + + Working directory + ShellProfileSettings.xaml + + + Are you sure you want to close this tab? + ViewModel + + + Are you sure you want to close this window? + ViewModel + + + Are you sure you want to delete this keybinding? + ViewModel + + + Are you sure you want to delete this theme? + ViewModel + + + Are you sure you want to discard all changes? + ViewModel + + + Are you sure you want to restore the general settings? + ViewModel + + + Are you sure you want to restore the default keybindings? + ViewModel + + + Are you sure you want to restore the mouse settings? + ViewModel + + + Are you sure you want to restore this profile? + ViewModel + + + Are you sure you want to restore the default terminal options? + ViewModel + + + Disabled by policy. + ViewModel + + + Disabled by user. Please reactivate it in the Startup tab of the Task Manager. + ViewModel + + + Edit Title + ViewModel + + + Error + ViewModel + + + The operation cannot be completed due to the following error: + ViewModel + + + Import theme failed + ViewModel + + + No suitable parser found + ViewModel + + + Please confirm + ViewModel + + + Cancel + + + Enter your keybinding now + + + OK + + + Reset + + + Text copied + ViewModel + + + Add + KeyBindingSettings.xaml + + + Change tab title + Command + + + Clear + Command + + + Close tab + Command + + + Configurable new tab + Command + + + Configurable new window + Command + + + Keybindings + KeyBindingSettings.xaml + + + Delete + KeyBindingsView.xaml + + + Edit + KeyBindingsView.xaml + + + New remote tab + Command + + + New tab + Command + + + New window + Command + + + Next tab + Command + + + Paste without newlines + Command + + + Previous tab + Command + + + Search + Command + + + Select all + Command + + + Cancel + ShellProfileSelectionDialog.xaml + + + Start + ShellProfileSelectionDialog.xaml + + + Select Profile + ShellProfileSelectionDialog.xaml + + + Show settings + Command + + + Switch to Terminal 1 + Command + + + Switch to Terminal 2 + Command + + + Switch to Terminal 3 + Command + + + Switch to Terminal 4 + Command + + + Switch to Terminal 5 + Command + + + Switch to Terminal 6 + Command + + + Switch to Terminal 7 + Command + + + Switch to Terminal 8 + Command + + + Switch to Terminal 9 + Command + + + Toggle Fullscreen + Command + + + Toggle window + Command + + \ No newline at end of file diff --git a/FluentTerminal.App/Strings/zh-CN/Resources.resw b/FluentTerminal.App/Strings/zh-CN/Resources.resw new file mode 100644 index 0000000..9fb94af --- /dev/null +++ b/FluentTerminal.App/Strings/zh-CN/Resources.resw @@ -0,0 +1,864 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 关于 + MainPage.xaml + + + 始终显示标签栏 + GeneralSettings.xaml + + + 关 + GeneralSettings.xaml + + + 开 + GeneralSettings.xaml + + + 背景色 + GeneralSettings.xaml + + + 蓝色 + TabBar.xaml + + + 关闭 + TabBar.xaml + + + 在关闭窗口之前询问 + GeneralSettings.xaml + + + 关 + GeneralSettings.xaml + + + 开 + GeneralSettings.xaml + + + 在关闭标签页之前询问 + GeneralSettings.xaml + + + 关 + GeneralSettings.xaml + + + 开 + GeneralSettings.xaml + + + 标签颜色 + TabBar.xaml + + + 非活动选项卡上的颜色 + GeneralSettings.xaml + + + 复制 + XtermTerminalView.xaml.cs + + + 在标题栏显示自定义标题 + GeneralSettings.xaml + + + 关 + GeneralSettings.xaml + + + 开 + GeneralSettings.xaml + + + 修改标题 + TabBar.xaml + + + 常规 + GeneralSettings.xaml + + + 绿色 + TabBar.xaml + + + 非活动选项卡输出提示 + GeneralSettings.xaml + + + 关 + GeneralSettings.xaml + + + 开 + GeneralSettings.xaml + + + 下次启动生效 + GeneralSettings.xaml + + + 新标签页 + MainPage.xaml + + + 无 + TabBar.xaml + + + 新的标签页 + GeneralSettings.xaml + + + 新的窗口 + GeneralSettings.xaml + + + 打开新的终端 + GeneralSettings.xaml + + + 橙色 + TabBar.xaml + + + 粘贴 + XtermTerminalView.xaml.cs + + + 紫色 + TabBar.xaml + + + 红色 + TabBar.xaml + + + 恢复默认 + GeneralSettings.xaml + + + 开机自启 + GeneralSettings.xaml + + + 关 + GeneralSettings.xaml + + + 开 + GeneralSettings.xaml + + + 设置 + SettingsPage.xaml.cs + + + 设置 + MainPage.xaml + + + 在系统托盘中显示 + GeneralSettings.xaml + + + 关 + GeneralSettings.xaml + + + 开 + GeneralSettings.xaml + + + 标签栏位置 + GeneralSettings.xaml + + + 青色 + TabBar.xaml + + + 底部 + GeneralSettings.xaml + + + 顶部 + GeneralSettings.xaml + + + 下划线 + GeneralSettings.xaml + + + 当前标签栏下划线 + GeneralSettings.xaml + + + 关 + GeneralSettings.xaml + + + 开 + GeneralSettings.xaml + + + Windows 10 1809+: 始终使用 WinPty + GeneralSettings.xaml + + + 关 + GeneralSettings.xaml + + + 开 + GeneralSettings.xaml + + + 关于 + SettingsPage.xaml + + + 常规 + SettingsPage.xaml + + + 快捷键 + SettingsPage.xaml + + + 鼠标 + SettingsPage.xaml + + + 配置文件 + SettingsPage.xaml + + + 终端 + SettingsPage.xaml + + + 主题 + SettingsPage.xaml + + + 添加 + ShellProfileSettings.xaml + + + 参数 + ShellProfileSettings.xaml + + + 背景不透明度 + TerminalSettings.xaml + + + 光标闪烁 + TerminalSettings.xaml + + + 关 + TerminalSettings.xaml + + + 开 + TerminalSettings.xaml + + + 黑体 + TerminalSettings.xaml + + + 开 + TerminalSettings.xaml + + + 关 + TerminalSettings.xaml + + + 取消 + ShellProfileSettings.xaml + + + 正在检查更新 ... + About.xaml + + + 检查更新 + About.xaml + + + 单击要编辑的颜色 + ThemeSettings.xaml + + + 复制 + ShellProfileSettings.xaml + + + 调色板 + ThemeSettings.xaml + + + 文本复制提示 + TerminalSettings.xaml + + + 关 + TerminalSettings.xaml + + + 开 + TerminalSettings.xaml + + + 自动复制选中的文本 + MouseSettings.xaml + + + 关 + MouseSettings.xaml + + + 开 + MouseSettings.xaml + + + 新建 + ShellProfileSettings.xaml + + + 当前版本 + About.xaml + + + 垂直 + TerminalSettings.xaml + + + 块状 + TerminalSettings.xaml + + + 光标样式 + TerminalSettings.xaml + + + 下划线 + TerminalSettings.xaml + + + 删除 + ShellProfileSettings.xaml + + + 不改变 + ShellProfileSettings.xaml + + + 编辑 + ShellProfileSettings.xaml + + + 导出 + ThemeSettings.xaml + + + 字体 + TerminalSettings.xaml + + + 字体大小 + TerminalSettings.xaml + + + 导入 + ThemeSettings.xaml + + + 快捷键 + ShellProfileSettings.xaml + + + 快捷键 + ShellProfileSettings.xaml + + + 最新版本 + About.xaml + + + 许可 + About.xaml + + + 行结束标志转换 + ShellProfileSettings.xaml + + + 粘贴时转换行结束标识符 + ShellProfileSettings.xaml + + + 鼠标中键动作 + MouseSettings.xaml + + + 鼠标 + MouseSettings.xaml + + + 打开弹出式菜单 + MouseSettings.xaml + + + 没做什么 + MouseSettings.xaml + + + 粘贴剪切板内容 + MouseSettings.xaml + + + 新建 + ThemeSettings.xaml + + + 内边距 + TerminalSettings.xaml + + + 名称 + ShellProfileSettings.xaml + + + 终端配置 + ShellProfileSettings.xaml + + + 主题 + ShellProfileSettings.xaml + + + 发行说明 + About.xaml + + + 鼠标右键动作 + MouseSettings.xaml + + + 保存 + ShellProfileSettings.xaml + + + 滚动限制 + TerminalSettings.xaml + + + 自动隐藏 + TerminalSettings.xaml + + + 隐藏 + TerminalSettings.xaml + + + 滚动条样式 + TerminalSettings.xaml + + + 显示 + TerminalSettings.xaml + + + 应用 + ThemeSettings.xaml + + + 设为默认 + ShellProfileSettings.xaml + + + 可执行程序位置 + ShellProfileSettings.xaml + + + 标签栏颜色 + ShellProfileSettings.xaml + + + 终端 + TerminalSettings.xaml + + + 主题 + ThemeSettings.xaml + + + 作者 + ThemeSettings.xaml + + + 主题名 + ThemeSettings.xaml + + + 转换行结尾为 CR + ShellProfileSettings.xaml + + + 转换行结尾为 CR+LF + ShellProfileSettings.xaml + + + 转换行结尾为 LF + ShellProfileSettings.xaml + + + 工作目录 + ShellProfileSettings.xaml + + + 是否要关闭此标签页？ + ViewModel + + + 你确定要关闭这个窗口吗？ + ViewModel + + + 是否删除此快捷键绑定？ + ViewModel + + + 是否要删除此主题？ + ViewModel + + + 是否要放弃所有更改 + ViewModel + + + 是否要还原常规设置？ + ViewModel + + + 是否还原默认的快捷键绑定？ + ViewModel + + + 是否要还原鼠标设置？ + ViewModel + + + 是否要还原此配置？ + ViewModel + + + 是否要还原默认终端选项？ + ViewModel + + + 已被组策略禁止。 + ViewModel + + + 已被用户禁用。请在任务管理器的“启动”选项卡中重新激活它。 + ViewModel + + + 编辑标题 + ViewModel + + + 错误 + ViewModel + + + 由于以下错误，操作无法完成： + ViewModel + + + 导入主题失败 + ViewModel + + + 解析失败 + ViewModel + + + 请确认 + ViewModel + + + 取消 + + + 请键入要绑定的快捷键 + + + 确定 + + + 重置 + + + 已复制 + ViewModel + + + 添加 + KeyBindingSettings.xaml + + + 修改标签页标题 + Command + + + 清屏 + Command + + + 关闭标签页 + Command + + + 新的标签页（自定义配置） + Command + + + 新的窗口（自定义配置） + Command + + + 快捷键 + KeyBindingSettings.xaml + + + 删除 + KeyBindingsView.xaml + + + 编辑 + KeyBindingsView.xaml + + + 新的远程标签页 + Command + + + 下一个标签页 + Command + + + 新的窗口 + Command + + + 切换标签页 + Command + + + 粘贴（不换行） + Command + + + 上一个标签页 + Command + + + 搜索 + Command + + + 全选 + Command + + + 取消 + ShellProfileSelectionDialog.xaml + + + 启动 + ShellProfileSelectionDialog.xaml + + + 选择一个配置 + ShellProfileSelectionDialog.xaml + + + 显示设置 + Command + + + 切换到终端 #1 + Command + + + 切换到终端 #2 + Command + + + 切换到终端 #3 + Command + + + 切换到终端 #4 + Command + + + 切换到终端 #5 + Command + + + 切换到终端 #6 + Command + + + 切换到终端 #7 + Command + + + 切换到终端 #8 + Command + + + 切换到终端 #9 + Command + + + 切换全屏 + Command + + + 切换窗口 + Command + + \ No newline at end of file diff --git a/FluentTerminal.App/Views/KeyBindingsView.xaml b/FluentTerminal.App/Views/KeyBindingsView.xaml index 6ec484b..6132c50 100644 --- a/FluentTerminal.App/Views/KeyBindingsView.xaml +++ b/FluentTerminal.App/Views/KeyBindingsView.xaml @@ -84,11 +84,13 @@ diff --git a/FluentTerminal.App/Views/MainPage.xaml b/FluentTerminal.App/Views/MainPage.xaml index 1f07512..d4bc9e9 100644 --- a/FluentTerminal.App/Views/MainPage.xaml +++ b/FluentTerminal.App/Views/MainPage.xaml @@ -49,7 +49,7 @@ + x:Uid="NewTab"> @@ -57,7 +57,7 @@ + x:Uid="Settings"> @@ -65,7 +65,7 @@ + x:Uid="About"> - + + x:Uid="None"> @@ -98,7 +98,7 @@ Command="{x:Bind ViewModel.SelectedTerminal.SelectTabThemeCommand}" CommandParameter="Red" IsChecked="{x:Bind ViewModel.SelectedTerminal.TabTheme, Mode=OneWay, Converter={StaticResource TabThemeSelectedConverter}, ConverterParameter=Red}" - Text="Red"> + x:Uid="Red"> + x:Uid="Green"> + x:Uid="Blue"> + x:Uid="Purple"> + x:Uid="Orange"> + x:Uid="Teal"> - + - + - + - + - + - + - + - + diff --git a/FluentTerminal.App/Views/SettingsPage.xaml.cs b/FluentTerminal.App/Views/SettingsPage.xaml.cs index 7bed20a..7413b22 100644 --- a/FluentTerminal.App/Views/SettingsPage.xaml.cs +++ b/FluentTerminal.App/Views/SettingsPage.xaml.cs @@ -1,4 +1,5 @@ -using FluentTerminal.App.Utilities; +using FluentTerminal.App.Services.Utilities; +using FluentTerminal.App.Utilities; using FluentTerminal.App.ViewModels; using FluentTerminal.App.Views.SettingsPages; using System; @@ -27,8 +28,8 @@ namespace FluentTerminal.App.Views { InitializeComponent(); Root.DataContext = this; - - ApplicationView.GetForCurrentView().Title = "Settings"; + var asd= StringsHelper.GetString("Setting"); + ApplicationView.GetForCurrentView().Title = StringsHelper.GetString("Setting"); CoreApplicationViewTitleBar coreTitleBar = CoreApplication.GetCurrentView().TitleBar; coreTitleBar.LayoutMetricsChanged += TitleBar_LayoutMetricsChanged; diff --git a/FluentTerminal.App/Views/SettingsPages/About.xaml b/FluentTerminal.App/Views/SettingsPages/About.xaml index ebea433..a8f4e73 100644 --- a/FluentTerminal.App/Views/SettingsPages/About.xaml +++ b/FluentTerminal.App/Views/SettingsPages/About.xaml @@ -22,6 +22,7 @@ VerticalAlignment="Center" FontSize="28" Style="{StaticResource TitleTextBlockStyle}" + x:Uid="About" Text="About" /> @@ -51,30 +53,30 @@ Stretch="None" /> - + - -Release notes + - - + - Checking for updates... + Not found - -Release notes + - - + GNU General Public License v3.0 diff --git a/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml b/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml index 7649ac1..aa0edc1 100644 --- a/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml +++ b/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml @@ -21,7 +21,8 @@ VerticalAlignment="Center" FontSize="28" Style="{StaticResource TitleTextBlockStyle}" - Text="General" /> + Text="General" + x:Uid="General" /> @@ -38,6 +40,7 @@ @@ -48,80 +51,94 @@ - + - + - + - + diff --git a/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml b/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml index 52e248b..491be4d 100644 --- a/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml +++ b/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml @@ -23,6 +23,7 @@ VerticalAlignment="Center" FontSize="28" Style="{StaticResource TitleTextBlockStyle}" + x:Uid="Keybindings" Text="Keybindings" /> - + @@ -39,6 +40,7 @@ Command="{x:Bind ViewModel.RestoreDefaultsCommand}" CommandParameter="keyBindings" Icon="Undo" + x:Uid="Restore" Label="Restore Defaults" /> diff --git a/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml.cs b/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml.cs index 5e8f4c0..8c22545 100644 --- a/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml.cs +++ b/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml.cs @@ -29,7 +29,7 @@ namespace FluentTerminal.App.Views.SettingsPages Command command = (Command)value; AddCommandMenu.Items.Add(new MenuFlyoutItem { - Text = EnumHelper.GetEnumDescription(command), + Text = StringsHelper.GetString(EnumHelper.GetEnumDescription(command)), Command = ViewModel.AddCommand, CommandParameter = command.ToString() }); diff --git a/FluentTerminal.App/Views/SettingsPages/MouseSettings.xaml b/FluentTerminal.App/Views/SettingsPages/MouseSettings.xaml index 14765a2..d468068 100644 --- a/FluentTerminal.App/Views/SettingsPages/MouseSettings.xaml +++ b/FluentTerminal.App/Views/SettingsPages/MouseSettings.xaml @@ -22,6 +22,7 @@ VerticalAlignment="Center" FontSize="28" Style="{StaticResource TitleTextBlockStyle}" + x:Uid="Mouse" Text="Mouse" /> @@ -39,36 +41,43 @@ - + - + diff --git a/FluentTerminal.App/Views/SettingsPages/ShellProfileSettings.xaml b/FluentTerminal.App/Views/SettingsPages/ShellProfileSettings.xaml index 624bc14..8b30010 100644 --- a/FluentTerminal.App/Views/SettingsPages/ShellProfileSettings.xaml +++ b/FluentTerminal.App/Views/SettingsPages/ShellProfileSettings.xaml @@ -100,6 +100,7 @@ VerticalAlignment="Center" FontSize="28" Style="{StaticResource TitleTextBlockStyle}" + x:Uid="Profiles" Text="Profiles" /> @@ -143,10 +149,12 @@ @@ -196,7 +204,7 @@ Margin="0,0,6,0"> - + @@ -219,6 +227,7 @@ Width="300" Margin="{StaticResource ItemMargin}" HorizontalAlignment="Left" + x:Uid="ProfileName" Header="Name" IsEnabled="{x:Bind PreInstalled, Converter={StaticResource NegateConverter}, Mode=OneWay}" IsSpellCheckEnabled="False" @@ -227,6 +236,7 @@ - + @@ -306,8 +324,9 @@ - + @@ -319,12 +338,14 @@ @@ -44,6 +46,7 @@ @@ -71,6 +76,7 @@ Width="200" Margin="{StaticResource ItemMargin}" HorizontalAlignment="Left" + x:Uid="BackgroundOpacity" Header="Background opacity" Maximum="1" Minimum="0" @@ -81,6 +87,7 @@ Width="200" Margin="{StaticResource ItemMargin}" HorizontalAlignment="Left" + x:Uid="Padding" Header="Padding" Maximum="64" Minimum="0" @@ -92,42 +99,50 @@ Width="200" Margin="{StaticResource ItemMargin}" HorizontalAlignment="Left" + x:Uid="ScrollbackLimit" Header="Scrollback limit" KeyDown="ScrollBackTextBoxOnKeyDown" Text="{x:Bind ViewModel.ScrollBackLimit, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" /> - + - + @@ -135,6 +150,7 @@ diff --git a/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml b/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml index 6fdf5f1..07d2491 100644 --- a/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml +++ b/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml @@ -38,6 +38,7 @@ VerticalAlignment="Center" FontSize="28" Style="{StaticResource TitleTextBlockStyle}" + x:Uid="Theme" Text="Themes" /> @@ -65,16 +68,19 @@ Command="{x:Bind ViewModel.CloneCommand, Mode=OneWay}" CommandParameter="{x:Bind ViewModel.SelectedTheme, Mode=OneWay}" Icon="Copy" + x:Uid="CloneAppBarButton" Label="Clone" /> @@ -142,7 +150,7 @@ Margin="0,0,6,0"> - + @@ -162,7 +170,7 @@ Margin="0,0,6,0"> - + @@ -206,6 +214,7 @@ Width="200" Margin="{StaticResource ItemMargin}" HorizontalAlignment="Left" + x:Uid="ThemeName" Header="Name" Text="{x:Bind Name, Mode=TwoWay}" Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" /> @@ -214,6 +223,7 @@ Width="200" Margin="{StaticResource ItemMargin}" HorizontalAlignment="Left" + x:Uid="ThemeAuthor" Header="Author" Text="{x:Bind Author, Mode=TwoWay}" Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" /> @@ -233,13 +243,14 @@ - + diff --git a/FluentTerminal.App/Views/TabBar.xaml b/FluentTerminal.App/Views/TabBar.xaml index 0509fff..d0508e2 100644 --- a/FluentTerminal.App/Views/TabBar.xaml +++ b/FluentTerminal.App/Views/TabBar.xaml @@ -70,12 +70,12 @@ - + + x:Uid="None"> @@ -84,7 +84,7 @@ Command="{x:Bind SelectTabThemeCommand}" CommandParameter="Red" IsChecked="{x:Bind TabTheme, Mode=OneWay, Converter={StaticResource TabThemeSelectedConverter}, ConverterParameter=Red}" - Text="Red"> + x:Uid="Red"> + x:Uid="Green"> + x:Uid="Blue"> + x:Uid="Purple"> + x:Uid="Orange"> + x:Uid="Teal"> - + - +