diff --git a/doceditor/fpdocupdater/fpdocfiles.pas b/doceditor/fpdocupdater/fpdocfiles.pas index a6c61ebcc3..82a7d22e10 100644 --- a/doceditor/fpdocupdater/fpdocfiles.pas +++ b/doceditor/fpdocupdater/fpdocfiles.pas @@ -27,8 +27,9 @@ unit FPDocFiles; interface uses - Classes, SysUtils, Contnrs, FileUtil, DOM, XMLWrite, XMLRead, - LazUtf8; + Classes, SysUtils, Contnrs, + // LazUtils + FileUtil, DOM, XMLWrite, XMLRead, LazUtf8, LazLoggerBase; type TFPDocInfo = record @@ -298,8 +299,6 @@ const implementation -uses LCLProc; - function DbgS(const AInfo: TFPDocInfo): String; begin Result := diff --git a/doceditor/fpdocupdater/fpdocupdater.lpi b/doceditor/fpdocupdater/fpdocupdater.lpi index d1f2b565ac..c0e0596110 100644 --- a/doceditor/fpdocupdater/fpdocupdater.lpi +++ b/doceditor/fpdocupdater/fpdocupdater.lpi @@ -1,34 +1,37 @@ - + + - - - - - - - + + + + + + + + + @@ -38,7 +41,7 @@ - + @@ -67,6 +70,11 @@ + + + + + @@ -80,6 +88,9 @@ + + + diff --git a/doceditor/fpdocupdater/fpdocupdater.lpr b/doceditor/fpdocupdater/fpdocupdater.lpr index f10a0e6f10..ab855b12a3 100644 --- a/doceditor/fpdocupdater/fpdocupdater.lpr +++ b/doceditor/fpdocupdater/fpdocupdater.lpr @@ -8,7 +8,7 @@ uses {$ENDIF}{$ENDIF} Interfaces, // this includes the LCL widgetset Forms, - MainUnit, UnitMove, UnitSummary; + MainUnit, UnitMove, UnitSummary, FPDocFiles; begin Application.Initialize; diff --git a/doceditor/fpdocupdater/mainunit.lfm b/doceditor/fpdocupdater/mainunit.lfm index 705f9f15f0..6de0511d8c 100644 --- a/doceditor/fpdocupdater/mainunit.lfm +++ b/doceditor/fpdocupdater/mainunit.lfm @@ -1,28 +1,27 @@ object FormMain: TFormMain Left = 253 - Height = 528 + Height = 542 Top = 138 Width = 598 HorzScrollBar.Page = 597 VertScrollBar.Page = 527 - ActiveControl = EditDocs Caption = 'FPDoc Updater' - ClientHeight = 528 + ClientHeight = 542 ClientWidth = 598 Constraints.MinHeight = 525 Constraints.MinWidth = 300 OnCreate = FormCreate OnDestroy = FormDestroy OnShow = FormShow - LCLVersion = '1.3' + LCLVersion = '2.3.0.0' object LabelDocs: TLabel AnchorSideTop.Control = EditDocs AnchorSideTop.Side = asrCenter AnchorSideRight.Control = EditDocs - Left = 72 - Height = 15 - Top = 15 - Width = 101 + Left = 70 + Height = 19 + Top = 18 + Width = 103 Anchors = [akTop, akRight] BorderSpacing.Right = 7 Caption = 'FPDoc files path:' @@ -32,10 +31,10 @@ object FormMain: TFormMain AnchorSideTop.Control = EditUnits AnchorSideTop.Side = asrCenter AnchorSideRight.Control = EditUnits - Left = 107 - Height = 15 - Top = 49 - Width = 66 + Left = 105 + Height = 19 + Top = 58 + Width = 68 Anchors = [akTop, akRight] BorderSpacing.Right = 7 Caption = 'Units path:' @@ -44,20 +43,24 @@ object FormMain: TFormMain object LabelBackup: TLabel AnchorSideLeft.Control = ListBox AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = CheckBoxBackup + AnchorSideTop.Side = asrBottom Left = 426 - Height = 15 - Top = 252 - Width = 111 + Height = 19 + Top = 271 + Width = 113 BorderSpacing.Left = 6 + BorderSpacing.Top = 9 Caption = 'Backup extension:' ParentColor = False end object LabelPackage: TLabel AnchorSideLeft.Control = ListBox AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = ListBox Left = 426 - Height = 15 - Top = 161 + Height = 19 + Top = 170 Width = 54 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -68,10 +71,10 @@ object FormMain: TFormMain AnchorSideTop.Control = EditMakeSkel AnchorSideTop.Side = asrCenter AnchorSideRight.Control = EditMakeSkel - Left = 54 - Height = 15 - Top = 114 - Width = 119 + Left = 50 + Height = 19 + Top = 136 + Width = 123 Anchors = [akTop, akRight] BorderSpacing.Right = 7 Caption = 'MakeSkel tool path:' @@ -81,10 +84,10 @@ object FormMain: TFormMain AnchorSideTop.Control = EditInclude AnchorSideTop.Side = asrCenter AnchorSideRight.Control = EditInclude - Left = 65 - Height = 15 - Top = 83 - Width = 108 + Left = 63 + Height = 19 + Top = 98 + Width = 110 Anchors = [akTop, akRight] BorderSpacing.Right = 7 Caption = 'Include files path:' @@ -92,7 +95,7 @@ object FormMain: TFormMain end object EditDocs: TDirectoryEdit Left = 180 - Height = 21 + Height = 31 Top = 12 Width = 368 ShowHidden = False @@ -110,25 +113,28 @@ object FormMain: TFormMain AnchorSideRight.Control = EditDocs AnchorSideRight.Side = asrBottom Left = 180 - Height = 21 - Top = 46 + Height = 31 + Top = 52 Width = 368 ShowHidden = False ButtonWidth = 45 NumGlyphs = 1 Anchors = [akTop, akLeft, akRight] - BorderSpacing.Top = 13 + BorderSpacing.Top = 9 MaxLength = 0 TabOrder = 1 OnChange = EditUnitsChange end object ButtonUpdate: TButton AnchorSideLeft.Control = ButtonRefresh + AnchorSideTop.Control = ButtonRefresh + AnchorSideTop.Side = asrBottom Left = 426 Height = 25 - Top = 396 + Top = 428 Width = 122 Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 15 BorderSpacing.InnerBorder = 4 Caption = 'Update' OnClick = ButtonUpdateClick @@ -136,11 +142,14 @@ object FormMain: TFormMain end object ButtonUpdateAll: TButton AnchorSideLeft.Control = ButtonUpdateNew + AnchorSideTop.Control = ButtonUpdateNew + AnchorSideTop.Side = asrBottom Left = 426 Height = 25 - Top = 468 + Top = 496 Width = 122 Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 9 BorderSpacing.InnerBorder = 4 Caption = 'Update All' OnClick = ButtonUpdateAllClick @@ -148,11 +157,14 @@ object FormMain: TFormMain end object ButtonUpdateNew: TButton AnchorSideLeft.Control = ButtonUpdate + AnchorSideTop.Control = ButtonUpdate + AnchorSideTop.Side = asrBottom Left = 426 Height = 25 - Top = 432 + Top = 462 Width = 122 Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 9 BorderSpacing.InnerBorder = 4 Caption = 'Update New' Font.Color = clRed @@ -163,37 +175,47 @@ object FormMain: TFormMain object ButtonRefresh: TButton AnchorSideLeft.Control = ListBox AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = CheckBoxShowSummary + AnchorSideTop.Side = asrBottom Left = 426 Height = 25 - Top = 354 + Top = 388 Width = 122 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 + BorderSpacing.Top = 25 BorderSpacing.InnerBorder = 4 Caption = 'Refresh' OnClick = ButtonRefreshClick TabOrder = 5 end object ListBox: TListBox + AnchorSideTop.Control = EditMakeSkel + AnchorSideTop.Side = asrBottom Left = 11 Height = 339 - Top = 156 + Top = 170 Width = 409 Anchors = [akTop, akLeft, akRight, akBottom] + BorderSpacing.Top = 9 ItemHeight = 0 MultiSelect = True OnDrawItem = ListBoxDrawItem Style = lbOwnerDrawFixed TabOrder = 6 + TopIndex = -1 end object CheckBoxBackup: TCheckBox AnchorSideLeft.Control = ListBox AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = EditPackage + AnchorSideTop.Side = asrBottom Left = 426 - Height = 20 - Top = 222 - Width = 139 + Height = 21 + Top = 241 + Width = 140 BorderSpacing.Left = 6 + BorderSpacing.Top = 15 Caption = 'Backup FPDoc files' Checked = True State = cbChecked @@ -202,24 +224,30 @@ object FormMain: TFormMain object EditBackup: TEdit AnchorSideLeft.Control = ListBox AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = LabelBackup + AnchorSideTop.Side = asrBottom Left = 444 - Height = 21 - Top = 276 + Height = 31 + Top = 296 Width = 80 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 24 + BorderSpacing.Top = 6 TabOrder = 8 Text = 'bak' end object EditPackage: TEdit AnchorSideLeft.Control = ListBox AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = LabelPackage + AnchorSideTop.Side = asrBottom Left = 444 - Height = 21 - Top = 186 + Height = 31 + Top = 195 Width = 80 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 24 + BorderSpacing.Top = 6 TabOrder = 9 Text = 'lcl' end @@ -230,8 +258,8 @@ object FormMain: TFormMain AnchorSideRight.Control = EditInclude AnchorSideRight.Side = asrBottom Left = 180 - Height = 21 - Top = 111 + Height = 31 + Top = 130 Width = 368 DialogOptions = [] FilterIndex = 0 @@ -250,32 +278,35 @@ object FormMain: TFormMain AnchorSideRight.Control = EditUnits AnchorSideRight.Side = asrBottom Left = 180 - Height = 21 - Top = 80 + Height = 31 + Top = 92 Width = 368 ShowHidden = False ButtonWidth = 45 NumGlyphs = 1 Anchors = [akTop, akLeft, akRight] - BorderSpacing.Top = 13 + BorderSpacing.Top = 9 MaxLength = 0 TabOrder = 11 end object StatusBar: TStatusBar Left = 0 - Height = 20 - Top = 508 + Height = 21 + Top = 521 Width = 598 Panels = <> end object CheckBoxShowSummary: TCheckBox AnchorSideLeft.Control = ListBox AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = EditBackup + AnchorSideTop.Side = asrBottom Left = 426 - Height = 20 - Top = 312 - Width = 118 + Height = 21 + Top = 342 + Width = 120 BorderSpacing.Left = 6 + BorderSpacing.Top = 15 Caption = 'Show summary' Checked = True State = cbChecked @@ -286,7 +317,7 @@ object FormMain: TFormMain DefaultExt = '.xml' Filter = 'FPDoc file (*.xml)|*.xml|All files|*.*' Options = [ofFileMustExist, ofEnableSizing, ofViewDetail] - left = 24 - top = 168 + Left = 24 + Top = 168 end end diff --git a/doceditor/fpdocupdater/mainunit.pas b/doceditor/fpdocupdater/mainunit.pas index 7c48bac85f..e937f7e848 100644 --- a/doceditor/fpdocupdater/mainunit.pas +++ b/doceditor/fpdocupdater/mainunit.pas @@ -27,10 +27,13 @@ unit MainUnit; interface uses - Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, - FPDocFiles, StdCtrls, ComCtrls, FileUtil, ExtCtrls, - LCLIntf, LCLType, LCLProc, Process, UTF8Process, EditBtn, Laz_XMLCfg, - LazUtf8, LazFileUtils; + Classes, SysUtils, Process, + // LCL + Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls, ExtCtrls, EditBtn, + LResources, LCLIntf, LCLType, + // LazUtils + UTF8Process, Laz_XMLCfg, LazUtf8, FileUtil, LazFileUtils, LazLoggerBase, + FPDocFiles; type