From e81e3817c0a4b735da47e6c45529c6f88ed4d52f Mon Sep 17 00:00:00 2001
From: Andrew Lee <alee14498@protonmail.com>
Date: Mon, 8 Feb 2021 21:27:18 -0500
Subject: Moved playback to backend; Menu; Size now matches

---
 Erable/Views/MainWindow.axaml    | 23 ++++++++++++++++++-----
 Erable/Views/MainWindow.axaml.cs |  7 +++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'Erable/Views')

diff --git a/Erable/Views/MainWindow.axaml b/Erable/Views/MainWindow.axaml
index 02d362a..de6c5b7 100644
--- a/Erable/Views/MainWindow.axaml
+++ b/Erable/Views/MainWindow.axaml
@@ -5,18 +5,31 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="Erable.Views.MainWindow" 
-        Icon="/Assets/avalonia-logo.ico"
+        Width="800"
+        Height="450"
+        Icon="/Assets/erable.png"
         Title="Erable">
 
     <Design.DataContext>
         <vm:MainWindowViewModel/>
     </Design.DataContext>
     <StackPanel>
-        <TextBlock Text="{Binding Greeting}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        <DockPanel>
+            <Menu DockPanel.Dock="Top">
+                <MenuItem Header="_File">
+                    <MenuItem Header="_Open..."/>
+                    <Separator/>
+                    <MenuItem Header="_Exit" PointerPressed="InputElement_OnPointerPressed"/>
+                </MenuItem>
+                <MenuItem Header="_Help">
+                    <MenuItem Header="_About"/>
+                </MenuItem>
+            </Menu>
+        </DockPanel>
         <Button Name="PlayButton" Width="80" Command="{Binding PlayFunction}" >Play</Button>
-        <Button Name="StopButton" Width="80" >Stop</Button>
+        <Button Name="StopButton" Width="80" Command="{Binding StopFunction}">Stop</Button>
         <Button Name="BrowseButton" Width="80" Command="{Binding BrowseFunction }" >Browse</Button>
-        <Button Name="MessageBoxTest" Width="80" Command="{Binding MsgBoxTest }" >Message Box Test</Button>
-
+        <!--<Button Name="MessageBoxTest" Width="80" Command="{Binding MsgBoxTest }" >Message Box Test</Button>-->
+        <Slider Name="AudioSlider"/>
     </StackPanel>
 </Window>
diff --git a/Erable/Views/MainWindow.axaml.cs b/Erable/Views/MainWindow.axaml.cs
index 814bc0f..78cde38 100644
--- a/Erable/Views/MainWindow.axaml.cs
+++ b/Erable/Views/MainWindow.axaml.cs
@@ -1,5 +1,7 @@
+using System;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 
 namespace Erable.Views
@@ -18,5 +20,10 @@ namespace Erable.Views
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e)
+        {
+            Environment.Exit(0);
+        }
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3