Skip to content

Commit 33cc7a9

Browse files
gavinkendallgavinkendall
committed
2.4.0.9 - Allow Active Window to use GDI screen capture method for Screen. Removed logging from FormRegionSelectWithMouse.
1 parent e95b40e commit 33cc7a9

File tree

9 files changed

+15
-28
lines changed

9 files changed

+15
-28
lines changed

‎AutoScreenCaptureSetup/AutoScreenCaptureSetup.vdproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,15 +233,15 @@
233233
{
234234
"Name" = "8:Microsoft Visual Studio"
235235
"ProductName" = "8:Auto Screen Capture"
236-
"ProductCode" = "8:{16815007-9A04-48D3-AEE0-F9AFDC06E31E}"
237-
"PackageCode" = "8:{A6631A89-4EB4-4084-B2D6-08127F344D44}"
236+
"ProductCode" = "8:{1EBABF2D-2D46-48EC-82BA-04DFFF5D45C1}"
237+
"PackageCode" = "8:{826BFB39-733A-4DAB-8A8A-3E4240A348F0}"
238238
"UpgradeCode" = "8:{6B29B7BC-0101-4495-B28C-26B6D3CDCC02}"
239239
"AspNetVersion" = "8:4.0.30319.0"
240240
"RestartWWWService" = "11:FALSE"
241241
"RemovePreviousVersions" = "11:TRUE"
242242
"DetectNewerInstalledVersion" = "11:TRUE"
243243
"InstallAllUsers" = "11:FALSE"
244-
"ProductVersion" = "8:2.4.08"
244+
"ProductVersion" = "8:2.4.09"
245245
"Manufacturer" = "8:Gavin Kendall"
246246
"ARPHELPTELEPHONE" = "8:"
247247
"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.4.0.8")]
36-
[assembly: AssemblyFileVersion("2.4.0.8")]
35+
[assembly: AssemblyVersion("2.4.0.9")]
36+
[assembly: AssemblyFileVersion("2.4.0.9")]
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.4.0.8"/>
6+
version="2.4.0.9"/>
77
<asmv3:application>
88
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
99
<dpiAware>True/PM</dpiAware>

‎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/main/FormMain-ScreenCapture.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ private Bitmap GetBitmapFromRegionSelect()
515515
/// <param name="e"></param>
516516
private void toolStripMenuItemRegionSelectClipboard_Click(object sender, EventArgs e)
517517
{
518-
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_log, _screenCapture);
518+
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_screenCapture);
519519
_formRegionSelectWithMouse.LoadCanvas(sendToClipboard: true);
520520
}
521521

@@ -526,7 +526,7 @@ private void toolStripMenuItemRegionSelectClipboard_Click(object sender, EventAr
526526
/// <param name="e"></param>
527527
private void toolStripMenuItemRegionSelectClipboardAutoSave_Click(object sender, EventArgs e)
528528
{
529-
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_log, _screenCapture);
529+
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_screenCapture);
530530
_formRegionSelectWithMouse.MouseSelectionCompleted += _formRegionSelectWithMouse_RegionSelectClipboardAutoSaveMouseSelectionCompleted;
531531
_formRegionSelectWithMouse.LoadCanvas(sendToClipboard: true);
532532
}
@@ -538,7 +538,7 @@ private void toolStripMenuItemRegionSelectClipboardAutoSave_Click(object sender,
538538
/// <param name="e"></param>
539539
private void toolStripMenuItemRegionSelectClipboardAutoSaveEdit_Click(object sender, EventArgs e)
540540
{
541-
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_log, _screenCapture);
541+
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_screenCapture);
542542
_formRegionSelectWithMouse.MouseSelectionCompleted += _formRegionSelectWithMouse_RegionSelectClipboardAutoSaveEditMouseSelectionCompleted;
543543
_formRegionSelectWithMouse.LoadCanvas(sendToClipboard: true);
544544
}
@@ -550,7 +550,7 @@ private void toolStripMenuItemRegionSelectClipboardAutoSaveEdit_Click(object sen
550550
/// <param name="e"></param>
551551
private void toolStripMenuItemRegionSelectClipboardFloatingScreenshot_Click(object sender, EventArgs e)
552552
{
553-
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_log, _screenCapture);
553+
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_screenCapture);
554554
_formRegionSelectWithMouse.MouseSelectionCompleted += _formRegionSelectWithMouse_RegionSelectClipboardFloatingScreenshotMouseSelectionCompleted;
555555
_formRegionSelectWithMouse.LoadCanvas(sendToClipboard: true);
556556
}
@@ -562,7 +562,7 @@ private void toolStripMenuItemRegionSelectClipboardFloatingScreenshot_Click(obje
562562
/// <param name="e"></param>
563563
private void toolStripMenuItemRegionSelectFloatingScreenshot_Click(object sender, EventArgs e)
564564
{
565-
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_log, _screenCapture);
565+
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_screenCapture);
566566
_formRegionSelectWithMouse.MouseSelectionCompleted += _formRegionSelectWithMouse_RegionSelectFloatingScreenshotMouseSelectionCompleted;
567567
_formRegionSelectWithMouse.LoadCanvas(sendToClipboard: false);
568568
}

‎interface/region/FormRegion.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ private void FormRegion_FormClosing(object sender, FormClosingEventArgs e)
450450

451451
private void buttonRegionSelect_Click(object sender, EventArgs e)
452452
{
453-
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_log, _screenCapture);
453+
_formRegionSelectWithMouse = new FormRegionSelectWithMouse(_screenCapture);
454454
_formRegionSelectWithMouse.MouseSelectionCompleted += _formRegionSelectWithMouse_RegionSelectMouseSelectionCompleted;
455455
_formRegionSelectWithMouse.LoadCanvas(sendToClipboard: false);
456456

‎interface/region_select/FormRegionSelectWithMouse.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ namespace AutoScreenCapture
3131
/// </summary>
3232
public partial class FormRegionSelectWithMouse : Form
3333
{
34-
Log _log;
3534
ScreenCapture _screenCapture;
3635

3736
private bool _sendToClipboard;
@@ -65,11 +64,10 @@ public partial class FormRegionSelectWithMouse : Form
6564
/// <summary>
6665
/// Empty constructor.
6766
/// </summary>
68-
public FormRegionSelectWithMouse(Log log, ScreenCapture screenCapture)
67+
public FormRegionSelectWithMouse(ScreenCapture screenCapture)
6968
{
7069
InitializeComponent();
7170

72-
_log = log;
7371
_screenCapture = screenCapture;
7472

7573
outputX = 0;
@@ -127,8 +125,6 @@ public void LoadCanvas(bool sendToClipboard)
127125

128126
Hide();
129127

130-
_log.Write($"RegionSelectWithMouse(LoadCanvas) X={Left}, Y={Top}, Width={Width}, Height={Height}", writeError: false, null);
131-
132128
Bitmap bitmap = _screenCapture.GetScreenBitmap(source: -1, component: -1, captureMethod: 1, Left, Top, Width, Height, resolutionRatio: 100, mouse: false);
133129

134130
using (MemoryStream s = new MemoryStream())
@@ -219,8 +215,6 @@ private void pictureBoxMouseCanvas_MouseUp(object sender, MouseEventArgs e)
219215
outputWidth = _selectWidth;
220216
outputHeight = _selectHeight;
221217

222-
_log.Write($"RegionSelectWithMouse(CompleteMouseSelection) X={outputX}, Y={outputY}, Width={outputWidth}, Height={outputHeight}", writeError: false, null);
223-
224218
CompleteMouseSelection(sender, e);
225219
}
226220

‎interface/screen/FormScreen.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,6 @@ private void UpdatePreviewImage(ScreenCapture screenCapture)
400400
checkBoxMouse.Enabled = false;
401401
}
402402

403-
comboBoxScreenCaptureMethod.Enabled = true;
404-
405403
if (checkBoxAutoAdapt.Checked)
406404
{
407405
labelScreenSource.Enabled = false;
@@ -451,12 +449,6 @@ private void UpdatePreviewImage(ScreenCapture screenCapture)
451449
numericUpDownY.Enabled = false;
452450
numericUpDownWidth.Enabled = false;
453451
numericUpDownHeight.Enabled = false;
454-
455-
if (!checkBoxAutoAdapt.Checked)
456-
{
457-
comboBoxScreenCaptureMethod.SelectedIndex = 0;
458-
comboBoxScreenCaptureMethod.Enabled = false;
459-
}
460452
}
461453

462454
pictureBoxPreview.Image = null;

‎settings/Settings.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ public void Load(FileSystem fileSystem)
256256
_versionCollection.Add(new Version(CODENAME_BLADE, "2.4.0.5")); // Icon Double Click trigger implemented. Added more trigger actions.
257257
_versionCollection.Add(new Version(CODENAME_BLADE, "2.4.0.6")); // Screen Capture Status and Screen Capture Status With Label Switcher windows have larger text, Region Select uses BitBlt capture method, Preview for Screen and Region use BitBlt capture method, Initial Capture is set as default, Region Select logs selection information to log file.
258258
_versionCollection.Add(new Version(CODENAME_BLADE, "2.4.0.7")); // Resolution Ratio implemented
259+
_versionCollection.Add(new Version(CODENAME_BLADE, "2.4.0.8")); // Region Preview fix.
259260

260261
Application = new SettingCollection()
261262
{

0 commit comments

Comments
 (0)