Changeset 492

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.

Location:

trunk

Files:

• NewView/MainForm.pas (modified) (7 diffs)
• NewView/VersionUnit.pas (modified) (1 diff)
• NewView/newview.scu (modified) ( previous)
• Sibyl/SPCC/FORMS.PAS (modified) (11 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,

trunk/NewView/VersionUnit.pas

@@ -17 +17 @@
 
 const
-  Version =        'V2.19.8b';  // $SS_REQUIRE_NEW_VERSION$
-  BldLevelVersion = '2.19.8b';  // Embedded for IBM BLDLEVEL tool
+  Version =        'V2.19.8d';  // $SS_REQUIRE_NEW_VERSION$
+  BldLevelVersion = '2.19.8d';  // Embedded for IBM BLDLEVEL tool
   CopyrightMsg = 'Copyright 2005 Aaron Lawrence; 2006-2019 Ronald Brill';
   LicenseMsg   = 'Licensed under the GNU Public License';

trunk/Sibyl/SPCC/FORMS.PAS

@@ -7 +7 @@
  º                                                                          º
  ÈÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍŒ}
-                             
+
 Unit Forms;
 
@@ -2057 +2057 @@
          FOnCreate:TNotifyEvent;
          FOnDestroy:TNotifyEvent;
+         FSysModalWin:HWnd;      // [ALT 2023-12-27]
          Procedure CMRelease(Var Msg:TMessage); Message CM_RELEASE;
          Procedure CMEndModalState(Var Msg:TMessage); Message CM_ENDMODALSTATE;
@@ -2464 +2465 @@
 // This is not functionally needed but prevents unnecessary GpiDeleteSetId calls
 // which fail and therefore make it more difficult to test for real problems.
-// Probably not safe to leave in due to incompatibility between components 
+// Probably not safe to leave in due to incompatibility between components
 // and IDE  - AaronL
 //         FFontSet:boolean;
@@ -5416 +5417 @@
           Begin
                FFont.Destroy;
-               FFont := nil; // AaronL - need to set ffont to nil 
+               FFont := nil; // AaronL - need to set ffont to nil
           End;
      End;
@@ -6213 +6214 @@
    CurrentModalFrame:HWND=0;
    DesktopHWND:HWND=0;
-   ModalList:TList=NIL;   
+   ModalList:TList=NIL;
 
 {$HINTS OFF}
@@ -6274 +6275 @@
 Begin
      MyPID := GetCurrentProcessID;
-     
+
      // Get the count of switch list items
      SwitchListCount := WinQuerySwitchList( AppHandle, nil, 0 );
@@ -6281 +6282 @@
      // Allocate buffer
      GetMem( pSwitchListInfo, BufferSize );
-     
+
      // Call WinQuerySwitchList again to get the switch list items
      WinQuerySwitchList( AppHandle, pSwitchListInfo^, BufferSize );
-     
+
      for i := 0 to SwitchListCount - 1 do
      begin
@@ -6293 +6294 @@
                     // This switch entry is for this application
                     if swctl.hwnd = Exclude.FFrame.Handle then
-                         continue;                    
+                         continue;
                     // so show/hide it
                     if Show then
@@ -6301 +6302 @@
                     WinChangeSwitchEntry( hswitch,
                                           swctl );
-                                         
+
                end;
           end;
@@ -7965 +7966 @@
           If OnDismissDlg <> Nil Then OnDismissDlg(Self);
           If FModalResult <> cmNull Then EndModalState;
+
+          // [20231227 ALT] Restore any previous system-modal window
+          if FSysModalWin <> NULLHANDLE then
+              WinSetSysModalWindow( HWND_DESKTOP, FSysModalWin );
      End;
 End;
@@ -8508 +8513 @@
      Show;
      BringToFront;
+
+     // [ALT 20231227]
+     FSysModalWin := WinQuerySysModalWindow( HWND_DESKTOP );
+     if FSysModalWin <> NULLHANDLE then
+          WinSetSysModalWindow( HWND_DESKTOP, Frame.Handle );
 
 again: