From b8199ce351b70646617289c7b40d7b08cb30f644 Mon Sep 17 00:00:00 2001 From: Sandra Borst <108298114+VerfluchteZocke@users.noreply.github.com> Date: Sun, 5 Jan 2025 19:39:06 +0100 Subject: [PATCH] =?UTF-8?q?minutes=20ausgelagert=20aus=20der=20combobox;?= =?UTF-8?q?=20nur=20noch=20Eingabe=20von=20Zahlen=20erm=C3=B6glicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.vs/InnoLabProjektDektopApp/v17/.suo | Bin 465920 -> 465920 bytes .../Screens/FirstLaunch/01Startscreen.xaml.cs | 2 +- .../Screens/FirstLaunch/02Progress.xaml.cs | 2 +- .../Screens/FirstLaunch/04Settings.xaml | 70 +++++++------- .../Screens/FirstLaunch/04Settings.xaml.cs | 18 ++-- .../Screens/Regulaer/01Overview.xaml | 89 +++++++++--------- .../Screens/Regulaer/01Overview.xaml.cs | 18 +++- .../InnoLabProjektDektopApp.AssemblyInfo.cs | 2 +- ...bProjektDektopApp.AssemblyInfoInputs.cache | 2 +- .../Screens/FirstLaunch/04Settings.g.cs | 32 +++++-- .../Screens/FirstLaunch/04Settings.g.i.cs | 32 +++++-- .../Screens/Regulaer/01Overview.g.cs | 46 ++++++--- .../Screens/Regulaer/01Overview.g.i.cs | 46 ++++++--- .../Screens/Regulaer/04Statistics.g.cs | 2 +- .../Screens/Regulaer/04Statistics.g.i.cs | 2 +- .../obj/Debug/net8.0-windows/apphost.exe | Bin 142848 -> 142848 bytes 16 files changed, 238 insertions(+), 125 deletions(-) diff --git a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo index dc42953e7e13c2e65f366e36ff4990726171c4eb..d201d29b1c48939309f45951a417c10a140505e5 100644 GIT binary patch delta 4501 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 delta 4011 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 Jx~zk33IPAaT)qGR diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs index 9a9e02e..d34c6c7 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs @@ -35,7 +35,7 @@ namespace InnoLabProjektDektopApp private void Button_Click(object sender, RoutedEventArgs e) { - this.Content = new Progress().Content; + // } } } \ No newline at end of file diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs index d34a07d..cc95495 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs @@ -26,7 +26,7 @@ namespace InnoLabProjektDektopApp } private void Button_Click2(object sender, RoutedEventArgs e) { - this.Content = new Settings().Content; + //this.Content = new Settings().Content; } private void Button_Click3(object sender, RoutedEventArgs e) { diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml index 8312b3b..0a3353f 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml @@ -119,40 +119,46 @@ ToolTip="You can decide how long the focus and break period should be. The focus </Grid.ColumnDefinitions> <!-- Focus Period --> - <StackPanel Grid.Column="0" Margin="10"> - <TextBlock Text="Focus period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" /> - <ComboBox x:Name="FocusPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="150" FontSize="14" Padding="5" SelectionChanged="ComboBox_SelectionChanged" IsEditable="True"> - <ComboBoxItem Content="20 minutes" /> - <ComboBoxItem Content="30 minutes" /> - <ComboBoxItem Content="40 minutes" /> - <ComboBoxItem Content="50 minutes" IsSelected="True" /> - <ComboBoxItem Content="60 minutes" /> - <ComboBoxItem Content="90 minutes" /> - <ComboBoxItem Content="120 minutes" /> - <ComboBoxItem Content="150 minutes" /> - <ComboBoxItem Content="180 minutes" /> - </ComboBox> - </StackPanel> - - <!-- Break Period --> - <StackPanel Grid.Column="1" Margin="10"> - <TextBlock Text="Break period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" /> - <ComboBox x:Name="BreakPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="150" FontSize="14" Padding="5" IsEditable="True"> - <ComboBoxItem Content="0 minutes" /> - <ComboBoxItem Content="3 minutes" /> - <ComboBoxItem Content="5 minutes" /> - <ComboBoxItem Content="10 minutes" IsSelected="True" /> - <ComboBoxItem Content="15 minutes" /> - <ComboBoxItem Content="20 minutes" /> - <ComboBoxItem Content="25 minutes" /> - <ComboBoxItem Content="30 minutes" /> - </ComboBox> - </StackPanel> - - <!-- Cycles --> + <StackPanel Grid.Column="0" Margin="10"> + <TextBlock Text="Focus period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" /> + <StackPanel Orientation="Horizontal"> + <ComboBox x:Name="FocusPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="100" FontSize="14" Padding="5" SelectionChanged="ComboBox_SelectionChanged" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput"> + <ComboBoxItem Content="20" /> + <ComboBoxItem Content="30" /> + <ComboBoxItem Content="40" /> + <ComboBoxItem Content="50" IsSelected="True" /> + <ComboBoxItem Content="60" /> + <ComboBoxItem Content="90" /> + <ComboBoxItem Content="120" /> + <ComboBoxItem Content="150" /> + <ComboBoxItem Content="180" /> + </ComboBox> + <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" /> + </StackPanel> + </StackPanel> + + <!-- Break Period --> + <StackPanel Grid.Column="1" Margin="10"> + <TextBlock Text="Break period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" /> + <StackPanel Orientation="Horizontal"> + <ComboBox x:Name="BreakPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="100" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput"> + <ComboBoxItem Content="0" /> + <ComboBoxItem Content="3" /> + <ComboBoxItem Content="5" /> + <ComboBoxItem Content="10" IsSelected="True" /> + <ComboBoxItem Content="15" /> + <ComboBoxItem Content="20" /> + <ComboBoxItem Content="25" /> + <ComboBoxItem Content="30" /> + </ComboBox> + <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" /> + </StackPanel> + </StackPanel> + + <!-- Cycles --> <StackPanel Grid.Column="2" Margin="10"> <TextBlock Text="Cycles" FontSize="14" FontWeight="SemiBold" Foreground="Gray" /> - <ComboBox x:Name="CyclesComboBox" HorizontalAlignment="Left" Height="30" Width="150" FontSize="14" Padding="5" IsEditable="True"> + <ComboBox x:Name="CyclesComboBox" HorizontalAlignment="Left" Height="30" Width="150" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">> <ComboBoxItem Content="1" /> <ComboBoxItem Content="2" /> <ComboBoxItem Content="3" /> diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs index c236c92..e8a9f3d 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs @@ -60,12 +60,12 @@ namespace InnoLabProjektDektopApp private void SaveSettingsButton_Click(object sender, RoutedEventArgs e) { - // Sammle die Einstellungen aus den Eingabefeldern - string focusPeriod = ((ComboBoxItem)FocusPeriodComboBox.SelectedItem)?.Content.ToString() ?? "50 minutes"; - string breakPeriod = ((ComboBoxItem)BreakPeriodComboBox.SelectedItem)?.Content.ToString() ?? "10 minutes"; - string cycles = ((ComboBoxItem)CyclesComboBox.SelectedItem)?.Content.ToString() ?? "4"; + // Sammle die Werte aus den ComboBoxen oder verwende Standardwerte + string focusPeriod = string.IsNullOrWhiteSpace(FocusPeriodComboBox.Text) ? "50" : FocusPeriodComboBox.Text; + string breakPeriod = string.IsNullOrWhiteSpace(BreakPeriodComboBox.Text) ? "10" : BreakPeriodComboBox.Text; + string cycles = string.IsNullOrWhiteSpace(CyclesComboBox.Text) ? "4" : CyclesComboBox.Text; - string distractionMode = DistractionModeFullBlocking.IsChecked == true + string distractionMode = DistractionModeFullBlocking.IsChecked == true ? "Full-blocking mode" : DistractionModeMascotFeedback.IsChecked == true ? "Mascot feedback only" @@ -127,9 +127,15 @@ private void SaveSettingsButton_Click(object sender, RoutedEventArgs e) } + private void ComboBox_PreviewTextInput(object sender, TextCompositionEventArgs e) + { + e.Handled = !int.TryParse(e.Text, out _); + } - } + + + } } \ No newline at end of file diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml index 04a0e41..5129b43 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml @@ -79,51 +79,56 @@ HorizontalAlignment="Left" /> <ColumnDefinition Width="2*" /> </Grid.ColumnDefinitions> - <!-- Focus Period --> - <StackPanel Grid.Column="0" VerticalAlignment="Center"> - <TextBlock Text="Focus period" Foreground="White" FontSize="14" FontWeight="Bold" /> - <ComboBox x:Name="FocusPeriodComboBox" Width="100" HorizontalAlignment="Left"> - <ComboBoxItem Content="20 minutes" /> - <ComboBoxItem Content="30 minutes" /> - <ComboBoxItem Content="40 minutes" /> - <ComboBoxItem Content="50 minutes" IsSelected="True" /> - <ComboBoxItem Content="60 minutes" /> - <ComboBoxItem Content="90 minutes" /> - <ComboBoxItem Content="120 minutes" /> - <ComboBoxItem Content="150 minutes" /> - <ComboBoxItem Content="180 minutes" /> - </ComboBox> - </StackPanel> + <StackPanel Grid.Column="0" Margin="10"> + <TextBlock Text="Focus period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" /> + <StackPanel Orientation="Horizontal"> + <ComboBox x:Name="FocusPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="70" FontSize="14" Padding="5" SelectionChanged="ComboBox_SelectionChanged" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput"> + <ComboBoxItem Content="20" /> + <ComboBoxItem Content="30" /> + <ComboBoxItem Content="40" /> + <ComboBoxItem Content="50" IsSelected="True" /> + <ComboBoxItem Content="60" /> + <ComboBoxItem Content="90" /> + <ComboBoxItem Content="120" /> + <ComboBoxItem Content="150" /> + <ComboBoxItem Content="180" /> + </ComboBox> + <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" /> + </StackPanel> + </StackPanel> - <!-- Break Period --> - <StackPanel Grid.Column="1" VerticalAlignment="Center"> - <TextBlock Text="Break period" Foreground="White" FontSize="14" FontWeight="Bold" /> - <ComboBox x:Name="BreakPeriodComboBox" Width="100" HorizontalAlignment="Left"> - <ComboBoxItem Content="0 minutes" /> - <ComboBoxItem Content="3 minutes" /> - <ComboBoxItem Content="5 minutes" /> - <ComboBoxItem Content="10 minutes" IsSelected="True" /> - <ComboBoxItem Content="15 minutes" /> - <ComboBoxItem Content="20 minutes" /> - <ComboBoxItem Content="25 minutes" /> - <ComboBoxItem Content="30 minutes" /> - </ComboBox> - </StackPanel> + <!-- Break Period --> + <StackPanel Grid.Column="1" Margin="10"> + <TextBlock Text="Break period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" /> + <StackPanel Orientation="Horizontal"> + <ComboBox x:Name="BreakPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="70" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput"> + <ComboBoxItem Content="0" /> + <ComboBoxItem Content="3" /> + <ComboBoxItem Content="5" /> + <ComboBoxItem Content="10" IsSelected="True" /> + <ComboBoxItem Content="15" /> + <ComboBoxItem Content="20" /> + <ComboBoxItem Content="25" /> + <ComboBoxItem Content="30" /> + </ComboBox> + <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" /> + </StackPanel> + </StackPanel> - <!-- Cycles --> - <StackPanel Grid.Column="2" VerticalAlignment="Center"> - <TextBlock Text="Cycles" Foreground="White" FontSize="14" FontWeight="Bold" /> - <ComboBox x:Name="CyclesComboBox" Width="50" HorizontalAlignment="Left"> - <ComboBoxItem Content="1" /> - <ComboBoxItem Content="2" /> - <ComboBoxItem Content="3" /> - <ComboBoxItem Content="4" IsSelected="True" /> - <ComboBoxItem Content="5" /> - <ComboBoxItem Content="6" /> - </ComboBox> - </StackPanel> + <!-- Cycles --> + <StackPanel Grid.Column="2" Margin="10"> + <TextBlock Text="Cycles" FontSize="14" FontWeight="SemiBold" Foreground="Gray" /> + <ComboBox x:Name="CyclesComboBox" HorizontalAlignment="Left" Height="30" Width="50" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">> + <ComboBoxItem Content="1" /> + <ComboBoxItem Content="2" /> + <ComboBoxItem Content="3" /> + <ComboBoxItem Content="4" IsSelected="True" /> + <ComboBoxItem Content="5" /> + <ComboBoxItem Content="6" /> + </ComboBox> + </StackPanel> - <!-- Distraction Mode --> + <!-- Distraction Mode --> <StackPanel Grid.Column="3" VerticalAlignment="Center"> <TextBlock Text="Distraction Mode" Foreground="White" FontSize="14" FontWeight="Bold" /> <ComboBox x:Name="DistractionModeComboBox" Width="140" HorizontalAlignment="Left"> diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs index 50efb6f..186bb05 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs @@ -3,6 +3,7 @@ using System.IO; using System.Text.Json; using System.Windows; using System.Windows.Controls; +using System.Windows.Input; namespace InnoLabProjektDektopApp { @@ -33,6 +34,7 @@ namespace InnoLabProjektDektopApp { try { + // JSON-Datei lesen // JSON-Datei lesen if (File.Exists(SettingsFilePath)) { @@ -47,21 +49,21 @@ namespace InnoLabProjektDektopApp if (profileSettings.TryGetProperty("focusPeriod", out var focusPeriodElement)) { string focusPeriod = focusPeriodElement.GetString(); - FocusPeriodComboBox.SelectedItem = FindComboBoxItem(FocusPeriodComboBox, focusPeriod); + FocusPeriodComboBox.Text = focusPeriod; } // Break Period if (profileSettings.TryGetProperty("breakPeriod", out var breakPeriodElement)) { string breakPeriod = breakPeriodElement.GetString(); - BreakPeriodComboBox.SelectedItem = FindComboBoxItem(BreakPeriodComboBox, breakPeriod); + BreakPeriodComboBox.Text = breakPeriod; } // Cycles if (profileSettings.TryGetProperty("cycles", out var cyclesElement)) { string cycles = cyclesElement.GetString(); - CyclesComboBox.SelectedItem = FindComboBoxItem(CyclesComboBox, cycles); + CyclesComboBox.Text = cycles; } // Distraction Mode @@ -174,5 +176,15 @@ namespace InnoLabProjektDektopApp this.NavigationService.Navigate(new Session(focusPeriod, breakPeriod, cycles, distractionMode, mascotVisible, wordsOfAffirmation, insultingWords)); } + private void ComboBox_PreviewTextInput(object sender, TextCompositionEventArgs e) + { + e.Handled = !int.TryParse(e.Text, out _); + } + + private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) + { + + } + } } diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs index 17255fa..1c5cce6 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("CoFlow")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c9b946b3346a901f02ac1a59efe2d304d269d6df")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c202edd209c51d734ca5f846f5b4f79b3aa0840e")] [assembly: System.Reflection.AssemblyProductAttribute("CoFlow")] [assembly: System.Reflection.AssemblyTitleAttribute("CoFlow")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache index 0a23d7e..e2d50fe 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache @@ -1 +1 @@ -b7d380ae506091cf46ecb3e50bb6cc8fd2d969c30cb9e882f33b68be45a03700 +d3e399c63a326117f5a32a9f07b15627e8003f4100fabd2d1db549e7cfbf86e2 diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs index 90b0e3d..9241c33 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3091AF73E4DCD404239266588D489CB937D8EFD9" +#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E32CABBCA79C9C9D3FBAF9161798644469D0BB48" //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. @@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox FocusPeriodComboBox; @@ -115,7 +115,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 140 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 144 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox BreakPeriodComboBox; @@ -123,7 +123,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 155 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 161 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox CyclesComboBox; @@ -199,21 +199,39 @@ namespace InnoLabProjektDektopApp { case 9: this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target)); - #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged); + #line default + #line hidden + + #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + this.FocusPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + #line default #line hidden return; case 10: this.BreakPeriodComboBox = ((System.Windows.Controls.ComboBox)(target)); + + #line 144 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + this.BreakPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + + #line default + #line hidden return; case 11: this.CyclesComboBox = ((System.Windows.Controls.ComboBox)(target)); + + #line 161 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + this.CyclesComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + + #line default + #line hidden return; case 12: - #line 168 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 174 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveSettingsButton_Click); #line default @@ -221,7 +239,7 @@ namespace InnoLabProjektDektopApp { return; case 13: - #line 171 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 177 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToOverviewButton_Click); #line default diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs index 90b0e3d..9241c33 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3091AF73E4DCD404239266588D489CB937D8EFD9" +#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E32CABBCA79C9C9D3FBAF9161798644469D0BB48" //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. @@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox FocusPeriodComboBox; @@ -115,7 +115,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 140 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 144 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox BreakPeriodComboBox; @@ -123,7 +123,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 155 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 161 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox CyclesComboBox; @@ -199,21 +199,39 @@ namespace InnoLabProjektDektopApp { case 9: this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target)); - #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged); + #line default + #line hidden + + #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + this.FocusPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + #line default #line hidden return; case 10: this.BreakPeriodComboBox = ((System.Windows.Controls.ComboBox)(target)); + + #line 144 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + this.BreakPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + + #line default + #line hidden return; case 11: this.CyclesComboBox = ((System.Windows.Controls.ComboBox)(target)); + + #line 161 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + this.CyclesComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + + #line default + #line hidden return; case 12: - #line 168 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 174 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveSettingsButton_Click); #line default @@ -221,7 +239,7 @@ namespace InnoLabProjektDektopApp { return; case 13: - #line 171 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" + #line 177 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToOverviewButton_Click); #line default diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs index 6f863d3..fd12f30 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "27EFD47612E883094FA6DDB67E9E552CC96BCE5B" +#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C53B7B99D5653902CA91DB4BEFD00CD98F3668F0" //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. @@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 101 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 104 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox BreakPeriodComboBox; @@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 116 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 121 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox CyclesComboBox; @@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 129 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 134 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox DistractionModeComboBox; @@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 139 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 144 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox MascotVisibilityComboBox; @@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 149 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 154 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox WordsOfAffirmationCheckBox; @@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 155 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 160 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox InsultingWordsCheckBox; @@ -99,7 +99,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 169 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 174 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox FocusTopicInputBox; @@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 178 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 183 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock FocusTopicPlaceholder; @@ -162,12 +162,36 @@ namespace InnoLabProjektDektopApp { return; case 3: this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target)); + + #line 85 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged); + + #line default + #line hidden + + #line 85 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + this.FocusPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + + #line default + #line hidden return; case 4: this.BreakPeriodComboBox = ((System.Windows.Controls.ComboBox)(target)); + + #line 104 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + this.BreakPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + + #line default + #line hidden return; case 5: this.CyclesComboBox = ((System.Windows.Controls.ComboBox)(target)); + + #line 121 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + this.CyclesComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + + #line default + #line hidden return; case 6: this.DistractionModeComboBox = ((System.Windows.Controls.ComboBox)(target)); @@ -184,7 +208,7 @@ namespace InnoLabProjektDektopApp { case 10: this.FocusTopicInputBox = ((System.Windows.Controls.TextBox)(target)); - #line 177 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 182 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" this.FocusTopicInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.FocusTopicInputBox_TextChanged); #line default @@ -195,7 +219,7 @@ namespace InnoLabProjektDektopApp { return; case 12: - #line 190 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 195 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StartButton_Click); #line default diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.i.cs index 6f863d3..fd12f30 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.i.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "27EFD47612E883094FA6DDB67E9E552CC96BCE5B" +#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C53B7B99D5653902CA91DB4BEFD00CD98F3668F0" //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. @@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 101 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 104 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox BreakPeriodComboBox; @@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 116 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 121 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox CyclesComboBox; @@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 129 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 134 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox DistractionModeComboBox; @@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 139 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 144 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox MascotVisibilityComboBox; @@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 149 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 154 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox WordsOfAffirmationCheckBox; @@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 155 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 160 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox InsultingWordsCheckBox; @@ -99,7 +99,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 169 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 174 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox FocusTopicInputBox; @@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp { #line hidden - #line 178 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 183 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock FocusTopicPlaceholder; @@ -162,12 +162,36 @@ namespace InnoLabProjektDektopApp { return; case 3: this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target)); + + #line 85 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged); + + #line default + #line hidden + + #line 85 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + this.FocusPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + + #line default + #line hidden return; case 4: this.BreakPeriodComboBox = ((System.Windows.Controls.ComboBox)(target)); + + #line 104 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + this.BreakPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + + #line default + #line hidden return; case 5: this.CyclesComboBox = ((System.Windows.Controls.ComboBox)(target)); + + #line 121 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + this.CyclesComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput); + + #line default + #line hidden return; case 6: this.DistractionModeComboBox = ((System.Windows.Controls.ComboBox)(target)); @@ -184,7 +208,7 @@ namespace InnoLabProjektDektopApp { case 10: this.FocusTopicInputBox = ((System.Windows.Controls.TextBox)(target)); - #line 177 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 182 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" this.FocusTopicInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.FocusTopicInputBox_TextChanged); #line default @@ -195,7 +219,7 @@ namespace InnoLabProjektDektopApp { return; case 12: - #line 190 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" + #line 195 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StartButton_Click); #line default diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs index 1ad8c26..11f2326 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B7879C038C97A981468360F56AAAC9CA70CFB68E" +#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "01B55004193E3CC05C4C67CFCD081BC8DD5D338C" //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs index 1ad8c26..11f2326 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B7879C038C97A981468360F56AAAC9CA70CFB68E" +#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "01B55004193E3CC05C4C67CFCD081BC8DD5D338C" //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe index 67a1df483690a2a8ff56a0e6a72586aa21796bd1..ec9376a62b0fc0b14bfbebdee5c9f74be2040906 100644 GIT binary patch delta 97 zcmZp;!vR7qj9Zw#Y55v47%&(yq%x#1q%eTkmJG=ZrVNG*DGcTe#tbG5$qb1MrVMEe s77Qi~W(;WzrVL38CJbo|<_wk$Nespei42Jh24GnOhScrO+Dv<y00SlxjsO4v delta 97 zcmZp;!vR7qj9Zw#Y57_*Br#Yrm@t?zBrzB>7=u}f43-QA42BG83<eBF42cZM42BGe v45kd045<uh45<u83@Hr83<eA)3@Hpo3}y_L3@Hp|3@Hq0+nu$U_A&tg_`MR8 -- GitLab