From cab8d21745903279272861d4f5591e28c109a959 Mon Sep 17 00:00:00 2001 From: sr55 Date: Fri, 13 Jul 2007 19:37:44 +0000 Subject: [PATCH] WinGui: - Some C# Code fixes. Parser.cs is currently missing in action. Will appear soon hopefully. git-svn-id: svn://localhost/HandBrake/trunk@675 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/HandBrakeCS.csproj | 10 ++++++++++ win/C#/frmDvdInfo.cs | 4 ++-- win/C#/frmEncodeOutput.Designer.cs | 3 +-- win/C#/frmEncodeOutput.cs | 8 +++++++- win/C#/frmMain.cs | 13 ++++++++----- win/C#/frmQueue.Designer.cs | 1 + win/C#/frmQueue.cs | 14 +++++++++++++- win/C#/frmReadDVD.Designer.cs | 1 - win/C#/frmReadDVD.cs | 5 ----- 9 files changed, 42 insertions(+), 17 deletions(-) diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index 3cd67f65..10e4b29d 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -37,6 +37,12 @@ + + Form + + + frmEncodeOutput.cs + Form @@ -69,6 +75,10 @@ + + frmEncodeOutput.cs + Designer + Designer frmAbout.cs diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs index da1b653a..130ffa2f 100644 --- a/win/C#/frmDvdInfo.cs +++ b/win/C#/frmDvdInfo.cs @@ -8,14 +8,14 @@ using System.Windows.Forms; namespace Handbrake { - public partial class frmDVDData : Form + public partial class frmDvdInfo : Form { /* * This window should be used to display the RAW output of the handbrake CLI which is produced during the scan. */ - public frmDVDData() + public frmDvdInfo() { InitializeComponent(); } diff --git a/win/C#/frmEncodeOutput.Designer.cs b/win/C#/frmEncodeOutput.Designer.cs index 0cb4fcb4..a8d4782b 100644 --- a/win/C#/frmEncodeOutput.Designer.cs +++ b/win/C#/frmEncodeOutput.Designer.cs @@ -1,6 +1,6 @@ namespace Handbrake { - partial class frmDVDData + partial class frmDvdInfo { /// /// Required designer variable. @@ -82,7 +82,6 @@ namespace Handbrake this.Name = "frmDVDData"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Read DVD"; - this.Load += new System.EventHandler(this.frmDVDData_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/win/C#/frmEncodeOutput.cs b/win/C#/frmEncodeOutput.cs index da1b653a..7418a600 100644 --- a/win/C#/frmEncodeOutput.cs +++ b/win/C#/frmEncodeOutput.cs @@ -12,7 +12,8 @@ namespace Handbrake { /* - * This window should be used to display the RAW output of the handbrake CLI which is produced during the scan. + * This window will be used to display the raw output of hbcli.exe when it is encoding. + * */ public frmDVDData() @@ -24,5 +25,10 @@ namespace Handbrake { this.Close(); } + + private void frmDVDData_Load(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 78c4a9a2..504179e0 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -317,13 +317,14 @@ namespace Handbrake // TOOLS MENU -------------------------------------------------------------- private void mnu_encode_Click(object sender, EventArgs e) { - Form Queue = new frmQueue(); + string query = ""; // temp fix for bug here. + Form Queue = new frmQueue(query); Queue.ShowDialog(); } private void mnu_viewDVDdata_Click(object sender, EventArgs e) { - Form DVDData = new frmDVDData(); + Form DVDData = new frmDvdInfo(); DVDData.Show(); } @@ -557,7 +558,9 @@ namespace Handbrake private void btn_queue_Click(object sender, EventArgs e) { - Form Queue = new frmQueue(); + String query = GenerateTheQuery(); + MessageBox.Show(query); + Form Queue = new frmQueue(query); Queue.Show(); } @@ -1025,7 +1028,7 @@ namespace Handbrake videoEncoder = " -e x264b30"; break; default: - Mixdown = " -e x264"; + videoEncoder = " -e x264"; break; } @@ -1044,7 +1047,7 @@ namespace Handbrake audioEncoder = " -E ac3"; break; default: - Mixdown = " -E faac"; + audioEncoder = " -E faac"; break; } diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs index f17c5099..cfa3e645 100644 --- a/win/C#/frmQueue.Designer.cs +++ b/win/C#/frmQueue.Designer.cs @@ -148,6 +148,7 @@ namespace Handbrake this.Name = "frmQueue"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Queue"; + this.Load += new System.EventHandler(this.frmQueue_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index 16a7ae6f..e806ad87 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -10,19 +10,31 @@ namespace Handbrake { public partial class frmQueue : Form { - public frmQueue() + private string query = ""; + + public frmQueue(string query) { InitializeComponent(); + this.query = query; } public void addItem(String item) { list_queue.Items.Add(item); + MessageBox.Show("test"); } private void btn_Close_Click(object sender, EventArgs e) { this.Close(); } + + private void frmQueue_Load(object sender, EventArgs e) + { + addItem(query); + MessageBox.Show("test"); + } + + } } \ No newline at end of file diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs index 8959620e..1cb81113 100644 --- a/win/C#/frmReadDVD.Designer.cs +++ b/win/C#/frmReadDVD.Designer.cs @@ -108,7 +108,6 @@ namespace Handbrake this.Name = "frmReadDVD"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Reading DVD..."; - this.Load += new System.EventHandler(this.frmReadDVD_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs index a491a3ed..1c18ce7a 100644 --- a/win/C#/frmReadDVD.cs +++ b/win/C#/frmReadDVD.cs @@ -70,10 +70,5 @@ namespace Handbrake updateUIElements(); } - - private void frmReadDVD_Load(object sender, EventArgs e) - { - - } } } \ No newline at end of file -- 2.11.0