Skip to content

Commit 1845fce

Browse files
clovettclovett
committed
- Fix issue #103, no flag shows up on accounts that have no explicit currency defined.
- Fix issue #93, row header is needed to show validation errors (like trying to edit amount on reconciled transaction). - Publish 2.1.0.10
1 parent 2617017 commit 1845fce

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

‎Source/WPF/MoneyPackage/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap">
3-
<Identity Name="43906ChrisLovett.MyMoney.Net" Publisher="CN=Chris Lovett, O=Chris Lovett, S=Washington, C=US" Version="2.1.0.9" />
3+
<Identity Name="43906ChrisLovett.MyMoney.Net" Publisher="CN=Chris Lovett, O=Chris Lovett, S=Washington, C=US" Version="2.1.0.10" />
44
<Properties>
55
<DisplayName>MyMoney.Net</DisplayName>
66
<PublisherDisplayName>Chris Lovett</PublisherDisplayName>

‎Source/WPF/MyMoney/Properties/PublishProfiles/ClickOnceProfile.pubxml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
44
-->
55
<Project>
66
<PropertyGroup>
7-
<ApplicationRevision>9</ApplicationRevision>
8-
<ApplicationVersion>2.1.0.9</ApplicationVersion>
7+
<ApplicationRevision>10</ApplicationRevision>
8+
<ApplicationVersion>2.1.0.10</ApplicationVersion>
99
<BootstrapperEnabled>True</BootstrapperEnabled>
1010
<Configuration>Release</Configuration>
1111
<CreateWebPageOnPublish>True</CreateWebPageOnPublish>

‎Source/WPF/MyMoney/Setup/changes.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<changes>
3+
<change version="2.1.0.10" date="3/29/2022">
4+
- Fix issue #103, no flag shows up on accounts that have no explicit currency defined.
5+
- Fix issue #93, row header is needed to show validation errors (like trying to edit amount on reconciled transaction).
6+
</change>
37
<change version="2.1.0.9" date="3/29/2022">
48
- Fix bug in event tracking in brokerage accounts so the account balance updates properly when you edit security, units, or unit price.
59
- Fix OFX import of transfers in brokerage accounts so if the brokerage sends a negative number of units in a transfer out, it will be converted to a positive number of shares "removed".

‎Source/WPF/MyMoney/Views/TransactionsView.xaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<Grid ToolTip="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}},
115115
Path=(Validation.Errors),
116116
Converter={StaticResource ValidationErrorGetErrorMessageConverter}}"
117-
Background="{DynamicResource SystemControlErrorTextForegroundBrush}" Margin="-1,-1,-1,-1">
117+
Background="{StaticResource ErrorMessageBrush}" Margin="-1,-2,1,2">
118118
<ui:SymbolIcon Symbol="Important" VerticalAlignment="Center" HorizontalAlignment="Center"/>
119119
</Grid>
120120
</ControlTemplate>
@@ -433,7 +433,6 @@
433433
ItemsSource="{Binding Path=NonNullSplits.ObservableCollection}"
434434
RowValidationErrorTemplate="{StaticResource RowValidationErrorTemplate}"
435435
RowEditEnding="TheGridForAmountSplit_RowEditEnding"
436-
RowHeaderWidth="0"
437436
CellStyle="{DynamicResource MyDataGridCellStyle}"
438437
Style="{DynamicResource MyDataGridStyle2}"
439438
help:HelpService.HelpKeyword="Basics/Splits/"
@@ -484,7 +483,6 @@
484483
<Setter Property="ContentMargin" Value="0,0,0,30"/>
485484
<Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="True"/>
486485
<Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling"/>
487-
<Setter Property="RowHeaderWidth" Value="0"/>
488486
<Setter Property="BorderBrush" Value="Transparent"/>
489487
</Style>
490488

@@ -502,11 +500,15 @@
502500
<Setter Property="ClipboardCopyMode" Value="None"/>
503501
<Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="True"/>
504502
<Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling"/>
505-
<Setter Property="RowHeaderWidth" Value="0"/>
506503
<Setter Property="BorderBrush" Value="Transparent"/>
507504
</Style>
505+
506+
<Style TargetType="{x:Type DataGridRowHeader}" >
507+
<Setter Property="Background" Value="{DynamicResource SystemControlPageBackgroundChromeMediumLowBrush}" />
508+
<Setter Property="Foreground" Value="White" />
509+
</Style>
508510

509-
<Style x:Key="MyDataGridRowStyle" TargetType="DataGridRow">
511+
<Style x:Key="MyDataGridRowStyle" TargetType="DataGridRow">
510512
<EventSetter Event="DragOver" Handler="OnDataGridRowDragOver"/>
511513
<EventSetter Event="DragEnter" Handler="OnDataGridRowDragEnter"/>
512514
<EventSetter Event="DragLeave" Handler="OnDataGridRowDragLeave"/>

‎Source/WPF/Version/Version.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
// And also sync this with the MSIX package manifest in
77
// ~\MyMoney.Net\Source\WPF\MoneyPackage\Package.appxmanifest
88

9-
[assembly: AssemblyVersion("2.1.0.9")]
10-
[assembly: AssemblyFileVersion("2.1.0.9")]
9+
[assembly: AssemblyVersion("2.1.0.10")]
10+
[assembly: AssemblyFileVersion("2.1.0.10")]

‎Source/WPF/Version/Version.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<ApplicationRevision>9</ApplicationRevision>
5-
<ApplicationVersion>2.1.0.9</ApplicationVersion>
4+
<ApplicationRevision>10</ApplicationRevision>
5+
<ApplicationVersion>2.1.0.10</ApplicationVersion>
66
</PropertyGroup>
77
</Project>

‎Source/WPF/Version/VersionMaster.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.0.9
1+
2.1.0.10

0 commit comments

Comments
 (0)