From 7928a72c77e2495558a8d08dae8ba651954c1e45 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 1 Feb 2021 20:08:04 -0500 Subject: Name change --- Alee Audio Player.csproj | 19 ------------------- Alee Audio Player.sln | 34 ---------------------------------- App.axaml | 4 ++-- App.axaml.cs | 6 +++--- Erable.csproj | 19 +++++++++++++++++++ Erable.sln | 35 +++++++++++++++++++++++++++++++++++ Program.cs | 2 +- README.md | 7 +++++-- ViewLocator.cs | 4 ++-- ViewModels/MainWindowViewModel.cs | 11 +++++++++-- ViewModels/ViewModelBase.cs | 2 +- Views/MainWindow.axaml | 11 ++++++----- Views/MainWindow.axaml.cs | 2 +- appveyor.yml | 2 +- 14 files changed, 85 insertions(+), 73 deletions(-) delete mode 100644 Alee Audio Player.csproj delete mode 100644 Alee Audio Player.sln create mode 100644 Erable.csproj create mode 100644 Erable.sln diff --git a/Alee Audio Player.csproj b/Alee Audio Player.csproj deleted file mode 100644 index 42dc411..0000000 --- a/Alee Audio Player.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - WinExe - net5.0 - enable - AleeAudioPlayer - - - - - - - - - - - - - diff --git a/Alee Audio Player.sln b/Alee Audio Player.sln deleted file mode 100644 index c735ca0..0000000 --- a/Alee Audio Player.sln +++ /dev/null @@ -1,34 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alee Audio Player", "Alee Audio Player.csproj", "{7816A5DD-C5B1-498D-9980-C36458D7465F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|x64.ActiveCfg = Debug|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|x64.Build.0 = Debug|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|x86.ActiveCfg = Debug|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|x86.Build.0 = Debug|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|Any CPU.Build.0 = Release|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|x64.ActiveCfg = Release|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|x64.Build.0 = Release|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|x86.ActiveCfg = Release|Any CPU - {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/App.axaml b/App.axaml index bfb9eef..992dbfb 100644 --- a/App.axaml +++ b/App.axaml @@ -1,7 +1,7 @@ + xmlns:local="using:Erable" + x:Class="Erable.App"> diff --git a/App.axaml.cs b/App.axaml.cs index 48cb22b..addd072 100644 --- a/App.axaml.cs +++ b/App.axaml.cs @@ -1,10 +1,10 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; -using AleeAudioPlayer.ViewModels; -using AleeAudioPlayer.Views; +using Erable.ViewModels; +using Erable.Views; -namespace AleeAudioPlayer +namespace Erable { public class App : Application { diff --git a/Erable.csproj b/Erable.csproj new file mode 100644 index 0000000..b10f530 --- /dev/null +++ b/Erable.csproj @@ -0,0 +1,19 @@ + + + WinExe + net5.0 + enable + Erable + + + + + + + + + + + + + diff --git a/Erable.sln b/Erable.sln new file mode 100644 index 0000000..70dc476 --- /dev/null +++ b/Erable.sln @@ -0,0 +1,35 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Erable", "Erable.csproj", "{7816A5DD-C5B1-498D-9980-C36458D7465F}" +i +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|x64.ActiveCfg = Debug|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|x64.Build.0 = Debug|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|x86.ActiveCfg = Debug|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Debug|x86.Build.0 = Debug|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|Any CPU.Build.0 = Release|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|x64.ActiveCfg = Release|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|x64.Build.0 = Release|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|x86.ActiveCfg = Release|Any CPU + {7816A5DD-C5B1-498D-9980-C36458D7465F}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/Program.cs b/Program.cs index b10f120..312bbb4 100644 --- a/Program.cs +++ b/Program.cs @@ -3,7 +3,7 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.ReactiveUI; -namespace AleeAudioPlayer +namespace Erable { class Program { diff --git a/README.md b/README.md index 47d1c6a..1e97752 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ -# Alee Audio Player -An audio player written in AvaloniaUI \ No newline at end of file +# Erable Audio Player +An audio player written in AvaloniaUI + +## What does "Erable" mean? +It means maple in french. \ No newline at end of file diff --git a/ViewLocator.cs b/ViewLocator.cs index a1269cd..0a6eb01 100644 --- a/ViewLocator.cs +++ b/ViewLocator.cs @@ -1,9 +1,9 @@ using System; using Avalonia.Controls; using Avalonia.Controls.Templates; -using AleeAudioPlayer.ViewModels; +using Erable.ViewModels; -namespace AleeAudioPlayer +namespace Erable { public class ViewLocator : IDataTemplate { diff --git a/ViewModels/MainWindowViewModel.cs b/ViewModels/MainWindowViewModel.cs index e1f86e3..0c51fbd 100644 --- a/ViewModels/MainWindowViewModel.cs +++ b/ViewModels/MainWindowViewModel.cs @@ -1,13 +1,14 @@ using System; using System.Collections.Generic; using System.Text; +using Avalonia.Controls; using Gst; -namespace AleeAudioPlayer.ViewModels +namespace Erable.ViewModels { public class MainWindowViewModel : ViewModelBase { - public string Greeting => "Welcome to Alee Audio Player!"; + public string Greeting => "Welcome to Erable Audio Player!"; public void PlayFunction(string[] args) { @@ -25,5 +26,11 @@ namespace AleeAudioPlayer.ViewModels // Free resources //pipeline.SetState (State.Null); } + + public void BrowseFunction() + { + //OpenFileDialog dialog = new OpenFileDialog(); + //dialog.Filters.Add(new FileDialogFilter() {Name = "Audio Files", Extensions = {"mp3"}}); + } } } diff --git a/ViewModels/ViewModelBase.cs b/ViewModels/ViewModelBase.cs index 11bbf94..6ab8d21 100644 --- a/ViewModels/ViewModelBase.cs +++ b/ViewModels/ViewModelBase.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using ReactiveUI; -namespace AleeAudioPlayer.ViewModels +namespace Erable.ViewModels { public class ViewModelBase : ReactiveObject { diff --git a/Views/MainWindow.axaml b/Views/MainWindow.axaml index dabf29b..d580753 100644 --- a/Views/MainWindow.axaml +++ b/Views/MainWindow.axaml @@ -1,19 +1,20 @@ + Title="Erable Audio Player"> - - + + + diff --git a/Views/MainWindow.axaml.cs b/Views/MainWindow.axaml.cs index 22f6710..814bc0f 100644 --- a/Views/MainWindow.axaml.cs +++ b/Views/MainWindow.axaml.cs @@ -2,7 +2,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace AleeAudioPlayer.Views +namespace Erable.Views { public class MainWindow : Window { diff --git a/appveyor.yml b/appveyor.yml index 616fd67..c67012a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,4 +6,4 @@ build: verbosity: normal before_deploy: - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/deploy.ps1')) -- ps: 7z a AleeAudioPlayer-Windows.zip bin\Debug\net5.0 \ No newline at end of file +- ps: 7z a Erable-Windows.zip bin\Debug\net5.0 \ No newline at end of file -- cgit v1.2.3