From 761641f71a0840c1669dc7b198fb51ad23d8ad5d Mon Sep 17 00:00:00 2001 From: Marcus Date: Mon, 24 Nov 2025 13:47:28 +0100 Subject: [PATCH] =?UTF-8?q?Darkmode=20f=C3=BCr=20Loading=20Asp=20Meldung?= =?UTF-8?q?=20beim=20Start?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZKuP/CreateParkausweis.xaml | 11 +-- ZKuP/CreateParkausweis.xaml.cs | 12 ++- ZKuP/ImageView.xaml | 2 +- ZKuP/ImageView.xaml.cs | 8 +- ZKuP/MainWindow.xaml | 133 ++------------------------------ ZKuP/MainWindow.xaml.cs | 95 +++++------------------ ZKuP/ManageAsp.xaml | 8 +- ZKuP/ManageAsp.xaml.cs | 61 ++++++--------- ZKuP/ManageUsers.xaml | 9 ++- ZKuP/Properties/AssemblyInfo.cs | 13 +--- ZKuP/Resources/Loading2.gif | Bin 0 -> 491908 bytes ZKuP/SQL.cs | 28 ++++++- ZKuP/Settings.cs | 2 +- ZKuP/ZKuP.csproj | 4 + 14 files changed, 122 insertions(+), 264 deletions(-) create mode 100644 ZKuP/Resources/Loading2.gif diff --git a/ZKuP/CreateParkausweis.xaml b/ZKuP/CreateParkausweis.xaml index a9ed116..65f5c2f 100644 --- a/ZKuP/CreateParkausweis.xaml +++ b/ZKuP/CreateParkausweis.xaml @@ -46,6 +46,7 @@ + @@ -65,7 +66,7 @@ - + @@ -74,16 +75,16 @@ - + - + - + - + diff --git a/ZKuP/CreateParkausweis.xaml.cs b/ZKuP/CreateParkausweis.xaml.cs index b7af6c8..53a14c1 100644 --- a/ZKuP/CreateParkausweis.xaml.cs +++ b/ZKuP/CreateParkausweis.xaml.cs @@ -512,13 +512,21 @@ namespace ZKuP private void tbDDigitsKennzeichen_PreviewTextInput(object sender, TextCompositionEventArgs e) { - if ((sender as TextBox).Text.Length >= 5) + if (e.Text != "H" && e.Text != "E" && (sender as TextBox).Text.Length >= 5) { e.Handled = true; return; } - if (!System.Text.RegularExpressions.Regex.IsMatch(e.Text, "^[0-9]*$")) + var tb = (TextBox)sender; + + // neuer Text unter Berücksichtigung von Selection (Ersetzung möglich) + string newText = tb.Text.Substring(0, tb.SelectionStart) + + e.Text + + tb.Text.Substring(tb.SelectionStart + tb.SelectionLength); + + + if (!System.Text.RegularExpressions.Regex.IsMatch(newText, @"^[0-9]+(?:E|H)?$")) { e.Handled = true; return; diff --git a/ZKuP/ImageView.xaml b/ZKuP/ImageView.xaml index f1ee872..921c080 100644 --- a/ZKuP/ImageView.xaml +++ b/ZKuP/ImageView.xaml @@ -9,7 +9,7 @@ Title="Unterschriftenanzeige" Height="370" Width="419" Loaded="Window_Loaded" LocationChanged="Window_LocationChanged"> - + diff --git a/ZKuP/ImageView.xaml.cs b/ZKuP/ImageView.xaml.cs index bdebc64..528a679 100644 --- a/ZKuP/ImageView.xaml.cs +++ b/ZKuP/ImageView.xaml.cs @@ -62,7 +62,13 @@ namespace ZKuP { Dispatcher.Invoke(new Action(() => { - if (!showComboBox) { dPDate.Visibility = cBSignature.Visibility = btnToday.Visibility = btnUp.Visibility = btnDown.Visibility = tbFilter.Visibility = lblFilter.Visibility = btnFiltern.Visibility = cbOnlyWithSignature.Visibility = Visibility.Collapsed; } + if (!showComboBox) + { + dPDate.Visibility = cBSignature.Visibility = btnToday.Visibility = btnUp.Visibility = btnDown.Visibility = tbFilter.Visibility = lblFilter.Visibility = btnFiltern.Visibility = cbOnlyWithSignature.Visibility = panelRB.Visibility = Visibility.Collapsed; + + imageSignature.Margin = new Thickness(10); + this.Height = imageSignature.ActualHeight + 50; + } else { cBSignature.Visibility = dPDate.Visibility = btnToday.Visibility = btnUp.Visibility = btnDown.Visibility = tbFilter.Visibility = lblFilter.Visibility = btnFiltern.Visibility = cbOnlyWithSignature.Visibility = Visibility.Visible; } })); diff --git a/ZKuP/MainWindow.xaml b/ZKuP/MainWindow.xaml index 1db41f3..3159133 100644 --- a/ZKuP/MainWindow.xaml +++ b/ZKuP/MainWindow.xaml @@ -120,47 +120,7 @@ - - - + @@ -203,59 +163,11 @@ - - + @@ -270,22 +182,11 @@ - - - - - + + + + + @@ -339,24 +240,7 @@