Skip to content
Permalink
Browse files

Merge pull request #1936 from yahiheb/xaml-formatting-2

Xaml formatting 2
  • Loading branch information...
nopara73 committed Jul 27, 2019
2 parents e7abbc5 + f7a8252 commit b2bcf2c3aea425d65488c9624aa0e413077b9baf
@@ -1,23 +1,22 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui">
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui">
<UserControl.Resources>
<converters:BooleanStringConverter x:Key="BooleanStringConverter" />
<converters:NetworkStringConverter x:Key="NetworkStringConverter" />
</UserControl.Resources>
<DockPanel LastChildFill="true">
<StackPanel DockPanel.Dock ="Top" IsVisible="{Binding IsModified}" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 5 10 5">
<StackPanel DockPanel.Dock="Top" IsVisible="{Binding IsModified}" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 5 10 5">
<TextBlock Text="Heads Up!" FontWeight="Bold" Classes="warningMessage" Margin="0 0 3 0" />
<TextBlock Classes="warningMessage">Changes will be applied after restarting the application.</TextBlock>
</StackPanel>
<ScrollViewer>
<StackPanel Margin="30" Spacing="10">
<Grid Classes="content">
<StackPanel Orientation="Vertical" Spacing="30">

<controls:GroupBox Title="Bitcoin" TextBlock.FontSize="16" Padding="10" Margin="0 5 10 5">
<StackPanel Orientation="Vertical" Spacing="5">
<StackPanel Margin="0 10" Spacing="5">
@@ -30,7 +29,6 @@
</DropDown.ItemTemplate>
</DropDown>
</StackPanel>

<controls:GroupBox Title="{Binding Network, StringFormat=My Node for \{0\}, Converter={StaticResource NetworkStringConverter}}" TextBlock.FontSize="16" Padding="10" Margin="0 5 10 5">
<StackPanel Orientation="Vertical" Spacing="5">
<StackPanel Margin="0 10" Spacing="5">
@@ -45,7 +43,6 @@
</controls:GroupBox>
</StackPanel>
</controls:GroupBox>

<controls:GroupBox Title="Tor" TextBlock.FontSize="16" Padding="10" Margin="0 5 10 5">
<StackPanel Orientation="Vertical" Spacing="5">
<StackPanel Margin="0 10" Orientation="Horizontal" Spacing="5">
@@ -62,7 +59,6 @@
</StackPanel>
</StackPanel>
</controls:GroupBox>

<controls:GroupBox Title="UI" TextBlock.FontSize="16" Padding="10" Margin="0 5 10 5">
<StackPanel Orientation="Vertical" Spacing="5">
<StackPanel Margin="0 10" Orientation="Horizontal" Spacing="5">
@@ -90,32 +86,23 @@
<controls:GroupBox Title="Anonymity Levels" TextBlock.FontSize="16" Padding="10" Margin="0 5 10 5">
<StackPanel Orientation="Vertical" Spacing="5">
<Grid Margin="0 10" ColumnDefinitions="30, *">
<DrawingPresenter Height="24" Width="24" Grid.Column="0"
Margin="0 0 10 10"
VerticalAlignment="Center" HorizontalAlignment="Center"
Drawing="{DynamicResource PrivacySome}" />
<DrawingPresenter Height="24" Width="24" Grid.Column="0" Margin="0 0 10 10" VerticalAlignment="Center" HorizontalAlignment="Center" Drawing="{DynamicResource PrivacySome}" />
<TextBox Text="{Binding SomePrivacyLevel}" Grid.Column="1">
<i:Interaction.Behaviors>
<behaviors:CommandOnLostFocusBehavior Command="{Binding TextBoxLostFocusCommand}" />
</i:Interaction.Behaviors>
</TextBox>
</Grid>
<Grid Margin="0 10" ColumnDefinitions="30, *">
<DrawingPresenter Height="24" Width="24" Grid.Column="0"
Margin="0 0 10 10"
VerticalAlignment="Center" HorizontalAlignment="Center"
Drawing="{DynamicResource PrivacyFine}" />
<DrawingPresenter Height="24" Width="24" Grid.Column="0" Margin="0 0 10 10" VerticalAlignment="Center" HorizontalAlignment="Center" Drawing="{DynamicResource PrivacyFine}" />
<TextBox Text="{Binding FinePrivacyLevel}" Grid.Column="1">
<i:Interaction.Behaviors>
<behaviors:CommandOnLostFocusBehavior Command="{Binding TextBoxLostFocusCommand}" />
</i:Interaction.Behaviors>
</TextBox>
</Grid>
<Grid Margin="0 10" ColumnDefinitions="30, *">
<DrawingPresenter Height="24" Width="24" Grid.Column="0"
Margin="0 0 10 10"
VerticalAlignment="Center" HorizontalAlignment="Center"
Drawing="{DynamicResource PrivacyStrong}" />
<DrawingPresenter Height="24" Width="24" Grid.Column="0" Margin="0 0 10 10" VerticalAlignment="Center" HorizontalAlignment="Center" Drawing="{DynamicResource PrivacyStrong}" />
<TextBox Text="{Binding StrongPrivacyLevel}" Grid.Column="1">
<i:Interaction.Behaviors>
<behaviors:CommandOnLostFocusBehavior Command="{Binding TextBoxLostFocusCommand}" />
@@ -124,7 +111,6 @@
</Grid>
</StackPanel>
</controls:GroupBox>

<controls:GroupBox Title="Other settings" TextBlock.FontSize="16" Padding="10" Margin="0 5 10 5">
<StackPanel Orientation="Vertical" Spacing="5">
<StackPanel Margin="0 10" Spacing="5">
@@ -137,7 +123,6 @@
</StackPanel>
</StackPanel>
</controls:GroupBox>

<Button Content="Open Config File" Command="{Binding OpenConfigFileCommand}" />
</StackPanel>
</Grid>
@@ -1,7 +1,6 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui">
<StackPanel Margin="20" Spacing="10">

<TextBlock Text="Write down these Recovery Words!" FontWeight="Bold" />
<Border Padding="2" Background="White" HorizontalAlignment="Stretch" Opacity="0.8">
<controls:ExtendedTextBox Text="{Binding MnemonicWords, Mode=TwoWay}" Background="Transparent" FontWeight="Bold" Foreground="Black" HorizontalAlignment="Center" Classes="selectableTextBlock" />
@@ -1,7 +1,7 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui">
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui">
<DockPanel LastChildFill="True">
<StackPanel DockPanel.Dock="Bottom" Spacing="10">
<controls:GroupBox IsVisible="{Binding !IsDesktopWallet}" TextBlock.FontSize="30" Padding="30" Margin="20 0">
@@ -73,8 +73,7 @@
<TextBlock Text="{Binding WalletName}">
<i:Interaction.Behaviors>
<behaviors:CommandOnDoubleClickBehavior Command="{Binding RelativeSource={RelativeSource AncestorType=ListBox}, Path=DataContext.LoadCommand}" />
</i:Interaction.Behaviors>
</TextBlock>
</i:Interaction.Behaviors></TextBlock>
</DataTemplate>
</controls:ExtendedListBox.ItemTemplate>
</controls:ExtendedListBox>
@@ -20,12 +20,12 @@
<ItemsControl Items="{Binding Suggestions}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation ="Horizontal" Spacing="2" />
<StackPanel Orientation="Horizontal" Spacing="2" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Button Focusable="False" Content="{Binding Word}" Command="{Binding OnSelected}" IsPressed ="{Binding IsHighLighted}" />
<Button Focusable="False" Content="{Binding Word}" Command="{Binding OnSelected}" IsPressed="{Binding IsHighLighted}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>

0 comments on commit b2bcf2c

Please sign in to comment.
You can’t perform that action at this time.