Merge pull request #1 from jibedoubleve/dev

Bug fixing (V 1.0.1)

Probel.JsonReader.Presentation/Properties/Messages.resx

@@ -195,4 +195,7 @@
   <data name="Menu_Order_Desc" xml:space="preserve">
     <value>Descending</value>
   </data>
+  <data name="Status_Version" xml:space="preserve">
+    <value>V {0}</value>
+  </data>
 </root>

Probel.JsonReader.Presentation/Services/SerialisationService.cs

@@ -120,6 +120,9 @@ public bool ShowWarning
             get; set;
         }
 
+        [JsonProperty]
+        public bool IsSortAscending { get; set; }
+
         #endregion Properties
 
         public void Fill(SettingsViewModel vm)
@@ -131,6 +134,7 @@ public void Fill(SettingsViewModel vm)
             vm.ShowWarning = ShowWarning;
             vm.ShowError = ShowError;
             vm.ShowFatal = ShowFatal;
+            vm.IsSortAscending = IsSortAscending;
         }
     }
 }

Probel.JsonReader.Presentation/ViewModels/ShellViewModel.cs

@@ -9,6 +9,7 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
@@ -28,7 +29,9 @@ public class ShellViewModel : BindableBase
         private string _status = Messages.Status_Ready;
         private string _statusItemsCount = string.Format(Messages.Status_xxItems, 0);
         private string _title = TITLE_PREFIX;
+        private string _version;
         private string FilePath;
+
         private FileSystemWatcher FileWatcher;
 
         #endregion Fields
@@ -37,6 +40,9 @@ public class ShellViewModel : BindableBase
 
         public ShellViewModel(ILogRepository logRepository, ICommandBuilder commandBuilder)
         {
+            var v = Assembly.GetEntryAssembly().GetName().Version;
+            Version = string.Format(Messages.Status_Version, v.ToString(3));
+
             LogRepository = logRepository;
             DefaultDirectory = Environment.ExpandEnvironmentVariables(DEFAULT_DIRECTORY);
 
@@ -89,6 +95,12 @@ public string Title
             set => SetProperty(ref _title, $"{TITLE_PREFIX} - [{value}]", nameof(Title));
         }
 
+        public string Version
+        {
+            get => _version;
+            set => SetProperty(ref _version, value, nameof(Version));
+        }
+
         private IEnumerable<LogModel> BufferLogs { get; set; }
 
         #endregion Properties

Probel.JsonReader.Presentation/Views/ShellView.xaml

@@ -162,6 +162,7 @@
             CanUserReorderColumns="False"
             CanUserResizeRows="False"
             CanUserSortColumns="False"
+            GridLinesVisibility="Horizontal"
             ItemsSource="{Binding Logs}"
             SelectionMode="Single">
             <DataGrid.Resources>
@@ -235,6 +236,11 @@
         </DataGrid>
         <StatusBar Grid.Row="3">
             <StatusBarItem Content="{Binding Status}" />
+            <StatusBarItem
+                HorizontalAlignment="Right"
+                Content="{Binding Version}"
+                DockPanel.Dock="Right" />
+            <Separator Margin="5,3,5,3" DockPanel.Dock="Right" />
             <StatusBarItem
                 HorizontalAlignment="Right"
                 Content="{Binding StatusItemsCount}"

Version.cs

@@ -11,5 +11,5 @@
 // [assembly: AssemblyVersion("1.0.*")]
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]