Changeset 829 for cprs/trunk/CPRS-Chart/Orders/fOMNavA.pas

Timestamp:

Jul 7, 2010, 4:31:10 PM (14 years ago)

Author:

Kevin Toppenberg

Message:

Upgrade to version 27

File:

• cprs/trunk/CPRS-Chart/Orders/fOMNavA.pas (modified) (12 diffs)

cprs/trunk/CPRS-Chart/Orders/fOMNavA.pas

@@ -7 +7 @@
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  Buttons, Grids, StdCtrls, ORCtrls, ExtCtrls, uConst, rOrders, uOrders, fFrame;
+  Buttons, Grids, StdCtrls, ORCtrls, ExtCtrls, uConst, rOrders, uOrders, fFrame, fBase508Form,
+  VA508AccessibilityManager;
 
 type
-  TfrmOMNavA = class(TForm)
+  TfrmOMNavA = class(TfrmBase508Form)
     pnlTool: TPanel;
     cmdDone: TORAlignButton;
@@ -16 +17 @@
     cmdPrev: TBitBtn;
     cmdNext: TBitBtn;
+    accEventsGrdMenu: TVA508ComponentAccessibility;
     procedure FormActivate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
@@ -42 +44 @@
       Shift: TShiftState);
     procedure FormResize(Sender: TObject);
+    procedure accEventsGrdMenuCaptionQuery(Sender: TObject;
+      var Text: string);
+    procedure accEventsGrdMenuValueQuery(Sender: TObject;
+      var Text: string);
   private
     FOrderingMenu: Integer;
@@ -88 +94 @@
 
 uses rODBase, ORFn, fODBase,fODGen, fODAuto, fOMVerify, uCore, rMisc, uODBase,
-  fOrders, uAccessibleStringGrid;
+  fOrders, VAUtils;
 
 const
@@ -271 +277 @@
   NoFresh := True;
   ResizeFont;
-  TAccessibleStringGrid.WrapControl(grdMenu);
+//  TAccessibleStringGrid.WrapControl(grdMenu);
 end;
 
@@ -288 +294 @@
 end;
 
+procedure TfrmOMNavA.accEventsGrdMenuCaptionQuery(Sender: TObject;
+  var Text: string);
+begin
+  Text := pnlTool.Caption;
+end;
+
 procedure TfrmOMNavA.FormDestroy(Sender: TObject);
 var
@@ -294 +306 @@
   OrderMenuItem: TOrderMenuItem;
 begin
-  TAccessibleStringGrid.UnwrapControl(grdMenu);
+//  TAccessibleStringGrid.UnwrapControl(grdMenu);
   ClearMenuGrid;
   for i := 0 to FMenuHits.Count - 1 do
@@ -371 +383 @@
       if Selected    then
       begin
-         if ColorToRGB(clWindowText) = ColorToRGB(clBlack) then
-          Font.Color := clBlue;
+        Font.Color := Get508CompliantColor(clBlue);
         Font.Style := Font.Style + [fsUnderline];
       end;
@@ -470 +481 @@
     //frmFrame.UpdatePtInfoOnRefresh;
     FOrderMenuItem := TOrderMenuItem(Objects[Col, Row]);
-    if FOrderMenuItem.Display > 0 then FOrderMenuItem := nil;          // display only
+    if Assigned(FOrderMenuItem) then
+      if FOrderMenuItem.Display > 0 then FOrderMenuItem := nil;          // display only
     if FOrderMenuItem <> nil then
     begin
@@ -624 +636 @@
     Result := False;
     InfoBox(x, TC_DISABLED, MB_OK);
+  end;
+end;
+
+procedure TfrmOMNavA.accEventsGrdMenuValueQuery(Sender: TObject;
+  var Text: string);
+var
+  OrderMenuItem : TOrderMenuItem;
+begin
+  inherited;
+  if grdMenu.Objects[grdMenu.Col, grdMenu.Row] is TOrderMenuItem then begin
+    OrderMenuItem := TOrderMenuItem(grdMenu.Objects[grdMenu.Col, grdMenu.Row]);
+    if OrderMenuItem.AutoAck then
+      Text := 'Auto Accept, '+ OrderMenuItem.ItemText;
   end;
 end;
@@ -660 +685 @@
        end; {'M'}
   'Q': ActivateOrderDialog(IntToStr(AnItem.IEN), FDelayEvent, Self, 0);
-  'P': ShowMessage('Order Dialogs of type "Prompt" cannot be processed.');
+  'P': ShowMsg('Order Dialogs of type "Prompt" cannot be processed.');
   'O': begin
          // disable initially, since the 1st item in the set may be a menu
@@ -667 +692 @@
            then Self.Enabled := True;
        end;
-  else ShowMessage('Unknown Order Dialog type: ' + AnItem.DlgType);
+  else ShowMsg('Unknown Order Dialog type: ' + AnItem.DlgType);
   end; {case}
 end;