diff --git a/Aerochat/Aerochat.csproj b/Aerochat/Aerochat.csproj index ad61720a..757ee2a2 100644 --- a/Aerochat/Aerochat.csproj +++ b/Aerochat/Aerochat.csproj @@ -137,6 +137,7 @@ + @@ -145,11 +146,14 @@ + + + @@ -305,6 +309,7 @@ + @@ -315,6 +320,8 @@ + + diff --git a/Aerochat/Scenes/Caustics.jpg b/Aerochat/Scenes/Caustics.jpg new file mode 100644 index 00000000..fdff25c1 Binary files /dev/null and b/Aerochat/Scenes/Caustics.jpg differ diff --git a/Aerochat/Scenes/HappyAccidents.jpeg b/Aerochat/Scenes/HappyAccidents.jpeg new file mode 100644 index 00000000..61ee511b Binary files /dev/null and b/Aerochat/Scenes/HappyAccidents.jpeg differ diff --git a/Aerochat/Scenes/Scenes.xml b/Aerochat/Scenes/Scenes.xml index 673f8136..3b354341 100644 --- a/Aerochat/Scenes/Scenes.xml +++ b/Aerochat/Scenes/Scenes.xml @@ -1,30 +1,33 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aerochat/Scenes/VolumeBeta.png b/Aerochat/Scenes/VolumeBeta.png new file mode 100644 index 00000000..03cdcae4 Binary files /dev/null and b/Aerochat/Scenes/VolumeBeta.png differ diff --git a/Aerochat/Scenes/XboxGrunge.png b/Aerochat/Scenes/XboxGrunge.png new file mode 100644 index 00000000..4c784c46 Binary files /dev/null and b/Aerochat/Scenes/XboxGrunge.png differ diff --git a/Aerochat/ViewModels/Scene.cs b/Aerochat/ViewModels/Scene.cs index f3325ecb..801ae3ee 100644 --- a/Aerochat/ViewModels/Scene.cs +++ b/Aerochat/ViewModels/Scene.cs @@ -23,6 +23,7 @@ public class SceneViewModel : ViewModelBase private string _color; private string _textColor; private string _shadowColor; + private string _credit; public int Id { @@ -65,6 +66,12 @@ public string ShadowColor set => SetProperty(ref _shadowColor, value); } + public string Credit + { + get => _credit; + set => SetProperty(ref _credit, value); + } + public static SceneViewModel FromScene(XElement scene) { string colourStr = scene.Attribute("color").Value; @@ -80,6 +87,7 @@ public static SceneViewModel FromScene(XElement scene) DisplayName = scene.Attribute("displayname").Value, Color = colourStr, Default = bool.Parse(scene.Attribute("default").Value), + Credit = scene.Attribute("credit").Value, TextColor = textBlack ? "#000000" : "#ffffff", ShadowColor = textBlack ? "#ffffff" : "#000000" }; diff --git a/Aerochat/Windows/About.xaml b/Aerochat/Windows/About.xaml new file mode 100644 index 00000000..2b0b152b --- /dev/null +++ b/Aerochat/Windows/About.xaml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aerochat/Windows/Home.xaml.cs b/Aerochat/Windows/Home.xaml.cs index 0d643f7a..e3f34583 100644 --- a/Aerochat/Windows/Home.xaml.cs +++ b/Aerochat/Windows/Home.xaml.cs @@ -656,5 +656,10 @@ private void SceneTileImage_PreviewMouseLeftButtonUp(object sender, MouseButtonE { new ChangeScene().ShowDialog(); } + + private void CreditsBtn_Click(object sender, RoutedEventArgs e) + { + new About().ShowDialog(); + } } }