ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temp commit before merge

Browse Source
This commit is contained in:
Rene Evertz
2024-05-28 11:50:30 +02:00
parent f3855aaebb
commit 58aaf05673
11 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BeWoLauncher/LauncherWindow.xaml
View File

@@ -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>

12
BeWoLauncher/LauncherWindow.xaml.cs
View File

@@ -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)
{

1
BeWoLauncher/Logic/Behavior/LaunchBehavior.cs
View File

@@ -47,6 +47,7 @@ namespace BeWoLauncher.Logic.Behavior
{
if (UninstallMode)
{
DownloadController.GetDeleteplan();
ViewBehavior.ShowUninstallInfo();
EndWaiting();
}

7
BeWoLauncher/Logic/Controller/DownloadController.cs
View File

@@ -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;

9
BeWoLauncher/Logic/Utils/Download/DownloadManager.cs
View File

@@ -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()

2
BeWoLauncher/Logic/ViewBuilder.cs
View File

@@ -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;

2
BeWoLauncher/View/Frames/InfoFrame.xaml
View File

@@ -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>

2
BeWoLauncher/View/Frames/InstallInfoFrame.xaml
View File

@@ -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>

8
BeWoLauncher/View/Frames/LoadingFrame.xaml
View File

@@ -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>

12
BeWoLauncher/View/LoginView.xaml
View File

@@ -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>

4
SharedLauncher/Extensions/PathExtensions.cs
View File

@@ -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);