aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <alee14498@protonmail.com>2021-02-01 20:08:04 -0500
committerAndrew Lee <alee14498@protonmail.com>2021-02-01 20:08:04 -0500
commit7928a72c77e2495558a8d08dae8ba651954c1e45 (patch)
tree29510b8e79268cb48850e2ec541ffec62af278ee
parent204c9a1cbaa4f258c374a49ad1a033dde5cf06ab (diff)
downloaderable-godot-7928a72c77e2495558a8d08dae8ba651954c1e45.tar.gz
erable-godot-7928a72c77e2495558a8d08dae8ba651954c1e45.tar.bz2
erable-godot-7928a72c77e2495558a8d08dae8ba651954c1e45.zip
Name change
-rw-r--r--App.axaml4
-rw-r--r--App.axaml.cs6
-rw-r--r--Erable.csproj (renamed from Alee Audio Player.csproj)2
-rw-r--r--Erable.sln (renamed from Alee Audio Player.sln)3
-rw-r--r--Program.cs2
-rw-r--r--README.md7
-rw-r--r--ViewLocator.cs4
-rw-r--r--ViewModels/MainWindowViewModel.cs11
-rw-r--r--ViewModels/ViewModelBase.cs2
-rw-r--r--Views/MainWindow.axaml11
-rw-r--r--Views/MainWindow.axaml.cs2
-rw-r--r--appveyor.yml2
12 files changed, 34 insertions, 22 deletions
diff --git a/App.axaml b/App.axaml
index bfb9eef..992dbfb 100644
--- a/App.axaml
+++ b/App.axaml
@@ -1,7 +1,7 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:AleeAudioPlayer"
- x:Class="AleeAudioPlayer.App">
+ xmlns:local="using:Erable"
+ x:Class="Erable.App">
<Application.DataTemplates>
<local:ViewLocator/>
</Application.DataTemplates>
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/Alee Audio Player.csproj b/Erable.csproj
index 42dc411..b10f530 100644
--- a/Alee Audio Player.csproj
+++ b/Erable.csproj
@@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<Nullable>enable</Nullable>
- <RootNamespace>AleeAudioPlayer</RootNamespace>
+ <RootNamespace>Erable</RootNamespace>
</PropertyGroup>
<ItemGroup>
<Folder Include="Models\" />
diff --git a/Alee Audio Player.sln b/Erable.sln
index c735ca0..70dc476 100644
--- a/Alee Audio Player.sln
+++ b/Erable.sln
@@ -3,7 +3,8 @@ 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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Erable", "Erable.csproj", "{7816A5DD-C5B1-498D-9980-C36458D7465F}"
+i
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
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 @@
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:vm="using:AleeAudioPlayer.ViewModels"
+ xmlns:vm="using:Erable.ViewModels"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- x:Class="AleeAudioPlayer.Views.MainWindow"
+ x:Class="Erable.Views.MainWindow"
Icon="/Assets/avalonia-logo.ico"
- Title="Alee Audio Player">
+ Title="Erable Audio Player">
<Design.DataContext>
<vm:MainWindowViewModel/>
</Design.DataContext>
<StackPanel>
<TextBlock Text="{Binding Greeting}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
- <Button Name="PlayButton" Width="50" Command="{Binding PlayFunction}" >Play</Button>
- <Button Name="StopButton" Width="50" >Stop</Button>
+ <Button Name="PlayButton" Width="80" Command="{Binding PlayFunction}" >Play</Button>
+ <Button Name="StopButton" Width="80" >Stop</Button>
+ <Button Name="BrowseButton" Width="80" Command="{Binding BrowseFunction }" >Browse</Button>
</StackPanel>
</Window>
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