This commit is contained in:
Tobias Wohlleben 2025-01-21 23:04:34 +01:00
parent 9184c8d8ea
commit 360b34d2d6
5 changed files with 54 additions and 42 deletions

View File

@ -11,10 +11,10 @@
<Border CornerRadius="10" Background="Black" Padding="0" Opacity="0" x:Name="TimerContainer">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<!-- Fortschrittsanzeige -->
<Grid Height="100" Width="1350" Background="Gray" Margin="0,0,0,0">
<Grid Height="75" Width="1350" Background="Gray" Margin="0,0,0,0">
<Rectangle x:Name="ProgressBar"
Fill="#4CAF50"
Height="100"
Height="75"
HorizontalAlignment="Left"/>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="72">HIER EINE ANWEISUNG ANZEIGEN</TextBlock>
</Grid>

View File

@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
Title="PictureGalleryPage" Width="1600" Height="795"
Title="PictureGalleryPage" Width="1600" Height="900"
Background="Black">
<Grid>
<WrapPanel VerticalAlignment="Stretch" x:Name="PicturesPanel" Orientation="Horizontal" />

View File

@ -1,6 +1,7 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using CamBooth.App.Core.AppSettings;
@ -74,7 +75,7 @@ public partial class PictureGalleryPage : Page
Image? imageControl = new()
{
Source = thumbnail,
Width = 381,
Width = 388,
Margin = new Thickness(6)
};
hyperlink.Inlines.Add(new InlineUIContainer(imageControl));
@ -97,15 +98,19 @@ public partial class PictureGalleryPage : Page
ContentDialog? contentDialog = new(this.RootContentDialogPresenter);
Image? imageToShow = new()
{
MaxHeight = 570,
VerticalAlignment = VerticalAlignment.Center,
Source = PictureGalleryService.CreateThumbnail(picturePathUri.AbsolutePath, 499, 300)
Source = PictureGalleryService.CreateThumbnail(picturePathUri.AbsolutePath, 450, 300)
};
contentDialog.DialogWidth = 940;
contentDialog.PrimaryButtonAppearance = ControlAppearance.Success;
contentDialog.CloseButtonAppearance = ControlAppearance.Primary;
// contentDialog.DialogWidth = 800;
// contentDialog.DialogMaxHeight = 300;
// contentDialog.DialogHeight = 300;
contentDialog.VerticalAlignment = VerticalAlignment.Top;
contentDialog.PrimaryButtonAppearance = ControlAppearance.Caution;
contentDialog.CloseButtonAppearance = ControlAppearance.Dark;
//contentDialog.SetCurrentValue(ContentDialog.TitleProperty, "Hello World");
// contentDialog.SetCurrentValue(ContentDialog.TitleProperty, "Hello World");
contentDialog.SetCurrentValue(ContentControl.ContentProperty, imageToShow);
contentDialog.SetCurrentValue(ContentDialog.CloseButtonTextProperty, "Schließen");
contentDialog.SetCurrentValue(ContentDialog.PrimaryButtonTextProperty, "Drucken");

View File

@ -10,62 +10,63 @@
Title="MainWindow"
Background="Black"
Width="1600" Height="900"
WindowStyle="None"
ResizeMode="NoResize"
AllowsTransparency="True"
WindowStartupLocation="CenterScreen"
HorizontalAlignment="Stretch">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- Inhalt der ersten Zeile -->
<!-- LiveView -->
<Frame Grid.Row="0"
x:Name="MainFrame"
Margin="5 5 5 0"
NavigationUIVisibility="Hidden"
HorizontalAlignment="Center"
Background="LightBlue"
VerticalAlignment="Center"
Panel.ZIndex="0" />
<!-- Picture Gallery -->
<Frame Grid.Row="0"
x:Name="PicturePanel"
NavigationUIVisibility="Hidden"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Background="Blue"
Panel.ZIndex="1" />
<!-- Inhalt der dritten Zeile -->
<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" Visibility="Hidden" Name="TimerPanel" Background="#AA000000" Panel.ZIndex="2"
Margin="0 0 0 0">
<liveView:TimerControlRectangleAnimation x:Name="TimerControlRectangleAnimation" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" Name="ButtonPanel" Background="#AA000000" Panel.ZIndex="2"
Margin="0 0 0 0">
<ui:Button Content="Start" Click="NavToLiveView" Width="200" Height="75" VerticalAlignment="Bottom"
Margin="0 0 5 0" />
<ui:Button Content="Hide Debug" Click="SetVisibilityDebugConsole" Width="200" Height="75"
VerticalAlignment="Bottom" Margin="0 0 5 0" />
<ui:Button Content="Take Photo" Click="StartTakePhotoProcess" Width="200" Height="75" VerticalAlignment="Bottom"
Margin="0 0 5 0" />
<ui:Button Content="Pictures" Click="SetVisibilityPicturePanel" Width="200" Height="75"
VerticalAlignment="Bottom" Margin="0 0 5 0" />
<ui:Button Content="Close" Appearance="Danger" Click="CloseApp" Width="200" Height="75" VerticalAlignment="Bottom" Margin="0 0 5 0" />
</StackPanel>
<!-- Inhalt der zweiten Zeile (nimmt den verbleibenden Platz ein) -->
<!-- DebugFrame -->
<Frame Grid.Row="1"
x:Name="DebugFrame"
Margin="5"
NavigationUIVisibility="Hidden"
VerticalAlignment="Bottom"
HorizontalAlignment="Center"
Background="LightGreen"
VerticalAlignment="Bottom"
Panel.ZIndex="2" />
<!-- Inhalt der dritten Zeile (nimmt den verbleibenden Platz ein) -->
<Frame Grid.Row="1"
x:Name="PicturePanel"
Margin="5"
NavigationUIVisibility="Hidden"
HorizontalAlignment="Center"
Background="Blue"
VerticalAlignment="Bottom"
Panel.ZIndex="1" />
<!-- Inhalt der dritten Zeile -->
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Hidden" Name="TimerPanel"
Margin="0 0 5 5">
<liveView:TimerControlRectangleAnimation x:Name="TimerControlRectangleAnimation" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Name="ButtonPanel"
Margin="0 0 5 5">
<ui:Button Content="Start" Click="NavToLiveView" Width="200" Height="50" VerticalAlignment="Bottom"
Margin="0 0 5 5" />
<ui:Button Content="Hide Debug" Click="SetVisibilityDebugConsole" Width="200" Height="50"
VerticalAlignment="Bottom" Margin="0 0 5 5" />
<ui:Button Content="Take Photo" Click="StartTakePhotoProcess" Width="200" Height="50" VerticalAlignment="Bottom"
Margin="0 0 5 5" />
<ui:Button Content="Pictures" Click="SetVisibilityPicturePanel" Width="200" Height="50"
VerticalAlignment="Bottom" Margin="0 0 5 5" />
</StackPanel>
</Grid>
</Window>

View File

@ -131,4 +131,10 @@ public partial class MainWindow : Window
{
this.SetVisibilityPicturePanel(this._isPicturePanelVisible);
}
private void CloseApp(object sender, RoutedEventArgs e)
{
this.Close();
}
}