Changeset 2576


Ignore:
Timestamp:
3/22/2012 3:58:25 AM (3 years ago)
Author:
lowjoel
Message:

Do not validate the form when the user clicks on the Cancel button.

Fixes #389.

Location:
branches/eraser6/6.0/Eraser.DefaultPlugins
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/eraser6/6.0/Eraser.DefaultPlugins/CustomMethodEditorForm.Designer.cs

    r1677 r2576  
    6363            this.passesMoveDownBtn = new System.Windows.Forms.Button(); 
    6464            this.passGrp = new System.Windows.Forms.GroupBox(); 
     65            this.passEditor = new Eraser.DefaultPlugins.CustomMethodPassEditor(); 
    6566            this.randomizeChk = new System.Windows.Forms.CheckBox(); 
    6667            this.okBtn = new System.Windows.Forms.Button(); 
    6768            this.cancelBtn = new System.Windows.Forms.Button(); 
    6869            this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components); 
    69             this.passEditor = new Eraser.DefaultPlugins.CustomMethodPassEditor(); 
    7070            this.passGrp.SuspendLayout(); 
    7171            ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 
     
    145145            this.passGrp.TabStop = false; 
    146146            //  
     147            // passEditor 
     148            //  
     149            resources.ApplyResources(this.passEditor, "passEditor"); 
     150            this.passEditor.Name = "passEditor"; 
     151            this.passEditor.PassData = null; 
     152            this.passEditor.PassType = Eraser.DefaultPlugins.CustomMethodPassEditorPassType.Text; 
     153            //  
    147154            // randomizeChk 
    148155            //  
     
    161168            //  
    162169            resources.ApplyResources(this.cancelBtn, "cancelBtn"); 
     170            this.cancelBtn.CausesValidation = false; 
    163171            this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; 
    164172            this.cancelBtn.Name = "cancelBtn"; 
     
    168176            //  
    169177            this.errorProvider.ContainerControl = this; 
    170             //  
    171             // passEditor 
    172             //  
    173             resources.ApplyResources(this.passEditor, "passEditor"); 
    174             this.passEditor.Name = "passEditor"; 
    175             this.passEditor.PassData = null; 
    176             this.passEditor.PassType = Eraser.DefaultPlugins.CustomMethodPassEditorPassType.Text; 
    177178            //  
    178179            // CustomMethodEditorForm 
  • branches/eraser6/6.0/Eraser.DefaultPlugins/CustomMethodEditorForm.resx

    r585 r2576  
    178178    <value>Top, Bottom, Left, Right</value> 
    179179  </data> 
     180  <data name="passesColNumber.Text" xml:space="preserve"> 
     181    <value>Pass Number</value> 
     182  </data> 
     183  <data name="passesColNumber.Width" type="System.Int32, mscorlib"> 
     184    <value>90</value> 
     185  </data> 
     186  <data name="passesColType.Text" xml:space="preserve"> 
     187    <value>Data</value> 
     188  </data> 
     189  <data name="passesColType.Width" type="System.Int32, mscorlib"> 
     190    <value>135</value> 
     191  </data> 
    180192  <data name="passesLv.Location" type="System.Drawing.Point, System.Drawing"> 
    181193    <value>12, 60</value> 
     
    199211    <value>9</value> 
    200212  </data> 
    201   <data name="passesColNumber.Text" xml:space="preserve"> 
    202     <value>Pass Number</value> 
    203   </data> 
    204   <data name="passesColNumber.Width" type="System.Int32, mscorlib"> 
    205     <value>90</value> 
    206   </data> 
    207   <data name="passesColType.Text" xml:space="preserve"> 
    208     <value>Data</value> 
    209   </data> 
    210   <data name="passesColType.Width" type="System.Int32, mscorlib"> 
    211     <value>135</value> 
    212   </data> 
    213213  <data name="passesAddBtn.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> 
    214214    <value>Top, Right</value> 
     
    376376    <value>Bottom, Left, Right</value> 
    377377  </data> 
     378  <data name="passEditor.Font" type="System.Drawing.Font, System.Drawing"> 
     379    <value>Segoe UI, 9pt</value> 
     380  </data> 
    378381  <data name="passEditor.Location" type="System.Drawing.Point, System.Drawing"> 
    379382    <value>6, 13</value> 
     
    389392  </data> 
    390393  <data name="&gt;&gt;passEditor.Type" xml:space="preserve"> 
    391     <value>Eraser.DefaultPlugins.CustomMethodPassEditor, Eraser.DefaultPlugins, Version=6.0.0.1, Culture=neutral, PublicKeyToken=4411c113eac74bb2</value> 
     394    <value>Eraser.DefaultPlugins.CustomMethodPassEditor, Eraser.DefaultPlugins, Version=6.0.9.2575, Culture=neutral, PublicKeyToken=ab8c5acb8db9a36b</value> 
    392395  </data> 
    393396  <data name="&gt;&gt;passEditor.Parent" xml:space="preserve"> 
Note: See TracChangeset for help on using the changeset viewer.