Ignore:
Timestamp:
3/22/2012 4:01:22 AM (3 years ago)
Author:
lowjoel
Message:

Forward-port r2576 Eraser 6.0: Do not validate the form when the user clicks on the Cancel button.

Fixes #389.

Location:
trunk/eraser
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/eraser

  • trunk/eraser/Eraser.DefaultPlugins/CustomMethodEditorForm.Designer.cs

    r2516 r2577  
    5555            this.nameTxt = new System.Windows.Forms.TextBox(); 
    5656            this.passesLv = new System.Windows.Forms.ListView(); 
    57             this.passesColNumber = new System.Windows.Forms.ColumnHeader(); 
    58             this.passesColType = new System.Windows.Forms.ColumnHeader(); 
     57            this.passesColNumber = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); 
     58            this.passesColType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); 
    5959            this.passesAddBtn = new System.Windows.Forms.Button(); 
    6060            this.passesRemoveBtn = new System.Windows.Forms.Button(); 
    6161            this.passesDuplicateBtn = new System.Windows.Forms.Button(); 
    6262            this.passGrp = new System.Windows.Forms.GroupBox(); 
     63            this.passEditor = new Eraser.DefaultPlugins.CustomMethodPassEditor(); 
    6364            this.randomizeChk = new System.Windows.Forms.CheckBox(); 
    6465            this.okBtn = new System.Windows.Forms.Button(); 
    6566            this.cancelBtn = new System.Windows.Forms.Button(); 
    6667            this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components); 
    67             this.passEditor = new Eraser.DefaultPlugins.CustomMethodPassEditor(); 
    6868            this.passGrp.SuspendLayout(); 
    6969            ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 
     
    9393            this.passesLv.UseCompatibleStateImageBehavior = false; 
    9494            this.passesLv.View = System.Windows.Forms.View.Details; 
     95            this.passesLv.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.passesLv_ItemDrag); 
     96            this.passesLv.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.passesLv_ItemSelectionChanged); 
    9597            this.passesLv.DragDrop += new System.Windows.Forms.DragEventHandler(this.passesLv_DragDrop); 
    96             this.passesLv.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.passesLv_ItemSelectionChanged); 
    9798            this.passesLv.DragEnter += new System.Windows.Forms.DragEventHandler(this.passesLv_DragEnter); 
    9899            this.passesLv.GiveFeedback += new System.Windows.Forms.GiveFeedbackEventHandler(this.passesLv_GiveFeedback); 
    99             this.passesLv.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.passesLv_ItemDrag); 
    100100            //  
    101101            // passesColNumber 
     
    135135            this.passGrp.TabStop = false; 
    136136            //  
     137            // passEditor 
     138            //  
     139            resources.ApplyResources(this.passEditor, "passEditor"); 
     140            this.passEditor.Name = "passEditor"; 
     141            this.passEditor.PassData = null; 
     142            this.passEditor.PassType = Eraser.DefaultPlugins.CustomMethodPassEditorPassType.Text; 
     143            //  
    137144            // randomizeChk 
    138145            //  
     
    151158            //  
    152159            resources.ApplyResources(this.cancelBtn, "cancelBtn"); 
     160            this.cancelBtn.CausesValidation = false; 
    153161            this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; 
    154162            this.cancelBtn.Name = "cancelBtn"; 
     
    158166            //  
    159167            this.errorProvider.ContainerControl = this; 
    160             //  
    161             // passEditor 
    162             //  
    163             resources.ApplyResources(this.passEditor, "passEditor"); 
    164             this.passEditor.Name = "passEditor"; 
    165             this.passEditor.PassData = null; 
    166             this.passEditor.PassType = Eraser.DefaultPlugins.CustomMethodPassEditorPassType.Text; 
    167168            //  
    168169            // CustomMethodEditorForm 
Note: See TracChangeset for help on using the changeset viewer.