From ec80d91b4e4b3555fb023043752000fb01bef6bb Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 22 Aug 2009 15:16:30 +0000 Subject: [PATCH] IDE: fpdoc editor: removed popmenu items, added speedbutton for printshort git-svn-id: trunk@21392 - --- ide/fpdoceditwindow.lfm | 82 ++++++------ ide/fpdoceditwindow.lrs | 242 ++++++++++++++++++------------------ ide/fpdoceditwindow.pas | 43 +++---- ide/lazarusidestrconsts.pas | 1 + 4 files changed, 175 insertions(+), 193 deletions(-) diff --git a/ide/fpdoceditwindow.lfm b/ide/fpdoceditwindow.lfm index 9aa6668b6a..f8999c3c49 100644 --- a/ide/fpdoceditwindow.lfm +++ b/ide/fpdoceditwindow.lfm @@ -1,7 +1,7 @@ object FPDocEditor: TFPDocEditor - Left = 318 + Left = 520 Height = 126 - Top = 620 + Top = 745 Width = 753 ActiveControl = LeftBtnPanel Caption = 'FPDoc editor' @@ -10,7 +10,7 @@ object FPDocEditor: TFPDocEditor OnCreate = FormCreate OnDestroy = FormDestroy OnResize = FormResize - LCLVersion = '0.9.27' + LCLVersion = '0.9.29' object PageControl: TPageControl Left = 40 Height = 126 @@ -18,7 +18,6 @@ object FPDocEditor: TFPDocEditor Width = 713 ActivePage = ShortTabSheet Align = alClient - PopupMenu = PopupMenu1 TabIndex = 0 TabOrder = 0 TabPosition = tpBottom @@ -26,8 +25,8 @@ object FPDocEditor: TFPDocEditor OnPageChanged = PageControlChange object ShortTabSheet: TTabSheet Caption = 'ShortTabSheet' - ClientHeight = 91 - ClientWidth = 707 + ClientHeight = 99 + ClientWidth = 711 object LinkLabel: TLabel AnchorSideTop.Control = LinkEdit AnchorSideTop.Side = asrCenter @@ -59,7 +58,7 @@ object FPDocEditor: TFPDocEditor Left = 82 Height = 27 Top = 0 - Width = 623 + Width = 627 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Right = 2 @@ -105,7 +104,7 @@ object FPDocEditor: TFPDocEditor Left = 72 Height = 27 Top = 29 - Width = 633 + Width = 637 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Top = 2 @@ -118,13 +117,13 @@ object FPDocEditor: TFPDocEditor end object InheritedTabSheet: TTabSheet Caption = 'InheritedTabSheet' - ClientHeight = 91 - ClientWidth = 707 + ClientHeight = 99 + ClientWidth = 711 object InheritedShortLabel: TLabel Left = 0 Height = 14 Top = 2 - Width = 707 + Width = 711 Align = alTop BorderSpacing.Top = 2 Caption = 'InheritedShortLabel' @@ -139,7 +138,7 @@ object FPDocEditor: TFPDocEditor Left = 0 Height = 27 Top = 18 - Width = 707 + Width = 711 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 2 ReadOnly = True @@ -191,13 +190,13 @@ object FPDocEditor: TFPDocEditor end object DescrTabSheet: TTabSheet Caption = 'DescrTabSheet' - ClientHeight = 91 - ClientWidth = 707 + ClientHeight = 99 + ClientWidth = 711 object DescrMemo: TMemo Left = 0 - Height = 87 + Height = 95 Top = 0 - Width = 705 + Width = 709 Align = alClient BorderSpacing.Right = 2 BorderSpacing.Bottom = 4 @@ -205,19 +204,18 @@ object FPDocEditor: TFPDocEditor 'DescrMemo' ) OnChange = DescrMemoChange - PopupMenu = PopupMenu1 TabOrder = 0 end end object ErrorsTabSheet: TTabSheet Caption = 'ErrorsTabSheet' - ClientHeight = 91 - ClientWidth = 707 + ClientHeight = 99 + ClientWidth = 711 object ErrorsMemo: TMemo Left = 0 - Height = 87 + Height = 95 Top = 0 - Width = 705 + Width = 709 Align = alClient BorderSpacing.Right = 2 BorderSpacing.Bottom = 4 @@ -230,13 +228,13 @@ object FPDocEditor: TFPDocEditor end object SeeAlsoTabSheet: TTabSheet Caption = 'SeeAlsoTabSheet' - ClientHeight = 91 - ClientWidth = 707 + ClientHeight = 99 + ClientWidth = 711 object SeeAlsoMemo: TMemo Left = 0 - Height = 91 + Height = 99 Top = 0 - Width = 707 + Width = 711 Align = alClient Lines.Strings = ( 'SeeAlsoMemo' @@ -247,13 +245,13 @@ object FPDocEditor: TFPDocEditor end object ExampleTabSheet: TTabSheet Caption = 'ExampleTabSheet' - ClientHeight = 91 - ClientWidth = 707 + ClientHeight = 99 + ClientWidth = 711 object ExampleEdit: TEdit Left = 0 Height = 27 Top = 0 - Width = 705 + Width = 709 Align = alTop BorderSpacing.Right = 2 OnChange = ExampleEditChange @@ -265,7 +263,7 @@ object FPDocEditor: TFPDocEditor AnchorSideTop.Side = asrBottom AnchorSideRight.Control = ExampleTabSheet AnchorSideRight.Side = asrBottom - Left = 568 + Left = 572 Height = 23 Top = 33 Width = 133 @@ -397,6 +395,19 @@ object FPDocEditor: TFPDocEditor ShowHint = True ParentShowHint = False end + object InsertPrintShortSpeedButton: TSpeedButton + Tag = 7 + Left = 0 + Height = 23 + Top = 69 + Width = 20 + Caption = 'PS' + Color = clBtnFace + NumGlyphs = 0 + OnClick = FormatButtonClick + ShowHint = True + ParentShowHint = False + end end object OpenDialog: TOpenDialog Title = 'Open example file' @@ -405,17 +416,4 @@ object FPDocEditor: TFPDocEditor left = 240 top = 16 end - object PopupMenu1: TPopupMenu - OnPopup = PopupMenu1Popup - left = 280 - top = 16 - object CopyShortToDescrMenuItem: TMenuItem - Caption = 'CopyShortToDescrMenuItem' - OnClick = CopyShortToDescrMenuItemClick - end - object InsertPrintShortTag: TMenuItem - Caption = 'InsertPrintShortTag' - OnClick = InsertPrintShortTagClick - end - end end diff --git a/ide/fpdoceditwindow.lrs b/ide/fpdoceditwindow.lrs index a9fddc0d31..b43bca5c82 100644 --- a/ide/fpdoceditwindow.lrs +++ b/ide/fpdoceditwindow.lrs @@ -1,130 +1,128 @@ { 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 - +'l'#2#5'Width'#3#241#2#13'ActiveControl'#7#12'LeftBtnPanel'#7'Caption'#6#12 + 'TPF0'#12'TFPDocEditor'#11'FPDocEditor'#4'Left'#3#8#2#6'Height'#2'~'#3'Top'#3 + +#233#2#5'Width'#3#241#2#13'ActiveControl'#7#12'LeftBtnPanel'#7'Caption'#6#12 +'FPDoc editor'#12'ClientHeight'#2'~'#11'ClientWidth'#3#241#2#8'OnCreate'#7#10 +'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#8'OnResize'#7#10'FormResize'#10 - +'LCLVersion'#6#6'0.9.27'#0#12'TPageControl'#11'PageControl'#4'Left'#2'('#6'H' + +'LCLVersion'#6#6'0.9.29'#0#12'TPageControl'#11'PageControl'#4'Left'#2'('#6'H' +'eight'#2'~'#3'Top'#2#0#5'Width'#3#201#2#10'ActivePage'#7#13'ShortTabSheet'#5 - +'Align'#7#8'alClient'#9'PopupMenu'#7#10'PopupMenu1'#8'TabIndex'#2#0#8'TabOrd' - +'er'#2#0#11'TabPosition'#7#8'tpBottom'#8'OnChange'#7#17'PageControlChange'#13 - +'OnPageChanged'#7#17'PageControlChange'#0#9'TTabSheet'#13'ShortTabSheet'#7'C' - +'aption'#6#13'ShortTabSheet'#12'ClientHeight'#2'['#11'ClientWidth'#3#195#2#0 - +#6'TLabel'#9'LinkLabel'#21'AnchorSideTop.Control'#7#8'LinkEdit'#18'AnchorSid' - +'eTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#18#3'Top'#2'!'#5'Width'#2 - +'<'#17'BorderSpacing.Top'#2#6#7'Caption'#6#9'LinkLabel'#11'ParentColor'#8#0#0 - +#6'TLabel'#10'ShortLabel'#22'AnchorSideLeft.Control'#7#13'ShortTabSheet'#21 - +'AnchorSideTop.Control'#7#9'ShortEdit'#18'AnchorSideTop.Side'#7#9'asrCenter' - +#4'Left'#2#6#6'Height'#2#18#3'Top'#2#4#5'Width'#2'F'#18'BorderSpacing.Left'#2 - +#6#7'Caption'#6#10'ShortLabel'#11'ParentColor'#8#0#0#5'TEdit'#9'ShortEdit'#22 - +'AnchorSideLeft.Control'#7#10'ShortLabel'#19'AnchorSideLeft.Side'#7#9'asrBot' - +'tom'#23'AnchorSideRight.Control'#7#13'ShortTabSheet'#20'AnchorSideRight.Sid' - +'e'#7#9'asrBottom'#4'Left'#2'R'#6'Height'#2#27#3'Top'#2#0#5'Width'#3'o'#2#7 - +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'B' - +'orderSpacing.Right'#2#2#8'OnChange'#7#20'ShortEditEditingDone'#13'OnEditing' - +'Done'#7#20'ShortEditEditingDone'#8'TabOrder'#2#0#4'Text'#6#9'ShortEdit'#0#0 - +#7'TButton'#12'CreateButton'#21'AnchorSideTop.Control'#7#8'LinkEdit'#18'Anch' - +'orSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#29#3'Top'#2'>'#5'Wid' - +'th'#2'b'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'CreateB' - +'utton'#7'OnClick'#7#17'CreateButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#10 - +'SaveButton'#22'AnchorSideLeft.Control'#7#12'CreateButton'#19'AnchorSideLeft' - +'.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#12'CreateButton'#4'Left'#2 - +'n'#6'Height'#2#29#3'Top'#2'>'#5'Width'#2'W'#8'AutoSize'#9#18'BorderSpacing.' - +'Left'#2#6#7'Caption'#6#10'SaveButton'#7'OnClick'#7#15'SaveButtonClick'#8'Ta' - +'bOrder'#2#2#0#0#5'TEdit'#8'LinkEdit'#22'AnchorSideLeft.Control'#7#9'LinkLab' - +'el'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'Sh' - +'ortEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7 - +#13'ShortTabSheet'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'H'#6'He' - +'ight'#2#27#3'Top'#2#29#5'Width'#3'y'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'a' - +'kRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpa' - +'cing.Right'#2#2#8'OnChange'#7#19'LinkEditEditingDone'#13'OnEditingDone'#7#19 - +'LinkEditEditingDone'#8'TabOrder'#2#3#4'Text'#6#8'LinkEdit'#0#0#0#9'TTabShee' - +'t'#17'InheritedTabSheet'#7'Caption'#6#17'InheritedTabSheet'#12'ClientHeight' - +#2'['#11'ClientWidth'#3#195#2#0#6'TLabel'#19'InheritedShortLabel'#4'Left'#2#0 - +#6'Height'#2#14#3'Top'#2#2#5'Width'#3#195#2#5'Align'#7#5'alTop'#17'BorderSpa' - +'cing.Top'#2#2#7'Caption'#6#19'InheritedShortLabel'#11'ParentColor'#8#0#0#5 - +'TEdit'#18'InheritedShortEdit'#22'AnchorSideLeft.Control'#7#17'InheritedTabS' - +'heet'#21'AnchorSideTop.Control'#7#19'InheritedShortLabel'#18'AnchorSideTop.' - +'Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#17'InheritedTabSheet'#20 - +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#27#3'Top'#2#18 - +#5'Width'#3#195#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpa' - +'cing.Top'#2#2#8'ReadOnly'#9#8'TabOrder'#2#0#4'Text'#6#18'InheritedShortEdit' - +#0#0#7'TButton'#21'MoveToInheritedButton'#21'AnchorSideTop.Control'#7#18'Inh' - +'eritedShortEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height' - +#2#23#3'Top'#2'3'#5'Width'#3#140#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6 - +#7'Caption'#6#21'MoveToInheritedButton'#7'OnClick'#7#26'MoveToInheritedButto' - +'nClick'#8'TabOrder'#2#1#0#0#7'TButton'#23'CopyFromInheritedButton'#22'Ancho' - +'rSideLeft.Control'#7#21'MoveToInheritedButton'#19'AnchorSideLeft.Side'#7#9 - +'asrBottom'#21'AnchorSideTop.Control'#7#21'MoveToInheritedButton'#18'AnchorS' - +'ideTop.Side'#7#9'asrCenter'#4'Left'#3#150#0#6'Height'#2#23#3'Top'#2'3'#5'Wi' - +'dth'#3#151#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#10#7'Caption'#6#23'Copy' - +'FromInheritedButton'#7'OnClick'#7#28'CopyFromInheritedButtonClick'#8'TabOrd' - +'er'#2#2#0#0#7'TButton'#24'AddLinkToInheritedButton'#22'AnchorSideLeft.Contr' - +'ol'#7#23'CopyFromInheritedButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21 - +'AnchorSideTop.Control'#7#23'CopyFromInheritedButton'#4'Left'#3'7'#1#6'Heigh' - +'t'#2#23#3'Top'#2'3'#5'Width'#3#151#0#8'AutoSize'#9#18'BorderSpacing.Left'#2 - +#10#7'Caption'#6#24'AddLinkToInheritedButton'#7'OnClick'#7#29'AddLinkToInher' - ,'itedButtonClick'#8'TabOrder'#2#3#0#0#0#9'TTabSheet'#13'DescrTabSheet'#7'Cap' - +'tion'#6#13'DescrTabSheet'#12'ClientHeight'#2'['#11'ClientWidth'#3#195#2#0#5 - +'TMemo'#9'DescrMemo'#4'Left'#2#0#6'Height'#2'W'#3'Top'#2#0#5'Width'#3#193#2#5 - +'Align'#7#8'alClient'#19'BorderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2 - +#4#13'Lines.Strings'#1#6#9'DescrMemo'#0#8'OnChange'#7#15'DescrMemoChange'#9 - +'PopupMenu'#7#10'PopupMenu1'#8'TabOrder'#2#0#0#0#0#9'TTabSheet'#14'ErrorsTab' - +'Sheet'#7'Caption'#6#14'ErrorsTabSheet'#12'ClientHeight'#2'['#11'ClientWidth' - +#3#195#2#0#5'TMemo'#10'ErrorsMemo'#4'Left'#2#0#6'Height'#2'W'#3'Top'#2#0#5'W' - +'idth'#3#193#2#5'Align'#7#8'alClient'#19'BorderSpacing.Right'#2#2#20'BorderS' - +'pacing.Bottom'#2#4#13'Lines.Strings'#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'['#11'ClientWidth'#3#195#2 - +#0#5'TMemo'#11'SeeAlsoMemo'#4'Left'#2#0#6'Height'#2'['#3'Top'#2#0#5'Width'#3 - +#195#2#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#11'SeeAlsoMemo'#0#13'OnE' - +'ditingDone'#7#22'SeeAlsoMemoEditingDone'#8'TabOrder'#2#0#0#0#0#9'TTabSheet' - +#15'ExampleTabSheet'#7'Caption'#6#15'ExampleTabSheet'#12'ClientHeight'#2'[' - +#11'ClientWidth'#3#195#2#0#5'TEdit'#11'ExampleEdit'#4'Left'#2#0#6'Height'#2 - +#27#3'Top'#2#0#5'Width'#3#193#2#5'Align'#7#5'alTop'#19'BorderSpacing.Right'#2 - +#2#8'OnChange'#7#17'ExampleEditChange'#8'TabOrder'#2#0#4'Text'#6#11'ExampleE' - +'dit'#0#0#7'TButton'#19'BrowseExampleButton'#21'AnchorSideTop.Control'#7#11 - +'ExampleEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contr' - +'ol'#7#15'ExampleTabSheet'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3 - +'8'#2#6'Height'#2#23#3'Top'#2'!'#5'Width'#3#133#0#7'Anchors'#11#5'akTop'#7'a' - +'kRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'Browse' - +'ExampleButton'#7'OnClick'#7#24'BrowseExampleButtonClick'#8'TabOrder'#2#1#0#0 - +#0#0#6'TPanel'#12'LeftBtnPanel'#4'Left'#2#0#6'Height'#2'~'#3'Top'#2#0#5'Widt' - +'h'#2#20#5'Align'#7#6'alLeft'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2 - +'~'#11'ClientWidth'#2#20#11'FullRepaint'#8#14'ParentShowHint'#8#8'ShowHint'#9 - +#8'TabOrder'#2#1#0#12'TSpeedButton'#16'BoldFormatButton'#4'Left'#2#0#6'Heigh' - +'t'#2#23#3'Top'#2#0#5'Width'#2#20#5'Align'#7#5'alTop'#5'Color'#7#9'clBtnFace' - +#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#18 - +'ItalicFormatButton'#3'Tag'#2#1#4'Left'#2#0#6'Height'#2#23#3'Top'#2'.'#5'Wid' - +'th'#2#20#5'Align'#7#5'alTop'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnC' - +'lick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#21'UnderlineFormatButton' - +#3'Tag'#2#2#4'Left'#2#0#6'Height'#2#23#3'Top'#2#23#5'Width'#2#20#5'Align'#7#5 + +'Align'#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#0#11'TabPosition'#7#8'tp' + +'Bottom'#8'OnChange'#7#17'PageControlChange'#13'OnPageChanged'#7#17'PageCont' + +'rolChange'#0#9'TTabSheet'#13'ShortTabSheet'#7'Caption'#6#13'ShortTabSheet' + +#12'ClientHeight'#2'c'#11'ClientWidth'#3#199#2#0#6'TLabel'#9'LinkLabel'#21'A' + +'nchorSideTop.Control'#7#8'LinkEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4 + +'Left'#2#6#6'Height'#2#18#3'Top'#2'!'#5'Width'#2'<'#17'BorderSpacing.Top'#2#6 + +#7'Caption'#6#9'LinkLabel'#11'ParentColor'#8#0#0#6'TLabel'#10'ShortLabel'#22 + +'AnchorSideLeft.Control'#7#13'ShortTabSheet'#21'AnchorSideTop.Control'#7#9'S' + +'hortEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#18#3 + +'Top'#2#4#5'Width'#2'F'#18'BorderSpacing.Left'#2#6#7'Caption'#6#10'ShortLabe' + +'l'#11'ParentColor'#8#0#0#5'TEdit'#9'ShortEdit'#22'AnchorSideLeft.Control'#7 + +#10'ShortLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Co' + +'ntrol'#7#13'ShortTabSheet'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2 + +'R'#6'Height'#2#27#3'Top'#2#0#5'Width'#3's'#2#7'Anchors'#11#5'akTop'#6'akLef' + +'t'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#2#8'On' + +'Change'#7#20'ShortEditEditingDone'#13'OnEditingDone'#7#20'ShortEditEditingD' + +'one'#8'TabOrder'#2#0#4'Text'#6#9'ShortEdit'#0#0#7'TButton'#12'CreateButton' + +#21'AnchorSideTop.Control'#7#8'LinkEdit'#18'AnchorSideTop.Side'#7#9'asrBotto' + +'m'#4'Left'#2#6#6'Height'#2#29#3'Top'#2'>'#5'Width'#2'b'#8'AutoSize'#9#20'Bo' + +'rderSpacing.Around'#2#6#7'Caption'#6#12'CreateButton'#7'OnClick'#7#17'Creat' + +'eButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#10'SaveButton'#22'AnchorSideLe' + +'ft.Control'#7#12'CreateButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'An' + +'chorSideTop.Control'#7#12'CreateButton'#4'Left'#2'n'#6'Height'#2#29#3'Top'#2 + +'>'#5'Width'#2'W'#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#10'S' + +'aveButton'#7'OnClick'#7#15'SaveButtonClick'#8'TabOrder'#2#2#0#0#5'TEdit'#8 + +'LinkEdit'#22'AnchorSideLeft.Control'#7#9'LinkLabel'#19'AnchorSideLeft.Side' + +#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'ShortEdit'#18'AnchorSideTop.Si' + +'de'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#13'ShortTabSheet'#20'Ancho' + +'rSideRight.Side'#7#9'asrBottom'#4'Left'#2'H'#6'Height'#2#27#3'Top'#2#29#5'W' + +'idth'#3'}'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing' + +'.Left'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#2#8'OnChange' + +#7#19'LinkEditEditingDone'#13'OnEditingDone'#7#19'LinkEditEditingDone'#8'Tab' + +'Order'#2#3#4'Text'#6#8'LinkEdit'#0#0#0#9'TTabSheet'#17'InheritedTabSheet'#7 + +'Caption'#6#17'InheritedTabSheet'#12'ClientHeight'#2'c'#11'ClientWidth'#3#199 + +#2#0#6'TLabel'#19'InheritedShortLabel'#4'Left'#2#0#6'Height'#2#14#3'Top'#2#2 + +#5'Width'#3#199#2#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#2#7'Caption'#6 + +#19'InheritedShortLabel'#11'ParentColor'#8#0#0#5'TEdit'#18'InheritedShortEdi' + +'t'#22'AnchorSideLeft.Control'#7#17'InheritedTabSheet'#21'AnchorSideTop.Cont' + +'rol'#7#19'InheritedShortLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anc' + +'horSideRight.Control'#7#17'InheritedTabSheet'#20'AnchorSideRight.Side'#7#9 + +'asrBottom'#4'Left'#2#0#6'Height'#2#27#3'Top'#2#18#5'Width'#3#199#2#7'Anchor' + +'s'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#2#8'ReadOnly' + +#9#8'TabOrder'#2#0#4'Text'#6#18'InheritedShortEdit'#0#0#7'TButton'#21'MoveTo' + +'InheritedButton'#21'AnchorSideTop.Control'#7#18'InheritedShortEdit'#18'Anch' + +'orSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#23#3'Top'#2'3'#5'Wid' + +'th'#3#140#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'Move' + +'ToInheritedButton'#7'OnClick'#7#26'MoveToInheritedButtonClick'#8'TabOrder'#2 + +#1#0#0#7'TButton'#23'CopyFromInheritedButton'#22'AnchorSideLeft.Control'#7#21 + +'MoveToInheritedButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSide' + +'Top.Control'#7#21'MoveToInheritedButton'#18'AnchorSideTop.Side'#7#9'asrCent' + +'er'#4'Left'#3#150#0#6'Height'#2#23#3'Top'#2'3'#5'Width'#3#151#0#8'AutoSize' + +#9#18'BorderSpacing.Left'#2#10#7'Caption'#6#23'CopyFromInheritedButton'#7'On' + +'Click'#7#28'CopyFromInheritedButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#24 + +'AddLinkToInheritedButton'#22'AnchorSideLeft.Control'#7#23'CopyFromInherited' + +'Button'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7 + +#23'CopyFromInheritedButton'#4'Left'#3'7'#1#6'Height'#2#23#3'Top'#2'3'#5'Wid' + +'th'#3#151#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#10#7'Caption'#6#24'AddLi' + +'nkToInheritedButton'#7'OnClick'#7#29'AddLinkToInheritedButtonClick'#8'TabOr' + ,'der'#2#3#0#0#0#9'TTabSheet'#13'DescrTabSheet'#7'Caption'#6#13'DescrTabSheet' + +#12'ClientHeight'#2'c'#11'ClientWidth'#3#199#2#0#5'TMemo'#9'DescrMemo'#4'Lef' + +'t'#2#0#6'Height'#2'_'#3'Top'#2#0#5'Width'#3#197#2#5'Align'#7#8'alClient'#19 + +'BorderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2#4#13'Lines.Strings'#1#6 + +#9'DescrMemo'#0#8'OnChange'#7#15'DescrMemoChange'#8'TabOrder'#2#0#0#0#0#9'TT' + +'abSheet'#14'ErrorsTabSheet'#7'Caption'#6#14'ErrorsTabSheet'#12'ClientHeight' + +#2'c'#11'ClientWidth'#3#199#2#0#5'TMemo'#10'ErrorsMemo'#4'Left'#2#0#6'Height' + +#2'_'#3'Top'#2#0#5'Width'#3#197#2#5'Align'#7#8'alClient'#19'BorderSpacing.Ri' + +'ght'#2#2#20'BorderSpacing.Bottom'#2#4#13'Lines.Strings'#1#6#10'ErrorsMemo'#0 + +#8'OnChange'#7#16'ErrorsMemoChange'#8'TabOrder'#2#0#0#0#0#9'TTabSheet'#15'Se' + +'eAlsoTabSheet'#7'Caption'#6#15'SeeAlsoTabSheet'#12'ClientHeight'#2'c'#11'Cl' + +'ientWidth'#3#199#2#0#5'TMemo'#11'SeeAlsoMemo'#4'Left'#2#0#6'Height'#2'c'#3 + +'Top'#2#0#5'Width'#3#199#2#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#11'S' + +'eeAlsoMemo'#0#13'OnEditingDone'#7#22'SeeAlsoMemoEditingDone'#8'TabOrder'#2#0 + +#0#0#0#9'TTabSheet'#15'ExampleTabSheet'#7'Caption'#6#15'ExampleTabSheet'#12 + +'ClientHeight'#2'c'#11'ClientWidth'#3#199#2#0#5'TEdit'#11'ExampleEdit'#4'Lef' + +'t'#2#0#6'Height'#2#27#3'Top'#2#0#5'Width'#3#197#2#5'Align'#7#5'alTop'#19'Bo' + +'rderSpacing.Right'#2#2#8'OnChange'#7#17'ExampleEditChange'#8'TabOrder'#2#0#4 + +'Text'#6#11'ExampleEdit'#0#0#7'TButton'#19'BrowseExampleButton'#21'AnchorSid' + +'eTop.Control'#7#11'ExampleEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'An' + +'chorSideRight.Control'#7#15'ExampleTabSheet'#20'AnchorSideRight.Side'#7#9'a' + +'srBottom'#4'Left'#3'<'#2#6'Height'#2#23#3'Top'#2'!'#5'Width'#3#133#0#7'Anch' + +'ors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7 + +'Caption'#6#19'BrowseExampleButton'#7'OnClick'#7#24'BrowseExampleButtonClick' + +#8'TabOrder'#2#1#0#0#0#0#6'TPanel'#12'LeftBtnPanel'#4'Left'#2#0#6'Height'#2 + +'~'#3'Top'#2#0#5'Width'#2#20#5'Align'#7#6'alLeft'#10'BevelOuter'#7#6'bvNone' + +#12'ClientHeight'#2'~'#11'ClientWidth'#2#20#11'FullRepaint'#8#14'ParentShowH' + +'int'#8#8'ShowHint'#9#8'TabOrder'#2#1#0#12'TSpeedButton'#16'BoldFormatButton' + +#4'Left'#2#0#6'Height'#2#23#3'Top'#2#0#5'Width'#2#20#5'Align'#7#5'alTop'#5'C' + +'olor'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0 + +#12'TSpeedButton'#18'ItalicFormatButton'#3'Tag'#2#1#4'Left'#2#0#6'Height'#2 + +#23#3'Top'#2'.'#5'Width'#2#20#5'Align'#7#5'alTop'#5'Color'#7#9'clBtnFace'#9 + +'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#21'U' + +'nderlineFormatButton'#3'Tag'#2#2#4'Left'#2#0#6'Height'#2#23#3'Top'#2#23#5'W' + +'idth'#2#20#5'Align'#7#5'alTop'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'O' + +'nClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#18'InsertVarTagButton' + +#3'Tag'#2#5#4'Left'#2#0#6'Height'#2#23#3'Top'#2'\'#5'Width'#2#20#5'Align'#7#5 +'alTop'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButto' - +'nClick'#0#0#12'TSpeedButton'#18'InsertVarTagButton'#3'Tag'#2#5#4'Left'#2#0#6 - +'Height'#2#23#3'Top'#2'\'#5'Width'#2#20#5'Align'#7#5'alTop'#5'Color'#7#9'clB' - +'tnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedBu' - +'tton'#26'InsertParagraphSpeedButton'#3'Tag'#2#6#4'Left'#2#0#6'Height'#2#23#3 - +'Top'#2'E'#5'Width'#2#20#5'Align'#7#5'alTop'#7'Caption'#6#1'P'#5'Color'#7#9 - +'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#0#6'TPan' - +'el'#13'RightBtnPanel'#4'Left'#2#20#6'Height'#2'~'#3'Top'#2#0#5'Width'#2#20#5 - +'Align'#7#6'alLeft'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'~'#11'Clie' - +'ntWidth'#2#20#8'TabOrder'#2#2#0#12'TSpeedButton'#21'InsertLinkSpeedButton'#4 - +'Left'#2#0#6'Height'#2#23#3'Top'#2#0#5'Width'#2#20#5'Align'#7#5'alTop'#7'Cap' - +'tion'#6#2'Li'#5'Color'#7#9'clBtnFace'#7'Enabled'#8#9'NumGlyphs'#2#0#7'OnCli' - +'ck'#7#26'InsertLinkSpeedButtonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0 - +#12'TSpeedButton'#19'InsertCodeTagButton'#3'Tag'#2#3#4'Left'#2#0#6'Height'#2 - +#23#3'Top'#2#23#5'Width'#2#20#5'Align'#7#5'alTop'#5'Color'#7#9'clBtnFace'#9 - +'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#8'ShowHint'#9#14'ParentSh' - +'owHint'#8#0#0#12'TSpeedButton'#18'InsertRemarkButton'#3'Tag'#2#4#4'Left'#2#0 - +#6'Height'#2#23#3'Top'#2'.'#5'Width'#2#20#5'Align'#7#5'alTop'#5'Color'#7#9'c' - +'lBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#8'ShowHint'#9 - +#14'ParentShowHint'#8#0#0#0#11'TOpenDialog'#10'OpenDialog'#5'Title'#6#17'Ope' - +'n example file'#6'Filter'#6#28'pascal file|*.pas; *.pp; *.p'#11'FilterIndex' - +#2#0#4'left'#3#240#0#3'top'#2#16#0#0#10'TPopupMenu'#10'PopupMenu1'#7'OnPopup' - +#7#15'PopupMenu1Popup'#4'left'#3#24#1#3'top'#2#16#0#9'TMenuItem'#24'CopyShor' - +'tToDescrMenuItem'#7'Caption'#6#24'CopyShortToDescrMenuItem'#7'OnClick'#7#29 - +'CopyShortToDescrMenuItemClick'#0#0#9'TMenuItem'#19'InsertPrintShortTag'#7'C' - +'aption'#6#19'InsertPrintShortTag'#7'OnClick'#7#24'InsertPrintShortTagClick' - +#0#0#0#0 + +'nClick'#0#0#12'TSpeedButton'#26'InsertParagraphSpeedButton'#3'Tag'#2#6#4'Le' + +'ft'#2#0#6'Height'#2#23#3'Top'#2'E'#5'Width'#2#20#5'Align'#7#5'alTop'#7'Capt' + +'ion'#6#1'P'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'Format' + +'ButtonClick'#0#0#0#6'TPanel'#13'RightBtnPanel'#4'Left'#2#20#6'Height'#2'~'#3 + +'Top'#2#0#5'Width'#2#20#5'Align'#7#6'alLeft'#10'BevelOuter'#7#6'bvNone'#12'C' + +'lientHeight'#2'~'#11'ClientWidth'#2#20#8'TabOrder'#2#2#0#12'TSpeedButton'#21 + +'InsertLinkSpeedButton'#4'Left'#2#0#6'Height'#2#23#3'Top'#2#0#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'InsertLinkSpeedButtonClick'#8'ShowHint'#9#14 + +'ParentShowHint'#8#0#0#12'TSpeedButton'#19'InsertCodeTagButton'#3'Tag'#2#3#4 + +'Left'#2#0#6'Height'#2#23#3'Top'#2#23#5'Width'#2#20#5'Align'#7#5'alTop'#5'Co' + +'lor'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#8'S' + +'howHint'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#18'InsertRemarkButton' + +#3'Tag'#2#4#4'Left'#2#0#6'Height'#2#23#3'Top'#2'.'#5'Width'#2#20#5'Align'#7#5 + +'alTop'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButto' + +'nClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#27'InsertPr' + +'intShortSpeedButton'#3'Tag'#2#7#4'Left'#2#0#6'Height'#2#23#3'Top'#2'E'#5'Wi' + +'dth'#2#20#7'Caption'#6#2'PS'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnC' + +'lick'#7#17'FormatButtonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#0#11'T' + +'OpenDialog'#10'OpenDialog'#5'Title'#6#17'Open example file'#6'Filter'#6#28 + +'pascal file|*.pas; *.pp; *.p'#11'FilterIndex'#2#0#4'left'#3#240#0#3'top'#2 + +#16#0#0#0 ]); diff --git a/ide/fpdoceditwindow.pas b/ide/fpdoceditwindow.pas index 26ecab1962..2a76e95fc7 100644 --- a/ide/fpdoceditwindow.pas +++ b/ide/fpdoceditwindow.pas @@ -84,8 +84,6 @@ type LeftBtnPanel: TPanel; LinkEdit: TEdit; LinkLabel: TLabel; - CopyShortToDescrMenuItem: TMenuItem; - PopupMenu1: TPopupMenu; SeeAlsoMemo: TMemo; MoveToInheritedButton: TButton; OpenDialog: TOpenDialog; @@ -96,8 +94,8 @@ type ShortEdit: TEdit; ShortLabel: TLabel; ShortTabSheet: TTabSheet; + InsertPrintShortSpeedButton: TSpeedButton; UnderlineFormatButton: TSpeedButton; - InsertPrintShortTag: TMenuItem; procedure AddLinkToInheritedButtonClick(Sender: TObject); procedure ApplicationIdle(Sender: TObject; var Done: Boolean); procedure BrowseExampleButtonClick(Sender: TObject); @@ -115,11 +113,9 @@ type procedure LinkEditEditingDone(Sender: TObject); procedure MoveToInheritedButtonClick(Sender: TObject); procedure PageControlChange(Sender: TObject); - procedure PopupMenu1Popup(Sender: TObject); procedure SaveButtonClick(Sender: TObject); procedure SeeAlsoMemoEditingDone(Sender: TObject); procedure ShortEditEditingDone(Sender: TObject); - procedure InsertPrintShortTagClick(Sender: TObject); private FCaretXY: TPoint; FModified: Boolean; @@ -222,6 +218,7 @@ begin InsertVarTagButton.Hint := lisCodeHelpHintVarTag; InsertParagraphSpeedButton.Hint := lisCodeHelpInsertParagraphFormattingTag; InsertLinkSpeedButton.Hint := lisCodeHelpInsertALink; + InsertPrintShortSpeedButton.Hint:=lisInsertPrintshortTag2; ShortLabel.Caption:=lisShort; LinkLabel.Caption:=lisLink; @@ -236,9 +233,6 @@ begin CopyFromInheritedButton.Caption:=lisLDCopyFromInherited; AddLinkToInheritedButton.Caption:=lisLDAddLinkToInherited; - CopyShortToDescrMenuItem.Caption:=lisAppendShortDescriptionToLongDescription; - InsertPrintShortTag.Caption:=lisInsertPrintShortTag; - Reset; CodeHelpBoss.AddHandlerOnChanging(@OnLazDocChanging); @@ -280,11 +274,14 @@ procedure TFPDocEditor.FormatButtonClick(Sender: TObject); procedure InsertTag(const StartTag, EndTag: String); begin if PageControl.ActivePage = ShortTabSheet then - ShortEdit.SelText := StartTag + ShortEdit.SelText + EndTag; - if PageControl.ActivePage = DescrTabSheet then - DescrMemo.SelText := StartTag + DescrMemo.SelText + EndTag; - if PageControl.ActivePage = ErrorsTabSheet then - ErrorsMemo.SelText := StartTag + ErrorsMemo.SelText + EndTag; + ShortEdit.SelText := StartTag + ShortEdit.SelText + EndTag + else if PageControl.ActivePage = DescrTabSheet then + DescrMemo.SelText := StartTag + DescrMemo.SelText + EndTag + else if PageControl.ActivePage = ErrorsTabSheet then + ErrorsMemo.SelText := StartTag + ErrorsMemo.SelText + EndTag + else + exit; + Modified:=true; end; begin @@ -310,6 +307,10 @@ begin //paragraph tag 6: InsertTag('

', '

'); + //printshort + 7: + if (fChain<>nil) and (fChain.Count>0) then + InsertTag('',''); end; end; @@ -429,14 +430,6 @@ begin UpdateButtons; end; -procedure TFPDocEditor.PopupMenu1Popup(Sender: TObject); -begin - CopyShortToDescrMenuItem.Visible:= - (PageControl.ActivePage = DescrTabSheet) - or (PageControl.ActivePage = ShortTabSheet); - InsertPrintShortTag.Visible := CopyShortToDescrMenuItem.Visible; -end; - procedure TFPDocEditor.SaveButtonClick(Sender: TObject); begin Save; @@ -454,14 +447,6 @@ begin Modified:=true; end; -procedure TFPDocEditor.InsertPrintShortTagClick(Sender: TObject); -const - cPrintShort = ''; -begin - DescrMemo.SelText:=Format(cPrintShort, [fChain[0].ElementName]); - Modified:=true; -end; - function TFPDocEditor.GetContextTitle(Element: TCodeHelpElement): string; // get codetools path. for example: TButton.Align begin diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 9bbfe65e87..489701eacc 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -4251,6 +4251,7 @@ resourcestring lisEveryNThLineNumber = 'Every n-th line number:'; lisLink = 'Link:'; lisShort = 'Short:'; + lisInsertPrintshortTag2 = 'Insert printshort tag'; lisDeleteOldFile2 = 'Delete old file?'; lisTheUnitSearchPathOfContainsTheSourceDirectoryOfPac = 'The unit search ' +'path of %s%s%s contains the source directory %s%s%s of package %s';