Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added more UI to the Credentials login form and catch exception

Browse Source
This commit is contained in:
erri120 2020-04-28 14:11:12 +02:00
parent 3548e42a64
commit 670efbdb10
No known key found for this signature in database
GPG Key ID: A8C0A18D8D4D3135
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Wabbajack/View Models/Settings/CredentialsLoginVM.cs
View File

@ -4,6 +4,7 @@ using System.Reactive.Linq;
using System.Security; using System.Security;
using ReactiveUI; using ReactiveUI;
using ReactiveUI.Fody.Helpers; using ReactiveUI.Fody.Helpers;
using Wabbajack.Common;
using Wabbajack.Lib; using Wabbajack.Lib;
using Wabbajack.Lib.Downloaders; using Wabbajack.Lib.Downloaders;
@ -33,6 +34,8 @@ namespace Wabbajack
} }
public void Login(SecureString password) public void Login(SecureString password)
{
try
{ {
if (password == null || password.Length == 0) if (password == null || password.Length == 0)
{ {
@ -43,6 +46,12 @@ namespace Wabbajack
ReturnMessage = _downloader.LoginWithCredentials(Username, password); ReturnMessage = _downloader.LoginWithCredentials(Username, password);
password.Clear(); password.Clear();
} }
catch (Exception e)
{
Utils.Error(e, "Exception while trying to login");
ReturnMessage = new LoginReturnMessage($"Unhandled exception: {e.Message}", true);
}
}
private static bool IsValidAddress(string s) private static bool IsValidAddress(string s)
{ {

12
Wabbajack/Views/Settings/CredentialsLoginView.xaml
View File

@ -17,18 +17,22 @@
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBox FontSize="20" x:Name="Username" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/> <TextBlock FontSize="20" Grid.Row="0" Grid.Column="0" Margin="0 16 8 0">Email:</TextBlock>
<PasswordBox Margin="0 16 0 -8" FontSize="20" x:Name="Password" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"/> <TextBox FontSize="20" x:Name="Username" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2"/>
<Button Margin="8 8 0 0" x:Name="LoginButton" Grid.Row="2" Grid.Column="2" Click="LoginButton_OnClick"> <TextBlock FontSize="20" Grid.Row="1" Grid.Column="0" Margin="0 16 8 0">Password:</TextBlock>
<PasswordBox Margin="0 16 0 -8" FontSize="20" x:Name="Password" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2"/>
<Button Margin="8 8 0 0" x:Name="LoginButton" Grid.Row="2" Grid.Column="3" Click="LoginButton_OnClick">
<TextBlock FontSize="14">Login</TextBlock> <TextBlock FontSize="14">Login</TextBlock>
</Button> </Button>
<TextBox x:Name="Message" FontSize="20" Margin="0 16 0 0" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3"/> <TextBlock x:Name="Message" FontSize="20" Margin="0 16 0 0" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3"/>
</Grid> </Grid>
</rxui:ReactiveUserControl> </rxui:ReactiveUserControl>