From d2cc0eec4600ebad848899ccc7923fd9682e54c4 Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Thu, 8 Mar 2012 07:14:56 +0000
Subject: [PATCH] A few minor adjustments

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1023 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
---
 src/ChangeLog.txt              |  2 +-
 src/Forms/GoToLine.resx        |  3 +++
 src/Forms/Settings.Designer.cs |  4 ++--
 src/Forms/Settings.cs          |  2 ++
 src/Forms/VobSubOcr.cs         | 17 ++++++++++++-----
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt
index 119dda19a..be65c740c 100644
--- a/src/ChangeLog.txt
+++ b/src/ChangeLog.txt
@@ -19,7 +19,7 @@ Subtitle Edit Changelog
    * Go to next/prev sub (or double click in time line) will center selected 
      line in listview - thx Sean/vmb/Leszek
    * Multiple replace can now move items up/down - thx Majid
-   * Improved support of SCCP format
+   * Improved support for the SCC format
  * FIXED:
    * Export to Blu-ray sup timestamps
    * Crash in Visual Sync - thx XhmikosR
diff --git a/src/Forms/GoToLine.resx b/src/Forms/GoToLine.resx
index 85654d94f..d6ab67f3f 100644
--- a/src/Forms/GoToLine.resx
+++ b/src/Forms/GoToLine.resx
@@ -656,6 +656,9 @@
         AAAAAAAAgAEAAP//AAA=
 </value>
   </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterParent</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Go to line</value>
   </data>
diff --git a/src/Forms/Settings.Designer.cs b/src/Forms/Settings.Designer.cs
index 6e1b7bf71..864686639 100644
--- a/src/Forms/Settings.Designer.cs
+++ b/src/Forms/Settings.Designer.cs
@@ -1333,7 +1333,7 @@
             // labelSpectrogramAppearance
             // 
             this.labelSpectrogramAppearance.AutoSize = true;
-            this.labelSpectrogramAppearance.Location = new System.Drawing.Point(10, 54);
+            this.labelSpectrogramAppearance.Location = new System.Drawing.Point(10, 52);
             this.labelSpectrogramAppearance.Name = "labelSpectrogramAppearance";
             this.labelSpectrogramAppearance.Size = new System.Drawing.Size(164, 13);
             this.labelSpectrogramAppearance.TabIndex = 15;
@@ -1356,7 +1356,7 @@
             this.checkBoxGenerateSpectrogram.AutoSize = true;
             this.checkBoxGenerateSpectrogram.Location = new System.Drawing.Point(10, 20);
             this.checkBoxGenerateSpectrogram.Name = "checkBoxGenerateSpectrogram";
-            this.checkBoxGenerateSpectrogram.Size = new System.Drawing.Size(131, 17);
+            this.checkBoxGenerateSpectrogram.Size = new System.Drawing.Size(134, 17);
             this.checkBoxGenerateSpectrogram.TabIndex = 11;
             this.checkBoxGenerateSpectrogram.Text = "Generate spectrogram";
             this.checkBoxGenerateSpectrogram.UseVisualStyleBackColor = true;
diff --git a/src/Forms/Settings.cs b/src/Forms/Settings.cs
index e153b29a8..6c324a653 100644
--- a/src/Forms/Settings.cs
+++ b/src/Forms/Settings.cs
@@ -578,6 +578,8 @@ namespace Nikse.SubtitleEdit.Forms
             {
                 int newButtonHeight = (int)(textSize.Height + 7 + 0.5);
                 Utilities.SetButtonHeight(this, newButtonHeight, 1);
+                Utilities.SetButtonHeight(groupBoxSsaStyle, newButtonHeight, 2);
+                Utilities.SetButtonHeight(groupBoxWaveFormAppearence, newButtonHeight, 1);
             }
         }
 
diff --git a/src/Forms/VobSubOcr.cs b/src/Forms/VobSubOcr.cs
index 009088225..b56d76829 100644
--- a/src/Forms/VobSubOcr.cs
+++ b/src/Forms/VobSubOcr.cs
@@ -774,11 +774,18 @@ namespace Nikse.SubtitleEdit.Forms
                         string fullFileName = Path.Combine(Path.GetDirectoryName(_bdnFileName), fn);
                         if (File.Exists(fullFileName))
                         {
-                            var temp = new Bitmap(fullFileName);
-                            if (temp.Width > maxWidth)
-                                maxWidth = temp.Width;
-                            totalHeight += temp.Height;
-                            bitmaps.Add(temp);
+                            try
+                            {
+                                var temp = new Bitmap(fullFileName);
+                                if (temp.Width > maxWidth)
+                                    maxWidth = temp.Width;
+                                totalHeight += temp.Height;
+                                bitmaps.Add(temp);
+                            }
+                            catch
+                            {
+                                return null;
+                            }
                         }
                     }