Merge pull request #10137 from keymanapp/fix/developer/10003-opening-…

…multiple-kpj fix(developer): prevent opening .kpj in multiple processes 🦕
keymanapp · Dec 6, 2023 · 4c7b799 · 4c7b799
2 parents 56d5f37 + 4641684
commit 4c7b799
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/developer/src/tike/actions/dmActionsMain.pas b/developer/src/tike/actions/dmActionsMain.pas
@@ -576,16 +576,15 @@ procedure TmodActionsMain.actProjectCloseUpdate(Sender: TObject);
 
 procedure TmodActionsMain.actProjectNewExecute(Sender: TObject);
 begin
+  // TODO: new process
   if not frmKeymanDeveloper.BeforeOpenProject then
     Exit;
   ShowNewProjectForm(frmKeymanDeveloper);
 end;
 
 procedure TmodActionsMain.actProjectOpenAccept(Sender: TObject);
 begin
-  if not frmKeymanDeveloper.BeforeOpenProject then
-    Exit;
-  OpenProject(actProjectOpen.Dialog.FileName);
+  frmKeymanDeveloper.OpenProject(actProjectOpen.Dialog.FileName);
 end;
 
 procedure TmodActionsMain.OpenProject(FileName: WideString);

diff --git a/developer/src/tike/main/UfrmMain.pas b/developer/src/tike/main/UfrmMain.pas
@@ -444,6 +444,7 @@   TfrmKeymanDeveloper = class(TTikeForm, IUnicodeDataUIManager, IDragDrop)
     procedure RefreshOptions;
 
     function OpenEditor(FFileName: string; frmClass: TfrmTikeEditorClass): TfrmTikeEditor;
+    procedure OpenProject(const filename: string);
     function OpenFile(FFileName: string; FCloseNewFile: Boolean): TfrmTikeChild;
     procedure OpenFilesInProject(FFileNames: TArray<string>);
 
@@ -1563,11 +1564,22 @@ procedure TfrmKeymanDeveloper.mnuProjectClick(Sender: TObject);
 end;
 
 procedure TfrmKeymanDeveloper.mnuProjectRecentFileClick(Sender: TObject);
+var
+  filename: string;
 begin
-  with Sender as TMenuItem do
+  filename := (Sender as TMenuItem).Hint;
+  OpenProject(filename);
+end;
+
+procedure TfrmKeymanDeveloper.OpenProject(const filename: string);
+begin
+  if IsGlobalProjectUIReady then
+  begin
+    OpenFilesInProject([filename]);
+  end
+  else if BeforeOpenProject then
   begin
-    if BeforeOpenProject then
-      modActionsMain.OpenProject(Hint);
+    modActionsMain.OpenProject(filename);
   end;
 end;
 

diff --git a/developer/src/tike/project/Keyman.Developer.System.Project.ProjectFiles.pas b/developer/src/tike/project/Keyman.Developer.System.Project.ProjectFiles.pas
@@ -70,5 +70,7 @@ initialization
   RegisterProjectFileType('.html', TOpenableProjectFile);  // I1769
   RegisterProjectFileType('.xml', TOpenableProjectFile);   // I1769
   RegisterProjectFileType('.js', TOpenableProjectFile);
+  RegisterProjectFileType('.kpj', TOpenableProjectFile);
+  RegisterProjectFileType('.user', TOpenableProjectFile);
 end.
 
diff --git a/developer/src/tike/project/Keyman.Developer.UI.Project.ProjectFilesUI.pas b/developer/src/tike/project/Keyman.Developer.UI.Project.ProjectFilesUI.pas
@@ -146,8 +146,11 @@ function TOpenableProjectFileUI.GetProjectFile: TOpenableProjectFile;
 procedure TOpenableProjectFileUI.OpenFile;
 begin
   FMDIChild := frmKeymanDeveloper.OpenFile(ProjectFile.FileName, False);
-  FMDIChild.OnCloseFile := CloseFile;
-  FMDIChild.ProjectFile := ProjectFile;
+  if Assigned(FMDIChild) then
+  begin
+    FMDIChild.OnCloseFile := CloseFile;
+    FMDIChild.ProjectFile := ProjectFile;
+  end;
 end;
 
 function TOpenableProjectFileUI.WindowOpen: Boolean;