Moved network to header
Moved network to header.
Removed network from statusbar.
MODIFY
WalletWasabi.Gui/MainWindow.xaml
WalletWasabi.Gui/MainWindow.xaml
xmlns:beh="clr-namespace:AvalonStudio.Utils.Behaviors;assembly=AvalonStudio.Utils"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Icon="resm:WalletWasabi.Gui.Resources.WasabiLogo.png?assembly=WalletWasabi.Gui"
- Title="Wasabi Wallet" BorderThickness="1" BorderBrush="{DynamicResource AvalonBorderBrush}"
+ Title="{Binding Title}" BorderThickness="1" BorderBrush="{DynamicResource AvalonBorderBrush}"
MinWidth="1100" MinHeight="530"
FontFamily="{DynamicResource UiFont}" FontSize="14"
Foreground="{DynamicResource ThemeForegroundBrush}" WindowState="Maximized"

MODIFY
WalletWasabi.Gui/Program.cs
WalletWasabi.Gui/Program.cs
@@ -43,6 +43,11 @@ namespace WalletWasabi.Gui
statusBar = new StatusBarViewModel(Global.Nodes.ConnectedNodes, Global.MemPoolService, Global.IndexDownloader, Global.UpdateChecker);
MainWindowViewModel.Instance.StatusBar = statusBar;
+
+ if (Global.IndexDownloader.Network != Network.Main)
+ {
+ MainWindowViewModel.Instance.Title += $" - {Global.IndexDownloader.Network}";
+ }
}
catch (Exception ex)
{

MODIFY
WalletWasabi.Gui/ViewModels/MainWindowViewModel.cs
WalletWasabi.Gui/ViewModels/MainWindowViewModel.cs
@@ -13,6 +13,14 @@ namespace WalletWasabi.Gui.ViewModels
private ModalDialogViewModelBase _modalDialog;
private bool _canClose = true;
+ private string _title = "Wasabi Wallet";
+
+ public string Title
+ {
+ get { return _title; }
+ internal set { this.RaiseAndSetIfChanged(ref _title, value); }
+ }
+
private StatusBarViewModel _statusBar;
public StatusBarViewModel StatusBar

MODIFY
WalletWasabi.Gui/ViewModels/StatusBarViewModel.cs
WalletWasabi.Gui/ViewModels/StatusBarViewModel.cs
@@ -94,14 +94,6 @@ namespace WalletWasabi.Gui.ViewModels
set { this.RaiseAndSetIfChanged(ref _status, value); }
}
- private string _showNetwork;
-
- public string ShowNetwork
- {
- get { return _showNetwork; }
- set { this.RaiseAndSetIfChanged(ref _showNetwork, value); }
- }
-
private long _clientOutOfDate;
private long _backendIncompatible;
@@ -128,15 +120,6 @@ namespace WalletWasabi.Gui.ViewModels
FiltersLeft = IndexDownloader.GetFiltersLeft();
- if (indexDownloader.Network == Network.Main)
- {
- ShowNetwork = "";
- }
- else
- {
- ShowNetwork = indexDownloader.Network.ToString();
- }
-
this.WhenAnyValue(x => x.BlocksLeft).Subscribe(blocks =>
{
SetStatusAndDoUpdateActions();

Moved network to header

Moved network to header.
Removed network from statusbar.