From: sr55 Date: Mon, 30 Jul 2007 18:30:11 +0000 (+0000) Subject: WinGui: X-Git-Tag: 0.9.0~78 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ae06e486523b4d062f2548a5080338a73d19aaa;p=handbrake WinGui: - UI re-configured for use without parse.cs (Updateds frmDvdInfo, frmReadDVD, frmMain, frmQueue) git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@763 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs index 9e798ea93..7f503227d 100644 --- a/win/C#/frmDvdInfo.cs +++ b/win/C#/frmDvdInfo.cs @@ -5,6 +5,8 @@ using System.Data; using System.Drawing; using System.Text; using System.Windows.Forms; +using System.IO; + namespace Handbrake { @@ -17,9 +19,22 @@ namespace Handbrake { InitializeComponent(); this.rtf_dvdInfo.Text = string.Empty; + + string appPath = Application.StartupPath.ToString(); + appPath = appPath + "\\"; + StreamReader sr = new StreamReader(appPath + "dvdinfo.dat"); + + string line = sr.ReadLine(); + + while (line != null) + { + this.rtf_dvdInfo.AppendText(line + System.Environment.NewLine); + line = sr.ReadLine(); + } + sr.Close(); } - public void HandleParsedData(object Sender, string Data) + /*public void HandleParsedData(object Sender, string Data) { if (this.InvokeRequired) { @@ -27,19 +42,19 @@ namespace Handbrake return; } this.rtf_dvdInfo.AppendText(Data + System.Environment.NewLine); - } + }*/ private void btn_close_Click(object sender, EventArgs e) { - this.Close(); + this.Hide(); } - protected override void OnClosing(CancelEventArgs e) + /*protected override void OnClosing(CancelEventArgs e) { e.Cancel = true; this.Hide(); base.OnClosing(e); - } + }*/ } } \ No newline at end of file diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 194275d7f..69864827a 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -194,7 +194,7 @@ namespace Handbrake // DVD_Save // this.DVD_Save.DefaultExt = "mp4"; - this.DVD_Save.Filter = ".mp4|*.mp4| .m4v|*.m4v |.avi|*.avi |.ogm|*.ogm |.mkv|*.mkv"; + this.DVD_Save.Filter = "*.mp4|*.mp4|*.m4v|*.m4v|*.avi|*.avi|*.ogm|*.ogm|*.mkv|*.mkv"; // // File_Save // diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 39d29ca3d..1e84ef1f3 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -669,7 +669,7 @@ namespace Handbrake { btn_eCancel.Enabled = true; String query = ""; - lbl_encode.Visible = true; + lbl_encode.Visible = false; if (QueryEditorText.Text == "") { @@ -700,9 +700,9 @@ namespace Handbrake } else { - hbProc = process.runCli(this, (string)state, true, true, false, false); - + hbProc = process.runCli(this, (string)state, false, false, false, false); MessageBox.Show("The encode process has now started.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); + hbProc.WaitForExit(); try { diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index e6b48d415..c34fee188 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -121,7 +121,7 @@ False - 530, 18 + 529, 18 633, 18 diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index 8d273215d..c0c0a8c84 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -104,6 +104,9 @@ namespace Handbrake if (progressBar.Value == 100) { MessageBox.Show("Encode Queue Completed!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); + progressBar.Value = 0; + progressBar.Update(); + lbl_progressValue.Text = "0 %"; } } } diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs index 5ba4af975..d26fa202d 100644 --- a/win/C#/frmReadDVD.Designer.cs +++ b/win/C#/frmReadDVD.Designer.cs @@ -55,7 +55,7 @@ namespace Handbrake this.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_ok.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_ok.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_ok.Location = new System.Drawing.Point(449, 56); + this.btn_ok.Location = new System.Drawing.Point(351, 56); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(71, 22); this.btn_ok.TabIndex = 28; @@ -113,7 +113,7 @@ namespace Handbrake this.btn_skip.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_skip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_skip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_skip.Location = new System.Drawing.Point(372, 56); + this.btn_skip.Location = new System.Drawing.Point(351, 4); this.btn_skip.Name = "btn_skip"; this.btn_skip.Size = new System.Drawing.Size(71, 22); this.btn_skip.TabIndex = 33; @@ -128,7 +128,7 @@ namespace Handbrake this.AcceptButton = this.btn_ok; this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(532, 88); + this.ClientSize = new System.Drawing.Size(434, 88); this.ControlBox = false; this.Controls.Add(this.btn_skip); this.Controls.Add(this.lbl_progress); @@ -142,7 +142,6 @@ namespace Handbrake this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(538, 113); - this.MinimumSize = new System.Drawing.Size(538, 113); this.Name = "frmReadDVD"; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs index 92c3a4751..d56f0f33d 100644 --- a/win/C#/frmReadDVD.cs +++ b/win/C#/frmReadDVD.cs @@ -33,10 +33,10 @@ namespace Handbrake private void btn_ok_Click(object sender, EventArgs e) { btn_ok.Enabled = false; - btn_skip.Visible = true; + //btn_skip.Visible = true; lbl_pressOk.Visible = false; lbl_progress.Text = "0%"; - lbl_progress.Visible = true; + //lbl_progress.Visible = true; lbl_status.Visible = true; // throw cli call and parsing on it's own thread ThreadPool.QueueUserWorkItem(startProc);