Skip to content

Commit 15356db

Browse files
committed
2.3.6.0 Fix to SMTP.
1 parent 165abe0 commit 15356db

File tree

6 files changed

+18
-16
lines changed

6 files changed

+18
-16
lines changed

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.3.4.9")]
36-
[assembly: AssemblyFileVersion("2.3.4.9")]
35+
[assembly: AssemblyVersion("2.3.6.0")]
36+
[assembly: AssemblyFileVersion("2.3.6.0")]
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.3.4.9"/>
6+
version="2.3.6.0"/>
77
<asmv3:application>
88
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
99
<dpiAware>True/PM</dpiAware>

changelog.txt

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

55

66
Codename "Boombayah"
7+
2.3.6.0 Fix to SMTP.
78
2.3.4.9 Region Select Options and Region Select / Clipboard / Floating Screenshot implemented.
89
2.3.4.8 Signed assembly in attempt to satisfy anti-virus software. Fixed weird Exit bug.
910
2.3.4.7 SaveScreenshotRefs user setting introduced. Implemented command line options -saveScreenshotRefs=on and -saveScreenshotRefs=off.

interface/FormAbout.resx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="richTextBoxApplication.Text" xml:space="preserve">
121-
<value>Auto Screen Capture 2.3.4.9 ("Boombayah")
121+
<value>Auto Screen Capture 2.3.6.0 ("Boombayah")
122122
Developed by Gavin Kendall (2008 - 2021)
123123

124124
SourceForge Project Site
@@ -140,6 +140,7 @@ Triggers have been rewritten. I haven't spent much time on the new wizard-style
140140
</data>
141141
<data name="richTextBoxChangelog.Text" xml:space="preserve">
142142
<value>Codename "Boombayah"
143+
2.3.6.0 Fix to SMTP.
143144
2.3.4.9 Region Select Options and Region Select / Clipboard / Floating Screenshot implemented.
144145
2.3.4.8 Signed assembly in attempt to satisfy anti-virus software. Fixed weird Exit bug.
145146
2.3.4.7 SaveScreenshotRefs user setting introduced. Implemented command line options -saveScreenshotRefs=on and -saveScreenshotRefs=off.

interface/main/FormMain-Screenshots.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -522,25 +522,25 @@ private bool EmailScreenshot(Screenshot screenshot, bool prompt)
522522

523523
_log.WriteDebugMessage("Attempting to email screenshot \"" + screenshot.Path + "\"");
524524

525-
string host = _config.Settings.Application.GetByKey("EmailServerHost", _config.Settings.DefaultSettings.EmailServerHost).Value.ToString();
525+
string host = Settings.SMTP.GetByKey("EmailServerHost", _config.Settings.DefaultSettings.EmailServerHost).Value.ToString();
526526

527527
_log.WriteDebugMessage("Host = " + host);
528528

529-
int.TryParse(_config.Settings.Application.GetByKey("EmailServerPort", _config.Settings.DefaultSettings.EmailServerPort).Value.ToString(), out int port);
529+
int.TryParse(Settings.SMTP.GetByKey("EmailServerPort", _config.Settings.DefaultSettings.EmailServerPort).Value.ToString(), out int port);
530530

531531
_log.WriteDebugMessage("Port = " + port);
532532

533-
bool.TryParse(_config.Settings.Application.GetByKey("EmailServerEnableSSL", _config.Settings.DefaultSettings.EmailServerEnableSSL).Value.ToString(), out bool ssl);
533+
bool.TryParse(Settings.SMTP.GetByKey("EmailServerEnableSSL", _config.Settings.DefaultSettings.EmailServerEnableSSL).Value.ToString(), out bool ssl);
534534

535535
_log.WriteDebugMessage("SSL = " + ssl);
536536

537537
_log.WriteDebugMessage("Prompt = " + prompt);
538538

539-
string username = _config.Settings.Application.GetByKey("EmailClientUsername", _config.Settings.DefaultSettings.EmailClientUsername).Value.ToString();
539+
string username = Settings.SMTP.GetByKey("EmailClientUsername", _config.Settings.DefaultSettings.EmailClientUsername).Value.ToString();
540540

541541
_log.WriteDebugMessage("Username = " + username);
542542

543-
string password = _config.Settings.Application.GetByKey("EmailClientPassword", _config.Settings.DefaultSettings.EmailClientPassword).Value.ToString();
543+
string password = Settings.SMTP.GetByKey("EmailClientPassword", _config.Settings.DefaultSettings.EmailClientPassword).Value.ToString();
544544

545545
if (string.IsNullOrEmpty(password))
546546
{
@@ -551,27 +551,27 @@ private bool EmailScreenshot(Screenshot screenshot, bool prompt)
551551
_log.WriteDebugMessage("Password = [I'm not going to log this so check the application settings file]");
552552
}
553553

554-
string from = _config.Settings.Application.GetByKey("EmailMessageFrom", _config.Settings.DefaultSettings.EmailMessageFrom).Value.ToString();
554+
string from = Settings.SMTP.GetByKey("EmailMessageFrom", _config.Settings.DefaultSettings.EmailMessageFrom).Value.ToString();
555555

556556
_log.WriteDebugMessage("From = " + from);
557557

558-
string to = _config.Settings.Application.GetByKey("EmailMessageTo", _config.Settings.DefaultSettings.EmailMessageTo).Value.ToString();
558+
string to = Settings.SMTP.GetByKey("EmailMessageTo", _config.Settings.DefaultSettings.EmailMessageTo).Value.ToString();
559559

560560
_log.WriteDebugMessage("To = " + to);
561561

562-
string cc = _config.Settings.Application.GetByKey("EmailMessageCC", _config.Settings.DefaultSettings.EmailMessageCC).Value.ToString();
562+
string cc = Settings.SMTP.GetByKey("EmailMessageCC", _config.Settings.DefaultSettings.EmailMessageCC).Value.ToString();
563563

564564
_log.WriteDebugMessage("CC = " + cc);
565565

566-
string bcc = _config.Settings.Application.GetByKey("EmailMessageBCC", _config.Settings.DefaultSettings.EmailMessageBCC).Value.ToString();
566+
string bcc = Settings.SMTP.GetByKey("EmailMessageBCC", _config.Settings.DefaultSettings.EmailMessageBCC).Value.ToString();
567567

568568
_log.WriteDebugMessage("BCC = " + bcc);
569569

570-
string subject = _config.Settings.Application.GetByKey("EmailMessageSubject", _config.Settings.DefaultSettings.EmailMessageSubject).Value.ToString();
570+
string subject = Settings.SMTP.GetByKey("EmailMessageSubject", _config.Settings.DefaultSettings.EmailMessageSubject).Value.ToString();
571571

572572
_log.WriteDebugMessage("Subject = " + subject);
573573

574-
string body = _config.Settings.Application.GetByKey("EmailMessageBody", _config.Settings.DefaultSettings.EmailMessageBody).Value.ToString();
574+
string body = Settings.SMTP.GetByKey("EmailMessageBody", _config.Settings.DefaultSettings.EmailMessageBody).Value.ToString();
575575

576576
_log.WriteDebugMessage("Body = " + body);
577577

modules/triggers/FormTrigger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ private void Okay()
314314

315315
if (listBoxAction.SelectedIndex == (int)TriggerActionType.EmailScreenshot)
316316
{
317-
MessageBox.Show("Please ensure that the application's email (SMTP) settings are correctly configured in order to automatically email screenshots to the intended recipient. It is important that you do not use this application to spam people. Thank you.\n\nThe settings are prefixed with \"Email\" and located in the following XML document used for application-wide settings ...\n" + _fileSystem.ApplicationSettingsFile, "Check Email Settings", MessageBoxButtons.OK, MessageBoxIcon.Warning);
317+
MessageBox.Show("Please ensure that the application's email (SMTP) settings are correctly configured in order to automatically email screenshots to the intended recipient. It is important that you do not use this application to spam people. Thank you.\n\nThe settings are located in " + _fileSystem.SmtpSettingsFile, "Check Email Settings", MessageBoxButtons.OK, MessageBoxIcon.Warning);
318318
}
319319

320320
Close();

0 commit comments

Comments
 (0)