Skip to content

Commit

Permalink
Merge branch 'release/4.20.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
delphidabbler committed Nov 4, 2022
2 parents 56f597e + 00297ea commit 93bc8df
Show file tree
Hide file tree
Showing 8 changed files with 130 additions and 47 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Customise GitHub Linguist

# Highlight Inno Setup's .ps files as Pascal
*.ps linguist-language=Pascal
# Include Markdown files in stats
*.md linguist-detectable
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@ Exe
Release
Src/CodeSnip.cfg
Src/AutoGen/IntfExternalObj.pas
Src/Portable/CodeSnipPortable.cfg
Src/Main/AutoGen/IntfExternalObj.pas
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ This change log begins with the first ever pre-release version of _CodeSnip_. Re
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).

## Release v4.20.2 of 04 November 2022

* Fixes bug where an exception was raised when selecting a main menu item with the cursor keys then pressing F1. [issue 54]
* 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]
* Fix appearance of copyright symbol in version information.

## Release v4.20.1 of 01 July 2022

* Operating system detection code was updated to (a) fix bugs and (b) detect some Dev, Beta and Release Preview builds of Windows 11 22H2.
Expand Down
135 changes: 96 additions & 39 deletions Src/3rdParty/PJSysInfo.pas

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Src/FmMain.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,7 @@ inherited MainForm: TMainForm
end
end
object appEvents: TApplicationEvents
OnHelp = appEventsHelp
OnHint = appEventsHint
Left = 291
Top = 96
Expand Down
15 changes: 15 additions & 0 deletions Src/FmMain.pas
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,11 @@ TMainForm = class(THelpAwareForm)
procedure actViewTestUnitUpdate(Sender: TObject);
/// <summary>Displays the Welcome page in the details pane.</summary>
procedure actWelcomeExecute(Sender: TObject);
/// <summary>Handles events triggered when help system is invoked. Prevents
/// exception being raised when F1 key is pressed when a menu is dropped
/// down.</summary>
function appEventsHelp(Command: Word; Data: Integer;
var CallHelp: Boolean): Boolean;
/// <summary>Handles events triggered when a control issues a hint. The
/// hint is displayed in the form's status bar.</summary>
procedure appEventsHint(Sender: TObject);
Expand Down Expand Up @@ -1215,6 +1220,16 @@ procedure TMainForm.AfterShowForm;
fMainDisplayMgr.ShowWelcomePage;
end;

function TMainForm.appEventsHelp(Command: Word; Data: Integer;
var CallHelp: Boolean): Boolean;
begin
// Prevent Delphi Help system from interfering!
// This prevents exception being raised when F1 is pressed over menu items
// while still allowing our custom help manager to operate.
CallHelp := False;
Result := True;
end;

procedure TMainForm.appEventsHint(Sender: TObject);
begin
if Assigned(fStatusBarMgr) then
Expand Down
6 changes: 3 additions & 3 deletions Src/VCodeSnip.vi
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@


[Fixed File Info]
File Version #=4, 20, 1, 265
Product Version #=4, 20, 1, 0
File Version #=4, 20, 2, 266
Product Version #=4, 20, 2, 0
File OS=4
File Type=1
File Sub-Type=0
Expand All @@ -26,7 +26,7 @@ Company Name=DelphiDabbler
File Description=CodeSnip Database Viewer
File Version=<#F1>.<#F2>.<#F3> build <#F4>
Internal Name=<SHORTFNAME>
Legal Copyright=Copyright P.D.Johnson, 2005-<YEAR>.
Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
Legal Trademark=
Original File Name=CodeSnip.exe
Private Build=
Expand Down
6 changes: 3 additions & 3 deletions Src/VCodeSnipPortable.vi
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@


[Fixed File Info]
File Version #=4, 20, 1, 265
Product Version #=4, 20, 1, 0
File Version #=4, 20, 2, 266
Product Version #=4, 20, 2, 0
File OS=4
File Type=1
File Sub-Type=0
Expand All @@ -26,7 +26,7 @@ Company Name=DelphiDabbler
File Description=CodeSnip Database Viewer (Portable Edition)
File Version=<#F1>.<#F2>.<#F3> build <#F4>
Internal Name=<SHORTFNAME>
Legal Copyright=Copyright P.D.Johnson, 2005-<YEAR>.
Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
Legal Trademark=
Original File Name=CodeSnip-p.exe
Private Build=
Expand Down

0 comments on commit 93bc8df

Please sign in to comment.