From 31959fb6552776681292574b3298216eb1f27d2d Mon Sep 17 00:00:00 2001 From: Pierre C Date: Tue, 19 Feb 2019 22:37:04 -0500 Subject: [PATCH 1/4] Add a warning sign when no layout is available --- .../App.xaml | 23 ++++++---- .../InvvardDev.EZLayoutDisplay.Desktop.csproj | 4 ++ .../Skins/Images/warning-sign.png | Bin 0 -> 25085 bytes .../Converter/BoolToVisibilityConverter.cs | 42 ++++++++++++++++++ .../View/DisplayLayoutWindow.xaml | 37 ++++++++++----- .../ViewModel/DisplayLayoutViewModel.cs | 32 +++++++++++-- 6 files changed, 116 insertions(+), 22 deletions(-) create mode 100644 src/InvvardDev.EZLayoutDisplay.Desktop/Skins/Images/warning-sign.png create mode 100644 src/InvvardDev.EZLayoutDisplay.Desktop/View/Converter/BoolToVisibilityConverter.cs diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml index e894bcff..a933b382 100644 --- a/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml +++ b/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml @@ -3,10 +3,10 @@ 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:ignore="http://www.galasoft.ch/ignore" - xmlns:viewModel="clr-namespace:InvvardDev.EZLayoutDisplay.Desktop.ViewModel" - xmlns:converter="clr-namespace:InvvardDev.EZLayoutDisplay.Desktop.View.Converter" - ShutdownMode="OnExplicitShutdown" + xmlns:ignore="http://www.galasoft.ch/ignore" + xmlns:viewModel="clr-namespace:InvvardDev.EZLayoutDisplay.Desktop.ViewModel" + xmlns:converter="clr-namespace:InvvardDev.EZLayoutDisplay.Desktop.View.Converter" + ShutdownMode="OnExplicitShutdown" StartupUri="View/MainWindow.xaml" mc:Ignorable="d ignore"> @@ -14,15 +14,22 @@ - + - + + + + + + - - + + \ No newline at end of file diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj b/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj index 3021ffcc..a2e5e6e4 100644 --- a/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj +++ b/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj @@ -152,6 +152,7 @@ AboutWindow.xaml + SettingsWindow.xaml @@ -249,6 +250,9 @@ + + +