浏览代码

show script name as in menu in dialog boxes

Johann ELSASS 5 年之前
父节点
当前提交
3c517a993c
共有 3 个文件被更改,包括 7 次插入5 次删除
  1. 5 3
      lazpaint/lazpaintinstance.pas
  2. 1 1
      lazpaint/lazpainttype.pas
  3. 1 1
      lazpaint/umenu.pas

+ 5 - 3
lazpaint/lazpaintinstance.pas

@@ -209,7 +209,7 @@ type
     procedure NotifyImagePaint; override;
     function TryOpenFileUTF8(filename: string; skipDialogIfSingleImage: boolean = false): boolean; override;
     function ExecuteFilter(filter: TPictureFilter; skipDialog: boolean = false): TScriptResult; override;
-    function RunScript(AFilename: string): boolean; override;
+    function RunScript(AFilename: string; ACaption: string = ''): boolean; override;
     procedure AdjustChooseColorHeight; override;
     procedure ColorFromFChooseColor; override;
     procedure ColorToFChooseColor; override;
@@ -1625,7 +1625,7 @@ begin
   vars.Free;
 end;
 
-function TLazPaintInstance.RunScript(AFilename: string): boolean;
+function TLazPaintInstance.RunScript(AFilename: string; ACaption: string): boolean;
 var
   p: TPythonScript;
   fError: TForm;
@@ -1651,7 +1651,9 @@ begin
   try
     FScriptTempFileNames := TStringList.Create;
     p := TPythonScript.Create;
-    FScriptName := AFilename;
+    if Trim(ACaption).Length > 0 then
+      FScriptName:= Trim(ACaption)
+      else FScriptName := AFilename;
     p.OnCommand:=@PythonScriptCommand;
     p.OnBusy := @PythonBusy;
     p.Run(AFilename);

+ 1 - 1
lazpaint/lazpainttype.pas

@@ -248,7 +248,7 @@ type
     procedure NotifyStackChange; virtual; abstract;
     function TryOpenFileUTF8(filename: string; skipDialogIfSingleImage: boolean = false): boolean; virtual; abstract;
     function ExecuteFilter(filter: TPictureFilter; skipDialog: boolean = false): TScriptResult; virtual; abstract;
-    function RunScript(AFilename: string): boolean; virtual; abstract;
+    function RunScript(AFilename: string; ACaption: string = ''): boolean; virtual; abstract;
     procedure AdjustChooseColorHeight; virtual; abstract;
     procedure ColorFromFChooseColor; virtual; abstract;
     procedure ColorToFChooseColor; virtual; abstract;

+ 1 - 1
lazpaint/umenu.pas

@@ -83,7 +83,7 @@ begin
   begin
     item := Sender as TMenuItem;
     scriptIndex := item.Tag;
-    FInstance.RunScript(FInstalledScripts[scriptIndex]);
+    FInstance.RunScript(FInstalledScripts[scriptIndex], item.Caption);
   end;
 end;