Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/EditTextU.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/EditTextU.pas (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/EditTextU.pas (revision 793) @@ -101,5 +101,6 @@ cmd := 'GET ONE WP FIELD^' + FileNum + '^' + FieldNum + '^' + IENS; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 if piece(RPCResult,'^',1)='-1' then begin @@ -131,9 +132,10 @@ RPCBrokerV.param[0].ptype := list; cmd := 'POST WP FIELD^' + FileNum + '^' + FieldNum + '^' + IENS; - RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; + RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; for i := 0 to Lines.Count-1 do begin - RPCBrokerV.Param[0].Mult['"' + IntToStr(i+1) + '"'] := Lines.Strings[i]; + RPCBrokerV.Param[0].Mult['"' + IntToStr(i+1) + '"'] := Lines.Strings[i]; end; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 if piece(RPCResult,'^',1)='-1' then begin Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/FMErrorU.dfm =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/FMErrorU.dfm (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/FMErrorU.dfm (revision 793) @@ -1,5 +1,5 @@ object FMErrorForm: TFMErrorForm - Left = 1217 - Top = 320 + Left = 247 + Top = 195 Width = 482 Height = 417 Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/TMGHTML2.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/TMGHTML2.pas (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/TMGHTML2.pas (revision 793) @@ -122,4 +122,5 @@ function MoveCaretToEnd : boolean; function MoveCaretToPos(ScreenPos: TPoint) : HRESULT; //kt added + procedure InsertHTMLAtCaret(HTMLText : AnsiString); //kt 4/21/10 procedure InsertTextAtCaret(Text : AnsiString); //Note: Text is NOT HTMLtext property HTMLText:string read GetHTMLText write SetHTMLText; @@ -691,4 +692,12 @@ end; +procedure THtmlObj.InsertHTMLAtCaret(HTMLText : AnsiString); +var + Range: IHTMLTxtRange; +begin + Range:= GetTextRange; + Range.pasteHTML(HTMLText); +end; + procedure THtmlObj.InsertTextAtCaret(Text : AnsiString); //kt added. Note: inserts external format (not HTML markup) @@ -754,6 +763,11 @@ procedure THtmlObj.SubMessageHandler(var Msg: TMessage); //Called from parent's EDMessageHandler, or from GlobalMsgHandler + +const + FontSizes : array [0..6] of byte = (8,10,12,14,18,24,36); + var i : Integer; WinControl : TWinControl; + TextSize : integer; begin @@ -820,4 +834,13 @@ Msg.Result := 1; //Handled end; + $31..$38 : begin + if CtrlToBeProcessed = true then begin + TextSize := Msg.WParam-$31; + if (TextSize >= 0) and (TextSize <=6 ) then begin + SetFontSize(FontSizes[TextSize]); + CtrlToBeProcessed := False; + end; + end; + end; { VK_RETURN : if CtrlReturnToBeProcessed then begin @@ -854,4 +877,48 @@ Msg.Result := 1; //Handled end; + Ord('Q') : if CtrlToBeProcessed then begin + //kt if not FEditable then exit; + Outdent; + Msg.Result := 1; //Handled + exit; + end; + Ord('W') : if CtrlToBeProcessed then begin + //kt if not FEditable then exit; + Indent; + Msg.Result := 1; //Handled + exit; + end; + Ord('D') : if CtrlToBeProcessed then begin + //kt if not FEditable then exit; + FontDialog; + Msg.Result := 1; //Handled + exit; + end; + { + Ord('.') : if CtrlToBeProcessed then begin + //kt if not FEditable then exit; + ToggleBullet; + Msg.Result := 1; //Handled + exit; + end; + Ord('N') : if CtrlToBeProcessed then begin + //kt if not FEditable then exit; + ToggleNumbering; + Msg.Result := 1; //Handled + exit; + end; + Ord(';') : if CtrlToBeProcessed then begin + //kt if not FEditable then exit; + TextForeColorDialog; + Msg.Result := 1; //Handled + exit; + end; + Ord('''') : if CtrlToBeProcessed then begin + //kt if not FEditable then exit; + TextBackColorDialog; + Msg.Result := 1; //Handled + exit; + end; + } end; {case} end; Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/TMGHTML2.~pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/TMGHTML2.~pas (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/TMGHTML2.~pas (revision 793) @@ -60,6 +60,5 @@ FEditable: boolean; ColorDialog: TColorDialog; - AllowNextBlur : boolean; - procedure SetMsgActive (Active : boolean); + AllowNextBlur : boolean; function GetHTMLText:string; procedure SetHTMLText(HTML:String); @@ -91,11 +90,12 @@ public {end public} - PopupMenu: TPopupMenu; + PopupMenu: TPopupMenu; KeyStruck : boolean; // A VERY crude determiner as to if Modified. NextControl : TWinControl; PrevControl : TWinControl; - constructor Create(Owner:TControl; Application : TApplication); + procedure SetMsgActive (Active : boolean); + constructor Create(Owner:TControl; Application : TApplication); destructor Destroy; override; - procedure Clear; + procedure Clear; procedure ToggleBullet; procedure ToggleItalic; @@ -122,4 +122,5 @@ function MoveCaretToEnd : boolean; function MoveCaretToPos(ScreenPos: TPoint) : HRESULT; //kt added + procedure InsertHTMLAtCaret(HTMLText : AnsiString); //kt 4/21/10 procedure InsertTextAtCaret(Text : AnsiString); //Note: Text is NOT HTMLtext property HTMLText:string read GetHTMLText write SetHTMLText; @@ -689,4 +690,12 @@ Result := FCaret.MoveCaretToPointer(FTMGDisplayPointer,Integer(True),CARET_DIRECTION_INDETERMINATE); FCaret.Show(Integer(True)); +end; + +procedure THtmlObj.InsertHTMLAtCaret(HTMLText : AnsiString); +var + Range: IHTMLTxtRange; +begin + Range:= Self.GetTextRange; + Range.pasteHTML(HTMLText); end; Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/LookupU.dfm =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/LookupU.dfm (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/LookupU.dfm (revision 793) @@ -1,5 +1,5 @@ object FieldLookupForm: TFieldLookupForm - Left = 1376 - Top = 349 + Left = 451 + Top = 232 Width = 302 Height = 169 Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/LookupU.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/LookupU.pas (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/LookupU.pas (revision 793) @@ -111,5 +111,6 @@ cmd := cmd + '^' + FileNum + '^' + StartFrom + '^' + IntToStr(Direction); RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 if piece(RPCResult,'^',1)='-1' then begin Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/PostU.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/PostU.pas (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/PostU.pas (revision 793) @@ -106,5 +106,6 @@ RPCBrokerV.Param[0].Mult[IntToStr(i)] := FChanges.Strings[i]; end; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 if piece(RPCResult,'^',1)='1' then begin Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/SubfilesU.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/SubfilesU.pas (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/SubfilesU.pas (revision 793) @@ -203,5 +203,6 @@ cmd := 'GET SUB RECS LIST' + '^' + SubFileNum + '^' + ParentIENS; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 if piece(RPCResult,'^',1)='-1' then begin Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtAdd.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtAdd.pas (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtAdd.pas (revision 793) @@ -479,5 +479,6 @@ //CheckPost('PtType',PtType); - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; tempS := RPCBrokerV.Results.Strings[0]; tempResult := strtoint(piece(tempS,'^',1)); Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtDemoEdit.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtDemoEdit.pas (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtDemoEdit.pas (revision 793) @@ -592,6 +592,7 @@ RPCBrokerV.remoteprocedure := 'TMG GET PATIENT DEMOGRAPHICS'; RPCBrokerV.param[0].value := Patient.DFN; RPCBrokerV.param[0].ptype := literal; - RPCBrokerV.Call; - + //RPCBrokerV.Call; + CallBroker; + with FServerPatientInfo do begin //Store results in a hash table for easier random access @@ -743,5 +744,6 @@ end; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; if RPCBrokerV.Results.Strings[0]<>'1' then begin MessageDlg(RPCBrokerV.Results.Strings[0],mtError,[mbOK],0); @@ -1463,5 +1465,6 @@ cmd := 'GET ONE RECORD^2^' + IENS; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 //Results[1]='FileNum^IENS^FieldNum^ExtValue^FieldName^DDInfo... @@ -1642,5 +1645,6 @@ RPCBrokerV.param[0].ptype := list; RPCBrokerV.Param[0].Mult['"REQUEST"'] := 'IS WP FIELD^' + FileNum + '^' + FieldNum; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 if piece(RPCResult,'^',1)='-1' then begin @@ -1833,5 +1837,6 @@ cmd := 'GET ONE RECORD^' + FileNum + '^' + IENS; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 if piece(RPCResult,'^',1)='-1' then begin Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fWebTab.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fWebTab.pas (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fWebTab.pas (revision 793) @@ -68,5 +68,11 @@ RPCBrokerV.Param[1].Value := 'R'; RPCBrokerV.Param[1].ptype := literal; - RPCResult := RPCBrokerV.StrCall; {returns 1 if available, 0 if not available} + //RPCResult := RPCBrokerV.StrCall; {returns 1 if available, 0 if not available} + CallBroker; + if RPCBrokerV.Results.Count > 0 then begin + RPCResult := RPCBrokerV.Results.Strings[0]; + end else begin + RPCResult := ''; + end; TMG_URL_RPC_Checked := true; TMG_URL_RPC_Available := (RPCResult='1'); @@ -76,5 +82,6 @@ if (URLList <> nil) then begin RPCBrokerV.remoteprocedure := 'TMG CPRS GET URL LIST'; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; URLList.Assign(RPCBrokerV.Results); if RPCBrokerV.Results.Count>0 then Result := RPCBrokerV.Results.Strings[0] Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/frmImageTransferProgress.dfm =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/frmImageTransferProgress.dfm (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/frmImageTransferProgress.dfm (revision 793) @@ -1,9 +1,9 @@ object ImageTransferForm: TImageTransferForm - Left = 348 - Top = 212 + Left = 341 + Top = 256 BorderStyle = bsToolWindow Caption = 'Image Transfer Progress' - ClientHeight = 86 - ClientWidth = 276 + ClientHeight = 108 + ClientWidth = 265 Color = clBtnFace Font.Charset = DEFAULT_CHARSET @@ -277,4 +277,13 @@ TabOrder = 0 end + object btnCancel: TButton + Left = 80 + Top = 80 + Width = 75 + Height = 25 + Caption = '&Cancel' + TabOrder = 1 + Visible = False + end object DKLanguageController1: TDKLanguageController Left = 176 @@ -282,7 +291,8 @@ LangData = { 1100496D6167655472616E73666572466F726D01010000000100000007004361 - 7074696F6E010400000006004C6162656C310101000000020000000700436170 + 7074696F6E010500000006004C6162656C310101000000020000000700436170 74696F6E000600496D6167653100000B0050726F67726573734D736701010000 - 0003000000070043617074696F6E000B0050726F67726573734261720000} + 0003000000070043617074696F6E000B0050726F677265737342617200000900 + 62746E43616E63656C010100000004000000070043617074696F6E00} end end Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/frmImageTransferProgress.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/frmImageTransferProgress.pas (revision 729) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/frmImageTransferProgress.pas (revision 793) @@ -16,4 +16,5 @@ ProgressMsg: TLabel; DKLanguageController1: TDKLanguageController; + btnCancel: TButton; private { Private declarations }