From d60429d88bec557064ef6ea1bbad4356ba42fd25 Mon Sep 17 00:00:00 2001 From: Nathan Banks Date: Tue, 15 Jan 2019 19:32:37 +0000 Subject: [PATCH 1/2] Started work on installer and always on setting --- KeyboardDisplay/MainWindow.xaml.cs | 11 +++--- KeyboardDisplay/Window1.xaml | 1 + KeyboardDisplay/Window1.xaml.cs | 6 ++++ Output/setup.exe | Bin 0 -> 360350 bytes setupScript.iss | 56 +++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 Output/setup.exe create mode 100644 setupScript.iss diff --git a/KeyboardDisplay/MainWindow.xaml.cs b/KeyboardDisplay/MainWindow.xaml.cs index 544a3fc..0268fcf 100644 --- a/KeyboardDisplay/MainWindow.xaml.cs +++ b/KeyboardDisplay/MainWindow.xaml.cs @@ -143,7 +143,7 @@ private void ChangeDisplay() ShowChange(tokenSource.Token); } - private async void ShowChange(CancellationToken token) + private async void ShowChange(CancellationToken token, bool alwaysOn = true) { Storyboard sb = FindResource("FadeIn") as Storyboard; Storyboard.SetTarget(sb, this); @@ -160,9 +160,12 @@ private async void ShowChange(CancellationToken token) { //tokenSource.Dispose(); } - Storyboard sb2 = FindResource("FadeOut") as Storyboard; - Storyboard.SetTarget(sb2, this); - sb2.Begin(); + if (alwaysOn == false) + { + Storyboard sb2 = FindResource("FadeOut") as Storyboard; + Storyboard.SetTarget(sb2, this); + sb2.Begin(); + } } protected override void OnSourceInitialized(EventArgs e) diff --git a/KeyboardDisplay/Window1.xaml b/KeyboardDisplay/Window1.xaml index 3188a1f..56ff0b7 100644 --- a/KeyboardDisplay/Window1.xaml +++ b/KeyboardDisplay/Window1.xaml @@ -11,6 +11,7 @@