WinGui:

- Just a few things cleared up

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

diff --git a/win/Handbrake/My Project/Settings.Designer.vb b/win/Handbrake/My Project/Settings.Designer.vb
index aba5a6895c3c6385749f58269b45f92b965e2279..b9a8feacf310656b11ac816e3d1565f6f562bd81 100644 (file)
--- a/win/Handbrake/My Project/Settings.Designer.vb
+++ b/win/Handbrake/My Project/Settings.Designer.vb
@@ -511,7 +511,7 @@ Namespace My
         \r
         <Global.System.Configuration.UserScopedSettingAttribute(),  _\r
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _\r
-         Global.System.Configuration.DefaultSettingValueAttribute("Normal")>  _\r
+         Global.System.Configuration.DefaultSettingValueAttribute("Below Normal")>  _\r
         Public Property Priority() As String\r
             Get\r
                 Return CType(Me("Priority"),String)\r

diff --git a/win/Handbrake/My Project/Settings.settings b/win/Handbrake/My Project/Settings.settings
index d96875001b505a5c9795300e186b8498c2826770..87db493022fbb5c292b113562d074f41a13e4ea1 100644 (file)
--- a/win/Handbrake/My Project/Settings.settings
+++ b/win/Handbrake/My Project/Settings.settings
@@ -117,7 +117,7 @@
       <Value Profile="(Default)" />\r
     </Setting>\r
     <Setting Name="Priority" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)">Normal</Value>\r
+      <Value Profile="(Default)">Below Normal</Value>\r
     </Setting>\r
   </Settings>\r
 </SettingsFile>
\ No newline at end of file

diff --git a/win/Handbrake/app.config b/win/Handbrake/app.config
index fe54bf138c619f9528927edd81983cfb3649b6ff..a300765f1acb12bd378bbf970491f129a232af66 100644 (file)
--- a/win/Handbrake/app.config
+++ b/win/Handbrake/app.config
@@ -141,7 +141,7 @@
                 <value />\r
             </setting>\r
             <setting name="Priority" serializeAs="String">\r
-                <value>Normal</value>\r
+                <value>Below Normal</value>\r
             </setting>\r
         </Handbrake.My.MySettings>\r
     </userSettings>\r

diff --git a/win/Handbrake/frmAbout.Designer.vb b/win/Handbrake/frmAbout.Designer.vb
index 75f112fc33762b7814cdcbbd002163fb929ca8bb..089b71eecc2892af9097fa8a97a80d7788e45bb8 100644 (file)
--- 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))\r
         Me.Version.Location = New System.Drawing.Point(252, 17)\r
         Me.Version.Name = "Version"\r
-        Me.Version.Size = New System.Drawing.Size(88, 13)\r
+        Me.Version.Size = New System.Drawing.Size(72, 13)\r
         Me.Version.TabIndex = 18\r
-        Me.Version.Text = "Version 2.25"\r
+        Me.Version.Text = "{Version}"\r
         '\r
         'Label3\r
         '\r

diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb
index 43cdc2510587aac3ce949ee1aefb810eb02223c2..979e0c1db66beadf0d78a26e7077c3eaa930336d 100644 (file)
--- 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))\r
         Me.RadioISO.Location = New System.Drawing.Point(358, 34)\r
         Me.RadioISO.Name = "RadioISO"\r
-        Me.RadioISO.Size = New System.Drawing.Size(47, 17)\r
+        Me.RadioISO.Size = New System.Drawing.Size(44, 17)\r
         Me.RadioISO.TabIndex = 19\r
-        Me.RadioISO.Text = "ISO"\r
+        Me.RadioISO.Text = "File"\r
+        Me.ToolTip.SetToolTip(Me.RadioISO, "ISO, TS, MPG")\r
         Me.RadioISO.UseVisualStyleBackColor = True\r
         '\r
         'btn_Browse\r
@@ -715,7 +716,7 @@ Partial Class frmMain
         Me.btn_Browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_Browse.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_Browse.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_Browse.Location = New System.Drawing.Point(418, 21)\r
+        Me.btn_Browse.Location = New System.Drawing.Point(415, 22)\r
         Me.btn_Browse.Name = "btn_Browse"\r
         Me.btn_Browse.Size = New System.Drawing.Size(78, 22)\r
         Me.btn_Browse.TabIndex = 2\r
@@ -2282,7 +2283,7 @@ Partial Class frmMain
         'ISO_Open\r
         '\r
         Me.ISO_Open.DefaultExt = "iso"\r
-        Me.ISO_Open.Filter = "iso|*.iso"\r
+        Me.ISO_Open.Filter = "iso|*.iso |mpg|*.mpg |mpeg|*.mpeg |ts|*.ts |VOB|*.VOB"\r
         '\r
         'DVD_Save\r
         '\r

diff --git a/win/Handbrake/frmMain.resx b/win/Handbrake/frmMain.resx
index 653be2fe3a19f0d02cf6c8ca3316a53e00308b2d..752b751bb843d331b99f9343540de17eed61c037 100644 (file)
--- 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">\r
     <value>234, 18</value>\r
   </metadata>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>639, 17</value>\r
+  </metadata>\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA\r

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index 0145d23500588cab87996f6e1dee7bbf35202a47..b68de8c8b11d0c292312c58a33af3a51cc86271f 100644 (file)
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -697,7 +697,7 @@ Public Class frmMain
 \r
     Private Sub drp_dvdtitle_click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles drp_dvdtitle.Click\r
         If drp_dvdtitle.Items.Count = 1 Then\r
-            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)\r
+            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)\r
         End If\r
     End Sub\r
 \r

diff --git a/win/Handbrake/frmReadDVD.vb b/win/Handbrake/frmReadDVD.vb
index b03ae79ef78a726d50dfd443c73cf2f9075fad0a..379cfd9f918b120d4d7a9c234fcbe81c2cf8d912 100644 (file)
--- a/win/Handbrake/frmReadDVD.vb
+++ b/win/Handbrake/frmReadDVD.vb
@@ -15,7 +15,7 @@ Public Class frmReadDVD
         Try\r
             Shell("cmd /c """"" + applicationPath + "\hbcli.exe"" -i """ + frmMain.text_source.Text + """" & " -t0 >" + """" + applicationPath + "\dvdinfo.dat""" + " 2>&1""")\r
         Catch ex As Exception\r
-            MessageBox.Show("Unable to launch the CLI encoder.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
+            MessageBox.Show("Unable to launch the CLI encoder.", "Errir", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
             MessageBox.Show(ex.ToString)\r
         End Try\r
 \r
@@ -176,7 +176,7 @@ Public Class frmReadDVD
             End If\r
 \r
             If titleError = True Then\r
-                MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
+                MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
             End If\r
 \r
         Catch ex As Exception\r
@@ -198,7 +198,7 @@ Public Class frmReadDVD
             outputWriter.Close()\r
 \r
         Catch ex As Exception\r
-            MessageBox.Show("Unable to write Data file. Please make sure the application has admin privileges.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
+            MessageBox.Show("Unable to write Data file. Please make sure the application has admin privileges.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
         End Try\r
 \r
         Me.Close()\r
@@ -217,7 +217,7 @@ Public Class frmReadDVD
             str(0) = titleInfo(0).Trim.Substring(8).Replace(":", "") 'Title\r
             str(1) = titleInfo(1).Trim.Substring(12) ' Duration\r
         Catch ex As Exception\r
-            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)\r
+            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)\r
         End Try\r
 \r
         'Now lets add the info to the main form dropdowns\r

diff --git a/win/Handbrake/frmSplashScreen.Designer.vb b/win/Handbrake/frmSplashScreen.Designer.vb
index 7c92ff38c4ace01c6e40baaf80a72e0515715e65..6c72438db73ead8287c147776762fd1a79830c38 100644 (file)
--- a/win/Handbrake/frmSplashScreen.Designer.vb
+++ b/win/Handbrake/frmSplashScreen.Designer.vb
@@ -90,7 +90,7 @@ Partial Class frmSplashScreen
         Me.Version.Name = "Version"\r
         Me.Version.Size = New System.Drawing.Size(316, 18)\r
         Me.Version.TabIndex = 1\r
-        Me.Version.Text = "Version 2.25 (beta)"\r
+        Me.Version.Text = "Version {Version}"\r
         '\r
         'CLIV\r
         '\r
@@ -101,7 +101,7 @@ Partial Class frmSplashScreen
         Me.CLIV.Name = "CLIV"\r
         Me.CLIV.Size = New System.Drawing.Size(316, 108)\r
         Me.CLIV.TabIndex = 2\r
-        Me.CLIV.Text = "Windows CLI Version: 0.8.5b1"\r
+        Me.CLIV.Text = "Windows CLI Version: {Version}"\r
         '\r
         'frmSplashScreen\r
         '\r