moved ideintf/helphtml.pas to lcl/lazhelphtml.pas

git-svn-id: trunk@9280 -

.gitattributes

@@ -1298,7 +1298,6 @@ ideintf/graphicpropedit.lrs svneol=native#text/plain
 ideintf/graphicpropedit.pas svneol=native#text/plain
 ideintf/graphpropedits.pas svneol=native#text/pascal
 ideintf/helpfpdoc.pas svneol=native#text/pascal
-ideintf/helphtml.pas svneol=native#text/pascal
 ideintf/idecommands.pas svneol=native#text/pascal
 ideintf/idedialogs.pas svneol=native#text/plain
 ideintf/idehelpintf.pas svneol=native#text/plain
@@ -2297,6 +2296,7 @@ lcl/languages/lcl.po svneol=native#text/plain
 lcl/languages/lcl.ru.po svneol=native#text/plain
 lcl/languages/lcl.ua.po svneol=native#text/plain
 lcl/lazconfigstorage.pas svneol=native#text/pascal
+lcl/lazhelphtml.pas svneol=native#text/pascal
 lcl/lazhelpintf.pas svneol=native#text/pascal
 lcl/lazlinkedlist.pas svneol=native#text/pascal
 lcl/lclclasses.pp svneol=native#text/pascal

ide/helpfpcmessages.pas

@@ -39,7 +39,7 @@ interface
 uses
   Classes, SysUtils, LCLProc, Dialogs, FileUtil, TextTools, MacroIntf,
   LazarusIDEStrConsts, LazConfigStorage, HelpIntfs, IDEHelpIntf, LazHelpIntf,
-  HelpHTML;
+  LazHelpHTML;
   
 const
   lihcFPCMessages = 'FreePascal Compiler messages';

ide/helpmanager.pas

@@ -38,7 +38,7 @@ uses
   BasicCodeTools, CodeToolManager, CodeAtom, CodeCache, CustomCodeTool, CodeTree,
   PascalParserTool, FindDeclarationTool,
   PropEdits, ObjectInspector, FormEditingIntf, ProjectIntf,
-  LazHelpIntf, HelpHTML, HelpFPDoc, MacroIntf, IDEWindowIntf, IDEMsgIntf,
+  LazHelpIntf, LazHelpHTML, HelpFPDoc, MacroIntf, IDEWindowIntf, IDEMsgIntf,
   LazIDEIntf, HelpIntfs, IDEHelpIntf,
   LazarusIDEStrConsts, TransferMacros, DialogProcs, IDEOptionDefs,
   ObjInspExt, EnvironmentOpts, AboutFrm, MsgView, Project, PackageDefs, MainBar,

ideintf/allideintf.pas

@@ -31,7 +31,6 @@ uses
   FrmSelectProps,
   GraphPropEdits,
   HelpFPDoc,
-  HelpHTML,
   IDECommands,
   IDEDialogs,
   IDEHelpIntf,

ideintf/helpfpdoc.pas

@@ -27,7 +27,7 @@ interface
 
 uses
   Classes, SysUtils, LCLProc, FileUtil, MacroIntf, HelpIntfs, LazHelpIntf,
-  HelpHTML;
+  LazHelpHTML;
 
 type
   { TFPDocHTMLHelpDatabase }

ideintf/lazideintf.pas

@@ -22,7 +22,7 @@ unit LazIDEIntf;
 interface
 
 uses
-  Classes, SysUtils, Forms, PropEdits, HelpHTML, ProjectIntf, SrcEditorIntf;
+  Classes, SysUtils, Forms, PropEdits, LazHelpHTML, ProjectIntf, SrcEditorIntf;
 
 type
   // open file flags

lcl/alllclunits.pp

@@ -41,7 +41,7 @@ uses
   InterfaceBase,
   IntfGraphics,
   // components and functions
-  LCLClasses, AsyncProcess, Maps, HelpIntfs, LazHelpIntf,
+  LCLClasses, AsyncProcess, Maps, HelpIntfs, LazHelpIntf, LazHelpHTML,
   StdActns, Buttons, Extctrls, Calendar, Clipbrd, Forms, LCLIntf, Spin,
   Comctrls, Graphics, StdCtrls, Arrow, Controls, ImgList, Menus, Toolwin,
   Dialogs, Messages, Clistbox, ActnList, Grids, MaskEdit, ButtonPanel,

lcl/helpintfs.pas

@@ -26,7 +26,7 @@
     Interfaces to define the abstract HelpSystem.
     You can create your own HelpSystem based on these interfaces
     or use the LCL help system in lazhelpintf.pas.
-    The THTMLHelpDatabase and THTMLBrowserHelpViewer in helphtml.pas use the
+    The THTMLHelpDatabase and THTMLBrowserHelpViewer in lazhelphtml.pas use the
     LCL help system.
 }
 unit HelpIntfs;

lcl/lazhelphtml.pas

@@ -15,7 +15,7 @@
   Abstract:
     Methods and types for simple HTML help.
 }
-unit HelpHTML;
+unit LazHelpHTML;
 
 {$mode objfpc}{$H+}
 
@@ -23,19 +23,8 @@ interface
 
 uses
   Classes, SysUtils, LCLProc, Forms, Process, FileUtil, LazConfigStorage,
-  HelpIntfs, LazHelpIntf;
+  LCLStrConsts, HelpIntfs, LazHelpIntf;
   
-resourcestring
-  hhsHelpTheHelpDatabaseWasUnableToFindFile = 'The help database %s%s%s was '
-    +'unable to find file %s%s%s.';
-  hhsHelpTheMacroSInBrowserParamsWillBeReplacedByTheURL = 'The macro %s in '
-    +'BrowserParams will be replaced by the URL.';
-  hhsHelpNoHTMLBrowserFoundPleaseDefineOneInHelpConfigureHe = 'No HTML '
-    +'Browser found.%sPlease define one in Help -> Configure Help -> Viewers';
-  hhsHelpBrowserNotFound = 'Browser %s%s%s not found.';
-  hhsHelpBrowserNotExecutable = 'Browser %s%s%s not executable.';
-  hhsHelpErrorWhileExecuting = 'Error while executing %s%s%s:%s%s';
-
 type
   { THTMLHelpDatabase }
 

lcl/lclstrconsts.pas

@@ -274,6 +274,16 @@ ResourceString
   rsHelpSelectorError = 'Help Selector Error';
   rsUnknownErrorPleaseReportThisBug = 'Unknown Error, please report this bug';
 
+  hhsHelpTheHelpDatabaseWasUnableToFindFile = 'The help database %s%s%s was '
+    +'unable to find file %s%s%s.';
+  hhsHelpTheMacroSInBrowserParamsWillBeReplacedByTheURL = 'The macro %s in '
+    +'BrowserParams will be replaced by the URL.';
+  hhsHelpNoHTMLBrowserFoundPleaseDefineOneInHelpConfigureHe = 'No HTML '
+    +'Browser found.%sPlease define one in Help -> Configure Help -> Viewers';
+  hhsHelpBrowserNotFound = 'Browser %s%s%s not found.';
+  hhsHelpBrowserNotExecutable = 'Browser %s%s%s not executable.';
+  hhsHelpErrorWhileExecuting = 'Error while executing %s%s%s:%s%s';
+
 implementation
 
 end.

packager/packagesystem.pas

@@ -948,6 +948,7 @@ begin
     AddFile('grids.pas','Grids',pftUnit,[pffHasRegisterProc],cpBase);
     AddFile('controls.pp','Controls',pftUnit,[pffHasRegisterProc],cpBase);
     AddFile('dialogs.pp','Dialogs',pftUnit,[pffHasRegisterProc],cpBase);
+    AddFile('lazhelphtml.pas','LazHelpHTML',pftUnit,[],cpBase);
     AddFile('spin.pp','Spin',pftUnit,[pffHasRegisterProc],cpBase);
     AddFile('arrow.pp','Arrow',pftUnit,[pffHasRegisterProc],cpBase);
     AddFile('calendar.pp','Calendar',pftUnit,[pffHasRegisterProc],cpBase);
@@ -1080,7 +1081,6 @@ begin
     AddFile('frmselectprops.pas','FrmSelectProps',pftUnit,[],cpBase);
     AddFile('graphpropedits.pas','GraphPropEdits',pftUnit,[],cpBase);
     AddFile('helpfpdoc.pas','HelpFPDoc',pftUnit,[],cpBase);
-    AddFile('helphtml.pas','HelpHTML',pftUnit,[],cpBase);
     AddFile('idecommands.pas','IDECommands',pftUnit,[],cpBase);
     AddFile('idewindowintf.pas','IDEWindowIntf',pftUnit,[pffHasRegisterProc],cpBase);
     AddFile('imagelisteditor.pp','ImageListEditor',pftUnit,[],cpBase);