diff options
| author | sr55 <[email protected]> | 2007-12-21 15:21:12 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2007-12-21 15:21:12 +0000 |
| commit | 8ee09a3eac69c06cfd9b04c369c0ada1915c7fce (patch) | |
| tree | 2f5216ed252af48d405e3cb4134996368d8ac648 | |
| parent | c9457fe2227ed8693e8b42044ddd4a4d5518ada6 (diff) | |
WinGui:
- Updated build number to match SVN.
- Fixed an issue where Encode & Pause buttons didn't enable / disable correctly on the queue.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1144 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/C#/Properties/Settings.Designer.cs | 2 | ||||
| -rw-r--r-- | win/C#/Properties/Settings.settings | 2 | ||||
| -rw-r--r-- | win/C#/app.config | 2 | ||||
| -rw-r--r-- | win/C#/frmQueue.cs | 16 |
4 files changed, 14 insertions, 8 deletions
diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index 8eb65e28c..e2043b31f 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -133,7 +133,7 @@ namespace Handbrake.Properties { [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("1000")]
+ [global::System.Configuration.DefaultSettingValueAttribute("1144")]
public int hb_build {
get {
return ((int)(this["hb_build"]));
diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index 9b60aea65..23fa200e7 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -30,7 +30,7 @@ <Value Profile="(Default)">Checked</Value>
</Setting>
<Setting Name="hb_build" Type="System.Int32" Scope="User">
- <Value Profile="(Default)">1000</Value>
+ <Value Profile="(Default)">1144</Value>
</Setting>
<Setting Name="skipversion" Type="System.Int32" Scope="User">
<Value Profile="(Default)">0</Value>
diff --git a/win/C#/app.config b/win/C#/app.config index a35ba754c..d33008bfd 100644 --- a/win/C#/app.config +++ b/win/C#/app.config @@ -35,7 +35,7 @@ <value>Checked</value>
</setting>
<setting name="hb_build" serializeAs="String">
- <value>1000</value>
+ <value>1144</value>
</setting>
<setting name="skipversion" serializeAs="String">
<value>0</value>
diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index 4faff3936..deb097227 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -29,7 +29,11 @@ namespace Handbrake {
// Reset some values
- lbl_status.Visible = false;
+ if (list_queue.Items.Count != 0)
+ {
+ lbl_status.Visible = false;
+ btn_encode.Enabled = false;
+ }
cancel = false;
// Start the encode
@@ -59,6 +63,7 @@ namespace Handbrake {
cancel = true;
btn_stop.Visible = false;
+ btn_encode.Enabled = true;
MessageBox.Show("No further items on the queue will start. The current encode process will continue until it is finished. \nClick 'Encode Video' when you wish to continue encoding the queue.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
@@ -89,8 +94,7 @@ namespace Handbrake if (cancel == true)
{
break;
- }
-
+ }
}
resetQueue();
@@ -155,7 +159,10 @@ namespace Handbrake {
this.BeginInvoke(new ProgressUpdateHandler(resetQueue));
return;
+
}
+ btn_stop.Visible = false;
+ btn_encode.Enabled = true;
if (cancel == true)
{
@@ -169,8 +176,7 @@ namespace Handbrake lbl_status.Text = "Encode Queue Completed!";
text_edit.Text = "";
}
- btn_stop.Visible = false;
-
+
lbl_progressValue.Text = "0 %";
progressBar.Value = 0;
progressBar.Update();
|