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

minor cleanup

Browse Source
This commit is contained in:
niksedk 2014-03-23 21:25:03 +01:00
parent 4562d80387
commit ef0f7974ea
4 changed files with 70 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Forms/About.cs
View File

@ -8,8 +8,8 @@ namespace Nikse.SubtitleEdit.Forms
{
partial class About : Form
{
LanguageStructure.About _language = Configuration.Settings.Language.About;
LanguageStructure.General _languageGeneral = Configuration.Settings.Language.General;
private readonly LanguageStructure.About _language = Configuration.Settings.Language.About;
private readonly LanguageStructure.General _languageGeneral = Configuration.Settings.Language.General;
public About()
{
@ -33,14 +33,14 @@ namespace Nikse.SubtitleEdit.Forms
if (versionInfo.Length >= 4)
revisionNumber = versionInfo[3];
linkLabelGitBuildHash.Text = revisionNumber;
System.Windows.Forms.ToolTip ToolTip1 = new System.Windows.Forms.ToolTip();
ToolTip1.SetToolTip(linkLabelGitBuildHash, GetGitHubHashLink());
var toolTip1 = new ToolTip();
toolTip1.SetToolTip(linkLabelGitBuildHash, GetGitHubHashLink());
richTextBoxAbout1.Text = _language.AboutText1.TrimEnd() + Environment.NewLine +
Environment.NewLine +
_languageGeneral.TranslatedBy.Trim();
var height = TextDraw.MeasureTextHeight(richTextBoxAbout1.Font, richTextBoxAbout1.Text, false) * 1.4 + 80;
richTextBoxAbout1.Height = (int)height;
double height = TextDraw.MeasureTextHeight(richTextBoxAbout1.Font, richTextBoxAbout1.Text, false)*1.4 + 80;
richTextBoxAbout1.Height = (int) height;
Height = richTextBoxAbout1.Top + richTextBoxAbout1.Height + 90;
}

31
src/Forms/AddToNames.cs
View File

@ -1,17 +1,15 @@
using System;
using System.Windows.Forms;
using Nikse.SubtitleEdit.Logic;
using Nikse.SubtitleEdit.Logic;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
namespace Nikse.SubtitleEdit.Forms
{
public sealed partial class AddToNamesList : Form
{
LanguageStructure.Main _language;
Subtitle _subtitle;
public string NewName { get; private set; }
private LanguageStructure.Main _language;
private Subtitle _subtitle;
public AddToNamesList()
{
@ -24,16 +22,18 @@ namespace Nikse.SubtitleEdit.Forms
FixLargeFonts();
}
public string NewName { get; private set; }
private void FixLargeFonts()
{
if (labelDescription.Left + labelDescription.Width + 5 > Width)
Width = labelDescription.Left + labelDescription.Width + 5;
Graphics graphics = this.CreateGraphics();
SizeF textSize = graphics.MeasureString(buttonOK.Text, this.Font);
Graphics graphics = CreateGraphics();
SizeF textSize = graphics.MeasureString(buttonOK.Text, Font);
if (textSize.Height > buttonOK.Height - 4)
{
int newButtonHeight = (int)(textSize.Height + 7 + 0.5);
var newButtonHeight = (int) (textSize.Height + 7 + 0.5);
Utilities.SetButtonHeight(this, newButtonHeight, 1);
}
}
@ -61,7 +61,7 @@ namespace Nikse.SubtitleEdit.Forms
internal void Initialize(Subtitle subtitle, string hunspellName, string text)
{
_subtitle = subtitle;
_subtitle = subtitle;
if (!string.IsNullOrEmpty(text))
{
@ -71,7 +71,6 @@ namespace Nikse.SubtitleEdit.Forms
}
comboBoxDictionaries.Items.Clear();
string languageName = Utilities.AutoDetectLanguageName(Configuration.Settings.General.SpellCheckLanguage, _subtitle);
foreach (string name in Utilities.GetDictionaryLanguages())
{
comboBoxDictionaries.Items.Add(name);
@ -99,8 +98,8 @@ namespace Nikse.SubtitleEdit.Forms
if (list.Count > 0)
{
string name = list[0];
int start = name.LastIndexOf("[");
int end = name.LastIndexOf("]");
int start = name.LastIndexOf("[", StringComparison.Ordinal);
int end = name.LastIndexOf("]", StringComparison.Ordinal);
if (start > 0 && end > start)
{
start++;
@ -119,8 +118,8 @@ namespace Nikse.SubtitleEdit.Forms
if (comboBoxDictionaries.Items.Count > 0)
{
string name = comboBoxDictionaries.SelectedItem.ToString();
int start = name.LastIndexOf("[");
int end = name.LastIndexOf("]");
int start = name.LastIndexOf("[", StringComparison.Ordinal);
int end = name.LastIndexOf("]", StringComparison.Ordinal);
if (start >= 0 && end > start)
{
start++;

48
src/Forms/ChangeCasing.cs
View File

@ -1,17 +1,17 @@
using System;
using Nikse.SubtitleEdit.Logic;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Windows.Forms;
using Nikse.SubtitleEdit.Logic;
using System.Text.RegularExpressions;
using System.Drawing;
using System.Globalization;
using System.Text.RegularExpressions;
using System.Windows.Forms;
namespace Nikse.SubtitleEdit.Forms
{
public sealed partial class ChangeCasing : Form
{
private int _noOfLinesChanged;
private static readonly Regex AloneI = new Regex(@"\bi\b", RegexOptions.Compiled);
private int _noOfLinesChanged;
public ChangeCasing()
{
@ -38,26 +38,9 @@ namespace Nikse.SubtitleEdit.Forms
radioButtonLowercase.Checked = true;
}
private void FixLargeFonts()
{
if (radioButtonNormal.Left + radioButtonNormal.Width + 40 > Width)
Width = radioButtonNormal.Left + radioButtonNormal.Width + 40;
Graphics graphics = CreateGraphics();
SizeF textSize = graphics.MeasureString(buttonOK.Text, Font);
if (textSize.Height > buttonOK.Height - 4)
{
int newButtonHeight = (int)(textSize.Height + 7 + 0.5);
Utilities.SetButtonHeight(this, newButtonHeight, 1);
}
}
public int LinesChanged
{
get
{
return _noOfLinesChanged;
}
get { return _noOfLinesChanged; }
}
public bool ChangeNamesToo
@ -69,12 +52,26 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void FixLargeFonts()
{
if (radioButtonNormal.Left + radioButtonNormal.Width + 40 > Width)
Width = radioButtonNormal.Left + radioButtonNormal.Width + 40;
Graphics graphics = CreateGraphics();
SizeF textSize = graphics.MeasureString(buttonOK.Text, Font);
if (textSize.Height > buttonOK.Height - 4)
{
var newButtonHeight = (int) (textSize.Height + 7 + 0.5);
Utilities.SetButtonHeight(this, newButtonHeight, 1);
}
}
internal void FixCasing(Subtitle subtitle, string language)
{
var namesEtc = new List<string>();
var tmp = new List<string>();
Utilities.LoadNamesEtcWordLists(tmp, tmp, language);
foreach (var s in tmp)
foreach (string s in tmp)
{
if (s.Contains("."))
namesEtc.Add(s);
@ -180,5 +177,6 @@ namespace Nikse.SubtitleEdit.Forms
Configuration.Settings.Tools.ChangeCasingChoice = "Lowercase";
DialogResult = DialogResult.OK;
}
}
}

45
src/Forms/ChangeCasingNames.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
using System.Text;
using System.Windows.Forms;
using Nikse.SubtitleEdit.Logic;
@ -9,9 +10,9 @@ namespace Nikse.SubtitleEdit.Forms
{
public sealed partial class ChangeCasingNames : Form
{
readonly List<string> _usedNames = new List<string>();
Subtitle _subtitle;
int _noOfLinesChanged;
private readonly List<string> _usedNames = new List<string>();
private int _noOfLinesChanged;
private Subtitle _subtitle;
public ChangeCasingNames()
{
@ -35,13 +36,18 @@ namespace Nikse.SubtitleEdit.Forms
FixLargeFonts();
}
public int LinesChanged
{
get { return _noOfLinesChanged; }
}
private void FixLargeFonts()
{
Graphics graphics = this.CreateGraphics();
SizeF textSize = graphics.MeasureString(buttonOK.Text, this.Font);
Graphics graphics = CreateGraphics();
SizeF textSize = graphics.MeasureString(buttonOK.Text, Font);
if (textSize.Height > buttonOK.Height - 4)
{
int newButtonHeight = (int)(textSize.Height + 7 + 0.5);
var newButtonHeight = (int) (textSize.Height + 7 + 0.5);
Utilities.SetButtonHeight(this, newButtonHeight, 1);
}
}
@ -88,7 +94,7 @@ namespace Nikse.SubtitleEdit.Forms
if (item.Checked && text != null && text.ToLower().Contains(name.ToLower()) && name.Length > 1 && name != name.ToLower())
{
var st = new StripableText(text);
st.FixCasing(new List<string> { name }, true, false, false, string.Empty);
st.FixCasing(new List<string> {name}, true, false, false, string.Empty);
text = st.MergedString;
}
}
@ -105,7 +111,7 @@ namespace Nikse.SubtitleEdit.Forms
{
var item = new ListViewItem(string.Empty) {Tag = p, Checked = true};
var subItem = new ListViewItem.ListViewSubItem(item, p.Number.ToString());
var subItem = new ListViewItem.ListViewSubItem(item, p.Number.ToString(CultureInfo.InvariantCulture));
item.SubItems.Add(subItem);
subItem = new ListViewItem.ListViewSubItem(item, p.Text.Replace(Environment.NewLine, Configuration.Settings.General.ListViewLineSeparatorString));
item.SubItems.Add(subItem);
@ -147,20 +153,20 @@ namespace Nikse.SubtitleEdit.Forms
{
if (textToLower.Contains(name.ToLower())) // Optimization - Contains is much faster than IndexOf
{
int startIndex = textToLower.IndexOf(name.ToLower());
int startIndex = textToLower.IndexOf(name.ToLower(), StringComparison.Ordinal);
while (startIndex >= 0 && startIndex < text.Length &&
textToLower.Substring(startIndex).Contains(name.ToLower()) && name.Length > 1 && name != name.ToLower())
{
bool startOk = (startIndex == 0) || (text[startIndex - 1] == ' ') || (text[startIndex - 1] == '-') ||
(text[startIndex - 1] == '"') || (text[startIndex - 1] == '\'') || (text[startIndex - 1] == '>') ||
(Environment.NewLine.EndsWith(text[startIndex - 1].ToString()));
(Environment.NewLine.EndsWith(text[startIndex - 1].ToString(CultureInfo.InvariantCulture)));
if (startOk)
{
int end = startIndex + name.Length;
bool endOk = end <= text.Length;
if (endOk)
endOk = (end == text.Length) || ((" ,.!?:;')-<\"" + Environment.NewLine).Contains(text[end].ToString()));
endOk = (end == text.Length) || ((" ,.!?:;')-<\"" + Environment.NewLine).Contains(text[end].ToString(CultureInfo.InvariantCulture)));
if (endOk && text.Substring(startIndex, name.Length) != name) // do not add names where casing already is correct
{
@ -173,7 +179,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
startIndex = textToLower.IndexOf(name.ToLower(), startIndex + 2);
startIndex = textToLower.IndexOf(name.ToLower(), startIndex + 2, StringComparison.Ordinal);
}
}
}
@ -197,18 +203,18 @@ namespace Nikse.SubtitleEdit.Forms
string lower = text.ToLower();
if (lower.Contains(name.ToLower()) && name.Length > 1 && name != name.ToLower())
{
int start = lower.IndexOf(name.ToLower());
int start = lower.IndexOf(name.ToLower(), StringComparison.Ordinal);
if (start >= 0)
{
bool startOk = (start == 0) || (lower[start - 1] == ' ') || (lower[start - 1] == '-') || (lower[start - 1] == '"') ||
(lower[start - 1] == '\'') || (lower[start - 1] == '>') || (Environment.NewLine.EndsWith(lower[start - 1].ToString()));
(lower[start - 1] == '\'') || (lower[start - 1] == '>') || (Environment.NewLine.EndsWith(lower[start - 1].ToString(CultureInfo.InvariantCulture)));
if (startOk)
{
int end = start + name.Length;
bool endOk = end <= lower.Length;
if (endOk)
endOk = end == lower.Length || (" ,.!?:;')<-\"" + Environment.NewLine).Contains(lower[end].ToString());
endOk = end == lower.Length || (" ,.!?:;')<-\"" + Environment.NewLine).Contains(lower[end].ToString(CultureInfo.InvariantCulture));
item.Selected = endOk;
}
@ -246,14 +252,6 @@ namespace Nikse.SubtitleEdit.Forms
}
}
public int LinesChanged
{
get
{
return _noOfLinesChanged;
}
}
private void ButtonOkClick(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
@ -288,5 +286,6 @@ namespace Nikse.SubtitleEdit.Forms
listViewNames.ItemChecked += ListViewNamesItemChecked;
GeneratePreview();
}
}
}