diff --git a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo index d066e3be0500fedbccb416aede4fe402cd1c0586..1004cf1b72e82cb36ee9573a02e6321988f6ef54 100644 Binary files a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo and b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo differ diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml index c0236af680b5fc486c8eafe4bb2b669121b6a9c6..244eb5d768db93aedf6c1405522b1d40151bb3d2 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 ef936276665f0828240052ec3de7d513ab972d5c..e669ae8bba6cf7063c42893544a4207352e86cec 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 df4a42a5ed224e1a1d3417c76ba755f76f8fd386..b3812fdff4aedf7cd077b2c3be8ad555d5eb402a 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 386854e6b4278f7bced3edf1d2495d74d4210de0..8d9fe3d9a2375212ae2c2003ec59b123e3b4da08 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 fed90d7f460371a8afb20fdb2919d571d714c62c..4cfe5b6a3b8142aa642929618deea2ab4ed833a6 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 14c450758bcb87e0784154260a4007b09a857e5d..54f8e6c6c229c266ea424d02bafe9019629ad7c2 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 c056f90fc132ff764744f9e9dd81152ca334558c..8174c40df3c875844f3afb8562ff2b7a47608e62 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 8f17528511ab5de44b7942ef84247d87f663ea91..4280c84a36fbf94e5ae6d5259df0cad794570486 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 4af139e3031e4c63dce9f102f57b1455f0c83c01..b29fa253c6655076a42aba0e4001db88fb60f786 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 0847605ade723e1c0e74a0c9746d5b8fd2211a94..99ae436d785ca03cc75b0c890aa332670203ff97 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 f079877b6a56d28f2d66c58d1ab817e29028f710..e04a61934790ae5089cd2e357b7fa21b72e596cf 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 a3d93ab2c30a6982b573edf0b7cc9058ab8205d7..46257c0e5ea7ecbf8e1cfb2a2245c82136d0e11e 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 bf4829f5fbbe7c81f20793480993219261da71bc..9703d7b868e18bb880591d4df51656b6d8efc549 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 3cc526863f4bdd89b1427376d2cb5def00fc1aa2..82aed18f398dd164a9b5576f9f79ae13116c82e5 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 161057bd8cfe821669ca4d3ca69f8af91b35f764..1c0fea9970de98fb659bce21f60ffecc15bedd0b 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 31b03826d76c2e2b3a1d325ab97f9f2585e3eadf..8f13f71d34c985ed92bbd0198614eebce54e640f 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 7d68674fc539ffdbd650bd1f4bb3c9df1ce1a512..be079bf665e4acf815756faccbd5cdfa26779353 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 94c9dcef6c23d2e47d69061a90b53fa9ad050848..da81060dc25cd6987f2ec544539621871479cdf6 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 bf37896f80081b6c222bccb81ae1a12d8ddaac5b..543037f33b79012c6fca81b457dcc7d7ef7d6aa0 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 e5c7e7b1b385bf193c28b846cd0687b45e8f95cc..17255fa93987d485fe92f666db2f33ed30f512f7 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 a73bfa9218c40705042df231c5b58e6b78434206..0a23d7ed543fdfdfc6804272625d11c832395c09 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 d3041d41cdc5c424538b4549a967c54f946e6b27..b23187bdb056f3141afe361819446e2ed32f80c1 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 a8f843b725137402aaf0917279b0f28ec4762daa..c0b7c51a50f274f63f5e427f3ede109a047a665e 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 b57efa7813c7ff3248d3260df328039c2f03a6bc..94bd2f5adc064060e4e2541f58445da37d9dadb1 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 311ba9c9145037177c6faadbaedc0f86d6986c91..df826b87183dcbd4ae4a95919b54ef5c670ea537 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 311ba9c9145037177c6faadbaedc0f86d6986c91..df826b87183dcbd4ae4a95919b54ef5c670ea537 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 afc8725aad2913d025091e0c27d15c83044a2be9..1efaccd2ac92971f7c18b62b71eb68f994399b20 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 afc8725aad2913d025091e0c27d15c83044a2be9..1efaccd2ac92971f7c18b62b71eb68f994399b20 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 589d8a350064841dadabca6c19db677494002c5c..fea875f3a2e9f2c797d9c7f2c5f915e91525011b 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 589d8a350064841dadabca6c19db677494002c5c..fea875f3a2e9f2c797d9c7f2c5f915e91525011b 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 4d8e07868dced88e79d96ec12334d2c17c97bd65..c5d911464384461e531be3cb0e9118c694f80746 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 4d8e07868dced88e79d96ec12334d2c17c97bd65..c5d911464384461e531be3cb0e9118c694f80746 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 434de39bc59e6a3deb2732572d3491af2d7c1bfd..be26894ce943e88346a3b068fdfffa12ba85e3b6 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 434de39bc59e6a3deb2732572d3491af2d7c1bfd..be26894ce943e88346a3b068fdfffa12ba85e3b6 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 Binary files a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe and b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe differ