Merge branch 'release/gui1.0'

GUI/Device.Pump.GUI.sln

@@ -1,9 +1,19 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30709.132
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Device.Pump.GUI", "Device.Pump.GUI.csproj", "{61A1A844-5F0F-4B94-8D8A-A64672F4E414}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Device.Pump.GUI", "Device.Pump.GUI\Device.Pump.GUI.csproj", "{61A1A844-5F0F-4B94-8D8A-A64672F4E414}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1AF2F09D-522F-4BA7-9137-5CA6AB225BA0}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		build.cake = build.cake
+		SyringePump.nsi = SyringePump.nsi
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Device.Pump", "Device.Pump\Device.Pump.csproj", "{8CAB4845-608A-4DF1-8E97-F0E25FE6769D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +25,10 @@ Global
 		{61A1A844-5F0F-4B94-8D8A-A64672F4E414}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{61A1A844-5F0F-4B94-8D8A-A64672F4E414}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61A1A844-5F0F-4B94-8D8A-A64672F4E414}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CAB4845-608A-4DF1-8E97-F0E25FE6769D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CAB4845-608A-4DF1-8E97-F0E25FE6769D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CAB4845-608A-4DF1-8E97-F0E25FE6769D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CAB4845-608A-4DF1-8E97-F0E25FE6769D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

GUI/Device.Pump.GUI/App.axaml

@@ -0,0 +1,23 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:Device.Pump.GUI"
+             x:Class="Device.Pump.App"
+             Name="Syringe Pump">
+    <Application.DataTemplates>
+        <local:ViewLocator/>
+    </Application.DataTemplates>
+
+    <Application.Styles>
+        <FluentTheme Mode="Light"/>
+        <StyleInclude Source="avares://Device.Pump.GUI/Views/Icons.axaml" />
+        <StyleInclude Source="avares://Device.Pump.GUI/Views/AccentColors.axaml" />
+        <!-- <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/> -->
+        <!-- <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/> -->
+    </Application.Styles>
+
+    <NativeMenu.Menu>
+        <NativeMenu>
+            <NativeMenuItem Header="About Syringe Pump GUI" Click="NativeMenuItem_OnClick" />
+        </NativeMenu>
+    </NativeMenu.Menu>
+</Application>

GUI/App.xaml.cs → GUI/Device.Pump.GUI/App.axaml.cs

@@ -1,12 +1,13 @@
+using System;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Device.Pump.GUI.ViewModels;
 using Device.Pump.GUI.Views;
 
-namespace Device.Pump.GUI
+namespace Device.Pump
 {
-    public class App : Application
+    public partial class App : Application
     {
         public override void Initialize()
         {
@@ -25,5 +26,13 @@ public override void OnFrameworkInitializationCompleted()
 
             base.OnFrameworkInitializationCompleted();
         }
+
+        private void NativeMenuItem_OnClick(object sender, EventArgs e)
+        { 
+            // FIXME: This should be using a Command
+            var about = new About() { DataContext = new AboutViewModel() };
+            about.ShowDialog((Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)
+                .MainWindow);
+        }
     }
-}
+}