Merged revision(s) 4508-4551, 3462-4508 from tags/version-4.8.7:

This updates the trunk with changes made in release 4.8.7.

Author: delphidabbler

Docs/ChangeLogs/ChangeLog-v4.txt

@@ -11,6 +11,11 @@
 ; Change Log for CodeSnip Release 4
 ; ------------------------------------------------------------------------------
 
+Release v4.8.7 of 06 March 2014
++ Changed so that automatic bug checker now correctly records last update date. This fixes bug #93 (http://bit.ly/NmSQUt).
++ Updated to use v2 of the DelphiDabbler CodeSnip update web service when checking for availability of program updates.
++ Minor corrections to help file.
+
 Release v4.8.6 of 28 February 2014
 + Improved operating system detection to handle Windows 8.1.
 + Added compatibility section to application manifest that declares the program has been tested with Windows Vista and Windows 7.

Src/Help/HTML/dlg_favourites.htm

@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2013-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -27,14 +27,12 @@
       <param name="ALink Name" value="FavouritesDlg">
     </object>
     <h1>
-      Favorites Dialogue Box
+      Favourites Dialogue Box
     </h1>
     <p>
       The user's favourite snippets can be accessed and managed from this
-      dialogue box. It is displayed from the <em>Snippets | Favourites</em>
-      menu option, the <img
-        alt="Menu icon" src="../images/Favourites.png" class="glyph"
-       > toolbar, or by pressing <span class="smallcaps">F4</span>.
+      dialogue box. It is displayed from the <em>Snippets | Show Favourites</em>
+      menu option or by pressing <span class="smallcaps">F4</span>.
     </p>
     <p>
       The dialogue box is non-modal so you can continue using <em>CodeSnip</em>

Src/Help/HTML/dlg_findcompiler.htm

@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2012, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2005-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -32,7 +32,7 @@ <h1>
     <p>
       This dialogue box enables snippets to be searched for by their
       relationship with various compilers. It is accessed from the <em>Search |
-      Compiler</em> menu option.
+      Find Compiler</em> menu option.
     </p>
     <p>
       The dialogue works by applying a search criteria to any or all of a

Src/UUpdateCheckers.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2013-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -207,10 +207,8 @@ function TUpdateCheckerThread.GetNotification(out N: TNotificationData):
   try
     if not CanUpdate then
       Exit(False);
-    if not DoCheck(N) then
-      Exit(False);
+    Result := DoCheck(N);
     RecordUpdate;
-    Result := True;
   except
     // Swallow any exception and return false to indicate "no update"
     Result := False;

Src/VCodeSnip.vi

@@ -11,8 +11,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 8, 6, 244
-Product Version #=4, 8, 6, 0
+File Version #=4, 8, 7, 245
+Product Version #=4, 8, 7, 0
 File OS=4
 File Type=1
 File Sub-Type=0

Src/VCodeSnipPortable.vi

@@ -11,8 +11,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 8, 6, 244
-Product Version #=4, 8, 6, 0
+File Version #=4, 8, 7, 245
+Product Version #=4, 8, 7, 0
 File OS=4
 File Type=1
 File Sub-Type=0

Src/Web.UProgramUpdateMgr.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -26,7 +26,7 @@ interface
 
 type
   ///  <summary>Provides an interface to the DelphiDabbler CodeSnip program
-  ///  update web service.</summary>
+  ///  update web service using the v2 API.</summary>
   ///  <remarks>This class provides a public method for every command exposed by
   ///  the web service.</remarks>
   TProgramUpdateMgr = class sealed(TStdWebService)
@@ -36,8 +36,12 @@   TProgramUpdateMgr = class sealed(TStdWebService)
       ScriptURLTplt = 'http://codesnip.%s/websvc/prog-update';
       ///  <summary>User agent sent to web service.</summary>
       UserAgent = 'CodeSnip';
+      ///  <summary>API version of web service.</summary>
+      ApiVersion = '2';
       ///  <summary>API key required for all calls to web service.</summary>
       ApiKey = '9EE3A4D85A2F46F79AE2AAB1012A7678';
+      ///  <summary>Release channel sent to web service.</summary>
+      Channel = '4';
       ///  <summary>Program edition sent to web service.</summary>
       {$IFDEF PORTABLE}
       Edition = 'portable';
@@ -50,6 +54,9 @@   TProgramUpdateMgr = class sealed(TStdWebService)
     ///  </summary>
     ///  <remarks>Callers must free the returned object.</remarks>
     function CreateParams: TURIParams;
+    ///  <summary>Adds channel and edition parameters to the given parameters.
+    ///  </summary>
+    procedure AddUpdateStreamParams(Params: TURIParams);
   public
     ///  <summary>Creates a new object instance with the correct URL and
     ///  suitable user agent.</summary>
@@ -83,6 +90,13 @@ implementation
 
 { TProgramUpdateMgr }
 
+procedure TProgramUpdateMgr.AddUpdateStreamParams(Params: TURIParams);
+begin
+  Assert(Assigned(Params), ClassName + '.AddUpdateStreamParams: Params is nil');
+  Params.Add('channel', Channel);
+  Params.Add('edition', Edition);
+end;
+
 constructor TProgramUpdateMgr.Create;
 begin
   inherited Create(TWebServiceInfo.Create(ScriptURLTplt, UserAgent));
@@ -91,6 +105,7 @@ constructor TProgramUpdateMgr.Create;
 function TProgramUpdateMgr.CreateParams: TURIParams;
 begin
   Result := TURIParams.Create;
+  Result.Add('api', ApiVersion);
   Result.Add('key', ApiKey);
   Result.Add('prog-id', TAppInfo.ProgramKey);
 end;
@@ -102,7 +117,7 @@ function TProgramUpdateMgr.DownloadURL: string;
 begin
   Params := CreateParams;
   try
-    Params.Add('edition', Edition);
+    AddUpdateStreamParams(Params);
     Response := TStringList.Create;
     try
       PostCommand('downloadurl', Params, Response);
@@ -122,7 +137,7 @@ function TProgramUpdateMgr.LatestProgramVersion: string;
 begin
   Params := CreateParams;
   try
-    Params.Add('edition', Edition);
+    AddUpdateStreamParams(Params);
     Response := TStringList.Create;
     try
       PostCommand('version', Params, Response);