From da4dd3d76d5a6c5449b5512f13c373d4e2b5dcfd Mon Sep 17 00:00:00 2001
From: Royce551 <poohwie2005@gmail.com>
Date: Mon, 3 May 2021 21:51:52 -0500
Subject: [PATCH] Add native menubar on mac n' cheese

---
 .../Backends/FmpBassBackend.dll               | Bin 7168 -> 7168 bytes
 .../Views/MainWindow.axaml                    |  26 ++++++++++++++++++
 .../Views/MainWindow.axaml.cs                 |  19 +++++++------
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Backends/FmpBassBackend.dll b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Backends/FmpBassBackend.dll
index ce5d5829ae3ff6a1cf97f6b826d286687b266ebe..95e176ff34ae37a476f72741b23888cc98f3c06d 100644
GIT binary patch
delta 761
zcmYjPTS!z<6kYq=hcn|i%~P8i(`j_P-p2P62}Ck_z`#gJ6j_Q8^wX3dC2BqpdO$?O
zkq|$k$A?7}#31>YkCCt-sGq+23H%ZI2+IgUDB5?LpbK}Mz1G?H>~+_@lkJo3cW$V!
z)Q<Votq?7zo}8d_lBi0nXatVSu!zZ%R7F`iMH9ifCgiTei~<^VMgZpyfaGeRO(sN!
zPRSyrqp#8^102b61|!TMh6uQ5xB%VQYl-}vBWj)zqpYiyH6m*I$17M%Rx+54VpOo6
zj9LV~dI4)LOCB$bDtTXNi&y6kXw5g8Iksi&<JH*15OXR+L2G1;iD}gQud|`Nt_;=X
zYFVMyx@x&6$=u=e3Zq{3tKCJMfFoM)*NZ7%sMW>n!|}-{%6?x}*q|6w8I5N7RV}3!
z>C#MlLIWb>Kt^_HzS5tCz<#zK={<&KC*Zc~L%m13dF_^$v;)+VUeG?%-~~1XOkotK
zNyD`q+n_DdQGl5|d#|{eeaN$I-m_sn&qBJzHgjwWQFV}Ph;h=uI@x*84qKXR0qP3U
z9L*w31GtA2TJ=Y8!k~FPfHmwRr<`U~^hH*-X^k<YuYt&`kD;2@wOQF?FQGMg-hQ2)
z%Ww8~jviz&$Q?lXwPQqg`|3hhR@=<3rSB9kJo@9QOn7Eh4Z<ZiJT>W{R}q1cm6s1e
z@dSTSyy1J8gC3R*{t~T|1MZY@f5hGYtRd4kFmrI_?Qr(X-Iau#^e;E&#f5*Ob<o*q
u=h9+zcK67yo0o6r|4-}1A6s>KDqKu+ayl@Pb`@_cBGZ)i?AoMMeZe2d8l!sv

delta 810
zcmYjPUr1A76#sqS{o}Ugnsd{Xk*(#tyH1@>)WYZ?EhR)@nJpwRgD9lcte`Y?zSx7<
z#)lwLgb-0s5zdH7A<;um74%T_kY*1>1Qk9m`g88Q4}EZd=lp)>+;a}+`zBf@T2fc!
zdxxWQ>1i)}kiOf;jtIu8lr0UwLE+;e5o1+sQ6$-T*-Qla(?Q6g!0iX*%>Wb6Jk6qq
zKVgSNp|mUJ(<%U4d>eu0BM9&W1I}m;K-IPzf_{{bkR(^u@PO_fqdK<u4g$S_k8slC
zl?Fj^n8WBvQjrT<K-`j=yR>|PCNnXZXX~0yR@+JtvP+3Fqgyo*T?_rM(=etkCF=6N
z(BxW24dujZ3G6Pe)rsSBTVXx1K*7c=LGefqHqt(9E5*Fx&t-`Q<fAg7M#I^3<}|kA
zz|<^C%V`@;8$n5H6fQ;I*`WabF<_Bwt4e<KT;k;E6T`+&KR1y^*54aN$PO5l{QG-5
z+sL+x^U7Y<n8_+%+2AP}9Y|sX{Y=4Ro_%KPOho}wCVM40iM=*ij$#&kFqv01*ta}O
zA|MYk3yiA()|i!IR>&E};$cxA8^9dWXi{&$4vo!Y9!8t@bPM+hC3S(699t&zs>@)^
zrH&%V)|BVucVm?FKD>n+f8{UmVin6`*gD1Th+o#1mToLzfbueLY?oB$9)I@cfwT2p
z+4iY`9=Xsi`itg7uBcj7z#R@prqU&G&$Z5qPhed=^ak*Pz9G7ZA+g(Cszhk}5fO9y
zohy$$zhfc)zHE5GJDF5g#k6~=!4v}*O_2&6vwlns>a(eL1Gm3FoitvSd9EA&wzRK=
a&4{a>@pRapag^jF{xFg$D*wUK;evnTKczMR

diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml
index 3e3726c..28c3565 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml
@@ -38,6 +38,29 @@
 		<vm:MainWindowViewModel/>
 	</Design.DataContext>
 
+	<NativeMenu.Menu>
+		<NativeMenu>
+			<NativeMenuItem Header="File">
+				<NativeMenu>
+					<NativeMenuItem Header="Open..." Command="{Binding OpenTrackCommand}"/>
+					<NativeMenuItemSeperator/>
+					<NativeMenuItem Header="Import Tracks" Command="{Binding BrowseTracksCommand}"/>
+					<NativeMenuItem Header="Import Folders" Command="{Binding BrowseFoldersCommand}"/>
+					<NativeMenuItem Header="Import Playlist Files" Command="{Binding BrowsePlaylistFilesCommand}"/>
+				</NativeMenu>
+			</NativeMenuItem>
+			<NativeMenuItem Header="Playback">
+				<NativeMenu>
+					<NativeMenuItem Header="What could go here!"/>
+				</NativeMenu>
+			</NativeMenuItem>
+			<NativeMenuItem Header="About">
+				<NativeMenu>
+					<NativeMenuItem Header="About FRESHMusicPlayer" Command="{Binding AboutFMPCommand}"/>
+				</NativeMenu>
+			</NativeMenuItem>
+		</NativeMenu>
+	</NativeMenu.Menu>
 	<Panel>
 		<StackPanel Background="Transparent" Orientation="Horizontal" ZIndex="1" Height="50" Margin="0,0,10,0" VerticalAlignment="Top" HorizontalAlignment="Right">
 			<Button Margin="0,5">
@@ -119,6 +142,9 @@
 					</WrapPanel>
 				</Grid>
 			</Grid>
+			
+			
+				
 			<TabControl DockPanel.Dock="Top" SelectedIndex="{Binding SelectedTab}">
 				<TabItem Header="Tracks">
 					<DockPanel>
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml.cs
index 11819c5..d4f8778 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml.cs
@@ -30,15 +30,16 @@ namespace FRESHMusicPlayer.Views
 
         private void DoStuff()
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                new MessageBox().SetStuff("Did you download the wrong thing?",
-                    $"This is FRESHMusicPlayer for Mac and Linux. {Environment.NewLine}" +
-                    "Although you're free to keep using this version (we won't bother you again), " +
-                    "you'll get a better experience if you grab the Windows version from" +
-                    "https://github.com/royce551/freshmusicplayer/releases/latest. " +
-                    "If there's something you think was done better here, let us know in the issue tracker!").ShowDialog(this);
-            }
+            // TODO: reimplement as notification
+            //if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            //{
+            //    new MessageBox().SetStuff("Did you download the wrong thing?",
+            //        $"This is FRESHMusicPlayer for Mac and Linux. {Environment.NewLine}" +
+            //        "Although you're free to keep using this version (we won't bother you again), " +
+            //        "you'll get a better experience if you grab the Windows version from" +
+            //        "https://github.com/royce551/freshmusicplayer/releases/latest. " +
+            //        "If there's something you think was done better here, let us know in the issue tracker!").ShowDialog(this);
+            //}
         }
 
         private void OnClosing(object sender, CancelEventArgs e)