From 1287af331441f635a1800d1336bb1e2dc1d66b10 Mon Sep 17 00:00:00 2001 From: iTob Date: Sun, 19 Jan 2025 18:25:10 +0100 Subject: [PATCH] wip --- src/CamBooth/CamBooth.App/App.xaml | 8 +- src/CamBooth/CamBooth.App/App.xaml.cs | 2 + src/CamBooth/CamBooth.App/CamBooth.App.csproj | 1 + .../LiveView/LiveViewPage.xaml.cs | 4 +- src/CamBooth/CamBooth.App/MainWindow.xaml | 59 +++++++++----- src/CamBooth/CamBooth.App/MainWindow.xaml.cs | 76 ++++++++++++++---- .../PictureGallery/PictureGalleryService.cs | 78 +++++++++++++++++++ .../PictureGallery/PicturePanel.xaml | 16 ++++ .../PictureGallery/PicturePanel.xaml.cs | 52 +++++++++++++ 9 files changed, 258 insertions(+), 38 deletions(-) create mode 100644 src/CamBooth/CamBooth.App/PictureGallery/PictureGalleryService.cs create mode 100644 src/CamBooth/CamBooth.App/PictureGallery/PicturePanel.xaml create mode 100644 src/CamBooth/CamBooth.App/PictureGallery/PicturePanel.xaml.cs diff --git a/src/CamBooth/CamBooth.App/App.xaml b/src/CamBooth/CamBooth.App/App.xaml index 7bb60b2..cfcaa33 100644 --- a/src/CamBooth/CamBooth.App/App.xaml +++ b/src/CamBooth/CamBooth.App/App.xaml @@ -1,8 +1,14 @@  - + + + + + + diff --git a/src/CamBooth/CamBooth.App/App.xaml.cs b/src/CamBooth/CamBooth.App/App.xaml.cs index 2e49d9d..c25cd24 100644 --- a/src/CamBooth/CamBooth.App/App.xaml.cs +++ b/src/CamBooth/CamBooth.App/App.xaml.cs @@ -7,6 +7,7 @@ using CamBooth.App.Core.AppSettings; using CamBooth.App.Core.Logging; using CamBooth.App.DebugConsole; using CamBooth.App.LiveView; +using CamBooth.App.PictureGallery; using Microsoft.Extensions.DependencyInjection; @@ -39,5 +40,6 @@ public partial class App : Application services.AddTransient(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); } } \ No newline at end of file diff --git a/src/CamBooth/CamBooth.App/CamBooth.App.csproj b/src/CamBooth/CamBooth.App/CamBooth.App.csproj index 664bf85..3d66261 100644 --- a/src/CamBooth/CamBooth.App/CamBooth.App.csproj +++ b/src/CamBooth/CamBooth.App/CamBooth.App.csproj @@ -25,6 +25,7 @@ + diff --git a/src/CamBooth/CamBooth.App/LiveView/LiveViewPage.xaml.cs b/src/CamBooth/CamBooth.App/LiveView/LiveViewPage.xaml.cs index 9f1bf13..6fcba1f 100644 --- a/src/CamBooth/CamBooth.App/LiveView/LiveViewPage.xaml.cs +++ b/src/CamBooth/CamBooth.App/LiveView/LiveViewPage.xaml.cs @@ -65,7 +65,7 @@ public partial class LiveViewPage : Page { this.OpenSession(); this.StarLiveView(); - this.SetCameraSaveToComputer(); + this.SetSettingSaveToComputer(); } string cameraDeviceNames = string.Join(", ", cameraList.Select(cam => cam.DeviceName)); @@ -81,7 +81,7 @@ public partial class LiveViewPage : Page } } - private void SetCameraSaveToComputer() + private void SetSettingSaveToComputer() { MainCamera.SetSetting(PropertyID.SaveTo, (int)SaveTo.Host); MainCamera.SetCapacity(4096, int.MaxValue); diff --git a/src/CamBooth/CamBooth.App/MainWindow.xaml b/src/CamBooth/CamBooth.App/MainWindow.xaml index 30b3815..d1ee414 100644 --- a/src/CamBooth/CamBooth.App/MainWindow.xaml +++ b/src/CamBooth/CamBooth.App/MainWindow.xaml @@ -3,43 +3,64 @@ 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:ui="http://schemas.lepo.co/wpfui/2022/xaml" xmlns:local="clr-namespace:CamBooth.App" mc:Ignorable="d" - Title="MainWindow" Width="1600" Height="900" HorizontalAlignment="Stretch"> + Title="MainWindow" + Background="Black" + Width="1600" Height="900" + HorizontalAlignment="Stretch"> - + - - - + + + + - - + + + - -