mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 17:56:51 +13:00
In actions use $ prefix instead of % for input and output, with new prefix don't add quotes around file path automatically
This commit is contained in:
parent
6799edaa1b
commit
75a583d9a3
4 changed files with 15 additions and 8 deletions
|
@ -43,7 +43,7 @@ public class ExternalProgram
|
||||||
|
|
||||||
public ExternalProgram()
|
public ExternalProgram()
|
||||||
{
|
{
|
||||||
Args = "%input";
|
Args = '"' + CodeMenuEntryActions.input.ToPrefixString() + '"';
|
||||||
}
|
}
|
||||||
|
|
||||||
public ExternalProgram(string name, string path) : this()
|
public ExternalProgram(string name, string path) : this()
|
||||||
|
|
|
@ -42,7 +42,12 @@ public CodeMenuEntry(string value, string description, string category = null)
|
||||||
|
|
||||||
public string ToPrefixString()
|
public string ToPrefixString()
|
||||||
{
|
{
|
||||||
return Prefix + Value;
|
return ToPrefixString(Prefix);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string ToPrefixString(string prefix)
|
||||||
|
{
|
||||||
|
return prefix + Value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -29,7 +29,7 @@ namespace ShareX.HelpersLib
|
||||||
{
|
{
|
||||||
public class CodeMenuEntryActions : CodeMenuEntry
|
public class CodeMenuEntryActions : CodeMenuEntry
|
||||||
{
|
{
|
||||||
protected override string Prefix { get; } = "%";
|
protected override string Prefix { get; } = "$";
|
||||||
|
|
||||||
public static readonly CodeMenuEntryActions input = new CodeMenuEntryActions("input", Resources.ActionsCodeMenuEntry_FilePath_File_path);
|
public static readonly CodeMenuEntryActions input = new CodeMenuEntryActions("input", Resources.ActionsCodeMenuEntry_FilePath_File_path);
|
||||||
public static readonly CodeMenuEntryActions output = new CodeMenuEntryActions("output", Resources.ActionsCodeMenuEntry_OutputFilePath_File_path_without_extension____Output_file_name_extension_);
|
public static readonly CodeMenuEntryActions output = new CodeMenuEntryActions("output", Resources.ActionsCodeMenuEntry_OutputFilePath_File_path_without_extension____Output_file_name_extension_);
|
||||||
|
@ -44,12 +44,14 @@ public static string Parse(string pattern, string inputPath, string outputPath)
|
||||||
|
|
||||||
if (inputPath != null)
|
if (inputPath != null)
|
||||||
{
|
{
|
||||||
result = result.Replace(input.ToPrefixString(), '"' + inputPath + '"');
|
result = result.Replace(input.ToPrefixString("%"), '"' + inputPath + '"');
|
||||||
|
result = result.Replace(input.ToPrefixString(), inputPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (outputPath != null)
|
if (outputPath != null)
|
||||||
{
|
{
|
||||||
result = result.Replace(output.ToPrefixString(), '"' + outputPath + '"');
|
result = result.Replace(output.ToPrefixString("%"), '"' + outputPath + '"');
|
||||||
|
result = result.Replace(output.ToPrefixString(), outputPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
|
|
@ -52,12 +52,12 @@ public int Size
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[DefaultValue(typeof(Color), "Black"), Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))]
|
|
||||||
public Color Color { get; set; }
|
|
||||||
|
|
||||||
[DefaultValue(DashStyle.Solid), TypeConverter(typeof(EnumProperNameConverter))]
|
[DefaultValue(DashStyle.Solid), TypeConverter(typeof(EnumProperNameConverter))]
|
||||||
public DashStyle DashStyle { get; set; }
|
public DashStyle DashStyle { get; set; }
|
||||||
|
|
||||||
|
[DefaultValue(typeof(Color), "Black"), Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))]
|
||||||
|
public Color Color { get; set; }
|
||||||
|
|
||||||
[DefaultValue(false)]
|
[DefaultValue(false)]
|
||||||
public bool UseGradient { get; set; }
|
public bool UseGradient { get; set; }
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue