Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-25 12:44:46 +01:00
Code Issues Projects Releases Wiki Activity

Make it easier to customize colors for shortcuts

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-12-01 18:30:41 +01:00
parent c09769cb7b
commit 27ae5d973c
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/libse/Common/Settings.cs
View File

@ -152,10 +152,10 @@ namespace Nikse.SubtitleEdit.Core.Common
public bool ListViewSyntaxMoreThanXLines { get; set; } public bool ListViewSyntaxMoreThanXLines { get; set; }
public Color ListViewSyntaxErrorColor { get; set; } public Color ListViewSyntaxErrorColor { get; set; }
public Color ListViewUnfocusedSelectedColor { get; set; } public Color ListViewUnfocusedSelectedColor { get; set; }
public Color Color1ForShortcut { get; set; } public Color Color1 { get; set; }
public Color Color2ForShortcut { get; set; } public Color Color2 { get; set; }
public Color Color3ForShortcut { get; set; } public Color Color3 { get; set; }
public Color Color4ForShortcut { get; set; } public Color Color4 { get; set; }
public bool ListViewShowColumnEndTime { get; set; } public bool ListViewShowColumnEndTime { get; set; }
public bool ListViewShowColumnDuration { get; set; } public bool ListViewShowColumnDuration { get; set; }
public bool ListViewShowColumnCharsPerSec { get; set; } public bool ListViewShowColumnCharsPerSec { get; set; }
@ -358,10 +358,10 @@ namespace Nikse.SubtitleEdit.Core.Common
ListViewSyntaxColorGap = true; ListViewSyntaxColorGap = true;
ListViewSyntaxErrorColor = Color.FromArgb(255, 180, 150); ListViewSyntaxErrorColor = Color.FromArgb(255, 180, 150);
ListViewUnfocusedSelectedColor = Color.LightBlue; ListViewUnfocusedSelectedColor = Color.LightBlue;
Color1ForShortcut = Color.Yellow; Color1 = Color.Yellow;
Color2ForShortcut = Color.Red; Color2 = Color.FromArgb(byte.MaxValue, 0, 0);
Color3ForShortcut = Color.Green; Color3 = Color.FromArgb(0, byte.MaxValue, 0);
Color4ForShortcut = Color.Cyan; Color4 = Color.Cyan;
ListViewShowColumnEndTime = true; ListViewShowColumnEndTime = true;
ListViewShowColumnDuration = true; ListViewShowColumnDuration = true;
SplitAdvanced = false; SplitAdvanced = false;
@ -3795,28 +3795,28 @@ $HorzAlign = Center
settings.Tools.ListViewUnfocusedSelectedColor = Color.FromArgb(int.Parse(subNode.InnerText, CultureInfo.InvariantCulture)); settings.Tools.ListViewUnfocusedSelectedColor = Color.FromArgb(int.Parse(subNode.InnerText, CultureInfo.InvariantCulture));
} }
subNode = node.SelectSingleNode("Color1ForShortcut"); subNode = node.SelectSingleNode("Color1");
if (subNode != null) if (subNode != null)
{ {
settings.Tools.Color1ForShortcut = Color.FromArgb(int.Parse(subNode.InnerText, CultureInfo.InvariantCulture)); settings.Tools.Color1 = ColorTranslator.FromHtml(subNode.InnerText);
} }
subNode = node.SelectSingleNode("Color2ForShortcut"); subNode = node.SelectSingleNode("Color2");
if (subNode != null) if (subNode != null)
{ {
settings.Tools.Color2ForShortcut = Color.FromArgb(int.Parse(subNode.InnerText, CultureInfo.InvariantCulture)); settings.Tools.Color2 = ColorTranslator.FromHtml(subNode.InnerText);
} }
subNode = node.SelectSingleNode("Color3ForShortcut"); subNode = node.SelectSingleNode("Color3");
if (subNode != null) if (subNode != null)
{ {
settings.Tools.Color3ForShortcut = Color.FromArgb(int.Parse(subNode.InnerText, CultureInfo.InvariantCulture)); settings.Tools.Color3 = ColorTranslator.FromHtml(subNode.InnerText);
} }
subNode = node.SelectSingleNode("Color4ForShortcut"); subNode = node.SelectSingleNode("Color4");
if (subNode != null) if (subNode != null)
{ {
settings.Tools.Color4ForShortcut = Color.FromArgb(int.Parse(subNode.InnerText, CultureInfo.InvariantCulture)); settings.Tools.Color4 = ColorTranslator.FromHtml(subNode.InnerText);
} }
subNode = node.SelectSingleNode("ListViewShowColumnEndTime"); subNode = node.SelectSingleNode("ListViewShowColumnEndTime");
@ -7936,10 +7936,10 @@ $HorzAlign = Center
textWriter.WriteElementString("ListViewSyntaxColorGap", settings.Tools.ListViewSyntaxColorGap.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("ListViewSyntaxColorGap", settings.Tools.ListViewSyntaxColorGap.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ListViewSyntaxErrorColor", settings.Tools.ListViewSyntaxErrorColor.ToArgb().ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("ListViewSyntaxErrorColor", settings.Tools.ListViewSyntaxErrorColor.ToArgb().ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ListViewUnfocusedSelectedColor", settings.Tools.ListViewUnfocusedSelectedColor.ToArgb().ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("ListViewUnfocusedSelectedColor", settings.Tools.ListViewUnfocusedSelectedColor.ToArgb().ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("Color1ForShortcut", settings.Tools.Color1ForShortcut.ToArgb().ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("Color1", ColorTranslator.ToHtml(settings.Tools.Color1));
textWriter.WriteElementString("Color2ForShortcut", settings.Tools.Color2ForShortcut.ToArgb().ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("Color2", ColorTranslator.ToHtml(settings.Tools.Color2));
textWriter.WriteElementString("Color3ForShortcut", settings.Tools.Color3ForShortcut.ToArgb().ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("Color3", ColorTranslator.ToHtml(settings.Tools.Color3));
textWriter.WriteElementString("Color4ForShortcut", settings.Tools.Color4ForShortcut.ToArgb().ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("Color4", ColorTranslator.ToHtml(settings.Tools.Color4));
textWriter.WriteElementString("ListViewShowColumnEndTime", settings.Tools.ListViewShowColumnEndTime.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("ListViewShowColumnEndTime", settings.Tools.ListViewShowColumnEndTime.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ListViewShowColumnDuration", settings.Tools.ListViewShowColumnDuration.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("ListViewShowColumnDuration", settings.Tools.ListViewShowColumnDuration.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ListViewShowColumnCharsPerSec", settings.Tools.ListViewShowColumnCharsPerSec.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("ListViewShowColumnCharsPerSec", settings.Tools.ListViewShowColumnCharsPerSec.ToString(CultureInfo.InvariantCulture));

24
src/ui/Forms/Main.cs
View File

@ -628,22 +628,22 @@ namespace Nikse.SubtitleEdit.Forms
} }
else if (e.KeyData == _shortcuts.MainListViewColor1) else if (e.KeyData == _shortcuts.MainListViewColor1)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color1ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color1));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewColor2) else if (e.KeyData == _shortcuts.MainListViewColor2)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color2ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color2));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewColor3) else if (e.KeyData == _shortcuts.MainListViewColor3)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color3ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color3));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewColor4) else if (e.KeyData == _shortcuts.MainListViewColor4)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color4ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color4));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
} }
@ -9530,22 +9530,22 @@ namespace Nikse.SubtitleEdit.Forms
} }
else if (e.KeyData == _shortcuts.MainListViewColor1) else if (e.KeyData == _shortcuts.MainListViewColor1)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color1ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color1));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewColor2) else if (e.KeyData == _shortcuts.MainListViewColor2)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color2ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color2));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewColor3) else if (e.KeyData == _shortcuts.MainListViewColor3)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color3ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color3));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewColor4) else if (e.KeyData == _shortcuts.MainListViewColor4)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color4ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color4));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewToggleMusicSymbols) else if (e.KeyData == _shortcuts.MainListViewToggleMusicSymbols)
@ -17342,22 +17342,22 @@ namespace Nikse.SubtitleEdit.Forms
} }
else if (e.KeyData == _shortcuts.MainListViewColor1) else if (e.KeyData == _shortcuts.MainListViewColor1)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color1ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color1));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewColor2) else if (e.KeyData == _shortcuts.MainListViewColor2)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color2ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color2));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewColor3) else if (e.KeyData == _shortcuts.MainListViewColor3)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color3ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color3));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewColor4) else if (e.KeyData == _shortcuts.MainListViewColor4)
{ {
SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color4ForShortcut)); SetListViewColor(ColorTranslator.ToHtml(Configuration.Settings.Tools.Color4));
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (e.KeyData == _shortcuts.MainListViewFocusWaveform) else if (e.KeyData == _shortcuts.MainListViewFocusWaveform)

8
src/ui/Forms/Settings.cs
View File

@ -1283,10 +1283,10 @@ namespace Nikse.SubtitleEdit.Forms
AddNode(listViewAndTextBoxNode, language.AlignmentN7, nameof(Configuration.Settings.Shortcuts.MainListViewAlignmentN7)); AddNode(listViewAndTextBoxNode, language.AlignmentN7, nameof(Configuration.Settings.Shortcuts.MainListViewAlignmentN7));
AddNode(listViewAndTextBoxNode, language.AlignmentN8, nameof(Configuration.Settings.Shortcuts.MainListViewAlignmentN8)); AddNode(listViewAndTextBoxNode, language.AlignmentN8, nameof(Configuration.Settings.Shortcuts.MainListViewAlignmentN8));
AddNode(listViewAndTextBoxNode, language.AlignmentN9, nameof(Configuration.Settings.Shortcuts.MainListViewAlignmentN9)); AddNode(listViewAndTextBoxNode, language.AlignmentN9, nameof(Configuration.Settings.Shortcuts.MainListViewAlignmentN9));
AddNode(listViewAndTextBoxNode, string.Format(language.ColorX, "1", ColorTranslator.ToHtml(Configuration.Settings.Tools.Color1ForShortcut)), nameof(Configuration.Settings.Shortcuts.MainListViewColor1)); AddNode(listViewAndTextBoxNode, string.Format(language.ColorX, "1", ColorTranslator.ToHtml(Configuration.Settings.Tools.Color1)), nameof(Configuration.Settings.Shortcuts.MainListViewColor1));
AddNode(listViewAndTextBoxNode, string.Format(language.ColorX, "2", ColorTranslator.ToHtml(Configuration.Settings.Tools.Color2ForShortcut)), nameof(Configuration.Settings.Shortcuts.MainListViewColor2)); AddNode(listViewAndTextBoxNode, string.Format(language.ColorX, "2", ColorTranslator.ToHtml(Configuration.Settings.Tools.Color2)), nameof(Configuration.Settings.Shortcuts.MainListViewColor2));
AddNode(listViewAndTextBoxNode, string.Format(language.ColorX, "3", ColorTranslator.ToHtml(Configuration.Settings.Tools.Color3ForShortcut)), nameof(Configuration.Settings.Shortcuts.MainListViewColor3)); AddNode(listViewAndTextBoxNode, string.Format(language.ColorX, "3", ColorTranslator.ToHtml(Configuration.Settings.Tools.Color3)), nameof(Configuration.Settings.Shortcuts.MainListViewColor3));
AddNode(listViewAndTextBoxNode, string.Format(language.ColorX, "4", ColorTranslator.ToHtml(Configuration.Settings.Tools.Color4ForShortcut)), nameof(Configuration.Settings.Shortcuts.MainListViewColor4)); AddNode(listViewAndTextBoxNode, string.Format(language.ColorX, "4", ColorTranslator.ToHtml(Configuration.Settings.Tools.Color4)), nameof(Configuration.Settings.Shortcuts.MainListViewColor4));
AddNode(listViewAndTextBoxNode, Configuration.Settings.Language.Main.Menu.ContextMenu.RemoveFormattingAll, nameof(Configuration.Settings.Shortcuts.MainRemoveFormatting), true); AddNode(listViewAndTextBoxNode, Configuration.Settings.Language.Main.Menu.ContextMenu.RemoveFormattingAll, nameof(Configuration.Settings.Shortcuts.MainRemoveFormatting), true);
AddNode(listViewAndTextBoxNode, language.RemoveTimeCodes, nameof(Configuration.Settings.Shortcuts.MainListViewRemoveTimeCodes)); AddNode(listViewAndTextBoxNode, language.RemoveTimeCodes, nameof(Configuration.Settings.Shortcuts.MainListViewRemoveTimeCodes));
if (listViewAndTextBoxNode.Nodes.Count > 0) if (listViewAndTextBoxNode.Nodes.Count > 0)