fix breaking change in avalonia Gap to Spacing on Stackpanel
MODIFY
WalletWasabi.Gui/Controls/ModalDialog.xaml
WalletWasabi.Gui/Controls/ModalDialog.xaml
<Grid Background="#EF2D2D2D" IsVisible="{Binding IsVisible, FallbackValue=False}">
<Grid Height="500" Background="{DynamicResource ThemeControlBackgroundBrush}" Margin="10 0">
<DockPanel LastChildFill="True" Margin="450 0 450 100">
- <StackPanel Orientation="Horizontal" Gap="20" HorizontalAlignment="Right" DockPanel.Dock="Bottom" Margin="8 0 8 8" TextBlock.FontSize="15">
+ <StackPanel Orientation="Horizontal" Spacing="20" HorizontalAlignment="Right" DockPanel.Dock="Bottom" Margin="8 0 8 8" TextBlock.FontSize="15">
<Button Command="{Binding CancelCommand}" IsVisible="{Binding CancelButtonVisible}" Content="Cancel" Width="160" Height="50" />
<Button Content="OK" Command="{Binding OKCommand}" IsVisible="{Binding OKButtonVisible}" Width="100" Height="30" />
</StackPanel>

MODIFY
WalletWasabi.Gui/Controls/StatusBar.xaml
WalletWasabi.Gui/Controls/StatusBar.xaml
<behaviors:CommandOnClickBehavior Command="{Binding UpdateCommand}" />
</i:Interaction.Behaviors>
<DockPanel LastChildFill="True" Margin="10 0">
- <StackPanel Orientation="Horizontal" Gap="20" DockPanel.Dock="Right">
+ <StackPanel Orientation="Horizontal" Spacing="20" DockPanel.Dock="Right">
- <StackPanel Orientation="Horizontal" Gap="4" IsVisible="{Binding !CriticalUpdateAvailable}">
+ <StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding !CriticalUpdateAvailable}">
<TextBlock Text="{Binding ShowNetwork}" />
</StackPanel>
<Panel IsVisible="{Binding BlocksLeft, Converter={StaticResource ShouldDisplayValueConverter}}">
- <StackPanel Orientation="Horizontal" Gap="4" IsVisible="{Binding !CriticalUpdateAvailable}">
+ <StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding !CriticalUpdateAvailable}">
<Grid Height="10" Width="10">
<DrawingPresenter VerticalAlignment="Center" HorizontalAlignment="Center">
<DrawingPresenter.Drawing>
</Panel>
<Panel IsVisible="{Binding FiltersLeft, Converter={StaticResource ShouldDisplayValueConverter}}">
- <StackPanel Orientation="Horizontal" Gap="4" IsVisible="{Binding !CriticalUpdateAvailable}">
+ <StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding !CriticalUpdateAvailable}">
<Grid Height="10" Width="10">
<DrawingPresenter VerticalAlignment="Center" HorizontalAlignment="Center">
<DrawingPresenter.Drawing>
</StackPanel>
</Panel>
- <StackPanel Orientation="Horizontal" Gap="4" IsVisible="{Binding !CriticalUpdateAvailable}">
+ <StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding !CriticalUpdateAvailable}">
<Grid Height="10" Width="10">
<DrawingPresenter VerticalAlignment="Center" HorizontalAlignment="Center">
<DrawingPresenter.Drawing>
<TextBlock Text="{Binding Tor}" Foreground="{Binding Tor, ConverterParameter=Tor, Converter={StaticResource StatusColorConverter}}" />
</StackPanel>
- <StackPanel Orientation="Horizontal" Gap="4" IsVisible="{Binding !CriticalUpdateAvailable}">
+ <StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding !CriticalUpdateAvailable}">
<Grid Height="10" Width="10">
<DrawingPresenter VerticalAlignment="Center" HorizontalAlignment="Center">
<DrawingPresenter.Drawing>
<TextBlock Text="{Binding Backend}" Foreground="{Binding Backend, ConverterParameter=Backend, Converter={StaticResource StatusColorConverter}}" />
</StackPanel>
- <StackPanel Orientation="Horizontal" Gap="4" IsVisible="{Binding !CriticalUpdateAvailable}">
+ <StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding !CriticalUpdateAvailable}">
<Grid Height="10" Width="10">
<DrawingPresenter VerticalAlignment="Center" HorizontalAlignment="Center">
<DrawingPresenter.Drawing>
<TextBlock Text="{Binding Peers}" Foreground="{Binding Peers, ConverterParameter=Peers, Converter={StaticResource StatusColorConverter}}" />
</StackPanel>
- <StackPanel Orientation="Horizontal" Gap="4" IsVisible="{Binding !CriticalUpdateAvailable}">
+ <StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding !CriticalUpdateAvailable}">
<Grid Height="10" Width="10">
<DrawingPresenter VerticalAlignment="Center" HorizontalAlignment="Center">
<DrawingPresenter.Drawing>
</StackPanel>
</StackPanel>
- <StackPanel Orientation="Horizontal" Gap="4">
+ <StackPanel Orientation="Horizontal" Spacing="4">
<Grid Height="10" Width="10" IsVisible="{Binding UpdateAvailable}">
<DrawingPresenter VerticalAlignment="Center" HorizontalAlignment="Center">
<DrawingPresenter.Drawing>

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabView.xaml
<controls:GroupBox Title="Queue Coins For CoinJoin" TextBlock.FontSize="16" Padding="10" Margin="10 5 10 5">
<Grid Classes="content">
<DockPanel LastChildFill="True">
- <StackPanel Gap="10" Orientation="Horizontal" DockPanel.Dock="Bottom" Margin="0 10 0 0" HorizontalAlignment="Right">
+ <StackPanel Spacing="10" Orientation="Horizontal" DockPanel.Dock="Bottom" Margin="0 10 0 0" HorizontalAlignment="Right">
<TextBlock Text="{Binding WarningMessageEnqueue}" Classes="warningMessage" />
<TextBox Text="{Binding Password}" PasswordChar="*" Watermark="Password" UseFloatingWatermark="True" MinWidth="173" />
<DockPanel LastChildFill="True" VerticalAlignment="Top">
<Grid Classes="content">
<ScrollViewer>
<StackPanel Orientation="Vertical">
- <StackPanel Orientation="Horizontal" Gap="4">
+ <StackPanel Orientation="Horizontal" Spacing="4">
<TextBlock Text="Minimum"></TextBlock>
<TextBlock Foreground="YellowGreen" Text="{Binding RequiredBTC, Converter={StaticResource MoneyStringConverter}}"></TextBlock>
<TextBlock Foreground="YellowGreen" Text="BTC"></TextBlock>
<TextBlock Text="is required to be queued for CoinJoin."></TextBlock>
</StackPanel>
- <StackPanel Orientation="Horizontal" Gap="4" IsVisible="{Binding AmountQueued, Converter={StaticResource CoinJoinedVisibilityConverter}}">
+ <StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding AmountQueued, Converter={StaticResource CoinJoinedVisibilityConverter}}">
<TextBlock Text="You have queued"></TextBlock>
<TextBlock Foreground="YellowGreen" Text="{Binding AmountQueued, Converter={StaticResource MoneyStringConverter}}"></TextBlock>
<TextBlock Foreground="YellowGreen" Text="BTC"></TextBlock>
<TextBlock Text="for CoinJoin."></TextBlock>
</StackPanel>
- <StackPanel Orientation="Horizontal" Gap="4">
+ <StackPanel Orientation="Horizontal" Spacing="4">
<TextBlock Text="Coordinator Fee:"></TextBlock>
<TextBlock Text="{Binding CoordinatorFeePercent}"></TextBlock>
<TextBlock Text="% per anonymity set."></TextBlock>
</StackPanel>
- <StackPanel Orientation="Horizontal" Gap="4">
+ <StackPanel Orientation="Horizontal" Spacing="4">
<TextBlock Text="Round ID:"></TextBlock>
<TextBlock Text="{Binding RoundId}"></TextBlock>
</StackPanel>
- <StackPanel Orientation="Horizontal" Gap="4">
+ <StackPanel Orientation="Horizontal" Spacing="4">
<TextBlock Text="Phase:"></TextBlock>
<TextBlock Foreground="YellowGreen" Text="{Binding Phase, Converter={StaticResource PhaseStringConverter}}"></TextBlock>
</StackPanel>
- <StackPanel Orientation="Horizontal" Gap="4">
+ <StackPanel Orientation="Horizontal" Spacing="4">
<TextBlock Text="Number Of Registered Peers:"></TextBlock>
<TextBlock Foreground="YellowGreen" Text="{Binding PeersRegistered}"></TextBlock>
<TextBlock Text="/"></TextBlock>
<controls:GroupBox Title="Coins Being CoinJoined" TextBlock.FontSize="16" Padding="10" Margin="10 5" Grid.Row="2" IsVisible="{Binding AmountQueued, Converter={StaticResource CoinJoinedVisibilityConverter}}">
<Grid Classes="content">
<DockPanel LastChildFill="True">
- <StackPanel Gap="10" Orientation="Horizontal" DockPanel.Dock="Bottom" Margin="0 10 0 0" HorizontalAlignment="Right">
+ <StackPanel Spacing="10" Orientation="Horizontal" DockPanel.Dock="Bottom" Margin="0 10 0 0" HorizontalAlignment="Right">
<TextBlock Text="{Binding WarningMessageDequeue}" Classes="warningMessage" />
<DockPanel LastChildFill="True">
<Button Content="Dequeue" Command="{Binding DequeueCommand}" DockPanel.Dock="Right" VerticalAlignment="Top" />

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/SendTabView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/SendTabView.xaml
<DockPanel LastChildFill="True">
<Grid Classes="content">
<DockPanel LastChildFill="True" Margin="20">
- <StackPanel DockPanel.Dock="Bottom" Margin="0 10" Gap="10" HorizontalAlignment="Left">
+ <StackPanel DockPanel.Dock="Bottom" Margin="0 10" Spacing="10" HorizontalAlignment="Left">
<TextBlock>Note that, you must select coins you want to spend from.</TextBlock>
<controls:ExtendedTextBox Text="{Binding Address}" Watermark="Address" UseFloatingWatermark="True" />
<controls:ExtendedTextBox Text="{Binding Label}" Watermark="Label" UseFloatingWatermark="True">
Start labelling today and your privacy will thank you tomorrow!
</ToolTip.Tip>
</controls:ExtendedTextBox>
- <StackPanel Orientation="Horizontal" Gap="10">
+ <StackPanel Orientation="Horizontal" Spacing="10">
<Button Content="{Binding MaxClear}" Command="{Binding MaxCommand}" VerticalAlignment="Top" />
<controls:ExtendedTextBox Foreground="{Binding IsMax, Converter={StaticResource AmountForegroundConverter}}" IsReadOnly="{Binding IsMax}" Text="{Binding Amount}" Watermark="Amount (BTC)" UseFloatingWatermark="True" MinWidth="124" MinHeight="46" />
<StackPanel>
- <StackPanel Orientation="Horizontal" Gap="10">
+ <StackPanel Orientation="Horizontal" Spacing="10">
<TextBlock Text="Fee:" />
<Grid Height="10" Width="10">
</DrawingPresenter>
</Grid>
</StackPanel>
- <StackPanel Orientation="Horizontal" Gap="4">
+ <StackPanel Orientation="Horizontal" Spacing="4">
<TextBlock Text="Confirmation Expected In:" />
<TextBlock Foreground="YellowGreen" Text="{Binding Fee, Converter={StaticResource FeeConfirmationTargetConverter}}" />
</StackPanel>
</StackPanel>
</StackPanel>
- <StackPanel Gap="10" Orientation="Horizontal">
+ <StackPanel Spacing="10" Orientation="Horizontal">
<TextBox Text="{Binding Password}" PasswordChar="*" Watermark="Password" UseFloatingWatermark="True" MinWidth="173" />
<DockPanel VerticalAlignment="Top" LastChildFill="True">
<Button Command="{Binding BuildTransactionCommand}" DockPanel.Dock="Right">

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletExplorerView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/WalletExplorerView.xaml
</TreeView.Styles>
<TreeView.DataTemplates>
<TreeDataTemplate DataType="ViewModels:WalletViewModel" ItemsSource="{Binding Actions}">
- <StackPanel Orientation="Horizontal" Gap="6">
+ <StackPanel Orientation="Horizontal" Spacing="6">
<DrawingPresenter Width="20" Height="20">
<DrawingPresenter.Drawing>
<DrawingGroup>
<TreeDataTemplate DataType="ViewModels:SendTabViewModel">
<Button BorderThickness="0" Background="Transparent" Command="{Binding DoItCommand}">
- <StackPanel Orientation="Horizontal" Gap="6">
+ <StackPanel Orientation="Horizontal" Spacing="6">
<DrawingPresenter Width="20" Height="20">
<DrawingPresenter.Drawing>
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1 M 25.3333,52.25L 50.6667,52.25L 50.6667,45.9167L 55.4167,45.9167L 55.4167,57L 50.6667,57L 25.3333,57L 20.5833,57L 20.5833,45.9167L 25.3333,45.9167L 25.3333,52.25 Z M 34.8333,49.0834L 41.1667,49.0834L 41.1666,28.5L 49.0833,38L 49.0833,28.5L 38,15.8334L 26.9167,28.5L 26.9167,38L 34.8333,28.5L 34.8333,49.0834 Z " />
<TreeDataTemplate DataType="ViewModels:ReceiveTabViewModel">
<Button BorderThickness="0" Background="Transparent" Command="{Binding DoItCommand}">
- <StackPanel Orientation="Horizontal" Gap="6">
+ <StackPanel Orientation="Horizontal" Spacing="6">
<DrawingPresenter Width="20" Height="20">
<DrawingPresenter.Drawing>
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1 M 25.3333,52.25L 50.6666,52.25L 50.6666,45.9167L 55.4166,45.9167L 55.4166,57L 20.5833,57L 20.5833,45.9167L 25.3333,45.9167L 25.3333,52.25 Z M 34.8333,15.8333L 41.1667,15.8333L 41.1667,36.4167L 49.0833,26.9167L 49.0833,36.4167L 38,49.0833L 26.9167,36.4167L 26.9167,26.9167L 34.8333,36.4167L 34.8333,15.8333 Z " />
<TreeDataTemplate DataType="ViewModels:CoinJoinTabViewModel">
<Button BorderThickness="0" Background="Transparent" Command="{Binding DoItCommand}">
- <StackPanel Orientation="Horizontal" Gap="6">
+ <StackPanel Orientation="Horizontal" Spacing="6">
<DrawingPresenter Width="20" Height="20">
<DrawingPresenter.Drawing>
<DrawingGroup>
<TreeDataTemplate DataType="ViewModels:HistoryTabViewModel">
<Button BorderThickness="0" Background="Transparent" Command="{Binding DoItCommand}">
- <StackPanel Orientation="Horizontal" Gap="6">
+ <StackPanel Orientation="Horizontal" Spacing="6">
<DrawingPresenter Width="20" Height="20">
<DrawingPresenter.Drawing>
<DrawingGroup>

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletExplorerViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/WalletExplorerViewModel.cs
@@ -16,7 +16,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
[Export]
[ExportToolControl]
[Shared]
- public class WalletExplorerViewModel : ToolViewModel, IExtension
+ public class WalletExplorerViewModel : ToolViewModel, IActivatableExtension
{
public override Location DefaultLocation => Location.Right;
@@ -51,5 +51,14 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
WalletViewModel walletViewModel = new WalletViewModel(walletName, receiveDominant);
_wallets.Add(walletViewModel);
}
+
+ public void BeforeActivation()
+ {
+ }
+
+ public void Activation()
+ {
+ IoC.Get<IShell>().MainPerspective.AddOrSelectTool(this);
+ }
}
}

MODIFY
WalletWasabi.Gui/Tabs/WalletManager/LoadWalletView.xaml
WalletWasabi.Gui/Tabs/WalletManager/LoadWalletView.xaml
</StackPanel>
</Button>
<Button Command="{Binding OpenFolderCommand}" DockPanel.Dock="Right" Margin="0 0 10 0">
- <StackPanel Orientation="Horizontal" Gap="8">
+ <StackPanel Orientation="Horizontal" Spacing="8">
<DrawingPresenter Width="28">
<DrawingPresenter.Drawing>
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1 M 19,50L 28,34L 63,34L 54,50L 19,50 Z M 19,28.0001L 35,28C 36,25 37.4999,24.0001 37.4999,24.0001L 48.75,24C 49.3023,24 50,24.6977 50,25.25L 50,28L 53.9999,28.0001L 53.9999,32L 27,32L 19,46.4L 19,28.0001 Z " />

fix breaking change in avalonia Gap to Spacing on Stackpanel