From 3047e1621748279e54b14003d4b29a2dbf68b5ec Mon Sep 17 00:00:00 2001 From: WeekendGamer8900 Date: Mon, 6 Apr 2020 11:00:22 +0800 Subject: [PATCH] Added count up sessions --- TimerPlus/Properties/AssemblyInfo.cs | 4 +- TimerPlus/ScreenSessions.xaml | 52 +++++++++--- TimerPlus/ScreenSessions.xaml.cs | 40 ++++++++- TimerPlus/ScreenStatistics.xaml | 116 +++++++++++++-------------- TimerPlus/ScreenTimer.xaml.cs | 4 +- TimerPlus/StoredData.cs | 72 ++++++++++++++--- TimerPlus/TimerPlus.csproj | 27 +++++++ TimerPlus/XamlUtility.cs | 6 +- 8 files changed, 237 insertions(+), 84 deletions(-) diff --git a/TimerPlus/Properties/AssemblyInfo.cs b/TimerPlus/Properties/AssemblyInfo.cs index 5804e43..aa6f620 100644 --- a/TimerPlus/Properties/AssemblyInfo.cs +++ b/TimerPlus/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/TimerPlus/ScreenSessions.xaml b/TimerPlus/ScreenSessions.xaml index 7a947ea..d5ef2f2 100644 --- a/TimerPlus/ScreenSessions.xaml +++ b/TimerPlus/ScreenSessions.xaml @@ -23,6 +23,8 @@ + + Width="Auto" + SharedSizeGroup="gp1" /> @@ -116,12 +118,20 @@ Width="Auto" SharedSizeGroup="gp3" /> - - + + + + + + Text="{Binding StatsTime, Converter={StaticResource TimeSpanToStringConverter}}"> @@ -168,6 +178,12 @@ + + + + + + + + + Count up + + +