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

SE 3.3.1

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1595 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-02-03 16:39:58 +00:00
parent 21af247f31
commit 3f2e441481
3 changed files with 82 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Changelog.txt
View File

@ -1,6 +1,6 @@
Subtitle Edit Changelog
3.3.1 (xth February 2013)
3.3.1 (3rd February 2013)
* NEW:
* Added a few new subtitle formats (now 150 formats!)
* French language - thx thx JM GBT
@ -13,7 +13,7 @@ Subtitle Edit Changelog
* Export to png/xml now uses font styles from ssa/ass
* Export images - better cropping
* Alignment tags now works for format PAC - thx Jussi
* Allows chars/sec down to 4 due to languages such as Japanese - thx dandomina
* Allows chars/sec down to 4 due to e.g. Japanese - thx dandomina
* FIXED:
* No longer removes last lines in 'Merge short lines' - thx Pax
* Some fixes for networking mode regarding insert/split - thx Dan

72
src/Forms/Main.cs
View File

@ -3224,15 +3224,7 @@ namespace Nikse.SubtitleEdit.Forms
{
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle)
{
buttonUnBreak.Visible = false;
buttonAutoBreak.Visible = false;
buttonSplitLine.Visible = false;
textBoxListViewTextAlternate.Visible = true;
labelAlternateText.Visible = true;
labelAlternateCharactersPerSecond.Visible = true;
labelTextAlternateLineLengths.Visible = true;
labelAlternateSingleLine.Visible = true;
labelTextAlternateLineTotal.Visible = true;
AddAlternate();
}
else
{
@ -3274,6 +3266,19 @@ namespace Nikse.SubtitleEdit.Forms
RefreshTimeCodeMode();
}
private void AddAlternate()
{
buttonUnBreak.Visible = false;
buttonAutoBreak.Visible = false;
buttonSplitLine.Visible = false;
textBoxListViewTextAlternate.Visible = true;
labelAlternateText.Visible = true;
labelAlternateCharactersPerSecond.Visible = true;
labelTextAlternateLineLengths.Visible = true;
labelAlternateSingleLine.Visible = true;
labelTextAlternateLineTotal.Visible = true;
}
private int ShowSubtitle()
{
if (_splitDualSami)
@ -13434,6 +13439,36 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.AutoSizeAllColumns(this);
_subtitleListViewIndex = -1;
_oldSelectedParagraph = null;
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
{
buttonUnBreak.Visible = false;
buttonAutoBreak.Visible = false;
buttonSplitLine.Visible = false;
textBoxListViewText.Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Bottom;
textBoxListViewText.Width = (groupBoxEdit.Width - (textBoxListViewText.Left + 10)) / 2;
textBoxListViewTextAlternate.Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Bottom;
textBoxListViewTextAlternate.Left = textBoxListViewText.Left + textBoxListViewText.Width + 3;
textBoxListViewTextAlternate.Width = textBoxListViewText.Width;
textBoxListViewTextAlternate.Visible = true;
labelAlternateText.Text = Configuration.Settings.Language.General.OriginalText;
labelAlternateText.Visible = true;
labelAlternateCharactersPerSecond.Visible = true;
labelTextAlternateLineLengths.Visible = true;
labelAlternateSingleLine.Visible = true;
labelTextAlternateLineTotal.Visible = true;
labelCharactersPerSecond.Left = textBoxListViewText.Left + (textBoxListViewText.Width - labelCharactersPerSecond.Width);
labelTextLineTotal.Left = textBoxListViewText.Left + (textBoxListViewText.Width - labelTextLineTotal.Width);
AddAlternate();
Main_Resize(null, null);
_changeAlternateSubtitleToString = _subtitleAlternate.ToText(new SubRip()).Trim();
}
else
{
RemoveAlternate(false);
}
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
SubtitleListview1.SelectIndexAndEnsureVisible(0);
TimerWebServiceTick(null, null);
@ -13492,6 +13527,8 @@ namespace Nikse.SubtitleEdit.Forms
private void NetworkGetSendUpdates(List<int> deleteIndices, int insertIndex, Paragraph insertParagraph)
{
_networkSession.TimerStop();
if (_networkSession == null)
return;
bool doReFill = false;
bool updateListViewStatus = false;
@ -13500,12 +13537,22 @@ namespace Nikse.SubtitleEdit.Forms
int numberOfLines = 0;
List<SeNetworkService.SeUpdate> updates = null;
int numberOfRetries = 10;
while (numberOfRetries > 0)
{
numberOfRetries--;
try
{
updates = _networkSession.GetUpdates(out message, out numberOfLines);
numberOfRetries = 0;
}
catch (Exception exception)
{
if (numberOfRetries <= 0)
{
if (exception.InnerException != null)
MessageBox.Show(string.Format(_language.NetworkUnableToConnectToServer, exception.InnerException.Message + Environment.NewLine + exception.InnerException.StackTrace));
else
MessageBox.Show(string.Format(_language.NetworkUnableToConnectToServer, exception.Message + Environment.NewLine + exception.StackTrace));
_networkSession.TimerStop();
if (_networkChat != null && !_networkChat.IsDisposed)
@ -13520,6 +13567,13 @@ namespace Nikse.SubtitleEdit.Forms
_networkChat = null;
return;
}
else
{
Application.DoEvents();
System.Threading.Thread.Sleep(250);
}
}
}
int currentSelectedIndex = -1;
if (SubtitleListview1.SelectedItems.Count > 0)
currentSelectedIndex = SubtitleListview1.SelectedItems[0].Index;

2
src/Forms/Main.resx
View File

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