diff --git a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/DesignTimeBuild/.dtbcache.v2 b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/DesignTimeBuild/.dtbcache.v2
index 53c26d9735f7895783a776d9f980702687f48c61..d2ab2ed8568e51dac13c16dad60ec62496e80a18 100644
Binary files a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/DesignTimeBuild/.dtbcache.v2 and b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.futdcache.v2 b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.futdcache.v2
index cd059f9dd80f33b73a37fd4bcb9dc65ba5fffb05..4a648cb94985b6e82c15d0a9d33807c8da3f06b0 100644
Binary files a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.futdcache.v2 and b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.futdcache.v2 differ
diff --git a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo
index dc42953e7e13c2e65f366e36ff4990726171c4eb..6944e43672530d865a548e8f43aa0d80b0725592 100644
Binary files a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo and b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo differ
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs
index 9a9e02ed86b5354d504823288dee5b1a00fbdfa0..d34c6c7c9bf252c8681961cf2ddc3e08df3ae9f3 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs
@@ -35,7 +35,7 @@ namespace InnoLabProjektDektopApp
private void Button_Click(object sender, RoutedEventArgs e)
{
- this.Content = new Progress().Content;
+ //
}
}
}
\ No newline at end of file
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs
index d34a07d1f38b6df13e3b19a54ecf67595b50d119..cc95495a2b156c20fe5af60cdfc0069eab919f2a 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs
@@ -26,7 +26,7 @@ namespace InnoLabProjektDektopApp
}
private void Button_Click2(object sender, RoutedEventArgs e)
{
- this.Content = new Settings().Content;
+ //this.Content = new Settings().Content;
}
private void Button_Click3(object sender, RoutedEventArgs e)
{
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
index 8312b3b94031b30fbc6c80fed79ee00b77a4bdae..0a3353f791707271925e5c03aeedcb37299d08d8 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
@@ -119,40 +119,46 @@ ToolTip="You can decide how long the focus and break period should be. The focus
</Grid.ColumnDefinitions>
<!-- Focus Period -->
- <StackPanel Grid.Column="0" Margin="10">
- <TextBlock Text="Focus period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" />
- <ComboBox x:Name="FocusPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="150" FontSize="14" Padding="5" SelectionChanged="ComboBox_SelectionChanged" IsEditable="True">
- <ComboBoxItem Content="20 minutes" />
- <ComboBoxItem Content="30 minutes" />
- <ComboBoxItem Content="40 minutes" />
- <ComboBoxItem Content="50 minutes" IsSelected="True" />
- <ComboBoxItem Content="60 minutes" />
- <ComboBoxItem Content="90 minutes" />
- <ComboBoxItem Content="120 minutes" />
- <ComboBoxItem Content="150 minutes" />
- <ComboBoxItem Content="180 minutes" />
- </ComboBox>
- </StackPanel>
-
- <!-- Break Period -->
- <StackPanel Grid.Column="1" Margin="10">
- <TextBlock Text="Break period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" />
- <ComboBox x:Name="BreakPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="150" FontSize="14" Padding="5" IsEditable="True">
- <ComboBoxItem Content="0 minutes" />
- <ComboBoxItem Content="3 minutes" />
- <ComboBoxItem Content="5 minutes" />
- <ComboBoxItem Content="10 minutes" IsSelected="True" />
- <ComboBoxItem Content="15 minutes" />
- <ComboBoxItem Content="20 minutes" />
- <ComboBoxItem Content="25 minutes" />
- <ComboBoxItem Content="30 minutes" />
- </ComboBox>
- </StackPanel>
-
- <!-- Cycles -->
+ <StackPanel Grid.Column="0" Margin="10">
+ <TextBlock Text="Focus period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" />
+ <StackPanel Orientation="Horizontal">
+ <ComboBox x:Name="FocusPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="100" FontSize="14" Padding="5" SelectionChanged="ComboBox_SelectionChanged" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">
+ <ComboBoxItem Content="20" />
+ <ComboBoxItem Content="30" />
+ <ComboBoxItem Content="40" />
+ <ComboBoxItem Content="50" IsSelected="True" />
+ <ComboBoxItem Content="60" />
+ <ComboBoxItem Content="90" />
+ <ComboBoxItem Content="120" />
+ <ComboBoxItem Content="150" />
+ <ComboBoxItem Content="180" />
+ </ComboBox>
+ <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" />
+ </StackPanel>
+ </StackPanel>
+
+ <!-- Break Period -->
+ <StackPanel Grid.Column="1" Margin="10">
+ <TextBlock Text="Break period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" />
+ <StackPanel Orientation="Horizontal">
+ <ComboBox x:Name="BreakPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="100" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">
+ <ComboBoxItem Content="0" />
+ <ComboBoxItem Content="3" />
+ <ComboBoxItem Content="5" />
+ <ComboBoxItem Content="10" IsSelected="True" />
+ <ComboBoxItem Content="15" />
+ <ComboBoxItem Content="20" />
+ <ComboBoxItem Content="25" />
+ <ComboBoxItem Content="30" />
+ </ComboBox>
+ <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" />
+ </StackPanel>
+ </StackPanel>
+
+ <!-- Cycles -->
<StackPanel Grid.Column="2" Margin="10">
<TextBlock Text="Cycles" FontSize="14" FontWeight="SemiBold" Foreground="Gray" />
- <ComboBox x:Name="CyclesComboBox" HorizontalAlignment="Left" Height="30" Width="150" FontSize="14" Padding="5" IsEditable="True">
+ <ComboBox x:Name="CyclesComboBox" HorizontalAlignment="Left" Height="30" Width="150" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">>
<ComboBoxItem Content="1" />
<ComboBoxItem Content="2" />
<ComboBoxItem Content="3" />
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
index c236c92689e8da7e76a4fcafccf525140f894269..ce2080b3ce17dddc545d441c8d158cf9cf815c1b 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
@@ -32,6 +32,10 @@ namespace InnoLabProjektDektopApp
if (MascotVisibleNo.IsChecked == true)
{
MotivationSection.Visibility = Visibility.Collapsed; // Hide the section
+
+ //uncheck motivation options
+ WordsOfAffirmationCheckBox.IsChecked = false;
+ InsultingWordsCheckBox.IsChecked = false;
}
else
{
@@ -60,18 +64,22 @@ namespace InnoLabProjektDektopApp
private void SaveSettingsButton_Click(object sender, RoutedEventArgs e)
{
- // Sammle die Einstellungen aus den Eingabefeldern
- string focusPeriod = ((ComboBoxItem)FocusPeriodComboBox.SelectedItem)?.Content.ToString() ?? "50 minutes";
- string breakPeriod = ((ComboBoxItem)BreakPeriodComboBox.SelectedItem)?.Content.ToString() ?? "10 minutes";
- string cycles = ((ComboBoxItem)CyclesComboBox.SelectedItem)?.Content.ToString() ?? "4";
+ // Sammle die Werte aus den ComboBoxen oder verwende Standardwerte
+ string focusPeriod = string.IsNullOrWhiteSpace(FocusPeriodComboBox.Text) ? "50" : FocusPeriodComboBox.Text;
+ string breakPeriod = string.IsNullOrWhiteSpace(BreakPeriodComboBox.Text) ? "10" : BreakPeriodComboBox.Text;
+ string cycles = string.IsNullOrWhiteSpace(CyclesComboBox.Text) ? "4" : CyclesComboBox.Text;
+
+ string distractionMode = DistractionModeFullBlocking.IsChecked == true
+ ? "Full-blocking mode"
+ : DistractionModeMascotFeedback.IsChecked == true
+ ? "Mascot feedback only"
+ : "seconds warning mode";
- string distractionMode = DistractionModeFullBlocking.IsChecked == true
- ? "Full-blocking mode"
- : DistractionModeMascotFeedback.IsChecked == true
- ? "Mascot feedback only"
- : $"{SecondsComboBox.SelectedItem} seconds warning mode";
+ string warningSeconds = !string.IsNullOrWhiteSpace(SecondsComboBox.Text)
+ ? SecondsComboBox.Text
+ : "10";
- string mascotVisible = MascotVisibleYes.IsChecked == true ? "Yes" : "No";
+ string mascotVisible = MascotVisibleYes.IsChecked == true ? "Yes" : "No";
bool wordsOfAffirmation = WordsOfAffirmationCheckBox.IsChecked ?? false;
bool insultingWords = InsultingWordsCheckBox.IsChecked ?? false;
@@ -87,6 +95,7 @@ private void SaveSettingsButton_Click(object sender, RoutedEventArgs e)
{ "breakPeriod", breakPeriod },
{ "cycles", cycles },
{ "distractionMode", distractionMode },
+ { "warningSeconds", warningSeconds },
{ "mascotVisibility", mascotVisible },
{ "wordsOfAffirmation", wordsOfAffirmation.ToString() },
{ "insultingWords", insultingWords.ToString() }
@@ -127,9 +136,15 @@ private void SaveSettingsButton_Click(object sender, RoutedEventArgs e)
}
+ private void ComboBox_PreviewTextInput(object sender, TextCompositionEventArgs e)
+ {
+ e.Handled = !int.TryParse(e.Text, out _);
+ }
+
- }
+
+ }
}
\ No newline at end of file
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
index 04a0e4155efa4d8cb333c443c2766ef4fe5735a2..664ad19dab9fd56268eb15743d52cab5af511adc 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
@@ -69,97 +69,99 @@ HorizontalAlignment="Left" />
Text="Settings for this session"
/>
- <Grid>
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="2*" />
- <ColumnDefinition Width="2*" />
- <ColumnDefinition Width="1*" />
- <ColumnDefinition Width="2*" />
- <ColumnDefinition Width="2*" />
- <ColumnDefinition Width="2*" />
- </Grid.ColumnDefinitions>
-
- <!-- Focus Period -->
- <StackPanel Grid.Column="0" VerticalAlignment="Center">
- <TextBlock Text="Focus period" Foreground="White" FontSize="14" FontWeight="Bold" />
- <ComboBox x:Name="FocusPeriodComboBox" Width="100" HorizontalAlignment="Left">
- <ComboBoxItem Content="20 minutes" />
- <ComboBoxItem Content="30 minutes" />
- <ComboBoxItem Content="40 minutes" />
- <ComboBoxItem Content="50 minutes" IsSelected="True" />
- <ComboBoxItem Content="60 minutes" />
- <ComboBoxItem Content="90 minutes" />
- <ComboBoxItem Content="120 minutes" />
- <ComboBoxItem Content="150 minutes" />
- <ComboBoxItem Content="180 minutes" />
- </ComboBox>
- </StackPanel>
+ <WrapPanel>
+
+ <!-- Erste Reihe -->
+ <StackPanel Grid.Row="0" Grid.Column="0" Margin="10">
+ <TextBlock Text="Focus period" FontSize="14" FontWeight="Bold" Foreground="White" />
+ <StackPanel Orientation="Horizontal">
+ <ComboBox x:Name="FocusPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="70" FontSize="14" Padding="5" SelectionChanged="ComboBox_SelectionChanged" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">
+ <ComboBoxItem Content="20" />
+ <ComboBoxItem Content="30" />
+ <ComboBoxItem Content="40" />
+ <ComboBoxItem Content="50" IsSelected="True" />
+ <ComboBoxItem Content="60" />
+ <ComboBoxItem Content="90" />
+ <ComboBoxItem Content="120" />
+ <ComboBoxItem Content="150" />
+ <ComboBoxItem Content="180" />
+ </ComboBox>
+ <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" />
+ </StackPanel>
+ </StackPanel>
- <!-- Break Period -->
- <StackPanel Grid.Column="1" VerticalAlignment="Center">
- <TextBlock Text="Break period" Foreground="White" FontSize="14" FontWeight="Bold" />
- <ComboBox x:Name="BreakPeriodComboBox" Width="100" HorizontalAlignment="Left">
- <ComboBoxItem Content="0 minutes" />
- <ComboBoxItem Content="3 minutes" />
- <ComboBoxItem Content="5 minutes" />
- <ComboBoxItem Content="10 minutes" IsSelected="True" />
- <ComboBoxItem Content="15 minutes" />
- <ComboBoxItem Content="20 minutes" />
- <ComboBoxItem Content="25 minutes" />
- <ComboBoxItem Content="30 minutes" />
- </ComboBox>
- </StackPanel>
+ <StackPanel Grid.Row="0" Grid.Column="1" Margin="10">
+ <TextBlock Text="Break period" FontSize="14" FontWeight="Bold" Foreground="White" />
+ <StackPanel Orientation="Horizontal">
+ <ComboBox x:Name="BreakPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="70" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">
+ <ComboBoxItem Content="0" />
+ <ComboBoxItem Content="3" />
+ <ComboBoxItem Content="5" />
+ <ComboBoxItem Content="10" IsSelected="True" />
+ <ComboBoxItem Content="15" />
+ <ComboBoxItem Content="20" />
+ <ComboBoxItem Content="25" />
+ <ComboBoxItem Content="30" />
+ </ComboBox>
+ <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" />
+ </StackPanel>
+ </StackPanel>
- <!-- Cycles -->
- <StackPanel Grid.Column="2" VerticalAlignment="Center">
- <TextBlock Text="Cycles" Foreground="White" FontSize="14" FontWeight="Bold" />
- <ComboBox x:Name="CyclesComboBox" Width="50" HorizontalAlignment="Left">
- <ComboBoxItem Content="1" />
- <ComboBoxItem Content="2" />
- <ComboBoxItem Content="3" />
- <ComboBoxItem Content="4" IsSelected="True" />
- <ComboBoxItem Content="5" />
- <ComboBoxItem Content="6" />
- </ComboBox>
- </StackPanel>
+ <StackPanel Grid.Row="0" Grid.Column="2" Margin="10">
+ <TextBlock Text="Cycles" FontSize="14" FontWeight="Bold" Foreground="White" />
+ <ComboBox x:Name="CyclesComboBox" HorizontalAlignment="Left" Height="30" Width="50" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">
+ <ComboBoxItem Content="1" />
+ <ComboBoxItem Content="2" />
+ <ComboBoxItem Content="3" />
+ <ComboBoxItem Content="4" IsSelected="True" />
+ <ComboBoxItem Content="5" />
+ <ComboBoxItem Content="6" />
+ </ComboBox>
+ </StackPanel>
- <!-- Distraction Mode -->
- <StackPanel Grid.Column="3" VerticalAlignment="Center">
- <TextBlock Text="Distraction Mode" Foreground="White" FontSize="14" FontWeight="Bold" />
- <ComboBox x:Name="DistractionModeComboBox" Width="140" HorizontalAlignment="Left">
- <ComboBoxItem Content="Full-blocking mode" IsSelected="True" />
- <ComboBoxItem Content="Warning mode" />
- <ComboBoxItem Content="Mascot feedback only" />
- </ComboBox>
- </StackPanel>
+ <!-- Zweite Reihe -->
+ <StackPanel Grid.Row="1" Grid.Column="0" Margin="10" x:Name="SecondsWarningPanel" >
+ <TextBlock Text="Seconds" Foreground="White" FontSize="14" FontWeight="Bold" />
+ <ComboBox x:Name="SecondsWarningComboBox" Width="50" HorizontalAlignment="Left">
+ <ComboBoxItem Content="3" />
+ <ComboBoxItem Content="5" />
+ <ComboBoxItem Content="10" IsSelected="True"/>
+ <ComboBoxItem Content="15" />
+ <ComboBoxItem Content="30" />
+ </ComboBox>
+ </StackPanel>
- <!-- Mascot Visibility -->
- <StackPanel Grid.Column="4" VerticalAlignment="Center">
- <TextBlock Text="Mascot visible" Foreground="White" FontSize="14" FontWeight="Bold" />
- <ComboBox x:Name="MascotVisibilityComboBox" Width="80" HorizontalAlignment="Left">
- <ComboBoxItem Content="Yes" IsSelected="True" />
- <ComboBoxItem Content="No" />
- </ComboBox>
- </StackPanel>
+ <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="10">
+ <TextBlock Text="Distraction Mode" Foreground="White" FontSize="14" FontWeight="Bold" />
+ <ComboBox x:Name="DistractionModeComboBox" Width="170" HorizontalAlignment="Left" SelectionChanged="DistractionMode_SelectionChanged">
+ <ComboBoxItem Content="Full-blocking mode" IsSelected="True" />
+ <ComboBoxItem Content="seconds warning mode" />
+ <ComboBoxItem Content="Mascot feedback only" />
+ </ComboBox>
+ </StackPanel>
- <!-- Motivation Options -->
- <StackPanel Grid.Column="5" VerticalAlignment="Center">
- <TextBlock Text="Motivation options" Foreground="White" FontSize="14" FontWeight="Bold" />
- <StackPanel Orientation="Horizontal" >
- <CheckBox x:Name="WordsOfAffirmationCheckBox" IsChecked="True" VerticalAlignment="Center"/>
- <TextBlock
-Style="{StaticResource StandardText}" Foreground="White"
-Text="words of affirmation" Margin="10,0,0,0"/>
+ <StackPanel Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="10" Width="150">
+ <TextBlock Text="Mascot visible" Foreground="White" FontSize="14" FontWeight="Bold" />
+ <ComboBox x:Name="MascotVisibilityComboBox" Width="80" HorizontalAlignment="Left" SelectionChanged="MascotVisibilityComboBox_SelectionChanged">
+ <ComboBoxItem Content="Yes" IsSelected="True" />
+ <ComboBoxItem Content="No" />
+ </ComboBox>
</StackPanel>
- <StackPanel Orientation="Horizontal" >
- <CheckBox x:Name="InsultingWordsCheckBox" IsChecked="True" VerticalAlignment="Center"/>
- <TextBlock
-Style="{StaticResource StandardText}" Foreground="White"
-Text="insulting words" Margin="10,0,0,0"/>
+
+ <StackPanel Grid.Row="1" Grid.Column="3" VerticalAlignment="Stretch" Margin="10" x:Name="MotivationOptionsPanel" Visibility="Collapsed">
+ <TextBlock Text="Motivation options" Foreground="White" FontSize="14" FontWeight="Bold" />
+ <StackPanel Orientation="Horizontal">
+ <CheckBox x:Name="WordsOfAffirmationCheckBox" IsChecked="True" VerticalAlignment="Center" />
+ <TextBlock Style="{StaticResource StandardText}" Foreground="White" Text="words of affirmation" Margin="10,0,0,0" />
+ </StackPanel>
+ <StackPanel Orientation="Horizontal">
+ <CheckBox x:Name="InsultingWordsCheckBox" IsChecked="True" VerticalAlignment="Center" />
+ <TextBlock Style="{StaticResource StandardText}" Foreground="White" Text="insulting words" Margin="10,0,0,0" />
+ </StackPanel>
</StackPanel>
- </StackPanel>
- </Grid>
- </StackPanel>
+ </WrapPanel>
+
+ </StackPanel>
</Border>
<TextBlock Text="Optional: What do you want to focus on during this session? (Premium)" Foreground="Gray" FontSize="14" FontWeight="Bold" Margin="0,20,0,0"/>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
index 50efb6f3cce4000bf07e602deaa677d0527a8d56..1a54142f4748f7d5596ce10a02074a551883f58f 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
@@ -3,6 +3,7 @@ using System.IO;
using System.Text.Json;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Input;
namespace InnoLabProjektDektopApp
{
@@ -33,6 +34,7 @@ namespace InnoLabProjektDektopApp
{
try
{
+ // JSON-Datei lesen
// JSON-Datei lesen
if (File.Exists(SettingsFilePath))
{
@@ -47,21 +49,21 @@ namespace InnoLabProjektDektopApp
if (profileSettings.TryGetProperty("focusPeriod", out var focusPeriodElement))
{
string focusPeriod = focusPeriodElement.GetString();
- FocusPeriodComboBox.SelectedItem = FindComboBoxItem(FocusPeriodComboBox, focusPeriod);
+ FocusPeriodComboBox.Text = focusPeriod;
}
// Break Period
if (profileSettings.TryGetProperty("breakPeriod", out var breakPeriodElement))
{
string breakPeriod = breakPeriodElement.GetString();
- BreakPeriodComboBox.SelectedItem = FindComboBoxItem(BreakPeriodComboBox, breakPeriod);
+ BreakPeriodComboBox.Text = breakPeriod;
}
// Cycles
if (profileSettings.TryGetProperty("cycles", out var cyclesElement))
{
string cycles = cyclesElement.GetString();
- CyclesComboBox.SelectedItem = FindComboBoxItem(CyclesComboBox, cycles);
+ CyclesComboBox.Text = cycles;
}
// Distraction Mode
@@ -69,6 +71,39 @@ namespace InnoLabProjektDektopApp
{
string distractionMode = distractionModeElement.GetString();
DistractionModeComboBox.SelectedItem = FindComboBoxItem(DistractionModeComboBox, distractionMode);
+
+ // Zusätzliche ComboBox für Sekunden aktivieren, wenn Modus "seconds warning mode" ist
+ if (distractionMode == "seconds warning mode")
+ {
+ SecondsWarningComboBox.Visibility = Visibility.Visible;
+
+
+ }
+ else
+ {
+ SecondsWarningComboBox.Visibility = Visibility.Collapsed;
+ }
+ }
+
+ //Get information about seconds
+ if (profileSettings.TryGetProperty("warningSeconds", out var warningSecondsElement))
+ {
+ string warningSeconds = warningSecondsElement.GetString();
+
+ // Überprüfen, ob der Wert existiert, andernfalls auf Standard setzen
+ var item = SecondsWarningComboBox.Items
+ .OfType<ComboBoxItem>()
+ .FirstOrDefault(i => i.Content.ToString() == warningSeconds);
+
+ if (item != null)
+ {
+ SecondsWarningComboBox.SelectedItem = item;
+ }
+ else
+ {
+ // Setze einen Standardwert, falls der gespeicherte Wert ungültig ist
+ SecondsWarningComboBox.SelectedItem = "10"; // Default: "10"
+ }
}
// Mascot Visibility
@@ -76,8 +111,19 @@ namespace InnoLabProjektDektopApp
{
string mascotVisibility = mascotVisibilityElement.GetString();
MascotVisibilityComboBox.SelectedItem = FindComboBoxItem(MascotVisibilityComboBox, mascotVisibility);
+
+ // Überprüfen, ob es "No" ist
+ if (mascotVisibility == "No")
+ {
+ MotivationOptionsPanel.Visibility = Visibility.Collapsed;
+ }
+ else
+ {
+ MotivationOptionsPanel.Visibility = Visibility.Visible;
+ }
}
+
// Checkbox: Words of Affirmation
if (profileSettings.TryGetProperty("wordsOfAffirmation", out var wordsOfAffirmationElement))
{
@@ -174,5 +220,58 @@ namespace InnoLabProjektDektopApp
this.NavigationService.Navigate(new Session(focusPeriod, breakPeriod, cycles, distractionMode, mascotVisible, wordsOfAffirmation, insultingWords));
}
+ private void ComboBox_PreviewTextInput(object sender, TextCompositionEventArgs e)
+ {
+ e.Handled = !int.TryParse(e.Text, out _);
+ }
+
+ private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+
+ }
+
+ private void DistractionMode_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ if (DistractionModeComboBox.SelectedItem != null &&
+ DistractionModeComboBox.SelectedItem.ToString().Contains("seconds warning mode"))
+ {
+ SecondsWarningPanel.Visibility = Visibility.Visible;
+
+ // Setze einen Standardwert, falls keiner ausgewählt ist
+ if (SecondsWarningComboBox.SelectedItem == null)
+ {
+ SecondsWarningComboBox.SelectedItem = "10"; // Default: "10"
+ }
+ }
+ else
+ {
+ SecondsWarningPanel.Visibility = Visibility.Collapsed;
+ }
+ }
+
+ private void MascotVisibilityComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ if (MascotVisibilityComboBox.SelectedItem is ComboBoxItem selectedItem)
+ {
+ string selectedValue = selectedItem.Content.ToString();
+ if (MotivationOptionsPanel == null) return;
+
+
+ // MotivationOptionsPanel wird sichtbar oder verborgen
+ if (selectedValue == "No")
+ {
+ MotivationOptionsPanel.Visibility = Visibility.Collapsed;
+ WordsOfAffirmationCheckBox.IsChecked = false;
+ InsultingWordsCheckBox.IsChecked = false;
+ }
+ else
+ {
+ MotivationOptionsPanel.Visibility = Visibility.Visible;
+ }
+ }
+ }
+
+
+
}
}
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 17255fa93987d485fe92f666db2f33ed30f512f7..c56ac4d6536d82d450cb5ff521b84f748651a13a 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("CoFlow")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c9b946b3346a901f02ac1a59efe2d304d269d6df")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b8199ce351b70646617289c7b40d7b08cb30f644")]
[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 0a23d7ed543fdfdfc6804272625d11c832395c09..d687c0cd2372193f119f3140f2102453f7910c70 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache
@@ -1 +1 @@
-b7d380ae506091cf46ecb3e50bb6cc8fd2d969c30cb9e882f33b68be45a03700
+eb30c911c9974992b249d2c54f3e85084a8fbc7155b8da806798b1d8a9572e4d
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 90b0e3d40c00dcf4f7bff1530a114dbf53d46ebd..af4bf9eed0bcb34a00a96d13f17fa17bf8c89bb4 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3091AF73E4DCD404239266588D489CB937D8EFD9"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "52D23A0064CD987DE513B625A2CB3D7A7294BC6C"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox FocusPeriodComboBox;
@@ -115,7 +115,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 140 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 144 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox BreakPeriodComboBox;
@@ -123,7 +123,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 155 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 161 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox CyclesComboBox;
@@ -199,21 +199,39 @@ namespace InnoLabProjektDektopApp {
case 9:
this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
- #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
+ #line default
+ #line hidden
+
+ #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ this.FocusPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
#line default
#line hidden
return;
case 10:
this.BreakPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 144 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ this.BreakPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
+ #line default
+ #line hidden
return;
case 11:
this.CyclesComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 161 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ this.CyclesComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
+ #line default
+ #line hidden
return;
case 12:
- #line 168 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 174 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveSettingsButton_Click);
#line default
@@ -221,7 +239,7 @@ namespace InnoLabProjektDektopApp {
return;
case 13:
- #line 171 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 177 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToOverviewButton_Click);
#line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs
index 90b0e3d40c00dcf4f7bff1530a114dbf53d46ebd..af4bf9eed0bcb34a00a96d13f17fa17bf8c89bb4 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3091AF73E4DCD404239266588D489CB937D8EFD9"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "52D23A0064CD987DE513B625A2CB3D7A7294BC6C"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox FocusPeriodComboBox;
@@ -115,7 +115,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 140 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 144 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox BreakPeriodComboBox;
@@ -123,7 +123,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 155 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 161 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox CyclesComboBox;
@@ -199,21 +199,39 @@ namespace InnoLabProjektDektopApp {
case 9:
this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
- #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
+ #line default
+ #line hidden
+
+ #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ this.FocusPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
#line default
#line hidden
return;
case 10:
this.BreakPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 144 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ this.BreakPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
+ #line default
+ #line hidden
return;
case 11:
this.CyclesComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 161 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ this.CyclesComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
+ #line default
+ #line hidden
return;
case 12:
- #line 168 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 174 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveSettingsButton_Click);
#line default
@@ -221,7 +239,7 @@ namespace InnoLabProjektDektopApp {
return;
case 13:
- #line 171 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+ #line 177 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToOverviewButton_Click);
#line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs
index 6f863d363050778c912f8dafd3c1bcf9bb866168..05fdd91486dd58554d892174dc1e4ed9988ba558 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "27EFD47612E883094FA6DDB67E9E552CC96BCE5B"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "455C6EF69FB9B51C9247D43B3EE496D7D697FBAC"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -43,7 +43,7 @@ namespace InnoLabProjektDektopApp {
public partial class Overview : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
- #line 85 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 78 "..\..\..\..\..\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 101 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 96 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox BreakPeriodComboBox;
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 116 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 112 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox CyclesComboBox;
@@ -67,7 +67,23 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 129 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 123 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.StackPanel SecondsWarningPanel;
+
+ #line default
+ #line hidden
+
+
+ #line 125 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.ComboBox SecondsWarningComboBox;
+
+ #line default
+ #line hidden
+
+
+ #line 136 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox DistractionModeComboBox;
@@ -75,7 +91,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 139 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 145 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox MascotVisibilityComboBox;
@@ -83,7 +99,15 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 149 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 151 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.StackPanel MotivationOptionsPanel;
+
+ #line default
+ #line hidden
+
+
+ #line 154 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox WordsOfAffirmationCheckBox;
@@ -91,7 +115,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 155 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 158 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox InsultingWordsCheckBox;
@@ -99,7 +123,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 169 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 171 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox FocusTopicInputBox;
@@ -107,7 +131,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 178 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 180 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock FocusTopicPlaceholder;
@@ -162,40 +186,85 @@ namespace InnoLabProjektDektopApp {
return;
case 3:
this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 78 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
+
+ #line default
+ #line hidden
+
+ #line 78 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.FocusPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
+ #line default
+ #line hidden
return;
case 4:
this.BreakPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 96 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.BreakPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
+ #line default
+ #line hidden
return;
case 5:
this.CyclesComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 112 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.CyclesComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
+ #line default
+ #line hidden
return;
case 6:
- this.DistractionModeComboBox = ((System.Windows.Controls.ComboBox)(target));
+ this.SecondsWarningPanel = ((System.Windows.Controls.StackPanel)(target));
return;
case 7:
- this.MascotVisibilityComboBox = ((System.Windows.Controls.ComboBox)(target));
+ this.SecondsWarningComboBox = ((System.Windows.Controls.ComboBox)(target));
return;
case 8:
- this.WordsOfAffirmationCheckBox = ((System.Windows.Controls.CheckBox)(target));
+ this.DistractionModeComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 136 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.DistractionModeComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.DistractionMode_SelectionChanged);
+
+ #line default
+ #line hidden
return;
case 9:
- this.InsultingWordsCheckBox = ((System.Windows.Controls.CheckBox)(target));
+ this.MascotVisibilityComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 145 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.MascotVisibilityComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.MascotVisibilityComboBox_SelectionChanged);
+
+ #line default
+ #line hidden
return;
case 10:
+ this.MotivationOptionsPanel = ((System.Windows.Controls.StackPanel)(target));
+ return;
+ case 11:
+ this.WordsOfAffirmationCheckBox = ((System.Windows.Controls.CheckBox)(target));
+ return;
+ case 12:
+ this.InsultingWordsCheckBox = ((System.Windows.Controls.CheckBox)(target));
+ return;
+ case 13:
this.FocusTopicInputBox = ((System.Windows.Controls.TextBox)(target));
- #line 177 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 179 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
this.FocusTopicInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.FocusTopicInputBox_TextChanged);
#line default
#line hidden
return;
- case 11:
+ case 14:
this.FocusTopicPlaceholder = ((System.Windows.Controls.TextBlock)(target));
return;
- case 12:
+ case 15:
- #line 190 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 192 "..\..\..\..\..\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 6f863d363050778c912f8dafd3c1bcf9bb866168..05fdd91486dd58554d892174dc1e4ed9988ba558 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "27EFD47612E883094FA6DDB67E9E552CC96BCE5B"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "455C6EF69FB9B51C9247D43B3EE496D7D697FBAC"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -43,7 +43,7 @@ namespace InnoLabProjektDektopApp {
public partial class Overview : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
- #line 85 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 78 "..\..\..\..\..\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 101 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 96 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox BreakPeriodComboBox;
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 116 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 112 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox CyclesComboBox;
@@ -67,7 +67,23 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 129 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 123 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.StackPanel SecondsWarningPanel;
+
+ #line default
+ #line hidden
+
+
+ #line 125 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.ComboBox SecondsWarningComboBox;
+
+ #line default
+ #line hidden
+
+
+ #line 136 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox DistractionModeComboBox;
@@ -75,7 +91,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 139 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 145 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox MascotVisibilityComboBox;
@@ -83,7 +99,15 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 149 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 151 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.StackPanel MotivationOptionsPanel;
+
+ #line default
+ #line hidden
+
+
+ #line 154 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox WordsOfAffirmationCheckBox;
@@ -91,7 +115,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 155 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 158 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox InsultingWordsCheckBox;
@@ -99,7 +123,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 169 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 171 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox FocusTopicInputBox;
@@ -107,7 +131,7 @@ namespace InnoLabProjektDektopApp {
#line hidden
- #line 178 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 180 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock FocusTopicPlaceholder;
@@ -162,40 +186,85 @@ namespace InnoLabProjektDektopApp {
return;
case 3:
this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 78 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
+
+ #line default
+ #line hidden
+
+ #line 78 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.FocusPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
+ #line default
+ #line hidden
return;
case 4:
this.BreakPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 96 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.BreakPeriodComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
+ #line default
+ #line hidden
return;
case 5:
this.CyclesComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 112 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.CyclesComboBox.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.ComboBox_PreviewTextInput);
+
+ #line default
+ #line hidden
return;
case 6:
- this.DistractionModeComboBox = ((System.Windows.Controls.ComboBox)(target));
+ this.SecondsWarningPanel = ((System.Windows.Controls.StackPanel)(target));
return;
case 7:
- this.MascotVisibilityComboBox = ((System.Windows.Controls.ComboBox)(target));
+ this.SecondsWarningComboBox = ((System.Windows.Controls.ComboBox)(target));
return;
case 8:
- this.WordsOfAffirmationCheckBox = ((System.Windows.Controls.CheckBox)(target));
+ this.DistractionModeComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 136 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.DistractionModeComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.DistractionMode_SelectionChanged);
+
+ #line default
+ #line hidden
return;
case 9:
- this.InsultingWordsCheckBox = ((System.Windows.Controls.CheckBox)(target));
+ this.MascotVisibilityComboBox = ((System.Windows.Controls.ComboBox)(target));
+
+ #line 145 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ this.MascotVisibilityComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.MascotVisibilityComboBox_SelectionChanged);
+
+ #line default
+ #line hidden
return;
case 10:
+ this.MotivationOptionsPanel = ((System.Windows.Controls.StackPanel)(target));
+ return;
+ case 11:
+ this.WordsOfAffirmationCheckBox = ((System.Windows.Controls.CheckBox)(target));
+ return;
+ case 12:
+ this.InsultingWordsCheckBox = ((System.Windows.Controls.CheckBox)(target));
+ return;
+ case 13:
this.FocusTopicInputBox = ((System.Windows.Controls.TextBox)(target));
- #line 177 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 179 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
this.FocusTopicInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.FocusTopicInputBox_TextChanged);
#line default
#line hidden
return;
- case 11:
+ case 14:
this.FocusTopicPlaceholder = ((System.Windows.Controls.TextBlock)(target));
return;
- case 12:
+ case 15:
- #line 190 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+ #line 192 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StartButton_Click);
#line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs
index 1ad8c263004c8d92e2be784efdc0bb18af385767..11f232608ab147fef0af19e8fb263cba40fb5dc3 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B7879C038C97A981468360F56AAAC9CA70CFB68E"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "01B55004193E3CC05C4C67CFCD081BC8DD5D338C"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs
index 1ad8c263004c8d92e2be784efdc0bb18af385767..11f232608ab147fef0af19e8fb263cba40fb5dc3 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B7879C038C97A981468360F56AAAC9CA70CFB68E"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "01B55004193E3CC05C4C67CFCD081BC8DD5D338C"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe
index 67a1df483690a2a8ff56a0e6a72586aa21796bd1..2498a476f362f84331e9f6f8eb5ccf99f50fb54f 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