summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--win/C#/Functions/AppcastReader.cs (renamed from win/C#/Functions/RssReader.cs)55
-rw-r--r--win/C#/Functions/Common.cs6
-rw-r--r--win/C#/HandBrakeCS.csproj11
-rw-r--r--win/C#/Properties/Settings.Designer.cs12
-rw-r--r--win/C#/Properties/Settings.settings3
-rw-r--r--win/C#/app.config3
-rw-r--r--win/C#/frmActivityWindow.cs13
-rw-r--r--win/C#/frmDownload.cs3
-rw-r--r--win/C#/frmMain.Designer.cs299
-rw-r--r--win/C#/frmMain.resx76
-rw-r--r--win/C#/frmOptions.Designer.cs61
-rw-r--r--win/C#/frmOptions.cs16
-rw-r--r--win/C#/frmUpdater.cs2
13 files changed, 339 insertions, 221 deletions
diff --git a/win/C#/Functions/RssReader.cs b/win/C#/Functions/AppcastReader.cs
index 28acf8aa8..6e9d97ea7 100644
--- a/win/C#/Functions/RssReader.cs
+++ b/win/C#/Functions/AppcastReader.cs
@@ -17,21 +17,21 @@ using System.Text.RegularExpressions;
namespace Handbrake.Functions
{
- class RssReader
+ class AppcastReader
{
XmlTextReader rssReader;
XmlDocument rssDoc;
XmlNode nodeRss;
XmlNode nodeChannel;
XmlNode nodeItem;
+ private string hb_versionInfo;
+ private string hb_version;
+ private string hb_build;
+ private string hb_file;
// Rss Reading Code.
- private void readRss()
+ private void readRss(XmlTextReader rssReader)
{
- if (Properties.Settings.Default.hb_build.ToString().EndsWith("1"))
- rssReader = new XmlTextReader(Properties.Settings.Default.appcast_unstable);
- else
- rssReader = new XmlTextReader(Properties.Settings.Default.appcast);
rssDoc = new XmlDocument();
rssDoc.Load(rssReader);
@@ -54,27 +54,48 @@ namespace Handbrake.Functions
}
}
- // Some varibles.
- private string hb_versionInfo;
- private string hb_version;
- private string hb_build;
- private string hb_file;
-
+
// Get's the information required out the RSS file.
private void getInfo()
{
- readRss();
+ Match ver;
+ int unstable_build = 0;
+ string input;
+
+ // Check the stable appcast and get the build nuber
+ rssReader = new XmlTextReader(Properties.Settings.Default.appcast);
+ readRss(rssReader);
+ input = nodeItem.InnerXml;
+ ver = Regex.Match(input, @"sparkle:version=""([0-9]*)\""");
+ int stable_build = int.Parse(ver.ToString().Replace("sparkle:version=", "").Replace("\"", ""));
+
+ // If the pref to enable unstable appcast checking is enabled OR
+ // this is a snapshot release,
+ // then check the unstable appcast.
+ if (Properties.Settings.Default.checkSnapshot == "Checked" || Properties.Settings.Default.hb_build.ToString().EndsWith("1"))
+ {
+ // Get the stable build
+ rssReader = new XmlTextReader(Properties.Settings.Default.appcast_unstable);
+ readRss(rssReader);
+ input = nodeItem.InnerXml;
+ ver = Regex.Match(input, @"sparkle:version=""([0-9]*)\""");
+ unstable_build = int.Parse(ver.ToString().Replace("sparkle:version=", "").Replace("\"", ""));
+ }
+
+ if (stable_build >= unstable_build)
+ rssReader = new XmlTextReader(Properties.Settings.Default.appcast);
+ else
+ rssReader = new XmlTextReader(Properties.Settings.Default.appcast_unstable);
// Get the Version Information
hb_versionInfo = nodeItem["description"].InnerText;
// Get the version
- Match ver;
- string input = nodeItem.InnerXml;
- ver = Regex.Match(input, @"sparkle:shortVersionString=""([0-9].[0-9].[0-9]*)\""");
+ string inputNode = nodeItem.InnerXml;
+ ver = Regex.Match(inputNode, @"sparkle:shortVersionString=""([0-9].[0-9].[0-9]*)\""");
hb_version = ver.ToString().Replace("sparkle:shortVersionString=", "").Replace("\"", "");
- ver = Regex.Match(input, @"sparkle:version=""([0-9]*)\""");
+ ver = Regex.Match(inputNode, @"sparkle:version=""([0-9]*)\""");
hb_build = ver.ToString().Replace("sparkle:version=", "").Replace("\"", "");
// Get the update file
diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 87256dc55..3f68b6346 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -27,7 +27,7 @@ namespace Handbrake.Functions
{
try
{
- Functions.RssReader rssRead = new Functions.RssReader();
+ Functions.AppcastReader rssRead = new Functions.AppcastReader();
string build = rssRead.build();
int latest = int.Parse(build);
@@ -76,10 +76,10 @@ namespace Handbrake.Functions
while (!cliProcess.HasExited)
{
line = stdOutput.ReadLine();
- Match m = Regex.Match(line, @"HandBrake svn[0-9]*[M]* \([0-9]*\)");
+ Match m = Regex.Match(line, @"HandBrake [0-9\.]*svn[0-9]*[M]* \([0-9]*\)");
if (m.Success != false)
{
- string data = line.Replace("(", "").Replace(")","").Replace("HandBrake ","");
+ string data = line.Replace("(", "").Replace(")", "").Replace("HandBrake ", "");
string[] arr = data.Split(' ');
cliVersionData.Add(arr[0]);
cliVersionData.Add(arr[1]);
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 43bc6c014..33bddfefa 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -143,7 +143,7 @@
<Compile Include="Functions\Common.cs" />
<Compile Include="Functions\Presets.cs" />
<Compile Include="Functions\Queue.cs" />
- <Compile Include="Functions\RssReader.cs" />
+ <Compile Include="Functions\AppcastReader.cs" />
<Compile Include="Functions\Encode.cs" />
<Compile Include="Functions\QueryParser.cs" />
<Compile Include="Functions\x264Panel.cs" />
@@ -240,7 +240,6 @@
<None Include="Resources\hb16.png" />
<None Include="Resources\Help16.png" />
<None Include="Resources\info16.png" />
- <Content Include="Resources\JobPassLarge.png" />
<Content Include="Resources\Output_Small.png" />
<None Include="Resources\Pause.png" />
<None Include="Resources\Play.png" />
@@ -249,16 +248,8 @@
<Content Include="Resources\Queue_Small.png" />
<None Include="Resources\stop.png" />
<None Include="Resources\SplashScreen.jpg" />
- <None Include="Resources\Remove.png" />
<None Include="Resources\Movies.png" />
- <None Include="Resources\info.png" />
- <None Include="Resources\History.png" />
- <None Include="Resources\Help.png" />
<None Include="Resources\General Preferences.png" />
- <None Include="Resources\Emoticon.png" />
- <None Include="Resources\Disc.png" />
- <None Include="Resources\Delete.png" />
- <None Include="Resources\Burn.png" />
</ItemGroup>
<ItemGroup>
<COMReference Include="AxMSComctlLib">
diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index c60982559..9b7fc0668 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -214,5 +214,17 @@ namespace Handbrake.Properties {
this["cli_minimized"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string checkSnapshot {
+ get {
+ return ((string)(this["checkSnapshot"]));
+ }
+ set {
+ this["checkSnapshot"] = value;
+ }
+ }
}
}
diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index db3927e25..41a169028 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -50,5 +50,8 @@
<Setting Name="cli_minimized" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
+ <Setting Name="checkSnapshot" Type="System.String" Scope="User">
+ <Value Profile="(Default)" />
+ </Setting>
</Settings>
</SettingsFile> \ No newline at end of file
diff --git a/win/C#/app.config b/win/C#/app.config
index 3aeae3338..8d69ad837 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -55,6 +55,9 @@
<setting name="cli_minimized" serializeAs="String">
<value />
</setting>
+ <setting name="checkSnapshot" serializeAs="String">
+ <value />
+ </setting>
</Handbrake.Properties.Settings>
</userSettings>
</configuration> \ No newline at end of file
diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index e23ff0aa5..36e405b38 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -15,8 +15,7 @@ using System.IO;
using System.Threading;
using System.Diagnostics;
using System.Runtime.InteropServices;
-
-
+using Microsoft.Win32;
namespace Handbrake
{
@@ -49,9 +48,19 @@ namespace Handbrake
string logFile = Path.Combine(Path.GetTempPath(), read_file);
if (File.Exists(logFile))
{
+
+ // Get the CPU Processor Name
+ RegistryKey RegKey = Registry.LocalMachine;
+ RegKey = RegKey.OpenSubKey("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0");
+ Object cpuType = RegKey.GetValue("ProcessorNameString");
+
// Add a header to the log file indicating that it's from the Windows GUI and display the windows version
rtf_actLog.AppendText("### Windows GUI \n");
rtf_actLog.AppendText(String.Format("### Running: {0} \n###\n", Environment.OSVersion.ToString()));
+ rtf_actLog.AppendText(String.Format("### CPU: {0} \n", cpuType));
+ rtf_actLog.AppendText(String.Format("### Temp Dir: {0} \n", Path.GetTempPath()));
+ rtf_actLog.AppendText(String.Format("### Install Dir: {0} \n", Application.StartupPath));
+ rtf_actLog.AppendText(String.Format("### Data Dir: {0} \n###\n", Application.UserAppDataPath));
// Start a new thread to run the autoUpdate process
monitorFile = new Thread(autoUpdate);
diff --git a/win/C#/frmDownload.cs b/win/C#/frmDownload.cs
index 62f58ac98..b8b74d275 100644
--- a/win/C#/frmDownload.cs
+++ b/win/C#/frmDownload.cs
@@ -44,12 +44,11 @@ namespace Handbrake
{
MessageBox.Show("An error occured on the Download Thread \n" + exc.ToString(),"Error",MessageBoxButtons.OK, MessageBoxIcon.Error);
}
-
}
private void Download()
{
- Functions.RssReader rssRead = new Functions.RssReader();
+ Functions.AppcastReader rssRead = new Functions.AppcastReader();
string tempPath = Path.Combine(Path.GetTempPath(), "handbrake-setup.exe");
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index ecc8f47ae..291013f81 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
System.Windows.Forms.Label Label38;
System.Windows.Forms.ContextMenuStrip notifyIconMenu;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();
this.DVD_Save = new System.Windows.Forms.SaveFileDialog();
this.File_Save = new System.Windows.Forms.SaveFileDialog();
@@ -91,11 +91,16 @@ namespace Handbrake
this.File_Open = new System.Windows.Forms.OpenFileDialog();
this.ISO_Open = new System.Windows.Forms.OpenFileDialog();
this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_open = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.mnu_exit = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_open3 = new System.Windows.Forms.ToolStripMenuItem();
this.ToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_viewDVDdata = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+ this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();
this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_delete_preset = new System.Windows.Forms.ToolStripMenuItem();
@@ -103,10 +108,13 @@ namespace Handbrake
this.btn_new_preset = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();
this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_handbrake_home = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_handbrake_forums = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.mnu_UpdateCheck = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();
this.frmMainMenu = new System.Windows.Forms.MenuStrip();
this.GroupBox1 = new System.Windows.Forms.GroupBox();
this.Label13 = new System.Windows.Forms.Label();
@@ -243,30 +251,24 @@ namespace Handbrake
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.treeView_presets = new System.Windows.Forms.TreeView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
- this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
- this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
- this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
- this.StatusStrip = new System.Windows.Forms.StatusStrip();
- this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();
this.btn_source = new System.Windows.Forms.ToolStripDropDownButton();
this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();
this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.mnu_dvd_drive = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.btn_start = new System.Windows.Forms.ToolStripButton();
this.btn_add2Queue = new System.Windows.Forms.ToolStripButton();
this.btn_showQueue = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.btn_minimize = new System.Windows.Forms.ToolStripButton();
- this.mnu_open = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_viewDVDdata = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_handbrake_home = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();
+ this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
+ this.StatusStrip = new System.Windows.Forms.StatusStrip();
+ this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();
+ this.panel4 = new System.Windows.Forms.Panel();
+ this.splitContainer1 = new System.Windows.Forms.SplitContainer();
Label38 = new System.Windows.Forms.Label();
notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
notifyIconMenu.SuspendLayout();
@@ -294,6 +296,10 @@ namespace Handbrake
this.groupBox2.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.StatusStrip.SuspendLayout();
+ this.panel4.SuspendLayout();
+ this.splitContainer1.Panel1.SuspendLayout();
+ this.splitContainer1.Panel2.SuspendLayout();
+ this.splitContainer1.SuspendLayout();
this.SuspendLayout();
//
// Label38
@@ -392,7 +398,7 @@ namespace Handbrake
this.text_destination.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.text_destination.Location = new System.Drawing.Point(99, 19);
this.text_destination.Name = "text_destination";
- this.text_destination.Size = new System.Drawing.Size(493, 21);
+ this.text_destination.Size = new System.Drawing.Size(503, 21);
this.text_destination.TabIndex = 1;
this.ToolTip.SetToolTip(this.text_destination, "Location where the encoded file will be saved.");
this.text_destination.TextChanged += new System.EventHandler(this.text_destination_TextChanged);
@@ -652,9 +658,9 @@ namespace Handbrake
//
// number
//
- dataGridViewCellStyle3.Format = "N0";
- dataGridViewCellStyle3.NullValue = null;
- this.number.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle1.Format = "N0";
+ dataGridViewCellStyle1.NullValue = null;
+ this.number.DefaultCellStyle = dataGridViewCellStyle1;
this.number.HeaderText = "Chapter Number";
this.number.MaxInputLength = 3;
this.number.Name = "number";
@@ -1043,6 +1049,16 @@ namespace Handbrake
this.FileToolStripMenuItem.Size = new System.Drawing.Size(38, 20);
this.FileToolStripMenuItem.Text = "&File";
//
+ // mnu_open
+ //
+ this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image")));
+ this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.mnu_open.Name = "mnu_open";
+ this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
+ this.mnu_open.Size = new System.Drawing.Size(210, 22);
+ this.mnu_open.Text = "&Import Preset";
+ this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);
+ //
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
@@ -1072,11 +1088,44 @@ namespace Handbrake
this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(49, 20);
this.ToolsToolStripMenuItem.Text = "&Tools";
//
+ // mnu_encode
+ //
+ this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;
+ this.mnu_encode.Name = "mnu_encode";
+ this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
+ this.mnu_encode.Size = new System.Drawing.Size(251, 22);
+ this.mnu_encode.Text = "Show Queue";
+ this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);
+ //
+ // mnu_encodeLog
+ //
+ this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;
+ this.mnu_encodeLog.Name = "mnu_encodeLog";
+ this.mnu_encodeLog.Size = new System.Drawing.Size(251, 22);
+ this.mnu_encodeLog.Text = "Activity Window (Encode log)";
+ this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);
+ //
+ // mnu_viewDVDdata
+ //
+ this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Movies_Small;
+ this.mnu_viewDVDdata.Name = "mnu_viewDVDdata";
+ this.mnu_viewDVDdata.Size = new System.Drawing.Size(251, 22);
+ this.mnu_viewDVDdata.Text = "Activity Window (Scan log)";
+ this.mnu_viewDVDdata.Click += new System.EventHandler(this.mnu_viewDVDdata_Click);
+ //
// ToolStripSeparator5
//
this.ToolStripSeparator5.Name = "ToolStripSeparator5";
this.ToolStripSeparator5.Size = new System.Drawing.Size(248, 6);
//
+ // mnu_options
+ //
+ this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;
+ this.mnu_options.Name = "mnu_options";
+ this.mnu_options.Size = new System.Drawing.Size(251, 22);
+ this.mnu_options.Text = "Options";
+ this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);
+ //
// PresetsToolStripMenuItem
//
this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1138,6 +1187,22 @@ namespace Handbrake
this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.HelpToolStripMenuItem.Text = "&Help";
//
+ // mnu_user_guide
+ //
+ this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;
+ this.mnu_user_guide.Name = "mnu_user_guide";
+ this.mnu_user_guide.Size = new System.Drawing.Size(215, 22);
+ this.mnu_user_guide.Text = "HandBrake User Guide";
+ this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click_1);
+ //
+ // mnu_handbrake_home
+ //
+ this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16;
+ this.mnu_handbrake_home.Name = "mnu_handbrake_home";
+ this.mnu_handbrake_home.Size = new System.Drawing.Size(215, 22);
+ this.mnu_handbrake_home.Text = "HandBrake Homepage";
+ this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);
+ //
// mnu_handbrake_forums
//
this.mnu_handbrake_forums.Name = "mnu_handbrake_forums";
@@ -1162,6 +1227,14 @@ namespace Handbrake
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(212, 6);
//
+ // mnu_about
+ //
+ this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;
+ this.mnu_about.Name = "mnu_about";
+ this.mnu_about.Size = new System.Drawing.Size(215, 22);
+ this.mnu_about.Text = "About...";
+ this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);
+ //
// frmMainMenu
//
this.frmMainMenu.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -1173,7 +1246,7 @@ namespace Handbrake
this.HelpToolStripMenuItem});
this.frmMainMenu.Location = new System.Drawing.Point(0, 0);
this.frmMainMenu.Name = "frmMainMenu";
- this.frmMainMenu.Size = new System.Drawing.Size(936, 24);
+ this.frmMainMenu.Size = new System.Drawing.Size(938, 24);
this.frmMainMenu.TabIndex = 0;
this.frmMainMenu.Text = "MenuStrip1";
//
@@ -1191,7 +1264,7 @@ namespace Handbrake
this.GroupBox1.Controls.Add(this.Label10);
this.GroupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.GroupBox1.ForeColor = System.Drawing.Color.Black;
- this.GroupBox1.Location = new System.Drawing.Point(14, 73);
+ this.GroupBox1.Location = new System.Drawing.Point(10, 10);
this.GroupBox1.Name = "GroupBox1";
this.GroupBox1.Size = new System.Drawing.Size(705, 87);
this.GroupBox1.TabIndex = 1;
@@ -1250,7 +1323,7 @@ namespace Handbrake
this.groupBox_output.Controls.Add(this.check_optimiseMP4);
this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.groupBox_output.ForeColor = System.Drawing.Color.Black;
- this.groupBox_output.Location = new System.Drawing.Point(14, 217);
+ this.groupBox_output.Location = new System.Drawing.Point(10, 154);
this.groupBox_output.Name = "groupBox_output";
this.groupBox_output.Size = new System.Drawing.Size(705, 50);
this.groupBox_output.TabIndex = 3;
@@ -2173,7 +2246,7 @@ namespace Handbrake
this.advancedOptions.Controls.Add(this.h264Tab);
this.advancedOptions.Controls.Add(this.tabPage4);
this.advancedOptions.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.advancedOptions.Location = new System.Drawing.Point(14, 281);
+ this.advancedOptions.Location = new System.Drawing.Point(10, 218);
this.advancedOptions.Name = "advancedOptions";
this.advancedOptions.SelectedIndex = 0;
this.advancedOptions.Size = new System.Drawing.Size(705, 328);
@@ -2800,7 +2873,7 @@ namespace Handbrake
this.groupBox_dest.Controls.Add(this.text_destination);
this.groupBox_dest.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.groupBox_dest.ForeColor = System.Drawing.Color.Black;
- this.groupBox_dest.Location = new System.Drawing.Point(14, 163);
+ this.groupBox_dest.Location = new System.Drawing.Point(10, 100);
this.groupBox_dest.Name = "groupBox_dest";
this.groupBox_dest.Size = new System.Drawing.Size(705, 50);
this.groupBox_dest.TabIndex = 2;
@@ -2810,7 +2883,7 @@ namespace Handbrake
// btn_destBrowse
//
this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_destBrowse.Location = new System.Drawing.Point(598, 18);
+ this.btn_destBrowse.Location = new System.Drawing.Point(608, 17);
this.btn_destBrowse.Name = "btn_destBrowse";
this.btn_destBrowse.Size = new System.Drawing.Size(75, 23);
this.btn_destBrowse.TabIndex = 13;
@@ -2826,9 +2899,9 @@ namespace Handbrake
this.groupBox2.Controls.Add(this.btn_setDefault);
this.groupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.groupBox2.ForeColor = System.Drawing.Color.Black;
- this.groupBox2.Location = new System.Drawing.Point(729, 73);
+ this.groupBox2.Location = new System.Drawing.Point(5, 10);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(198, 536);
+ this.groupBox2.Size = new System.Drawing.Size(198, 535);
this.groupBox2.TabIndex = 11;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Presets";
@@ -2862,52 +2935,10 @@ namespace Handbrake
this.toolStrip1.Location = new System.Drawing.Point(0, 24);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
- this.toolStrip1.Size = new System.Drawing.Size(936, 39);
+ this.toolStrip1.Size = new System.Drawing.Size(938, 39);
this.toolStrip1.TabIndex = 0;
this.toolStrip1.Text = "toolStrip1";
//
- // toolStripSeparator10
- //
- this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39);
- //
- // toolStripSeparator4
- //
- this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);
- //
- // toolStripSeparator8
- //
- this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);
- //
- // notifyIcon
- //
- this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;
- this.notifyIcon.BalloonTipText = "HandBrake Status Here";
- this.notifyIcon.BalloonTipTitle = "HandBrake";
- this.notifyIcon.ContextMenuStrip = notifyIconMenu;
- this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
- this.notifyIcon.Text = "HandBrake";
- this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
- //
- // StatusStrip
- //
- this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.lbl_encode});
- this.StatusStrip.Location = new System.Drawing.Point(0, 619);
- this.StatusStrip.Name = "StatusStrip";
- this.StatusStrip.Size = new System.Drawing.Size(936, 22);
- this.StatusStrip.TabIndex = 12;
- this.StatusStrip.Text = "statusStrip1";
- //
- // lbl_encode
- //
- this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_encode.Name = "lbl_encode";
- this.lbl_encode.Size = new System.Drawing.Size(148, 17);
- this.lbl_encode.Text = "Encoding: Not Started";
- //
// btn_source
//
this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -2954,6 +2985,11 @@ namespace Handbrake
this.mnu_dvd_drive.Visible = false;
this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click);
//
+ // toolStripSeparator10
+ //
+ this.toolStripSeparator10.Name = "toolStripSeparator10";
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39);
+ //
// btn_start
//
this.btn_start.Image = global::Handbrake.Properties.Resources.Play;
@@ -2987,6 +3023,11 @@ namespace Handbrake
this.btn_showQueue.Text = "Show Queue";
this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);
//
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);
+ //
// btn_ActivityWindow
//
this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;
@@ -2999,6 +3040,11 @@ namespace Handbrake
"ently running encode.";
this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);
//
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);
+ //
// btn_minimize
//
this.btn_minimize.Image = global::Handbrake.Properties.Resources.hb32;
@@ -3008,89 +3054,76 @@ namespace Handbrake
this.btn_minimize.Text = "Minimize To Taskbar";
this.btn_minimize.Click += new System.EventHandler(this.btn_minimize_Click);
//
- // mnu_open
- //
- this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image")));
- this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.mnu_open.Name = "mnu_open";
- this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
- this.mnu_open.Size = new System.Drawing.Size(210, 22);
- this.mnu_open.Text = "&Import Preset";
- this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);
- //
- // mnu_encode
+ // notifyIcon
//
- this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;
- this.mnu_encode.Name = "mnu_encode";
- this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
- this.mnu_encode.Size = new System.Drawing.Size(251, 22);
- this.mnu_encode.Text = "Show Queue";
- this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);
+ this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;
+ this.notifyIcon.BalloonTipText = "HandBrake Status Here";
+ this.notifyIcon.BalloonTipTitle = "HandBrake";
+ this.notifyIcon.ContextMenuStrip = notifyIconMenu;
+ this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
+ this.notifyIcon.Text = "HandBrake";
+ this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
//
- // mnu_encodeLog
+ // StatusStrip
//
- this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;
- this.mnu_encodeLog.Name = "mnu_encodeLog";
- this.mnu_encodeLog.Size = new System.Drawing.Size(251, 22);
- this.mnu_encodeLog.Text = "Activity Window (Encode log)";
- this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);
+ this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.lbl_encode});
+ this.StatusStrip.Location = new System.Drawing.Point(0, 619);
+ this.StatusStrip.Name = "StatusStrip";
+ this.StatusStrip.Size = new System.Drawing.Size(938, 22);
+ this.StatusStrip.TabIndex = 12;
+ this.StatusStrip.Text = "statusStrip1";
//
- // mnu_viewDVDdata
+ // lbl_encode
//
- this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Movies_Small;
- this.mnu_viewDVDdata.Name = "mnu_viewDVDdata";
- this.mnu_viewDVDdata.Size = new System.Drawing.Size(251, 22);
- this.mnu_viewDVDdata.Text = "Activity Window (Scan log)";
- this.mnu_viewDVDdata.Click += new System.EventHandler(this.mnu_viewDVDdata_Click);
+ this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbl_encode.Name = "lbl_encode";
+ this.lbl_encode.Size = new System.Drawing.Size(148, 17);
+ this.lbl_encode.Text = "Encoding: Not Started";
//
- // mnu_options
+ // panel4
//
- this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;
- this.mnu_options.Name = "mnu_options";
- this.mnu_options.Size = new System.Drawing.Size(251, 22);
- this.mnu_options.Text = "Options";
- this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);
+ this.panel4.Controls.Add(this.splitContainer1);
+ this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel4.Location = new System.Drawing.Point(0, 63);
+ this.panel4.Name = "panel4";
+ this.panel4.Size = new System.Drawing.Size(938, 556);
+ this.panel4.TabIndex = 13;
//
- // mnu_user_guide
+ // splitContainer1
//
- this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;
- this.mnu_user_guide.Name = "mnu_user_guide";
- this.mnu_user_guide.Size = new System.Drawing.Size(215, 22);
- this.mnu_user_guide.Text = "HandBrake User Guide";
- this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click_1);
+ this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer1.Name = "splitContainer1";
//
- // mnu_handbrake_home
+ // splitContainer1.Panel1
//
- this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16;
- this.mnu_handbrake_home.Name = "mnu_handbrake_home";
- this.mnu_handbrake_home.Size = new System.Drawing.Size(215, 22);
- this.mnu_handbrake_home.Text = "HandBrake Homepage";
- this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);
+ this.splitContainer1.Panel1.Controls.Add(this.GroupBox1);
+ this.splitContainer1.Panel1.Controls.Add(this.groupBox_dest);
+ this.splitContainer1.Panel1.Controls.Add(this.groupBox_output);
+ this.splitContainer1.Panel1.Controls.Add(this.advancedOptions);
+ this.splitContainer1.Panel1.Margin = new System.Windows.Forms.Padding(2);
+ this.splitContainer1.Panel1.Padding = new System.Windows.Forms.Padding(2);
//
- // mnu_about
+ // splitContainer1.Panel2
//
- this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;
- this.mnu_about.Name = "mnu_about";
- this.mnu_about.Size = new System.Drawing.Size(215, 22);
- this.mnu_about.Text = "About...";
- this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);
+ this.splitContainer1.Panel2.Controls.Add(this.groupBox2);
+ this.splitContainer1.Size = new System.Drawing.Size(938, 556);
+ this.splitContainer1.SplitterDistance = 723;
+ this.splitContainer1.TabIndex = 12;
//
// frmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(936, 641);
+ this.ClientSize = new System.Drawing.Size(938, 641);
+ this.Controls.Add(this.panel4);
this.Controls.Add(this.toolStrip1);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox_dest);
- this.Controls.Add(this.advancedOptions);
- this.Controls.Add(this.groupBox_output);
- this.Controls.Add(this.GroupBox1);
this.Controls.Add(this.frmMainMenu);
this.Controls.Add(this.StatusStrip);
this.DoubleBuffered = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MinimumSize = new System.Drawing.Size(680, 580);
+ this.MinimumSize = new System.Drawing.Size(946, 668);
this.Name = "frmMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Handbrake";
@@ -3131,6 +3164,10 @@ namespace Handbrake
this.toolStrip1.PerformLayout();
this.StatusStrip.ResumeLayout(false);
this.StatusStrip.PerformLayout();
+ this.panel4.ResumeLayout(false);
+ this.splitContainer1.Panel1.ResumeLayout(false);
+ this.splitContainer1.Panel2.ResumeLayout(false);
+ this.splitContainer1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -3366,6 +3403,8 @@ namespace Handbrake
internal System.Windows.Forms.ToolStripMenuItem mnu_encodeLog;
private System.Windows.Forms.StatusStrip StatusStrip;
private System.Windows.Forms.ToolStripStatusLabel lbl_encode;
+ private System.Windows.Forms.Panel panel4;
+ private System.Windows.Forms.SplitContainer splitContainer1;
}
} \ No newline at end of file
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index dd4fda4be..1b5323eb3 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -155,12 +155,6 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
the list will not be populated with the correct amount of chapters.
Note: Do not change any of the chapter numbers!</value>
</data>
- <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>223, 15</value>
</metadata>
@@ -170,16 +164,50 @@ Note: Do not change any of the chapter numbers!</value>
<metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>329, 15</value>
</metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
+ k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
+ TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
+ AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
+ BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
+ UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
+ CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
+ F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
+ rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
+ NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
+ 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
+ AAAAAElFTkSuQmCC
+</value>
+ </data>
<metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>106, 15</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>731, 18</value>
</metadata>
+ <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
+ k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
+ TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
+ AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
+ BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
+ UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
+ CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
+ F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
+ rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
+ NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
+ 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
+ AAAAAElFTkSuQmCC
+</value>
+ </data>
<metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>830, 18</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
@@ -562,40 +590,6 @@ Note: Do not change any of the chapter numbers!</value>
<metadata name="StatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1060, 18</value>
</metadata>
- <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
- k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
- TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
- AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
- BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
- UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
- CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
- F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
- rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
- NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
- 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
- AAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
- k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
- TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
- AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
- BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
- UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
- CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
- F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
- rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
- NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
- 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
- AAAAAElFTkSuQmCC
-</value>
- </data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>56</value>
</metadata>
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index b2f2152dc..4db4e7e1b 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -64,6 +64,8 @@ namespace Handbrake
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.pathFinder = new System.Windows.Forms.FolderBrowserDialog();
this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
+ this.check_snapshot = new System.Windows.Forms.CheckBox();
+ this.lbl_appcastUnstable = new System.Windows.Forms.Label();
this.tab_options.SuspendLayout();
this.tab_general.SuspendLayout();
this.tab_cli.SuspendLayout();
@@ -77,7 +79,7 @@ namespace Handbrake
this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_close.Location = new System.Drawing.Point(395, 344);
+ this.btn_close.Location = new System.Drawing.Point(395, 323);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(107, 22);
this.btn_close.TabIndex = 53;
@@ -98,7 +100,7 @@ namespace Handbrake
"Lock System",
"Log Off",
"Quit HandBrake"});
- this.drp_completeOption.Location = new System.Drawing.Point(114, 103);
+ this.drp_completeOption.Location = new System.Drawing.Point(114, 100);
this.drp_completeOption.Name = "drp_completeOption";
this.drp_completeOption.Size = new System.Drawing.Size(166, 21);
this.drp_completeOption.TabIndex = 43;
@@ -113,7 +115,7 @@ namespace Handbrake
this.tab_options.Location = new System.Drawing.Point(12, 55);
this.tab_options.Name = "tab_options";
this.tab_options.SelectedIndex = 0;
- this.tab_options.Size = new System.Drawing.Size(490, 278);
+ this.tab_options.Size = new System.Drawing.Size(490, 262);
this.tab_options.TabIndex = 58;
//
// tab_general
@@ -131,7 +133,7 @@ namespace Handbrake
this.tab_general.Controls.Add(this.drp_completeOption);
this.tab_general.Location = new System.Drawing.Point(4, 22);
this.tab_general.Name = "tab_general";
- this.tab_general.Size = new System.Drawing.Size(482, 252);
+ this.tab_general.Size = new System.Drawing.Size(482, 236);
this.tab_general.TabIndex = 3;
this.tab_general.Text = "General";
this.tab_general.UseVisualStyleBackColor = true;
@@ -141,7 +143,7 @@ namespace Handbrake
this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_browse.Location = new System.Drawing.Point(386, 174);
+ this.btn_browse.Location = new System.Drawing.Point(386, 171);
this.btn_browse.Name = "btn_browse";
this.btn_browse.Size = new System.Drawing.Size(68, 22);
this.btn_browse.TabIndex = 78;
@@ -153,7 +155,7 @@ namespace Handbrake
//
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label10.Location = new System.Drawing.Point(111, 177);
+ this.label10.Location = new System.Drawing.Point(111, 174);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(82, 13);
this.label10.TabIndex = 77;
@@ -161,7 +163,7 @@ namespace Handbrake
//
// text_an_path
//
- this.text_an_path.Location = new System.Drawing.Point(199, 174);
+ this.text_an_path.Location = new System.Drawing.Point(199, 171);
this.text_an_path.Name = "text_an_path";
this.text_an_path.Size = new System.Drawing.Size(181, 21);
this.text_an_path.TabIndex = 76;
@@ -172,7 +174,7 @@ namespace Handbrake
//
this.check_autoNaming.AutoSize = true;
this.check_autoNaming.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_autoNaming.Location = new System.Drawing.Point(114, 151);
+ this.check_autoNaming.Location = new System.Drawing.Point(114, 148);
this.check_autoNaming.Name = "check_autoNaming";
this.check_autoNaming.Size = new System.Drawing.Size(340, 17);
this.check_autoNaming.TabIndex = 72;
@@ -185,7 +187,7 @@ namespace Handbrake
//
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label13.Location = new System.Drawing.Point(10, 152);
+ this.label13.Location = new System.Drawing.Point(10, 149);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(86, 13);
this.label13.TabIndex = 71;
@@ -249,7 +251,7 @@ namespace Handbrake
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label2.Location = new System.Drawing.Point(12, 106);
+ this.label2.Location = new System.Drawing.Point(12, 103);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(84, 13);
this.label2.TabIndex = 54;
@@ -265,7 +267,7 @@ namespace Handbrake
this.tab_cli.Controls.Add(this.Label4);
this.tab_cli.Location = new System.Drawing.Point(4, 22);
this.tab_cli.Name = "tab_cli";
- this.tab_cli.Size = new System.Drawing.Size(482, 252);
+ this.tab_cli.Size = new System.Drawing.Size(482, 236);
this.tab_cli.TabIndex = 2;
this.tab_cli.Text = "CLI";
this.tab_cli.UseVisualStyleBackColor = true;
@@ -360,12 +362,14 @@ namespace Handbrake
//
// tab_advanced
//
+ this.tab_advanced.Controls.Add(this.lbl_appcastUnstable);
+ this.tab_advanced.Controls.Add(this.check_snapshot);
this.tab_advanced.Controls.Add(this.btn_drive_detect);
this.tab_advanced.Controls.Add(this.label6);
this.tab_advanced.Location = new System.Drawing.Point(4, 22);
this.tab_advanced.Name = "tab_advanced";
this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);
- this.tab_advanced.Size = new System.Drawing.Size(482, 252);
+ this.tab_advanced.Size = new System.Drawing.Size(482, 236);
this.tab_advanced.TabIndex = 4;
this.tab_advanced.Text = "Advanced";
this.tab_advanced.UseVisualStyleBackColor = true;
@@ -374,7 +378,7 @@ namespace Handbrake
//
this.btn_drive_detect.AutoSize = true;
this.btn_drive_detect.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btn_drive_detect.Location = new System.Drawing.Point(62, 19);
+ this.btn_drive_detect.Location = new System.Drawing.Point(76, 18);
this.btn_drive_detect.Name = "btn_drive_detect";
this.btn_drive_detect.Size = new System.Drawing.Size(383, 17);
this.btn_drive_detect.TabIndex = 72;
@@ -388,7 +392,7 @@ namespace Handbrake
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label6.Location = new System.Drawing.Point(21, 19);
+ this.label6.Location = new System.Drawing.Point(27, 19);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(35, 13);
this.label6.TabIndex = 71;
@@ -420,9 +424,34 @@ namespace Handbrake
this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
this.ToolTip.ToolTipTitle = "Tooltip";
//
+ // check_snapshot
+ //
+ this.check_snapshot.AutoSize = true;
+ this.check_snapshot.BackColor = System.Drawing.Color.Transparent;
+ this.check_snapshot.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.check_snapshot.Location = new System.Drawing.Point(76, 41);
+ this.check_snapshot.Name = "check_snapshot";
+ this.check_snapshot.Size = new System.Drawing.Size(273, 17);
+ this.check_snapshot.TabIndex = 80;
+ this.check_snapshot.Text = "Check for unstable development snapshots";
+ this.ToolTip.SetToolTip(this.check_snapshot, "Enables the built in update checker to check for the latest development snapshot " +
+ "builds.\r\nWarning: These are considered unstable builds and are not supported!");
+ this.check_snapshot.UseVisualStyleBackColor = false;
+ this.check_snapshot.CheckedChanged += new System.EventHandler(this.check_snapshot_CheckedChanged);
+ //
+ // lbl_appcastUnstable
+ //
+ this.lbl_appcastUnstable.AutoSize = true;
+ this.lbl_appcastUnstable.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbl_appcastUnstable.Location = new System.Drawing.Point(6, 42);
+ this.lbl_appcastUnstable.Name = "lbl_appcastUnstable";
+ this.lbl_appcastUnstable.Size = new System.Drawing.Size(64, 13);
+ this.lbl_appcastUnstable.TabIndex = 81;
+ this.lbl_appcastUnstable.Text = "Updates:";
+ //
// frmOptions
//
- this.ClientSize = new System.Drawing.Size(521, 374);
+ this.ClientSize = new System.Drawing.Size(514, 355);
this.Controls.Add(this.label8);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.tab_options);
@@ -478,5 +507,7 @@ namespace Handbrake
internal System.Windows.Forms.CheckBox check_cli_minimized;
private System.Windows.Forms.Label label12;
internal System.Windows.Forms.ToolTip ToolTip;
+ private System.Windows.Forms.Label lbl_appcastUnstable;
+ internal System.Windows.Forms.CheckBox check_snapshot;
}
} \ No newline at end of file
diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index a314046e4..d947a6354 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -33,6 +33,15 @@ namespace Handbrake
if (Properties.Settings.Default.updateStatus == "Checked")
check_updateCheck.CheckState = CheckState.Checked;
+ // Unstable Snapshot checking should only be visible for stable builds.
+ if (Properties.Settings.Default.hb_build.ToString().EndsWith("1"))
+ {
+ lbl_appcastUnstable.Visible = false;
+ check_snapshot.Visible = false;
+ }
+ if (Properties.Settings.Default.checkSnapshot == "Checked")
+ check_snapshot.CheckState = CheckState.Checked;
+
if (Properties.Settings.Default.defaultSettings == "Checked")
check_userDefaultSettings.CheckState = CheckState.Checked;
@@ -132,6 +141,11 @@ namespace Handbrake
Properties.Settings.Default.autoNamePath = text_an_path.Text;
}
+ private void check_snapshot_CheckedChanged(object sender, EventArgs e)
+ {
+ Properties.Settings.Default.checkSnapshot = check_snapshot.CheckState.ToString();
+ }
+
private void check_cli_minimized_CheckedChanged(object sender, EventArgs e)
{
Properties.Settings.Default.cli_minimized = check_cli_minimized.CheckState.ToString();
@@ -139,5 +153,7 @@ namespace Handbrake
#endregion
+
+
}
} \ No newline at end of file
diff --git a/win/C#/frmUpdater.cs b/win/C#/frmUpdater.cs
index 67f850df7..ac4f7f5c1 100644
--- a/win/C#/frmUpdater.cs
+++ b/win/C#/frmUpdater.cs
@@ -14,7 +14,7 @@ namespace Handbrake
{
public partial class frmUpdater : Form
{
- Functions.RssReader rssRead = new Functions.RssReader();
+ Functions.AppcastReader rssRead = new Functions.AppcastReader();
public frmUpdater()
{
InitializeComponent();
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 00:32:50 +0000