Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-pick seemingly uncontroversial commits from https://github.com/zkSNACKs/WalletWasabi/pull/1361 #1521

Merged
merged 4 commits into from
Jun 3, 2019
Merged

Cherry-pick seemingly uncontroversial commits from https://github.com/zkSNACKs/WalletWasabi/pull/1361 #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90a158c
fix xaml syntax error.
danwalmsley May 31, 2019
23c3c86
Fix FileNotFound exceptions
nopara73 Jun 1, 2019
5415858
Remove .this
nopara73 Jun 1, 2019
c1de4b0
Fix StringFormats (Remove ')
nopara73 Jun 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions WalletWasabi.Gui/Controls/StatusBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</DrawingPresenter.Drawing>
</DrawingPresenter>
</Grid>
<TextBlock Text="{Binding BlocksLeft, StringFormat='Missing Blocks: \{0\}'}" Foreground="{Binding BlocksLeft, ConverterParameter=BlocksLeft, Converter={StaticResource StatusColorConverter}}" />
<TextBlock Text="{Binding BlocksLeft, StringFormat=Missing Blocks: \{0\}}" Foreground="{Binding BlocksLeft, ConverterParameter=BlocksLeft, Converter={StaticResource StatusColorConverter}}" />
</StackPanel>
</Panel>

Expand All @@ -63,7 +63,7 @@
</DrawingPresenter.Drawing>
</DrawingPresenter>
</Grid>
<TextBlock Text="{Binding FiltersLeft, StringFormat='Missing Filters: \{0\}', Converter={StaticResource FilterLeftValueConverter}}" Foreground="{Binding FiltersLeft, ConverterParameter=FiltersLeft, Converter={StaticResource StatusColorConverter}}" />
<TextBlock Text="{Binding FiltersLeft, StringFormat=Missing Filters: \{0\}, Converter={StaticResource FilterLeftValueConverter}}" Foreground="{Binding FiltersLeft, ConverterParameter=FiltersLeft, Converter={StaticResource StatusColorConverter}}" />
</StackPanel>
</Panel>

Expand Down Expand Up @@ -91,7 +91,7 @@
</DrawingPresenter.Drawing>
</DrawingPresenter>
</Grid>
<TextBlock Text="{Binding Tor, StringFormat='Tor is \{0\}', Converter={StaticResource PascalToPhraseConverter}}" Foreground="{Binding Tor, ConverterParameter=Tor, Converter={StaticResource StatusColorConverter}}" />
<TextBlock Text="{Binding Tor, StringFormat=Tor is \{0\}, Converter={StaticResource PascalToPhraseConverter}}" Foreground="{Binding Tor, ConverterParameter=Tor, Converter={StaticResource StatusColorConverter}}" />
</StackPanel>

<StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding !CriticalUpdateAvailable}">
Expand Down Expand Up @@ -121,7 +121,7 @@
</DrawingPresenter.Drawing>
</DrawingPresenter>
</Grid>
<TextBlock Text="{Binding Backend, StringFormat='Backend is \{0\}', Converter={StaticResource PascalToPhraseConverter}}" Foreground="{Binding Backend, ConverterParameter=Backend, Converter={StaticResource StatusColorConverter}}" />
<TextBlock Text="{Binding Backend, StringFormat=Backend is \{0\}, Converter={StaticResource PascalToPhraseConverter}}" Foreground="{Binding Backend, ConverterParameter=Backend, Converter={StaticResource StatusColorConverter}}" />
</StackPanel>

<StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding !CriticalUpdateAvailable}">
Expand All @@ -139,7 +139,7 @@
</DrawingPresenter.Drawing>
</DrawingPresenter>
</Grid>
<TextBlock Text="{Binding Peers, StringFormat='Peers: \{0\}'}" Foreground="{Binding Peers, ConverterParameter=Peers, Converter={StaticResource StatusColorConverter}}" />
<TextBlock Text="{Binding Peers, StringFormat=Peers: \{0\}}" Foreground="{Binding Peers, ConverterParameter=Peers, Converter={StaticResource StatusColorConverter}}" />
</StackPanel>

<StackPanel Orientation="Horizontal" Spacing="0" IsVisible="{Binding !CriticalUpdateAvailable}">
Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Gui/Controls/WalletExplorer/PinPadView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<UserControl xmlns="https://github.com/avaloniaui"
<UserControl x:Class="WalletWasabi.Gui.Controls.WalletExplorer.PinPadView"
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"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.PinpadView"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui">
<controls:GroupBox Title="{Binding Title}" TextBlock.FontSize="30" Padding="20" Margin="10">
<DockPanel LastChildFill ="True">
Expand Down
3 changes: 2 additions & 1 deletion WalletWasabi.Gui/Controls/WalletExplorer/TransactionBroadcasterView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<UserControl xmlns="https://github.com/avaloniaui"
<UserControl x:Class="WalletWasabi.Gui.Controls.WalletExplorer.TransactionBroadcasterView"
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"
Expand Down
24 changes: 12 additions & 12 deletions WalletWasabi.Gui/Controls/WalletExplorer/TransactionBroadcasterView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
using Avalonia;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;

namespace WalletWasabi.Gui.Controls.WalletExplorer
{
public class TransactionBroadcasterView : UserControl
{
public TransactionBroadcasterView()
{
this.InitializeComponent();
}
public class TransactionBroadcasterView : UserControl
{
public TransactionBroadcasterView()
{
InitializeComponent();
}

private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
}
3 changes: 2 additions & 1 deletion WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewerView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<UserControl xmlns="https://github.com/avaloniaui"
<UserControl x:Class="WalletWasabi.Gui.Controls.WalletExplorer.TransactionViewerView"
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"
Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Avalonia;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;

Expand All @@ -8,7 +8,7 @@ public class WalletInfoView : UserControl
{
public WalletInfoView()
{
this.InitializeComponent();
InitializeComponent();
}

private void InitializeComponent()
Expand Down