Merge pull request gitextensions#5505 from c3er/update-option

Add option to disable automatic update search
gerhardol · Oct 4, 2018 · 5223815 · 5223815
2 parents ecf1335 + 4dba783
commit 5223815
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 16 deletions.
diff --git a/GitCommands/Settings/AppSettings.cs b/GitCommands/Settings/AppSettings.cs
@@ -1504,6 +1504,12 @@ public static DateTime LastUpdateCheck
             set => SetDate("LastUpdateCheck", value);
         }
 
+        public static bool CheckForUpdates
+        {
+            get => GetBool("CheckForUpdates", true);
+            set => SetBool("CheckForUpdates", value);
+        }
+
         public static bool CheckForReleaseCandidates
         {
             get => GetBool("CheckForReleaseCandidates", false);

diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -685,7 +685,7 @@ private void InternalInitialize(bool hard)
             using (WaitCursorScope.Enter())
             {
                 // check for updates
-                if (AppSettings.LastUpdateCheck.AddDays(7) < DateTime.Now)
+                if (AppSettings.CheckForUpdates && AppSettings.LastUpdateCheck.AddDays(7) < DateTime.Now)
                 {
                     AppSettings.LastUpdateCheck = DateTime.Now;
                     var updateForm = new FormUpdates(AppSettings.AppVersion);

diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/AdvancedSettingsPage.Designer.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/AdvancedSettingsPage.Designer.cs
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/AdvancedSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/AdvancedSettingsPage.cs
@@ -28,6 +28,7 @@ protected override void SettingsToPage()
             chkUseLocalChangesAction.Checked = AppSettings.UseDefaultCheckoutBranchAction;
             chkDontSHowHelpImages.Checked = AppSettings.DontShowHelpImages;
             chkAlwaysShowAdvOpt.Checked = AppSettings.AlwaysShowAdvOpt;
+            chkCheckForUpdates.Checked = AppSettings.CheckForUpdates;
             chkCheckForRCVersions.Checked = AppSettings.CheckForReleaseCandidates;
             chkConsoleEmulator.Checked = AppSettings.UseConsoleEmulatorForCommands;
             chkAutoNormaliseBranchName.Checked = AppSettings.AutoNormaliseBranchName;
@@ -42,6 +43,7 @@ protected override void PageToSettings()
             AppSettings.UseDefaultCheckoutBranchAction = chkUseLocalChangesAction.Checked;
             AppSettings.DontShowHelpImages = chkDontSHowHelpImages.Checked;
             AppSettings.AlwaysShowAdvOpt = chkAlwaysShowAdvOpt.Checked;
+            AppSettings.CheckForUpdates = chkCheckForUpdates.Checked;
             AppSettings.CheckForReleaseCandidates = chkCheckForRCVersions.Checked;
             AppSettings.UseConsoleEmulatorForCommands = chkConsoleEmulator.Checked;
             AppSettings.AutoNormaliseBranchName = chkAutoNormaliseBranchName.Checked;

diff --git a/GitUI/Translation/English.xlf b/GitUI/Translation/English.xlf
@@ -48,6 +48,10 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
         <source>Auto normalise branch name</source>
         <target />
       </trans-unit>
+      <trans-unit id="chkCheckForUpdates.Text">
+        <source>Check for updates weekly</source>
+        <target />
+      </trans-unit>
       <trans-unit id="chkCheckForRCVersions.Text">
         <source>Check for release candidate versions</source>
         <target />

diff --git a/GitUI/Translation/German.xlf b/GitUI/Translation/German.xlf
@@ -58,6 +58,11 @@ Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen vo
         <source>Auto normalise branch name</source>
         <target>Branchname automatisch normalisieren</target>
 
+      </trans-unit>
+      <trans-unit id="chkCheckForUpdates.Text">
+        <source>Check for updates weekly</source>
+        <target>Wöchentlich nach updates suchen</target>
+
       </trans-unit>
       <trans-unit id="chkCheckForRCVersions.Text">
         <source>Check for release candidate versions</source>