Changeset 2577


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:
3 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 
  • trunk/eraser/Eraser.DefaultPlugins/CustomMethodEditorForm.resx

    r1501 r2577  
    113113  </resheader> 
    114114  <resheader name="reader"> 
    115     <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     115    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    116116  </resheader> 
    117117  <resheader name="writer"> 
    118     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    119119  </resheader> 
    120   <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
     120  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
    121121  <data name="nameLbl.AutoSize" type="System.Boolean, mscorlib"> 
    122122    <value>True</value> 
    123123  </data> 
    124   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
     124  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
    125125  <data name="nameLbl.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> 
    126126    <value>NoControl</value> 
    127127  </data> 
    128   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> 
     128  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> 
    129129  <data name="nameLbl.Location" type="System.Drawing.Point, System.Drawing"> 
    130130    <value>12, 9</value> 
     
    143143  </data> 
    144144  <data name="&gt;&gt;nameLbl.Type" xml:space="preserve"> 
    145     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     145    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    146146  </data> 
    147147  <data name="&gt;&gt;nameLbl.Parent" xml:space="preserve"> 
     
    167167  </data> 
    168168  <data name="&gt;&gt;nameTxt.Type" xml:space="preserve"> 
    169     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     169    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    170170  </data> 
    171171  <data name="&gt;&gt;nameTxt.Parent" xml:space="preserve"> 
     
    203203  </data> 
    204204  <data name="&gt;&gt;passesLv.Type" xml:space="preserve"> 
    205     <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     205    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    206206  </data> 
    207207  <data name="&gt;&gt;passesLv.Parent" xml:space="preserve"> 
     
    233233  </data> 
    234234  <data name="&gt;&gt;passesAddBtn.Type" xml:space="preserve"> 
    235     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     235    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    236236  </data> 
    237237  <data name="&gt;&gt;passesAddBtn.Parent" xml:space="preserve"> 
     
    266266  </data> 
    267267  <data name="&gt;&gt;passesRemoveBtn.Type" xml:space="preserve"> 
    268     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     268    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    269269  </data> 
    270270  <data name="&gt;&gt;passesRemoveBtn.Parent" xml:space="preserve"> 
     
    299299  </data> 
    300300  <data name="&gt;&gt;passesDuplicateBtn.Type" xml:space="preserve"> 
    301     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     301    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    302302  </data> 
    303303  <data name="&gt;&gt;passesDuplicateBtn.Parent" xml:space="preserve"> 
     
    326326  </data> 
    327327  <data name="&gt;&gt;passEditor.Type" xml:space="preserve"> 
    328     <value>Eraser.DefaultPlugins.CustomMethodPassEditor, Eraser.DefaultPlugins, Version=6.0.6.1500, Culture=neutral, PublicKeyToken=3ac89a0351e689b6</value> 
     328    <value>Eraser.DefaultPlugins.CustomMethodPassEditor, Eraser.DefaultPlugins, Version=6.1.0.2532, Culture=neutral, PublicKeyToken=ab8c5acb8db9a36b</value> 
    329329  </data> 
    330330  <data name="&gt;&gt;passEditor.Parent" xml:space="preserve"> 
     
    353353  </data> 
    354354  <data name="&gt;&gt;passGrp.Type" xml:space="preserve"> 
    355     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     355    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    356356  </data> 
    357357  <data name="&gt;&gt;passGrp.Parent" xml:space="preserve"> 
     
    383383  </data> 
    384384  <data name="&gt;&gt;randomizeChk.Type" xml:space="preserve"> 
    385     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     385    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    386386  </data> 
    387387  <data name="&gt;&gt;randomizeChk.Parent" xml:space="preserve"> 
     
    413413  </data> 
    414414  <data name="&gt;&gt;okBtn.Type" xml:space="preserve"> 
    415     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     415    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    416416  </data> 
    417417  <data name="&gt;&gt;okBtn.Parent" xml:space="preserve"> 
     
    443443  </data> 
    444444  <data name="&gt;&gt;cancelBtn.Type" xml:space="preserve"> 
    445     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     445    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    446446  </data> 
    447447  <data name="&gt;&gt;cancelBtn.Parent" xml:space="preserve"> 
     
    451451    <value>1</value> 
    452452  </data> 
    453   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
     453  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    454454    <value>17, 17</value> 
    455455  </metadata> 
    456   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
     456  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    457457    <value>True</value> 
    458458  </metadata> 
     
    466466    <value>Segoe UI, 9pt</value> 
    467467  </data> 
    468   <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> 
    469     <value>NoControl</value> 
    470   </data> 
    471468  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms"> 
    472469    <value>CenterParent</value> 
     
    479476  </data> 
    480477  <data name="&gt;&gt;passesColNumber.Type" xml:space="preserve"> 
    481     <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     478    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    482479  </data> 
    483480  <data name="&gt;&gt;passesColType.Name" xml:space="preserve"> 
     
    485482  </data> 
    486483  <data name="&gt;&gt;passesColType.Type" xml:space="preserve"> 
    487     <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     484    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    488485  </data> 
    489486  <data name="&gt;&gt;errorProvider.Name" xml:space="preserve"> 
     
    491488  </data> 
    492489  <data name="&gt;&gt;errorProvider.Type" xml:space="preserve"> 
    493     <value>System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     490    <value>System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    494491  </data> 
    495492  <data name="&gt;&gt;$this.Name" xml:space="preserve"> 
     
    497494  </data> 
    498495  <data name="&gt;&gt;$this.Type" xml:space="preserve"> 
    499     <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     496    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    500497  </data> 
    501498</root> 
Note: See TracChangeset for help on using the changeset viewer.