Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ff9ab45

Browse files
author
DelphiDabbler
committedAug 12, 2014
Update version numbers displayed by command line sign-on message and in GUI app's about box.
1 parent bf9a6f7 commit ff9ab45

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed
 

‎Src/GUI/FmMain.pas

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/
55
*
6-
* Copyright (C) 2006-2012, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2006-2014, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -225,10 +225,12 @@ procedure TMainForm.actAboutExecute(Sender: TObject);
225225
@param Sender [in] Not used.
226226
}
227227
begin
228+
{ TODO: Get version information from resources instead of hard coding. }
229+
{ TODO: Remove "beta" message once beta program has ended. }
228230
Application.MessageBox(
229-
'PasHiGUI v0.99.1 beta.'#13#10#13#10
231+
'PasHiGUI v1.0.0 beta 2.'#13#10#13#10
230232
+ 'A GUI front end for the PasHi Syntax Highlighter v2.'#13#10#13#10
231-
+ 'Copyright (c) 2006-2012 by Peter D Johnson (www.delphidabbler.com).',
233+
+ 'Copyright (c) 2006-2014 by Peter D Johnson (www.delphidabbler.com).',
232234
'About',
233235
MB_OK
234236
);

‎Src/UMain.pas

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/
55
*
6-
* Copyright (C) 2007-2012, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2007-2014, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -107,14 +107,17 @@ function GetProductVersionStr: string;
107107
begin
108108
FFI := PVSFixedFileInfo(ValPtr)^;
109109
// Build version info string from product version field of FFI
110-
Result := Format(
111-
'%d.%d.%d',
112-
[
113-
HiWord(FFI.dwProductVersionMS),
114-
LoWord(FFI.dwProductVersionMS),
115-
HiWord(FFI.dwProductVersionLS)
116-
]
117-
);
110+
{ TODO: delete following line and reinstate commented out lines once
111+
beta program has ended. }
112+
Result := Format('v2.0.0 beta %d', [HiWord(FFI.dwProductVersionLS)]);
113+
// Result := Format(
114+
// 'v%d.%d.%d',
115+
// [
116+
// HiWord(FFI.dwProductVersionMS),
117+
// LoWord(FFI.dwProductVersionMS),
118+
// HiWord(FFI.dwProductVersionLS)
119+
// ]
120+
// );
118121
end
119122
end;
120123
finally

0 commit comments

Comments
 (0)
Please sign in to comment.