Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 14:32:35 +01:00
Code Issues Projects Releases Wiki Activity

Now (nearly) all actions in main window are saved in an actions log - you can view by click in the action status bar

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1255 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2012-06-14 16:11:54 +00:00
parent 734188809a
commit c290e879d8
17 changed files with 505 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Forms/Main.Designer.cs generated
View File

@ -435,6 +435,7 @@
this.labelStatus.Name = "labelStatus";
this.labelStatus.Size = new System.Drawing.Size(700, 22);
this.labelStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.labelStatus.Click += new System.EventHandler(this.labelStatus_Click);
//
// toolStripSelected
//

116
src/Forms/Main.cs
View File

@ -79,7 +79,9 @@ namespace Nikse.SubtitleEdit.Forms
double? _audioWaveFormRightClickSeconds = null;
private System.Windows.Forms.Timer _timerDoSyntaxColoring = new Timer();
System.Windows.Forms.Timer _timerAutoSave = new Timer();
System.Windows.Forms.Timer _timerClearStatus = new Timer();
string _textAutoSave;
StringBuilder _statusLog = new StringBuilder();
NikseWebServiceSession _networkSession;
NetworkChat _networkChat = null;
@ -372,6 +374,9 @@ namespace Nikse.SubtitleEdit.Forms
toolStripComboBoxWaveForm.SelectedIndexChanged += toolStripComboBoxWaveForm_SelectedIndexChanged;
FixLargeFonts();
_timerClearStatus.Interval = 5000;
_timerClearStatus.Tick += TimerClearStatus_Tick;
}
catch (Exception exception)
{
@ -380,6 +385,11 @@ namespace Nikse.SubtitleEdit.Forms
}
}
void TimerClearStatus_Tick(object sender, EventArgs e)
{
ShowStatus(string.Empty);
}
private void SetEncoding(Encoding encoding)
{
if (encoding.BodyName == Encoding.UTF8.BodyName)
@ -1220,15 +1230,7 @@ namespace Nikse.SubtitleEdit.Forms
sortTextMaxLineLengthToolStripMenuItem.Text = _language.Menu.Tools.TextSingleLineMaximumLength;
sortTextTotalLengthToolStripMenuItem.Text = _language.Menu.Tools.TextTotalLength;
sortTextNumberOfLinesToolStripMenuItem.Text = _language.Menu.Tools.TextNumberOfLines;
if (!string.IsNullOrEmpty(_language.Menu.Tools.TextNumberOfCharactersPerSeconds))
{
textCharssecToolStripMenuItem.Text = _language.Menu.Tools.TextNumberOfCharactersPerSeconds;
textCharssecToolStripMenuItem.Visible = true;
}
else
{
textCharssecToolStripMenuItem.Visible = false;
}
textCharssecToolStripMenuItem.Text = _language.Menu.Tools.TextNumberOfCharactersPerSeconds;
toolStripMenuItemShowOriginalInPreview.Text = _language.Menu.Tools.ShowOriginalTextInAudioAndVideoPreview;
toolStripMenuItemMakeEmptyFromCurrent.Text = _language.Menu.Tools.MakeNewEmptyTranslationFromCurrentSubtitle;
@ -3565,6 +3567,12 @@ namespace Nikse.SubtitleEdit.Forms
{
labelStatus.Text = message;
statusStrip1.Refresh();
if (!string.IsNullOrEmpty(message))
{
_timerClearStatus.Stop();
_statusLog.AppendLine(string.Format("{0:0000}-{1:00}-{2:00} {3}: {4}", DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.ToLongTimeString(), message));
_timerClearStatus.Start();
}
}
private void ReloadFromSourceView()
@ -8345,12 +8353,12 @@ namespace Nikse.SubtitleEdit.Forms
{
if (_mainAdjustSelected100MsForward == e.KeyData)
{
ShowEarlierOrLater(100, true);
ShowEarlierOrLater(100, SelectionChoice.SelectionOnly);
e.SuppressKeyPress = true;
}
else if (_mainAdjustSelected100MsBack == e.KeyData)
{
ShowEarlierOrLater(-100, true);
ShowEarlierOrLater(-100, SelectionChoice.SelectionOnly);
e.SuppressKeyPress = true;
}
else if (mediaPlayer.VideoPlayer != null)
@ -10373,49 +10381,39 @@ namespace Nikse.SubtitleEdit.Forms
Refresh();
}
public void ShowEarlierOrLater(double adjustMilliseconds, bool onlySelected)
public void ShowEarlierOrLater(double adjustMilliseconds, SelectionChoice selection)
{
TimeCode tc = new TimeCode(TimeSpan.FromMilliseconds(adjustMilliseconds));
MakeHistoryForUndo(_language.BeforeShowSelectedLinesEarlierLater + ": " + tc.ToString());
double frameRate = CurrentFrameRate;
SubtitleListview1.BeginUpdate();
for (int i = 0; i < _subtitle.Paragraphs.Count; i++)
{
if (SubtitleListview1.Items[i].Selected || !onlySelected)
{
Paragraph p = _subtitle.GetParagraphOrDefault(i);
if (p != null)
{
if (_subtitleAlternate != null && onlySelected)
{
Paragraph original = Utilities.GetOriginalParagraph(i, p, _subtitleAlternate.Paragraphs);
if (original != null)
{
original.StartTime.TotalMilliseconds += adjustMilliseconds;
original.EndTime.TotalMilliseconds += adjustMilliseconds;
}
}
p.StartTime.TotalMilliseconds += adjustMilliseconds;
p.EndTime.TotalMilliseconds += adjustMilliseconds;
SubtitleListview1.SetStartTime(i, p);
}
}
int startFrom = 0;
if (selection == SelectionChoice.SelectionAndForward)
{
if (SubtitleListview1.SelectedItems.Count > 0)
startFrom = SubtitleListview1.SelectedItems[0].Index;
else
startFrom = _subtitle.Paragraphs.Count;
}
if (_subtitleAlternate != null && !onlySelected)
for (int i = startFrom; i < _subtitle.Paragraphs.Count; i++)
{
for (int i = 0; i < _subtitleAlternate.Paragraphs.Count; i++)
switch (selection)
{
Paragraph p = _subtitleAlternate.GetParagraphOrDefault(i);
if (p != null)
{
p.StartTime.TotalMilliseconds += adjustMilliseconds;
p.EndTime.TotalMilliseconds += adjustMilliseconds;
}
}
}
case SelectionChoice.SelectionOnly:
if (SubtitleListview1.Items[i].Selected)
ShowEarlierOrLaterParagraph(adjustMilliseconds, i);
break;
case SelectionChoice.AllLines:
ShowEarlierOrLaterParagraph(adjustMilliseconds, i);
break;
case SelectionChoice.SelectionAndForward:
ShowEarlierOrLaterParagraph(adjustMilliseconds, i);
break;
}
}
SubtitleListview1.EndUpdate();
if (_subtitle.WasLoadedWithFrameNumbers)
@ -10425,6 +10423,27 @@ namespace Nikse.SubtitleEdit.Forms
UpdateListSyntaxColoring();
}
private void ShowEarlierOrLaterParagraph(double adjustMilliseconds, int i)
{
Paragraph p = _subtitle.GetParagraphOrDefault(i);
if (p != null)
{
if (_subtitleAlternate != null)
{
Paragraph original = Utilities.GetOriginalParagraph(i, p, _subtitleAlternate.Paragraphs);
if (original != null)
{
original.StartTime.TotalMilliseconds += adjustMilliseconds;
original.EndTime.TotalMilliseconds += adjustMilliseconds;
}
}
p.StartTime.TotalMilliseconds += adjustMilliseconds;
p.EndTime.TotalMilliseconds += adjustMilliseconds;
SubtitleListview1.SetStartTime(i, p);
}
}
private void UpdateSourceView()
{
if (tabControlSubtitle.SelectedIndex == TabControlSourceView)
@ -14273,5 +14292,16 @@ namespace Nikse.SubtitleEdit.Forms
_formPositionsAndSizes.SavePositionAndSize(restoreAutoBackup);
}
private void labelStatus_Click(object sender, EventArgs e)
{
if (_statusLog.Length > 0)
{
var statusLog = new StatusLog(_statusLog.ToString());
_formPositionsAndSizes.SetPositionAndSize(statusLog);
statusLog.ShowDialog(this);
_formPositionsAndSizes.SavePositionAndSize(statusLog);
}
}
}
}

2
src/Forms/Main.resx
View File

@ -681,7 +681,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAAYABFAGAARQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAZABFAGQARQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

54
src/Forms/ShowEarlierLater.Designer.cs generated
View File

@ -39,19 +39,20 @@ namespace Nikse.SubtitleEdit.Forms
this.radioButtonAllLines = new System.Windows.Forms.RadioButton();
this.radioButtonSelectedLinesOnly = new System.Windows.Forms.RadioButton();
this.timeUpDownAdjust = new Nikse.SubtitleEdit.Controls.TimeUpDown();
this.radioButtonSelectedLineAndForward = new System.Windows.Forms.RadioButton();
this.SuspendLayout();
//
//
// labelHoursMinSecsMilliSecs
//
//
this.labelHoursMinSecsMilliSecs.AutoSize = true;
this.labelHoursMinSecsMilliSecs.Location = new System.Drawing.Point(11, 6);
this.labelHoursMinSecsMilliSecs.Name = "labelHoursMinSecsMilliSecs";
this.labelHoursMinSecsMilliSecs.Size = new System.Drawing.Size(108, 13);
this.labelHoursMinSecsMilliSecs.TabIndex = 18;
this.labelHoursMinSecsMilliSecs.Text = "Hours:min:sec.msecs";
//
//
// buttonShowLater
//
//
this.buttonShowLater.Location = new System.Drawing.Point(145, 53);
this.buttonShowLater.Name = "buttonShowLater";
this.buttonShowLater.Size = new System.Drawing.Size(119, 21);
@ -59,9 +60,9 @@ namespace Nikse.SubtitleEdit.Forms
this.buttonShowLater.Text = "Show later";
this.buttonShowLater.UseVisualStyleBackColor = true;
this.buttonShowLater.Click += new System.EventHandler(this.ButtonShowLaterClick);
//
//
// buttonShowEarlier
//
//
this.buttonShowEarlier.Location = new System.Drawing.Point(145, 26);
this.buttonShowEarlier.Name = "buttonShowEarlier";
this.buttonShowEarlier.Size = new System.Drawing.Size(120, 21);
@ -69,22 +70,22 @@ namespace Nikse.SubtitleEdit.Forms
this.buttonShowEarlier.Text = "Show earlier";
this.buttonShowEarlier.UseVisualStyleBackColor = true;
this.buttonShowEarlier.Click += new System.EventHandler(this.ButtonShowEarlierClick);
//
//
// labelTotalAdjustment
//
//
this.labelTotalAdjustment.AutoSize = true;
this.labelTotalAdjustment.Location = new System.Drawing.Point(12, 128);
this.labelTotalAdjustment.Location = new System.Drawing.Point(9, 148);
this.labelTotalAdjustment.Name = "labelTotalAdjustment";
this.labelTotalAdjustment.Size = new System.Drawing.Size(108, 13);
this.labelTotalAdjustment.TabIndex = 38;
this.labelTotalAdjustment.Text = "labelTotalAdjustment";
//
//
// timer1
//
//
this.timer1.Interval = 250;
//
//
// radioButtonAllLines
//
//
this.radioButtonAllLines.AutoSize = true;
this.radioButtonAllLines.Location = new System.Drawing.Point(14, 70);
this.radioButtonAllLines.Name = "radioButtonAllLines";
@ -94,9 +95,9 @@ namespace Nikse.SubtitleEdit.Forms
this.radioButtonAllLines.Text = "All lines";
this.radioButtonAllLines.UseVisualStyleBackColor = true;
this.radioButtonAllLines.CheckedChanged += new System.EventHandler(this.radioButtonAllLines_CheckedChanged);
//
//
// radioButtonSelectedLinesOnly
//
//
this.radioButtonSelectedLinesOnly.AutoSize = true;
this.radioButtonSelectedLinesOnly.Location = new System.Drawing.Point(14, 93);
this.radioButtonSelectedLinesOnly.Name = "radioButtonSelectedLinesOnly";
@ -106,9 +107,9 @@ namespace Nikse.SubtitleEdit.Forms
this.radioButtonSelectedLinesOnly.Text = "Selected lines only";
this.radioButtonSelectedLinesOnly.UseVisualStyleBackColor = true;
this.radioButtonSelectedLinesOnly.CheckedChanged += new System.EventHandler(this.radioButtonAllLines_CheckedChanged);
//
//
// timeUpDownAdjust
//
//
this.timeUpDownAdjust.AutoSize = true;
this.timeUpDownAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.timeUpDownAdjust.Location = new System.Drawing.Point(12, 23);
@ -116,12 +117,24 @@ namespace Nikse.SubtitleEdit.Forms
this.timeUpDownAdjust.Name = "timeUpDownAdjust";
this.timeUpDownAdjust.Size = new System.Drawing.Size(92, 25);
this.timeUpDownAdjust.TabIndex = 21;
//
//
// radioButtonSelectedLineAndForward
//
this.radioButtonSelectedLineAndForward.AutoSize = true;
this.radioButtonSelectedLineAndForward.Location = new System.Drawing.Point(14, 116);
this.radioButtonSelectedLineAndForward.Name = "radioButtonSelectedLineAndForward";
this.radioButtonSelectedLineAndForward.Size = new System.Drawing.Size(160, 17);
this.radioButtonSelectedLineAndForward.TabIndex = 41;
this.radioButtonSelectedLineAndForward.TabStop = true;
this.radioButtonSelectedLineAndForward.Text = "Selected line(s) and forward";
this.radioButtonSelectedLineAndForward.UseVisualStyleBackColor = true;
//
// ShowEarlierLater
//
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(291, 150);
this.ClientSize = new System.Drawing.Size(301, 170);
this.Controls.Add(this.radioButtonSelectedLineAndForward);
this.Controls.Add(this.radioButtonSelectedLinesOnly);
this.Controls.Add(this.radioButtonAllLines);
this.Controls.Add(this.buttonShowLater);
@ -154,5 +167,6 @@ namespace Nikse.SubtitleEdit.Forms
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.RadioButton radioButtonAllLines;
private System.Windows.Forms.RadioButton radioButtonSelectedLinesOnly;
private System.Windows.Forms.RadioButton radioButtonSelectedLineAndForward;
}
}

21
src/Forms/ShowEarlierLater.cs
View File

@ -2,12 +2,13 @@
using System.Drawing;
using System.Windows.Forms;
using Nikse.SubtitleEdit.Logic;
using Nikse.SubtitleEdit.Logic.Enums;
namespace Nikse.SubtitleEdit.Forms
{
public sealed partial class ShowEarlierLater : Form
{
public delegate void AdjustEventHandler(double adjustMilliseconds, bool onlySelected);
public delegate void AdjustEventHandler(double adjustMilliseconds, SelectionChoice selection);
TimeSpan _totalAdjustment = TimeSpan.FromMilliseconds(0);
AdjustEventHandler _adjustCallback;
@ -57,6 +58,8 @@ namespace Nikse.SubtitleEdit.Forms
_formPositionsAndSizes = formPositionsAndSizes;
if (onlySelected)
radioButtonSelectedLinesOnly.Checked = true;
else if (Configuration.Settings.Tools.LastShowEarlierOrLaterSelection == SelectionChoice.SelectionAndForward.ToString())
radioButtonSelectedLineAndForward.Checked = true;
else
radioButtonAllLines.Checked = true;
@ -64,12 +67,23 @@ namespace Nikse.SubtitleEdit.Forms
timeUpDownAdjust.TimeCode = new TimeCode(TimeSpan.FromMilliseconds(Configuration.Settings.General.DefaultAdjustMilliseconds));
}
private SelectionChoice GetSelectionChoice()
{
if (radioButtonSelectedLinesOnly.Checked)
return SelectionChoice.SelectionOnly;
else if (radioButtonSelectedLineAndForward.Checked)
return SelectionChoice.SelectionAndForward;
else
return SelectionChoice.AllLines;
}
private void ButtonShowEarlierClick(object sender, EventArgs e)
{
TimeCode tc = timeUpDownAdjust.TimeCode;
if (tc != null && tc.TotalMilliseconds > 0)
{
_adjustCallback.Invoke(-tc.TotalMilliseconds, radioButtonSelectedLinesOnly.Checked);
_adjustCallback.Invoke(-tc.TotalMilliseconds, GetSelectionChoice());
_totalAdjustment = TimeSpan.FromMilliseconds(_totalAdjustment.TotalMilliseconds - tc.TotalMilliseconds);
ShowTotalAdjustMent();
Configuration.Settings.General.DefaultAdjustMilliseconds = (int)tc.TotalMilliseconds;
@ -87,7 +101,7 @@ namespace Nikse.SubtitleEdit.Forms
TimeCode tc = timeUpDownAdjust.TimeCode;
if (tc != null && tc.TotalMilliseconds > 0)
{
_adjustCallback.Invoke(tc.TotalMilliseconds, radioButtonSelectedLinesOnly.Checked);
_adjustCallback.Invoke(tc.TotalMilliseconds, GetSelectionChoice());
_totalAdjustment = TimeSpan.FromMilliseconds(_totalAdjustment.TotalMilliseconds + tc.TotalMilliseconds);
ShowTotalAdjustMent();
Configuration.Settings.General.DefaultAdjustMilliseconds = (int)tc.TotalMilliseconds;
@ -105,6 +119,7 @@ namespace Nikse.SubtitleEdit.Forms
private void ShowEarlierLater_FormClosing(object sender, FormClosingEventArgs e)
{
_formPositionsAndSizes.SavePositionAndSize(this);
Configuration.Settings.Tools.LastShowEarlierOrLaterSelection = GetSelectionChoice().ToString();
}
}

54
src/Forms/ShowEarlierLater.resx
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->

85
src/Forms/StatusLog.Designer.cs generated Normal file
View File

@ -0,0 +1,85 @@
namespace Nikse.SubtitleEdit.Forms
{
partial class StatusLog
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.buttonOK = new System.Windows.Forms.Button();
this.textBoxStatusLog = new System.Windows.Forms.TextBox();
this.SuspendLayout();
//
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.buttonOK.Location = new System.Drawing.Point(877, 407);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(75, 21);
this.buttonOK.TabIndex = 1;
this.buttonOK.Text = "&OK";
this.buttonOK.UseVisualStyleBackColor = true;
//
// textBoxStatusLog
//
this.textBoxStatusLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.textBoxStatusLog.Location = new System.Drawing.Point(13, 13);
this.textBoxStatusLog.Multiline = true;
this.textBoxStatusLog.Name = "textBoxStatusLog";
this.textBoxStatusLog.ReadOnly = true;
this.textBoxStatusLog.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.textBoxStatusLog.Size = new System.Drawing.Size(939, 388);
this.textBoxStatusLog.TabIndex = 2;
//
// StatusLog
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(964, 440);
this.Controls.Add(this.textBoxStatusLog);
this.Controls.Add(this.buttonOK);
this.KeyPreview = true;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "StatusLog";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Status messages";
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StatusLog_KeyDown);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Button buttonOK;
private System.Windows.Forms.TextBox textBoxStatusLog;
}
}

19
src/Forms/StatusLog.cs Normal file
View File

@ -0,0 +1,19 @@
using System.Windows.Forms;
namespace Nikse.SubtitleEdit.Forms
{
public partial class StatusLog : Form
{
public StatusLog(string logText)
{
InitializeComponent();
textBoxStatusLog.Text = logText;
}
private void StatusLog_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape)
DialogResult = DialogResult.Cancel;
}
}
}

120
src/Forms/StatusLog.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

99
src/Languages/da-DK.xml
View File

@ -2,7 +2,7 @@
<Language Name="Dansk">
<General>
<Title>Subtitle Edit</Title>
<Version>3.2</Version>
<Version>3.3</Version>
<TranslatedBy>Oversat til dansk af Nikse (mailto:nikse.dk@gmail.com)</TranslatedBy>
<CultureName>da-DK</CultureName>
<HelpFile>
@ -30,6 +30,7 @@
<HourMinutesSecondsMilliseconds>Timer:min:sek:msek</HourMinutesSecondsMilliseconds>
<Bold>Fed</Bold>
<Italic>Kursiv</Italic>
<Underline>Understreg</Underline>
<Visible>Synlig</Visible>
<FrameRate>Billeder pr. sekund</FrameRate>
<Name>Navn</Name>
@ -61,6 +62,7 @@
<VideoWindowTitle>Video - {0}</VideoWindowTitle>
<AudioWindowTitle>Lydspor - {0}</AudioWindowTitle>
<ControlsWindowTitle>Kommandoer - {0}</ControlsWindowTitle>
<Advanced>Avanceret</Advanced>
</General>
<About>
<Title>Om Subtitle Edit</Title>
@ -161,6 +163,7 @@
<XNumberOfDifference>Antal forskelle: {0}</XNumberOfDifference>
<ShowOnlyDifferences>Vis kun forskelle</ShowOnlyDifferences>
<OnlyLookForDifferencesInText>Vis kun forskelle i teksten</OnlyLookForDifferencesInText>
<CannotCompareWithImageBasedSubtitles>Kan ikke sammenligne med billede baseret undertekster</CannotCompareWithImageBasedSubtitles>
</CompareSubtitles>
<DvdSubrip>
<Title>Rip undertekster fra ifo/vobs (dvd)</Title>
@ -297,6 +300,7 @@
<AddPeriods>Tilføj punktum efter de linjer, hvor næste linje starter med stort bogstav</AddPeriods>
<StartWithUppercaseLetterAfterParagraph>Start nye linier med stort bogstav efter punktum</StartWithUppercaseLetterAfterParagraph>
<StartWithUppercaseLetterAfterPeriodInsideParagraph>Start med stort bogstav efter punktum inde i linjer</StartWithUppercaseLetterAfterPeriodInsideParagraph>
<StartWithUppercaseLetterAfterColon>Start med stort bogstav efter kolon/semikolon</StartWithUppercaseLetterAfterColon>
<FixLowercaseIToUppercaseI>Ret alene lille 'i' til 'I' (engelsk)</FixLowercaseIToUppercaseI>
<FixCommonOcrErrors>Ret OCR-fejl (ved hjælp af OCR erstat liste)</FixCommonOcrErrors>
<CommonOcrErrorsFixed>Ret OCR fejl (via OcrReplaceList fil): {0}</CommonOcrErrorsFixed>
@ -442,6 +446,10 @@
<Interjections>
<Title>Følelsesudbrud</Title>
</Interjections>
<JoinSubtitles>
<Title>Flet undertekster</Title>
<Information>Tilføj undertekster til at deltage (droppe også understøttet)</Information>
</JoinSubtitles>
<Main>
<Menu>
<File>
@ -451,6 +459,9 @@
<Reopen>&amp;Genåbn</Reopen>
<Save>&amp;Gem</Save>
<SaveAs>Gem &amp;som...</SaveAs>
<RestoreAutoBackup>Gendan fra auto-backup...</RestoreAutoBackup>
<AdvancedSubStationAlphaProperties>Advanced Sub Station Alpha egenskaber...</AdvancedSubStationAlphaProperties>
<SubStationAlphaProperties>Sub Station Alpha egenskaber...</SubStationAlphaProperties>
<OpenOriginal>Åbn original undertekst (oversætter mode)...</OpenOriginal>
<SaveOriginal>Gem original</SaveOriginal>
<CloseOriginal>Luk original</CloseOriginal>
@ -471,7 +482,6 @@
<ExportEbu>EBU STL...</ExportEbu>
<ExportPac>PAC (Screen Electronics)...</ExportPac>
<ExportPlainText>Almindelig tekst...</ExportPlainText>
<ExportPlainTextWithoutLineBreaks>Almindelig tekst uden linjeskift...</ExportPlainTextWithoutLineBreaks>
<Exit>&amp;Afslut</Exit>
</File>
<Edit>
@ -577,7 +587,10 @@
<ShowHideVideo>Vis/skjul video</ShowHideVideo>
</ToolBar>
<ContextMenu>
<SubStationAlphaSetStyle>(Advanced) Sub Station Alpha - Sæt style</SubStationAlphaSetStyle>
<AdvancedSubStationAlphaSetStyle>Advanced Sub Station Alpha - vælg stilart</AdvancedSubStationAlphaSetStyle>
<SubStationAlphaSetStyle>(Advanced) Sub Station Alpha - vælg stilart</SubStationAlphaSetStyle>
<SubStationAlphaStyles>Sub Station Alpha stilarter...</SubStationAlphaStyles>
<AdvancedSubStationAlphaStyles>Advanced Sub Station Alpha stilarter...</AdvancedSubStationAlphaStyles>
<Cut>Klip</Cut>
<Copy>Kopier</Copy>
<Paste>Indsæt</Paste>
@ -598,6 +611,7 @@
<Underline>Understregning</Underline>
<Color>Farve...</Color>
<FontName>Font navn...</FontName>
<Alignment>Juestring...</Alignment>
<AutoBalanceSelectedLines>Auto balancer markerede linjer...</AutoBalanceSelectedLines>
<RemoveLineBreaksFromSelectedLines>Fjern line-skift fra valgte linjer...</RemoveLineBreaksFromSelectedLines>
<TypewriterEffect>Skrivemaskine effekt...</TypewriterEffect>
@ -761,6 +775,7 @@ Fortsæt?</SubtitleAppendPrompt>
<TranslationFromSwedishToDanishFailed>Oversættelse fra svensk til dansk mislykkedes</TranslationFromSwedishToDanishFailed>
<BeforeUndo>Før fortryd</BeforeUndo>
<UndoPerformed>Fortryd udført</UndoPerformed>
<RedoPerformed>Redo udført</RedoPerformed>
<NothingToUndo>Intet at fortryde</NothingToUndo>
<InvalidLanguageNameX>Ugyldigt sprog navn: {0}</InvalidLanguageNameX>
<UnableToChangeLanguage>Kunne ikke skifte sprog!</UnableToChangeLanguage>
@ -871,6 +886,10 @@ Fortsæt?</SubtitleAppendPrompt>
<BeforeToggleDialogueDashes>Før skift af dialog tankestreger</BeforeToggleDialogueDashes>
<ExportPlainTextAs>Eksporter almindelig tekst som</ExportPlainTextAs>
<TextFiles>Tekst filer</TextFiles>
<SubtitleExported>Subtitle eksporteret</SubtitleExported>
<LineNumberXErrorReadingFromSourceLineY>Linie {0} - fejl ved læsning: {1}</LineNumberXErrorReadingFromSourceLineY>
<LineNumberXErrorReadingTimeCodeFromSourceLineY>Linie {0} - Fejl ved læsning af tidskode: {1}</LineNumberXErrorReadingTimeCodeFromSourceLineY>
<LineNumberXExpectedNumberFromSourceLineY>Linie {0} - fejl ved linjenummer: {1}</LineNumberXExpectedNumberFromSourceLineY>
</Main>
<MatroskaSubtitleChooser>
<Title>Vælg undertekst fra Matroska fil</Title>
@ -955,6 +974,14 @@ Fortsæt?</SubtitleAppendPrompt>
<Replace>&amp;Erstat</Replace>
<ReplaceAll>Erstat &amp;alle</ReplaceAll>
</ReplaceDialog>
<RestoreAutoBackup>
<Title>Gendan auto backup</Title>
<Information>Åbn auto-gemt backup</Information>
<DateAndTime>Dato og tid</DateAndTime>
<FileName>Filnavn</FileName>
<Extension>Type</Extension>
<NoBackedUpFilesFound>Ingen sikkerhedskopierede filer fundet!</NoBackedUpFilesFound>
</RestoreAutoBackup>
<SetMinimumDisplayTimeBetweenParagraphs>
<Title>Mindste visningstid mellem tekster</Title>
<PreviewLinesModifiedX>Resultat - antal linier rettet: {0}</PreviewLinesModifiedX>
@ -1016,12 +1043,19 @@ Fortsæt?</SubtitleAppendPrompt>
<MainListViewVideoGoToPositionAndPause>Gå til video pos og pause</MainListViewVideoGoToPositionAndPause>
<MainListViewVideoGoToPositionAndPlay>Gå til video pos og afspi</MainListViewVideoGoToPositionAndPlay>
<MainListViewEditText>Gå til at rediger tekst</MainListViewEditText>
<MainListViewVideoGoToPositionMinus1SecAndPause>Gå til video pos - 1 sek og pause</MainListViewVideoGoToPositionMinus1SecAndPause>
<MainListViewVideoGoToPositionMinusHalfSecAndPause>Gå til video pos - 0,5 sek og pause</MainListViewVideoGoToPositionMinusHalfSecAndPause>
<MainListViewVideoGoToPositionMinus1SecAndPlay>Gå til video pos - 1 sek og afspil</MainListViewVideoGoToPositionMinus1SecAndPlay>
<MainListViewEditTextAndPause>Gå at redigere tekstfeltet, og pause på video position</MainListViewEditTextAndPause>
<AutoBackup>Auto-backup</AutoBackup>
<AutoBackupEveryMinute>Hvert minut</AutoBackupEveryMinute>
<AutoBackupEveryFiveMinutes>Hver 5. minut</AutoBackupEveryFiveMinutes>
<AutoBackupEveryFifteenMinutes>Hver 15. minut</AutoBackupEveryFifteenMinutes>
<AllowEditOfOriginalSubtitle>Tillad redigering af originale undertekst</AllowEditOfOriginalSubtitle>
<PromptDeleteLines>Spørg om slet af linjer</PromptDeleteLines>
<TimeCodeMode>Tidskode indstillinger</TimeCodeMode>
<TimeCodeModeHHMMSSMsec>HH:MM:SS.Msec (00:00:01.500)</TimeCodeModeHHMMSSMsec>
<TimeCodeModeHHMMSSFF>HH:MM:SS:FF (00:00:01:12)</TimeCodeModeHHMMSSFF>
<VideoEngine>Video afspiller</VideoEngine>
<DirectShow>DirectShow</DirectShow>
<DirectShowDescription>Quartz.dll i system32 mappen</DirectShowDescription>
@ -1111,10 +1145,12 @@ Fortsæt?</SubtitleAppendPrompt>
<GoToPrevious>Gå til forrige line</GoToPrevious>
<ToggleFocus>Skift fokus imellem liste visning og undertekst tekstboks</ToggleFocus>
<ToggleDialogueDashes>Toogle dialog tankestreger</ToggleDialogueDashes>
<Alignment>Justering (valgte linier)</Alignment>
<ReverseStartAndEndingForRTL>Byt rundt på højre-mod-venstre start/slut</ReverseStartAndEndingForRTL>
<VerticalZoom>Lodret zoom</VerticalZoom>
<WaveformSeekSilenceForward>Søg stilhed frem</WaveformSeekSilenceForward>
<WaveformSeekSilenceBack>Søg stilhed tilbage</WaveformSeekSilenceBack>
<WaveformAddTextHere>Tilføj tekst her (for ny selektion)</WaveformAddTextHere>
<GoBack100Milliseconds>100 ms tilbage</GoBack100Milliseconds>
<GoForward100Milliseconds>100 ms frem</GoForward100Milliseconds>
<GoBack500Milliseconds>500 ms tilbage</GoBack500Milliseconds>
@ -1122,6 +1158,14 @@ Fortsæt?</SubtitleAppendPrompt>
<TogglePlayPause>Skift mellem afspil og pause</TogglePlayPause>
<Pause>Pause</Pause>
<Fullscreen>Fuldskærm</Fullscreen>
<SyntaxColoring>Syntaks farvelægning</SyntaxColoring>
<ListViewSyntaxColoring>Listevisning syntaks farvelægning</ListViewSyntaxColoring>
<SyntaxColorDurationIfTooSmall>Farve - varighed, hvis for kort</SyntaxColorDurationIfTooSmall>
<SyntaxColorDurationIfTooLarge>Farve - varighed, hvis for længe</SyntaxColorDurationIfTooLarge>
<SyntaxColorTextIfTooLong>Farve - tekst, hvis for lang</SyntaxColorTextIfTooLong>
<SyntaxColorTextMoreThanXLines>Farve - tekst, hvis mere end linjer:</SyntaxColorTextMoreThanXLines>
<SyntaxColorOverlap>Farve - tidskode overlapper</SyntaxColorOverlap>
<SyntaxColorErrorColor>Fejl baggrund farve</SyntaxColorErrorColor>
</Settings>
<ShowEarlierLater>
<Title>Vis valgte linjer tidligere/senere</Title>
@ -1131,6 +1175,7 @@ Fortsæt?</SubtitleAppendPrompt>
<TotalAdjustmentX>Samlede justering: {0}</TotalAdjustmentX>
<AllLines>Alle linjer</AllLines>
<SelectedLinesonly>Valgte linjer</SelectedLinesonly>
<SelectedLinesAndForward>Valgte linier og frem</SelectedLinesAndForward>
</ShowEarlierLater>
<ShowHistory>
<Title>Historik (fortryd)</Title>
@ -1192,6 +1237,54 @@ Fortsæt?</SubtitleAppendPrompt>
<StartFromNumber>Start fra nummer:</StartFromNumber>
<PleaseEnterAValidNumber>Ups, du skal indtaste et nummer</PleaseEnterAValidNumber>
</StartNumberingFrom>
<SubStationAlphaProperties>
<Title>Advanced Sub Station Alpha egenskaber</Title>
<TitleSubstationAlpha>Sub Station Alpha egenskaber</TitleSubstationAlpha>
<Script>Script</Script>
<ScriptTitle>Titel</ScriptTitle>
</SubStationAlphaProperties>
<SubStationAlphaStyles>
<Title>Avanceret Sub Station Alpha stilarter</Title>
<TitleSubstationAlpha>Sub Station Alpha stilarter</TitleSubstationAlpha>
<Styles>Stilarter</Styles>
<Properties>Egenskaber</Properties>
<Name>Navn</Name>
<Font>Font</Font>
<FontName>Font navn</FontName>
<FontSize>Skriftstørrelse</FontSize>
<UseCount>Bruges</UseCount>
<Primary>Primær</Primary>
<Secondary>Sekundær</Secondary>
<Tertiary>Tertiær</Tertiary>
<Outline>Kontur</Outline>
<Shadow>Skygge</Shadow>
<Back>Tilbage</Back>
<Alignment>Justering</Alignment>
<TopLeft>Top/venstre</TopLeft>
<TopCenter>Top/center</TopCenter>
<TopRight>Top/højre</TopRight>
<MiddleLeft>Midt/venstre</MiddleLeft>
<MiddleCenter>Midt/center</MiddleCenter>
<MiddleRight>Midt/højre</MiddleRight>
<BottomLeft>Bund/venstre</BottomLeft>
<BottomCenter>Bund/center</BottomCenter>
<BottomRight>Bund/højre</BottomRight>
<Colors>Farver</Colors>
<Margins>Margener</Margins>
<MarginLeft>Margen venstre</MarginLeft>
<MarginRight>Margin højre</MarginRight>
<MarginVertical>Margen lodret</MarginVertical>
<Border>Kant</Border>
<PlusShadow>+ Skygge</PlusShadow>
<OpaqueBox>Kasse (bruger konturfarve)</OpaqueBox>
<Import>Importer...</Import>
<Copy>Kopi</Copy>
<CopyOfY>Kopi af {0}</CopyOfY>
<CopyXOfY>Kopier {0} af {1}</CopyXOfY>
<New>Ny</New>
<Remove>Fjern</Remove>
<RemoveAll>Fjern alle</RemoveAll>
</SubStationAlphaStyles>
<PointSync>
<Title>Punkt synkronisering</Title>
<TitleViaOtherSubtitle>Punkt synkroniser via anden undertekst</TitleViaOtherSubtitle>

9
src/Logic/Enums/SelectionChoice.cs Normal file
View File

@ -0,0 +1,9 @@
namespace Nikse.SubtitleEdit.Logic.Enums
{
public enum SelectionChoice
{
SelectionOnly,
AllLines,
SelectionAndForward,
}
}

3
src/Logic/Language.cs
View File

@ -79,7 +79,7 @@ namespace Nikse.SubtitleEdit.Logic
General = new LanguageStructure.General
{
Title = "Subtitle Edit",
Version = "3.2",
Version = "3.3",
TranslatedBy = " ",
CultureName = "en-US",
HelpFile = string.Empty,
@ -1367,6 +1367,7 @@ can edit in same subtitle file (collaboration)",
TotalAdjustmentX = "Total adjustment: {0}",
AllLines = "All lines",
SelectedLinesonly = "Selected lines only",
SelectedLinesAndForward = "Selected line(s) and forward",
};
ShowHistory = new LanguageStructure.ShowHistory

1
src/Logic/LanguageStructure.cs
View File

@ -1315,6 +1315,7 @@
public string TotalAdjustmentX { get; set; }
public string AllLines { get; set; }
public string SelectedLinesonly { get; set; }
public string SelectedLinesAndForward { get; set; }
}
public class ShowHistory

1
src/Logic/Settings.cs
View File

@ -97,6 +97,7 @@ namespace Nikse.SubtitleEdit.Logic
public string SplitOutputFolder { get; set; }
public int SplitNumberOfParts { get; set; }
public string SplitVia { get; set; }
public string LastShowEarlierOrLaterSelection { get; set; }
public ToolsSettings()
{

6
src/Logic/SubtitleFormats/SubRip.cs
View File

@ -105,8 +105,10 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
foreach (Paragraph p in subtitle.Paragraphs)
{
p.Text = p.Text.Replace(Environment.NewLine + Environment.NewLine, Environment.NewLine);
p.Text = p.Text.Replace("<32>", "<i>").Replace("</32>", "</i>"); // .wsrt
p.Text = p.Text.Replace("<33>", "<i>").Replace("</33>", "</i>"); // .wsrt
p.Text = p.Text.Replace("<32>", "<i>").Replace("</32>", "</i>"); // .wsrt - music or similar?
p.Text = p.Text.Replace("<33>", "<i>").Replace("</33>", "</i>"); // .wsrt - speaker
p.Text = p.Text.Replace("<35>", "[").Replace("</35>", "]"); // .wsrt - text for HI
p.Text = p.Text.Replace("<36>", "").Replace("</36>", ""); // .wsrt - shouting
}
if (doRenum)

10
src/SubtitleEdit.csproj
View File

@ -440,6 +440,12 @@
<Compile Include="Forms\StartNumberingFrom.Designer.cs">
<DependentUpon>StartNumberingFrom.cs</DependentUpon>
</Compile>
<Compile Include="Forms\StatusLog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\StatusLog.Designer.cs">
<DependentUpon>StatusLog.cs</DependentUpon>
</Compile>
<Compile Include="Forms\SubStationAlphaProperties.cs">
<SubType>Form</SubType>
</Compile>
@ -586,6 +592,7 @@
<Compile Include="Logic\DetectEncoding\Multilang\_RemotableHandle.cs" />
<Compile Include="Logic\DetectEncoding\Multilang\_ULARGE_INTEGER.cs" />
<Compile Include="Logic\DetectEncoding\Multilang\__MIDL_IWinTypes_0009.cs" />
<Compile Include="Logic\Enums\SelectionChoice.cs" />
<Compile Include="Logic\FastBitmap.cs" />
<Compile Include="Logic\Fourier.cs" />
<Compile Include="Logic\HashSet.cs" />
@ -979,6 +986,9 @@
<DependentUpon>StartNumberingFrom.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Forms\StatusLog.resx">
<DependentUpon>StatusLog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\SubStationAlphaProperties.resx">
<DependentUpon>SubStationAlphaProperties.cs</DependentUpon>
</EmbeddedResource>

8
src/SubtitleEdit.sln
View File

@ -13,6 +13,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProjectSection
EndProject
Global
GlobalSection(SubversionScc) = preSolution
Svn-Managed = True
Manager = AnkhSVN - Subversion Support for Visual Studio
EndGlobalSection
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = SubtitleEdit.vsmdi
EndGlobalSection
@ -33,8 +37,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(SubversionScc) = preSolution
Svn-Managed = True
Manager = AnkhSVN - Subversion Support for Visual Studio
EndGlobalSection
EndGlobal