diff --git a/ShareX.HelpersLib/NameParser/CodeMenuEntry.cs b/ShareX.HelpersLib/NameParser/CodeMenuEntry.cs index c553e8e33..db7ed0007 100644 --- a/ShareX.HelpersLib/NameParser/CodeMenuEntry.cs +++ b/ShareX.HelpersLib/NameParser/CodeMenuEntry.cs @@ -23,25 +23,26 @@ You should have received a copy of the GNU General Public License #endregion License Information (GPL v3) -using System; - namespace ShareX.HelpersLib { public abstract class CodeMenuEntry { - protected readonly string _value, _description, _category; + protected abstract string Prefix { get; } + + public string Value { get; private set; } + public string Description { get; private set; } + public string Category { get; private set; } public CodeMenuEntry(string value, string description, string category = null) { - _value = value; - _description = description; - _category = category; + Value = value; + Description = description; + Category = category; } - public string Value { get { return _value; } } - public string Description { get { return _description; } } - public string Category { get { return _category; } } - - public abstract string ToPrefixString(); + public string ToPrefixString() + { + return Prefix + Value; + } } } \ No newline at end of file diff --git a/ShareX.HelpersLib/NameParser/ActionsCodeMenuEntry.cs b/ShareX.HelpersLib/NameParser/CodeMenuEntryActions.cs similarity index 72% rename from ShareX.HelpersLib/NameParser/ActionsCodeMenuEntry.cs rename to ShareX.HelpersLib/NameParser/CodeMenuEntryActions.cs index 4656a5880..7c5c94ad3 100644 --- a/ShareX.HelpersLib/NameParser/ActionsCodeMenuEntry.cs +++ b/ShareX.HelpersLib/NameParser/CodeMenuEntryActions.cs @@ -24,22 +24,18 @@ You should have received a copy of the GNU General Public License #endregion License Information (GPL v3) using ShareX.HelpersLib.Properties; -using System; namespace ShareX.HelpersLib { - public class ActionsCodeMenuEntry : CodeMenuEntry + public class CodeMenuEntryActions : CodeMenuEntry { - public ActionsCodeMenuEntry(string value, string description) : base(value, description) + protected override string Prefix { get; } = "%"; + + public static readonly CodeMenuEntryActions FilePath = new CodeMenuEntryActions("input", Resources.ActionsCodeMenuEntry_FilePath_File_path); + public static readonly CodeMenuEntryActions OutputFilePath = new CodeMenuEntryActions("output", Resources.ActionsCodeMenuEntry_OutputFilePath_File_path_without_extension____Output_file_name_extension_); + + public CodeMenuEntryActions(string value, string description) : base(value, description) { } - - public override string ToPrefixString() - { - return '%' + _value; - } - - public static readonly ActionsCodeMenuEntry FilePath = new ActionsCodeMenuEntry("input", Resources.ActionsCodeMenuEntry_FilePath_File_path); - public static readonly ActionsCodeMenuEntry OutputFilePath = new ActionsCodeMenuEntry("output", Resources.ActionsCodeMenuEntry_OutputFilePath_File_path_without_extension____Output_file_name_extension_); } } \ No newline at end of file diff --git a/ShareX.HelpersLib/NameParser/CodeMenuEntryFilename.cs b/ShareX.HelpersLib/NameParser/CodeMenuEntryFilename.cs new file mode 100644 index 000000000..71bbd72be --- /dev/null +++ b/ShareX.HelpersLib/NameParser/CodeMenuEntryFilename.cs @@ -0,0 +1,71 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2016 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +using ShareX.HelpersLib.Properties; +using System; + +namespace ShareX.HelpersLib +{ + public class CodeMenuEntryFilename : CodeMenuEntry + { + protected override string Prefix { get; } = "%"; + + public static readonly CodeMenuEntryFilename t = new CodeMenuEntryFilename("t", Resources.ReplCodeMenuEntry_t_Title_of_active_window, Resources.ReplCodeMenuCategory_Target); + public static readonly CodeMenuEntryFilename pn = new CodeMenuEntryFilename("pn", Resources.ReplCodeMenuEntry_pn_Process_name_of_active_window, Resources.ReplCodeMenuCategory_Target); + public static readonly CodeMenuEntryFilename y = new CodeMenuEntryFilename("y", Resources.ReplCodeMenuEntry_y_Current_year, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename yy = new CodeMenuEntryFilename("yy", Resources.ReplCodeMenuEntry_yy_Current_year__2_digits_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename mo = new CodeMenuEntryFilename("mo", Resources.ReplCodeMenuEntry_mo_Current_month, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename mon = new CodeMenuEntryFilename("mon", Resources.ReplCodeMenuEntry_mon_Current_month_name__Local_language_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename mon2 = new CodeMenuEntryFilename("mon2", Resources.ReplCodeMenuEntry_mon2_Current_month_name__English_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename d = new CodeMenuEntryFilename("d", Resources.ReplCodeMenuEntry_d_Current_day, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename h = new CodeMenuEntryFilename("h", Resources.ReplCodeMenuEntry_h_Current_hour, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename mi = new CodeMenuEntryFilename("mi", Resources.ReplCodeMenuEntry_mi_Current_minute, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename s = new CodeMenuEntryFilename("s", Resources.ReplCodeMenuEntry_s_Current_second, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename ms = new CodeMenuEntryFilename("ms", Resources.ReplCodeMenuEntry_ms_Current_millisecond, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename pm = new CodeMenuEntryFilename("pm", Resources.ReplCodeMenuEntry_pm_Gets_AM_PM, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename w = new CodeMenuEntryFilename("w", Resources.ReplCodeMenuEntry_w_Current_week_name__Local_language_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename w2 = new CodeMenuEntryFilename("w2", Resources.ReplCodeMenuEntry_w2_Current_week_name__English_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename unix = new CodeMenuEntryFilename("unix", Resources.ReplCodeMenuEntry_unix_Unix_timestamp, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename i = new CodeMenuEntryFilename("i", Resources.ReplCodeMenuEntry_i_Auto_increment_number, Resources.ReplCodeMenuCategory_Incremental); + public static readonly CodeMenuEntryFilename ia = new CodeMenuEntryFilename("ia", Resources.ReplCodeMenuEntry_ia_Auto_increment_alphanumeric, Resources.ReplCodeMenuCategory_Incremental); + public static readonly CodeMenuEntryFilename iAa = new CodeMenuEntryFilename("iAa", Resources.ReplCodeMenuEntry_iAa_Auto_increment_alphanumeric_all, Resources.ReplCodeMenuCategory_Incremental); + public static readonly CodeMenuEntryFilename ib = new CodeMenuEntryFilename("ib", Resources.ReplCodeMenuEntry_ib_Auto_increment_base_alphanumeric, Resources.ReplCodeMenuCategory_Incremental); + public static readonly CodeMenuEntryFilename ix = new CodeMenuEntryFilename("ix", Resources.ReplCodeMenuEntry_ix_Auto_increment_hexadecimal, Resources.ReplCodeMenuCategory_Incremental); + public static readonly CodeMenuEntryFilename rn = new CodeMenuEntryFilename("rn", Resources.ReplCodeMenuEntry_rn_Random_number_0_to_9, Resources.ReplCodeMenuCategory_Random); + public static readonly CodeMenuEntryFilename ra = new CodeMenuEntryFilename("ra", Resources.ReplCodeMenuEntry_ra_Random_alphanumeric_char, Resources.ReplCodeMenuCategory_Random); + public static readonly CodeMenuEntryFilename rx = new CodeMenuEntryFilename("rx", Resources.ReplCodeMenuEntry_rx_Random_hexadecimal, Resources.ReplCodeMenuCategory_Random); + public static readonly CodeMenuEntryFilename guid = new CodeMenuEntryFilename("guid", Resources.ReplCodeMenuEntry_guid_Random_guid, Resources.ReplCodeMenuCategory_Random); + public static readonly CodeMenuEntryFilename width = new CodeMenuEntryFilename("width", Resources.ReplCodeMenuEntry_width_Gets_image_width, Resources.ReplCodeMenuCategory_Image); + public static readonly CodeMenuEntryFilename height = new CodeMenuEntryFilename("height", Resources.ReplCodeMenuEntry_height_Gets_image_height, Resources.ReplCodeMenuCategory_Image); + public static readonly CodeMenuEntryFilename un = new CodeMenuEntryFilename("un", Resources.ReplCodeMenuEntry_un_User_name, Resources.ReplCodeMenuCategory_Computer); + public static readonly CodeMenuEntryFilename uln = new CodeMenuEntryFilename("uln", Resources.ReplCodeMenuEntry_uln_User_login_name, Resources.ReplCodeMenuCategory_Computer); + public static readonly CodeMenuEntryFilename cn = new CodeMenuEntryFilename("cn", Resources.ReplCodeMenuEntry_cn_Computer_name, Resources.ReplCodeMenuCategory_Computer); + public static readonly CodeMenuEntryFilename n = new CodeMenuEntryFilename("n", Resources.ReplCodeMenuEntry_n_New_line); + + public CodeMenuEntryFilename(string value, string description, string category = null) : base(value, description, category) + { + } + } +} \ No newline at end of file diff --git a/ShareX.HelpersLib/NameParser/CodeMenuEntryPixelInfo.cs b/ShareX.HelpersLib/NameParser/CodeMenuEntryPixelInfo.cs new file mode 100644 index 000000000..0eb5d7df9 --- /dev/null +++ b/ShareX.HelpersLib/NameParser/CodeMenuEntryPixelInfo.cs @@ -0,0 +1,44 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2016 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +namespace ShareX.HelpersLib +{ + public class CodeMenuEntryPixelInfo : CodeMenuEntry + { + protected override string Prefix { get; } = "$"; + + public static readonly CodeMenuEntryPixelInfo x = new CodeMenuEntryPixelInfo("x", "X position"); + public static readonly CodeMenuEntryPixelInfo y = new CodeMenuEntryPixelInfo("y", "Y position"); + public static readonly CodeMenuEntryPixelInfo r = new CodeMenuEntryPixelInfo("r", "Red color (0-255)"); + public static readonly CodeMenuEntryPixelInfo g = new CodeMenuEntryPixelInfo("g", "Green color (0-255)"); + public static readonly CodeMenuEntryPixelInfo b = new CodeMenuEntryPixelInfo("b", "Blue color (0-255)"); + public static readonly CodeMenuEntryPixelInfo hex = new CodeMenuEntryPixelInfo("hex", "Hex color value"); + public static readonly CodeMenuEntryPixelInfo n = new CodeMenuEntryPixelInfo("n", "New line"); + + public CodeMenuEntryPixelInfo(string value, string description) : base(value, description) + { + } + } +} \ No newline at end of file diff --git a/ShareX.HelpersLib/NameParser/NameParser.cs b/ShareX.HelpersLib/NameParser/NameParser.cs index cb6cff4f1..f4f38a847 100644 --- a/ShareX.HelpersLib/NameParser/NameParser.cs +++ b/ShareX.HelpersLib/NameParser/NameParser.cs @@ -83,12 +83,12 @@ public string Parse(string pattern) { windowText = windowText.Remove(MaxTitleLength); } - sb.Replace(ReplCodeMenuEntry.t.ToPrefixString(), windowText); + sb.Replace(CodeMenuEntryFilename.t.ToPrefixString(), windowText); } if (ProcessName != null) { - sb.Replace(ReplCodeMenuEntry.pn.ToPrefixString(), ProcessName); + sb.Replace(CodeMenuEntryFilename.pn.ToPrefixString(), ProcessName); } string width = "", height = ""; @@ -103,8 +103,8 @@ public string Parse(string pattern) height = ImageHeight.ToString(); } - sb.Replace(ReplCodeMenuEntry.width.ToPrefixString(), width); - sb.Replace(ReplCodeMenuEntry.height.ToPrefixString(), height); + sb.Replace(CodeMenuEntryFilename.width.ToPrefixString(), width); + sb.Replace(CodeMenuEntryFilename.height.ToPrefixString(), height); DateTime dt = DateTime.Now; @@ -113,16 +113,16 @@ public string Parse(string pattern) dt = TimeZoneInfo.ConvertTime(dt, CustomTimeZone); } - sb.Replace(ReplCodeMenuEntry.mon2.ToPrefixString(), CultureInfo.InvariantCulture.DateTimeFormat.GetMonthName(dt.Month)) - .Replace(ReplCodeMenuEntry.mon.ToPrefixString(), CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(dt.Month)) - .Replace(ReplCodeMenuEntry.yy.ToPrefixString(), dt.ToString("yy")) - .Replace(ReplCodeMenuEntry.y.ToPrefixString(), dt.Year.ToString()) - .Replace(ReplCodeMenuEntry.mo.ToPrefixString(), Helpers.AddZeroes(dt.Month)) - .Replace(ReplCodeMenuEntry.d.ToPrefixString(), Helpers.AddZeroes(dt.Day)); + sb.Replace(CodeMenuEntryFilename.mon2.ToPrefixString(), CultureInfo.InvariantCulture.DateTimeFormat.GetMonthName(dt.Month)) + .Replace(CodeMenuEntryFilename.mon.ToPrefixString(), CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(dt.Month)) + .Replace(CodeMenuEntryFilename.yy.ToPrefixString(), dt.ToString("yy")) + .Replace(CodeMenuEntryFilename.y.ToPrefixString(), dt.Year.ToString()) + .Replace(CodeMenuEntryFilename.mo.ToPrefixString(), Helpers.AddZeroes(dt.Month)) + .Replace(CodeMenuEntryFilename.d.ToPrefixString(), Helpers.AddZeroes(dt.Day)); string hour; - if (sb.ToString().Contains(ReplCodeMenuEntry.pm.ToPrefixString())) + if (sb.ToString().Contains(CodeMenuEntryFilename.pm.ToPrefixString())) { hour = Helpers.HourTo12(dt.Hour); } @@ -131,36 +131,36 @@ public string Parse(string pattern) hour = Helpers.AddZeroes(dt.Hour); } - sb.Replace(ReplCodeMenuEntry.h.ToPrefixString(), hour) - .Replace(ReplCodeMenuEntry.mi.ToPrefixString(), Helpers.AddZeroes(dt.Minute)) - .Replace(ReplCodeMenuEntry.s.ToPrefixString(), Helpers.AddZeroes(dt.Second)) - .Replace(ReplCodeMenuEntry.ms.ToPrefixString(), Helpers.AddZeroes(dt.Millisecond, 3)) - .Replace(ReplCodeMenuEntry.w2.ToPrefixString(), CultureInfo.InvariantCulture.DateTimeFormat.GetDayName(dt.DayOfWeek)) - .Replace(ReplCodeMenuEntry.w.ToPrefixString(), CultureInfo.CurrentCulture.DateTimeFormat.GetDayName(dt.DayOfWeek)) - .Replace(ReplCodeMenuEntry.pm.ToPrefixString(), dt.Hour >= 12 ? "PM" : "AM"); + sb.Replace(CodeMenuEntryFilename.h.ToPrefixString(), hour) + .Replace(CodeMenuEntryFilename.mi.ToPrefixString(), Helpers.AddZeroes(dt.Minute)) + .Replace(CodeMenuEntryFilename.s.ToPrefixString(), Helpers.AddZeroes(dt.Second)) + .Replace(CodeMenuEntryFilename.ms.ToPrefixString(), Helpers.AddZeroes(dt.Millisecond, 3)) + .Replace(CodeMenuEntryFilename.w2.ToPrefixString(), CultureInfo.InvariantCulture.DateTimeFormat.GetDayName(dt.DayOfWeek)) + .Replace(CodeMenuEntryFilename.w.ToPrefixString(), CultureInfo.CurrentCulture.DateTimeFormat.GetDayName(dt.DayOfWeek)) + .Replace(CodeMenuEntryFilename.pm.ToPrefixString(), dt.Hour >= 12 ? "PM" : "AM"); - sb.Replace(ReplCodeMenuEntry.unix.ToPrefixString(), DateTime.UtcNow.ToUnix().ToString()); + sb.Replace(CodeMenuEntryFilename.unix.ToPrefixString(), DateTime.UtcNow.ToUnix().ToString()); - if (sb.ToString().Contains(ReplCodeMenuEntry.i.ToPrefixString()) - || sb.ToString().Contains(ReplCodeMenuEntry.ib.ToPrefixString()) - || sb.ToString().Contains(ReplCodeMenuEntry.ib.ToPrefixString().Replace('b', 'B')) - || sb.ToString().Contains(ReplCodeMenuEntry.iAa.ToPrefixString()) - || sb.ToString().Contains(ReplCodeMenuEntry.iAa.ToPrefixString().Replace("Aa", "aA")) - || sb.ToString().Contains(ReplCodeMenuEntry.ia.ToPrefixString()) - || sb.ToString().Contains(ReplCodeMenuEntry.ia.ToPrefixString().Replace('a', 'A')) - || sb.ToString().Contains(ReplCodeMenuEntry.ix.ToPrefixString()) - || sb.ToString().Contains(ReplCodeMenuEntry.ix.ToPrefixString().Replace('x', 'X'))) + if (sb.ToString().Contains(CodeMenuEntryFilename.i.ToPrefixString()) + || sb.ToString().Contains(CodeMenuEntryFilename.ib.ToPrefixString()) + || sb.ToString().Contains(CodeMenuEntryFilename.ib.ToPrefixString().Replace('b', 'B')) + || sb.ToString().Contains(CodeMenuEntryFilename.iAa.ToPrefixString()) + || sb.ToString().Contains(CodeMenuEntryFilename.iAa.ToPrefixString().Replace("Aa", "aA")) + || sb.ToString().Contains(CodeMenuEntryFilename.ia.ToPrefixString()) + || sb.ToString().Contains(CodeMenuEntryFilename.ia.ToPrefixString().Replace('a', 'A')) + || sb.ToString().Contains(CodeMenuEntryFilename.ix.ToPrefixString()) + || sb.ToString().Contains(CodeMenuEntryFilename.ix.ToPrefixString().Replace('x', 'X'))) { AutoIncrementNumber++; // Base try { - foreach (Tuple entry in ListEntryWithValues(sb.ToString(), ReplCodeMenuEntry.ib.ToPrefixString(), 2)) + foreach (Tuple entry in ListEntryWithValues(sb.ToString(), CodeMenuEntryFilename.ib.ToPrefixString(), 2)) { sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(entry.Item2[0], Helpers.AlphanumericInverse), entry.Item2[1])); } - foreach (Tuple entry in ListEntryWithValues(sb.ToString(), ReplCodeMenuEntry.ib.ToPrefixString().Replace('b', 'B'), 2)) + foreach (Tuple entry in ListEntryWithValues(sb.ToString(), CodeMenuEntryFilename.ib.ToPrefixString().Replace('b', 'B'), 2)) { sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(entry.Item2[0], Helpers.Alphanumeric), entry.Item2[1])); } @@ -170,90 +170,90 @@ public string Parse(string pattern) } // Alphanumeric Dual Case (Base 62) - foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.iAa.ToPrefixString())) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), CodeMenuEntryFilename.iAa.ToPrefixString())) { sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(62, Helpers.Alphanumeric), entry.Item2)); } - sb.Replace(ReplCodeMenuEntry.iAa.ToPrefixString(), AutoIncrementNumber.ToBase(62, Helpers.Alphanumeric)); + sb.Replace(CodeMenuEntryFilename.iAa.ToPrefixString(), AutoIncrementNumber.ToBase(62, Helpers.Alphanumeric)); // Alphanumeric Dual Case (Base 62) - foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.iAa.ToPrefixString().Replace("Aa", "aA"))) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), CodeMenuEntryFilename.iAa.ToPrefixString().Replace("Aa", "aA"))) { sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(62, Helpers.AlphanumericInverse), entry.Item2)); } - sb.Replace(ReplCodeMenuEntry.iAa.ToPrefixString().Replace("Aa", "aA"), AutoIncrementNumber.ToBase(62, Helpers.AlphanumericInverse)); + sb.Replace(CodeMenuEntryFilename.iAa.ToPrefixString().Replace("Aa", "aA"), AutoIncrementNumber.ToBase(62, Helpers.AlphanumericInverse)); // Alphanumeric Single Case (Base 36) - foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.ia.ToPrefixString())) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), CodeMenuEntryFilename.ia.ToPrefixString())) { sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(36, Helpers.Alphanumeric), entry.Item2).ToLowerInvariant()); } - sb.Replace(ReplCodeMenuEntry.ia.ToPrefixString(), AutoIncrementNumber.ToBase(36, Helpers.Alphanumeric).ToLowerInvariant()); + sb.Replace(CodeMenuEntryFilename.ia.ToPrefixString(), AutoIncrementNumber.ToBase(36, Helpers.Alphanumeric).ToLowerInvariant()); // Alphanumeric Single Case Capital (Base 36) - foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.ia.ToPrefixString().Replace('a', 'A'))) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), CodeMenuEntryFilename.ia.ToPrefixString().Replace('a', 'A'))) { sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(36, Helpers.Alphanumeric), entry.Item2).ToUpperInvariant()); } - sb.Replace(ReplCodeMenuEntry.ia.ToPrefixString().Replace('a', 'A'), AutoIncrementNumber.ToBase(36, Helpers.Alphanumeric).ToUpperInvariant()); + sb.Replace(CodeMenuEntryFilename.ia.ToPrefixString().Replace('a', 'A'), AutoIncrementNumber.ToBase(36, Helpers.Alphanumeric).ToUpperInvariant()); // Hexadecimal (Base 16) - foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.ix.ToPrefixString())) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), CodeMenuEntryFilename.ix.ToPrefixString())) { sb.Replace(entry.Item1, AutoIncrementNumber.ToString("x" + entry.Item2.ToString())); } - sb.Replace(ReplCodeMenuEntry.ix.ToPrefixString(), AutoIncrementNumber.ToString("x")); + sb.Replace(CodeMenuEntryFilename.ix.ToPrefixString(), AutoIncrementNumber.ToString("x")); // Hexadecimal Capital (Base 16) - foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.ix.ToPrefixString().Replace('x', 'X'))) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), CodeMenuEntryFilename.ix.ToPrefixString().Replace('x', 'X'))) { sb.Replace(entry.Item1, AutoIncrementNumber.ToString("X" + entry.Item2.ToString())); } - sb.Replace(ReplCodeMenuEntry.ix.ToPrefixString().Replace('x', 'X'), AutoIncrementNumber.ToString("X")); + sb.Replace(CodeMenuEntryFilename.ix.ToPrefixString().Replace('x', 'X'), AutoIncrementNumber.ToString("X")); // Number (Base 10) - foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.i.ToPrefixString())) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), CodeMenuEntryFilename.i.ToPrefixString())) { sb.Replace(entry.Item1, AutoIncrementNumber.ToString("d" + entry.Item2.ToString())); } - sb.Replace(ReplCodeMenuEntry.i.ToPrefixString(), AutoIncrementNumber.ToString("d")); + sb.Replace(CodeMenuEntryFilename.i.ToPrefixString(), AutoIncrementNumber.ToString("d")); } - sb.Replace(ReplCodeMenuEntry.un.ToPrefixString(), Environment.UserName); - sb.Replace(ReplCodeMenuEntry.uln.ToPrefixString(), Environment.UserDomainName); - sb.Replace(ReplCodeMenuEntry.cn.ToPrefixString(), Environment.MachineName); + sb.Replace(CodeMenuEntryFilename.un.ToPrefixString(), Environment.UserName); + sb.Replace(CodeMenuEntryFilename.uln.ToPrefixString(), Environment.UserDomainName); + sb.Replace(CodeMenuEntryFilename.cn.ToPrefixString(), Environment.MachineName); if (Type == NameParserType.Text) { - sb.Replace(ReplCodeMenuEntry.n.ToPrefixString(), Environment.NewLine); + sb.Replace(CodeMenuEntryFilename.n.ToPrefixString(), Environment.NewLine); } string result = sb.ToString(); - foreach (Tuple entry in ListEntryWithValue(result, ReplCodeMenuEntry.rn.ToPrefixString())) + foreach (Tuple entry in ListEntryWithValue(result, CodeMenuEntryFilename.rn.ToPrefixString())) { result = result.ReplaceAll(entry.Item1, () => Helpers.RepeatGenerator(entry.Item2, () => Helpers.GetRandomChar(Helpers.Numbers).ToString())); } - foreach (Tuple entry in ListEntryWithValue(result, ReplCodeMenuEntry.ra.ToPrefixString())) + foreach (Tuple entry in ListEntryWithValue(result, CodeMenuEntryFilename.ra.ToPrefixString())) { result = result.ReplaceAll(entry.Item1, () => Helpers.RepeatGenerator(entry.Item2, () => Helpers.GetRandomChar(Helpers.Alphanumeric).ToString())); } - foreach (Tuple entry in ListEntryWithValue(result, ReplCodeMenuEntry.rx.ToPrefixString())) + foreach (Tuple entry in ListEntryWithValue(result, CodeMenuEntryFilename.rx.ToPrefixString())) { result = result.ReplaceAll(entry.Item1, () => Helpers.RepeatGenerator(entry.Item2, () => Helpers.GetRandomChar(Helpers.Hexadecimal.ToLowerInvariant()).ToString())); } - foreach (Tuple entry in ListEntryWithValue(result, ReplCodeMenuEntry.rx.ToPrefixString().Replace('x', 'X'))) + foreach (Tuple entry in ListEntryWithValue(result, CodeMenuEntryFilename.rx.ToPrefixString().Replace('x', 'X'))) { result = result.ReplaceAll(entry.Item1, () => Helpers.RepeatGenerator(entry.Item2, () => Helpers.GetRandomChar(Helpers.Hexadecimal.ToUpperInvariant()).ToString())); } - result = result.ReplaceAll(ReplCodeMenuEntry.rn.ToPrefixString(), () => Helpers.GetRandomChar(Helpers.Numbers).ToString()); - result = result.ReplaceAll(ReplCodeMenuEntry.ra.ToPrefixString(), () => Helpers.GetRandomChar(Helpers.Alphanumeric).ToString()); - result = result.ReplaceAll(ReplCodeMenuEntry.rx.ToPrefixString(), () => Helpers.GetRandomChar(Helpers.Hexadecimal.ToLowerInvariant()).ToString()); - result = result.ReplaceAll(ReplCodeMenuEntry.rx.ToPrefixString().Replace('x', 'X'), () => Helpers.GetRandomChar(Helpers.Hexadecimal.ToUpperInvariant()).ToString()); + result = result.ReplaceAll(CodeMenuEntryFilename.rn.ToPrefixString(), () => Helpers.GetRandomChar(Helpers.Numbers).ToString()); + result = result.ReplaceAll(CodeMenuEntryFilename.ra.ToPrefixString(), () => Helpers.GetRandomChar(Helpers.Alphanumeric).ToString()); + result = result.ReplaceAll(CodeMenuEntryFilename.rx.ToPrefixString(), () => Helpers.GetRandomChar(Helpers.Hexadecimal.ToLowerInvariant()).ToString()); + result = result.ReplaceAll(CodeMenuEntryFilename.rx.ToPrefixString().Replace('x', 'X'), () => Helpers.GetRandomChar(Helpers.Hexadecimal.ToUpperInvariant()).ToString()); - result = result.ReplaceAll(ReplCodeMenuEntry.guid.ToPrefixString().ToLowerInvariant(), () => Guid.NewGuid().ToString().ToLowerInvariant()); - result = result.ReplaceAll(ReplCodeMenuEntry.guid.ToPrefixString().ToUpperInvariant(), () => Guid.NewGuid().ToString().ToUpperInvariant()); + result = result.ReplaceAll(CodeMenuEntryFilename.guid.ToPrefixString().ToLowerInvariant(), () => Guid.NewGuid().ToString().ToLowerInvariant()); + result = result.ReplaceAll(CodeMenuEntryFilename.guid.ToPrefixString().ToUpperInvariant(), () => Guid.NewGuid().ToString().ToUpperInvariant()); if (Type == NameParserType.FolderPath) { diff --git a/ShareX.HelpersLib/NameParser/RegionCaptureInfoTextCodeMenuEntry.cs b/ShareX.HelpersLib/NameParser/RegionCaptureInfoTextCodeMenuEntry.cs deleted file mode 100644 index 5f413c870..000000000 --- a/ShareX.HelpersLib/NameParser/RegionCaptureInfoTextCodeMenuEntry.cs +++ /dev/null @@ -1,52 +0,0 @@ -#region License Information (GPL v3) - -/* - ShareX - A program that allows you to take screenshots and share any file type - Copyright (c) 2007-2016 ShareX Team - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Optionally you can also view the license at . -*/ - -#endregion License Information (GPL v3) - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace ShareX.HelpersLib -{ - public class RegionCaptureInfoTextCodeMenuEntry : CodeMenuEntry - { - public RegionCaptureInfoTextCodeMenuEntry(string value, string description) : base(value, description) - { - } - - public override string ToPrefixString() - { - return '$' + _value; - } - - public static readonly RegionCaptureInfoTextCodeMenuEntry x = new RegionCaptureInfoTextCodeMenuEntry("x", "X position"); - public static readonly RegionCaptureInfoTextCodeMenuEntry y = new RegionCaptureInfoTextCodeMenuEntry("y", "Y position"); - public static readonly RegionCaptureInfoTextCodeMenuEntry r = new RegionCaptureInfoTextCodeMenuEntry("r", "Red color (0-255)"); - public static readonly RegionCaptureInfoTextCodeMenuEntry g = new RegionCaptureInfoTextCodeMenuEntry("g", "Green color (0-255)"); - public static readonly RegionCaptureInfoTextCodeMenuEntry b = new RegionCaptureInfoTextCodeMenuEntry("b", "Blue color (0-255)"); - public static readonly RegionCaptureInfoTextCodeMenuEntry hex = new RegionCaptureInfoTextCodeMenuEntry("hex", "Hex color value"); - public static readonly RegionCaptureInfoTextCodeMenuEntry n = new RegionCaptureInfoTextCodeMenuEntry("n", "New line"); - } -} \ No newline at end of file diff --git a/ShareX.HelpersLib/NameParser/ReplCodeMenuEntry.cs b/ShareX.HelpersLib/NameParser/ReplCodeMenuEntry.cs deleted file mode 100644 index d69110910..000000000 --- a/ShareX.HelpersLib/NameParser/ReplCodeMenuEntry.cs +++ /dev/null @@ -1,77 +0,0 @@ -#region License Information (GPL v3) - -/* - ShareX - A program that allows you to take screenshots and share any file type - Copyright (c) 2007-2016 ShareX Team - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Optionally you can also view the license at . -*/ - -#endregion License Information (GPL v3) - -using ShareX.HelpersLib.Properties; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace ShareX.HelpersLib -{ - public class ReplCodeMenuEntry : CodeMenuEntry - { - public ReplCodeMenuEntry(string value, string description, string category = null) : base(value, description, category) - { - } - - public override string ToPrefixString() - { - return '%' + _value; - } - - public static readonly ReplCodeMenuEntry t = new ReplCodeMenuEntry("t", Resources.ReplCodeMenuEntry_t_Title_of_active_window, Resources.ReplCodeMenuCategory_Target); - public static readonly ReplCodeMenuEntry pn = new ReplCodeMenuEntry("pn", Resources.ReplCodeMenuEntry_pn_Process_name_of_active_window, Resources.ReplCodeMenuCategory_Target); - public static readonly ReplCodeMenuEntry y = new ReplCodeMenuEntry("y", Resources.ReplCodeMenuEntry_y_Current_year, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry yy = new ReplCodeMenuEntry("yy", Resources.ReplCodeMenuEntry_yy_Current_year__2_digits_, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry mo = new ReplCodeMenuEntry("mo", Resources.ReplCodeMenuEntry_mo_Current_month, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry mon = new ReplCodeMenuEntry("mon", Resources.ReplCodeMenuEntry_mon_Current_month_name__Local_language_, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry mon2 = new ReplCodeMenuEntry("mon2", Resources.ReplCodeMenuEntry_mon2_Current_month_name__English_, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry d = new ReplCodeMenuEntry("d", Resources.ReplCodeMenuEntry_d_Current_day, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry h = new ReplCodeMenuEntry("h", Resources.ReplCodeMenuEntry_h_Current_hour, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry mi = new ReplCodeMenuEntry("mi", Resources.ReplCodeMenuEntry_mi_Current_minute, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry s = new ReplCodeMenuEntry("s", Resources.ReplCodeMenuEntry_s_Current_second, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry ms = new ReplCodeMenuEntry("ms", Resources.ReplCodeMenuEntry_ms_Current_millisecond, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry pm = new ReplCodeMenuEntry("pm", Resources.ReplCodeMenuEntry_pm_Gets_AM_PM, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry w = new ReplCodeMenuEntry("w", Resources.ReplCodeMenuEntry_w_Current_week_name__Local_language_, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry w2 = new ReplCodeMenuEntry("w2", Resources.ReplCodeMenuEntry_w2_Current_week_name__English_, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry unix = new ReplCodeMenuEntry("unix", Resources.ReplCodeMenuEntry_unix_Unix_timestamp, Resources.ReplCodeMenuCategory_Date_and_Time); - public static readonly ReplCodeMenuEntry i = new ReplCodeMenuEntry("i", Resources.ReplCodeMenuEntry_i_Auto_increment_number, Resources.ReplCodeMenuCategory_Incremental); - public static readonly ReplCodeMenuEntry ia = new ReplCodeMenuEntry("ia", Resources.ReplCodeMenuEntry_ia_Auto_increment_alphanumeric, Resources.ReplCodeMenuCategory_Incremental); - public static readonly ReplCodeMenuEntry iAa = new ReplCodeMenuEntry("iAa", Resources.ReplCodeMenuEntry_iAa_Auto_increment_alphanumeric_all, Resources.ReplCodeMenuCategory_Incremental); - public static readonly ReplCodeMenuEntry ib = new ReplCodeMenuEntry("ib", Resources.ReplCodeMenuEntry_ib_Auto_increment_base_alphanumeric, Resources.ReplCodeMenuCategory_Incremental); - public static readonly ReplCodeMenuEntry ix = new ReplCodeMenuEntry("ix", Resources.ReplCodeMenuEntry_ix_Auto_increment_hexadecimal, Resources.ReplCodeMenuCategory_Incremental); - public static readonly ReplCodeMenuEntry rn = new ReplCodeMenuEntry("rn", Resources.ReplCodeMenuEntry_rn_Random_number_0_to_9, Resources.ReplCodeMenuCategory_Random); - public static readonly ReplCodeMenuEntry ra = new ReplCodeMenuEntry("ra", Resources.ReplCodeMenuEntry_ra_Random_alphanumeric_char, Resources.ReplCodeMenuCategory_Random); - public static readonly ReplCodeMenuEntry rx = new ReplCodeMenuEntry("rx", Resources.ReplCodeMenuEntry_rx_Random_hexadecimal, Resources.ReplCodeMenuCategory_Random); - public static readonly ReplCodeMenuEntry guid = new ReplCodeMenuEntry("guid", Resources.ReplCodeMenuEntry_guid_Random_guid, Resources.ReplCodeMenuCategory_Random); - public static readonly ReplCodeMenuEntry width = new ReplCodeMenuEntry("width", Resources.ReplCodeMenuEntry_width_Gets_image_width, Resources.ReplCodeMenuCategory_Image); - public static readonly ReplCodeMenuEntry height = new ReplCodeMenuEntry("height", Resources.ReplCodeMenuEntry_height_Gets_image_height, Resources.ReplCodeMenuCategory_Image); - public static readonly ReplCodeMenuEntry un = new ReplCodeMenuEntry("un", Resources.ReplCodeMenuEntry_un_User_name, Resources.ReplCodeMenuCategory_Computer); - public static readonly ReplCodeMenuEntry uln = new ReplCodeMenuEntry("uln", Resources.ReplCodeMenuEntry_uln_User_login_name, Resources.ReplCodeMenuCategory_Computer); - public static readonly ReplCodeMenuEntry cn = new ReplCodeMenuEntry("cn", Resources.ReplCodeMenuEntry_cn_Computer_name, Resources.ReplCodeMenuCategory_Computer); - public static readonly ReplCodeMenuEntry n = new ReplCodeMenuEntry("n", Resources.ReplCodeMenuEntry_n_New_line); - } -} \ No newline at end of file diff --git a/ShareX.HelpersLib/ShareX.HelpersLib.csproj b/ShareX.HelpersLib/ShareX.HelpersLib.csproj index 74ddfef5d..acb1bcd50 100644 --- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj +++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj @@ -88,7 +88,7 @@ - + Form @@ -192,7 +192,7 @@ - + Form @@ -228,7 +228,7 @@ TabToTreeView.cs - + diff --git a/ShareX.HelpersLib/UITypeEditors/NameParserEditor.cs b/ShareX.HelpersLib/UITypeEditors/NameParserEditor.cs index 582b70b46..b8461b7c4 100644 --- a/ShareX.HelpersLib/UITypeEditors/NameParserEditor.cs +++ b/ShareX.HelpersLib/UITypeEditors/NameParserEditor.cs @@ -41,7 +41,7 @@ public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext contex public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) { Point pos = Cursor.Position; - CodeMenu.Create(ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn).Show(pos.X, pos.Y); + CodeMenu.Create(CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn).Show(pos.X, pos.Y); return value; } } diff --git a/ShareX.ImageEffectsLib/WatermarkForm.cs b/ShareX.ImageEffectsLib/WatermarkForm.cs index 2eea2bbf6..bed66a219 100644 --- a/ShareX.ImageEffectsLib/WatermarkForm.cs +++ b/ShareX.ImageEffectsLib/WatermarkForm.cs @@ -42,7 +42,7 @@ public WatermarkForm(WatermarkConfig watermarkConfig) InitializeComponent(); Icon = ShareXResources.Icon; config = watermarkConfig; - CodeMenu.Create(txtWatermarkText, ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn); + CodeMenu.Create(txtWatermarkText, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); } private void WatermarkUI_Load(object sender, EventArgs e) diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index c0af88c16..543c16476 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -94,11 +94,11 @@ private void InitializeControls() ttlvMain.MainTabControl = tcUploaders; ttlvMain.FocusListView(); - CodeMenu.Create(txtDropboxPath, ReplCodeMenuEntry.n, ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn); - CodeMenu.Create(txtAmazonS3ObjectPrefix, ReplCodeMenuEntry.n, ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn); - CodeMenu.Create(txtMediaFirePath, ReplCodeMenuEntry.n, ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn); - CodeMenu.Create(txtCustomUploaderArgValue, ReplCodeMenuEntry.n, ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn); - CodeMenu.Create(txtCustomUploaderHeaderValue, ReplCodeMenuEntry.n, ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn); + CodeMenu.Create(txtDropboxPath, CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); + CodeMenu.Create(txtAmazonS3ObjectPrefix, CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); + CodeMenu.Create(txtMediaFirePath, CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); + CodeMenu.Create(txtCustomUploaderArgValue, CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); + CodeMenu.Create(txtCustomUploaderHeaderValue, CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); txtCustomUploaderLog.AddContextMenu(); diff --git a/ShareX/Forms/ActionsForm.cs b/ShareX/Forms/ActionsForm.cs index d7bd17dfa..a77439ab7 100644 --- a/ShareX/Forms/ActionsForm.cs +++ b/ShareX/Forms/ActionsForm.cs @@ -47,7 +47,7 @@ public ActionsForm(ExternalProgram fileAction) txtName.Text = fileAction.Name ?? ""; txtPath.Text = fileAction.Path ?? ""; txtArguments.Text = fileAction.Args ?? ""; - CodeMenu.Create(txtArguments); + CodeMenu.Create(txtArguments); txtOutputExtension.Text = fileAction.OutputExtension ?? ""; txtExtensions.Text = fileAction.Extensions ?? ""; cbHiddenWindow.Checked = fileAction.HiddenWindow; diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs index dd295ced9..620e06c8c 100644 --- a/ShareX/Forms/ApplicationSettingsForm.cs +++ b/ShareX/Forms/ApplicationSettingsForm.cs @@ -79,7 +79,7 @@ private void InitializeControls() cbTrayLeftClickAction.Items.AddRange(Helpers.GetLocalizedEnumDescriptions()); cbTrayMiddleClickAction.Items.AddRange(Helpers.GetLocalizedEnumDescriptions()); - CodeMenu.Create(txtSaveImageSubFolderPattern, ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn, ReplCodeMenuEntry.i, ReplCodeMenuEntry.width, ReplCodeMenuEntry.height, ReplCodeMenuEntry.n); + CodeMenu.Create(txtSaveImageSubFolderPattern, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn, CodeMenuEntryFilename.i, CodeMenuEntryFilename.width, CodeMenuEntryFilename.height, CodeMenuEntryFilename.n); cbProxyMethod.Items.AddRange(Helpers.GetLocalizedEnumDescriptions()); diff --git a/ShareX/Forms/ClipboardFormatForm.cs b/ShareX/Forms/ClipboardFormatForm.cs index 8dde31027..c097eefbe 100644 --- a/ShareX/Forms/ClipboardFormatForm.cs +++ b/ShareX/Forms/ClipboardFormatForm.cs @@ -46,7 +46,7 @@ public ClipboardFormatForm(ClipboardFormat cbf) ClipboardFormat = cbf; txtDescription.Text = cbf.Description ?? ""; txtFormat.Text = cbf.Format ?? ""; - CodeMenu.Create(txtFormat); + CodeMenu.Create(txtFormat); lblExample.Text = string.Format(Resources.ClipboardFormatForm_ClipboardFormatForm_Supported_variables___0__and_other_variables_such_as__1__etc_, "$result, $url, $shorturl, $thumbnailurl, $deletionurl, $filepath, $filename, $filenamenoext, $thumbnailfilename, $thumbnailfilenamenoext, $folderpath, $foldername, $uploadtime", "%y, %mo, %d"); diff --git a/ShareX/Forms/TaskSettingsForm.cs b/ShareX/Forms/TaskSettingsForm.cs index 6cdbf14b1..c592b12de 100644 --- a/ShareX/Forms/TaskSettingsForm.cs +++ b/ShareX/Forms/TaskSettingsForm.cs @@ -249,7 +249,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false) cbRegionCaptureUseCustomInfoText.Checked = TaskSettings.CaptureSettings.SurfaceOptions.UseCustomInfoText; txtRegionCaptureCustomInfoText.Enabled = TaskSettings.CaptureSettings.SurfaceOptions.UseCustomInfoText; TaskSettings.CaptureSettings.SurfaceOptions.CustomInfoText = TaskSettings.CaptureSettings.SurfaceOptions.CustomInfoText.Replace("\r\n", "$n").Replace("\n", "$n"); - CodeMenu.Create(txtRegionCaptureCustomInfoText); + CodeMenu.Create(txtRegionCaptureCustomInfoText); txtRegionCaptureCustomInfoText.Text = TaskSettings.CaptureSettings.SurfaceOptions.CustomInfoText; cbRegionCaptureSnapSizes.Items.AddRange(TaskSettings.CaptureSettings.SurfaceOptions.SnapSizes.ToArray()); cbRegionCaptureShowTips.Checked = TaskSettings.CaptureSettings.SurfaceOptions.ShowTips; @@ -303,8 +303,8 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false) txtNameFormatPattern.Text = TaskSettings.UploadSettings.NameFormatPattern; txtNameFormatPatternActiveWindow.Text = TaskSettings.UploadSettings.NameFormatPatternActiveWindow; - CodeMenu.Create(txtNameFormatPattern, ReplCodeMenuEntry.n, ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn); - CodeMenu.Create(txtNameFormatPatternActiveWindow, ReplCodeMenuEntry.n); + CodeMenu.Create(txtNameFormatPattern, CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); + CodeMenu.Create(txtNameFormatPatternActiveWindow, CodeMenuEntryFilename.n); cbRegionCaptureUseWindowPattern.Checked = TaskSettings.UploadSettings.RegionCaptureUseWindowPattern; cbFileUploadUseNamePattern.Checked = TaskSettings.UploadSettings.FileUploadUseNamePattern; UpdateNameFormatPreviews(); @@ -359,6 +359,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false) #region Tools + CodeMenu.Create(txtToolsScreenColorPickerFormat); txtToolsScreenColorPickerFormat.Text = TaskSettings.ToolsSettings.ScreenColorPickerFormat; #endregion Tools diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs index 0702a5411..bfc9b3b08 100644 --- a/ShareX/TaskSettings.cs +++ b/ShareX/TaskSettings.cs @@ -376,7 +376,7 @@ public class TaskSettingsUpload public class TaskSettingsTools { - public string ScreenColorPickerFormat = "$r, $g, $b"; // $r, $g, $b, $hex, $HEX, $x, $y + public string ScreenColorPickerFormat = "$r, $g, $b"; public IndexerSettings IndexerSettings = new IndexerSettings(); public ImageCombinerOptions ImageCombinerOptions = new ImageCombinerOptions(); public VideoThumbnailOptions VideoThumbnailOptions = new VideoThumbnailOptions();