* Load file from command-line if set

git-svn-id: trunk@57585 -

components/fpreport/design/frmfpreportdesignermain.pp

@@ -292,6 +292,7 @@ type
     procedure VAlignExecute(Sender: TObject);
     procedure VResizeExecute(Sender: TObject);
   private
+    FInitialFileName: String;
     FLoadModified : Boolean;
     FStopDesigning: Boolean;
     MRUMenuManager1: TMRUMenuManager;
@@ -317,6 +318,7 @@ type
     procedure GetReportDataNames(Sender: TObject; List: TStrings);
     procedure InitialiseData;
 {$ENDIF}
+    procedure CheckLoadInitialFile;
     function CreateNewPage: TFPReportCustomPage;
     procedure DoPaste(Sender: TObject);
     procedure DoReportChangedByDesigner(Sender: TObject);
@@ -363,10 +365,12 @@ type
     function PageDesigner(Aindex : Integer) : TFPReportDesignerControl;
     Property Modified : Boolean Read GetModified Write SetModified;
   public
+  Public
     procedure ResetModified; virtual;
     procedure DesignReport; virtual;
     procedure StopDesigning; virtual;
     procedure PreviewReport; virtual;
+    procedure LoadReportFromFile(const AFileName: String);
     function NewReport: Boolean; virtual;
     Function SaveReport : Boolean; virtual;
     function OpenReport: Boolean; virtual;
@@ -381,6 +385,7 @@ type
     Property OnNewReport : TNotifyEvent Read FOnNewReport Write FOnNewReport;
     Property OnOpenReport : TNotifyEvent Read FOnOpenReport Write FOnOpenReport;
     Property AutoSaveOnClose : Boolean Read FAutoSaveOnClose Write FAutoSaveOnClose;
+    Property InitialFileName : String Read FInitialFileName Write FInitialFileName;
   end;
 
 Const
@@ -554,10 +559,31 @@ begin
 end;
 
 procedure TFPReportDesignerForm.FormShow(Sender: TObject);
+
+
 begin
+  CheckLoadInitialFile;
   SBReport.Refresh;
 end;
 
+procedure TFPReportDesignerForm.CheckLoadInitialFile;
+
+Var
+  FN : String;
+
+begin
+  if (InitialFileName<>'') then
+    begin
+    FN:=InitialFileName;
+    InitialFileName:='';
+    if FileExists(FN) then
+      begin
+      LoadReportFromFile(FN);
+      DesignReport;
+      end;
+    end;
+end;
+
 procedure TFPReportDesignerForm.DesignReport;
 
 Var
@@ -1753,22 +1779,25 @@ begin
       ODReport.FileName:=Self.FileName;
     Result:=ODReport.Execute;
     if Result then
-      begin
+      LoadReportFromFile(ODReport.FileName);
-      StopDesigning;
-      LoadDesignFromFile(ODReport.FileName);
-      SetFileCaption(ODReport.FileName);
-      if Assigned(MRUMenuManager1) then
-        begin
-        MRUMenuManager1.AddToRecent(ODReport.FileName);
-        MRUMenuManager1.SaveRecentFilesToIni;
-        end;
-
-      end;
     end;
   If Result then
     DesignReport;
 end;
 
+Procedure TFPReportDesignerForm.LoadReportFromFile(Const AFileName : String);
+
+begin
+  StopDesigning;
+  LoadDesignFromFile(AFileName);
+  SetFileCaption(AFileName);
+  if Assigned(MRUMenuManager1) then
+    begin
+    MRUMenuManager1.AddToRecent(AFileName);
+    MRUMenuManager1.SaveRecentFilesToIni;
+    end;
+end;
+
 procedure TFPReportDesignerForm.StopDesigning;
 
 Var

components/fpreport/design/reportdesign.lpi

@@ -23,9 +23,16 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
+      <local>
+        <CommandLineParams Value="/home/michael/testcopypaste.json"/>
+      </local>
       <FormatVersion Value="2"/>
       <Modes Count="1">
-        <Mode0 Name="default"/>
+        <Mode0 Name="default">
+          <local>
+            <CommandLineParams Value="/home/michael/testcopypaste.json"/>
+          </local>
+        </Mode0>
       </Modes>
     </RunParams>
     <RequiredPackages Count="6">

components/fpreport/design/reportdesign.lpr

@@ -116,6 +116,9 @@ begin
   Application.Initialize;
   Application.CreateForm(TFPReportDesignerForm,FPReportDesignerForm);
   Application.Scaled:=False;
+  if (ParamCount>0) then
+    FPReportDesignerForm.InitialFileName:=ParamStr(1);
+  // Improve this to check for options ?
   Application.Run;
 end.