Skip to content

Commit e9b60fc

Browse files
committed
2.3.3.8 - Screen now has Source (such as Graphics Card and Operating System), X, Y, Width, and Height
1 parent c90e411 commit e9b60fc

22 files changed

+841
-513
lines changed

ScreenCapture.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,6 @@ public Image GetImageByPath(string path)
443443
/// <param name="y">The Y value of the bitmap.</param>
444444
/// <param name="width">The Width value of the bitmap.</param>
445445
/// <param name="height">The Height value of the bitmap.</param>
446-
/// <param name="resolutionRatio">The resolution ratio to apply to the bitmap.</param>
447446
/// <param name="mouse">Determines if the mouse pointer should be included in the bitmap.</param>
448447
/// <returns>A bitmap image representing what we captured.</returns>
449448
public Bitmap GetScreenBitmap(int x, int y, int width, int height, bool mouse)
@@ -606,6 +605,7 @@ public string GetActiveWindowProcessName()
606605
/// <summary>
607606
/// Gets the bitmap images for the avaialble screens.
608607
/// </summary>
608+
/// <param name="source">The source index.</param>
609609
/// <param name="component">The component index.</param>
610610
/// <param name="x">The X value of the bitmap.</param>
611611
/// <param name="y">The Y value of the bitmap.</param>
@@ -614,11 +614,11 @@ public string GetActiveWindowProcessName()
614614
/// <param name="mouse">Determines if we include the mouse pointer in the captured bitmap.</param>
615615
/// <param name="bitmap">The bitmap to operate on.</param>
616616
/// <returns>A boolean to indicate if we were successful in getting a bitmap.</returns>
617-
public bool GetScreenImages(int component, int x, int y, int width, int height, bool mouse, out Bitmap bitmap)
617+
public bool GetScreenImages(int source, int component, int x, int y, int width, int height, bool mouse, out Bitmap bitmap)
618618
{
619619
try
620620
{
621-
bitmap = component == 0
621+
bitmap = source == 0 && component == 0
622622
? GetActiveWindowBitmap()
623623
: GetScreenBitmap(x, y, width, height, mouse);
624624

autoscreen.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@
257257
<Compile Include="macro\MacroParser.cs" />
258258
<Compile Include="modules\triggers\Trigger.cs" />
259259
<Compile Include="modules\triggers\TriggerCollection.cs" />
260-
<Compile Include="modules\screenshots\ScreenshotType.cs" />
261260
<Compile Include="security\Security.cs" />
262261
<Compile Include="settings\DefaultSettings.cs" />
263262
<Compile Include="settings\Setting.cs" />

config/Config.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ private void CheckAndCreateFiles(ScreenCapture screenCapture, Log log)
288288
{
289289
// Loading the screen collection will automatically create the available screens and add them to the collection.
290290
ScreenCollection screenCollection = new ScreenCollection();
291-
screenCollection.LoadXmlFileAndAddScreens(new ImageFormatCollection(), this, _macroParser, _fileSystem, log);
291+
screenCollection.LoadXmlFileAndAddScreens(new ImageFormatCollection(), this, _macroParser, screenCapture, _fileSystem, log);
292292
}
293293

294294
if (string.IsNullOrEmpty(_fileSystem.TriggersFile))

interface/FormAbout.Designer.cs

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

interface/FormAbout.resx

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Twitter
131131
https://twitter.com/autoscreen2
132132

133133
YouTube Channel
134-
https://www.youtube.com/c/gavinkendall/</value>
134+
https://www.youtube.com/user/gavinkendall/</value>
135135
</data>
136136
<data name="richTextBoxLicense.Text" xml:space="preserve">
137137
<value>GNU GENERAL PUBLIC LICENSE
@@ -322,28 +322,28 @@ END OF TERMS AND CONDITIONS</value>
322322
</data>
323323
<data name="richTextBoxChangelog.Text" xml:space="preserve">
324324
<value>Codename "Boombayah"
325-
2.3.3.8 Refactored code to reduce usage of static classes and static variables. Removed calls to GC Collect. Changed screen capture method. Removed "Resolution Ratio" option for better screen capture performance. Module tab page layout style changed to be multi-line. "Region Select / Auto Save" region is no longer created when application initialized since "Region Select / Auto Save" screenshots are now shown in all screenshot tabs.
325+
2.3.3.8 Screen now has Source (such as Graphics Card and Operating System), X, Y, Width, and Height. Removed "Resolution Ratio" option for better screen capture performance. Removed internal screen dictionary refresh from Windows because we now use X, Y, Width, and Height either from Graphics Card or from Operating System and these values can now be adjusted. Module tab page layout style changed to be multi-line. Refactored code to reduce usage of static classes and static variables for better memory management. Removed calls to GC Collect. Changed screen capture method. "Region Select / Auto Save" region is no longer created when application initialized. "Region Select / Auto Save" screenshots are now shown in all screenshot tabs.
326326
2.3.3.7 Memory leak fix.
327-
2.3.3.6 Active Window Title text comparison includes type of match to use during text comparison.
328-
2.3.3.5 Application Focus now has Delay Before and Delay After options.
329-
2.3.3.4 A bug fix for saving of file when adding screenshot to collection.
330-
2.3.3.3 An internal list of image hash values are stored when emailing screenshots so we do not email duplicate images.
331-
2.3.3.2 Can now run an Editor without arguments or without %filepath% tag when using Run Editor trigger action. Includes changes to version collection, change to how Application Focus behaves when application not found (so now adds the application to the process list regardless), and bug fix applied to threads.
327+
2.3.3.6 Active Window Title text comparison includes type of match to use during text comparison. (January 1, 2021)
328+
2.3.3.5 Application Focus now has Delay Before and Delay After options. (December 7, 2020)
329+
2.3.3.4 A bug fix for saving of file when adding screenshot to collection. (November 24, 2020)
330+
2.3.3.3 An internal list of image hash values are stored when emailing screenshots so we do not email duplicate images. (November 24, 2020)
331+
2.3.3.2 Can now run an Editor without arguments or without %filepath% tag when using Run Editor trigger action. Includes changes to version collection, change to how Application Focus behaves when application not found (so now adds the application to the process list regardless), and bug fix applied to threads. (November 10, 2020)
332332
2.3.3.1 New command line arguments -activeWindowTitle, -applicationFocus, and -label.
333333
2.3.3.0 Application Focus moved from Screen to Setup. Fixed Application Focus bug with Active Window Title. Renamed user setting keys. New method for capturing device display resolution.
334334
2.3.2.9 Application Focus implemented for Screen.
335335
2.3.2.8 Changelog added to About Auto Screen Capture window. Fixed bug with hidden system tray icon so no notification balloon appears when system tray icon is hidden.
336336
2.3.2.7 Quarter Year tag implemented so you can have %quarteryear% return "3" if we're currently in the third quarter of the current year.
337337
2.3.2.6 "Time of Day" Tag is now "Time Range" Tag with Macro 1, Macro 2, Macro 3, and Macro 4 to replace morning, afternoon, evening, and "Evening extends to next morning" fields. Also implemented "Day/Time" Trigger.
338-
2.3.2.5 Macro tag expressions can now parse date time formats such as yyyy-MM-dd and HH-mm-ss-fff (especially useful for the %yesterday% macro tag).
338+
2.3.2.5 Macro tag expressions can now parse date time formats such as yyyy-MM-dd and HH-mm-ss-fff (especially useful for the %yesterday% macro tag). (September 1, 2020)
339339
2.3.2.4 ListboxScreenshots sorted.
340340
2.3.2.3 Information Window renamed to Show Screen Capture Status
341341
2.3.2.2 Information Window implemented.
342342
2.3.2.1 Fixed bug with inactive schedules that should not perform any actions when inactive.
343343
2.3.2.0 Region Select Auto Save region is created if the regions.xml file is not found so you can view screenshots taken with Region Select Auto Save.
344344
2.3.1.9 Schedules can now have their own interval set for them separate from the main interval. Also fixed bug with screen capture duration info.
345345
2.3.1.8 Region Select implemented for Regions.
346-
2.3.1.7 OptimizeScreenCapture implemented.
346+
2.3.1.7 OptimizeScreenCapture implemented. (August 5, 2020)
347347
2.3.1.6 Region Select Edit implemented and fixed bug with ViewId for new Screens and Regions.
348348
2.3.1.5 Region Select / Auto Save implemented.
349349
2.3.1.4 ExitOnError set to True by default.
@@ -360,7 +360,7 @@ END OF TERMS AND CONDITIONS</value>
360360
2.3.0.3 Fixed bug when creating a new Trigger.
361361
2.3.0.2 Keyboard Shortcuts implemented.
362362
2.3.0.1 Fixed bug with FilenameLengthLimit application setting.
363-
2.3.0.0 Faster startup, commands can be issued to a running instance, multiple schedules, more trigger conditions and trigger actions, and help tips in the help bar.
363+
2.3.0.0 Faster startup, commands can be issued to a running instance, multiple schedules, more trigger conditions and trigger actions, and help tips in the help bar. (June 8, 2020)
364364

365365
Codename "Dalek"
366366
2.2.5.0 A version that was never released. This was to make startup speed faster but major features implemented for the application (such as Schedules and controlling a running instance of the application from the command line) deserved 2.2.5.0 to become 2.3.0.0! Boombayah!
@@ -369,7 +369,7 @@ Codename "Dalek"
369369
2.2.3.1 Apply Label is made invisible when screen capture session is locked. Fixed bug with parsing command line arguments.
370370
2.2.3.0 Apply Label system tray icon menu lists available labels.
371371
2.2.2.9 Double-click system tray icon to show or hide interface. Fixed issue with having backslash characters in name and any invalid Windows characters in path.
372-
2.2.2.8 Fixed an issue with displaying a screenshot preview.
372+
2.2.2.8 Fixed an issue with displaying a screenshot preview. (October 3, 2019)
373373
2.2.2.7 Make sure we do not check the drive information if the path is a shared network path.
374374
2.2.2.6 Fixed upgrade system. For real this time.
375375
2.2.2.5 Fixed bug with upgrade system.
@@ -403,10 +403,34 @@ Codename "Dalek"
403403
2.2.0.3 Active window title is retrieved earlier for less chance in having different titles in different screenshot objects despite being in the same screen capture cycle. Some code cleanup. Documentation being added. Fixed a racing condition issue with KeepScreenshotsForDays and Save in ScreenshotCollection.
404404
2.2.0.2 Application no longer stops current screen capture session if the directory root does not exist or the drive is not ready. This ensures that the current screen capture session will continue even if the drive being referenced is not available for some reason. Useful if you usually save screen images to an external drive but then disconnect from it and want to continue using the laptop's internal drive. Reintroduced the thread for saving screenshots and the lock on xDoc.
405405
2.2.0.1 Fixed bug with empty window title which resulted in image files remaining after cleanup.
406-
2.2.0.0 Support for unlimited number of screens. This was a huge release with the most commits ever in the application's history.
406+
2.2.0.0 Support for unlimited number of screens. This was a huge release with the most commits ever in the application's history. (May 24, 2019)
407407

408408
Codename "Clara"
409-
2.1.8.2 The last version in the 2.1 "Macro" series. This includes the large user.xml file fix (2.1.7.9), "the handle is invalid" fix when Windows is locked (2.1.8.0), and the removal of the "start when Windows starts" feature (2.1.8.1); because anti-virus software falsely flags the application as a virus if we do that.</value>
409+
2.1.8.2 The final version in the 2.1 "Macro" series. This includes the large user.xml file fix (2.1.7.9), "the handle is invalid" fix when Windows is locked (2.1.8.0), and the removal of the "start when Windows starts" feature (2.1.8.1); because anti-virus software falsely flags the application as a virus if we do that. (January 4, 2019)
410+
411+
Macro Series
412+
2.1.7.6 The application became portable with its own "!autoscreen" directory containing application data and user settings.
413+
2.1.7.5 Regions could now be captured. (December 7, 2018)
414+
2.1.6.2 Triggers were implemented so you could perform an action based on a condition to change the application's behaviour.
415+
2.1.5.2 The -hideSystemTrayIcon command line option is introduced.
416+
2.1.5.0 The mouse pointer is captured. (June 15, 2018)
417+
2.1.4.0 Memory leak fix. (May 11, 2018)
418+
2.1.2.0 Editors module implemented. (April 10, 2018)
419+
420+
Phoenix Series
421+
2.0.6.3 Stability improvements and bug fixes. (November 4, 2017)
422+
2.0.5.0 The application is re-coded/re-written and a new user-friendly interface is implemented. Command line options are introduced. The project is put on GitHub. (May 14, 2015)
423+
424+
Legacy Series
425+
1.0.8.0 Bug fixes and improved screenshot processing. (January 29, 2009)
426+
1.0.5.0 The application gets a few bug fixes and is distributed by Softpedia. (June 28, 2008)
427+
1.0.0.0 Auto Screen Capture is uploaded to SourceForge and distributed by BrotherSoft. (January 2008)
428+
429+
Prototype
430+
0.0.0.1 The prototype that simply took screenshots at a defined interval which would run on a timer. (2007)</value>
431+
</data>
432+
<data name="richTextBoxWhatsNew.Text" xml:space="preserve">
433+
<value>Every screen has its own X, Y, Width, and Height values. The application no longer continually gets its display device information from Windows so you can now freely adjust the position and size for each screen.</value>
410434
</data>
411435
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
412436
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

0 commit comments

Comments
 (0)