BUG-2077: More improvements for the update check interval. Also corrected the readme.txt.template

This commit is contained in:
Robin 2016-12-30 11:15:00 +01:00
parent 245ffe5da9
commit b92d79ed39
5 changed files with 60 additions and 8 deletions

View file

@ -506,6 +506,8 @@ namespace Greenshot {
this.numericUpDown_daysbetweencheck.Size = new System.Drawing.Size(57, 20);
this.numericUpDown_daysbetweencheck.TabIndex = 8;
this.numericUpDown_daysbetweencheck.ThousandsSeparator = true;
this.numericUpDown_daysbetweencheck.Minimum = 0;
this.numericUpDown_daysbetweencheck.Maximum = 365;
//
// label_checkperiod
//

View file

@ -46,6 +46,7 @@ namespace Greenshot {
private static readonly ILog Log = LogManager.GetLogger(typeof(SettingsForm));
private readonly ToolTip _toolTip = new ToolTip();
private bool _inHotkey;
private int _daysbetweencheckPreviousValue;
public SettingsForm() {
InitializeComponent();
@ -71,7 +72,10 @@ namespace Greenshot {
ie_hotkeyControl.Leave += LeaveHotkeyControl;
lastregion_hotkeyControl.Enter += EnterHotkeyControl;
lastregion_hotkeyControl.Leave += LeaveHotkeyControl;
// Changes for BUG-2077
numericUpDown_daysbetweencheck.ValueChanged += NumericUpDownDaysbetweencheckOnValueChanged;
_daysbetweencheckPreviousValue = (int) numericUpDown_daysbetweencheck.Value;
DisplayPluginTab();
UpdateUi();
ExpertSettingsEnableState(false);
@ -79,6 +83,38 @@ namespace Greenshot {
CheckSettings();
}
/// <summary>
/// This makes sure the check cannot be set to 1-6
/// </summary>
/// <param name="sender">object</param>
/// <param name="eventArgs">EventArgs</param>
private void NumericUpDownDaysbetweencheckOnValueChanged(object sender, EventArgs eventArgs)
{
int currentValue = (int)numericUpDown_daysbetweencheck.Value;
// Check if we can into the forbidden range
if (currentValue > 0 && currentValue < 7)
{
if (_daysbetweencheckPreviousValue <= currentValue)
{
numericUpDown_daysbetweencheck.Value = 7;
}
else
{
numericUpDown_daysbetweencheck.Value = 0;
}
}
if ((int)numericUpDown_daysbetweencheck.Value < 0)
{
numericUpDown_daysbetweencheck.Value = 0;
}
if ((int)numericUpDown_daysbetweencheck.Value > 365)
{
numericUpDown_daysbetweencheck.Value = 365;
}
_daysbetweencheckPreviousValue = (int)numericUpDown_daysbetweencheck.Value;
}
private void EnterHotkeyControl(object sender, EventArgs e) {
HotkeyControl.UnregisterHotkeys();
_inHotkey = true;

View file

@ -9,17 +9,23 @@ All details to our tickets can be found here: https://greenshot.atlassian.net
@DETAILVERSION@
* BUG-2065 Overflow Error
This is a bugfix release for the Greenshot 1.2.9.104-3721c10 RELEASE
Bugs fixed:
* BUG-2065 OverflowException in the editor
* BUG-2077 It's not possible to disable the update check
* BUG-2080 Exception when opening the context menu
* BUG-2089 Greenshot crashes when hotkey registration fails and OneDrive is not installed
* BUG-2091 Greenshot .zip version has wrong log configuration
* FEATURE-992 Open Greenshot in foreground
* FEATURE-995 Setting to paste new images inside greenshot based on cursor location
* FEATURE-998 Open Last Capture File should select/jump to the file
* FEATURE-1000 Active OK-button in Greenshot quality
Added or changed translation:
* Nederlands by Stephan Paternotte
Features added:
* FEATURE-992 When reusing the editor, it is not brought to the front
* FEATURE-995 Paste images inside Greenshot editor to the current cursor location
* FEATURE-998 Opening last capture in explorer should select/jump to the file
* FEATURE-1000 Set default focus on the OK-button in the Greenshot quality dialog
Translations modified:
Nederlands by Stephan Paternotte
1.2.9.104-3721c10 RELEASE

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LinqBridge" version="1.3.0" targetFramework="net20" />
</packages>

View file

@ -431,6 +431,10 @@ namespace GreenshotPlugin.Core {
{
UpdateCheckInterval = 14;
}
if (UpdateCheckInterval > 365)
{
UpdateCheckInterval = 365;
}
// Enable OneNote if upgrading from 1.1
if (ExcludeDestinations != null && ExcludeDestinations.Contains("OneNote")) {