aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <alee14498@protonmail.com>2021-02-01 22:13:46 -0500
committerAndrew Lee <alee14498@protonmail.com>2021-02-01 22:13:46 -0500
commitc7428fab1c38d29bcc50ee263678504e34d01318 (patch)
treebf5c4a63afc1513d361c6b18fd6c6cf3f0aaaa27
parentd5f8e3f543e138b43fca95ed058345b9ab446d2f (diff)
downloaderable-godot-c7428fab1c38d29bcc50ee263678504e34d01318.tar.gz
erable-godot-c7428fab1c38d29bcc50ee263678504e34d01318.tar.bz2
erable-godot-c7428fab1c38d29bcc50ee263678504e34d01318.zip
Moved project files
-rw-r--r--.gitignore39
-rw-r--r--Erable.sln27
-rw-r--r--Erable/App.axaml (renamed from App.axaml)0
-rw-r--r--Erable/App.axaml.cs (renamed from App.axaml.cs)0
-rw-r--r--Erable/Assets/avalonia-logo.ico (renamed from Assets/avalonia-logo.ico)bin176111 -> 176111 bytes
-rw-r--r--Erable/Erable.csproj (renamed from Erable.csproj)0
-rw-r--r--Erable/Program.cs (renamed from Program.cs)0
-rw-r--r--Erable/ViewLocator.cs (renamed from ViewLocator.cs)0
-rw-r--r--Erable/ViewModels/MainWindowViewModel.cs (renamed from ViewModels/MainWindowViewModel.cs)0
-rw-r--r--Erable/ViewModels/ViewModelBase.cs (renamed from ViewModels/ViewModelBase.cs)0
-rw-r--r--Erable/Views/MainWindow.axaml (renamed from Views/MainWindow.axaml)2
-rw-r--r--Erable/Views/MainWindow.axaml.cs (renamed from Views/MainWindow.axaml.cs)0
12 files changed, 47 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore
index d007509..b38e46b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,35 @@
-.idea/
-.vscode/
-.vs/
+# Common IntelliJ Platform excludes
+
+# User specific
+**/.idea/**/workspace.xml
+**/.idea/**/tasks.xml
+**/.idea/shelf/*
+**/.idea/dictionaries
+**/.idea/httpRequests/
+
+# Sensitive or high-churn files
+**/.idea/**/dataSources/
+**/.idea/**/dataSources.ids
+**/.idea/**/dataSources.xml
+**/.idea/**/dataSources.local.xml
+**/.idea/**/sqlDataSources.xml
+**/.idea/**/dynamic.xml
-bin/
-obj/
+# Rider
+# Rider auto-generates .iml files, and contentModel.xml
+**/.idea/**/*.iml
+**/.idea/**/contentModel.xml
+**/.idea/**/modules.xml
+
+.idea
+*.suo
+*.user
+.vs/
+[Bb]in/
+[Oo]bj/
+_UpgradeReport_Files/
+[Pp]ackages/
-*.user \ No newline at end of file
+Thumbs.db
+Desktop.ini
+.DS_Store
diff --git a/Erable.sln b/Erable.sln
index f83cfd0..10bcb06 100644
--- a/Erable.sln
+++ b/Erable.sln
@@ -3,8 +3,7 @@ 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}"
-
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Erable", "Erable\Erable.csproj", "{2A160FE3-0D4C-4834-A5CF-FE87930E31B2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,17 +18,17 @@ Global
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
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Debug|x64.Build.0 = Debug|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Debug|x86.Build.0 = Debug|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Release|x64.ActiveCfg = Release|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Release|x64.Build.0 = Release|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Release|x86.ActiveCfg = Release|Any CPU
+ {2A160FE3-0D4C-4834-A5CF-FE87930E31B2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
diff --git a/App.axaml b/Erable/App.axaml
index 992dbfb..992dbfb 100644
--- a/App.axaml
+++ b/Erable/App.axaml
diff --git a/App.axaml.cs b/Erable/App.axaml.cs
index addd072..addd072 100644
--- a/App.axaml.cs
+++ b/Erable/App.axaml.cs
diff --git a/Assets/avalonia-logo.ico b/Erable/Assets/avalonia-logo.ico
index da8d49f..da8d49f 100644
--- a/Assets/avalonia-logo.ico
+++ b/Erable/Assets/avalonia-logo.ico
Binary files differ
diff --git a/Erable.csproj b/Erable/Erable.csproj
index b10f530..b10f530 100644
--- a/Erable.csproj
+++ b/Erable/Erable.csproj
diff --git a/Program.cs b/Erable/Program.cs
index 312bbb4..312bbb4 100644
--- a/Program.cs
+++ b/Erable/Program.cs
diff --git a/ViewLocator.cs b/Erable/ViewLocator.cs
index 0a6eb01..0a6eb01 100644
--- a/ViewLocator.cs
+++ b/Erable/ViewLocator.cs
diff --git a/ViewModels/MainWindowViewModel.cs b/Erable/ViewModels/MainWindowViewModel.cs
index 0c51fbd..0c51fbd 100644
--- a/ViewModels/MainWindowViewModel.cs
+++ b/Erable/ViewModels/MainWindowViewModel.cs
diff --git a/ViewModels/ViewModelBase.cs b/Erable/ViewModels/ViewModelBase.cs
index 6ab8d21..6ab8d21 100644
--- a/ViewModels/ViewModelBase.cs
+++ b/Erable/ViewModels/ViewModelBase.cs
diff --git a/Views/MainWindow.axaml b/Erable/Views/MainWindow.axaml
index d580753..6bb4cd1 100644
--- a/Views/MainWindow.axaml
+++ b/Erable/Views/MainWindow.axaml
@@ -6,7 +6,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Erable.Views.MainWindow"
Icon="/Assets/avalonia-logo.ico"
- Title="Erable Audio Player">
+ Title="Erable">
<Design.DataContext>
<vm:MainWindowViewModel/>
diff --git a/Views/MainWindow.axaml.cs b/Erable/Views/MainWindow.axaml.cs
index 814bc0f..814bc0f 100644
--- a/Views/MainWindow.axaml.cs
+++ b/Erable/Views/MainWindow.axaml.cs