Merge pull request #114 from OliBomby/dev

Dev update 1.7.0.0
OliBomby · Aug 29, 2020 · 16573d2 · 16573d2
2 parents ffe927e + 8cd6506
commit 16573d2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/Mapping Tools/MainWindow.xaml b/Mapping Tools/MainWindow.xaml
@@ -102,8 +102,8 @@
                                           ToolTip="Open the official Mapping Tools website in your browser."/>
                                 <MenuItem Header="_Github" Click="OpenGitHub" Icon="{materialDesign:PackIcon GithubCircle}"
                                           ToolTip="Go to the Mapping Tools Github."/>
-                                <MenuItem Header="_Info" Click="OpenInfo" Icon="{materialDesign:PackIcon InfoCircle}"
-                                          ToolTip="Basic information about your Mapping Tools client."/>
+                                <MenuItem Header="_About" Click="OpenInfo" Icon="{materialDesign:PackIcon InfoCircle}"
+                                          ToolTip="Information about your Mapping Tools client and credits."/>
                             </MenuItem>
                             <MenuItem x:Name="ProjectMenu" Visibility="Collapsed" Height="31" Header="_Project" Padding="12,0,0,0" MinWidth="67">
                             </MenuItem>

diff --git a/Mapping Tools/MainWindow.xaml.cs b/Mapping Tools/MainWindow.xaml.cs
@@ -14,6 +14,7 @@
 using System.Net.Http;
 using System.Reflection;
 using System.Security.Principal;
+using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -387,7 +388,22 @@ private void OpenGitHub(object sender, RoutedEventArgs e) {
         //Open info screen
         private void OpenInfo(object sender, RoutedEventArgs e) {
             var version = Assembly.GetEntryAssembly()?.GetName().Version;
-            MessageBox.Show($"Mapping Tools {version}\n\nMade by:\nOliBomby\nPotoofu", "Info");
+            var builder = new StringBuilder();
+            builder.AppendLine($"Mapping Tools {version}");
+            builder.AppendLine();
+            builder.AppendLine("Made by:");
+            builder.AppendLine("OliBomby");
+            builder.AppendLine();
+            builder.AppendLine("Supporters:");
+            builder.AppendLine("Mercury");
+            builder.AppendLine("Spoppyboi");
+            builder.AppendLine();
+            builder.AppendLine("Contributors:");
+            builder.AppendLine("Potoofu");
+            builder.AppendLine("Karoo13");
+            builder.AppendLine("Coppertine");
+
+            MessageBox.Show(builder.ToString(), "Info");
         }
 
         //Change top right icons on changed window state and set state variable

diff --git a/Mapping Tools/Properties/AssemblyInfo.cs b/Mapping Tools/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // 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.6.8.1")]
-[assembly: AssemblyFileVersion("1.6.8.1")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/Mapping Tools/viewmodels/SlideratorVm.cs b/Mapping Tools/viewmodels/SlideratorVm.cs
@@ -216,13 +216,13 @@ public double DistanceTraveled {
             }
         }
 
-        public int ExpectedSegments {
+        public long ExpectedSegments {
             get {
                 if (ExportAsStream) {
-                    return (int) (GraphBeats * BeatSnapDivisor) + 1;
+                    return (long) (GraphBeats * BeatSnapDivisor) + 1;
                 }
                 var newLength = NewVelocity * 100 * GlobalSv * GraphBeats;
-                return (int) ((newLength - DistanceTraveled) / MinDendrite + DistanceTraveled / 10);
+                return (long) ((newLength - DistanceTraveled) / MinDendrite + DistanceTraveled / 10);
             }
         }