Skip to content

Commit 59123b5

Browse files
committed
Now all columns are sortable
1 parent 5ccd4e7 commit 59123b5

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

Views/FuturesView.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<DataGridTextColumn Header="SL" Binding="{Binding StopLoss, StringFormat={}{0:C2}, TargetNullValue=—}"/>
127127

128128
<!-- Unrealized Profit/Loss -->
129-
<DataGridTemplateColumn Header="uPnL">
129+
<DataGridTemplateColumn Header="uPnL" SortMemberPath="UnrealizedPnl">
130130
<DataGridTemplateColumn.CellTemplate>
131131
<DataTemplate>
132132
<TextBlock Text="{Binding UnrealizedPnl, StringFormat={}{0:C2}, TargetNullValue=—}"
@@ -138,7 +138,7 @@
138138
</DataGridTemplateColumn>
139139

140140
<!-- Return on Equity Percentage -->
141-
<DataGridTemplateColumn Header="ROE %">
141+
<DataGridTemplateColumn Header="ROE %" SortMemberPath="RoePct">
142142
<DataGridTemplateColumn.CellTemplate>
143143
<DataTemplate>
144144
<TextBlock Text="{Binding RoePct, StringFormat={}{0:P2}, TargetNullValue=—}"

Views/PositionsView.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<DataGridTextColumn Header="Market Value" Binding="{Binding MarketValueQuote, StringFormat={}{0:C2}}"
9393
SortMemberPath="MarketValueQuote" SortDirection="Descending"/>
9494

95-
<DataGridTemplateColumn Header="Unrealized PnL">
95+
<DataGridTemplateColumn Header="Unrealized PnL" SortMemberPath="UnrealizedPnlQuote">
9696
<DataGridTemplateColumn.CellTemplate>
9797
<DataTemplate>
9898
<TextBlock Text="{Binding UnrealizedPnlQuote, StringFormat={}{0:C2}}"
@@ -103,7 +103,7 @@
103103
</DataGridTemplateColumn.CellTemplate>
104104
</DataGridTemplateColumn>
105105

106-
<DataGridTemplateColumn Header="Unrealized %" >
106+
<DataGridTemplateColumn Header="Unrealized %" SortMemberPath="UnrealizedPnlPct">
107107
<DataGridTemplateColumn.CellTemplate>
108108
<DataTemplate>
109109
<TextBlock Text="{Binding UnrealizedPnlPct, StringFormat={}{0:P2}, TargetNullValue=—}"

setupGenerateScript.iss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define MyAppName "CryptoJournal"
2-
#define MyAppVersion "1.0.1"
2+
#define MyAppVersion "1.0.2"
33
#define MyAppPublisher "ButterDevelop"
44
#define MyAppURL "https://github.com/ButterDevelop/CryptoJournal.Wpf"
55
#define MyAppExeName "CryptoJournal.Wpf.exe"
@@ -15,8 +15,8 @@ AppPublisherURL={#MyAppURL}
1515
AppSupportURL={#MyAppURL}
1616
AppUpdatesURL={#MyAppURL}
1717

18-
; По умолчанию - Program Files, но пользователь сможет выбрать сам.
19-
; В current-user режиме {autopf} автоматически станет userpf.
18+
; By default - Program Files, but the user can choose it himself
19+
; In current-user mode, {autopf} will automatically become userpf
2020
DefaultDirName={autopf}\{#MyAppName}
2121
DefaultGroupName={#MyAppName}
2222

@@ -30,8 +30,8 @@ WizardStyle=modern
3030
ArchitecturesAllowed=x64
3131
ArchitecturesInstallIn64BitMode=x64
3232

33-
; По умолчанию - admin install, но пользователь сможет выбрать
34-
; "только для меня" через встроенный диалог.
33+
; Default is admin install, but user will be able to choose
34+
; "just for me" via built-in dialog
3535
PrivilegesRequired=admin
3636
PrivilegesRequiredOverridesAllowed=dialog
3737

@@ -44,7 +44,7 @@ VersionInfoDescription=CryptoJournal installer
4444
VersionInfoProductName={#MyAppName}
4545
VersionInfoProductVersion={#MyAppVersion}
4646

47-
; Когда настроишь подпись:
47+
; if there is a signature here:
4848
; SignTool=mycustom
4949
; SignedUninstaller=yes
5050

0 commit comments

Comments
 (0)