WinGui:

- Just a few things cleared up

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@652 b64f7644-9d1e-0410-96f1-a4d463321fa5

9 files changed, 20 insertions, 16 deletions

diff --git a/win/Handbrake/My Project/Settings.Designer.vb b/win/Handbrake/My Project/Settings.Designer.vb
index aba5a6895..b9a8feacf 100644
--- a/win/Handbrake/My Project/Settings.Designer.vb
+++ b/win/Handbrake/My Project/Settings.Designer.vb
@@ -511,7 +511,7 @@ Namespace My
         

         <Global.System.Configuration.UserScopedSettingAttribute(),  _

          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _

-         Global.System.Configuration.DefaultSettingValueAttribute("Normal")>  _

+         Global.System.Configuration.DefaultSettingValueAttribute("Below Normal")>  _

         Public Property Priority() As String

             Get

                 Return CType(Me("Priority"),String)

diff --git a/win/Handbrake/My Project/Settings.settings b/win/Handbrake/My Project/Settings.settings
index d96875001..87db49302 100644
--- a/win/Handbrake/My Project/Settings.settings
+++ b/win/Handbrake/My Project/Settings.settings
@@ -117,7 +117,7 @@
       <Value Profile="(Default)" />

     </Setting>

     <Setting Name="Priority" Type="System.String" Scope="User">

-      <Value Profile="(Default)">Normal</Value>

+      <Value Profile="(Default)">Below Normal</Value>

     </Setting>

   </Settings>

 </SettingsFile>
\ No newline at end of file
diff --git a/win/Handbrake/app.config b/win/Handbrake/app.config
index fe54bf138..a300765f1 100644
--- a/win/Handbrake/app.config
+++ b/win/Handbrake/app.config
@@ -141,7 +141,7 @@
                 <value />

             </setting>

             <setting name="Priority" serializeAs="String">

-                <value>Normal</value>

+                <value>Below Normal</value>

             </setting>

         </Handbrake.My.MySettings>

     </userSettings>

diff --git a/win/Handbrake/frmAbout.Designer.vb b/win/Handbrake/frmAbout.Designer.vb
index 75f112fc3..089b71eec 100644
--- a/win/Handbrake/frmAbout.Designer.vb
+++ b/win/Handbrake/frmAbout.Designer.vb
@@ -49,9 +49,9 @@ Partial Class frmAbout
         Me.Version.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))

         Me.Version.Location = New System.Drawing.Point(252, 17)

         Me.Version.Name = "Version"

-        Me.Version.Size = New System.Drawing.Size(88, 13)

+        Me.Version.Size = New System.Drawing.Size(72, 13)

         Me.Version.TabIndex = 18

-        Me.Version.Text = "Version 2.25"

+        Me.Version.Text = "{Version}"

         '

         'Label3

         '

diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb
index 43cdc2510..979e0c1db 100644
--- a/win/Handbrake/frmMain.Designer.vb
+++ b/win/Handbrake/frmMain.Designer.vb
@@ -704,9 +704,10 @@ Partial Class frmMain
         Me.RadioISO.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))

         Me.RadioISO.Location = New System.Drawing.Point(358, 34)

         Me.RadioISO.Name = "RadioISO"

-        Me.RadioISO.Size = New System.Drawing.Size(47, 17)

+        Me.RadioISO.Size = New System.Drawing.Size(44, 17)

         Me.RadioISO.TabIndex = 19

-        Me.RadioISO.Text = "ISO"

+        Me.RadioISO.Text = "File"

+        Me.ToolTip.SetToolTip(Me.RadioISO, "ISO, TS, MPG")

         Me.RadioISO.UseVisualStyleBackColor = True

         '

         'btn_Browse

@@ -715,7 +716,7 @@ Partial Class frmMain
         Me.btn_Browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat

         Me.btn_Browse.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))

         Me.btn_Browse.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))

-        Me.btn_Browse.Location = New System.Drawing.Point(418, 21)

+        Me.btn_Browse.Location = New System.Drawing.Point(415, 22)

         Me.btn_Browse.Name = "btn_Browse"

         Me.btn_Browse.Size = New System.Drawing.Size(78, 22)

         Me.btn_Browse.TabIndex = 2

@@ -2282,7 +2283,7 @@ Partial Class frmMain
         'ISO_Open

         '

         Me.ISO_Open.DefaultExt = "iso"

-        Me.ISO_Open.Filter = "iso|*.iso"

+        Me.ISO_Open.Filter = "iso|*.iso |mpg|*.mpg |mpeg|*.mpeg |ts|*.ts |VOB|*.VOB"

         '

         'DVD_Save

         '

diff --git a/win/Handbrake/frmMain.resx b/win/Handbrake/frmMain.resx
index 653be2fe3..752b751bb 100644
--- a/win/Handbrake/frmMain.resx
+++ b/win/Handbrake/frmMain.resx
@@ -175,6 +175,9 @@
   <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>234, 18</value>

   </metadata>

+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+    <value>639, 17</value>

+  </metadata>

   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index 0145d2350..b68de8c8b 100644
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -697,7 +697,7 @@ Public Class frmMain
 

     Private Sub drp_dvdtitle_click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles drp_dvdtitle.Click

         If drp_dvdtitle.Items.Count = 1 Then

-            MessageBox.Show("There are no titles to select. Please scan the DVD by clicking the 'browse' button above before trying to select a title.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)

+            MessageBox.Show("There are no titles to select. Please scan the DVD by clicking the 'browse' button above before trying to select a title.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)

         End If

     End Sub

 

diff --git a/win/Handbrake/frmReadDVD.vb b/win/Handbrake/frmReadDVD.vb
index b03ae79ef..379cfd9f9 100644
--- a/win/Handbrake/frmReadDVD.vb
+++ b/win/Handbrake/frmReadDVD.vb
@@ -15,7 +15,7 @@ Public Class frmReadDVD
         Try

             Shell("cmd /c """"" + applicationPath + "\hbcli.exe"" -i """ + frmMain.text_source.Text + """" & " -t0 >" + """" + applicationPath + "\dvdinfo.dat""" + " 2>&1""")

         Catch ex As Exception

-            MessageBox.Show("Unable to launch the CLI encoder.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)

+            MessageBox.Show("Unable to launch the CLI encoder.", "Errir", MessageBoxButtons.OK, MessageBoxIcon.Hand)

             MessageBox.Show(ex.ToString)

         End Try

 

@@ -176,7 +176,7 @@ Public Class frmReadDVD
             End If

 

             If titleError = True Then

-                MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)

+                MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)

             End If

 

         Catch ex As Exception

@@ -198,7 +198,7 @@ Public Class frmReadDVD
             outputWriter.Close()

 

         Catch ex As Exception

-            MessageBox.Show("Unable to write Data file. Please make sure the application has admin privileges.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)

+            MessageBox.Show("Unable to write Data file. Please make sure the application has admin privileges.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)

         End Try

 

         Me.Close()

@@ -217,7 +217,7 @@ Public Class frmReadDVD
             str(0) = titleInfo(0).Trim.Substring(8).Replace(":", "") 'Title

             str(1) = titleInfo(1).Trim.Substring(12) ' Duration

         Catch ex As Exception

-            MessageBox.Show("ERROR: Incomplete DVD data found. Please copy the data on the View DVD Information tab and report this error.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)

+            MessageBox.Show("Incomplete DVD data found. Please copy the data on the View DVD Information tab and report this error.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)

         End Try

 

         'Now lets add the info to the main form dropdowns

diff --git a/win/Handbrake/frmSplashScreen.Designer.vb b/win/Handbrake/frmSplashScreen.Designer.vb
index 7c92ff38c..6c72438db 100644
--- a/win/Handbrake/frmSplashScreen.Designer.vb
+++ b/win/Handbrake/frmSplashScreen.Designer.vb
@@ -90,7 +90,7 @@ Partial Class frmSplashScreen
         Me.Version.Name = "Version"

         Me.Version.Size = New System.Drawing.Size(316, 18)

         Me.Version.TabIndex = 1

-        Me.Version.Text = "Version 2.25 (beta)"

+        Me.Version.Text = "Version {Version}"

         '

         'CLIV

         '

@@ -101,7 +101,7 @@ Partial Class frmSplashScreen
         Me.CLIV.Name = "CLIV"

         Me.CLIV.Size = New System.Drawing.Size(316, 108)

         Me.CLIV.TabIndex = 2

-        Me.CLIV.Text = "Windows CLI Version: 0.8.5b1"

+        Me.CLIV.Text = "Windows CLI Version: {Version}"

         '

         'frmSplashScreen

         '