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

Working on edit of original sub

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@260 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2011-01-17 20:30:40 +00:00
parent 664f3a8377
commit 3914166d9b
4 changed files with 169 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
src/Forms/Main.cs
View File

@ -151,6 +151,14 @@ namespace Nikse.SubtitleEdit.Forms
try
{
InitializeComponent();
textBoxListViewTextAlternate.Visible = false;
labelAlternateText.Visible = false;
labelAlternateCharactersPerSecond.Visible = false;
labelTextAlternateLineLengths.Visible = false;
labelAlternateSingleLine.Visible = false;
labelTextAlternateLineTotal.Visible = false;
toolStripMenuItemTranslationMode.ShortcutKeys = Keys.Control | Keys.Alt | Keys.O;
toolStripMenuItemTranslationMode.ShortcutKeyDisplayString = "Ctrl+Alt+O";
SetLanguage(Configuration.Settings.General.Language);
@ -773,31 +781,68 @@ namespace Nikse.SubtitleEdit.Forms
if (dr == DialogResult.Cancel)
return false;
if (dr == DialogResult.No)
return true;
if (string.IsNullOrEmpty(_fileName))
if (dr == DialogResult.Yes)
{
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
saveFileDialog1.InitialDirectory = openFileDialog1.InitialDirectory;
saveFileDialog1.Title = _language.SaveSubtitleAs;
if (saveFileDialog1.ShowDialog(this) == DialogResult.OK)
if (string.IsNullOrEmpty(_fileName))
{
openFileDialog1.InitialDirectory = saveFileDialog1.InitialDirectory;
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
saveFileDialog1.InitialDirectory = openFileDialog1.InitialDirectory;
saveFileDialog1.Title = _language.SaveSubtitleAs;
if (saveFileDialog1.ShowDialog(this) == DialogResult.OK)
{
openFileDialog1.InitialDirectory = saveFileDialog1.InitialDirectory;
_fileName = saveFileDialog1.FileName;
Text = Title + " - " + _fileName;
Configuration.Settings.RecentFiles.Add(_fileName, FirstVisibleIndex, FirstSelectedIndex, _videoFileName, _subtitleAlternateFileName);
Configuration.Settings.Save();
_fileName = saveFileDialog1.FileName;
Text = Title + " - " + _fileName;
Configuration.Settings.RecentFiles.Add(_fileName, FirstVisibleIndex, FirstSelectedIndex, _videoFileName, _subtitleAlternateFileName);
Configuration.Settings.Save();
if (SaveSubtitle(GetCurrentSubtitleFormat()) == DialogResult.OK)
return true;
}
else
{
return false;
}
}
return false;
if (SaveSubtitle(GetCurrentSubtitleFormat()) != DialogResult.OK)
return false;
}
}
return ContinueNewOrExitAlternate();
}
private bool ContinueNewOrExitAlternate()
{
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0 && _changeAlternate)
{
string promptText = _language.SaveChangesToUntitledOriginal;
if (!string.IsNullOrEmpty(_subtitleAlternateFileName))
promptText = string.Format(_language.SaveChangesToOriginalX, _subtitleAlternateFileName);
DialogResult dr = MessageBox.Show(promptText, Title, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Exclamation);
if (dr == DialogResult.Cancel)
return false;
if (dr == DialogResult.Yes)
{
if (string.IsNullOrEmpty(_subtitleAlternateFileName))
{
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
saveFileDialog1.InitialDirectory = openFileDialog1.InitialDirectory;
saveFileDialog1.Title = _language.SaveOriginalSubtitleAs;
if (saveFileDialog1.ShowDialog(this) == DialogResult.OK)
{
openFileDialog1.InitialDirectory = saveFileDialog1.InitialDirectory;
_subtitleAlternateFileName = saveFileDialog1.FileName;
}
else
{
return false;
}
}
if (SaveOriginalSubtitle(GetCurrentSubtitleFormat()) != DialogResult.OK)
return false;
}
if (SaveSubtitle(GetCurrentSubtitleFormat()) == DialogResult.OK)
return true;
return false;
}
return true;
}
@ -1368,6 +1413,46 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private DialogResult SaveOriginalSubtitle(SubtitleFormat format)
{
try
{
string allText = _subtitleAlternate.ToText(format).Trim();
var currentEncoding = GetCurrentEncoding();
if (currentEncoding == Encoding.Default && (allText.Contains("♪") || allText.Contains("♫") | allText.Contains("♥"))) // ANSI & music/unicode symbols
{
if (MessageBox.Show(string.Format(_language.UnicodeMusicSymbolsAnsiWarning), Title, MessageBoxButtons.YesNo) == DialogResult.No)
return DialogResult.No;
}
bool containsNegativeTime = false;
foreach (var p in _subtitleAlternate.Paragraphs)
{
if (p.StartTime.TotalMilliseconds < 0 || p.EndTime.TotalMilliseconds < 0)
{
containsNegativeTime = true;
break;
}
}
if (containsNegativeTime && !string.IsNullOrEmpty(_language.NegativeTimeWarning))
{
if (MessageBox.Show(_language.NegativeTimeWarning, Title, MessageBoxButtons.YesNo) == DialogResult.No)
return DialogResult.No;
}
File.WriteAllText(_subtitleAlternateFileName, allText, currentEncoding);
ShowStatus(string.Format(_language.SavedOriginalSubtitleX, _subtitleAlternateFileName));
_changeAlternate = false;
return DialogResult.OK;
}
catch
{
MessageBox.Show(string.Format(_language.UnableToSaveSubtitleX, _fileName));
return DialogResult.Cancel;
}
}
private void NewToolStripMenuItemClick(object sender, EventArgs e)
{
ReloadFromSourceView();
@ -1386,7 +1471,8 @@ namespace Nikse.SubtitleEdit.Forms
_fileDateTime = new DateTime();
Text = Title;
_oldSubtitleFormat = null;
labelSingleLine.Text = string.Empty;
RemoveAlternate();
comboBoxEncoding.Items[0] = "ANSI - " + Encoding.Default.CodePage.ToString();
if (Configuration.Settings.General.DefaultEncoding == "ANSI")
@ -3240,7 +3326,7 @@ namespace Nikse.SubtitleEdit.Forms
newParagraph.EndTime.TotalMilliseconds = 3000;
}
if (_subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
{
if (next != null)
{
@ -3314,7 +3400,7 @@ namespace Nikse.SubtitleEdit.Forms
newParagraph.EndTime.TotalMilliseconds = 3000;
}
if (_subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
{
if (prev != null)
{
@ -3408,9 +3494,12 @@ namespace Nikse.SubtitleEdit.Forms
_oldSelectedParagraph = new Paragraph(p);
UpdateListViewTextInfo(labelTextLineLengths, labelSingleLine, labelTextLineTotal, labelCharactersPerSecond, p);
InitializeListViewEditBoxAlternate(p, firstSelectedIndex);
labelAlternateCharactersPerSecond.Left = textBoxListViewTextAlternate.Left + (textBoxListViewTextAlternate.Width - labelAlternateCharactersPerSecond.Width);
labelTextAlternateLineTotal.Left = textBoxListViewTextAlternate.Left + (textBoxListViewTextAlternate.Width - labelTextAlternateLineTotal.Width);
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
{
InitializeListViewEditBoxAlternate(p, firstSelectedIndex);
labelAlternateCharactersPerSecond.Left = textBoxListViewTextAlternate.Left + (textBoxListViewTextAlternate.Width - labelAlternateCharactersPerSecond.Width);
labelTextAlternateLineTotal.Left = textBoxListViewTextAlternate.Left + (textBoxListViewTextAlternate.Width - labelTextAlternateLineTotal.Width);
}
}
}
}
@ -3942,7 +4031,7 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.SetDuration(firstSelectedIndex, currentParagraph);
_change = true;
if (_subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
{
Paragraph original = Utilities.GetOriginalParagraph(firstSelectedIndex, currentParagraph, _subtitleAlternate.Paragraphs);
if (original != null)
@ -3988,7 +4077,9 @@ namespace Nikse.SubtitleEdit.Forms
{
textBoxListViewTextAlternate.Enabled = true;
textBoxListViewTextAlternate.TextChanged -= TextBoxListViewTextAlternateTextChanged;
bool changeAlternate = _changeAlternate;
textBoxListViewTextAlternate.Text = original.Text;
_changeAlternate = changeAlternate;
textBoxListViewTextAlternate.TextChanged += TextBoxListViewTextAlternateTextChanged;
//UpdateOverlapErrors(timeUpDownStartTime.TimeCode);
UpdateListViewTextCharactersPerSeconds(labelAlternateCharactersPerSecond, p);
@ -4023,7 +4114,7 @@ namespace Nikse.SubtitleEdit.Forms
UpdateStartTimeInfo(timeUpDownStartTime.TimeCode);
_change = true;
if (_subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
{
int firstSelectedIndex = FirstSelectedIndex;
Paragraph p = _subtitle.GetParagraphOrDefault(firstSelectedIndex);
@ -6004,18 +6095,21 @@ namespace Nikse.SubtitleEdit.Forms
private void OpenAlternateSubtitle()
{
SaveSubtitleListviewIndexes();
openFileDialog1.Title = Configuration.Settings.Language.General.OpenOriginalSubtitleFile;
openFileDialog1.FileName = string.Empty;
openFileDialog1.Filter = Utilities.GetOpenDialogFiler();
if (!(openFileDialog1.ShowDialog(this) == DialogResult.OK))
return;
if (ContinueNewOrExitAlternate())
{
SaveSubtitleListviewIndexes();
openFileDialog1.Title = Configuration.Settings.Language.General.OpenOriginalSubtitleFile;
openFileDialog1.FileName = string.Empty;
openFileDialog1.Filter = Utilities.GetOpenDialogFiler();
if (!(openFileDialog1.ShowDialog(this) == DialogResult.OK))
return;
if (!LoadAlternateSubtitleFile(openFileDialog1.FileName))
return;
if (!LoadAlternateSubtitleFile(openFileDialog1.FileName))
return;
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
RestoreSubtitleListviewIndexes();
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
RestoreSubtitleListviewIndexes();
}
}
private bool LoadAlternateSubtitleFile(string fileName)
@ -6049,7 +6143,7 @@ namespace Nikse.SubtitleEdit.Forms
else
_subtitleAlternate.CalculateFrameNumbersFromTimeCodes(CurrentFrameRate);
if (_subtitleAlternate.Paragraphs.Count > 1)
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate.Paragraphs.Count > 1)
{
buttonUnBreak.Visible = false;
buttonUndoListViewChanges.Visible = false;
@ -6424,7 +6518,7 @@ namespace Nikse.SubtitleEdit.Forms
{
panelVideoPlayer.Invalidate();
if (_subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
{
textBoxListViewText.Width = (groupBoxEdit.Width - (textBoxListViewText.Left + 10)) / 2;
textBoxListViewTextAlternate.Left = textBoxListViewText.Left + textBoxListViewText.Width + 3;
@ -7007,7 +7101,7 @@ namespace Nikse.SubtitleEdit.Forms
{
toolStripMenuItemOpenContainingFolder.Visible = !string.IsNullOrEmpty(_fileName) && File.Exists(_fileName);
if (_subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
{
saveOriginalToolStripMenuItem.Visible = true;
saveOriginalAstoolStripMenuItem.Visible = true;
@ -8581,7 +8675,8 @@ namespace Nikse.SubtitleEdit.Forms
DialogResult result = saveFileDialog1.ShowDialog(this);
if (result == DialogResult.OK)
{
//TODO!!!!
_subtitleAlternateFileName = saveFileDialog1.FileName;
SaveOriginalSubtitle(GetCurrentSubtitleFormat());
}
}
@ -8597,47 +8692,7 @@ namespace Nikse.SubtitleEdit.Forms
try
{
string allText = _subtitleAlternate.ToText(format).Trim();
var currentEncoding = GetCurrentEncoding();
if (currentEncoding == Encoding.Default && (allText.Contains("♪") || allText.Contains("♫") | allText.Contains("♥"))) // ANSI & music/unicode symbols
{
if (MessageBox.Show(string.Format(_language.UnicodeMusicSymbolsAnsiWarning), Title, MessageBoxButtons.YesNo) == DialogResult.No)
return;
}
bool containsNegativeTime = false;
foreach (var p in _subtitleAlternate.Paragraphs)
{
if (p.StartTime.TotalMilliseconds < 0 || p.EndTime.TotalMilliseconds < 0)
{
containsNegativeTime = true;
break;
}
}
if (containsNegativeTime && !string.IsNullOrEmpty(_language.NegativeTimeWarning))
{
if (MessageBox.Show(_language.NegativeTimeWarning, Title, MessageBoxButtons.YesNo) == DialogResult.No)
return;
}
if (File.Exists(_subtitleAlternateFileName))
{
DateTime fileOnDisk = File.GetLastWriteTime(_subtitleAlternateFileName);
if (_fileDateTime != fileOnDisk && _fileDateTime != new DateTime())
{
if (MessageBox.Show(string.Format(_language.OverwriteModifiedFile,
_fileName, fileOnDisk.ToShortDateString(), fileOnDisk.ToString("HH:mm:ss"),
Environment.NewLine, _fileDateTime.ToShortDateString(), _fileDateTime.ToString("HH:mm:ss")),
Title + " - " + _language.FileOnDiskModified, MessageBoxButtons.YesNo) == DialogResult.No)
return;
}
File.Delete(_subtitleAlternateFileName);
}
File.WriteAllText(_subtitleAlternateFileName, allText, currentEncoding);
_fileDateTime = File.GetLastWriteTime(_subtitleAlternateFileName);
ShowStatus(string.Format(_language.SavedSubtitleX, _subtitleAlternateFileName));
_changeAlternate = false;
SaveOriginalSubtitle(GetCurrentSubtitleFormat());
}
catch
{
@ -8646,6 +8701,14 @@ namespace Nikse.SubtitleEdit.Forms
}
private void removeOriginalToolStripMenuItem_Click(object sender, EventArgs e)
{
if (ContinueNewOrExitAlternate())
{
RemoveAlternate();
}
}
private void RemoveAlternate()
{
SubtitleListview1.HideAlternateTextColumn();
_subtitleAlternate = new Subtitle();

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

@ -194,6 +194,7 @@
this.colorDialogSSAStyle = new System.Windows.Forms.ColorDialog();
this.fontDialogSSAStyle = new System.Windows.Forms.FontDialog();
this.labelStatus = new System.Windows.Forms.Label();
this.checkBoxAllowEditOfOriginalSubtitle = new System.Windows.Forms.CheckBox();
this.tabControlSettings.SuspendLayout();
this.tabPageGenerel.SuspendLayout();
this.groupBoxMiscellaneous.SuspendLayout();
@ -285,6 +286,7 @@
//
// groupBoxMiscellaneous
//
this.groupBoxMiscellaneous.Controls.Add(this.checkBoxAllowEditOfOriginalSubtitle);
this.groupBoxMiscellaneous.Controls.Add(this.comboBoxSpellChecker);
this.groupBoxMiscellaneous.Controls.Add(this.labelSpellChecker);
this.groupBoxMiscellaneous.Controls.Add(this.panelSubtitleBackgroundColor);
@ -486,7 +488,7 @@
this.checkBoxRememberWindowPosition.AutoSize = true;
this.checkBoxRememberWindowPosition.Location = new System.Drawing.Point(436, 101);
this.checkBoxRememberWindowPosition.Name = "checkBoxRememberWindowPosition";
this.checkBoxRememberWindowPosition.Size = new System.Drawing.Size(222, 17);
this.checkBoxRememberWindowPosition.Size = new System.Drawing.Size(223, 17);
this.checkBoxRememberWindowPosition.TabIndex = 13;
this.checkBoxRememberWindowPosition.Text = "Remember main window position and size";
this.checkBoxRememberWindowPosition.UseVisualStyleBackColor = true;
@ -533,7 +535,7 @@
this.checkBoxStartInSourceView.AutoSize = true;
this.checkBoxStartInSourceView.Location = new System.Drawing.Point(436, 124);
this.checkBoxStartInSourceView.Name = "checkBoxStartInSourceView";
this.checkBoxStartInSourceView.Size = new System.Drawing.Size(119, 17);
this.checkBoxStartInSourceView.Size = new System.Drawing.Size(121, 17);
this.checkBoxStartInSourceView.TabIndex = 14;
this.checkBoxStartInSourceView.Text = "Start in source view";
this.checkBoxStartInSourceView.UseVisualStyleBackColor = true;
@ -543,7 +545,7 @@
this.checkBoxReopenLastOpened.AutoSize = true;
this.checkBoxReopenLastOpened.Location = new System.Drawing.Point(444, 52);
this.checkBoxReopenLastOpened.Name = "checkBoxReopenLastOpened";
this.checkBoxReopenLastOpened.Size = new System.Drawing.Size(140, 17);
this.checkBoxReopenLastOpened.Size = new System.Drawing.Size(145, 17);
this.checkBoxReopenLastOpened.TabIndex = 11;
this.checkBoxReopenLastOpened.Text = "Start with last file loaded";
this.checkBoxReopenLastOpened.UseVisualStyleBackColor = true;
@ -553,7 +555,7 @@
this.checkBoxRememberRecentFiles.AutoSize = true;
this.checkBoxRememberRecentFiles.Location = new System.Drawing.Point(436, 28);
this.checkBoxRememberRecentFiles.Name = "checkBoxRememberRecentFiles";
this.checkBoxRememberRecentFiles.Size = new System.Drawing.Size(188, 17);
this.checkBoxRememberRecentFiles.Size = new System.Drawing.Size(195, 17);
this.checkBoxRememberRecentFiles.TabIndex = 10;
this.checkBoxRememberRecentFiles.Text = "Remember recent files (for reopen)";
this.checkBoxRememberRecentFiles.UseVisualStyleBackColor = true;
@ -564,7 +566,7 @@
this.checkBoxSubtitleFontBold.AutoSize = true;
this.checkBoxSubtitleFontBold.Location = new System.Drawing.Point(193, 209);
this.checkBoxSubtitleFontBold.Name = "checkBoxSubtitleFontBold";
this.checkBoxSubtitleFontBold.Size = new System.Drawing.Size(47, 17);
this.checkBoxSubtitleFontBold.Size = new System.Drawing.Size(46, 17);
this.checkBoxSubtitleFontBold.TabIndex = 6;
this.checkBoxSubtitleFontBold.Text = "Bold";
this.checkBoxSubtitleFontBold.UseVisualStyleBackColor = true;
@ -1974,6 +1976,16 @@
this.labelStatus.TabIndex = 3;
this.labelStatus.Text = "labelStatus";
//
// checkBoxAllowEditOfOriginalSubtitle
//
this.checkBoxAllowEditOfOriginalSubtitle.AutoSize = true;
this.checkBoxAllowEditOfOriginalSubtitle.Location = new System.Drawing.Point(436, 296);
this.checkBoxAllowEditOfOriginalSubtitle.Name = "checkBoxAllowEditOfOriginalSubtitle";
this.checkBoxAllowEditOfOriginalSubtitle.Size = new System.Drawing.Size(160, 17);
this.checkBoxAllowEditOfOriginalSubtitle.TabIndex = 37;
this.checkBoxAllowEditOfOriginalSubtitle.Text = "Allow edit of original subtitle";
this.checkBoxAllowEditOfOriginalSubtitle.UseVisualStyleBackColor = true;
//
// Settings
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -2221,5 +2233,6 @@
private System.Windows.Forms.ComboBox comboBoxSpellChecker;
private System.Windows.Forms.Label labelSpellChecker;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.CheckBox checkBoxAllowEditOfOriginalSubtitle;
}
}

4
src/Forms/Settings.cs
View File

@ -302,6 +302,8 @@ namespace Nikse.SubtitleEdit.Forms
else
comboBoxSpellChecker.SelectedIndex = 0;
checkBoxAllowEditOfOriginalSubtitle.Checked = gs.AllowEditOfOriginalSubtitle;
ToolsSettings toolsSettings = Configuration.Settings.Tools;
if (toolsSettings.VerifyPlaySeconds - 2 >= 0 && toolsSettings.VerifyPlaySeconds - 2 < comboBoxToolsVerifySeconds.Items.Count)
comboBoxToolsVerifySeconds.SelectedIndex = toolsSettings.VerifyPlaySeconds - 2;
@ -566,6 +568,8 @@ namespace Nikse.SubtitleEdit.Forms
else
gs.SpellChecker = "hunspell";
gs.AllowEditOfOriginalSubtitle = checkBoxAllowEditOfOriginalSubtitle.Checked;
if (radioButtonVideoPlayerWmp.Checked)
gs.VideoPlayer = "WindowsMediaPlayer";
//else if (radioButtonVideoPlayerManagedDirectX.Checked)

2
src/Logic/Settings.cs
View File

@ -288,7 +288,7 @@ namespace Nikse.SubtitleEdit.Logic
SyncListViewWithVideoWhilePlaying = false;
AutoBackupSeconds = 0;
SpellChecker = "hunspell";
AllowEditOfOriginalSubtitle = false;
AllowEditOfOriginalSubtitle = true;
}
}