Rename PrivateMode to LurkingWifeMode
MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/CoinListView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/CoinListView.xaml
<converters:CoinStatusBorderBrushConverter x:Key="CoinStatusBorderBrushConverter" />
<converters:CoinStatusForegroundConverter x:Key="CoinStatusForegroundConverter" />
<converters:CoinItemExpanderColorConverter x:Key="CoinItemExpanderColorConverter" />
- <converters:PrivateModeStringConverter x:Key="PrivateModeStringConverter" />
+ <converters:LurkingWifeModeStringConverter x:Key="LurkingWifeModeStringConverter" />
</UserControl.Resources>
<UserControl.Styles>
<Style Selector="TextBlock">
<Border ToolTip.Tip="{Binding ToolTip}" Padding="1" Grid.Column="2" Background="{Binding Status, Converter={StaticResource CoinStatusColorConverter}}" BorderBrush="{Binding Status, Converter={StaticResource CoinStatusBorderBrushConverter}}" HorizontalAlignment="Left" BorderThickness="1" CornerRadius="0,6,6,0">
<TextBlock Text="{Binding Status, Converter={StaticResource CoinStatusStringConverter}, Mode=OneWay}" Foreground="{Binding Status, Converter={StaticResource CoinStatusForegroundConverter}}" />
</Border>
- <TextBlock Grid.Column="3" Text="{Binding AmountBtc, ConverterParameter=8, Converter={StaticResource PrivateModeStringConverter}, Mode=OneWay}" />
+ <TextBlock Grid.Column="3" Text="{Binding AmountBtc, ConverterParameter=8, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" />
<Panel Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center" Background="Transparent"
DataContext="{Binding AnonymitySet, Converter={StaticResource PrivacyLevelValueConverter}}"
ToolTip.Tip="{Binding ToolTip}">
<DrawingPresenter Drawing="{Binding Icon}" Margin="0 0 25 0" />
</Panel>
- <controls:ExtendedTextBox Classes="selectableTextBlock" Background="Transparent" Grid.Column="5" Text="{Binding Clusters, ConverterParameter=50, Converter={StaticResource PrivateModeStringConverter}, Mode=OneWay}" />
+ <controls:ExtendedTextBox Classes="selectableTextBlock" Background="Transparent" Grid.Column="5" Text="{Binding Clusters, ConverterParameter=50, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" />
<TextBlock Text="" Grid.Column="6" />
</Grid>
</Grid>

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/CoinViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/CoinViewModel.cs
@@ -76,7 +76,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
this.RaisePropertyChanged(nameof(Confirmations));
}).DisposeWith(Disposables);
- Global.UiConfig.WhenAnyValue(x => x.PrivateMode).Subscribe(_ =>
+ Global.UiConfig.WhenAnyValue(x => x.LurkingWifeMode).Subscribe(_ =>
{
this.RaisePropertyChanged(nameof(AmountBtc));
this.RaisePropertyChanged(nameof(Clusters));

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabView.xaml
</i:Interaction.Behaviors>
<UserControl.Resources>
<converters:MoneyBrushConverter x:Key="MoneyBrushConverter" />
- <converters:PrivateModeStringConverter x:Key="PrivateModeStringConverter" />
+ <converters:LurkingWifeModeStringConverter x:Key="LurkingWifeModeStringConverter" />
</UserControl.Resources>
<controls:GroupBox Title="{Binding Title}" TextBlock.FontSize="30" Padding="20" Margin="10">
<Border Background="Transparent" IsVisible="{Binding Confirmed}" Grid.Column="0" ToolTip.Tip="Confirmed">
<Path HorizontalAlignment="Center" 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" Stretch="Fill" />
</Border>
- <TextBlock Text="{Binding DateTime, ConverterParameter=11, Converter={StaticResource PrivateModeStringConverter}, Mode=OneWay}" Grid.Column="1" />
- <TextBlock Text="{Binding AmountBtc, ConverterParameter=8, Converter={StaticResource PrivateModeStringConverter}, Mode=OneWay}" Grid.Column="2" Foreground="{Binding AmountBtc, Converter={StaticResource MoneyBrushConverter}}" />
- <TextBlock IsVisible="{Binding !ClipboardNotificationVisible}" Text="{Binding TransactionId, ConverterParameter=50, Converter={StaticResource PrivateModeStringConverter}, Mode=OneWay}" Grid.Column="3" />
+ <TextBlock Text="{Binding DateTime, ConverterParameter=11, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="1" />
+ <TextBlock Text="{Binding AmountBtc, ConverterParameter=8, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="2" Foreground="{Binding AmountBtc, Converter={StaticResource MoneyBrushConverter}}" />
+ <TextBlock IsVisible="{Binding !ClipboardNotificationVisible}" Text="{Binding TransactionId, ConverterParameter=50, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="3" />
<Grid IsVisible="{Binding ClipboardNotificationVisible}" Grid.Column="3">
<Grid Opacity="{Binding ClipboardNotificationOpacity}">

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewModel.cs
@@ -29,7 +29,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
_confirmed = model.WhenAnyValue(x => x.Confirmed).ToProperty(this, x => x.Confirmed, model.Confirmed).DisposeWith(Disposables);
- Global.UiConfig.WhenAnyValue(x => x.PrivateMode).Subscribe(x =>
+ Global.UiConfig.WhenAnyValue(x => x.LurkingWifeMode).Subscribe(x =>
{
this.RaisePropertyChanged(nameof(AmountBtc));
this.RaisePropertyChanged(nameof(TransactionId));

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletExplorerView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/WalletExplorerView.xaml
</DrawingGroup>
</DrawingPresenter.Drawing>
</DrawingPresenter>
- <Button Content="{Binding Title}" Command="{Binding PrivateModeCommand}" ToolTip.Tip="Toggle private mode." Height="19" VerticalAlignment="Center" BorderThickness="0" Margin="0" Padding="0" Background="Transparent" />
+ <Button Content="{Binding Title}" Command="{Binding LurkingWifeModeCommand}" Height="19" VerticalAlignment="Center" BorderThickness="0" Margin="0" Padding="0" Background="Transparent" />
</StackPanel>
</TreeDataTemplate>

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoView.xaml
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui">
<UserControl.Resources>
- <converters:PrivateModeStringConverter x:Key="PrivateModeStringConverter" />
+ <converters:LurkingWifeModeStringConverter x:Key="LurkingWifeModeStringConverter" />
</UserControl.Resources>
<controls:GroupBox Title="{Binding Title}" BorderThickness="0" Classes="docTabContainer">
<StackPanel>
<StackPanel Orientation="Vertical" Spacing="2">
<StackPanel Orientation="Horizontal">
<TextBlock Text="Encrypted Extended Master Private Key: " />
- <controls:ExtendedTextBox Text="{Binding EncryptedExtendedMasterPrivateKey , ConverterParameter=40, Converter={StaticResource PrivateModeStringConverter}, Mode=OneWay}" Classes="selectableTextBlock" />
+ <controls:ExtendedTextBox Text="{Binding EncryptedExtendedMasterPrivateKey , ConverterParameter=40, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Classes="selectableTextBlock" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<TextBlock Text="Extended Account Public Key: " />
- <controls:ExtendedTextBox Text="{Binding ExtendedAccountPublicKey, ConverterParameter=60, Converter={StaticResource PrivateModeStringConverter}, Mode=OneWay}" Classes="selectableTextBlock" />
+ <controls:ExtendedTextBox Text="{Binding ExtendedAccountPublicKey, ConverterParameter=60, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Classes="selectableTextBlock" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Extended Account zpub: " />
- <controls:ExtendedTextBox Text="{Binding ExtendedAccountZpub, ConverterParameter=60, Converter={StaticResource PrivateModeStringConverter}, Mode=OneWay}" Classes="selectableTextBlock" />
+ <controls:ExtendedTextBox Text="{Binding ExtendedAccountZpub, ConverterParameter=60, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Classes="selectableTextBlock" />
</StackPanel>
<StackPanel Margin="0 10 0 0" Spacing="10" Orientation="Horizontal">

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoViewModel.cs
@@ -70,7 +70,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
}
}).DisposeWith(Disposables);
- Global.UiConfig.WhenAnyValue(x => x.PrivateMode).Subscribe(_ =>
+ Global.UiConfig.WhenAnyValue(x => x.LurkingWifeMode).Subscribe(_ =>
{
this.RaisePropertyChanged(nameof(EncryptedExtendedMasterPrivateKey));
this.RaisePropertyChanged(nameof(ExtendedAccountPublicKey));

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/WalletViewModel.cs
@@ -33,7 +33,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
var coinsChanged = Observable.FromEventPattern(Global.WalletService.Coins, nameof(Global.WalletService.Coins.CollectionChanged));
var coinSpent = Observable.FromEventPattern(Global.WalletService, nameof(Global.WalletService.CoinSpentOrSpenderConfirmed));
- Global.UiConfig.WhenAnyValue(x => x.PrivateMode).Subscribe(x =>
+ Global.UiConfig.WhenAnyValue(x => x.LurkingWifeMode).Subscribe(x =>
{
SetBalance(Name);
}).DisposeWith(Disposables);
@@ -71,9 +71,9 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
Actions[3].DisplayActionTab();
}
- PrivateModeCommand = ReactiveCommand.CreateFromTask(async () =>
+ LurkingWifeModeCommand = ReactiveCommand.CreateFromTask(async () =>
{
- Global.UiConfig.PrivateMode = !Global.UiConfig.PrivateMode;
+ Global.UiConfig.LurkingWifeMode = !Global.UiConfig.LurkingWifeMode;
await Global.UiConfig.ToFileAsync();
}).DisposeWith(Disposables);
}
@@ -88,7 +88,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
set => this.RaiseAndSetIfChanged(ref _title, value);
}
- public ReactiveCommand PrivateModeCommand { get; }
+ public ReactiveCommand LurkingWifeModeCommand { get; }
public ObservableCollection<WalletActionViewModel> Actions
{
@@ -100,7 +100,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
{
Money balance = Enumerable.Where(WalletService.Coins, c => c.Unspent && !c.IsDust && !c.SpentAccordingToBackend).Sum(c => (long?)c.Amount) ?? 0;
- Title = $"{walletName} ({(Global.UiConfig.PrivateMode.Value ? "#########" : balance.ToString(false, true))} BTC)";
+ Title = $"{walletName} ({(Global.UiConfig.LurkingWifeMode.Value ? "#########" : balance.ToString(false, true))} BTC)";
}
#region IDisposable Support

RENAME
WalletWasabi.Gui/Converters/PrivateModeStringConverter.cs
WalletWasabi.Gui/Converters/LurkingWifeModeStringConverter.cs
@@ -7,13 +7,13 @@ using System.Text;
namespace WalletWasabi.Gui.Converters
{
- public class PrivateModeStringConverter : IValueConverter
+ public class LurkingWifeModeStringConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if ((value is string text))
{
- if (Global.UiConfig.PrivateMode == true)
+ if (Global.UiConfig.LurkingWifeMode == true)
{
int len = 10;
if (int.TryParse(parameter.ToString(), out int newLength))

MODIFY
WalletWasabi.Gui/Tabs/SettingsView.xaml
WalletWasabi.Gui/Tabs/SettingsView.xaml
<TextBlock VerticalAlignment="Center">Autocopy on Receive and History wallet tabs.</TextBlock>
</StackPanel>
<StackPanel Margin="0 10" Orientation="Horizontal">
- <ToggleButton IsChecked="{Binding PrivateMode}" Content="{Binding PrivateModeText}" Margin="0 0 10 0" Command="{Binding PrivateModeCommand}" />
- <TextBlock VerticalAlignment="Center">Private mode to hide sensitive content.</TextBlock>
+ <ToggleButton IsChecked="{Binding LurkingWifeMode}" Content="{Binding LurkingWifeModeText}" Margin="0 0 10 0" Command="{Binding LurkingWifeModeCommand}" />
+ <TextBlock VerticalAlignment="Center">Lurking Wife Mode hides sensitive content.</TextBlock>
</StackPanel>
</StackPanel>
</controls:GroupBox>

MODIFY
WalletWasabi.Gui/Tabs/SettingsViewModel.cs
WalletWasabi.Gui/Tabs/SettingsViewModel.cs
@@ -27,7 +27,7 @@ namespace WalletWasabi.Gui.Tabs
private bool _isModified;
public ReactiveCommand OpenConfigFileCommand { get; }
- public ReactiveCommand PrivateModeCommand { get; }
+ public ReactiveCommand LurkingWifeModeCommand { get; }
public SettingsViewModel() : base("Settings")
{
@@ -54,10 +54,10 @@ namespace WalletWasabi.Gui.Tabs
UseTorText = x ? "On" : "Off";
}).DisposeWith(Disposables);
- Global.UiConfig.WhenAnyValue(x => x.PrivateMode).Subscribe(_ =>
+ Global.UiConfig.WhenAnyValue(x => x.LurkingWifeMode).Subscribe(_ =>
{
- this.RaisePropertyChanged(nameof(PrivateMode));
- this.RaisePropertyChanged(nameof(PrivateModeText));
+ this.RaisePropertyChanged(nameof(LurkingWifeMode));
+ this.RaisePropertyChanged(nameof(LurkingWifeModeText));
}).DisposeWith(Disposables);
Dispatcher.UIThread.PostLogException(async () =>
@@ -74,9 +74,9 @@ namespace WalletWasabi.Gui.Tabs
OpenConfigFileCommand = ReactiveCommand.Create(OpenConfigFile).DisposeWith(Disposables);
- PrivateModeCommand = ReactiveCommand.CreateFromTask(async () =>
+ LurkingWifeModeCommand = ReactiveCommand.CreateFromTask(async () =>
{
- Global.UiConfig.PrivateMode = !PrivateMode;
+ Global.UiConfig.LurkingWifeMode = !LurkingWifeMode;
await Global.UiConfig.ToFileAsync();
});
}
@@ -143,9 +143,9 @@ namespace WalletWasabi.Gui.Tabs
set => this.RaiseAndSetIfChanged(ref _useTorText, value);
}
- public bool PrivateMode => Global.UiConfig.PrivateMode == true;
+ public bool LurkingWifeMode => Global.UiConfig.LurkingWifeMode == true;
- public string PrivateModeText => Global.UiConfig.PrivateMode == true ? "On" : "Off";
+ public string LurkingWifeModeText => Global.UiConfig.LurkingWifeMode == true ? "On" : "Off";
private void Save()
{

MODIFY
WalletWasabi.Gui/UiConfig.cs
WalletWasabi.Gui/UiConfig.cs
@@ -19,7 +19,7 @@ namespace WalletWasabi.Gui
[JsonObject(MemberSerialization.OptIn)]
public class UiConfig : ReactiveObject, IConfig
{
- private bool? _privateMode;
+ private bool? _lurkingWifeMode;
/// <inheritdoc />
public string FilePath { get; private set; }
@@ -43,11 +43,11 @@ namespace WalletWasabi.Gui
[JsonProperty(PropertyName = "Autocopy")]
public bool? Autocopy { get; internal set; }
- [JsonProperty(PropertyName = "PrivateMode")]
- public bool? PrivateMode
+ [JsonProperty(PropertyName = "LurkingWifeMode")]
+ public bool? LurkingWifeMode
{
- get => _privateMode;
- set => this.RaiseAndSetIfChanged(ref _privateMode, value);
+ get => _lurkingWifeMode;
+ set => this.RaiseAndSetIfChanged(ref _lurkingWifeMode, value);
}
public UiConfig()
@@ -59,7 +59,7 @@ namespace WalletWasabi.Gui
SetFilePath(filePath);
}
- public UiConfig(WindowState windowState, double height, double width, int feeTarget, int feeDisplayFormat, bool autocopy, bool privateMode)
+ public UiConfig(WindowState windowState, double height, double width, int feeTarget, int feeDisplayFormat, bool autocopy, bool lurkingWifeMode)
{
WindowState = Guard.NotNull(nameof(windowState), windowState);
Height = Guard.NotNull(nameof(height), height);
@@ -67,7 +67,7 @@ namespace WalletWasabi.Gui
FeeTarget = Guard.NotNull(nameof(feeTarget), feeTarget);
FeeDisplayFormat = Guard.NotNull(nameof(feeDisplayFormat), feeDisplayFormat);
Autocopy = Guard.NotNull(nameof(autocopy), autocopy);
- PrivateMode = Guard.NotNull(nameof(privateMode), privateMode);
+ LurkingWifeMode = Guard.NotNull(nameof(lurkingWifeMode), lurkingWifeMode);
}
/// <inheritdoc />
@@ -92,7 +92,7 @@ namespace WalletWasabi.Gui
FeeTarget = 2;
FeeDisplayFormat = 0;
Autocopy = true;
- PrivateMode = false;
+ LurkingWifeMode = false;
if (!File.Exists(FilePath))
{
@@ -117,7 +117,7 @@ namespace WalletWasabi.Gui
FeeTarget = config.FeeTarget ?? FeeTarget;
FeeDisplayFormat = config.FeeDisplayFormat ?? FeeDisplayFormat;
Autocopy = config.Autocopy ?? Autocopy;
- PrivateMode = config.PrivateMode ?? PrivateMode;
+ LurkingWifeMode = config.LurkingWifeMode ?? LurkingWifeMode;
}
/// <inheritdoc />
@@ -163,7 +163,7 @@ namespace WalletWasabi.Gui
return true;
}
- if (PrivateMode != config.PrivateMode)
+ if (LurkingWifeMode != config.LurkingWifeMode)
{
return true;
}

MODIFY
WalletWasabi.Gui/ViewModels/AddressViewModel.cs
WalletWasabi.Gui/ViewModels/AddressViewModel.cs
@@ -38,7 +38,7 @@ namespace WalletWasabi.Gui.ViewModels
QrCode = x.Result;
});
- Global.UiConfig.WhenAnyValue(x => x.PrivateMode).Subscribe(_ =>
+ Global.UiConfig.WhenAnyValue(x => x.LurkingWifeMode).Subscribe(_ =>
{
this.RaisePropertyChanged(nameof(AddressPrivate));
this.RaisePropertyChanged(nameof(LabelPrivate));
@@ -65,11 +65,11 @@ namespace WalletWasabi.Gui.ViewModels
public string Label => Model.Label;
- public string LabelPrivate => Global.UiConfig.PrivateMode == true ? "###########" : Label;
+ public string LabelPrivate => Global.UiConfig.LurkingWifeMode == true ? "###########" : Label;
public string Address => Model.GetP2wpkhAddress(Global.Network).ToString();
- public string AddressPrivate => Global.UiConfig.PrivateMode == true ? "###########################" : Address;
+ public string AddressPrivate => Global.UiConfig.LurkingWifeMode == true ? "###########################" : Address;
public string Pubkey => Model.PubKey.ToString();

Rename PrivateMode to LurkingWifeMode