Skip to content

Commit 93bc8df

Browse files
committed
Merge branch 'release/4.20.2'
2 parents 56f597e + 00297ea commit 93bc8df

File tree

8 files changed

+130
-47
lines changed

8 files changed

+130
-47
lines changed

Diff for: .gitattributes

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Customise GitHub Linguist
2+
3+
# Highlight Inno Setup's .ps files as Pascal
4+
*.ps linguist-language=Pascal
5+
# Include Markdown files in stats
6+
*.md linguist-detectable

Diff for: .gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@ Exe
1515
Release
1616
Src/CodeSnip.cfg
1717
Src/AutoGen/IntfExternalObj.pas
18-
Src/Portable/CodeSnipPortable.cfg
19-
Src/Main/AutoGen/IntfExternalObj.pas

Diff for: CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ This change log begins with the first ever pre-release version of _CodeSnip_. Re
1010
1111
From v4.1.0 the version numbering has attempted to adhere to the principles of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
1212

13+
## Release v4.20.2 of 04 November 2022
14+
15+
* Fixes bug where an exception was raised when selecting a main menu item with the cursor keys then pressing F1. [issue 54]
16+
* Update operating system detection code to correctly detect Version 22H2 of Windows 10 & Windows 11 plus some other Windows releases on the Dev, Beta & Release channels. [issues 55, 61 & 62]
17+
* Fix appearance of copyright symbol in version information.
18+
1319
## Release v4.20.1 of 01 July 2022
1420

1521
* Operating system detection code was updated to (a) fix bugs and (b) detect some Dev, Beta and Release Preview builds of Windows 11 22H2.

Diff for: Src/3rdParty/PJSysInfo.pas

+96-39
Large diffs are not rendered by default.

Diff for: Src/FmMain.dfm

+1
Original file line numberDiff line numberDiff line change
@@ -1174,6 +1174,7 @@ inherited MainForm: TMainForm
11741174
end
11751175
end
11761176
object appEvents: TApplicationEvents
1177+
OnHelp = appEventsHelp
11771178
OnHint = appEventsHint
11781179
Left = 291
11791180
Top = 96

Diff for: Src/FmMain.pas

+15
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,11 @@ TMainForm = class(THelpAwareForm)
478478
procedure actViewTestUnitUpdate(Sender: TObject);
479479
/// <summary>Displays the Welcome page in the details pane.</summary>
480480
procedure actWelcomeExecute(Sender: TObject);
481+
/// <summary>Handles events triggered when help system is invoked. Prevents
482+
/// exception being raised when F1 key is pressed when a menu is dropped
483+
/// down.</summary>
484+
function appEventsHelp(Command: Word; Data: Integer;
485+
var CallHelp: Boolean): Boolean;
481486
/// <summary>Handles events triggered when a control issues a hint. The
482487
/// hint is displayed in the form's status bar.</summary>
483488
procedure appEventsHint(Sender: TObject);
@@ -1215,6 +1220,16 @@ procedure TMainForm.AfterShowForm;
12151220
fMainDisplayMgr.ShowWelcomePage;
12161221
end;
12171222

1223+
function TMainForm.appEventsHelp(Command: Word; Data: Integer;
1224+
var CallHelp: Boolean): Boolean;
1225+
begin
1226+
// Prevent Delphi Help system from interfering!
1227+
// This prevents exception being raised when F1 is pressed over menu items
1228+
// while still allowing our custom help manager to operate.
1229+
CallHelp := False;
1230+
Result := True;
1231+
end;
1232+
12181233
procedure TMainForm.appEventsHint(Sender: TObject);
12191234
begin
12201235
if Assigned(fStatusBarMgr) then

Diff for: Src/VCodeSnip.vi

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99

1010
[Fixed File Info]
11-
File Version #=4, 20, 1, 265
12-
Product Version #=4, 20, 1, 0
11+
File Version #=4, 20, 2, 266
12+
Product Version #=4, 20, 2, 0
1313
File OS=4
1414
File Type=1
1515
File Sub-Type=0
@@ -26,7 +26,7 @@ Company Name=DelphiDabbler
2626
File Description=CodeSnip Database Viewer
2727
File Version=<#F1>.<#F2>.<#F3> build <#F4>
2828
Internal Name=<SHORTFNAME>
29-
Legal Copyright=Copyright P.D.Johnson, 2005-<YEAR>.
29+
Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
3030
Legal Trademark=
3131
Original File Name=CodeSnip.exe
3232
Private Build=

Diff for: Src/VCodeSnipPortable.vi

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99

1010
[Fixed File Info]
11-
File Version #=4, 20, 1, 265
12-
Product Version #=4, 20, 1, 0
11+
File Version #=4, 20, 2, 266
12+
Product Version #=4, 20, 2, 0
1313
File OS=4
1414
File Type=1
1515
File Sub-Type=0
@@ -26,7 +26,7 @@ Company Name=DelphiDabbler
2626
File Description=CodeSnip Database Viewer (Portable Edition)
2727
File Version=<#F1>.<#F2>.<#F3> build <#F4>
2828
Internal Name=<SHORTFNAME>
29-
Legal Copyright=Copyright P.D.Johnson, 2005-<YEAR>.
29+
Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
3030
Legal Trademark=
3131
Original File Name=CodeSnip-p.exe
3232
Private Build=

0 commit comments

Comments
 (0)