Changeset 492 for trunk/NewView/MainForm.pas

Timestamp:

Dec 28, 2023, 3:58:08 AM (20 months ago)

Author:

ataylor

Message:

Add system modal handling logic to TForm class and update NewView.

File:

• trunk/NewView/MainForm.pas (modified) (7 diffs)

trunk/NewView/MainForm.pas

@@ -520 +520 @@
     Procedure DoFind( FindOrigin: TFindOrigin );
 
+    // ALT 2023-12-24
+    Procedure CheckSetSysModal(FormWindow: TForm);
+    Procedure CheckUnsetSysModal;
+
     // Bookmarks ------------------------------------------
 
@@ -3736 +3740 @@
 
   // [20231023 ALT] Restore any previous system-modal window state
+  {
   if g_LastSysModalWindow <> NULLHANDLE then
   begin
     WinSetSysModalWindow( HWND_DESKTOP, g_LastSysModalWindow );
   end;
+  }
+  CheckUnsetSysModal;
 
   // TODO rbri maybe we have to do this
@@ -4363 +4370 @@
   StartingUp := false;
 
-  // ALT 20231023 handle system modal owner
+  // [ALT 20231023] handle system modal owner
   g_LastSysModalWindow := WinQuerySysModalWindow( HWND_DESKTOP );
+  {
   if g_LastSysModalWindow <> NULLHANDLE then
   begin
     WinSetSysModalWindow( HWND_DESKTOP, Frame.Handle );
   end;
+  }
+  // [ALT 2023-12-26] move above to procedure
+  CheckSetSysModal(Self);
 
   LogEvent(LogStartup, 'RUN PROGRAM');
@@ -4690 +4701 @@
     EndUpdate;
   end;
+//  CheckSetSysModal(InformationForm);
   InformationForm.ShowModal;
+//  CheckSetSysModal(Self);
 End;
 
@@ -5152 +5165 @@
   end;
 
+  // [ALT 2023-12-26] Disable certain items when running sysmodal
+  if g_LastSysModalWindow <> NULLHANDLE then
+  begin
+    OpenMI.Enabled := false;
+    OpenSpecialMI.Enabled := false;
+    FileSaveAsMI.Enabled := false;
+    PrintMI.Enabled := false;
+//    FileInformationMI.Enabled := false;
+    SaveAsIPFMI.Enabled := false;
+    EditGlobalSearchMI.Enabled := false;
+    GlobalSearchMI.Enabled := false;
+    AddNoteMI.Enabled := false;
+    DebugSaveLanguageFileMI.Enabled := false;
+    DebugLoadLanguageMI.Enabled := false;
+
+    Coolbar.Sections[ ciOpen ].Disabled := true;
+    Coolbar.Sections[ ciPrint ].Disabled := true;
+    Coolbar.Sections[ ciAddNote ].Disabled := true;
+  end;
 
 end;
@@ -6201 +6233 @@
 begin
   NoteSelected:= NotesListBox.ItemIndex <> -1;
-  EditNoteButton.Enabled:= NoteSelected;
   GotoNoteButton.Enabled:= NoteSelected;
-  DeleteNoteButton.Enabled:= NoteSelected;
-  AddNoteButton.Enabled := CurrentOpenFiles.Count > 0;
+  if g_LastSysModalWindow <> NULLHANDLE then
+  begin
+    AddNoteButton.Enabled := false;
+    EditNoteButton.Enabled := false;
+    DeleteNoteButton.Enabled := false;
+  end
+  else
+  begin
+    EditNoteButton.Enabled:= NoteSelected;
+    DeleteNoteButton.Enabled:= NoteSelected;
+    AddNoteButton.Enabled := CurrentOpenFiles.Count > 0;
+  end;
 end;
 
@@ -7176 +7217 @@
 end;
 
+
+Procedure TMainForm.CheckSetSysModal(FormWindow: TForm);
+begin
+  // Override any existing system-modal state
+  if g_LastSysModalWindow <> NULLHANDLE then
+  begin
+    WinSetSysModalWindow( HWND_DESKTOP, FormWindow.Frame.Handle );
+  end;
+end;
+
+
+Procedure TMainForm.CheckUnsetSysModal;
+begin
+  // Restore any previous system-modal window state
+  if g_LastSysModalWindow <> NULLHANDLE then
+  begin
+    WinSetSysModalWindow( HWND_DESKTOP, g_LastSysModalWindow );
+  end;
+end;
+
 Initialization
   RegisterClasses ([TMainForm, TSplitBar,