From 86a3e6d67d9b125bcda44727c91f0cbdfb4f576d Mon Sep 17 00:00:00 2001
From: Sandra Borst <108298114+VerfluchteZocke@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:11:59 +0100
Subject: [PATCH] navigation works but huge frontend problems!!!
---
.../.vs/InnoLabProjektDektopApp/v17/.suo | Bin 435712 -> 463360 bytes
.../InnoLabProjektDektopApp/App.xaml | 2 +-
.../Screens/FirstLaunch/01Startscreen.xaml | 7 +-
.../Screens/FirstLaunch/01Startscreen.xaml.cs | 14 +---
.../Screens/FirstLaunch/02Progress.xaml | 13 ++--
.../Screens/FirstLaunch/02Progress.xaml.cs | 15 +---
.../Screens/FirstLaunch/03_0Distractions.xaml | 7 +-
.../FirstLaunch/03_0Distractions.xaml.cs | 12 +--
.../FirstLaunch/03_1DistractionsList.xaml.cs | 12 ++-
.../Screens/FirstLaunch/04Settings.xaml | 7 +-
.../Screens/FirstLaunch/04Settings.xaml.cs | 14 ++--
.../Screens/Regulaer/01Overview.xaml | 9 ++-
.../Screens/Regulaer/01Overview.xaml.cs | 14 ++--
.../Screens/Regulaer/02Session.xaml | 7 +-
.../Screens/Regulaer/02Session.xaml.cs | 17 +++--
.../Screens/Regulaer/03End.xaml | 12 +--
.../Screens/Regulaer/03End.xaml.cs | 15 ++--
.../Screens/Regulaer/04Statistics.xaml | 19 ++---
.../Screens/Regulaer/04Statistics.xaml.cs | 6 +-
.../obj/Debug/net8.0-windows/App.g.i.cs | 4 +-
.../InnoLabProjektDektopApp.AssemblyInfo.cs | 2 +-
...bProjektDektopApp.AssemblyInfoInputs.cache | 2 +-
.../Screens/FirstLaunch/01Startscreen.g.i.cs | 6 +-
.../Screens/FirstLaunch/02Progress.g.i.cs | 31 +-------
.../FirstLaunch/03_0Distractions.g.i.cs | 72 +++++++++---------
.../Screens/FirstLaunch/04Settings.g.cs | 36 ++++-----
.../Screens/FirstLaunch/04Settings.g.i.cs | 36 ++++-----
.../Screens/Regulaer/01Overview.g.cs | 30 ++++----
.../Screens/Regulaer/01Overview.g.i.cs | 30 ++++----
.../Screens/Regulaer/02Session.g.cs | 37 ++++-----
.../Screens/Regulaer/02Session.g.i.cs | 37 ++++-----
.../Screens/Regulaer/03End.g.cs | 32 +++-----
.../Screens/Regulaer/03End.g.i.cs | 32 +++-----
.../Screens/Regulaer/04Statistics.g.cs | 30 +-------
.../Screens/Regulaer/04Statistics.g.i.cs | 30 +-------
.../obj/Debug/net8.0-windows/apphost.exe | Bin 142848 -> 142848 bytes
36 files changed, 260 insertions(+), 389 deletions(-)
diff --git a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo
index d066e3be0500fedbccb416aede4fe402cd1c0586..1004cf1b72e82cb36ee9573a02e6321988f6ef54 100644
GIT binary patch
delta 32141
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
My1;V5`losP4`F77j{pDw
delta 28788
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
Ik<jS>0OoN;WB>pF
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml
index c0236af..244eb5d 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml
@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:InnoLabProjektDektopApp"
- StartupUri="Screens\FirstLaunch\04Settings.xaml">
+ StartupUri="Screens\Regulaer\03End.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml
index ef93627..e669ae8 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="InnoLabProjektDektopApp.Startscreen"
+<UserControl x:Class="InnoLabProjektDektopApp.Startscreen"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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"
xmlns:local="clr-namespace:InnoLabProjektDektopApp"
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
- mc:Ignorable="d"
- Height="550" Width="900">
+ mc:Ignorable="d">
<Grid>
<Label Content="Are you ready to
work focused?" HorizontalAlignment="Left" Margin="76,102,0,0" VerticalAlignment="Top" Height="143" Width="432" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
@@ -15,4 +14,4 @@
<Rectangle HorizontalAlignment="Left" Height="269" Margin="587,0,0,0" Stroke="Black" VerticalAlignment="Center" Width="313" Fill="#FF828080"/>
<Image HorizontalAlignment="Left" Height="197" Margin="668,174,0,0" VerticalAlignment="Top" Width="213" Source="/Screens/FirstLaunch/Mascott_InnoLab.jpg"/>
</Grid>
-</Window>
+</UserControl>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs
index df4a42a..b3812fd 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs
@@ -14,25 +14,13 @@ namespace InnoLabProjektDektopApp
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
- public partial class Startscreen : Window
+ public partial class Startscreen : UserControl
{
public Startscreen()
{
InitializeComponent();
GlobalSettings.setDefaults(this);
}
- private void Option1_Click(object sender, RoutedEventArgs e)
- {
- //this.Content = new AnotherWindow().Content;
- }
- private void Option2_Click(object sender, RoutedEventArgs e)
- {
- //this.Content = new AnotherWindow().Content;
- }
- private void Option3_Click(object sender, RoutedEventArgs e)
- {
- //this.Content = new AnotherWindow().Content;
- }
private void Button_Click(object sender, RoutedEventArgs e)
{
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml
index 386854e..8d9fe3d 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="InnoLabProjektDektopApp.Progress"
+<UserControl x:Class="InnoLabProjektDektopApp.Progress"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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"
xmlns:local="clr-namespace:InnoLabProjektDektopApp"
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
- mc:Ignorable="d"
- Height="550" Width="900">
+ mc:Ignorable="d">
<Grid>
<Label Content="Your way to working more focused" HorizontalAlignment="Center" Margin="0,119,0,0" VerticalAlignment="Top" Height="108" Width="780" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
@@ -17,8 +16,8 @@
<TextBlock HorizontalAlignment="Left" Height="68" Margin="68,428,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="126"/>
<TextBlock HorizontalAlignment="Center" Height="68" Margin="0,428,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="124"/>
<TextBlock HorizontalAlignment="Left" Height="68" Margin="695,428,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="125"/>
- <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="68,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click1"/>
- <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="388,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click2"/>
- <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="695,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click2"/>
+ <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="68,343,0,0" VerticalAlignment="Top" Width="110"/>
+ <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="388,343,0,0" VerticalAlignment="Top" Width="110"/>
+ <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="695,343,0,0" VerticalAlignment="Top" Width="110"/>
</Grid>
-</Window>
+</UserControl>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs
index fed90d7..4cfe5b6 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs
@@ -14,7 +14,7 @@ namespace InnoLabProjektDektopApp
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
- public partial class Progress : Window
+ public partial class Progress : UserControl
{
public Progress()
{
@@ -33,18 +33,5 @@ namespace InnoLabProjektDektopApp
{
//this.Content = new AnotherWindow().Content;
}
-
- private void Button_Click1(object sender, RoutedEventArgs e)
- {
- //this.Content = new AnotherWindow().Content;
- }
- private void Button_Click2(object sender, RoutedEventArgs e)
- {
- this.Content = new Settings().Content;
- }
- private void Button_Click3(object sender, RoutedEventArgs e)
- {
- //this.Content = new AnotherWindow().Content;
- }
}
}
\ No newline at end of file
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml
index 14c4507..54f8e6c 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="InnoLabProjektDektopApp.Distractions"
+<UserControl x:Class="InnoLabProjektDektopApp.Distractions"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -6,7 +6,8 @@
xmlns:local="clr-namespace:InnoLabProjektDektopApp"
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
mc:Ignorable="d"
- Height="550" Width="900">
+ HorizontalAlignment="Stretch"
+ VerticalAlignment="Stretch">
<Grid>
<StackPanel Margin="20,0,20,20">
@@ -271,5 +272,5 @@
</StackPanel>
</Grid>
-</Window>
+</UserControl>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml.cs
index c056f90..8174c40 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml.cs
@@ -19,15 +19,18 @@ namespace InnoLabProjektDektopApp
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
- public partial class Distractions : Window
+ public partial class Distractions : UserControl
{
private string jsonFilePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "distractingWebsites.json");
private Dictionary<string, List<WebsiteEntry>> ?data;
- public Distractions()
+ private readonly End _parentScreen;
+ public Distractions(End parentScreen)
{
InitializeComponent();
GlobalSettings.setDefaults(this);
+
+ _parentScreen = parentScreen;
LoadJsonData();
}
@@ -230,9 +233,8 @@ namespace InnoLabProjektDektopApp
if (!string.IsNullOrEmpty(category))
{
// Navigiere zur entsprechenden Seite (DistractionsList)
- var distractionListScreen = new DistractionsList(category);
- distractionListScreen.Show(); // Zeige neue Seite
- this.Close(); // Schließe aktuelle Seite
+ var distractionListScreen = new DistractionsList(category, this._parentScreen);
+ _parentScreen.MainContent.Content = distractionListScreen;
}
}
}
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs
index 8f17528..4280c84 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs
@@ -21,13 +21,15 @@ namespace InnoLabProjektDektopApp
{
private string _category;
private Dictionary<string, List<WebsiteEntry>> _data;
+ private readonly End _parentScreen;
private string _jsonFilePath;
- public DistractionsList(string category)
+ public DistractionsList(string category, End parentScreen)
{
InitializeComponent();
GlobalSettings.setDefaults(this);
_category = category;
+ _parentScreen = parentScreen;
_jsonFilePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "distractingWebsites.json");
LoadCategoryItems();
}
@@ -223,9 +225,11 @@ namespace InnoLabProjektDektopApp
private void BackButton_Click(object sender, RoutedEventArgs e)
{
- var distractionsScreen = new Distractions();
- distractionsScreen.Show();
- this.Close();
+
+ var distractionScreen = new Distractions(this._parentScreen);
+
+ // Setze den Content des MainContent im End-Screen
+ _parentScreen.MainContent.Content = distractionScreen;
}
public class WebsiteEntry
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
index 4af139e..b29fa25 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="InnoLabProjektDektopApp.Settings"
+<UserControl x:Class="InnoLabProjektDektopApp.Settings"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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"
xmlns:local="clr-namespace:InnoLabProjektDektopApp"
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
- mc:Ignorable="d"
- Height="550" Width="900">
+ mc:Ignorable="d">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<Grid>
@@ -178,4 +177,4 @@ ToolTip="You can decide how long the focus and break period should be. The focus
</Grid>
</ScrollViewer>
-</Window>
+</UserControl>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
index 0847605..99ae436 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
@@ -17,12 +17,14 @@ namespace InnoLabProjektDektopApp
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
- public partial class Settings : Window
+ public partial class Settings : UserControl
{
- public Settings()
+ private readonly End _parentScreen;
+ public Settings(End parentScreen)
{
InitializeComponent();
GlobalSettings.setDefaults(this);
+ this._parentScreen = parentScreen;
MascotVisibilityChanged(null, null);
}
private void MascotVisibilityChanged(object sender, RoutedEventArgs e)
@@ -124,13 +126,9 @@ private void SaveSettingsButton_Click(object sender, RoutedEventArgs e)
private void NavigateToOverviewButton_Click(object sender, RoutedEventArgs e)
{
// Erstelle eine Instanz des OverviewScreen
- var overviewScreen = new Overview();
+ var overviewScreen = new Overview(_parentScreen);
+ _parentScreen.MainContent.Content = overviewScreen;
- // Zeige den OverviewScreen
- overviewScreen.Show();
-
- // Schließe den aktuellen Screen
- this.Close();
}
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
index f079877..e04a619 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="InnoLabProjektDektopApp.Overview"
+<UserControl x:Class="InnoLabProjektDektopApp.Overview"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -6,8 +6,10 @@
xmlns:local="clr-namespace:InnoLabProjektDektopApp"
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
mc:Ignorable="d"
- Height="550" Width="900">
+ Background="Black">
+ <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid>
+
<StackPanel Margin="20,0,20,20">
<!-- Ãœberschrift -->
@@ -194,4 +196,5 @@ TextChanged="FocusTopicInputBox_TextChanged" />
</StackPanel>
</Grid>
-</Window>
+ </ScrollViewer>
+</UserControl>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
index a3d93ab..46257c0 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
@@ -9,7 +9,7 @@ namespace InnoLabProjektDektopApp
/// <summary>
/// Interaction logic for Overview.xaml
/// </summary>
- public partial class Overview : Window
+ public partial class Overview : UserControl
{
// Aktuelles Profil, für das Einstellungen geladen werden sollen
private string profile = "profile1";
@@ -17,10 +17,13 @@ namespace InnoLabProjektDektopApp
// Pfad zur JSON-Datei, in der die Einstellungen gespeichert sind
private string SettingsFilePath;
- public Overview()
+ private readonly End _parentScreen;
+
+ public Overview(End parentScreen)
{
InitializeComponent();
GlobalSettings.setDefaults(this);
+ this._parentScreen = parentScreen;
// Definieren des Pfads zur JSON-Datei
this.SettingsFilePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "settings.json");
@@ -172,10 +175,9 @@ namespace InnoLabProjektDektopApp
MessageBoxButton.OK,
MessageBoxImage.Information);
- var sessionScreen = new Session(focusPeriod, breakPeriod, cycles, distractionMode, mascotVisible, wordsOfAffirmation, insultingWords);
- sessionScreen.Show();
- this.Close();
- }
+ var sessionScreen = new Session(focusPeriod, breakPeriod, cycles, distractionMode, mascotVisible, wordsOfAffirmation, insultingWords, this._parentScreen);
+ _parentScreen.MainContent.Content = sessionScreen;
+ }
}
}
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
index bf4829f..9703d7b 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="InnoLabProjektDektopApp.Session"
+<UserControl x:Class="InnoLabProjektDektopApp.Session"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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"
xmlns:local="clr-namespace:InnoLabProjektDektopApp"
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
- mc:Ignorable="d"
- Height="550" Width="900">
+ mc:Ignorable="d">
<Grid>
<Button Margin="0,100,150,10" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Background="Transparent" BorderBrush="Transparent" Click="discardSession_Click">
<Grid >
@@ -21,4 +20,4 @@
</StackPanel>
<Button Content="Pause" Name="PlayPauseButton" Style="{StaticResource PlayPauseButton}" HorizontalAlignment="Center" Margin="0,320,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5" Click="PlayPause_Click"/>
</Grid>
-</Window>
\ No newline at end of file
+</UserControl>
\ No newline at end of file
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
index 3cc5268..82aed18 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
@@ -16,8 +16,10 @@ namespace InnoLabProjektDektopApp
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
- public partial class Session : Window
+ public partial class Session : UserControl
{
+
+ private readonly End _parentScreen;
private int focusPeriod;
private int breakPeriod;
private int cycles;
@@ -43,7 +45,7 @@ namespace InnoLabProjektDektopApp
string distractionMode,
string mascotVisible,
bool wordsOfAffirmation,
- bool insultingWords)
+ bool insultingWords, End parentScreen)
{
InitializeComponent();
this.focusPeriod = focusPeriod;
@@ -53,7 +55,8 @@ namespace InnoLabProjektDektopApp
this.mascotVisible = mascotVisible;
this.wordsOfAffirmation = wordsOfAffirmation;
this.insultingWords = insultingWords;
- GlobalSettings.setDefaults(this);
+ this._parentScreen = parentScreen;
+ GlobalSettings.setDefaults(this);
this.maxTime = focusPeriod * 60; //todo: multiply with 60 later
this.seconds = this.maxTime;
@@ -264,11 +267,9 @@ namespace InnoLabProjektDektopApp
MessageBox.Show($"Abbruchgrund: {selectedReason}", "Sitzung beendet", MessageBoxButton.OK, MessageBoxImage.Information);
// Zum OverviewScreen navigieren
- var overviewScreen = new Overview();
- overviewScreen.Show();
- reasonWindow.Close(); // Fenster schließen
- this.Close(); // Aktuelles Fenster schließen
- };
+ var overviewScreen = new Overview(_parentScreen);
+ _parentScreen.MainContent.Content = overviewScreen;
+ };
// Radiobuttons und Button zum StackPanel hinzufügen
stackPanel.Children.Add(new TextBlock { Text = "Wählen Sie den Grund für den Abbruch aus:", Margin = new Thickness(5) });
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml
index 161057b..1c0fea9 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml
@@ -7,13 +7,9 @@
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
mc:Ignorable="d"
Height="550" Width="900">
- <Grid>
- <header:HeaderTemplate VerticalAlignment="Top"/>
-
- <Button Content="Subscription" Style="{StaticResource TopMenuButon}" HorizontalAlignment="Right" Margin="0,4,100,0" VerticalAlignment="Top" Height="26" Width="80" Click="Option2_Click"/>
- <Button Content="Contract" Style="{StaticResource TopMenuButon}" HorizontalAlignment="Right" Margin="0,4,20,0" VerticalAlignment="Top" Height="26" Width="80" Click="Option3_Click"/>
-
- <!-- DELETE -->
- <Label Content="End Page" HorizontalAlignment="Center" Margin="0,234,0,0" VerticalAlignment="Top" Height="108" Width="439" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+ <Grid Background="LightGray">
+ <ContentControl x:Name="MainContent" HorizontalAlignment="Stretch"
+ VerticalAlignment="Stretch"
+ Margin="0,0,0,0" ClipToBounds="False"/>
</Grid>
</Window>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml.cs
index 31b0382..8f13f71 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml.cs
@@ -20,18 +20,13 @@ namespace InnoLabProjektDektopApp
{
InitializeComponent();
GlobalSettings.setDefaults(this);
+
+ LoadScreen();
}
- private void Option1_Click(object sender, RoutedEventArgs e)
- {
- //this.Content = new AnotherWindow().Content;
- }
- private void Option2_Click(object sender, RoutedEventArgs e)
- {
- //this.Content = new AnotherWindow().Content;
- }
- private void Option3_Click(object sender, RoutedEventArgs e)
+
+ private void LoadScreen()
{
- //this.Content = new AnotherWindow().Content;
+ MainContent.Content = new Statistics(this);
}
}
}
\ No newline at end of file
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml
index 7d68674..be079bf 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml
@@ -1,19 +1,16 @@
-<Window x:Class="InnoLabProjektDektopApp.Statistics"
+<UserControl x:Class="InnoLabProjektDektopApp.Statistics"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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"
xmlns:local="clr-namespace:InnoLabProjektDektopApp"
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
- mc:Ignorable="d"
- Height="550" Width="900">
+ mc:Ignorable="d" Background="Red">
+ <ScrollViewer>
<Grid>
- <header:HeaderTemplate VerticalAlignment="top"/>
-
- <Button Content="Subscription" Style="{StaticResource TopMenuButon}" HorizontalAlignment="Right" Margin="0,4,100,0" VerticalAlignment="Top" Height="26" Width="80" Click="Option2_Click"/>
- <Button Content="Contract" Style="{StaticResource TopMenuButon}" HorizontalAlignment="Right" Margin="0,4,20,0" VerticalAlignment="Top" Height="26" Width="80" Click="Option3_Click"/>
-
- <!-- DELETE -->
- <Label Content="Statistics Page" HorizontalAlignment="Center" Margin="0,234,0,0" VerticalAlignment="Top" Height="108" Width="439" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+ <TextBlock Margin="10,10,-10,90" TextWrapping="Wrap" Text="Ganz viel Text und so"/>
+ <TextBlock Margin="665,132,-665,168" TextWrapping="Wrap" Text="Ganz viel Text und so"/>
+ <TextBlock Margin="10,371,-10,129" TextWrapping="Wrap" Text="Ganz viel Text und so"/>
</Grid>
-</Window>
+ </ScrollViewer>
+</UserControl>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml.cs
index 94c9dce..da81060 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml.cs
@@ -14,10 +14,12 @@ namespace InnoLabProjektDektopApp
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
- public partial class Statistics : Window
+ public partial class Statistics : UserControl
{
- public Statistics()
+ private readonly End _parentScreen;
+ public Statistics(End parentScreen)
{
+ this._parentScreen = parentScreen;
InitializeComponent();
GlobalSettings.setDefaults(this);
}
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/App.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/App.g.i.cs
index bf37896..543037f 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/App.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/App.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2DEDC9624A7085F1363F3F7BDB3110EA433383A8"
+#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7D74CC56137BF813041AB27EB36F34CDC24CEC07"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -55,7 +55,7 @@ namespace InnoLabProjektDektopApp {
_contentLoaded = true;
#line 5 "..\..\..\App.xaml"
- this.StartupUri = new System.Uri("Screens\\FirstLaunch\\04Settings.xaml", System.UriKind.Relative);
+ this.StartupUri = new System.Uri("Screens\\Regulaer\\03End.xaml", System.UriKind.Relative);
#line default
#line hidden
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 e5c7e7b..17255fa 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+93d144893d8dadca6f285ef4a5529527314cd24b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c9b946b3346a901f02ac1a59efe2d304d269d6df")]
[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 a73bfa9..0a23d7e 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 @@
-81fe44d744b1d9f6bc5c21f59489eb8a1ce8533d6aa9ebb2bad659cbb6cd413b
+b7d380ae506091cf46ecb3e50bb6cc8fd2d969c30cb9e882f33b68be45a03700
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/01Startscreen.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/01Startscreen.g.i.cs
index d3041d4..b23187b 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/01Startscreen.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/01Startscreen.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "36C0AE432AB2B51E75A5CC1B4D3A3625806DE022"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "324502E7827947321219F6F0D9F3355B46C0A89C"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,7 +40,7 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Startscreen
/// </summary>
- public partial class Startscreen : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Startscreen : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
@@ -74,7 +74,7 @@ namespace InnoLabProjektDektopApp {
{
case 1:
- #line 13 "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml"
+ #line 12 "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
#line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/02Progress.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/02Progress.g.i.cs
index a8f843b..c0b7c51 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/02Progress.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/02Progress.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "178E95093EF485EDF590E8871B8E4E6D3DC7E167"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8C1B1F384BFB1C9BA6619866C87FF1392922C464"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,7 +40,7 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Progress
/// </summary>
- public partial class Progress : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Progress : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
@@ -70,33 +70,6 @@ namespace InnoLabProjektDektopApp {
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
- switch (connectionId)
- {
- case 1:
-
- #line 20 "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click1);
-
- #line default
- #line hidden
- return;
- case 2:
-
- #line 21 "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click2);
-
- #line default
- #line hidden
- return;
- case 3:
-
- #line 22 "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click2);
-
- #line default
- #line hidden
- return;
- }
this._contentLoaded = true;
}
}
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_0Distractions.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_0Distractions.g.i.cs
index b57efa7..94bd2f5 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_0Distractions.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_0Distractions.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AD375DC9D639CF1B001DB990B29EE5D4D495D019"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CFC70533892A46AAE6BACF39AC665023F0AA8EB8"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Distractions
/// </summary>
- public partial class Distractions : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Distractions : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 32 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 33 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox SearchBox;
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 44 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 45 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock SearchPlaceholder;
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 73 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 74 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.StackPanel SearchResultsPanel;
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 100 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 101 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox UrlInputBox;
@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 109 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 110 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock UrlPlaceholder;
@@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 129 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 130 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox CategoryComboBox;
@@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 175 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 176 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox SocialMediaCheckBox;
@@ -99,7 +99,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 191 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 192 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox ShoppingCheckBox;
@@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 207 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 208 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox GamesCheckBox;
@@ -115,7 +115,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 224 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 225 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox PornCheckBox;
@@ -123,7 +123,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 240 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 241 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox OtherWebsitesCheckBox;
@@ -131,7 +131,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 256 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 257 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox OtherProgramsCheckBox;
@@ -171,7 +171,7 @@ namespace InnoLabProjektDektopApp {
case 1:
this.SearchBox = ((System.Windows.Controls.TextBox)(target));
- #line 43 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 44 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
this.SearchBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.SearchBox_TextChanged);
#line default
@@ -182,7 +182,7 @@ namespace InnoLabProjektDektopApp {
return;
case 3:
- #line 61 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 62 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SearchButton_Click);
#line default
@@ -194,7 +194,7 @@ namespace InnoLabProjektDektopApp {
case 5:
this.UrlInputBox = ((System.Windows.Controls.TextBox)(target));
- #line 108 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 109 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
this.UrlInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.UrlInputBox_TextChanged);
#line default
@@ -208,7 +208,7 @@ namespace InnoLabProjektDektopApp {
return;
case 8:
- #line 154 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 155 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.AddButton_Click);
#line default
@@ -216,7 +216,7 @@ namespace InnoLabProjektDektopApp {
return;
case 9:
- #line 173 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 174 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default
@@ -227,7 +227,7 @@ namespace InnoLabProjektDektopApp {
return;
case 11:
- #line 178 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 179 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -235,7 +235,7 @@ namespace InnoLabProjektDektopApp {
return;
case 12:
- #line 181 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 182 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -243,7 +243,7 @@ namespace InnoLabProjektDektopApp {
return;
case 13:
- #line 189 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 190 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default
@@ -254,7 +254,7 @@ namespace InnoLabProjektDektopApp {
return;
case 15:
- #line 194 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 195 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -262,7 +262,7 @@ namespace InnoLabProjektDektopApp {
return;
case 16:
- #line 197 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 198 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -270,7 +270,7 @@ namespace InnoLabProjektDektopApp {
return;
case 17:
- #line 205 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 206 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default
@@ -281,7 +281,7 @@ namespace InnoLabProjektDektopApp {
return;
case 19:
- #line 210 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 211 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -289,7 +289,7 @@ namespace InnoLabProjektDektopApp {
return;
case 20:
- #line 213 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 214 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -297,7 +297,7 @@ namespace InnoLabProjektDektopApp {
return;
case 21:
- #line 222 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 223 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default
@@ -308,7 +308,7 @@ namespace InnoLabProjektDektopApp {
return;
case 23:
- #line 227 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 228 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -316,7 +316,7 @@ namespace InnoLabProjektDektopApp {
return;
case 24:
- #line 230 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 231 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -324,7 +324,7 @@ namespace InnoLabProjektDektopApp {
return;
case 25:
- #line 238 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 239 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default
@@ -335,7 +335,7 @@ namespace InnoLabProjektDektopApp {
return;
case 27:
- #line 243 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 244 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -343,7 +343,7 @@ namespace InnoLabProjektDektopApp {
return;
case 28:
- #line 246 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 247 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -351,7 +351,7 @@ namespace InnoLabProjektDektopApp {
return;
case 29:
- #line 254 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 255 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default
@@ -362,7 +362,7 @@ namespace InnoLabProjektDektopApp {
return;
case 31:
- #line 259 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 260 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
@@ -370,7 +370,7 @@ namespace InnoLabProjektDektopApp {
return;
case 32:
- #line 262 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+ #line 263 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
#line default
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 311ba9c..df826b8 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}" "1F10F7816B98A4217B59F374663F778C8C3E559E"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7BAB7DC36151AC23FA242413944CD21CA2C22086"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Settings
/// </summary>
- public partial class Settings : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Settings : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 32 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 31 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton DistractionModeFullBlocking;
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 33 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 32 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton DistractionModeMascotFeedback;
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 40 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 39 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox SecondsComboBox;
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 66 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton MascotVisibleYes;
@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton MascotVisibleNo;
@@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 71 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 70 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.StackPanel MotivationSection;
@@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 85 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 84 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox WordsOfAffirmationCheckBox;
@@ -99,7 +99,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 91 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 90 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox InsultingWordsCheckBox;
@@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 124 "..\..\..\..\..\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 141 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 140 "..\..\..\..\..\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 156 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 155 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox CyclesComboBox;
@@ -172,7 +172,7 @@ namespace InnoLabProjektDektopApp {
case 4:
this.MascotVisibleYes = ((System.Windows.Controls.RadioButton)(target));
- #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 66 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
this.MascotVisibleYes.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
#line default
@@ -181,7 +181,7 @@ namespace InnoLabProjektDektopApp {
case 5:
this.MascotVisibleNo = ((System.Windows.Controls.RadioButton)(target));
- #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
this.MascotVisibleNo.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
#line default
@@ -199,7 +199,7 @@ namespace InnoLabProjektDektopApp {
case 9:
this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
- #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
#line default
@@ -213,7 +213,7 @@ namespace InnoLabProjektDektopApp {
return;
case 12:
- #line 169 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 168 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveSettingsButton_Click);
#line default
@@ -221,7 +221,7 @@ namespace InnoLabProjektDektopApp {
return;
case 13:
- #line 172 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 171 "..\..\..\..\..\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 311ba9c..df826b8 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}" "1F10F7816B98A4217B59F374663F778C8C3E559E"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7BAB7DC36151AC23FA242413944CD21CA2C22086"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Settings
/// </summary>
- public partial class Settings : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Settings : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 32 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 31 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton DistractionModeFullBlocking;
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 33 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 32 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton DistractionModeMascotFeedback;
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 40 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 39 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox SecondsComboBox;
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 66 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton MascotVisibleYes;
@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton MascotVisibleNo;
@@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 71 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 70 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.StackPanel MotivationSection;
@@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 85 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 84 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox WordsOfAffirmationCheckBox;
@@ -99,7 +99,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 91 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 90 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox InsultingWordsCheckBox;
@@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 124 "..\..\..\..\..\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 141 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 140 "..\..\..\..\..\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 156 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 155 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox CyclesComboBox;
@@ -172,7 +172,7 @@ namespace InnoLabProjektDektopApp {
case 4:
this.MascotVisibleYes = ((System.Windows.Controls.RadioButton)(target));
- #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 66 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
this.MascotVisibleYes.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
#line default
@@ -181,7 +181,7 @@ namespace InnoLabProjektDektopApp {
case 5:
this.MascotVisibleNo = ((System.Windows.Controls.RadioButton)(target));
- #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
this.MascotVisibleNo.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
#line default
@@ -199,7 +199,7 @@ namespace InnoLabProjektDektopApp {
case 9:
this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
- #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
#line default
@@ -213,7 +213,7 @@ namespace InnoLabProjektDektopApp {
return;
case 12:
- #line 169 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 168 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveSettingsButton_Click);
#line default
@@ -221,7 +221,7 @@ namespace InnoLabProjektDektopApp {
return;
case 13:
- #line 172 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 171 "..\..\..\..\..\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 afc8725..1efaccd 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}" "1EFCB88867CB021DF28247EC6D36F821FD4A0742"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FE596F2569A51C485CB02AC2660C774AEAFF7D22"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Overview
/// </summary>
- public partial class Overview : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Overview : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 83 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 85 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox FocusPeriodComboBox;
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 99 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 101 "..\..\..\..\..\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 114 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 116 "..\..\..\..\..\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 127 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 129 "..\..\..\..\..\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 137 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 139 "..\..\..\..\..\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 147 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 149 "..\..\..\..\..\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 153 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 155 "..\..\..\..\..\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 167 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 169 "..\..\..\..\..\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 176 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 178 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock FocusTopicPlaceholder;
@@ -146,7 +146,7 @@ namespace InnoLabProjektDektopApp {
{
case 1:
- #line 34 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 36 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.EditProfile_Click);
#line default
@@ -154,7 +154,7 @@ namespace InnoLabProjektDektopApp {
return;
case 2:
- #line 49 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 51 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.AddProfile_Click);
#line default
@@ -184,7 +184,7 @@ namespace InnoLabProjektDektopApp {
case 10:
this.FocusTopicInputBox = ((System.Windows.Controls.TextBox)(target));
- #line 175 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 177 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
this.FocusTopicInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.FocusTopicInputBox_TextChanged);
#line default
@@ -195,7 +195,7 @@ namespace InnoLabProjektDektopApp {
return;
case 12:
- #line 188 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 190 "..\..\..\..\..\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 afc8725..1efaccd 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}" "1EFCB88867CB021DF28247EC6D36F821FD4A0742"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FE596F2569A51C485CB02AC2660C774AEAFF7D22"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Overview
/// </summary>
- public partial class Overview : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Overview : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 83 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 85 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox FocusPeriodComboBox;
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 99 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 101 "..\..\..\..\..\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 114 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 116 "..\..\..\..\..\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 127 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 129 "..\..\..\..\..\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 137 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 139 "..\..\..\..\..\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 147 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 149 "..\..\..\..\..\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 153 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 155 "..\..\..\..\..\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 167 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 169 "..\..\..\..\..\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 176 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 178 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock FocusTopicPlaceholder;
@@ -146,7 +146,7 @@ namespace InnoLabProjektDektopApp {
{
case 1:
- #line 34 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 36 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.EditProfile_Click);
#line default
@@ -154,7 +154,7 @@ namespace InnoLabProjektDektopApp {
return;
case 2:
- #line 49 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 51 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.AddProfile_Click);
#line default
@@ -184,7 +184,7 @@ namespace InnoLabProjektDektopApp {
case 10:
this.FocusTopicInputBox = ((System.Windows.Controls.TextBox)(target));
- #line 175 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 177 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
this.FocusTopicInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.FocusTopicInputBox_TextChanged);
#line default
@@ -195,7 +195,7 @@ namespace InnoLabProjektDektopApp {
return;
case 12:
- #line 188 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 190 "..\..\..\..\..\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/02Session.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.cs
index 589d8a3..fea875f 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\02Session.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4D171F84F09119FFF5927E5550B6D53DBDAC090D"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\02Session.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C4EE273BBBBF6940BC2CFB32AD133CD7AD7026C5"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Session
/// </summary>
- public partial class Session : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Session : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 15 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ #line 16 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock Title;
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 16 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ #line 17 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock Clock;
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 18 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ #line 19 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.StackPanel CyclesIndicatorPanel;
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 20 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ #line 21 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button PlayPauseButton;
@@ -95,13 +95,6 @@ namespace InnoLabProjektDektopApp {
#line hidden
}
- [System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
- return System.Delegate.CreateDelegate(delegateType, this, handler);
- }
-
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -112,19 +105,27 @@ namespace InnoLabProjektDektopApp {
switch (connectionId)
{
case 1:
- this.Title = ((System.Windows.Controls.TextBlock)(target));
+
+ #line 10 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.discardSession_Click);
+
+ #line default
+ #line hidden
return;
case 2:
- this.Clock = ((System.Windows.Controls.TextBlock)(target));
+ this.Title = ((System.Windows.Controls.TextBlock)(target));
return;
case 3:
- this.CyclesIndicatorPanel = ((System.Windows.Controls.StackPanel)(target));
+ this.Clock = ((System.Windows.Controls.TextBlock)(target));
return;
case 4:
+ this.CyclesIndicatorPanel = ((System.Windows.Controls.StackPanel)(target));
+ return;
+ case 5:
this.PlayPauseButton = ((System.Windows.Controls.Button)(target));
- #line 20 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
- this.PlayPauseButton.Click += new System.Windows.RoutedEventHandler(this.Button_Click);
+ #line 21 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ this.PlayPauseButton.Click += new System.Windows.RoutedEventHandler(this.PlayPause_Click);
#line default
#line hidden
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.i.cs
index 589d8a3..fea875f 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\02Session.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4D171F84F09119FFF5927E5550B6D53DBDAC090D"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\02Session.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C4EE273BBBBF6940BC2CFB32AD133CD7AD7026C5"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Session
/// </summary>
- public partial class Session : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Session : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 15 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ #line 16 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock Title;
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 16 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ #line 17 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock Clock;
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 18 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ #line 19 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.StackPanel CyclesIndicatorPanel;
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 20 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ #line 21 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button PlayPauseButton;
@@ -95,13 +95,6 @@ namespace InnoLabProjektDektopApp {
#line hidden
}
- [System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
- return System.Delegate.CreateDelegate(delegateType, this, handler);
- }
-
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -112,19 +105,27 @@ namespace InnoLabProjektDektopApp {
switch (connectionId)
{
case 1:
- this.Title = ((System.Windows.Controls.TextBlock)(target));
+
+ #line 10 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.discardSession_Click);
+
+ #line default
+ #line hidden
return;
case 2:
- this.Clock = ((System.Windows.Controls.TextBlock)(target));
+ this.Title = ((System.Windows.Controls.TextBlock)(target));
return;
case 3:
- this.CyclesIndicatorPanel = ((System.Windows.Controls.StackPanel)(target));
+ this.Clock = ((System.Windows.Controls.TextBlock)(target));
return;
case 4:
+ this.CyclesIndicatorPanel = ((System.Windows.Controls.StackPanel)(target));
+ return;
+ case 5:
this.PlayPauseButton = ((System.Windows.Controls.Button)(target));
- #line 20 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
- this.PlayPauseButton.Click += new System.Windows.RoutedEventHandler(this.Button_Click);
+ #line 21 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+ this.PlayPauseButton.Click += new System.Windows.RoutedEventHandler(this.PlayPause_Click);
#line default
#line hidden
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.cs
index 4d8e078..c5d9114 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\03End.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "16A774735AFFF594D835EF08249963B0FE20FF84"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\03End.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "84C9834FBD53AB6E578CFEE13D1D1F383ED1D5C1"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -42,6 +42,14 @@ namespace InnoLabProjektDektopApp {
/// </summary>
public partial class End : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+
+ #line 11 "..\..\..\..\..\Screens\Regulaer\03End.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.ContentControl MainContent;
+
+ #line default
+ #line hidden
+
private bool _contentLoaded;
/// <summary>
@@ -63,13 +71,6 @@ namespace InnoLabProjektDektopApp {
#line hidden
}
- [System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
- return System.Delegate.CreateDelegate(delegateType, this, handler);
- }
-
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -80,20 +81,7 @@ namespace InnoLabProjektDektopApp {
switch (connectionId)
{
case 1:
-
- #line 13 "..\..\..\..\..\Screens\Regulaer\03End.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option2_Click);
-
- #line default
- #line hidden
- return;
- case 2:
-
- #line 14 "..\..\..\..\..\Screens\Regulaer\03End.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option3_Click);
-
- #line default
- #line hidden
+ this.MainContent = ((System.Windows.Controls.ContentControl)(target));
return;
}
this._contentLoaded = true;
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.i.cs
index 4d8e078..c5d9114 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\03End.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "16A774735AFFF594D835EF08249963B0FE20FF84"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\03End.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "84C9834FBD53AB6E578CFEE13D1D1F383ED1D5C1"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -42,6 +42,14 @@ namespace InnoLabProjektDektopApp {
/// </summary>
public partial class End : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+
+ #line 11 "..\..\..\..\..\Screens\Regulaer\03End.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.ContentControl MainContent;
+
+ #line default
+ #line hidden
+
private bool _contentLoaded;
/// <summary>
@@ -63,13 +71,6 @@ namespace InnoLabProjektDektopApp {
#line hidden
}
- [System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
- return System.Delegate.CreateDelegate(delegateType, this, handler);
- }
-
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -80,20 +81,7 @@ namespace InnoLabProjektDektopApp {
switch (connectionId)
{
case 1:
-
- #line 13 "..\..\..\..\..\Screens\Regulaer\03End.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option2_Click);
-
- #line default
- #line hidden
- return;
- case 2:
-
- #line 14 "..\..\..\..\..\Screens\Regulaer\03End.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option3_Click);
-
- #line default
- #line hidden
+ this.MainContent = ((System.Windows.Controls.ContentControl)(target));
return;
}
this._contentLoaded = true;
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 434de39..be26894 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}" "090ECFC8E77AFD0E3E7CDB280240AC2AEA811D91"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FE9B267F7ECAD348F4973C1DCA899573B0B082D4"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,7 +40,7 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Statistics
/// </summary>
- public partial class Statistics : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Statistics : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
@@ -63,13 +63,6 @@ namespace InnoLabProjektDektopApp {
#line hidden
}
- [System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
- return System.Delegate.CreateDelegate(delegateType, this, handler);
- }
-
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -77,25 +70,6 @@ namespace InnoLabProjektDektopApp {
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
- switch (connectionId)
- {
- case 1:
-
- #line 13 "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option2_Click);
-
- #line default
- #line hidden
- return;
- case 2:
-
- #line 14 "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option3_Click);
-
- #line default
- #line hidden
- return;
- }
this._contentLoaded = true;
}
}
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 434de39..be26894 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}" "090ECFC8E77AFD0E3E7CDB280240AC2AEA811D91"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FE9B267F7ECAD348F4973C1DCA899573B0B082D4"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -40,7 +40,7 @@ namespace InnoLabProjektDektopApp {
/// <summary>
/// Statistics
/// </summary>
- public partial class Statistics : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+ public partial class Statistics : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
@@ -63,13 +63,6 @@ namespace InnoLabProjektDektopApp {
#line hidden
}
- [System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
- return System.Delegate.CreateDelegate(delegateType, this, handler);
- }
-
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -77,25 +70,6 @@ namespace InnoLabProjektDektopApp {
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
- switch (connectionId)
- {
- case 1:
-
- #line 13 "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option2_Click);
-
- #line default
- #line hidden
- return;
- case 2:
-
- #line 14 "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option3_Click);
-
- #line default
- #line hidden
- return;
- }
this._contentLoaded = true;
}
}
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe
index e0a257ebe93b4c1e0f06695666311ce3fa01b6f4..67a1df483690a2a8ff56a0e6a72586aa21796bd1 100644
GIT binary patch
delta 99
zcmZp;!_fdlEsR^3zG(R;GgvYt0kH{#8IU#xLJ%tvC}O~1$dCpkjexvlAUl!46eyYs
g6iWq)r2thL0M(`d*=9iT6d;+xkha}fn`ti-040eM_W%F@
delta 99
zcmZp;!_fdlEsR^3zG(SdG8i+YFc>nJ0HFl~gl7R1Nd)3#AZf;s#$W`LF=a>vvP^&?
dra))}R0$%@fx1C@lYy#@fOOJ!XKkjvOaLSj5~2VA
--
GitLab