diff options
Diffstat (limited to 'win/C#')
| -rw-r--r-- | win/C#/Properties/Settings.Designer.cs | 26 | ||||
| -rw-r--r-- | win/C#/Properties/Settings.settings | 6 | ||||
| -rw-r--r-- | win/C#/app.config | 6 | ||||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 2 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 12 | ||||
| -rw-r--r-- | win/C#/frmQuickStart.Designer.cs | 2 |
6 files changed, 26 insertions, 28 deletions
diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index 13e28e9b8..addb9c668 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
+// Runtime Version:2.0.50727.832
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -37,18 +37,6 @@ namespace Handbrake.Properties { [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("0.8.5b1")]
- public string CliVersion {
- get {
- return ((string)(this["CliVersion"]));
- }
- set {
- this["CliVersion"] = value;
- }
- }
-
- [global::System.Configuration.UserScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://download.m0k.org/handbrake/windows/update.txt")]
public string updateFile {
get {
@@ -537,5 +525,17 @@ namespace Handbrake.Properties { this["QuickStartWindow"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0.9.0")]
+ public string CliVersion {
+ get {
+ return ((string)(this["CliVersion"]));
+ }
+ set {
+ this["CliVersion"] = value;
+ }
+ }
}
}
diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index 80d38b017..093e9a2df 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -5,9 +5,6 @@ <Setting Name="GuiVersion" Type="System.String" Scope="User">
<Value Profile="(Default)">2.4</Value>
</Setting>
- <Setting Name="CliVersion" Type="System.String" Scope="User">
- <Value Profile="(Default)">0.8.5b1</Value>
- </Setting>
<Setting Name="updateFile" Type="System.String" Scope="User">
<Value Profile="(Default)">http://download.m0k.org/handbrake/windows/update.txt</Value>
</Setting>
@@ -131,5 +128,8 @@ <Setting Name="QuickStartWindow" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
+ <Setting Name="CliVersion" Type="System.String" Scope="User">
+ <Value Profile="(Default)">0.9.0</Value>
+ </Setting>
</Settings>
</SettingsFile>
\ No newline at end of file diff --git a/win/C#/app.config b/win/C#/app.config index abe963c18..c10f75505 100644 --- a/win/C#/app.config +++ b/win/C#/app.config @@ -10,9 +10,6 @@ <setting name="GuiVersion" serializeAs="String">
<value>2.4</value>
</setting>
- <setting name="CliVersion" serializeAs="String">
- <value>0.8.5b1</value>
- </setting>
<setting name="updateFile" serializeAs="String">
<value>http://download.m0k.org/handbrake/windows/update.txt</value>
</setting>
@@ -133,6 +130,9 @@ <setting name="QuickStartWindow" serializeAs="String">
<value />
</setting>
+ <setting name="CliVersion" serializeAs="String">
+ <value>0.9.0</value>
+ </setting>
</Handbrake.Properties.Settings>
</userSettings>
</configuration>
\ No newline at end of file diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index a8241e04e..a6e34a283 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -459,7 +459,7 @@ namespace Handbrake // ISO_Open
//
this.ISO_Open.DefaultExt = "ISO";
- this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.mpeg;*.vob";
+ this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.mpeg;*.vob;*.ts";
this.ISO_Open.SupportMultiDottedExtensions = true;
//
// FileToolStripMenuItem
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index fcafb5dcf..c70b71c9f 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -9,15 +9,17 @@ using System.Net; using System.IO;
using System.Diagnostics;
using System.Threading;
-
+using System.Runtime.InteropServices;
namespace Handbrake
{
+
public partial class frmMain : Form
{
+
private Process hbProc;
private Parsing.DVD thisDVD;
-
+
// --------------------------------------------------------------
// Some windows that require only 1 instance.
// --------------------------------------------------------------
@@ -33,10 +35,6 @@ namespace Handbrake public frmMain()
{
-
-
-
-
ThreadPool.QueueUserWorkItem(showSplash);
Thread.Sleep(3000);
@@ -1322,7 +1320,7 @@ namespace Handbrake private void drp_dvdtitle_Click(object sender, EventArgs e)
{
- if (drp_dvdtitle.Items.Count == 1)
+ if (drp_dvdtitle.Items.Count == 0)
{
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);
}
diff --git a/win/C#/frmQuickStart.Designer.cs b/win/C#/frmQuickStart.Designer.cs index 8ce08ae1f..07f9488b4 100644 --- a/win/C#/frmQuickStart.Designer.cs +++ b/win/C#/frmQuickStart.Designer.cs @@ -217,7 +217,7 @@ namespace Handbrake this.label7.Size = new System.Drawing.Size(463, 39);
this.label7.TabIndex = 430;
this.label7.Text = "If you don\'t read the documentation / user guides then you will most likely fail." +
- " \r\nYou will not recieve support on the forums if you have not read the\r\nFAQ / Gu" +
+ " \r\nYou will not receive support on the forums if you have not read the\r\nFAQ / Gu" +
"ides and searched the forum.";
//
// pictureBox8
|