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

Minor refact (+ enabled global error handling again)

Browse Source
This commit is contained in:
Nikolaj Olsson 2016-08-10 17:33:43 +02:00
parent d356632310
commit 1d66a31988
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Forms/ExportPngXml.cs
View File

@ -522,18 +522,15 @@ namespace Nikse.SubtitleEdit.Forms
if (_vobSubOcr != null)
{
int i = 0;
foreach (Paragraph p in _subtitle.Paragraphs)
while (i < _subtitle.Paragraphs.Count)
{
var mp = MakeMakeBitmapParameter(i, width, height);
mp.Bitmap = _vobSubOcr.GetSubtitleBitmap(i);
mp.Bitmap = _vobSubOcr.GetSubtitleBitmap(i++);
if (_exportType == "BLURAYSUP")
{
MakeBluRaySupImage(mp);
}
imagesSavedCount = WriteParagraph(width, sb, border, height, imagesSavedCount, vobSubWriter, binarySubtitleFile, mp, i);
i++;
progressBar1.Refresh();
Application.DoEvents();
if (i < progressBar1.Maximum)
@ -3750,28 +3747,29 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
private void UpdateLineSpacing()
{
Bitmap bmp = new Bitmap(100, 100);
using (Graphics g = Graphics.FromImage(bmp))
using (var bmp = new Bitmap(100, 100))
{
var mbp = new MakeBitmapParameter();
mbp.SubtitleFontName = _subtitleFontName;
mbp.SubtitleFontSize = float.Parse(comboBoxSubtitleFontSize.SelectedItem.ToString());
mbp.SubtitleFontBold = _subtitleFontBold;
var fontSize = g.DpiY * mbp.SubtitleFontSize / 72;
Font font = SetFont(mbp, fontSize);
using (var g = Graphics.FromImage(bmp))
{
var mbp = new MakeBitmapParameter();
mbp.SubtitleFontName = _subtitleFontName;
mbp.SubtitleFontSize = float.Parse(comboBoxSubtitleFontSize.SelectedItem.ToString());
mbp.SubtitleFontBold = _subtitleFontBold;
var fontSize = g.DpiY * mbp.SubtitleFontSize / 72;
Font font = SetFont(mbp, fontSize);
SizeF textSize = g.MeasureString("Hj!", font);
int lineHeight = (int)Math.Round(textSize.Height * 0.64f);
SizeF textSize = g.MeasureString("Hj!", font);
int lineHeight = (int)Math.Round(textSize.Height * 0.64f);
var style = string.Empty;
if (subtitleListView1.SelectedIndices.Count > 0)
style = GetStyleName(_subtitle.Paragraphs[subtitleListView1.SelectedItems[0].Index]);
if (_lineHeights.ContainsKey(style))
numericUpDownLineSpacing.Value = _lineHeights[style];
else if (lineHeight >= numericUpDownLineSpacing.Minimum && lineHeight <= numericUpDownLineSpacing.Maximum && lineHeight != numericUpDownLineSpacing.Value)
numericUpDownLineSpacing.Value = lineHeight;
else if (lineHeight > numericUpDownLineSpacing.Maximum)
numericUpDownLineSpacing.Value = numericUpDownLineSpacing.Maximum;
var style = string.Empty;
if (subtitleListView1.SelectedIndices.Count > 0)
style = GetStyleName(_subtitle.Paragraphs[subtitleListView1.SelectedItems[0].Index]);
if (style != null && _lineHeights.ContainsKey(style))
numericUpDownLineSpacing.Value = _lineHeights[style];
else if (lineHeight >= numericUpDownLineSpacing.Minimum && lineHeight <= numericUpDownLineSpacing.Maximum && lineHeight != numericUpDownLineSpacing.Value)
numericUpDownLineSpacing.Value = lineHeight;
else if (lineHeight > numericUpDownLineSpacing.Maximum)
numericUpDownLineSpacing.Value = numericUpDownLineSpacing.Maximum;
}
}
}

10
src/Program.cs
View File

@ -15,13 +15,13 @@ namespace Nikse.SubtitleEdit
private static void Main()
{
// Add the event handler for handling UI thread exceptions to the event.
//Application.ThreadException += Application_ThreadException;
Application.ThreadException += Application_ThreadException;
//// Set the unhandled exception mode to force all Windows Forms errors to go through our handler.
//Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
// Set the unhandled exception mode to force all Windows Forms errors to go through our handler.
Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
//// Add the event handler for handling non-UI thread exceptions to the event.
//AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
// Add the event handler for handling non-UI thread exceptions to the event.
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);