summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-09-26 16:13:48 +0000
committersr55 <[email protected]>2010-09-26 16:13:48 +0000
commit656d459fbdf919b02c65944f7aed8f65c604b5ae (patch)
treefe8769dfdd63008334fc30e7282d135a7cced580
parent944fe868810ac0438ae97b1ade8c7cff2de05192 (diff)
WinGui:
- Fix: Set the scan text label to "Scan Cancelled" after cancelling a scan. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3555 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/C#/frmMain.Designer.cs8
-rw-r--r--win/C#/frmMain.cs2
2 files changed, 5 insertions, 5 deletions
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index f4dee1681..b42649b43 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -39,7 +39,7 @@ namespace Handbrake
this.components = new System.ComponentModel.Container();
System.Windows.Forms.ContextMenuStrip notifyIconMenu;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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.ToolTip = new System.Windows.Forms.ToolTip(this.components);
@@ -407,9 +407,9 @@ namespace Handbrake
//
// number
//
- dataGridViewCellStyle2.Format = "N0";
- dataGridViewCellStyle2.NullValue = null;
- this.number.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle1.Format = "N0";
+ dataGridViewCellStyle1.NullValue = null;
+ this.number.DefaultCellStyle = dataGridViewCellStyle1;
this.number.Frozen = true;
this.number.HeaderText = "Chapter Number";
this.number.MaxInputLength = 3;
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index bb0ec5ea8..8c5ca36b5 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -2177,7 +2177,7 @@ namespace Handbrake
SourceScan.Stop();
- lbl_encode.Text = "Scan Cancelled!";
+ labelSource.Text = "Scan Cancelled";
}
/// <summary>