Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2025-01-31 21:11:39 +01:00
Code Issues Projects Releases Wiki Activity

Option to calculate CPS with or without space - thx Chris :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2017-04-09 15:47:36 +02:00
parent 4b093572bf
commit 13ddf47cb8
7 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LanguageMaster.xml
View File

@ -1929,6 +1929,7 @@ can edit in same subtitle file (collaboration)</Information>
<MainTextBoxUnbreak>Unbreak text</MainTextBoxUnbreak>
<MainFileSaveAll>Save all</MainFileSaveAll>
<Miscellaneous>Misc.</Miscellaneous>
<CpsIncludesSpace>Chars/sec (CPS) includes spaces</CpsIncludesSpace>
<UseDoNotBreakAfterList>Use do-not-break-after list (for auto-br)</UseDoNotBreakAfterList>
<MicrosoftBingTranslator>Microsoft Bing Translator</MicrosoftBingTranslator>
<HowToSignUp>How to sign up</HowToSignUp>

1
libse/Language.cs
View File

@ -2213,6 +2213,7 @@ can edit in same subtitle file (collaboration)",
MainFileSaveAll = "Save all",
Miscellaneous = "Misc.",
UseDoNotBreakAfterList = "Use do-not-break-after list (for auto-br)",
CpsIncludesSpace = "Chars/sec (CPS) includes spaces",
MicrosoftBingTranslator = "Microsoft Bing Translator",
HowToSignUp = "How to sign up",
ClientId = "Client ID",

3
libse/LanguageDeserializer.cs
View File

@ -5239,6 +5239,9 @@ namespace Nikse.SubtitleEdit.Core
case "Settings/Miscellaneous":
language.Settings.Miscellaneous = reader.Value;
break;
case "Settings/CpsIncludesSpace":
language.Settings.CpsIncludesSpace = reader.Value;
break;
case "Settings/UseDoNotBreakAfterList":
language.Settings.UseDoNotBreakAfterList = reader.Value;
break;

1
libse/LanguageStructure.cs
View File

@ -2093,6 +2093,7 @@
public string MainTextBoxUnbreak { get; set; }
public string MainFileSaveAll { get; set; }
public string Miscellaneous { get; set; }
public string CpsIncludesSpace { get; set; }
public string UseDoNotBreakAfterList { get; set; }
public string MicrosoftBingTranslator { get; set; }
public string HowToSignUp { get; set; }

6
src/Forms/Main.cs
View File

@ -3933,6 +3933,7 @@ namespace Nikse.SubtitleEdit.Forms
string oldVideoPlayer = Configuration.Settings.General.VideoPlayer;
string oldMpvVideoOutput = Configuration.Settings.General.MpvVideoOutput;
string oldListViewLineSeparatorString = Configuration.Settings.General.ListViewLineSeparatorString;
var oldCpsWhiteSpaceSetting = Configuration.Settings.General.CharactersPerSecondsIgnoreWhiteSpace;
string oldSubtitleFontSettings = Configuration.Settings.General.SubtitleFontName +
Configuration.Settings.General.SubtitleFontBold +
Configuration.Settings.General.CenterSubtitleInTextBox +
@ -4071,8 +4072,9 @@ namespace Nikse.SubtitleEdit.Forms
mediaPlayer.ShowStopButton = Configuration.Settings.General.VideoPlayerShowStopButton;
mediaPlayer.ShowMuteButton = Configuration.Settings.General.VideoPlayerShowMuteButton;
mediaPlayer.ShowFullscreenButton = Configuration.Settings.General.VideoPlayerShowFullscreenButton;
if (oldListViewLineSeparatorString != Configuration.Settings.General.ListViewLineSeparatorString)
if (oldListViewLineSeparatorString != Configuration.Settings.General.ListViewLineSeparatorString ||
oldCpsWhiteSpaceSetting != Configuration.Settings.General.CharactersPerSecondsIgnoreWhiteSpace)
{
SubtitleListview1.InitializeLanguage(_languageGeneral, Configuration.Settings);
SaveSubtitleListviewIndices();

37
src/Forms/Settings.Designer.cs generated
View File

@ -130,6 +130,7 @@
this.labelCustomSearch = new System.Windows.Forms.Label();
this.comboBoxCustomSearch1 = new System.Windows.Forms.ComboBox();
this.groupBoxVideoPlayerDefault = new System.Windows.Forms.GroupBox();
this.checkBoxVideoAutoOpen = new System.Windows.Forms.CheckBox();
this.checkBoxVideoPlayerPreviewFontBold = new System.Windows.Forms.CheckBox();
this.checkBoxVideoPlayerShowFullscreenButton = new System.Windows.Forms.CheckBox();
this.checkBoxVideoPlayerShowMuteButton = new System.Windows.Forms.CheckBox();
@ -331,7 +332,7 @@
this.colorDialogSSAStyle = new System.Windows.Forms.ColorDialog();
this.labelStatus = new System.Windows.Forms.Label();
this.openFileDialogFFmpeg = new System.Windows.Forms.OpenFileDialog();
this.checkBoxVideoAutoOpen = new System.Windows.Forms.CheckBox();
this.checkBoxCpsIncludeWhiteSpace = new System.Windows.Forms.CheckBox();
this.tabControlSettings.SuspendLayout();
this.tabPageGeneral.SuspendLayout();
this.groupBoxMiscellaneous.SuspendLayout();
@ -1800,6 +1801,16 @@
this.groupBoxVideoPlayerDefault.TabIndex = 14;
this.groupBoxVideoPlayerDefault.TabStop = false;
//
// checkBoxVideoAutoOpen
//
this.checkBoxVideoAutoOpen.AutoSize = true;
this.checkBoxVideoAutoOpen.Location = new System.Drawing.Point(334, 68);
this.checkBoxVideoAutoOpen.Name = "checkBoxVideoAutoOpen";
this.checkBoxVideoAutoOpen.Size = new System.Drawing.Size(213, 17);
this.checkBoxVideoAutoOpen.TabIndex = 24;
this.checkBoxVideoAutoOpen.Text = "Auto open video when opening subtitle";
this.checkBoxVideoAutoOpen.UseVisualStyleBackColor = true;
//
// checkBoxVideoPlayerPreviewFontBold
//
this.checkBoxVideoPlayerPreviewFontBold.AutoSize = true;
@ -2574,6 +2585,7 @@
//
// groupBoxToolsMisc
//
this.groupBoxToolsMisc.Controls.Add(this.checkBoxCpsIncludeWhiteSpace);
this.groupBoxToolsMisc.Controls.Add(this.labelUserBingApiId);
this.groupBoxToolsMisc.Controls.Add(this.buttonEditDoNotBreakAfterList);
this.groupBoxToolsMisc.Controls.Add(this.checkBoxUseDoNotBreakAfterList);
@ -2594,7 +2606,7 @@
//
// buttonEditDoNotBreakAfterList
//
this.buttonEditDoNotBreakAfterList.Location = new System.Drawing.Point(34, 43);
this.buttonEditDoNotBreakAfterList.Location = new System.Drawing.Point(34, 76);
this.buttonEditDoNotBreakAfterList.Name = "buttonEditDoNotBreakAfterList";
this.buttonEditDoNotBreakAfterList.Size = new System.Drawing.Size(75, 23);
this.buttonEditDoNotBreakAfterList.TabIndex = 23;
@ -2605,10 +2617,10 @@
// checkBoxUseDoNotBreakAfterList
//
this.checkBoxUseDoNotBreakAfterList.AutoSize = true;
this.checkBoxUseDoNotBreakAfterList.Location = new System.Drawing.Point(15, 20);
this.checkBoxUseDoNotBreakAfterList.Location = new System.Drawing.Point(15, 53);
this.checkBoxUseDoNotBreakAfterList.Name = "checkBoxUseDoNotBreakAfterList";
this.checkBoxUseDoNotBreakAfterList.Size = new System.Drawing.Size(218, 17);
this.checkBoxUseDoNotBreakAfterList.TabIndex = 0;
this.checkBoxUseDoNotBreakAfterList.TabIndex = 1;
this.checkBoxUseDoNotBreakAfterList.Text = "Use \'do-not-beak-after\' list (for auto-br)";
this.checkBoxUseDoNotBreakAfterList.UseVisualStyleBackColor = true;
//
@ -3963,15 +3975,15 @@
//
this.openFileDialogFFmpeg.FileName = "openFileDialog1";
//
// checkBoxVideoAutoOpen
// checkBoxCpsIncludeWhiteSpace
//
this.checkBoxVideoAutoOpen.AutoSize = true;
this.checkBoxVideoAutoOpen.Location = new System.Drawing.Point(334, 68);
this.checkBoxVideoAutoOpen.Name = "checkBoxVideoAutoOpen";
this.checkBoxVideoAutoOpen.Size = new System.Drawing.Size(213, 17);
this.checkBoxVideoAutoOpen.TabIndex = 24;
this.checkBoxVideoAutoOpen.Text = "Auto open video when opening subtitle";
this.checkBoxVideoAutoOpen.UseVisualStyleBackColor = true;
this.checkBoxCpsIncludeWhiteSpace.AutoSize = true;
this.checkBoxCpsIncludeWhiteSpace.Location = new System.Drawing.Point(15, 21);
this.checkBoxCpsIncludeWhiteSpace.Name = "checkBoxCpsIncludeWhiteSpace";
this.checkBoxCpsIncludeWhiteSpace.Size = new System.Drawing.Size(274, 17);
this.checkBoxCpsIncludeWhiteSpace.TabIndex = 0;
this.checkBoxCpsIncludeWhiteSpace.Text = "Characters per second (CPS) includes white spaces";
this.checkBoxCpsIncludeWhiteSpace.UseVisualStyleBackColor = true;
//
// Settings
//
@ -4400,5 +4412,6 @@
private System.Windows.Forms.Label labelMaxWordsPerMin;
private System.Windows.Forms.CheckBox checkBoxMpvHandlesPreviewText;
private System.Windows.Forms.CheckBox checkBoxVideoAutoOpen;
private System.Windows.Forms.CheckBox checkBoxCpsIncludeWhiteSpace;
}
}

3
src/Forms/Settings.cs
View File

@ -512,6 +512,7 @@ namespace Nikse.SubtitleEdit.Forms
groupBoxToolsMisc.Text = language.Miscellaneous;
checkBoxUseDoNotBreakAfterList.Text = language.UseDoNotBreakAfterList;
checkBoxCpsIncludeWhiteSpace.Text = language.CpsIncludesSpace;
buttonEditDoNotBreakAfterList.Text = Configuration.Settings.Language.VobSubOcr.Edit;
comboBoxListViewDoubleClickEvent.Items.Clear();
@ -640,6 +641,7 @@ namespace Nikse.SubtitleEdit.Forms
checkBoxSpellCheckOneLetterWords.Checked = toolsSettings.SpellCheckOneLetterWords;
checkBoxTreatINQuoteAsING.Checked = toolsSettings.SpellCheckEnglishAllowInQuoteAsIng;
checkBoxUseDoNotBreakAfterList.Checked = toolsSettings.UseNoLineBreakAfter;
checkBoxCpsIncludeWhiteSpace.Checked = !Configuration.Settings.General.CharactersPerSecondsIgnoreWhiteSpace;
textBoxBingClientId.Text = Configuration.Settings.Tools.MicrosoftBingClientId;
textBoxBingClientSecret.Text = Configuration.Settings.Tools.MicrosoftBingClientSecret;
@ -1199,6 +1201,7 @@ namespace Nikse.SubtitleEdit.Forms
toolsSettings.SpellCheckOneLetterWords = checkBoxSpellCheckOneLetterWords.Checked;
toolsSettings.SpellCheckEnglishAllowInQuoteAsIng = checkBoxTreatINQuoteAsING.Checked;
toolsSettings.UseNoLineBreakAfter = checkBoxUseDoNotBreakAfterList.Checked;
Configuration.Settings.General.CharactersPerSecondsIgnoreWhiteSpace = !checkBoxCpsIncludeWhiteSpace.Checked;
toolsSettings.OcrFixUseHardcodedRules = checkBoxFixCommonOcrErrorsUsingHardcodedRules.Checked;
toolsSettings.FixShortDisplayTimesAllowMoveStartTime = checkBoxFixShortDisplayTimesAllowMoveStartTime.Checked;
toolsSettings.FixCommonErrorsSkipStepOne = checkBoxFceSkipStep1.Checked;