diff --git a/MaxSlurper/App.xaml b/MaxSlurper/App.xaml index 5a234a2..e33bb6e 100644 --- a/MaxSlurper/App.xaml +++ b/MaxSlurper/App.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:MaxSlurper" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" - StartupUri="MainWindow.xaml"> + > diff --git a/MaxSlurper/App.xaml.cs b/MaxSlurper/App.xaml.cs index 225f97c..84e701c 100644 --- a/MaxSlurper/App.xaml.cs +++ b/MaxSlurper/App.xaml.cs @@ -1,5 +1,4 @@ -using System.Configuration; -using System.Data; +using System.Linq; using Wpf.Ui.Appearance; namespace MaxSlurper @@ -12,8 +11,23 @@ namespace MaxSlurper protected override void OnStartup(System.Windows.StartupEventArgs e) { base.OnStartup(e); - - // The theme will be applied automatically when the window is shown + + bool startMinimized = e.Args.Contains("--minimized", System.StringComparer.OrdinalIgnoreCase); + + var mainWindow = new MainWindow(); + MainWindow = mainWindow; + + if (startMinimized) + { + // Only show the tray icon, don't show the window + mainWindow.WindowState = System.Windows.WindowState.Minimized; + mainWindow.ShowInTaskbar = false; + mainWindow.Hide(); + } + else + { + mainWindow.Show(); + } } } } diff --git a/MaxSlurper/Controls/ColorPickerWindow.xaml b/MaxSlurper/Controls/ColorPickerWindow.xaml index fc93c71..3b748ea 100644 --- a/MaxSlurper/Controls/ColorPickerWindow.xaml +++ b/MaxSlurper/Controls/ColorPickerWindow.xaml @@ -2,8 +2,8 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" - Title="Farbe aussuche" - Height="500" + Title="Farbe auswählen" + Height="500" Width="400" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" @@ -26,8 +26,8 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" @@ -176,14 +176,14 @@ Height="20" - + Margin="0,2,0,0">Hotkey zum Farben aufnehmen @@ -99,6 +99,37 @@ Foreground="{DynamicResource TextFillColorSecondaryBrush}" + + + + + + + + + + + + + + + + + + + + @@ -121,7 +152,7 @@ FontWeight="SemiBold" Foreground="{DynamicResource TextFillColorPrimaryBrush}"/> - - + @@ -151,13 +182,13 @@ BorderThickness="0,1,0,0" - onSettingsChanged) { InitializeComponent(); @@ -54,7 +84,7 @@ public event PropertyChangedEventHandler? PropertyChanged; return; _isCapturingHotkey = true; - CurrentHotkey = "Drück deine Tasten..."; + CurrentHotkey = "Tastenkombination eingeben..."; var captureWindow = new HotkeyCapture(); captureWindow.Owner = this; @@ -131,7 +161,7 @@ ExtendsContentIntoTitleBar = true; var infoText = new System.Windows.Controls.TextBlock { - Text = "Drück die Tastenkombination, die de haben willst", + Text = "Drücken Sie die gewünschte Tastenkombination", FontSize = 14, TextAlignment = TextAlignment.Center, Foreground = (System.Windows.Media.Brush)FindResource("TextFillColorSecondaryBrush"), @@ -142,7 +172,7 @@ ExtendsContentIntoTitleBar = true; var keyDisplay = new System.Windows.Controls.TextBlock { - Text = "Warte uff Eingabe...", + Text = "Warte auf Eingabe...", FontSize = 18, FontWeight = FontWeights.SemiBold, TextAlignment = TextAlignment.Center, @@ -204,7 +234,7 @@ key == Key.LWin || key == Key.RWin) // Require at least one modifier if (modifiers == ModifierKeys.None) { - keyDisplay.Text = "Mindestens ein Modifier (Strg, Alt, Shift, Win) musste drücken!"; + keyDisplay.Text = "Mindestens eine Zusatztaste (Strg, Alt, Shift, Win) erforderlich!"; okButton.IsEnabled = false; return; } diff --git a/MaxSlurper/MainWindow.xaml b/MaxSlurper/MainWindow.xaml index a506b7c..70fc34a 100644 --- a/MaxSlurper/MainWindow.xaml +++ b/MaxSlurper/MainWindow.xaml @@ -55,7 +55,7 @@ BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" BorderThickness="1" Cursor="Hand" - ToolTip="Drück ma druff, dann kannste dir 'ne Farbe raussuche"> + ToolTip="Klicken, um eine Farbe auszuwählen"> - - - - diff --git a/MaxSlurper/MainWindow.xaml.cs b/MaxSlurper/MainWindow.xaml.cs index 1020bad..43ea992 100644 --- a/MaxSlurper/MainWindow.xaml.cs +++ b/MaxSlurper/MainWindow.xaml.cs @@ -77,14 +77,14 @@ namespace MaxSlurper _notifyIcon.Text = "MaxSlurper"; var contextMenu = new ContextMenuStrip(); - var pickItem = new ToolStripMenuItem("Farbe schlürfen"); + var pickItem = new ToolStripMenuItem("Farbe aufnehmen"); // Use BeginInvoke to avoid synchronous invocation while windows may be closing pickItem.Click += (s, e) => { Dispatcher.BeginInvoke(new Action(() => _vm.PickColorCommand.Execute(null))); }; - var openItem = new ToolStripMenuItem("Fenster uffmachen"); + var openItem = new ToolStripMenuItem("Fenster öffnen"); openItem.Click += (s, e) => { Dispatcher.BeginInvoke(new Action(() => { Show(); WindowState = WindowState.Normal; Activate(); })); }; var settingsItem = new ToolStripMenuItem("Einstellungen"); settingsItem.Click += (s, e) => { Dispatcher.BeginInvoke(new Action(() => { Show(); WindowState = WindowState.Normal; Activate(); _vm.OpenSettingsCommand.Execute(null); })); }; - var exitItem = new ToolStripMenuItem("Tschüss"); + var exitItem = new ToolStripMenuItem("Beenden"); exitItem.Click += (s, e) => { _notifyIcon.Visible = false; System.Windows.Application.Current.Shutdown(); }; contextMenu.Items.Add(pickItem); contextMenu.Items.Add(openItem); diff --git a/MaxSlurper/MaxSlurper.csproj b/MaxSlurper/MaxSlurper.csproj index 874ba2b..7900fae 100644 --- a/MaxSlurper/MaxSlurper.csproj +++ b/MaxSlurper/MaxSlurper.csproj @@ -13,7 +13,7 @@ Mathias Wagner MaxSlurper MaxSlurper - Weil Max danach gefragt hat + Farbwähler-Anwendung Copyright © 2025 logo.ico