|
@@ -1335,8 +1335,20 @@ var
|
|
fError: TForm;
|
|
fError: TForm;
|
|
memo: TMemo;
|
|
memo: TMemo;
|
|
doFound, somethingDone: boolean;
|
|
doFound, somethingDone: boolean;
|
|
|
|
+ tmi: TTopMostInfo;
|
|
begin
|
|
begin
|
|
p := nil;
|
|
p := nil;
|
|
|
|
+
|
|
|
|
+ if ToolManager.TextShadow then
|
|
|
|
+ begin
|
|
|
|
+ //text shadow will be replaced in the future so do not allow it
|
|
|
|
+ if ToolManager.ToolProvideCommand(tcFinish) then
|
|
|
|
+ ToolManager.ToolCommand(tcFinish);
|
|
|
|
+ ToolManager.TextShadow := false;
|
|
|
|
+ end;
|
|
|
|
+
|
|
|
|
+ tmi := HideTopmost;
|
|
|
|
+ if Assigned(FMain) then FMain.Enabled:= false;
|
|
try
|
|
try
|
|
p := TPythonScript.Create;
|
|
p := TPythonScript.Create;
|
|
FScriptName := AFilename;
|
|
FScriptName := AFilename;
|
|
@@ -1371,6 +1383,8 @@ begin
|
|
end;
|
|
end;
|
|
end;
|
|
end;
|
|
p.Free;
|
|
p.Free;
|
|
|
|
+ if Assigned(FMain) then FMain.Enabled:= true;
|
|
|
|
+ ShowTopmost(tmi);
|
|
//ensure we are out of any do group
|
|
//ensure we are out of any do group
|
|
repeat
|
|
repeat
|
|
Image.DoEnd(doFound, somethingDone);
|
|
Image.DoEnd(doFound, somethingDone);
|
|
@@ -1386,7 +1400,6 @@ begin
|
|
ToolManager.ForeColor := FChooseColor.GetCurrentColor else
|
|
ToolManager.ForeColor := FChooseColor.GetCurrentColor else
|
|
if FChooseColor.colorTarget = ctBackColor then
|
|
if FChooseColor.colorTarget = ctBackColor then
|
|
ToolManager.BackColor := FChooseColor.GetCurrentColor;
|
|
ToolManager.BackColor := FChooseColor.GetCurrentColor;
|
|
- if Assigned(FMain) then FMain.UpdateEditPicture;
|
|
|
|
InColorFromFChooseColor := false;
|
|
InColorFromFChooseColor := false;
|
|
end;
|
|
end;
|
|
|
|
|