Skip to content

Commit d0466bf

Browse files
committed
2.5.1.7 - TimeFormatForTrigger considers seconds. Time property for Trigger sets time for zero seconds when loading Triggers, adding new Triggers, and changing existing Triggers so if a Trigger enables a module item it will rebuild the list of module items only once because DateTime.Now compared to Trigger.Time considers the top of the minute at zero seconds instead of triggering for an entire minute.
1 parent f6aa110 commit d0466bf

File tree

10 files changed

+15
-10
lines changed

10 files changed

+15
-10
lines changed

AutoScreenCaptureSetup/AutoScreenCaptureSetup.vdproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,15 +259,15 @@
259259
{
260260
"Name" = "8:Microsoft Visual Studio"
261261
"ProductName" = "8:Auto Screen Capture"
262-
"ProductCode" = "8:{2AF4C4C0-B8B5-4EFE-BBA0-F4C5C2B679DE}"
263-
"PackageCode" = "8:{98AB027E-56DA-4FC2-868B-E8949B6F9189}"
262+
"ProductCode" = "8:{5F700EC1-09E1-4F0C-94DF-26002BFA8EC2}"
263+
"PackageCode" = "8:{E6ECCDD3-C4C0-4F91-8E6E-CA86D854AF12}"
264264
"UpgradeCode" = "8:{6B29B7BC-0101-4495-B28C-26B6D3CDCC02}"
265265
"AspNetVersion" = "8:4.0.30319.0"
266266
"RestartWWWService" = "11:FALSE"
267267
"RemovePreviousVersions" = "11:TRUE"
268268
"DetectNewerInstalledVersion" = "11:TRUE"
269269
"InstallAllUsers" = "11:TRUE"
270-
"ProductVersion" = "8:2.5.16"
270+
"ProductVersion" = "8:2.5.17"
271271
"Manufacturer" = "8:Gavin Kendall"
272272
"ARPHELPTELEPHONE" = "8:"
273273
"ARPHELPLINK" = "8:https://sourceforge.net/p/autoscreen/tickets/"

Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.5.1.6")]
36-
[assembly: AssemblyFileVersion("2.5.1.6")]
35+
[assembly: AssemblyVersion("2.5.1.7")]
36+
[assembly: AssemblyFileVersion("2.5.1.7")]
3737
[assembly: NeutralResourcesLanguageAttribute("en-CA")]

app.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<assemblyIdentity
44
type="win32"
55
name="GavinKendall.AutoScreenCapture"
6-
version="2.5.1.6"/>
6+
version="2.5.1.7"/>
77
<asmv3:application>
88
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
99
<dpiAware>True/PM</dpiAware>

autoscreen.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# The version of Auto Screen Capture that this configuration file is intended for.
3030
# Be careful if you change the version number and don't provide the correct definitions for the specific version
3131
# as some settings will only work with certain versions of the application. Versioning of the configuration file starts with Auto Screen Capture 2.5.0.0 ("Limoncello").
32-
Version=2.5.1.6
32+
Version=2.5.1.7
3333

3434
# Starting with version 2.5.0.0 the entire configuration file defines all the default application and user settings
3535
# that were previously hard-coded within the application itself. Now you have the ability to define all of the default settings in a single file!

changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Auto Screen Capture by Gavin Kendall
22

3+
2.5.1.7 TimeFormatForTrigger considers seconds. Time property for Trigger sets time for zero seconds when loading Triggers, adding new Triggers, and changing existing Triggers so if a Trigger enables a module item it will rebuild the list of module items only once because DateTime.Now compared to Trigger.Time considers the top of the minute at zero seconds instead of triggering for an entire minute.
34
2.5.1.6 Image Difference Tolerance (as part of Optimize Screen Capture) is now available for individual Screens and Regions. Can now change dashboard wallpaper.
45
2.5.1.5 Optimize Screen Capture tolerance percentage is calculated based on Math.Ceiling() for better results when comparing very small changes between the previous captured image and the current captured image.
56
2.5.1.4 A small fix for the -interval command.

interface/about/FormAbout.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

interface/trigger/FormTrigger.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ private void AddTrigger()
213213
ActionType = (TriggerActionType)listBoxAction.SelectedIndex,
214214
Enable = checkBoxEnable.Checked,
215215
Date = dateTimePickerDate.Value,
216-
Time = dateTimePickerTime.Value,
216+
Time = new DateTime(dateTimePickerDate.Value.Year, dateTimePickerDate.Value.Month, dateTimePickerDate.Value.Day, dateTimePickerTime.Value.Hour, dateTimePickerTime.Value.Minute, 0),
217217
Day = comboBoxDay.Text,
218218
Days = (int)numericUpDownDays.Value,
219219
CycleCount = (int)numericUpDownCycleCount.Value,
@@ -278,7 +278,7 @@ private void ChangeTrigger()
278278
TriggerCollection.Get(TriggerObject).ActionType = (TriggerActionType)listBoxAction.SelectedIndex;
279279
TriggerCollection.Get(TriggerObject).Enable = checkBoxEnable.Checked;
280280
TriggerCollection.Get(TriggerObject).Date = dateTimePickerDate.Value;
281-
TriggerCollection.Get(TriggerObject).Time = dateTimePickerTime.Value;
281+
TriggerCollection.Get(TriggerObject).Time = new DateTime(dateTimePickerDate.Value.Year, dateTimePickerDate.Value.Month, dateTimePickerDate.Value.Day, dateTimePickerTime.Value.Hour, dateTimePickerTime.Value.Minute, 0);
282282
TriggerCollection.Get(TriggerObject).Day = comboBoxDay.Text;
283283
TriggerCollection.Get(TriggerObject).Days = (int)numericUpDownDays.Value;
284284
TriggerCollection.Get(TriggerObject).CycleCount = (int)numericUpDownCycleCount.Value;

macro/MacroParser.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ public string TimeFormatForTrigger
136136
sb.Append(HourFormat);
137137
sb.Append(":");
138138
sb.Append(MinuteFormat);
139+
sb.Append(":");
140+
sb.Append(SecondFormat);
139141

140142
return sb.ToString();
141143
}

modules/triggers/TriggerCollection.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ public bool LoadXmlFileAndAddTriggers(Config config, FileSystem fileSystem, Log
201201
case TRIGGER_TIME:
202202
xReader.Read();
203203
trigger.Time = Convert.ToDateTime(xReader.Value);
204+
trigger.Time = new DateTime(trigger.Date.Year, trigger.Date.Month, trigger.Date.Day, trigger.Time.Hour, trigger.Time.Minute, 0);
204205
break;
205206

206207
case TRIGGER_DAY:

settings/Settings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ public void Initialize(FileSystem fileSystem)
288288
_versionCollection.Add(new Version(CODENAME_LIMONCELLO, "2.5.1.3"));
289289
_versionCollection.Add(new Version(CODENAME_LIMONCELLO, "2.5.1.4"));
290290
_versionCollection.Add(new Version(CODENAME_LIMONCELLO, "2.5.1.5"));
291+
_versionCollection.Add(new Version(CODENAME_LIMONCELLO, "2.5.1.6"));
291292

292293
Application = new SettingCollection()
293294
{

0 commit comments

Comments
 (0)