diff --git a/components/externhelp/externhelpfrm.lfm b/components/externhelp/externhelpfrm.lfm index d33d2e6b15..7c6b5f2a5c 100644 --- a/components/externhelp/externhelpfrm.lfm +++ b/components/externhelp/externhelpfrm.lfm @@ -1,12 +1,14 @@ -inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame +object ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame + Left = 0 Height = 384 + Top = 0 Width = 581 ClientHeight = 384 ClientWidth = 581 TabOrder = 0 DesignLeft = 358 DesignTop = 166 - object ItemsTreeView: TTreeView[0] + object ItemsTreeView: TTreeView AnchorSideLeft.Control = Owner AnchorSideTop.Control = Owner AnchorSideRight.Control = Splitter1 @@ -19,7 +21,7 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame BorderSpacing.Left = 6 BorderSpacing.Top = 6 BorderSpacing.Bottom = 6 - DefaultItemHeight = 15 + DefaultItemHeight = 16 ParentShowHint = False ShowHint = True TabOrder = 0 @@ -31,7 +33,7 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame OnSelectionChanged = ItemsTreeViewSelectionChanged OnStartDrag = ItemsTreeViewStartDrag end - object AddSpeedButton: TSpeedButton[1] + object AddSpeedButton: TSpeedButton AnchorSideLeft.Control = Owner AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom @@ -41,13 +43,12 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame Width = 23 Anchors = [akLeft, akBottom] BorderSpacing.Around = 6 - Color = clBtnFace NumGlyphs = 0 OnClick = AddSpeedButtonClick ShowHint = True ParentShowHint = False end - object DeleteSpeedButton: TSpeedButton[2] + object DeleteSpeedButton: TSpeedButton AnchorSideLeft.Control = AddSpeedButton AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = AddSpeedButton @@ -55,34 +56,33 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame Height = 22 Top = 356 Width = 23 - Color = clBtnFace NumGlyphs = 0 OnClick = DeleteSpeedButtonClick ShowHint = True ParentShowHint = False end - object NameLabel: TLabel[3] + object NameLabel: TLabel AnchorSideLeft.Control = Splitter1 AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = Owner Left = 235 - Height = 14 + Height = 15 Top = 20 - Width = 53 + Width = 64 BorderSpacing.Left = 6 BorderSpacing.Top = 20 Caption = 'NameLabel' ParentColor = False end - object NameEdit: TEdit[4] + object NameEdit: TEdit AnchorSideLeft.Control = NameLabel AnchorSideTop.Control = NameLabel AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 235 - Height = 21 - Top = 34 + Height = 24 + Top = 35 Width = 340 Anchors = [akTop, akLeft, akRight] BorderSpacing.Right = 6 @@ -91,27 +91,27 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame TabOrder = 1 Text = 'NameEdit' end - object FilenameLabel: TLabel[5] + object FilenameLabel: TLabel AnchorSideLeft.Control = NameLabel AnchorSideTop.Control = NameEdit AnchorSideTop.Side = asrBottom Left = 235 - Height = 14 - Top = 70 - Width = 68 + Height = 15 + Top = 74 + Width = 81 BorderSpacing.Top = 15 Caption = 'FilenameLabel' ParentColor = False end - object FilenameEdit: TEdit[6] + object FilenameEdit: TEdit AnchorSideLeft.Control = FilenameLabel AnchorSideTop.Control = FilenameLabel AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 235 - Height = 21 - Top = 84 + Height = 24 + Top = 89 Width = 346 Anchors = [akTop, akLeft, akRight] OnChange = FilenameEditChange @@ -119,34 +119,34 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame TabOrder = 2 Text = 'FilenameEdit' end - object URLLabel: TLabel[7] + object URLLabel: TLabel AnchorSideLeft.Control = NameLabel AnchorSideTop.Control = WithSubDirsCheckBox AnchorSideTop.Side = asrBottom Left = 235 - Height = 14 - Top = 160 - Width = 45 + Height = 15 + Top = 176 + Width = 53 BorderSpacing.Top = 15 Caption = 'URLLabel' ParentColor = False end - object HelpBitBtn: TBitBtn[8] + object HelpBitBtn: TBitBtn AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom - Left = 500 - Height = 23 - Top = 355 - Width = 75 + Left = 506 + Height = 26 + Top = 352 + Width = 69 Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Around = 6 Caption = 'HelpBitBtn' TabOrder = 3 end - object Splitter1: TSplitter[9] + object Splitter1: TSplitter AnchorSideTop.Control = ItemsTreeView AnchorSideBottom.Control = ItemsTreeView AnchorSideBottom.Side = asrBottom @@ -157,32 +157,32 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame Align = alNone Anchors = [akTop, akLeft, akBottom] end - object StoreLabel: TLabel[10] + object StoreLabel: TLabel AnchorSideLeft.Control = NameLabel AnchorSideTop.Control = URLMemo AnchorSideTop.Side = asrBottom Left = 235 - Height = 14 - Top = 252 - Width = 52 + Height = 15 + Top = 269 + Width = 60 BorderSpacing.Top = 15 Caption = 'StoreLabel' ParentColor = False end - object StoreComboBox: TComboBox[11] + object StoreComboBox: TComboBox AnchorSideLeft.Control = StoreLabel AnchorSideTop.Control = StoreLabel AnchorSideTop.Side = asrBottom Left = 235 - Height = 21 - Top = 266 + Height = 27 + Top = 284 Width = 157 - ItemHeight = 13 + ItemHeight = 0 OnEditingDone = StoreComboBoxEditingDone TabOrder = 5 Text = 'StoreComboBox' end - object FileBrowseButton: TButton[12] + object FileBrowseButton: TButton AnchorSideLeft.Control = FilenameEdit AnchorSideTop.Control = FilenameEdit AnchorSideTop.Side = asrBottom @@ -190,9 +190,9 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame AnchorSideBottom.Control = FilenameEdit AnchorSideBottom.Side = asrBottom Left = 235 - Height = 23 - Top = 105 - Width = 61 + Height = 26 + Top = 113 + Width = 52 AutoSize = True BorderSpacing.Right = 6 Caption = 'Browse' @@ -201,23 +201,23 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame ShowHint = True TabOrder = 6 end - object FileMacrofyButton: TButton[13] + object FileUseMacrosButton: TButton AnchorSideLeft.Control = FileBrowseButton AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = FilenameEdit AnchorSideTop.Side = asrBottom - Left = 302 - Height = 23 - Top = 105 - Width = 113 + Left = 293 + Height = 26 + Top = 113 + Width = 126 AutoSize = True - Caption = 'FileMacrofyButton' - OnClick = FileMacrofyButtonClick + Caption = 'FileUseMacrosButton' + OnClick = FileUseMacrosButtonClick ParentShowHint = False ShowHint = True TabOrder = 7 end - object URLMemo: TMemo[14] + object URLMemo: TMemo AnchorSideLeft.Control = URLLabel AnchorSideTop.Control = URLLabel AnchorSideTop.Side = asrBottom @@ -225,7 +225,7 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame AnchorSideRight.Side = asrBottom Left = 235 Height = 63 - Top = 174 + Top = 191 Width = 346 Anchors = [akTop, akLeft, akRight] Lines.Strings = ( @@ -234,26 +234,26 @@ inherited ExternHelpGeneralOptsFrame: TExternHelpGeneralOptsFrame OnEditingDone = URLMemoEditingDone TabOrder = 8 end - object WithSubDirsCheckBox: TCheckBox[15] + object WithSubDirsCheckBox: TCheckBox AnchorSideLeft.Control = FileBrowseButton AnchorSideTop.Control = FileBrowseButton AnchorSideTop.Side = asrBottom Left = 235 - Height = 17 - Top = 128 - Width = 123 + Height = 22 + Top = 139 + Width = 145 Caption = 'WithSubDirsCheckBox' OnEditingDone = WithSubDirsCheckBoxEditingDone TabOrder = 9 end - object SelEditorFileButton: TButton[16] - AnchorSideLeft.Control = FileMacrofyButton + object SelEditorFileButton: TButton + AnchorSideLeft.Control = FileUseMacrosButton AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = FileMacrofyButton - Left = 421 - Height = 23 - Top = 105 - Width = 116 + AnchorSideTop.Control = FileUseMacrosButton + Left = 425 + Height = 26 + Top = 113 + Width = 115 AutoSize = True BorderSpacing.Left = 6 Caption = 'SelEditorFileButton' diff --git a/components/externhelp/externhelpfrm.pas b/components/externhelp/externhelpfrm.pas index 2fdf4d9807..352a04a6cd 100644 --- a/components/externhelp/externhelpfrm.pas +++ b/components/externhelp/externhelpfrm.pas @@ -57,7 +57,7 @@ resourcestring ehrsBrowseForPath = 'Browse for path'; ehrsGeneral = 'General'; ehrsBrowse = 'Browse ...'; - ehrsMacrofy = 'Macrofy'; + ehrsMacrofy = 'Use macros'; ehrsReplaceCommonDirectoriesWithMacros = 'Replace common directories with ' +'macros'; ehrsEditorFile = 'Editor file ...'; @@ -200,7 +200,7 @@ type AddSpeedButton: TSpeedButton; SelEditorFileButton: TButton; WithSubDirsCheckBox: TCheckBox; - FileMacrofyButton: TButton; + FileUseMacrosButton: TButton; DeleteSpeedButton: TSpeedButton; FileBrowseButton: TButton; FilenameEdit: TEdit; @@ -217,7 +217,7 @@ type procedure AddSpeedButtonClick(Sender: TObject); procedure DeleteSpeedButtonClick(Sender: TObject); procedure FileBrowseButtonClick(Sender: TObject); - procedure FileMacrofyButtonClick(Sender: TObject); + procedure FileUseMacrosButtonClick(Sender: TObject); procedure FilenameEditChange(Sender: TObject); procedure FilenameEditEditingDone(Sender: TObject); procedure ItemsTreeViewDragOver(Sender, Source: TObject; X, Y: Integer; @@ -770,7 +770,7 @@ begin end; end; -procedure TExternHelpGeneralOptsFrame.FileMacrofyButtonClick(Sender: TObject); +procedure TExternHelpGeneralOptsFrame.FileUseMacrosButtonClick(Sender: TObject); var Filename: String; begin @@ -1168,8 +1168,8 @@ begin DeleteSpeedButton.Hint:=ehrsDeleteItem; FileBrowseButton.Caption:=ehrsBrowse; FileBrowseButton.Hint:=ehrsBrowseForPath; - FileMacrofyButton.Caption:=ehrsMacrofy; - FileMacrofyButton.Hint:=ehrsReplaceCommonDirectoriesWithMacros; + FileUseMacrosButton.Caption:=ehrsMacrofy; + FileUseMacrosButton.Hint:=ehrsReplaceCommonDirectoriesWithMacros; SelEditorFileButton.Caption:=ehrsEditorFile; SelEditorFileButton.Hint:=ehrsSelectAFileFromTheSourceEditor; WithSubDirsCheckBox.Caption:=ehrsIncludeSubDirectories; diff --git a/components/externhelp/languages/externhelpfrm.de.po b/components/externhelp/languages/externhelpfrm.de.po index 775c8c2fb5..5ea131d103 100644 --- a/components/externhelp/languages/externhelpfrm.de.po +++ b/components/externhelp/languages/externhelpfrm.de.po @@ -62,7 +62,7 @@ msgid "Include sub directories" msgstr "Unterverzeichnisse einbeziehen" #: externhelpfrm.ehrsmacrofy -msgid "Macrofy" +msgid "Use macros" msgstr "" #: externhelpfrm.ehrsmysettings diff --git a/components/externhelp/languages/externhelpfrm.it.po b/components/externhelp/languages/externhelpfrm.it.po index b2b55c6a81..c705dcbdfd 100644 --- a/components/externhelp/languages/externhelpfrm.it.po +++ b/components/externhelp/languages/externhelpfrm.it.po @@ -1,4 +1,4 @@ -# Massimo Soricetti , 2011. + Massimo Soricetti , 2011. msgid "" msgstr "" "PO-Revision-Date: 2011-04-18 11:31+0200\n" @@ -64,7 +64,9 @@ msgid "Include sub directories" msgstr "Includi sottocartelle" #: externhelpfrm.ehrsmacrofy -msgid "Macrofy" +#, fuzzy +#| msgid "Macrofy" +msgid "Use macros" msgstr "Macrifica" #: externhelpfrm.ehrsmysettings diff --git a/components/externhelp/languages/externhelpfrm.po b/components/externhelp/languages/externhelpfrm.po index 424e864a4f..95085b0dd9 100644 --- a/components/externhelp/languages/externhelpfrm.po +++ b/components/externhelp/languages/externhelpfrm.po @@ -54,7 +54,7 @@ msgid "Include sub directories" msgstr "" #: externhelpfrm.ehrsmacrofy -msgid "Macrofy" +msgid "Use macros" msgstr "" #: externhelpfrm.ehrsmysettings diff --git a/components/externhelp/languages/externhelpfrm.pt.po b/components/externhelp/languages/externhelpfrm.pt.po index c5711bda25..63fa6ddb82 100644 --- a/components/externhelp/languages/externhelpfrm.pt.po +++ b/components/externhelp/languages/externhelpfrm.pt.po @@ -62,7 +62,9 @@ msgid "Include sub directories" msgstr "Inclua sub diretórios" #: externhelpfrm.ehrsmacrofy -msgid "Macrofy" +#, fuzzy +#| msgid "Macrofy" +msgid "Use macros" msgstr "\"Macrofy\"" #: externhelpfrm.ehrsmysettings diff --git a/components/externhelp/languages/externhelpfrm.pt_BR.po b/components/externhelp/languages/externhelpfrm.pt_BR.po index c5711bda25..63fa6ddb82 100644 --- a/components/externhelp/languages/externhelpfrm.pt_BR.po +++ b/components/externhelp/languages/externhelpfrm.pt_BR.po @@ -62,7 +62,9 @@ msgid "Include sub directories" msgstr "Inclua sub diretórios" #: externhelpfrm.ehrsmacrofy -msgid "Macrofy" +#, fuzzy +#| msgid "Macrofy" +msgid "Use macros" msgstr "\"Macrofy\"" #: externhelpfrm.ehrsmysettings diff --git a/components/externhelp/languages/externhelpfrm.ru.po b/components/externhelp/languages/externhelpfrm.ru.po index 2d6e247882..8dbd24a522 100644 --- a/components/externhelp/languages/externhelpfrm.ru.po +++ b/components/externhelp/languages/externhelpfrm.ru.po @@ -62,7 +62,9 @@ msgid "Include sub directories" msgstr "Искать в подкаталогах" #: externhelpfrm.ehrsmacrofy -msgid "Macrofy" +#, fuzzy +#| msgid "Macrofy" +msgid "Use macros" msgstr "Макросы" #: externhelpfrm.ehrsmysettings diff --git a/components/externhelp/languages/externhelpfrm.uk.po b/components/externhelp/languages/externhelpfrm.uk.po index bf2e4178a6..bb4abf579c 100644 --- a/components/externhelp/languages/externhelpfrm.uk.po +++ b/components/externhelp/languages/externhelpfrm.uk.po @@ -62,7 +62,9 @@ msgid "Include sub directories" msgstr "Включити підтеки" #: externhelpfrm.ehrsmacrofy -msgid "Macrofy" +#, fuzzy +#| msgid "Macrofy" +msgid "Use macros" msgstr "Перетворити в макрос" #: externhelpfrm.ehrsmysettings