Renamed & re-arranged TURL constants

Updated all affected code.

Author: delphidabbler

Src/FmBugReportBaseDlg.pas

@@ -100,7 +100,7 @@ procedure TBugReportBaseDlg.GoToTracker;
   // must be able to override this method.
   with TBrowseURL.Create(nil) do
     try
-      URL := TURL.BugTrackerURL;
+      URL := TURL.CodeSnipBugTracker;
       Execute;
     finally
       Free;

Src/FmDBUpdateDlg.pas

@@ -272,7 +272,7 @@ procedure TDBUpdateDlg.ConfigForm;
     begin
       Tplt.ResolvePlaceholderText(
         'CSDBReleaseURL',
-        TURL.CSDBReleaseURL
+        TURL.CodeSnippetsDBReleases
       );
     end
   );

Src/FmMain.pas

@@ -1337,9 +1337,9 @@ procedure TMainForm.InitForm;
 
     // Initialise actions
     // Browse actions have to have URLs set dynamically
-    actGitHubHome.URL := TURL.GitHubURL;
-    actFAQs.URL := TURL.FAQsURL;
-    actBlog.URL := TURL.BlogURL;
+    actGitHubHome.URL := TURL.CodeSnip;
+    actFAQs.URL := TURL.CodeSnipFAQReadMe;
+    actBlog.URL := TURL.CodeSnipBlog;
     // Tree control actions need shortcuts adding dynamically, and state stored
     // in Tag property
     actExpandNode.ShortCut := ShortCut(VK_ADD, [ssCtrl]);

Src/FmSWAGImportDlg.pas

@@ -482,7 +482,7 @@ procedure TSWAGImportDlg.ConfigForm;
     begin
       Tplt.ResolvePlaceholderText(
         'SWAGReleaseURL',
-        TURL.SWAGReleaseURL
+        TURL.SWAGReleases
       );
     end
   );

Src/UPaypalDonateAction.pas

@@ -61,7 +61,7 @@ function TPaypalDonateAction.Execute: Boolean;
   // use a TBrowseAction to access URL
   BrowseAction := TBrowseURL.Create(nil);
   try
-    BrowseAction.URL := TURL.DonateURL;
+    BrowseAction.URL := TURL.PaypalDonate;
     BrowseAction.Execute;
   finally
     FreeAndNil(BrowseAction);

Src/USaveUnitMgr.pas

@@ -150,7 +150,7 @@ function TSaveUnitMgr.CreateHeaderComments: IStringList;
     // Result used for units that contain at snippet(s) from main database
     Result.Add(Format(sLicense, [FormatDateTime('YYYY', Now)]));
     Result.Add('');
-    Result.Add(Format(sMainDescription, [TURL.DatabaseURL]));
+    Result.Add(Format(sMainDescription, [TURL.CodeSnip]));
     Result.Add('');
     Result.Add(Format(sGenerated, [RFC1123DateStamp]));
     Result.Add(
@@ -160,7 +160,7 @@ function TSaveUnitMgr.CreateHeaderComments: IStringList;
     );
     Result.Add('');
     Result.Add(
-      Format(sAdvert, [TAppInfo.ProgramName, TURL.GitHubURL])
+      Format(sAdvert, [TAppInfo.ProgramName, TURL.CodeSnip])
     );
   end
   else

Src/USnippetDoc.pas

@@ -181,7 +181,7 @@ function TSnippetDoc.Generate(const Snippet: TSnippet): TEncodedData;
     RenderExtra(Snippet.Extra);
   if not Snippet.UserDefined then
     // database info written only if snippet is from main database
-    RenderDBInfo(Format(sMainDatabaseInfo, [TURL.DatabaseURL]));
+    RenderDBInfo(Format(sMainDatabaseInfo, [TURL.CodeSnip]));
   Result := FinaliseDoc;
 end;
 

Src/UUrl.pas

@@ -22,42 +22,46 @@ interface
   TURL = record
   strict private
     const
-      ///  <summary>Name of server that hosts tested and released web services
-      ///  that are used by CodeSnip.</summary>
-      ///  <remarks>There is also a test server that can be used by CodeSnip
-      ///  where new and updated web services are tested - see
-      ///  <c>TestServerHost</c> below.</remarks>
-      ProductionServerHost = 'delphidabbler.com';
-      ///  <summary>URL of DelphiDabbler website.</summary>
-      WebsiteURL = 'http://' + ProductionServerHost;
+      ///  <summary>URL of DelphiDabbler's account on GitHub repository.
+      ///  </summary>
+      DDabGitHub = 'https://github.com/delphidabbler';
+      ///  <summary>URL of the Code Snippet database's GitHub repository.
+      ///  </summary>
+      CodeSnippetsDB = DDabGitHub + '/code-snippets';
+      ///  <summary>URL of the SWAG database's GitHub repository.</summary>
+      SWAG = DDabGitHub + '/swag';
+      ///  <summary>URL of the CodeSnip FAQ's GitHub repository.</summary>
+      CodeSnipFAQ = DDabGitHub + '/codesnip-faq';
   public
     const
-      ///  <summary>URL of CodeSnip's GitHub page.</summary>
-      GitHubURL = 'https://github.com/delphidabbler/codesnip';
+      ///  <summary>URL of CodeSnip's GitHub repository.</summary>
+      CodeSnip = DDabGitHub + '/codesnip';
+
+      ///  <summary>URL used to view and report CodeSnip bugs on GitHub.
+      ///  </summary>
+      CodeSnipBugTracker = CodeSnip + '/issues';
+
+      ///  <summary>URL of CodeSnip's FAQ web page.</summary>
+      ///  <remarks>This is the CodeSnip FAQ project on GitHub.</remarks>
+      CodeSnipFAQReadMe = CodeSnipFAQ + '/blob/master/README.md';
+
       ///  <summary>URL of the GitHub page where DelphiDabbler Code Snippets
       ///  database releases are hosted.</summary>
-      CSDBReleaseURL = 'https://github.com/'
-        + 'delphidabbler/code-snippets/releases';
+      CodeSnippetsDBReleases = CodeSnippetsDB + '/releases';
+
       ///  <summary>URL of the GitHub page where SWAG database releases are
       ///  hosted.</summary>
-      SWAGReleaseURL = 'https://github.com/delphidabbler/swag/releases';
-      ///  <summary>URL of the online Code Snippets database.</summary>
-      DatabaseURL = WebsiteURL + '/url/csdb';
+      SWAGReleases = SWAG + '/releases';
+
       ///  <summary>URL used to make donations towards the CodeSnip project.
       ///  </summary>
-      ///  <remarks>This URL redirects to the correct page on PayPal.</remarks>
-      DonateURL = 'https://www.paypal.com/donate/?'
+      PaypalDonate = 'https://www.paypal.com/donate/?'
         + 'token=LYnh7_DXV-YqTmX3Bilr9rCPN89oANmBTZmRCdNHu_qFSk2jo_'
         + 'WzTYTXCE165U9hXEmwq0&country.x=GB&locale.x=GB';
-      ///  <summary>URL used to view and report CodeSnip bugs on GitHub.
-      ///  </summary>
-      BugTrackerURL = GitHubURL + '/issues';
-      ///  <summary>URL of CodeSnip's FAQ web page.</summary>
-      ///  <remarks>This is the CodeSnip FAQ project on GitHub.</remarks>
-      FAQsURL = 'https://github.com/delphidabbler/codesnip-faq/'
-        + 'blob/master/README.md';
+
       /// <summary>URL of the the CodeSnip blog.</summary>
-      BlogURL = 'http://codesnip-app.blogspot.com/';
+      CodeSnipBlog = 'http://codesnip-app.blogspot.com/';
+
   end;