diff --git a/.gitignore b/.gitignore index 3365cfe..905c4c8 100644 --- a/.gitignore +++ b/.gitignore @@ -272,3 +272,6 @@ AutomatedTests/*.png /Installer/LatestBrainSimVersion.txt /BrainSimulator.backup /Installer/LatestBrainSimVersion.zip +/BrainSimII.zip +/Installer/BrainSimII_Setup.exe +/Installer/BrainSimII_Setup.zip diff --git a/BrainSimulator/BrainSimulator.csproj b/BrainSimulator/BrainSimulator.csproj index bf6447e..a63cb89 100644 --- a/BrainSimulator/BrainSimulator.csproj +++ b/BrainSimulator/BrainSimulator.csproj @@ -10,9 +10,10 @@ bin\ False $(VersionPrefix) - 1.6.8 - favicon.ico + 1.7.8 + Iconsmall.ico build$([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss")) + iconsmall.ico @@ -23,6 +24,12 @@ + + + + + + @@ -118,15 +125,21 @@ + - + + + + + + PreserveNewest @@ -330,11 +343,11 @@ + - @@ -396,6 +409,10 @@ + + True + \ + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/BrainSimulator/FiringHistoryWindow.xaml.cs b/BrainSimulator/FiringHistoryWindow.xaml.cs index 143e9f9..9b6e5f0 100644 --- a/BrainSimulator/FiringHistoryWindow.xaml.cs +++ b/BrainSimulator/FiringHistoryWindow.xaml.cs @@ -40,10 +40,9 @@ private void Dt_Tick(object sender, EventArgs e) public void Draw() { //if you are not full-width or at end, don't repaint because it makes the image move around - bool atRightEnd = (int)(scroller.HorizontalOffset + scroller.RenderSize.Width) == (int)scroller.ExtentWidth; + bool atRightEnd = scroller.HorizontalOffset + scroller.RenderSize.Width == scroller.ExtentWidth; bool fullWidth = scroller.RenderSize.Width == scroller.ExtentWidth; - if (theCanvas.Children.Count != 0 && !atRightEnd && !fullWidth) - return; + if (theCanvas.Children.Count != 0 && !atRightEnd && !fullWidth) return; if (dragging) return; ReallyDraw(); } diff --git a/BrainSimulator/GetUpdateDialog.xaml.cs b/BrainSimulator/GetUpdateDialog.xaml.cs index 67b687c..c55dfc1 100644 --- a/BrainSimulator/GetUpdateDialog.xaml.cs +++ b/BrainSimulator/GetUpdateDialog.xaml.cs @@ -1,16 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; +using System.Windows; namespace BrainSimulator { @@ -28,7 +16,7 @@ private void ButtonGetUpdate_Click(object sender, RoutedEventArgs e) { Properties.Settings.Default.CheckForUpdates = cbDontAsk.IsChecked == false; Properties.Settings.Default.Save(); - MainWindow.OpenApp("https://futureai.guru/BrainSimDownload.aspx"); + MainWindow.OpenApp(MainWindow.webURL+"/technologies/BrainSimII-download"); this.Close(); MainWindow.thisWindow?.Close(); } diff --git a/BrainSimulator/Help.xaml b/BrainSimulator/Help.xaml index 38722e5..4026ec2 100644 --- a/BrainSimulator/Help.xaml +++ b/BrainSimulator/Help.xaml @@ -9,7 +9,6 @@