diff --git a/.idea/.idea.Blacklight/.idea/avalonia.xml b/.idea/.idea.Blacklight/.idea/avalonia.xml
index c64d48f3573376652e879ca36a7d6e68f2f8d869..08880044a54b585caa0c024df75fffc77163c334 100644
--- a/.idea/.idea.Blacklight/.idea/avalonia.xml
+++ b/.idea/.idea.Blacklight/.idea/avalonia.xml
@@ -11,7 +11,7 @@
<entry key="Blacklight/Views/Dialogs/CreateChannelView.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" />
<entry key="Blacklight/Views/Documents/DocumentView.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" />
<entry key="Blacklight/Views/ErrorBoundary.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" />
- <entry key="Blacklight/Views/LoadingView.axaml" value="Blacklight/Blacklight.csproj" />
+ <entry key="Blacklight/Views/LoadingView.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" />
<entry key="Blacklight/Views/LoadingViewModel.axaml" value="Blacklight/Blacklight.csproj" />
<entry key="Blacklight/Views/Login/LoginView.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" />
<entry key="Blacklight/Views/Login/MainLoginPrompt.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" />
diff --git a/Blacklight/TODO b/Blacklight/TODO
index f12f8a62838315defa8b480afc96faaa5a7926de..60714945d24cf91d499d234bb1448b50e87fc1cb 100644
--- a/Blacklight/TODO
+++ b/Blacklight/TODO
@@ -23,7 +23,7 @@ or remove it when the event has arrived (how to tell? -> Client attribute with g
Show avatars for people
-Channel making
+[done] Channel making
Quark joining
@@ -31,3 +31,4 @@ Quark making
layout saving
+Add velopack, should be simple: https://github.com/velopack/velopack/tree/develop/samples/CSharpAvalonia
\ No newline at end of file
diff --git a/Blacklight/Views/Dialogs/CreateChannelView.axaml b/Blacklight/Views/Dialogs/CreateChannelView.axaml
index d886551e1828799f10b9f9e41a1f5a5337cf426f..4198754ec8eb685e36496a35f703655529b5a64a 100644
--- a/Blacklight/Views/Dialogs/CreateChannelView.axaml
+++ b/Blacklight/Views/Dialogs/CreateChannelView.axaml
@@ -27,7 +27,11 @@
Auto,*,Auto
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" Grid.Column="0" Margin="0, 0, 10, 0">Name:</TextBlock>
- <TextBox MinWidth="196" MaxLength="64" Grid.Column="2" Watermark="Name" Text="{Binding ChannelName}"/>
+ <TextBox MinWidth="196" MaxLength="64" Grid.Column="2" Watermark="Name" Text="{Binding ChannelName}">
+ <TextBox.KeyBindings>
+ <KeyBinding Gesture="Enter" Command="{Binding CreateChannelCommand}" />
+ </TextBox.KeyBindings>
+ </TextBox>
</Grid>
<Grid Margin="0,4" Grid.Row="2"
@@ -37,7 +41,11 @@
Auto,*,Auto
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" Grid.Column="0" Margin="0, 0, 10, 0">Description:</TextBlock>
- <TextBox MinWidth="196" MaxLength="512" Grid.Column="2" Watermark="Description (optional)" Text="{Binding ChannelDescription}"/>
+ <TextBox MinWidth="196" MaxLength="512" Grid.Column="2" Watermark="Description (optional)" Text="{Binding ChannelDescription}">
+ <TextBox.KeyBindings>
+ <KeyBinding Gesture="Enter" Command="{Binding CreateChannelCommand}" />
+ </TextBox.KeyBindings>
+ </TextBox>
</Grid>
<TextBlock MaxWidth="256"
diff --git a/Blacklight/Views/LoadingView.axaml b/Blacklight/Views/LoadingView.axaml
deleted file mode 100644
index eb072c6120cca653cb7d534ba900c75f795f2771..0000000000000000000000000000000000000000
--- a/Blacklight/Views/LoadingView.axaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:viewModels="clr-namespace:Blacklight.ViewModels"
- mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- x:Class="Blacklight.Views.LoadingView"
- x:DataType="viewModels:LoadingViewModel">
- <StackPanel>
- <TextBlock>Application loading... Maybe...</TextBlock>
- <Button Command="{Binding GoCommand}">Login?</Button>
- </StackPanel>
-</UserControl>
diff --git a/Blacklight/Views/LoadingView.axaml.cs b/Blacklight/Views/LoadingView.axaml.cs
deleted file mode 100644
index 501731ec376b78b8b11b3e3ae1de81d0cdaecf68..0000000000000000000000000000000000000000
--- a/Blacklight/Views/LoadingView.axaml.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Blacklight.Views;
-
-public partial class LoadingView : UserControl
-{
- public LoadingView()
- {
- InitializeComponent();
- }
-}
\ No newline at end of file