aaru-dps/RedBookPlayer
1
0
Fork 0
mirror of https://github.com/aaru-dps/RedBookPlayer.git synced 2025-12-16 19:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move GUI code to own namespace

Browse Source
This commit is contained in:
Matt Nadareski
2021-06-29 14:23:33 -07:00
parent 8c2a74c100
commit 0207448d76
9 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RedBookPlayer/App.xaml.cs
View File

@@ -5,6 +5,7 @@ using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using RedBookPlayer.GUI;
namespace RedBookPlayer namespace RedBookPlayer
{ {

2
RedBookPlayer/MainWindow.xaml → RedBookPlayer/GUI/MainWindow.xaml
View File

@@ -1,6 +1,6 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
x:Class="RedBookPlayer.MainWindow" Title="RedBookPlayer" SizeToContent="WidthAndHeight"> x:Class="RedBookPlayer.GUI.MainWindow" Title="RedBookPlayer" SizeToContent="WidthAndHeight">
<ContentControl Name="Content" /> <ContentControl Name="Content" />
</Window> </Window>

2
RedBookPlayer/MainWindow.xaml.cs → RedBookPlayer/GUI/MainWindow.xaml.cs
View File

@@ -5,7 +5,7 @@ using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace RedBookPlayer namespace RedBookPlayer.GUI
{ {
public class MainWindow : Window public class MainWindow : Window
{ {

2
RedBookPlayer/PlayerView.xaml → RedBookPlayer/GUI/PlayerView.xaml
View File

@@ -1,7 +1,7 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
x:Class="RedBookPlayer.PlayerView" Width="900" Height="400"> x:Class="RedBookPlayer.GUI.PlayerView" Width="900" Height="400">
<StackPanel Margin="16" VerticalAlignment="Center"> <StackPanel Margin="16" VerticalAlignment="Center">
<Button Click="LoadButton_Click" Margin="32,0,32,16">Load</Button> <Button Click="LoadButton_Click" Margin="32,0,32,16">Load</Button>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,16"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,16">

2
RedBookPlayer/PlayerView.xaml.cs → RedBookPlayer/GUI/PlayerView.xaml.cs
View File

@@ -12,7 +12,7 @@ using Avalonia.Media.Imaging;
using Avalonia.Platform; using Avalonia.Platform;
using Avalonia.Threading; using Avalonia.Threading;
namespace RedBookPlayer namespace RedBookPlayer.GUI
{ {
public class PlayerView : UserControl public class PlayerView : UserControl
{ {

2
RedBookPlayer/PlayerViewModel.cs → RedBookPlayer/GUI/PlayerViewModel.cs
View File

@@ -1,6 +1,6 @@
using ReactiveUI; using ReactiveUI;
namespace RedBookPlayer namespace RedBookPlayer.GUI
{ {
public class PlayerViewModel : ReactiveObject public class PlayerViewModel : ReactiveObject
{ {

2
RedBookPlayer/SettingsWindow.xaml → RedBookPlayer/GUI/SettingsWindow.xaml
View File

@@ -1,7 +1,7 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" x:Class="RedBookPlayer.SettingsWindow" Title="Settings" Width="450" Height="600"> d:DesignHeight="450" x:Class="RedBookPlayer.GUI.SettingsWindow" Title="Settings" Width="450" Height="600">
<DockPanel Margin="16"> <DockPanel Margin="16">
<TextBlock DockPanel.Dock="Top" Margin="0,0,0,4">Themes</TextBlock> <TextBlock DockPanel.Dock="Top" Margin="0,0,0,4">Themes</TextBlock>
<StackPanel DockPanel.Dock="Bottom"> <StackPanel DockPanel.Dock="Bottom">

2
RedBookPlayer/SettingsWindow.xaml.cs → RedBookPlayer/GUI/SettingsWindow.xaml.cs
View File

@@ -4,7 +4,7 @@ using Avalonia.Controls;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace RedBookPlayer namespace RedBookPlayer.GUI
{ {
public class SettingsWindow : Window public class SettingsWindow : Window
{ {

1
RedBookPlayer/Player.cs
View File

@@ -9,6 +9,7 @@ using CSCore.SoundOut;
using NWaves.Audio; using NWaves.Audio;
using NWaves.Filters.BiQuad; using NWaves.Filters.BiQuad;
using RedBookPlayer.Discs; using RedBookPlayer.Discs;
using RedBookPlayer.GUI;
namespace RedBookPlayer namespace RedBookPlayer
{ {