diff options
| author | sr55 <[email protected]> | 2009-01-04 23:02:32 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2009-01-04 23:02:32 +0000 |
| commit | 1a9d98d7f9a76c8f6a0057c6acb7ce599ab36464 (patch) | |
| tree | ad681fc7b6cb69f339a1b0223a8bbf6065904934 /win/C#/frmMain.cs | |
| parent | 90c58971858b845e77bf97fc4d6e8d5f696c0dc1 (diff) | |
WinGui:
- Makes the new preview window user accessible from the main window.
- Attempt at a fix for a QT lockup.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2060 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/frmMain.cs')
| -rw-r--r-- | win/C#/frmMain.cs | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 418a15f69..6f9341641 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -37,7 +37,8 @@ namespace Handbrake // Globals: Mainly used for tracking.
private frmQueue queueWindow;
- private frmGenPreview preview;
+ private frmGenPreview vlcpreview;
+ private frmPreview qtpreview;
private string lastAction = null;
public int maxWidth = 0;
public int maxHeight = 0;
@@ -568,21 +569,41 @@ namespace Handbrake queueWindow.setQueue(encodeQueue);
queueWindow.Show();
}
- private void btn_vidPreview_Click(object sender, EventArgs e)
+ private void mnu_vlcpreview_Click(object sender, EventArgs e)
{
if (text_source.Text == "" || text_source.Text == "Click 'Source' to continue" || text_destination.Text == "")
MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
else
{
- if (preview == null)
+ if (vlcpreview == null)
{
- preview = new frmGenPreview(this);
- preview.Show();
+ vlcpreview = new frmGenPreview(this);
+ vlcpreview.Show();
}
- else if (preview.IsDisposed)
+ else if (vlcpreview.IsDisposed)
{
- preview = new frmGenPreview(this);
- preview.Show();
+ vlcpreview = new frmGenPreview(this);
+ vlcpreview.Show();
+ }
+ else
+ MessageBox.Show("The preview window is already open!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ }
+ }
+ private void mnu_qtpreview_Click(object sender, EventArgs e)
+ {
+ if (text_source.Text == "" || text_source.Text == "Click 'Source' to continue" || text_destination.Text == "")
+ MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ else
+ {
+ if (qtpreview == null)
+ {
+ qtpreview = new frmPreview(this);
+ qtpreview.Show();
+ }
+ else if (qtpreview.IsDisposed)
+ {
+ qtpreview = new frmPreview(this);
+ qtpreview.Show();
}
else
MessageBox.Show("The preview window is already open!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|