From 58aaf05673960ea433fd0c0dd2f18e6546a81777 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Tue, 28 May 2024 11:50:30 +0200
Subject: [PATCH] temp commit before merge

---
 BeWoLauncher/LauncherWindow.xaml                     |  8 +++++++-
 BeWoLauncher/LauncherWindow.xaml.cs                  | 12 +++++++++++-
 BeWoLauncher/Logic/Behavior/LaunchBehavior.cs        |  1 +
 BeWoLauncher/Logic/Controller/DownloadController.cs  |  7 +++++++
 BeWoLauncher/Logic/Utils/Download/DownloadManager.cs |  9 +++++++--
 BeWoLauncher/Logic/ViewBuilder.cs                    |  2 +-
 BeWoLauncher/View/Frames/InfoFrame.xaml              |  2 +-
 BeWoLauncher/View/Frames/InstallInfoFrame.xaml       |  2 +-
 BeWoLauncher/View/Frames/LoadingFrame.xaml           |  8 ++++----
 BeWoLauncher/View/LoginView.xaml                     | 12 ++++++------
 SharedLauncher/Extensions/PathExtensions.cs          |  4 ++--
 11 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/BeWoLauncher/LauncherWindow.xaml b/BeWoLauncher/LauncherWindow.xaml
index 8f5f7dabf..cd992fcbf 100644
--- a/BeWoLauncher/LauncherWindow.xaml
+++ b/BeWoLauncher/LauncherWindow.xaml
@@ -7,7 +7,13 @@
         xmlns:local="clr-namespace:BeWoLauncher"
         mc:Ignorable="d"
         Title="BeWoLauncher" Height="1080" Width="1920" WindowStartupLocation="CenterScreen" WindowState="Maximized" BorderThickness="1" Closing="MainWindow_OnClosing"
-        Background="{StaticResource LoginBackground}" KeyDown="Window_KeyDown" KeyUp="Window_KeyUp">
+        Background="{StaticResource LoginBackground}"  KeyDown="Window_KeyDown" KeyUp="Window_KeyUp" PreviewKeyDown="Window_PreviewKeyDown" PreviewKeyUp="Window_PreviewKeyUp">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="Foreground" Value="#FF000000" />
+            <Setter Property="FontSize" Value="12" />
+        </Style>
+    </Window.Resources>
     <Grid x:Name="rootGrid2" Margin="0,0,0,0">
         <Grid x:Name="rootGrid" SizeChanged="RootGrid_SizeChanged" Margin="0,0,0,0">
         </Grid>
diff --git a/BeWoLauncher/LauncherWindow.xaml.cs b/BeWoLauncher/LauncherWindow.xaml.cs
index 2f9c05b6e..35f30aecd 100644
--- a/BeWoLauncher/LauncherWindow.xaml.cs
+++ b/BeWoLauncher/LauncherWindow.xaml.cs
@@ -138,6 +138,16 @@ namespace BeWoLauncher
         }
 
         private void Window_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            
+        }
+
+        private void Window_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            
+        }
+
+        private void Window_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
         {
             if (e.Key == System.Windows.Input.Key.Delete)
             {
@@ -145,7 +155,7 @@ namespace BeWoLauncher
             }
         }
 
-        private void Window_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
+        private void Window_PreviewKeyUp(object sender, System.Windows.Input.KeyEventArgs e)
         {
             if (e.Key == System.Windows.Input.Key.Delete)
             {
diff --git a/BeWoLauncher/Logic/Behavior/LaunchBehavior.cs b/BeWoLauncher/Logic/Behavior/LaunchBehavior.cs
index 9071ad49e..c75cb094c 100644
--- a/BeWoLauncher/Logic/Behavior/LaunchBehavior.cs
+++ b/BeWoLauncher/Logic/Behavior/LaunchBehavior.cs
@@ -47,6 +47,7 @@ namespace BeWoLauncher.Logic.Behavior
             {
                 if (UninstallMode)
                 {
+                    DownloadController.GetDeleteplan();
                     ViewBehavior.ShowUninstallInfo();
                     EndWaiting();
                 }
diff --git a/BeWoLauncher/Logic/Controller/DownloadController.cs b/BeWoLauncher/Logic/Controller/DownloadController.cs
index bddf17f85..0a632007a 100644
--- a/BeWoLauncher/Logic/Controller/DownloadController.cs
+++ b/BeWoLauncher/Logic/Controller/DownloadController.cs
@@ -26,6 +26,13 @@ namespace BeWoLauncher.Logic.Controller
             GenericTextLogger.Init(LauncherPaths.GetLoggerPath());
         }
 
+        public static void GetDeleteplan()
+        {
+            Manager = new DownloadManager();
+
+            Manager.GetDeletePlan();
+        }
+
         public static void GetCurrentUpdateplan(Action endWaiting = null)
         {
             bool not_called = true;
diff --git a/BeWoLauncher/Logic/Utils/Download/DownloadManager.cs b/BeWoLauncher/Logic/Utils/Download/DownloadManager.cs
index b72c7af82..6b7c3f082 100644
--- a/BeWoLauncher/Logic/Utils/Download/DownloadManager.cs
+++ b/BeWoLauncher/Logic/Utils/Download/DownloadManager.cs
@@ -44,6 +44,11 @@ namespace BeWoLauncher.Logic.Utils.Download
 
         }
 
+        public void GetDeletePlan()
+        {
+
+        }
+
         public void GetUpdatePlan()
         {
             GenericTextLogger.Post("Lokale Dateien werden berechnet. Request wird erstellt.");
@@ -140,7 +145,7 @@ namespace BeWoLauncher.Logic.Utils.Download
                 Feedback((int)LauncherProgress.DownloadUpdate, new DownloadProgressEventArgs(size, file2request));
             }
 
-            DownloadFolder.Unlock();
+            DownloadFolder.Unlock(SkipLock);
         }
         public void Apply()
         {
@@ -183,7 +188,7 @@ namespace BeWoLauncher.Logic.Utils.Download
 
             DownloadFolder.ClearFolder();
 
-            ApplyFolder.Unlock();
+            ApplyFolder.Unlock(SkipLock);
         }
 
         private void CreateUpdatePlanRequest()
diff --git a/BeWoLauncher/Logic/ViewBuilder.cs b/BeWoLauncher/Logic/ViewBuilder.cs
index 71db5abba..f9077cd8e 100644
--- a/BeWoLauncher/Logic/ViewBuilder.cs
+++ b/BeWoLauncher/Logic/ViewBuilder.cs
@@ -121,7 +121,7 @@ namespace BeWoLauncher.Logic
 
         private FrameBase getUninstallProgressFrame()
         {
-            var progress = new ProgressFrame(LauncherMode.Update);
+            var progress = new ProgressFrame(LauncherMode.Uninstall);
 
             progress.Successful += ViewBehavior.UninstallSuccess;
             progress.Exception += ViewBehavior.UninstallFailed;
diff --git a/BeWoLauncher/View/Frames/InfoFrame.xaml b/BeWoLauncher/View/Frames/InfoFrame.xaml
index e82888b24..e876cb9a2 100644
--- a/BeWoLauncher/View/Frames/InfoFrame.xaml
+++ b/BeWoLauncher/View/Frames/InfoFrame.xaml
@@ -13,7 +13,7 @@
                 <Button x:Name="btnCopy" Width="70" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,5,0" Click="Button_Click">Kopieren</Button>
                 <Button Width="200" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0" Click="Button_Click_1">Zurück zum Login</Button>
             </StackPanel>
-            <ScrollViewer DockPanel.Dock="Top" FontSize="12"  VerticalAlignment="Stretch">
+            <ScrollViewer DockPanel.Dock="Top" FontSize="12"  VerticalAlignment="Stretch" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
                 <TextBlock x:Name="txtField2">
                     Hier könnte ihre Fehlermeldung stehen!
                 </TextBlock>
diff --git a/BeWoLauncher/View/Frames/InstallInfoFrame.xaml b/BeWoLauncher/View/Frames/InstallInfoFrame.xaml
index affab4ba5..6ef9622f0 100644
--- a/BeWoLauncher/View/Frames/InstallInfoFrame.xaml
+++ b/BeWoLauncher/View/Frames/InstallInfoFrame.xaml
@@ -10,7 +10,7 @@
     
     <Grid x:Name="root" >
         <DockPanel Margin="5">
-            <Label DockPanel.Dock="Top" FontWeight="Bold">Sie sind dabei BeWoPlaner zu installieren.</Label>
+            <Label Foreground="#FF000000" FontSize="12" DockPanel.Dock="Top" FontWeight="Bold">Sie sind dabei BeWoPlaner zu installieren.</Label>
 
             <!--<StackPanel Orientation="Vertical" Margin="6">
                 <CheckBox>Desktopverknüpfung erstellen</CheckBox>
diff --git a/BeWoLauncher/View/Frames/LoadingFrame.xaml b/BeWoLauncher/View/Frames/LoadingFrame.xaml
index 11ff9f3dc..0ed48e608 100644
--- a/BeWoLauncher/View/Frames/LoadingFrame.xaml
+++ b/BeWoLauncher/View/Frames/LoadingFrame.xaml
@@ -5,11 +5,11 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:BeWoLauncher.View.Frames"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800" Loaded="UserControl_Loaded">
+             Width="400" Height="200" Loaded="UserControl_Loaded">
     <Grid>
-        <DockPanel Margin="5">
-            <Label FontSize="15" FontWeight="Bold" DockPanel.Dock="Top" HorizontalAlignment="Left" Margin="50,30,0,0">Starte BeWoPlaner</Label>
-            <ProgressBar DockPanel.Dock="Top" Height="30" IsIndeterminate="True" Margin="10" ></ProgressBar>
+        <DockPanel Margin="0">
+            <Label Foreground="#FF000000" FontSize="12" FontWeight="Bold" DockPanel.Dock="Top" HorizontalAlignment="Left" Margin="50,30,0,0">Starte BeWoPlaner</Label>
+            <ProgressBar DockPanel.Dock="Top" Height="20" IsIndeterminate="True" Margin="10" ></ProgressBar>
         </DockPanel>
     </Grid>
 </local:FrameBase>
diff --git a/BeWoLauncher/View/LoginView.xaml b/BeWoLauncher/View/LoginView.xaml
index 4566a26ee..4a0ca609e 100644
--- a/BeWoLauncher/View/LoginView.xaml
+++ b/BeWoLauncher/View/LoginView.xaml
@@ -18,7 +18,7 @@
                         <TranslateTransform X="0" Y="0" />
                     </TransformGroup>
                 </Grid.RenderTransform>
-                <Border CornerRadius="7,7,7,7" BorderThickness="2,2,2,2" Padding="5,5,5,5" BorderBrush="#FF606060" Background="{DynamicResource LoginBackgroundColor}" KeyDown="UIElement_OnKeyDown" >
+                <Border CornerRadius="7,7,7,7" BorderThickness="2,2,2,2" Padding="5,5,5,5" BorderBrush="#FF606060" Background="{DynamicResource LoginBackgroundColor}" KeyDown="UIElement_OnKeyDown">
                     <Grid Opacity="1">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
@@ -35,7 +35,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
 
@@ -54,9 +54,9 @@
                         <Label Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Benutzername:" Foreground="#FF000000" Background="#00000000" />
                         <Label Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left" Content="Passwort:" Foreground="#FF000000" Background="#00000000" />
 
-                        <TextBox TabIndex="0" SnapsToDevicePixels="True" Grid.Column="2" Grid.Row="2" Margin="10,10,20,10" Height="24" x:Name="TextBox_Username" HorizontalAlignment="Stretch" Text="" GotFocus="TextBox_Username_OnGotFocus" />
+                        <TextBox TabIndex="0" VerticalContentAlignment="Center" SnapsToDevicePixels="True" Grid.Column="2" Grid.Row="2" Margin="10,10,20,10" Height="24" x:Name="TextBox_Username" HorizontalAlignment="Stretch" Text="" GotFocus="TextBox_Username_OnGotFocus" />
 
-                        <PasswordBox Margin="10,0,20,0" Height="24" Grid.Column="2" Grid.Row="3" x:Name="PasswordBox_Password" Password="" HorizontalAlignment="Stretch" GotFocus="PasswordBox_Password_OnGotFocus" TabIndex="1"/>
+                        <PasswordBox Margin="10,0,20,0" Height="24" VerticalContentAlignment="Center" Grid.Column="2" Grid.Row="3" x:Name="PasswordBox_Password" Password="" HorizontalAlignment="Stretch" GotFocus="PasswordBox_Password_OnGotFocus" TabIndex="1"/>
 
 
                         <Label x:Name="profileLabel" Grid.Column="1" Grid.Row="5" Content="Profil:" Foreground="#FF000000" FontSize="12" Visibility="Collapsed" VerticalAlignment="Center"/>
@@ -164,9 +164,9 @@
                         </ToggleButton>
 
 
-                        <StackPanel Margin="10,30,20,50" Grid.Column="2" Grid.Row="8" Orientation="Vertical" HorizontalAlignment="Stretch">
+                        <StackPanel Margin="10,30,20,45" Grid.Column="2" Grid.Row="8" Orientation="Vertical" HorizontalAlignment="Stretch">
                             <Button Height="30" x:Name="button_login" HorizontalAlignment="Stretch" Content="Anmelden" Click="button_login_Click" IsDefault="True" Foreground="White" Margin="3" />
-                            <TextBlock VerticalAlignment="Center" Visibility="Collapsed" HorizontalAlignment="Center" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" Margin="3">
+                            <TextBlock VerticalAlignment="Center" Visibility="Visible" HorizontalAlignment="Center" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" Margin="3">
 								<Hyperlink RequestNavigate="PasswortVergessenLinkOnRequestNavigate" NavigateUri="#" >
 									<TextBlock Text="Passwort vergessen" HorizontalAlignment="Center" FontSize="10" VerticalAlignment="Center" />
 								</Hyperlink>
diff --git a/SharedLauncher/Extensions/PathExtensions.cs b/SharedLauncher/Extensions/PathExtensions.cs
index 144ead075..43951636b 100644
--- a/SharedLauncher/Extensions/PathExtensions.cs
+++ b/SharedLauncher/Extensions/PathExtensions.cs
@@ -72,11 +72,11 @@ namespace BS.SharedLauncher.Extensions
 
             using (File.Create(file));
         }
-        public static void Unlock(this string path)
+        public static void Unlock(this string path, bool skiplock)
         {
             var file = Path.Combine(path, BeWoPathFileConfig.LockFileName);
 
-            if (!File.Exists(file))
+            if (!skiplock && !File.Exists(file))
                 throw new ArgumentException($"Unlock nicht möglich, Lock existiert nicht", path);
 
             File.Delete(file);