diff --git a/Inno Config.iss b/Inno Config.iss index 02478f52..372a7eae 100644 --- a/Inno Config.iss +++ b/Inno Config.iss @@ -1,6 +1,6 @@ ; Variables: #define MyAppName "RedEye" -#define MyAppVersion "1.2.0" +#define MyAppVersion "1.3.0" #define MyAppPublisher "Swerik" #define MyAppURL "https://github.com/TheSwerik/RedEye" #define MyAppExeName "RedEye.exe" diff --git a/RedEye.Backend/src/Util/Config.cs b/RedEye.Backend/src/Util/Config.cs index e4e73351..e5740a59 100644 --- a/RedEye.Backend/src/Util/Config.cs +++ b/RedEye.Backend/src/Util/Config.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using Emgu.CV.Cuda; using Microsoft.VisualBasic.FileIO; @@ -23,6 +24,10 @@ static Config() } IsCudaEnabled = GetBool("Cuda") && CudaInvoke.HasCuda; + + if (Get("ScreenshotLocation").ToLowerInvariant().Contains("default")) + Set("ScreenshotLocation", Environment.GetFolderPath(Environment.SpecialFolder.MyPictures) + @"\RedEye Screenshots"); + Directory.CreateDirectory(Get("ScreenshotLocation")); } public static void Set(string setting, string value) diff --git a/RedEye.UI/RedEye.UI.csproj b/RedEye.UI/RedEye.UI.csproj index acc8e267..abfe9747 100644 --- a/RedEye.UI/RedEye.UI.csproj +++ b/RedEye.UI/RedEye.UI.csproj @@ -10,6 +10,7 @@ 8 enable RedEye + {C3591D81-347D-4F3E-B3F2-7FD71441E0CA} diff --git a/RedEye.UI/src/App.xaml b/RedEye.UI/src/App.xaml index 9bc96aea..76241f11 100644 --- a/RedEye.UI/src/App.xaml +++ b/RedEye.UI/src/App.xaml @@ -2,8 +2,9 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:RedEye" - StartupUri="src/MainWindow.xaml"> + StartupUri="MainWindow.xaml"> + \ No newline at end of file diff --git a/RedEye.UI/src/BoolToGridRowHeightConverter.cs b/RedEye.UI/src/BoolToGridRowHeightConverter.cs new file mode 100644 index 00000000..1914334c --- /dev/null +++ b/RedEye.UI/src/BoolToGridRowHeightConverter.cs @@ -0,0 +1,21 @@ +using System; +using System.Globalization; +using System.Windows; +using System.Windows.Data; + +namespace RedEye +{ + [ValueConversion(typeof(bool), typeof(GridLength))] + public class BoolToGridRowHeightConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + return ((bool)value == true) ? new GridLength(1, GridUnitType.Star) : new GridLength(0); + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { // Don't need any convert back + return null!; + } + } +} \ No newline at end of file diff --git a/RedEye.UI/src/MainWindow.xaml b/RedEye.UI/src/MainWindow.xaml index e0a45f06..96e511c3 100644 --- a/RedEye.UI/src/MainWindow.xaml +++ b/RedEye.UI/src/MainWindow.xaml @@ -5,7 +5,8 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:RedEye" mc:Ignorable="d" - Title="MainWindow" Height="450" Width="800" Closed="Window_OnClosed" SizeChanged="Window_OnSizeChanged"> + Title="RedEye" Height="450" Width="800" Closed="Window_OnClosed" SizeChanged="Window_OnSizeChanged" + d:DataContext="{d:DesignInstance }"> @@ -15,8 +16,9 @@ + - + @@ -31,14 +33,17 @@ - + - +