diff --git a/lcl/languages/lclstrconsts.ca.po b/lcl/languages/lclstrconsts.ca.po index dd2ab51e70..ceae773647 100644 --- a/lcl/languages/lclstrconsts.ca.po +++ b/lcl/languages/lclstrconsts.ca.po @@ -1270,6 +1270,10 @@ msgstr "" msgid "Text" msgstr "Text" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "" diff --git a/lcl/languages/lclstrconsts.cs.po b/lcl/languages/lclstrconsts.cs.po index c5056f5cf1..45b311f6f1 100644 --- a/lcl/languages/lclstrconsts.cs.po +++ b/lcl/languages/lclstrconsts.cs.po @@ -1232,6 +1232,10 @@ msgstr "Hluboká zelenomodrá" msgid "Text" msgstr "Text" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Označkovaný obrazový formát souboru" diff --git a/lcl/languages/lclstrconsts.de.po b/lcl/languages/lclstrconsts.de.po index ea84c7fdcd..b8714b5258 100644 --- a/lcl/languages/lclstrconsts.de.po +++ b/lcl/languages/lclstrconsts.de.po @@ -1231,6 +1231,10 @@ msgstr "Türkis" msgid "Text" msgstr "Text" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Tagged Image File Format" diff --git a/lcl/languages/lclstrconsts.es.po b/lcl/languages/lclstrconsts.es.po index f0ce9660e4..b7e9a7803c 100644 --- a/lcl/languages/lclstrconsts.es.po +++ b/lcl/languages/lclstrconsts.es.po @@ -1229,6 +1229,10 @@ msgstr "Turquesa" msgid "Text" msgstr "Texto" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Formato de Archivo de Imagen Etiquetado" diff --git a/lcl/languages/lclstrconsts.fi.po b/lcl/languages/lclstrconsts.fi.po index 77ffb04c76..fae7e64b61 100644 --- a/lcl/languages/lclstrconsts.fi.po +++ b/lcl/languages/lclstrconsts.fi.po @@ -1228,6 +1228,10 @@ msgstr "Sinivihreä" msgid "Text" msgstr "Teksti" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "" diff --git a/lcl/languages/lclstrconsts.fr.po b/lcl/languages/lclstrconsts.fr.po index 64e36f8f7c..e508dd48f3 100644 --- a/lcl/languages/lclstrconsts.fr.po +++ b/lcl/languages/lclstrconsts.fr.po @@ -1230,6 +1230,10 @@ msgstr "Sarcelle" msgid "Text" msgstr "Texte" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Tagged Image File Format" diff --git a/lcl/languages/lclstrconsts.he.po b/lcl/languages/lclstrconsts.he.po index 65e20e5535..8c238fc879 100644 --- a/lcl/languages/lclstrconsts.he.po +++ b/lcl/languages/lclstrconsts.he.po @@ -1277,6 +1277,10 @@ msgstr "כחלחל ירקרק" msgid "Text" msgstr "טקסט" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "פורמט מתוייג של קובץ דמות" diff --git a/lcl/languages/lclstrconsts.hu.po b/lcl/languages/lclstrconsts.hu.po index be11446849..e1f5eb2c6d 100644 --- a/lcl/languages/lclstrconsts.hu.po +++ b/lcl/languages/lclstrconsts.hu.po @@ -1230,6 +1230,10 @@ msgstr "Kékeszöld" msgid "Text" msgstr "Szöveg" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Tagged Image File Format" diff --git a/lcl/languages/lclstrconsts.id.po b/lcl/languages/lclstrconsts.id.po index 1c940657dc..789b3d9bd4 100644 --- a/lcl/languages/lclstrconsts.id.po +++ b/lcl/languages/lclstrconsts.id.po @@ -1269,6 +1269,10 @@ msgstr "" msgid "Text" msgstr "Teks" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "" diff --git a/lcl/languages/lclstrconsts.it.po b/lcl/languages/lclstrconsts.it.po index 1304d2229a..1c5fb93f02 100644 --- a/lcl/languages/lclstrconsts.it.po +++ b/lcl/languages/lclstrconsts.it.po @@ -1234,6 +1234,10 @@ msgstr "Ocra" msgid "Text" msgstr "Testo" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Formato del file immagine marcato" diff --git a/lcl/languages/lclstrconsts.ja.po b/lcl/languages/lclstrconsts.ja.po index 79f504e665..7072a2dd41 100644 --- a/lcl/languages/lclstrconsts.ja.po +++ b/lcl/languages/lclstrconsts.ja.po @@ -1231,6 +1231,10 @@ msgstr "暗青緑色" msgid "Text" msgstr "テキスト" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "TIFF ファイル" diff --git a/lcl/languages/lclstrconsts.lt.po b/lcl/languages/lclstrconsts.lt.po index 7fabe6521d..f7b351042c 100644 --- a/lcl/languages/lclstrconsts.lt.po +++ b/lcl/languages/lclstrconsts.lt.po @@ -1232,6 +1232,10 @@ msgstr "Tamsiai žydra" msgid "Text" msgstr "Tekstas" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "„Tagged Image File Format“" diff --git a/lcl/languages/lclstrconsts.nl.po b/lcl/languages/lclstrconsts.nl.po index cfe116e10c..a51f694a3d 100644 --- a/lcl/languages/lclstrconsts.nl.po +++ b/lcl/languages/lclstrconsts.nl.po @@ -1242,6 +1242,10 @@ msgstr "Blauwachtig groen (teal)" msgid "Text" msgstr "Tekst" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Tagged Image File Format" diff --git a/lcl/languages/lclstrconsts.no.po b/lcl/languages/lclstrconsts.no.po index 1943478d19..38a3dc95e8 100644 --- a/lcl/languages/lclstrconsts.no.po +++ b/lcl/languages/lclstrconsts.no.po @@ -1274,6 +1274,10 @@ msgstr "" msgid "Text" msgstr "Tekst" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "" diff --git a/lcl/languages/lclstrconsts.pl.po b/lcl/languages/lclstrconsts.pl.po index 2a86e51b48..b93a5e6c05 100644 --- a/lcl/languages/lclstrconsts.pl.po +++ b/lcl/languages/lclstrconsts.pl.po @@ -1242,6 +1242,10 @@ msgstr "Morski" msgid "Text" msgstr "" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "" diff --git a/lcl/languages/lclstrconsts.po b/lcl/languages/lclstrconsts.po index 7c667889f4..f168152f07 100644 --- a/lcl/languages/lclstrconsts.po +++ b/lcl/languages/lclstrconsts.po @@ -1223,6 +1223,10 @@ msgstr "" msgid "Text" msgstr "" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "" diff --git a/lcl/languages/lclstrconsts.pt.po b/lcl/languages/lclstrconsts.pt.po index d69cea4002..6a6d3928f2 100644 --- a/lcl/languages/lclstrconsts.pt.po +++ b/lcl/languages/lclstrconsts.pt.po @@ -1250,6 +1250,10 @@ msgstr "Verde Musgo" msgid "Text" msgstr "Texto" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Formato Arquivo Imagem \"Tagged\"" diff --git a/lcl/languages/lclstrconsts.pt_BR.po b/lcl/languages/lclstrconsts.pt_BR.po index 88e9d4edad..b56c1b761f 100644 --- a/lcl/languages/lclstrconsts.pt_BR.po +++ b/lcl/languages/lclstrconsts.pt_BR.po @@ -1258,6 +1258,10 @@ msgstr "Verde Musgo" msgid "Text" msgstr "Texto" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Formato Arquivo Imagem \"Tagged\"" diff --git a/lcl/languages/lclstrconsts.ru.po b/lcl/languages/lclstrconsts.ru.po index 207469c5b7..ab48989233 100644 --- a/lcl/languages/lclstrconsts.ru.po +++ b/lcl/languages/lclstrconsts.ru.po @@ -1230,6 +1230,10 @@ msgstr "Бирюзовый" msgid "Text" msgstr "Текст" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Формат Tagged Image File" diff --git a/lcl/languages/lclstrconsts.sk.po b/lcl/languages/lclstrconsts.sk.po index 32a618ee7a..308cf8e98f 100644 --- a/lcl/languages/lclstrconsts.sk.po +++ b/lcl/languages/lclstrconsts.sk.po @@ -1233,6 +1233,10 @@ msgstr "Hlboká zelenomodrá" msgid "Text" msgstr "Text" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Označkovať obrazový formát súboru" diff --git a/lcl/languages/lclstrconsts.tr.po b/lcl/languages/lclstrconsts.tr.po index 7b2d610902..612c74c211 100644 --- a/lcl/languages/lclstrconsts.tr.po +++ b/lcl/languages/lclstrconsts.tr.po @@ -1269,6 +1269,10 @@ msgstr "" msgid "Text" msgstr "Metin" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "" diff --git a/lcl/languages/lclstrconsts.uk.po b/lcl/languages/lclstrconsts.uk.po index 151421f18e..a678ad3a09 100644 --- a/lcl/languages/lclstrconsts.uk.po +++ b/lcl/languages/lclstrconsts.uk.po @@ -1232,6 +1232,10 @@ msgstr "Синьо-зелений" msgid "Text" msgstr "Текст" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "Тегований формат файлу зображення" diff --git a/lcl/languages/lclstrconsts.zh_CN.po b/lcl/languages/lclstrconsts.zh_CN.po index aaff33f28d..afad205037 100644 --- a/lcl/languages/lclstrconsts.zh_CN.po +++ b/lcl/languages/lclstrconsts.zh_CN.po @@ -1273,6 +1273,10 @@ msgstr "青" msgid "Text" msgstr "文本" +#: lclstrconsts.rsthebuiltinurlisreadonlychangethebaseurlinstead +msgid "The built-in URL is read only. Change the BaseURL instead." +msgstr "" + #: lclstrconsts.rstiff msgid "Tagged Image File Format" msgstr "" diff --git a/lcl/lazhelphtml.pas b/lcl/lazhelphtml.pas index 13411aeae3..93491caa99 100644 --- a/lcl/lazhelphtml.pas +++ b/lcl/lazhelphtml.pas @@ -56,6 +56,7 @@ type FKeywordPrefixNode: THelpNode; function IsBaseURLStored: boolean; procedure SetBaseURL(const AValue: string); + procedure SetBuiltInBaseURL(const AValue: string); procedure SetDefaultBaseURL(const AValue: string); public constructor Create(TheOwner: TComponent); override; @@ -73,6 +74,7 @@ type procedure Save(Storage: TConfigStorage); override; property DefaultBaseURL: string read FDefaultBaseURL write SetDefaultBaseURL;// used, if BaseURL is empty published + property BuiltInBaseURL: string read FDefaultBaseURL write SetBuiltInBaseURL;// read only, shown in the IDE help options property BaseURL: string read FBaseURL write SetBaseURL stored IsBaseURLStored; property AutoRegister; property KeywordPrefix: string read FKeywordPrefix write FKeywordPrefix;// see above @@ -132,6 +134,12 @@ begin FBaseURL:=AValue; end; +procedure THTMLHelpDatabase.SetBuiltInBaseURL(const AValue: string); +begin + if AValue=BuiltInBaseURL then exit; + raise Exception.Create(rsTheBuiltInURLIsReadOnlyChangeTheBaseURLInstead); +end; + procedure THTMLHelpDatabase.SetDefaultBaseURL(const AValue: string); begin if FDefaultBaseURL=AValue then exit; diff --git a/lcl/lclstrconsts.pas b/lcl/lclstrconsts.pas index bc32db5fcc..c70ee9db10 100644 --- a/lcl/lclstrconsts.pas +++ b/lcl/lclstrconsts.pas @@ -430,6 +430,8 @@ resourceString hhsHelpTheHelpDatabaseWasUnableToFindFile = 'The help database "%s" was ' +'unable to find file "%s".'; + rsTheBuiltInURLIsReadOnlyChangeTheBaseURLInstead = 'The built-in URL is read' + +' only. Change the BaseURL instead.'; hhsHelpTheMacroSInBrowserParamsWillBeReplacedByTheURL = 'The macro %s in ' +'BrowserParams will be replaced by the URL.'; hhsHelpNoHTMLBrowserFoundPleaseDefineOne = 'No HTML Browser found.'