progress coinlist
MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/CoinListView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/CoinListView.xaml
</UserControl.Styles>
<DockPanel LastChildFill="True">
- <Grid ColumnDefinitions="30,30,100,120,100,Auto" Margin="35 0" DockPanel.Dock="Top">
+ <Grid ColumnDefinitions="30,30,120,120,100,Auto" Margin="30 0" DockPanel.Dock="Top">
<TextBlock Text="" />
<TextBlock Text="" Grid.Column="1" />
- <TextBlock Text="Amount (BTC)" Grid.Column="2" />
- <TextBlock Text="Privacy" Grid.Column="3" Margin="20 0 0 0" />
- <TextBlock Text="Status" Grid.Column="4" Margin="40 0 0 0" />
+ <TextBlock Text="CoinJoin Status" Grid.Column="2" Margin="10 0 0 0" />
+ <TextBlock Text="Amount (BTC)" Grid.Column="3" Margin="10 0 0 0" />
+ <TextBlock Text="Privacy" Grid.Column="4" Margin="20 0 0 0" />
<TextBlock Text="History" Grid.Column="5" />
</Grid>
<ListBox Items="{Binding Coins}" VirtualizationMode="None">
</Grid>
</StackPanel>
</Expander>
- <Grid ColumnDefinitions="30,30,100,120,100,Auto" Margin="30 0 0 0" VerticalAlignment="Top">
+
+ <Grid ColumnDefinitions="30,30,120,120,100,Auto" Margin="30 0 0 0" VerticalAlignment="Top">
<CheckBox HorizontalContentAlignment="Left" IsChecked="{Binding IsSelected}" />
+
<Path HorizontalAlignment="Left" Grid.Column="1" Data="F1 M 23.7501,33.25L 34.8334,44.3333L 52.2499,22.1668L 56.9999,26.9168L 34.8334,53.8333L 19.0001,38L 23.7501,33.25 Z" Fill="#22B14C" Height="16" Width="16" IsVisible="{Binding Confirmed}" Stretch="Fill">
<ToolTip.Tip>
Confimed
</ToolTip.Tip>
</Path>
- <TextBlock Grid.Column="2" Text="{Binding AmountBtc}" />
- <Panel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"
+
+ <Border Padding="1" Grid.Column="2" Background="{Binding Status, Converter={StaticResource CoinStatusColorConverter}}" HorizontalAlignment="Left" BorderBrush="{Binding Status, Converter={StaticResource CoinStatusColorConverter}}" BorderThickness="1,1,1,1" CornerRadius="6,6,6,6">
+ <controls:ExtendedTextBox Classes="selectableTextBlock" Text="{Binding Status, Converter={StaticResource CoinStatusStringConverter}, Mode=OneWay}" Background="{Binding Status, Converter={StaticResource CoinStatusColorConverter}}" />
+ </Border>
+
+ <TextBlock Grid.Column="3" Text="{Binding AmountBtc}" />
+
+ <Panel Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"
DataContext="{Binding AnonymitySet, Converter={StaticResource PrivacyLevelValueConverter}}"
ToolTip.Tip="{Binding ToolTip}">
<DrawingPresenter Drawing="{Binding Icon}" Margin="0 0 25 0" />
</Panel>
- <Border Padding="1" Grid.Column="4" Background="{Binding Status, Converter={StaticResource CoinStatusColorConverter}}" HorizontalAlignment="Center" BorderBrush="{Binding Status, Converter={StaticResource CoinStatusColorConverter}}" BorderThickness="1,1,1,1" CornerRadius="6,6, 6, 6">
- <controls:ExtendedTextBox Classes="selectableTextBlock" Text="{Binding Status, Converter={StaticResource CoinStatusStringConverter}}" Background="{Binding Status, Converter={StaticResource CoinStatusColorConverter}}"/>
- </Border>
+
<controls:ExtendedTextBox Classes="selectableTextBlock" Grid.Column="5" Text="{Binding History}" />
+
<TextBlock Text="" Grid.Column="6" />
</Grid>
</Grid>

MODIFY
WalletWasabi.Gui/Converters/CoinStatusColorConverter.cs
WalletWasabi.Gui/Converters/CoinStatusColorConverter.cs
@@ -18,11 +18,16 @@ namespace WalletWasabi.Gui.Converters
{
switch (status)
{
- case SmartCoinStatus.Confirmed:
- return Brushes.Black;
-
- default:
- return Brushes.Black;
+ case SmartCoinStatus.Confirmed: return Brushes.Transparent;
+ case SmartCoinStatus.Unconfirmed: return Brushes.Transparent;
+ case SmartCoinStatus.MixingOnWaitingList: return Brushes.WhiteSmoke;
+ case SmartCoinStatus.MixingBanned: return Brushes.IndianRed;
+ case SmartCoinStatus.MixingInputRegistration: return Brushes.LimeGreen;
+ case SmartCoinStatus.MixingConnectionConfirmation: return Brushes.DarkGreen;
+ case SmartCoinStatus.MixingOutputRegistration: return Brushes.DarkGreen;
+ case SmartCoinStatus.MixingSigning: return Brushes.DarkGreen;
+ case SmartCoinStatus.SpentAccordingToBackend: return Brushes.IndianRed;
+ case SmartCoinStatus.MixingWaitingForConfirmation: return Brushes.LightYellow;
}
}
throw new InvalidOperationException();
@@ -30,7 +35,7 @@ namespace WalletWasabi.Gui.Converters
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
- throw new InvalidOperationException();
+ throw new NotSupportedException();
}
}
}

MODIFY
WalletWasabi.Gui/Converters/CoinStatusStringConverter.cs
WalletWasabi.Gui/Converters/CoinStatusStringConverter.cs
@@ -15,7 +15,19 @@ namespace WalletWasabi.Gui.Converters
{
if (value is SmartCoinStatus status)
{
- return status.ToString();
+ switch (status)
+ {
+ case SmartCoinStatus.Confirmed: return "";
+ case SmartCoinStatus.Unconfirmed: return "";
+ case SmartCoinStatus.MixingOnWaitingList: return "waiting";
+ case SmartCoinStatus.MixingBanned: return "banned";
+ case SmartCoinStatus.MixingInputRegistration: return "registered";
+ case SmartCoinStatus.MixingConnectionConfirmation: return "connection confirmed";
+ case SmartCoinStatus.MixingOutputRegistration: return "output registered";
+ case SmartCoinStatus.MixingSigning: return "signed";
+ case SmartCoinStatus.SpentAccordingToBackend: return "spent";
+ case SmartCoinStatus.MixingWaitingForConfirmation: return "waiting for confirmation";
+ }
}
throw new InvalidOperationException();
@@ -23,8 +35,7 @@ namespace WalletWasabi.Gui.Converters
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
- var s = value.ToString();
- return Enum.Parse<SmartCoinStatus>(s);
+ throw new NotSupportedException();
}
}
}

progress coinlist