Merge pull request #30 from Leo-Corporation/vNext

Version 2.0.1.2408
Leo-Corporation · Aug 24, 2024 · 357eb08 · 357eb08
2 parents def25a8 + 0a600a8
commit 357eb08
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/DayBar.Setup/Setup.iss b/DayBar.Setup/Setup.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "DayBar"
-#define MyAppVersion "2.0.0.2404"
-#define MyAppFullVersion "2.0.0.2404"
+#define MyAppVersion "2.0.1.2408"
+#define MyAppFullVersion "2.0.1.2408"
 #define MyAppPublisher "Léo Corporation"
 #define MyAppURL "https://leocorporation.dev/"
 #define MyAppExeName "DayBar.exe"

diff --git a/DayBar/Classes/Global.cs b/DayBar/Classes/Global.cs
@@ -36,7 +36,7 @@ namespace DayBar.Classes
 {
 	public static class Global
 	{
-		public static string Version => "2.0.0.2404";
+		public static string Version => "2.0.1.2408";
 		public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/DayBar/Version.txt";
 		public static HomePage HomePage { get; set; }
 		public static SettingsPage SettingsPage { get; set; }

diff --git a/DayBar/DayBar.csproj b/DayBar/DayBar.csproj
@@ -8,7 +8,7 @@
     <ApplicationIcon>DayBar.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Title>DayBar</Title>
-    <Version>2.0.0.2404</Version>
+    <Version>2.0.1.2408</Version>
     <Authors>Léo Corporation</Authors>
     <Company>Léo Corporation</Company>
     <Copyright>© 2024</Copyright>

diff --git a/DayBar/MainWindow.xaml b/DayBar/MainWindow.xaml
@@ -161,6 +161,12 @@
                             Foreground="{DynamicResource Foreground1}"
                             Header="{x:Static lang:Resources.Home}"
                             Style="{DynamicResource MenuStyle}" />
+                        <MenuItem
+                            x:Name="TaskMenu"
+                            Click="TaskMenu_Click"
+                            Foreground="{DynamicResource Foreground1}"
+                            Header="{x:Static lang:Resources.ToDoList}"
+                            Style="{DynamicResource MenuStyle}" />
                         <MenuItem
                             x:Name="SettingsMenu"
                             Click="SettingsMenu_Click"

diff --git a/DayBar/MainWindow.xaml.cs b/DayBar/MainWindow.xaml.cs
@@ -27,6 +27,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Collections.Generic;
 using System.IO;
 using System.Windows;
+using System.Windows.Documents;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 
@@ -257,4 +258,12 @@ private void ToDoBtn_Click(object sender, RoutedEventArgs e)
 		PageContent.Navigate(Global.ToDoPage);
 		ToDoBtn.IsChecked = true;
 	}
+
+	private void TaskMenu_Click(object sender, RoutedEventArgs e)
+	{
+		PageContent.Navigate(Global.ToDoPage);
+		ToDoBtn.IsChecked = true;
+
+		Show();
+	}
 }
diff --git a/DayBar/Pages/ToDoPage.xaml.cs b/DayBar/Pages/ToDoPage.xaml.cs
@@ -77,7 +77,7 @@ internal void InitUI()
 				OtherTasksPanel.Children.Add(new ToDoItem(_other[i], OtherTasksPanel));
 			}
 
-			ProgressTxt.Text = string.Format(Properties.Resources.TodoProgressTxt, (int)(todayDone / (double)_today.Count * 100d));
+			ProgressTxt.Text = string.Format(Properties.Resources.TodoProgressTxt, (int)(todayDone / ((double)_today.Count == 0 ? 1 : (double)_today.Count) * 100d));
 			ProgressBar.Value = (int)(todayDone / (double)_today.Count * 100d);
 		}
 		catch { }
@@ -91,7 +91,7 @@ internal void InitProgressUI()
 			if (_today[i].Done) todayDone++;
 		}
 
-		ProgressTxt.Text = string.Format(Properties.Resources.TodoProgressTxt, (int)(todayDone / (double)_today.Count * 100d));
+		ProgressTxt.Text = string.Format(Properties.Resources.TodoProgressTxt, (int)(todayDone / ((double)_today.Count == 0 ? 1 : (double)_today.Count) * 100d));
 		ProgressBar.Value = (int)(todayDone / (double)_today.Count * 100d);
 	}