From a7436698985671080220b65a68171fee75769262 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sun, 31 Mar 2019 17:11:29 -0400
Subject: [PATCH 1/5] Add the control hint label
---
.../View/DisplayLayoutWindow.xaml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index bd4d6668..fe7ca820 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -42,11 +42,18 @@
+
+
+
+
+
+
From 33c1ff3c714304f91f5fbb5de609f8455e6863dd Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sun, 31 Mar 2019 17:11:55 -0400
Subject: [PATCH 2/5] Add the formating skin
---
.../Skins/DisplayLayoutSkin.xaml | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
index e7ee5cdd..3dfba999 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
@@ -2,28 +2,41 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+
+
+
+
\ No newline at end of file
From 14d3d257b6030d5517e65e66499968feb822e4a9 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sun, 31 Mar 2019 17:12:37 -0400
Subject: [PATCH 3/5] Add the Control hint label text
---
.../ViewModel/DisplayLayoutViewModel.cs | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index f364b99c..669bf3c4 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -43,6 +43,7 @@ public class DisplayLayoutViewModel : ViewModelBase
private string _noLayoutWarningSecondLine;
private string _currentLayerNameTitle;
private string _currentLayerName;
+ private string _controlHintLabel;
private bool _noLayoutAvailable;
#endregion
@@ -94,6 +95,15 @@ public string CurrentLayerName
private set => Set(ref _currentLayerName, value);
}
+ ///
+ /// Gets or sets the control hint label.
+ ///
+ public string ControlHintLabel
+ {
+ get => _controlHintLabel;
+ private set => Set(ref _controlHintLabel, value);
+ }
+
///
/// Gets or sets the no layout available indicator.
///
@@ -166,6 +176,7 @@ private void SetLabelUi()
NoLayoutWarningSecondLine = "Please, go to the settings and update the layout.";
CurrentLayerNameTitle = "Current layer :";
CurrentLayerName = "";
+ ControlHintLabel = "Press 'Space' to display next layer";
}
private async void LoadCompleteLayout()
From 0f49be10bb64fc4431d02afe6fcd815a43a1311a Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sun, 31 Mar 2019 17:14:47 -0400
Subject: [PATCH 4/5] Validate the new Control Hint label
---
.../ViewModel/DisplayLayoutViewModelTest.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs b/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
index 8ccd012b..96067371 100644
--- a/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
@@ -11,7 +11,7 @@ namespace InvvardDev.EZLayoutDisplay.Tests.ViewModel
public class DisplayLayoutViewModelTest
{
[ Fact ]
- public void DisplayLayoutViewModelConstructor()
+ public void DisplayLayoutViewModel_Constructor()
{
//Arrange
var mockWindowService = new Mock();
@@ -40,6 +40,7 @@ public void DisplayLayoutViewModelConstructor()
Assert.Equal("Please, go to the settings and update the layout.", displayLayoutViewModel.NoLayoutWarningSecondLine);
Assert.Equal("Current layer :", displayLayoutViewModel.CurrentLayerNameTitle);
Assert.Equal("", displayLayoutViewModel.CurrentLayerName);
+ Assert.Equal("Press 'Space' to display next layer", displayLayoutViewModel.ControlHintLabel);
}
[ Fact ]
From c3ffbed3bb36fcfe0222d0975ea621b7a8b2be82 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sun, 31 Mar 2019 17:22:35 -0400
Subject: [PATCH 5/5] Reduce Control hint label font size
---
.../Skins/DisplayLayoutSkin.xaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
index 3dfba999..cb570f99 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
@@ -9,7 +9,6 @@