diff --git a/src/Titano.Uploader/Shell/ConnectViewModel.cs b/src/Titano.Uploader/Shell/ConnectViewModel.cs
index 8e483491..54e42a07 100644
--- a/src/Titano.Uploader/Shell/ConnectViewModel.cs
+++ b/src/Titano.Uploader/Shell/ConnectViewModel.cs
@@ -17,7 +17,6 @@ public sealed class ConnectViewModel : ObservableObject
private string _address;
private string _username;
private string? _errorText;
- private bool _isBusy;
public ConnectViewModel(IServerSession session, IUploaderDialogs dialogs, string? address, string? username)
{
@@ -53,12 +52,6 @@ public sealed class ConnectViewModel : ObservableObject
/// Set from the view's PasswordBox; never stored.
public string Password { private get; set; } = string.Empty;
- public bool IsBusy
- {
- get => _isBusy;
- private set => Set(ref _isBusy, value);
- }
-
/// One sentence saying what went wrong; the retry action sits next to it.
public string? ErrorText
{
@@ -78,36 +71,31 @@ public sealed class ConnectViewModel : ObservableObject
private async Task SignInAsync()
{
+ if (_session.State is not (ConnectionState.NotConfigured or ConnectionState.SignedOut)) return;
ErrorText = null;
- IsBusy = true;
- try
+ var (result, fingerprint) = await _session.SignInAsync(Address, Username.Trim(), Password, CancellationToken.None);
+ if (result == SignInResult.Untrusted && fingerprint is not null)
{
- var (result, fingerprint) = await _session.SignInAsync(Address, Username.Trim(), Password, CancellationToken.None);
- if (result == SignInResult.Untrusted && fingerprint is not null)
+ if (!_dialogs.ConfirmTrust(Display(Address), fingerprint))
{
- if (!_dialogs.ConfirmTrust(Display(Address), fingerprint))
- {
- ErrorText = Loc.L("Uploader.Connect.Error.Untrusted");
- return;
- }
- _session.Trust(fingerprint);
- (result, _) = await _session.SignInAsync(Address, Username.Trim(), Password, CancellationToken.None);
+ ErrorText = Loc.L("Uploader.Connect.Error.Untrusted");
+ return;
}
- ErrorText = result switch
- {
- SignInResult.Success => null,
- SignInResult.InvalidAddress => Loc.L("Uploader.Connect.Error.InvalidAddress"),
- SignInResult.Unreachable => Loc.L("Uploader.Connect.Error.Unreachable"),
- SignInResult.NotTitano => Loc.L("Uploader.Connect.Error.NotTitano"),
- SignInResult.BadCredentials => Loc.L("Uploader.Connect.Error.BadCredentials"),
- SignInResult.Untrusted => Loc.L("Uploader.Connect.Error.Untrusted"),
- _ => Loc.L("Uploader.Connect.Error.Failed"),
- };
- if (result == SignInResult.Success) Address = Display(_session.Address);
+ _session.Trust(fingerprint);
+ (result, _) = await _session.SignInAsync(Address, Username.Trim(), Password, CancellationToken.None);
}
- finally
+ ErrorText = result switch
{
- IsBusy = false;
- }
+ SignInResult.Success => null,
+ SignInResult.InvalidAddress => Loc.L("Uploader.Connect.Error.InvalidAddress"),
+ SignInResult.Unreachable => Loc.L("Uploader.Connect.Error.Unreachable"),
+ SignInResult.NotTitano => Loc.L("Uploader.Connect.Error.NotTitano"),
+ SignInResult.BadCredentials => Loc.L("Uploader.Connect.Error.BadCredentials"),
+ SignInResult.Untrusted => Loc.L("Uploader.Connect.Error.Untrusted"),
+ _ => Loc.L("Uploader.Connect.Error.Failed"),
+ };
+ if (result != SignInResult.Success) return;
+ Address = Display(_session.Address);
+ Password = string.Empty;
}
}
diff --git a/src/Titano.Uploader/Shell/MainViewModel.cs b/src/Titano.Uploader/Shell/MainViewModel.cs
index 664639a0..0c1f0279 100644
--- a/src/Titano.Uploader/Shell/MainViewModel.cs
+++ b/src/Titano.Uploader/Shell/MainViewModel.cs
@@ -1,6 +1,7 @@
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Diagnostics;
+using System.Globalization;
using System.IO;
using System.Windows.Input;
using System.Windows.Threading;
@@ -237,17 +238,22 @@ public sealed class MainViewModel : LocalizedViewModel
/// Accessible name of the pause/resume button (also the tray menu entry).
public string PauseLabel => Loc.L(IsPaused ? "Uploader.Action.Resume" : "Uploader.Action.Pause");
- /// Upload limit in MB/s; 0 = unlimited.
- public int BandwidthLimit
+ /// Upload limit in MB/s as typed; 0 = unlimited. Text that is not a whole number reverts.
+ public string BandwidthLimitText
{
- get => _s.Session.BandwidthLimit;
+ get => _s.Session.BandwidthLimit.ToString(Loc.Culture);
set
{
- var clamped = Math.Clamp(value, 0, 100_000);
- if (clamped == _s.Session.BandwidthLimit) return;
- _s.Session.BandwidthLimit = clamped;
- _s.Settings.BandwidthLimit = clamped;
- _s.SaveSettings();
+ if (int.TryParse(value, NumberStyles.Integer, Loc.Culture, out var limit))
+ {
+ limit = Math.Clamp(limit, 0, 100_000);
+ if (limit != _s.Session.BandwidthLimit)
+ {
+ _s.Session.BandwidthLimit = limit;
+ _s.Settings.BandwidthLimit = limit;
+ _s.SaveSettings();
+ }
+ }
OnPropertyChanged();
}
}
@@ -515,7 +521,7 @@ public sealed class MainViewModel : LocalizedViewModel
OnPropertyChanged(nameof(ConnectionText));
OnPropertyChanged(nameof(QuotaText));
OnPropertyChanged(nameof(IsConnectVisible));
- OnPropertyChanged(nameof(BandwidthLimit));
+ OnPropertyChanged(nameof(BandwidthLimitText));
if (e.PropertyName != nameof(IServerSession.State)) return;
if (_s.Session.State == ConnectionState.Connected) _ = LoadSequencesAsync();
if (IsConnectVisible)
diff --git a/src/Titano.Uploader/Shell/MainWindow.xaml b/src/Titano.Uploader/Shell/MainWindow.xaml
index 9c9cebb2..ad977433 100644
--- a/src/Titano.Uploader/Shell/MainWindow.xaml
+++ b/src/Titano.Uploader/Shell/MainWindow.xaml
@@ -124,7 +124,7 @@
-
-
@@ -188,14 +189,14 @@
-
+
-
-
@@ -299,11 +300,14 @@
+ Fill="{DynamicResource Brush.TextFaint}" />
+
+
+
@@ -405,7 +409,7 @@
-