diff --git a/CursorLang/Models/AppSettings.cs b/CursorLang/Models/AppSettings.cs index 1ea74b3..3c1b328 100644 --- a/CursorLang/Models/AppSettings.cs +++ b/CursorLang/Models/AppSettings.cs @@ -59,6 +59,9 @@ public sealed partial class AppSettings : ObservableObject [ObservableProperty] private Color _backgroundColor = Color.FromRgb(0x20, 0x20, 0x20); + [ObservableProperty] + private Color _foregroundColor = Color.FromRgb(0xFF, 0xFF, 0xFF); + [JsonIgnore] public TimeSpan Duration => TimeSpan.FromMilliseconds(DurationMilliseconds); } diff --git a/CursorLang/Resources/Strings.resx b/CursorLang/Resources/Strings.resx index 45aeb0e..fde6dd5 100644 --- a/CursorLang/Resources/Strings.resx +++ b/CursorLang/Resources/Strings.resx @@ -157,6 +157,9 @@ Background color + + Text color + Behavior diff --git a/CursorLang/Resources/Strings.ru.resx b/CursorLang/Resources/Strings.ru.resx index 21a8c36..161acd8 100644 --- a/CursorLang/Resources/Strings.ru.resx +++ b/CursorLang/Resources/Strings.ru.resx @@ -157,6 +157,9 @@ Цвет фона + + Цвет текста + Поведение diff --git a/CursorLang/ViewModels/SettingsViewModel.cs b/CursorLang/ViewModels/SettingsViewModel.cs index eb9fcf7..c459d6e 100644 --- a/CursorLang/ViewModels/SettingsViewModel.cs +++ b/CursorLang/ViewModels/SettingsViewModel.cs @@ -52,6 +52,18 @@ public sealed partial class SettingsViewModel : ObservableObject, IDisposable Color.FromRgb(0xF5, 0xF5, 0xF5), ]; + private static readonly Color[] ForegroundPalette = + [ + Color.FromRgb(0xFF, 0xFF, 0xFF), + Color.FromRgb(0xD4, 0xD4, 0xD4), + Color.FromRgb(0x00, 0x00, 0x00), + Color.FromRgb(0xFA, 0xCC, 0x15), + Color.FromRgb(0x4A, 0xDE, 0x80), + Color.FromRgb(0x60, 0xA5, 0xFA), + Color.FromRgb(0xF9, 0x73, 0x16), + Color.FromRgb(0xF8, 0x71, 0x71), + ]; + public SettingsViewModel(AppSettings settings, ILocalizationService localization) { Settings = settings; @@ -74,6 +86,8 @@ public sealed partial class SettingsViewModel : ObservableObject, IDisposable public IReadOnlyList BackgroundPalette { get; } = Palette; + public IReadOnlyList TextPalette { get; } = ForegroundPalette; + public IReadOnlyList> Themes { get; } public IReadOnlyList> PlacementModes { get; } diff --git a/CursorLang/Views/LayoutPopupWindow.xaml b/CursorLang/Views/LayoutPopupWindow.xaml index f220bbf..86877df 100644 --- a/CursorLang/Views/LayoutPopupWindow.xaml +++ b/CursorLang/Views/LayoutPopupWindow.xaml @@ -21,9 +21,12 @@ - + Text="{Binding ShortName}"> + + + + diff --git a/CursorLang/Views/MainWindow.xaml b/CursorLang/Views/MainWindow.xaml index 6fb1582..b2db8fb 100644 --- a/CursorLang/Views/MainWindow.xaml +++ b/CursorLang/Views/MainWindow.xaml @@ -21,6 +21,17 @@ + + + + + + + +