UPD: Use FPC resources for forms

src/fAbout.pas

@@ -62,6 +62,8 @@ procedure ShowAboutBox;
 
 implementation
 
+{$R *.lfm}
+
 uses
   dmHelpManager, uDCVersion;
 
@@ -158,7 +160,4 @@ begin
   lblWidgetsetVer.Caption    := WSVersion;
 end;
 
-initialization
- {$I fAbout.lrs}
-
 end.

src/fFileOpDlg.pas

@@ -97,6 +97,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
    dmCommonData, uLng, uDCUtils,
    uFileSourceOperationTypes,
@@ -639,7 +641,4 @@ begin
     end;
 end;
 
-initialization
- {$I fFileOpDlg.lrs}
-
 end.

src/fFindDlg.pas

@@ -174,6 +174,8 @@ function ShowDefineTemplateDlg(out TemplateName: UTF8String): Boolean;
 
 implementation
 
+{$R *.lfm}
+
 uses
   LCLProc, LCLType, LConvEncoding, StrUtils, HelpIntfs, fCalendar, fViewer, fMain,
   uLng, uGlobs, uShowForm, uOSUtils, uSearchTemplate, uDCUtils,
@@ -1006,9 +1008,6 @@ begin
   edtAttrib.Text := sAttr;
 end;
 
-initialization
- {$I fFindDlg.lrs}
-
 finalization
   if Assigned(frmFindDlg) then
     FreeAndNil(frmFindDlg);

src/fattributesedit.pas

@@ -100,6 +100,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 procedure TfrmAttributesEdit.btnOkClick(Sender: TObject);
 begin
   if Assigned(FOnOk) then
@@ -238,8 +240,5 @@ begin
   end;
 end;
 
-initialization
-  {$I fattributesedit.lrs}
-
 end.
 

src/fcalendar.pas

@@ -26,6 +26,8 @@ function ShowCalendarDialog(ADate: String; APosition: TPoint): String;
 
 implementation
 
+{$R *.lfm}
+
 function ShowCalendarDialog(ADate: String; APosition: TPoint): String;
 var
   dtDate: TDateTime;
@@ -78,8 +80,5 @@ begin
   end;
 end;
 
-initialization
-  {$I fcalendar.lrs}
-
 end.
 

src/fchecksumcalc.pas

@@ -58,6 +58,8 @@ function ShowCalcCheckSum(var sFileName: UTF8String; out SeparateFile: Boolean;
 
 implementation
 
+{$R *.lfm}
+
 uses
   uGlobs;
 
@@ -107,8 +109,5 @@ begin
   cmbHashAlgorithmChange(cmbHashAlgorithm);
 end;
 
-initialization
-  {$I fchecksumcalc.lrs}
-
 end.
 

src/fchecksumverify.pas

@@ -48,6 +48,8 @@ procedure ShowVerifyCheckSum(const VerifyResult: TStringList);
 
 implementation
 
+{$R *.lfm}
+
 procedure ShowVerifyCheckSum(const VerifyResult: TStringList);
 begin
   with TfrmCheckSumVerify.Create(Application) do
@@ -59,8 +61,5 @@ begin
   end;
 end;
 
-initialization
-  {$I fchecksumverify.lrs}
-
 end.
 

src/fcopymovedlg.pas

@@ -85,6 +85,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   fMain, LCLType, uGlobs, uFileSourceOperationOptions, uLng;
 
@@ -466,6 +468,4 @@ begin
   end;
 end;
 
-initialization
- {$I fcopymovedlg.lrs}
 end.

src/fdescredit.pas

@@ -55,6 +55,8 @@ function ShowDescrEditDlg(sFileName: String): Boolean;
 
 implementation
 
+{$R *.lfm}
+
 uses
   LConvEncoding;
 
@@ -108,8 +110,5 @@ begin
   memDescr.Lines.Text:= FDescr.ReadDescription(lblFileName.Caption);
 end;
 
-initialization
-  {$I fdescredit.lrs}
-
 end.
 

src/feditor.pas

@@ -180,6 +180,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   dmCommonData, dmHigh, uLng,
   SynEditHighlighter, uShowMsg, fMsg, fEditSearch,
@@ -812,7 +814,4 @@ begin
       mnuMenuItem.Items[I].Checked:= True;
 end;
 
-initialization
- {$I feditor.lrs}
-
 end.

src/fhardlink.pas

@@ -36,6 +36,8 @@ function ShowHardLinkForm(const sExistingFile, sLinkToCreate, CurrentPath: Strin
 
 implementation
 
+{$R *.lfm}
+
 uses
   FileUtil, uLng, uGlobs, uLog, uShowMsg, uOSUtils, uDCUtils;
 
@@ -117,7 +119,4 @@ begin
   edtLinkToCreate.SelectAll;
 end;
 
-initialization
- {$I fhardlink.lrs}
- 
-end.
+end.

src/fmain.pas

@@ -617,6 +617,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 uses
   LCLIntf, Dialogs, uGlobs, uLng, fConfigToolBar, uMasks, fCopyMoveDlg, uQuickViewPanel,
   uShowMsg, fHotDir, uDCUtils, uLog, uGlobsPaths, LCLProc, uOSUtils, uOSForms, uPixMapManager,
@@ -4470,6 +4472,4 @@ begin
   UpdateDiskCount;
 end;
 
-initialization
- {$I fmain.lrs}
 end.

src/foptions.pas

@@ -539,6 +539,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 uses
   uLng, uGlobsPaths, uPixMapManager, fMain, LCLProc, LCLVersion,
   uColorExt, uDCUtils, uOSUtils, fColumnsSetConf, uShowMsg, uShowForm,
@@ -3107,7 +3109,4 @@ begin
   gbViewerBookMode.Visible := (ExtTool = etViewer);
 end;
 
-initialization
- {$I fOptions.lrs}
-
 end.

src/fsymlink.pas

@@ -36,6 +36,8 @@ function ShowSymLinkForm(const sExistingFile, sLinkToCreate, CurrentPath: String
 
 implementation
 
+{$R *.lfm}
+
 uses
   FileUtil, uLng, uGlobs, uLog, uShowMsg, uOSUtils, uDCUtils;
 
@@ -117,7 +119,4 @@ begin
   edtLinkToCreate.SelectAll;
 end;
 
-initialization
- {$I fsymlink.lrs}
-
-end.
+end.

src/fviewer.pas

@@ -273,6 +273,8 @@ procedure ShowViewer(const FilesToView:TStringList; const aFileSource: IFileSour
 
 implementation
 
+{$R *.lfm}
+
 uses
   FileUtil, IntfGraphics, uLng, uShowMsg, uGlobs, LCLType, LConvEncoding, uClassesEx,
   uFindMmap, uDCUtils, LCLIntf;
@@ -2108,8 +2110,5 @@ begin
   end;
 end;
 
-initialization
- {$I fviewer.lrs}
-
 end.
 

src/newdesign/fviewoperations.pas

@@ -76,6 +76,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 uses
   uFileSourceOperationTypes,
   uLng, fFileOpDlg, uGlobs;
@@ -382,8 +384,5 @@ begin
   sboxOperations.Invalidate;     // force redraw
 end;
 
-initialization
-  {$I fviewoperations.lrs}
-
 end.
-
+