From b6ee99a88778d624cdf4338c789f7335fa017c51 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sat, 2 Feb 2008 09:14:57 +0000
Subject: [PATCH] IDE: fpdoc editor: added secon column of speedbuttons

git-svn-id: trunk@13947 -
---
 .gitattributes              |   3 +
 ide/fpdoceditwindow.lfm     | 211 ++++++++++++++++++---------------
 ide/fpdoceditwindow.lrs     | 229 +++++++++++++++++++-----------------
 ide/fpdoceditwindow.pas     |  10 ++
 ide/fpdocselectlink.lfm     |   9 ++
 ide/fpdocselectlink.lrs     |   7 ++
 ide/fpdocselectlink.pas     |  50 ++++++++
 ide/lazarusidestrconsts.pas |   2 +
 8 files changed, 318 insertions(+), 203 deletions(-)
 create mode 100644 ide/fpdocselectlink.lfm
 create mode 100644 ide/fpdocselectlink.lrs
 create mode 100644 ide/fpdocselectlink.pas

diff --git a/.gitattributes b/.gitattributes
index 14969e9857..b9929428de 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1995,6 +1995,9 @@ ide/fpdochints.pas svneol=native#text/plain
 ide/fpdocselectinherited.lfm svneol=native#text/plain
 ide/fpdocselectinherited.lrs svneol=native#text/plain
 ide/fpdocselectinherited.pas svneol=native#text/plain
+ide/fpdocselectlink.lfm svneol=native#text/plain
+ide/fpdocselectlink.lrs svneol=native#text/plain
+ide/fpdocselectlink.pas svneol=native#text/plain
 ide/frmcustomapplicationoptions.lfm svneol=native#text/plain
 ide/frmcustomapplicationoptions.lrs svneol=native#text/plain
 ide/frmcustomapplicationoptions.pas svneol=native#text/plain
diff --git a/ide/fpdoceditwindow.lfm b/ide/fpdoceditwindow.lfm
index b985de94e4..2db32fefa0 100644
--- a/ide/fpdoceditwindow.lfm
+++ b/ide/fpdoceditwindow.lfm
@@ -1,33 +1,33 @@
 object FPDocEditor: TFPDocEditor
   Left = 303
-  Height = 125
+  Height = 120
   Top = 548
   Width = 753
   HorzScrollBar.Page = 752
-  VertScrollBar.Page = 124
-  ActiveControl = DescrMemo
+  VertScrollBar.Page = 119
+  ActiveControl = ShortEdit
   Caption = 'FPDoc editor'
-  ClientHeight = 125
+  ClientHeight = 120
   ClientWidth = 753
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnResize = FormResize
   object PageControl: TPageControl
-    Left = 17
-    Height = 125
-    Width = 736
-    ActivePage = DescrTabSheet
+    Left = 40
+    Height = 120
+    Width = 713
+    ActivePage = ShortTabSheet
     Align = alClient
-    TabIndex = 1
+    TabIndex = 0
     TabOrder = 0
     TabPosition = tpBottom
     object ShortTabSheet: TTabSheet
       Caption = 'ShortTabSheet'
-      ClientHeight = 86
-      ClientWidth = 732
+      ClientHeight = 89
+      ClientWidth = 709
       object ShortEdit: TEdit
         Height = 23
-        Width = 730
+        Width = 707
         Align = alTop
         BorderSpacing.Right = 2
         OnChange = ShortEditEditingDone
@@ -65,11 +65,11 @@ object FPDocEditor: TFPDocEditor
     end
     object DescrTabSheet: TTabSheet
       Caption = 'DescrTabSheet'
-      ClientHeight = 94
-      ClientWidth = 732
+      ClientHeight = 89
+      ClientWidth = 709
       object DescrMemo: TMemo
-        Height = 90
-        Width = 730
+        Height = 85
+        Width = 707
         Align = alClient
         BorderSpacing.Right = 2
         BorderSpacing.Bottom = 4
@@ -82,10 +82,10 @@ object FPDocEditor: TFPDocEditor
     end
     object ErrorsTabSheet: TTabSheet
       Caption = 'ErrorsTabSheet'
-      ClientHeight = 86
+      ClientHeight = 94
       ClientWidth = 732
       object ErrorsMemo: TMemo
-        Height = 82
+        Height = 90
         Width = 730
         Align = alClient
         BorderSpacing.Right = 2
@@ -99,12 +99,12 @@ object FPDocEditor: TFPDocEditor
     end
     object SeeAlsoTabSheet: TTabSheet
       Caption = 'SeeAlsoTabSheet'
-      ClientHeight = 86
+      ClientHeight = 94
       ClientWidth = 732
       object LinkListBox: TListBox
         AnchorSideTop.Control = AddLinkButton
         AnchorSideTop.Side = asrBottom
-        Height = 49
+        Height = 57
         Top = 33
         Width = 730
         Align = alBottom
@@ -171,7 +171,7 @@ object FPDocEditor: TFPDocEditor
     end
     object ExampleTabSheet: TTabSheet
       Caption = 'ExampleTabSheet'
-      ClientHeight = 86
+      ClientHeight = 94
       ClientWidth = 732
       object ExampleEdit: TEdit
         Height = 23
@@ -199,7 +199,7 @@ object FPDocEditor: TFPDocEditor
     end
     object InheritedTabSheet: TTabSheet
       Caption = 'InheritedTabSheet'
-      ClientHeight = 86
+      ClientHeight = 94
       ClientWidth = 732
       object InheritedShortLabel: TLabel
         Height = 20
@@ -252,19 +252,19 @@ object FPDocEditor: TFPDocEditor
     end
   end
   object LeftBtnPanel: TPanel
-    Height = 125
-    Width = 17
+    Height = 120
+    Width = 20
     Align = alLeft
     BevelOuter = bvNone
-    ClientHeight = 125
-    ClientWidth = 17
+    ClientHeight = 120
+    ClientWidth = 20
     FullRepaint = False
     ParentShowHint = False
     ShowHint = True
     TabOrder = 1
     object BoldFormatButton: TSpeedButton
-      Height = 17
-      Width = 17
+      Height = 23
+      Width = 20
       Align = alTop
       Color = clBtnFace
       Glyph.Data = {
@@ -312,9 +312,9 @@ object FPDocEditor: TFPDocEditor
     end
     object ItalicFormatButton: TSpeedButton
       Tag = 1
-      Height = 17
-      Top = 17
-      Width = 17
+      Height = 23
+      Top = 46
+      Width = 20
       Align = alTop
       Color = clBtnFace
       Glyph.Data = {
@@ -362,9 +362,9 @@ object FPDocEditor: TFPDocEditor
     end
     object UnderlineFormatButton: TSpeedButton
       Tag = 2
-      Height = 17
-      Top = 34
-      Width = 17
+      Height = 23
+      Top = 23
+      Width = 20
       Align = alTop
       Color = clBtnFace
       Glyph.Data = {
@@ -410,11 +410,86 @@ object FPDocEditor: TFPDocEditor
       NumGlyphs = 0
       OnClick = FormatButtonClick
     end
+    object InsertVarTagButton: TSpeedButton
+      Tag = 5
+      Height = 23
+      Top = 92
+      Width = 20
+      Align = alTop
+      Color = clBtnFace
+      Glyph.Data = {
+        AA030000424DAA03000000000000360000002800000011000000110000000100
+        1800000000007403000064000000640000000000000000000000D8E9ECD8E9EC
+        D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9
+        ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC
+        D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9
+        EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC
+        D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8
+        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC
+        D8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
+        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9
+        ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
+        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9
+        ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
+        E9ECD8E9EC00D8E9ECD8E9ECD4D4D4222222D4D4D4D8E9EC6666667777774C4C
+        4C4C4C4CBBBBBB4C4C4C4C4C4CBBBBBBD8E9ECD8E9ECD8E9EC00D8E9ECD8E9EC
+        5E5E5E4444445E5E5ED8E9EC222222BBBBBB5E5E5E808080FFFFFF8080808080
+        80D8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECE6E6E6000000CCCCCC000000E6E6E6
+        C4C4C4888888444444999999E6E6E6666666222222888888BBBBBBD8E9ECD8E9
+        EC00D8E9ECD4D4D4AAAAAAAAAAAAAAAAAAD4D4D4D4D4D4AAAAAAAAAAAAD8E9EC
+        D4D4D4AAAAAAAAAAAAAAAAAAD8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8
+        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC
+        D8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
+        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9
+        ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
+        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9
+        ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
+        E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9
+        ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECD8E9EC
+        D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9
+        ECD8E9ECD8E9ECD8E9ECD8E9EC00
+      }
+      NumGlyphs = 0
+      OnClick = FormatButtonClick
+    end
+    object InsertParagraphSpeedButton: TSpeedButton
+      Tag = 6
+      Height = 23
+      Top = 69
+      Width = 20
+      Align = alTop
+      Caption = 'P'
+      Color = clBtnFace
+      NumGlyphs = 0
+      OnClick = FormatButtonClick
+    end
+  end
+  object RightBtnPanel: TPanel
+    Left = 20
+    Height = 120
+    Width = 20
+    Align = alLeft
+    BevelOuter = bvNone
+    ClientHeight = 120
+    ClientWidth = 20
+    TabOrder = 2
+    object InsertLinkSpeedButton: TSpeedButton
+      Height = 23
+      Width = 20
+      Align = alTop
+      Caption = 'Li'
+      Color = clBtnFace
+      Enabled = False
+      NumGlyphs = 0
+      OnClick = InsertLinkSpeedButtonClick
+      ShowHint = True
+      ParentShowHint = False
+    end
     object InsertCodeTagButton: TSpeedButton
       Tag = 3
-      Height = 17
-      Top = 51
-      Width = 17
+      Height = 23
+      Top = 23
+      Width = 20
       Align = alTop
       Color = clBtnFace
       Glyph.Data = {
@@ -455,12 +530,14 @@ object FPDocEditor: TFPDocEditor
       }
       NumGlyphs = 0
       OnClick = FormatButtonClick
+      ShowHint = True
+      ParentShowHint = False
     end
     object InsertRemarkButton: TSpeedButton
       Tag = 4
-      Height = 17
-      Top = 68
-      Width = 17
+      Height = 23
+      Top = 46
+      Width = 20
       Align = alTop
       Color = clBtnFace
       Glyph.Data = {
@@ -497,58 +574,8 @@ object FPDocEditor: TFPDocEditor
       }
       NumGlyphs = 0
       OnClick = FormatButtonClick
-    end
-    object InsertVarTagButton: TSpeedButton
-      Tag = 5
-      Height = 17
-      Top = 85
-      Width = 17
-      Align = alTop
-      Color = clBtnFace
-      Glyph.Data = {
-        AA030000424DAA03000000000000360000002800000011000000110000000100
-        1800000000007403000064000000640000000000000000000000D8E9ECD8E9EC
-        D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9
-        ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC
-        D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9
-        EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC
-        D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8
-        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC
-        D8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
-        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9
-        ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
-        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9
-        ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
-        E9ECD8E9EC00D8E9ECD8E9ECD4D4D4222222D4D4D4D8E9EC6666667777774C4C
-        4C4C4C4CBBBBBB4C4C4C4C4C4CBBBBBBD8E9ECD8E9ECD8E9EC00D8E9ECD8E9EC
-        5E5E5E4444445E5E5ED8E9EC222222BBBBBB5E5E5E808080FFFFFF8080808080
-        80D8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECE6E6E6000000CCCCCC000000E6E6E6
-        C4C4C4888888444444999999E6E6E6666666222222888888BBBBBBD8E9ECD8E9
-        EC00D8E9ECD4D4D4AAAAAAAAAAAAAAAAAAD4D4D4D4D4D4AAAAAAAAAAAAD8E9EC
-        D4D4D4AAAAAAAAAAAAAAAAAAD8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8
-        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC
-        D8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
-        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9
-        ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
-        E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9
-        ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8
-        E9ECD8E9EC00D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9
-        ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9EC00D8E9ECD8E9EC
-        D8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9ECD8E9
-        ECD8E9ECD8E9ECD8E9ECD8E9EC00
-      }
-      NumGlyphs = 0
-      OnClick = FormatButtonClick
-    end
-    object InsertParagraphSpeedButton: TSpeedButton
-      Tag = 6
-      Height = 17
-      Top = 102
-      Width = 17
-      Caption = 'P'
-      Color = clBtnFace
-      NumGlyphs = 0
-      OnClick = FormatButtonClick
+      ShowHint = True
+      ParentShowHint = False
     end
   end
   object OpenDialog: TOpenDialog
diff --git a/ide/fpdoceditwindow.lrs b/ide/fpdoceditwindow.lrs
index c8d4412d39..becab4e71d 100644
--- a/ide/fpdoceditwindow.lrs
+++ b/ide/fpdoceditwindow.lrs
@@ -1,16 +1,16 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TFPDocEditor','FORMDATA',[
-  'TPF0'#12'TFPDocEditor'#11'FPDocEditor'#4'Left'#3'/'#1#6'Height'#2'}'#3'Top'#3
+  'TPF0'#12'TFPDocEditor'#11'FPDocEditor'#4'Left'#3'/'#1#6'Height'#2'x'#3'Top'#3
   +'$'#2#5'Width'#3#241#2#18'HorzScrollBar.Page'#3#240#2#18'VertScrollBar.Page'
-  +#2'|'#13'ActiveControl'#7#9'DescrMemo'#7'Caption'#6#12'FPDoc editor'#12'Clie'
-  +'ntHeight'#2'}'#11'ClientWidth'#3#241#2#8'OnCreate'#7#10'FormCreate'#9'OnDes'
+  +#2'w'#13'ActiveControl'#7#9'ShortEdit'#7'Caption'#6#12'FPDoc editor'#12'Clie'
+  +'ntHeight'#2'x'#11'ClientWidth'#3#241#2#8'OnCreate'#7#10'FormCreate'#9'OnDes'
   +'troy'#7#11'FormDestroy'#8'OnResize'#7#10'FormResize'#0#12'TPageControl'#11
-  +'PageControl'#4'Left'#2#17#6'Height'#2'}'#5'Width'#3#224#2#10'ActivePage'#7
-  +#13'DescrTabSheet'#5'Align'#7#8'alClient'#8'TabIndex'#2#1#8'TabOrder'#2#0#11
+  +'PageControl'#4'Left'#2'('#6'Height'#2'x'#5'Width'#3#201#2#10'ActivePage'#7
+  +#13'ShortTabSheet'#5'Align'#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#0#11
   +'TabPosition'#7#8'tpBottom'#0#9'TTabSheet'#13'ShortTabSheet'#7'Caption'#6#13
-  +'ShortTabSheet'#12'ClientHeight'#2'V'#11'ClientWidth'#3#220#2#0#5'TEdit'#9'S'
-  +'hortEdit'#6'Height'#2#23#5'Width'#3#218#2#5'Align'#7#5'alTop'#19'BorderSpac'
+  +'ShortTabSheet'#12'ClientHeight'#2'Y'#11'ClientWidth'#3#197#2#0#5'TEdit'#9'S'
+  +'hortEdit'#6'Height'#2#23#5'Width'#3#195#2#5'Align'#7#5'alTop'#19'BorderSpac'
   +'ing.Right'#2#2#8'OnChange'#7#20'ShortEditEditingDone'#13'OnEditingDone'#7#20
   +'ShortEditEditingDone'#8'TabOrder'#2#0#4'Text'#6#9'ShortEdit'#0#0#7'TButton'
   +#12'CreateButton'#21'AnchorSideTop.Control'#7#9'ShortEdit'#18'AnchorSideTop.'
@@ -22,18 +22,18 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +'t'#2#29#3'Top'#2#29#5'Width'#2'W'#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#7
   +'Caption'#6#10'SaveButton'#7'OnClick'#7#15'SaveButtonClick'#8'TabOrder'#2#2#0
   +#0#0#9'TTabSheet'#13'DescrTabSheet'#7'Caption'#6#13'DescrTabSheet'#12'Client'
-  +'Height'#2'^'#11'ClientWidth'#3#220#2#0#5'TMemo'#9'DescrMemo'#6'Height'#2'Z'
-  +#5'Width'#3#218#2#5'Align'#7#8'alClient'#19'BorderSpacing.Right'#2#2#20'Bord'
+  +'Height'#2'Y'#11'ClientWidth'#3#197#2#0#5'TMemo'#9'DescrMemo'#6'Height'#2'U'
+  +#5'Width'#3#195#2#5'Align'#7#8'alClient'#19'BorderSpacing.Right'#2#2#20'Bord'
   +'erSpacing.Bottom'#2#4#13'Lines.Strings'#1#6#9'DescrMemo'#0#8'OnChange'#7#15
   +'DescrMemoChange'#8'TabOrder'#2#0#0#0#0#9'TTabSheet'#14'ErrorsTabSheet'#7'Ca'
-  +'ption'#6#14'ErrorsTabSheet'#12'ClientHeight'#2'V'#11'ClientWidth'#3#220#2#0
-  +#5'TMemo'#10'ErrorsMemo'#6'Height'#2'R'#5'Width'#3#218#2#5'Align'#7#8'alClie'
+  +'ption'#6#14'ErrorsTabSheet'#12'ClientHeight'#2'^'#11'ClientWidth'#3#220#2#0
+  +#5'TMemo'#10'ErrorsMemo'#6'Height'#2'Z'#5'Width'#3#218#2#5'Align'#7#8'alClie'
   +'nt'#19'BorderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2#4#13'Lines.Strin'
   +'gs'#1#6#10'ErrorsMemo'#0#8'OnChange'#7#16'ErrorsMemoChange'#8'TabOrder'#2#0
   +#0#0#0#9'TTabSheet'#15'SeeAlsoTabSheet'#7'Caption'#6#15'SeeAlsoTabSheet'#12
-  +'ClientHeight'#2'V'#11'ClientWidth'#3#220#2#0#8'TListBox'#11'LinkListBox'#21
+  +'ClientHeight'#2'^'#11'ClientWidth'#3#220#2#0#8'TListBox'#11'LinkListBox'#21
   +'AnchorSideTop.Control'#7#13'AddLinkButton'#18'AnchorSideTop.Side'#7#9'asrBo'
-  +'ttom'#6'Height'#2'1'#3'Top'#2'!'#5'Width'#3#218#2#5'Align'#7#8'alBottom'#7
+  +'ttom'#6'Height'#2'9'#3'Top'#2'!'#5'Width'#3#218#2#5'Align'#7#8'alBottom'#7
   +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'BorderSpacing.To'
   +'p'#2#4#19'BorderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2#4#7'OnClick'#7
   +#16'LinkListBoxClick'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#7'TButton'#13'Ad'
@@ -55,7 +55,7 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +'fLineComplete'#20'cbactSearchAscending'#0#8'AutoSize'#9#9'MaxLength'#2#0#8
   +'OnChange'#7#10'LinkChange'#8'TabOrder'#2#4#4'Text'#6#14'LinkIdComboBox'#0#0
   +#0#9'TTabSheet'#15'ExampleTabSheet'#7'Caption'#6#15'ExampleTabSheet'#12'Clie'
-  +'ntHeight'#2'V'#11'ClientWidth'#3#220#2#0#5'TEdit'#11'ExampleEdit'#6'Height'
+  +'ntHeight'#2'^'#11'ClientWidth'#3#220#2#0#5'TEdit'#11'ExampleEdit'#6'Height'
   +#2#23#5'Width'#3#218#2#5'Align'#7#5'alTop'#19'BorderSpacing.Right'#2#2#8'OnC'
   +'hange'#7#17'ExampleEditChange'#8'TabOrder'#2#0#4'Text'#6#11'ExampleEdit'#0#0
   +#7'TButton'#19'BrowseExampleButton'#23'AnchorSideRight.Control'#7#15'Example'
@@ -63,7 +63,7 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +#29#3'Top'#2#28#5'Width'#3#156#0#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoS'
   +'ize'#9#19'BorderSpacing.Right'#2#2#7'Caption'#6#19'BrowseExampleButton'#7'O'
   +'nClick'#7#24'BrowseExampleButtonClick'#8'TabOrder'#2#1#0#0#0#9'TTabSheet'#17
-  +'InheritedTabSheet'#7'Caption'#6#17'InheritedTabSheet'#12'ClientHeight'#2'V'
+  +'InheritedTabSheet'#7'Caption'#6#17'InheritedTabSheet'#12'ClientHeight'#2'^'
   +#11'ClientWidth'#3#220#2#0#6'TLabel'#19'InheritedShortLabel'#6'Height'#2#20#3
   ,'Top'#2#2#5'Width'#3#220#2#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#2#7'C'
   +'aption'#6#19'InheritedShortLabel'#11'ParentColor'#8#0#0#5'TEdit'#18'Inherit'
@@ -81,10 +81,10 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +'op.Side'#7#9'asrCenter'#4'Left'#3#168#0#6'Height'#2#29#3'Top'#2'6'#5'Width'
   +#3#175#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#10#7'Caption'#6#23'CopyFromI'
   +'nheritedButton'#7'OnClick'#7#28'CopyFromInheritedButtonClick'#8'TabOrder'#2
-  +#2#0#0#0#0#6'TPanel'#12'LeftBtnPanel'#6'Height'#2'}'#5'Width'#2#17#5'Align'#7
-  +#6'alLeft'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'}'#11'ClientWidth'#2
-  +#17#11'FullRepaint'#8#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#1#0#12
-  +'TSpeedButton'#16'BoldFormatButton'#6'Height'#2#17#5'Width'#2#17#5'Align'#7#5
+  +#2#0#0#0#0#6'TPanel'#12'LeftBtnPanel'#6'Height'#2'x'#5'Width'#2#20#5'Align'#7
+  +#6'alLeft'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'x'#11'ClientWidth'#2
+  +#20#11'FullRepaint'#8#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#1#0#12
+  +'TSpeedButton'#16'BoldFormatButton'#6'Height'#2#23#5'Width'#2#20#5'Align'#7#5
   +'alTop'#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10#190#4#0#0#186#4#0#0'BM'#186
   +#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0' '#0#0#0#0#0#132#4#0#0
   +'d'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#0#255#255#0#219#152' '#0#0#14#165#0#243
@@ -125,7 +125,7 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +#28#241#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#9'NumGlyphs'#2#0#7'OnCl'
   +'ick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#18'ItalicFormatButton'#3
-  +'Tag'#2#1#6'Height'#2#17#3'Top'#2#17#5'Width'#2#17#5'Align'#7#5'alTop'#5'Col'
+  +'Tag'#2#1#6'Height'#2#23#3'Top'#2'.'#5'Width'#2#20#5'Align'#7#5'alTop'#5'Col'
   +'or'#7#9'clBtnFace'#10'Glyph.Data'#10#190#4#0#0#186#4#0#0'BM'#186#4#0#0#0#0#0
   +#0'6'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0' '#0#0#0#0#0#132#4#0#0'd'#0#0#0'd'
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#25#0#0#0#0#0#0#0'd'#253'F'#0#0#0#1#0
@@ -174,7 +174,7 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +#241#0#0#0#0#0#0#0#0#0#197'}N'#0#197'}N'#0#197'}N'#0#208#169#140#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#255#255#0#241#207#136#0#197'}N'#0
   +#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#21
-  +'UnderlineFormatButton'#3'Tag'#2#2#6'Height'#2#17#3'Top'#2'"'#5'Width'#2#17#5
+  +'UnderlineFormatButton'#3'Tag'#2#2#6'Height'#2#23#3'Top'#2#23#5'Width'#2#20#5
   +'Align'#7#5'alTop'#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10#190#4#0#0#186#4
   +#0#0'BM'#186#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0' '#0#0#0#0
   +#0#132#4#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#25#0#0#0#0#0#0
@@ -223,11 +223,69 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +'}N'#0#213#158'|'#0#184'S'#239#0'0'#233'j'#0'('#202#252#0#128#228'D'#0#197'}'
   +'N'#0#197'}N'#0#197'}N'#0#208#169#140#0#228#187#146#0#228#187#146#0#209#159
   +'k'#0#207#156'k'#0#190#138'V'#0#0#0#0#0#0' '#160#0#250#214'Z'#0#197'}N'#0#9
-  +'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#19'I'
-  +'nsertCodeTagButton'#3'Tag'#2#3#6'Height'#2#17#3'Top'#2'3'#5'Width'#2#17#5'A'
-  +'lign'#7#5'alTop'#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10'6'#4#0#0'2'#4#0#0
-  +'BM2'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#17#0#0#0#15#0#0#0#1#0' '#0#0#0#0#0#252
-  +#3#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#216#233#236#255#216#233#236#255#216
+  +'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#18'I'
+  +'nsertVarTagButton'#3'Tag'#2#5#6'Height'#2#23#3'Top'#2'\'#5'Width'#2#20#5'Al'
+  +'ign'#7#5'alTop'#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10#174#3#0#0#170#3#0
+  +#0'BM'#170#3#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#24#0#0#0#0#0
+  +'t'#3#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#216#233#236#216#233#236#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
+  +#233#236#216#233#236#0#216#233#236#216#233#236#216#233#236#216#233#236#216
+  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
+  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#0#216#233#236#216
+  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
+  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
+  +#236#216#233#236#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#0
+  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
+  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233
+  +#236#212#212#212'"""'#212#212#212#216#233#236'fffwwwLLLLLL'#187#187#187'LLLL'
+  +'LL'#187#187#187#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233
+  +#236'^^^DDD^^^'#216#233#236'"""'#187#187#187'^^^'#128#128#128#255#255#255#128
+  +#128#128#128#128#128#216#233#236#216#233#236#216#233#236#216#233#236#0#216
+  +#233#236#230#230#230#0#0#0#204#204#204#0#0#0#230#230#230#196#196#196#136#136
+  +#136'DDD'#153#153#153#230#230#230'fff"""'#136#136#136#187#187#187#216#233#236
+  +#216#233#236#0#216#233#236#212#212#212#170#170#170#170#170#170#170#170#170
+  +#212#212#212#212#212#212#170#170#170#170#170#170#216#233#236#212#212#212#170
+  +#170#170#170#170#170#170#170#170#216#233#236#216#233#236#216#233#236#0#216
+  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
+  ,#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
+  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
+  +#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216#233#236#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
+  +#233#236#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
+  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#0#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
+  +#233#236#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216
+  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#0#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClic'
+  +'k'#0#0#12'TSpeedButton'#26'InsertParagraphSpeedButton'#3'Tag'#2#6#6'Height'
+  +#2#23#3'Top'#2'E'#5'Width'#2#20#5'Align'#7#5'alTop'#7'Caption'#6#1'P'#5'Colo'
+  +'r'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#0
+  +#6'TPanel'#13'RightBtnPanel'#4'Left'#2#20#6'Height'#2'x'#5'Width'#2#20#5'Ali'
+  +'gn'#7#6'alLeft'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'x'#11'ClientW'
+  +'idth'#2#20#8'TabOrder'#2#2#0#12'TSpeedButton'#21'InsertLinkSpeedButton'#6'H'
+  +'eight'#2#23#5'Width'#2#20#5'Align'#7#5'alTop'#7'Caption'#6#2'Li'#5'Color'#7
+  +#9'clBtnFace'#7'Enabled'#8#9'NumGlyphs'#2#0#7'OnClick'#7#26'InsertLinkSpeedB'
+  +'uttonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#19'Inse'
+  +'rtCodeTagButton'#3'Tag'#2#3#6'Height'#2#23#3'Top'#2#23#5'Width'#2#20#5'Alig'
+  +'n'#7#5'alTop'#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10'6'#4#0#0'2'#4#0#0'B'
+  +'M2'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#17#0#0#0#15#0#0#0#1#0' '#0#0#0#0#0#252#3
+  +#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#216#233#236#255#216#233#236#255#216
   +#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255
   +#216#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216#233#236
   +#255#216#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216#233
@@ -257,13 +315,13 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +'<Q|'#255'T'#173#255'X'#136#183#255'['#130#164#255'ez'#141#255'g}'#146#255
   +'[p'#147#255'66?'#255#211#211#211#255#216#233#236#255#216#233#236#255#216#233
   +#236#255#216#233#236#255#216#233#236#255'O'#150#189#255'@w'#151#255'8`|'#255
-  ,'Iw'#156#255'@c'#134#255'Y'#141#186#255'0Dc'#255'Be'#138#255'a'#151#201#255
+  +'Iw'#156#255'@c'#134#255'Y'#141#186#255'0Dc'#255'Be'#138#255'a'#151#201#255
   +'b'#155#204#255'BXl'#255'Zp'#130#255#216#233#236#255#216#233#236#255#216#233
   +#236#255#216#233#236#255#216#233#236#255'j'#167#204#255'Jh'#128#255'c'#170
   +#220#255'J'#131#168#255'Ct'#151#255'R'#144#185#255'Gp'#148#255'Bh'#137#255'^'
   +#149#196#255'?e'#135#255'Nz'#163#255#207#225#240#255#216#233#236#255#216#233
   +#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216
-  +#233#236#255#213#237#250#255#158#212#243#255'U'#152#191#255'U'#157#200#255'Z'
+  ,#233#236#255#213#237#250#255#158#212#243#255'U'#152#191#255'U'#157#200#255'Z'
   +#142#188#255'5a|'#255'U'#134#177#255'@i'#145#255#147#172#195#255#216#233#236
   +#255#216#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216#233
   +#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216
@@ -277,57 +335,9 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216
   +#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255
   +#216#233#236#255#216#233#236#255#216#233#236#255#216#233#236#255#9'NumGlyphs'
-  +#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#18'InsertRemark'
-  +'Button'#3'Tag'#2#4#6'Height'#2#17#3'Top'#2'D'#5'Width'#2#17#5'Align'#7#5'al'
-  +'Top'#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10#174#3#0#0#170#3#0#0'BM'#170#3
-  +#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#24#0#0#0#0#0't'#3#0#0'd'
-  +#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#0#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216
-  +#233#236#216#233#236#255#0#0#255#0#0#255#0#0#216#233#236#216#233#236#216#233
-  +#236#255#0#0#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236#216#233#236
-  +#0#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#255#0#0#255
-  +#0#0#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216#233
-  +#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233
-  +#236#0#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216
-  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#255#0#0
-  +#255#0#0#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216
-  +#233#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233#236#216
-  +#233#236#0#216#233#236#255#0#0#255#0#0#255#0#0#216#233#236#216#233#236#216
-  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
-  +#236#255#0#0#255#0#0#255#0#0#216#233#236#0#216#233#236#216#233#236#216#233
-  +#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233
-  +#236#0#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216
-  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#255#0#0
-  +#255#0#0#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216
-  +#233#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233#236#216
-  +#233#236#0#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#255
-  +#0#0#255#0#0#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236
-  +#216#233#236#216#233#236#255#0#0#255#0#0#255#0#0#216#233#236#216#233#236#216
-  +#233#236#255#0#0#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236#216#233
-  +#236#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#0#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
-  ,#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#216#233#236#0#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0
-  +#0#12'TSpeedButton'#18'InsertVarTagButton'#3'Tag'#2#5#6'Height'#2#17#3'Top'#2
-  +'U'#5'Width'#2#17#5'Align'#7#5'alTop'#5'Color'#7#9'clBtnFace'#10'Glyph.Data'
+  +#2#0#7'OnClick'#7#17'FormatButtonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0
+  +#0#12'TSpeedButton'#18'InsertRemarkButton'#3'Tag'#2#4#6'Height'#2#23#3'Top'#2
+  +'.'#5'Width'#2#20#5'Align'#7#5'alTop'#5'Color'#7#9'clBtnFace'#10'Glyph.Data'
   +#10#174#3#0#0#170#3#0#0'BM'#170#3#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#17#0#0#0#17#0
   +#0#0#1#0#24#0#0#0#0#0't'#3#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#216#233#236
   +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
@@ -338,47 +348,44 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +#233#236#216#233#236#0#216#233#236#216#233#236#216#233#236#216#233#236#216
   +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
   +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#0#216#233#236#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#255#0#0
+  +#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#255#0#0#216#233#236#216
+  +#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216#233#236#255#0
+  +#0#255#0#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
+  +#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236#0
+  +#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0
+  +#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216#233#236
+  +#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236
+  +#0#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#255#0#0#255
+  +#0#0#216#233#236#216#233#236#216#233#236#0#216#233#236#255#0#0#255#0#0#255#0
   +#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#0#216#233#236#216
-  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#255#0#0#216#233#236#0
+  +#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233#236
+  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0
+  +#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216#233#236
+  +#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
+  +#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236
+  +#0#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#255#0#0#255
+  +#0#0#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216#233
+  +#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233
+  +#236#216#233#236#216#233#236#255#0#0#255#0#0#216#233#236#216#233#236#216#233
+  +#236#0#216#233#236#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#255#0
+  +#0#216#233#236#216#233#236#216#233#236#255#0#0#255#0#0#255#0#0#216#233#236
   +#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216#233#236
   +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
   +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
   +#236#216#233#236#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233
   +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
   +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#0
-  +#216#233#236#216#233#236#212#212#212'"""'#212#212#212#216#233#236'fffwwwLLLL'
-  +'LL'#187#187#187'LLLLLL'#187#187#187#216#233#236#216#233#236#216#233#236#0
-  +#216#233#236#216#233#236'^^^DDD^^^'#216#233#236'"""'#187#187#187'^^^'#128#128
-  +#128#255#255#255#128#128#128#128#128#128#216#233#236#216#233#236#216#233#236
-  +#216#233#236#0#216#233#236#230#230#230#0#0#0#204#204#204#0#0#0#230#230#230
-  +#196#196#196#136#136#136'DDD'#153#153#153#230#230#230'fff"""'#136#136#136#187
-  +#187#187#216#233#236#216#233#236#0#216#233#236#212#212#212#170#170#170#170
-  +#170#170#170#170#170#212#212#212#212#212#212#170#170#170#170#170#170#216#233
-  +#236#212#212#212#170#170#170#170#170#170#170#170#170#216#233#236#216#233#236
-  +#216#233#236#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#0#216
-  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#0#216#233#236#216#233#236
   +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
   +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#0#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#0#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#0#216#233
-  +#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236
-  +#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216#233#236#216
-  +#233#236#216#233#236#216#233#236#216#233#236#0#9'NumGlyphs'#2#0#7'OnClick'#7
-  +#17'FormatButtonClick'#0#0#12'TSpeedButton'#26'InsertParagraphSpeedButton'#3
-  +'Tag'#2#6#6'Height'#2#17#3'Top'#2'f'#5'Width'#2#17#7'Caption'#6#1'P'#5'Color'
-  +#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#0#11
-  +'TOpenDialog'#10'OpenDialog'#5'Title'#6#17'Open example file'#6'Filter'#6#28
+  +#236#216#233#236#216#233#236#216#233#236#216#233#236#0#9'NumGlyphs'#2#0#7'On'
+  +'Click'#7#17'FormatButtonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#0#11
+  ,'TOpenDialog'#10'OpenDialog'#5'Title'#6#17'Open example file'#6'Filter'#6#28
   +'pascal file|*.pas; *.pp; *.p'#11'FilterIndex'#2#0#4'left'#2'@'#3'top'#2#24#0
   +#0#0
 ]);
diff --git a/ide/fpdoceditwindow.pas b/ide/fpdoceditwindow.pas
index 195a019673..c8141d0f91 100644
--- a/ide/fpdoceditwindow.pas
+++ b/ide/fpdoceditwindow.pas
@@ -62,6 +62,7 @@ type
   TFPDocEditor = class(TForm)
     AddLinkButton: TButton;
     BrowseExampleButton: TButton;
+    RightBtnPanel: TPanel;
     SaveButton: TButton;
     CreateButton: TButton;
     CopyFromInheritedButton: TButton;
@@ -90,6 +91,7 @@ type
     ExampleTabSheet: TTabSheet;
     InheritedTabSheet: TTabSheet;
     InsertParagraphSpeedButton: TSpeedButton;
+    InsertLinkSpeedButton: TSpeedButton;
     UnderlineFormatButton: TSpeedButton;
     SeeAlsoTabSheet: TTabSheet;
     procedure AddLinkButtonClick(Sender: TObject);
@@ -104,6 +106,7 @@ type
     procedure FormDestroy(Sender: TObject);
     procedure FormResize(Sender: TObject);
     procedure FormatButtonClick(Sender: TObject);
+    procedure InsertLinkSpeedButtonClick(Sender: TObject);
     procedure LinkChange(Sender: TObject);
     procedure LinkListBoxClick(Sender: TObject);
     procedure ApplicationIdle(Sender: TObject; var Done: Boolean);
@@ -240,6 +243,8 @@ begin
   InsertCodeTagButton.Hint := lisCodeHelpHintInsertCodeTag;
   InsertRemarkButton.Hint := lisCodeHelpHintRemarkTag;
   InsertVarTagButton.Hint := lisCodeHelpHintVarTag;
+  InsertParagraphSpeedButton.Hint := lisCodeHelpInsertParagraphFormattingTag;
+  InsertLinkSpeedButton.Hint := lisCodeHelpInsertALink;
 
   CreateButton.Caption := lisCodeHelpCreateButton;
   CreateButton.Enabled:=false;
@@ -315,6 +320,11 @@ begin
   end;
 end;
 
+procedure TFPDocEditor.InsertLinkSpeedButtonClick(Sender: TObject);
+begin
+
+end;
+
 procedure TFPDocEditor.LinkChange(Sender: TObject);
 begin
   if LinkListBox.ItemIndex<0 then
diff --git a/ide/fpdocselectlink.lfm b/ide/fpdocselectlink.lfm
new file mode 100644
index 0000000000..9d1f2083a3
--- /dev/null
+++ b/ide/fpdocselectlink.lfm
@@ -0,0 +1,9 @@
+object FPDocLinkEditorDlg: TFPDocLinkEditorDlg
+  Left = 362
+  Height = 300
+  Top = 304
+  Width = 400
+  HorzScrollBar.Page = 399
+  VertScrollBar.Page = 299
+  Caption = 'FPDocLinkEditorDlg'
+end
diff --git a/ide/fpdocselectlink.lrs b/ide/fpdocselectlink.lrs
new file mode 100644
index 0000000000..d474fa86f2
--- /dev/null
+++ b/ide/fpdocselectlink.lrs
@@ -0,0 +1,7 @@
+{ This is an automatically generated lazarus resource file }
+
+LazarusResources.Add('TFPDocLinkEditorDlg','FORMDATA',[
+  'TPF0'#19'TFPDocLinkEditorDlg'#18'FPDocLinkEditorDlg'#4'Left'#3'j'#1#6'Height'
+  +#3','#1#3'Top'#3'0'#1#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'Ver'
+  +'tScrollBar.Page'#3'+'#1#7'Caption'#6#18'FPDocLinkEditorDlg'#0#0
+]);
diff --git a/ide/fpdocselectlink.pas b/ide/fpdocselectlink.pas
new file mode 100644
index 0000000000..02205c341f
--- /dev/null
+++ b/ide/fpdocselectlink.pas
@@ -0,0 +1,50 @@
+{
+ ***************************************************************************
+ *                                                                         *
+ *   This source is free software; you can redistribute it and/or modify   *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This code is distributed in the hope that it will be useful, but      *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   General Public License for more details.                              *
+ *                                                                         *
+ *   A copy of the GNU General Public License is available on the World    *
+ *   Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also      *
+ *   obtain it by writing to the Free Software Foundation,                 *
+ *   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.        *
+ *                                                                         *
+ ***************************************************************************
+
+  Author: Mattias Gaertner
+  
+  Abstract:
+    Dialog used by the fpdoc editor to create a link.
+}
+unit FPDocSelectLink;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs; 
+
+type
+  TFPDocLinkEditorDlg = class(TForm)
+  private
+  public
+  end;
+
+var
+  FPDocLinkEditorDlg: TFPDocLinkEditorDlg;
+
+implementation
+
+initialization
+  {$I fpdocselectlink.lrs}
+
+end.
+
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 30913c0adc..070e4ba411 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -3496,6 +3496,8 @@ resourcestring
   lisCodeHelpAddLinkButton = 'Add link';
   lisCodeHelpDeleteLinkButton = 'Delete link';
   lisCodeHelpCreateButton = 'Create help item';
+  lisCodeHelpInsertALink = 'Insert a link ...';
+  lisCodeHelpInsertParagraphFormattingTag = 'Insert paragraph formatting tag';
   lisCodeHelpSaveButton = 'Save';
   lisCodeHelpExampleTag = 'Example';
   lisCodeHelpBrowseExampleButton = 'Browse';