Changeset 2025


Ignore:
Timestamp:
5/3/2010 2:27:06 PM (3 years ago)
Author:
lowjoel
Message:

Reorganised the dialog to make the settings for the erasure target more obvious, and renumbered tab indices.

Location:
trunk/eraser/Eraser
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/eraser/Eraser/TaskDataSelectionForm.Designer.cs

    r2024 r2025  
    5454            this.methodLbl = new System.Windows.Forms.Label(); 
    5555            this.methodCmb = new System.Windows.Forms.ComboBox(); 
    56             this.ok = new System.Windows.Forms.Button(); 
    57             this.cancel = new System.Windows.Forms.Button(); 
     56            this.okBtn = new System.Windows.Forms.Button(); 
     57            this.cancelBtn = new System.Windows.Forms.Button(); 
    5858            this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components); 
    5959            this.typeLbl = new System.Windows.Forms.Label(); 
    6060            this.typeCmb = new System.Windows.Forms.ComboBox(); 
    61             this.typeSettingsPnl = new System.Windows.Forms.Panel(); 
     61            this.typeSettingsPnl = new System.Windows.Forms.GroupBox(); 
    6262            ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 
    6363            this.SuspendLayout(); 
    … …  
    7575            this.methodCmb.Name = "methodCmb"; 
    7676            //  
    77             // ok 
     77            // okBtn 
    7878            //  
    79             resources.ApplyResources(this.ok, "ok"); 
    80             this.ok.Name = "ok"; 
    81             this.ok.UseVisualStyleBackColor = true; 
    82             this.ok.Click += new System.EventHandler(this.ok_Click); 
     79            resources.ApplyResources(this.okBtn, "okBtn"); 
     80            this.okBtn.Name = "okBtn"; 
     81            this.okBtn.UseVisualStyleBackColor = true; 
     82            this.okBtn.Click += new System.EventHandler(this.ok_Click); 
    8383            //  
    84             // cancel 
     84            // cancelBtn 
    8585            //  
    86             resources.ApplyResources(this.cancel, "cancel"); 
    87             this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; 
    88             this.cancel.Name = "cancel"; 
    89             this.cancel.UseVisualStyleBackColor = true; 
     86            resources.ApplyResources(this.cancelBtn, "cancelBtn"); 
     87            this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; 
     88            this.cancelBtn.Name = "cancelBtn"; 
     89            this.cancelBtn.UseVisualStyleBackColor = true; 
    9090            //  
    9191            // errorProvider 
    … …  
    110110            resources.ApplyResources(this.typeSettingsPnl, "typeSettingsPnl"); 
    111111            this.typeSettingsPnl.Name = "typeSettingsPnl"; 
     112            this.typeSettingsPnl.TabStop = false; 
    112113            //  
    113114            // TaskDataSelectionForm 
    114115            //  
    115             this.AcceptButton = this.ok; 
     116            this.AcceptButton = this.okBtn; 
    116117            resources.ApplyResources(this, "$this"); 
    117118            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; 
    118             this.CancelButton = this.cancel; 
     119            this.CancelButton = this.cancelBtn; 
    119120            this.Controls.Add(this.typeSettingsPnl); 
    120121            this.Controls.Add(this.typeCmb); 
    121122            this.Controls.Add(this.typeLbl); 
    122             this.Controls.Add(this.cancel); 
    123             this.Controls.Add(this.ok); 
     123            this.Controls.Add(this.cancelBtn); 
     124            this.Controls.Add(this.okBtn); 
    124125            this.Controls.Add(this.methodCmb); 
    125126            this.Controls.Add(this.methodLbl); 
    … …  
    139140        private System.Windows.Forms.Label methodLbl; 
    140141        private System.Windows.Forms.ComboBox methodCmb; 
    141         private System.Windows.Forms.Button ok; 
    142         private System.Windows.Forms.Button cancel; 
     142        private System.Windows.Forms.Button okBtn; 
     143        private System.Windows.Forms.Button cancelBtn; 
    143144        private System.Windows.Forms.ErrorProvider errorProvider; 
    144145        private System.Windows.Forms.ComboBox typeCmb; 
    145146        private System.Windows.Forms.Label typeLbl; 
    146         private System.Windows.Forms.Panel typeSettingsPnl; 
     147        private System.Windows.Forms.GroupBox typeSettingsPnl; 
    147148    } 
    148149} 

  • trunk/eraser/Eraser/TaskDataSelectionForm.resx

    r2024 r2025  
    124124  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> 
    125125  <data name="methodLbl.Location" type="System.Drawing.Point, System.Drawing"> 
    126     <value>5, 9</value> 
     126    <value>5, 38</value> 
    127127  </data> 
    128128  <data name="methodLbl.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    130130  </data> 
    131131  <data name="methodLbl.TabIndex" type="System.Int32, mscorlib"> 
    132     <value>1</value> 
     132    <value>3</value> 
    133133  </data> 
    134134  <data name="methodLbl.Text" xml:space="preserve"> 
    … …  
    152152  </data> 
    153153  <data name="methodCmb.Location" type="System.Drawing.Point, System.Drawing"> 
    154     <value>129, 6</value> 
     154    <value>129, 35</value> 
    155155  </data> 
    156156  <data name="methodCmb.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    158158  </data> 
    159159  <data name="methodCmb.TabIndex" type="System.Int32, mscorlib"> 
    160     <value>2</value> 
     160    <value>4</value> 
    161161  </data> 
    162162  <data name="&gt;&gt;methodCmb.Name" xml:space="preserve"> 
    … …  
    172172    <value>5</value> 
    173173  </data> 
    174   <data name="ok.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> 
     174  <data name="okBtn.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> 
    175175    <value>Bottom, Right</value> 
    176176  </data> 
    177   <data name="ok.Location" type="System.Drawing.Point, System.Drawing"> 
     177  <data name="okBtn.Location" type="System.Drawing.Point, System.Drawing"> 
    178178    <value>162, 340</value> 
    179179  </data> 
    180   <data name="ok.Size" type="System.Drawing.Size, System.Drawing"> 
     180  <data name="okBtn.Size" type="System.Drawing.Size, System.Drawing"> 
    181181    <value>75, 23</value> 
    182182  </data> 
    183   <data name="ok.TabIndex" type="System.Int32, mscorlib"> 
    184     <value>18</value> 
    185   </data> 
    186   <data name="ok.Text" xml:space="preserve"> 
     183  <data name="okBtn.TabIndex" type="System.Int32, mscorlib"> 
     184    <value>6</value> 
     185  </data> 
     186  <data name="okBtn.Text" xml:space="preserve"> 
    187187    <value>OK</value> 
    188188  </data> 
    189   <data name="&gt;&gt;ok.Name" xml:space="preserve"> 
    190     <value>ok</value> 
    191   </data> 
    192   <data name="&gt;&gt;ok.Type" xml:space="preserve"> 
     189  <data name="&gt;&gt;okBtn.Name" xml:space="preserve"> 
     190    <value>okBtn</value> 
     191  </data> 
     192  <data name="&gt;&gt;okBtn.Type" xml:space="preserve"> 
    193193    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    194194  </data> 
    195   <data name="&gt;&gt;ok.Parent" xml:space="preserve"> 
    196     <value>$this</value> 
    197   </data> 
    198   <data name="&gt;&gt;ok.ZOrder" xml:space="preserve"> 
     195  <data name="&gt;&gt;okBtn.Parent" xml:space="preserve"> 
     196    <value>$this</value> 
     197  </data> 
     198  <data name="&gt;&gt;okBtn.ZOrder" xml:space="preserve"> 
    199199    <value>4</value> 
    200200  </data> 
    201   <data name="cancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> 
     201  <data name="cancelBtn.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> 
    202202    <value>Bottom, Right</value> 
    203203  </data> 
    204   <data name="cancel.Location" type="System.Drawing.Point, System.Drawing"> 
     204  <data name="cancelBtn.Location" type="System.Drawing.Point, System.Drawing"> 
    205205    <value>243, 340</value> 
    206206  </data> 
    207   <data name="cancel.Size" type="System.Drawing.Size, System.Drawing"> 
     207  <data name="cancelBtn.Size" type="System.Drawing.Size, System.Drawing"> 
    208208    <value>75, 23</value> 
    209209  </data> 
    210   <data name="cancel.TabIndex" type="System.Int32, mscorlib"> 
    211     <value>19</value> 
    212   </data> 
    213   <data name="cancel.Text" xml:space="preserve"> 
     210  <data name="cancelBtn.TabIndex" type="System.Int32, mscorlib"> 
     211    <value>7</value> 
     212  </data> 
     213  <data name="cancelBtn.Text" xml:space="preserve"> 
    214214    <value>Cancel</value> 
    215215  </data> 
    216   <data name="&gt;&gt;cancel.Name" xml:space="preserve"> 
    217     <value>cancel</value> 
    218   </data> 
    219   <data name="&gt;&gt;cancel.Type" xml:space="preserve"> 
     216  <data name="&gt;&gt;cancelBtn.Name" xml:space="preserve"> 
     217    <value>cancelBtn</value> 
     218  </data> 
     219  <data name="&gt;&gt;cancelBtn.Type" xml:space="preserve"> 
    220220    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    221221  </data> 
    222   <data name="&gt;&gt;cancel.Parent" xml:space="preserve"> 
    223     <value>$this</value> 
    224   </data> 
    225   <data name="&gt;&gt;cancel.ZOrder" xml:space="preserve"> 
     222  <data name="&gt;&gt;cancelBtn.Parent" xml:space="preserve"> 
     223    <value>$this</value> 
     224  </data> 
     225  <data name="&gt;&gt;cancelBtn.ZOrder" xml:space="preserve"> 
    226226    <value>3</value> 
    227227  </data> 
    228228  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    229     <value>276, 17</value> 
     229    <value>17, 17</value> 
    230230  </metadata> 
    231231  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    … …  
    238238    <value>330, 375</value> 
    239239  </data> 
    240   <data name="typeSettingsPnl.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> 
    241     <value>Top, Bottom, Left, Right</value> 
    242   </data> 
    243240  <data name="typeSettingsPnl.Location" type="System.Drawing.Point, System.Drawing"> 
    244     <value>8, 64</value> 
     241    <value>8, 71</value> 
     242  </data> 
     243  <data name="typeSettingsPnl.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> 
     244    <value>10, 10, 10, 10</value> 
    245245  </data> 
    246246  <data name="typeSettingsPnl.Size" type="System.Drawing.Size, System.Drawing"> 
    247     <value>310, 270</value> 
     247    <value>310, 263</value> 
    248248  </data> 
    249249  <data name="typeSettingsPnl.TabIndex" type="System.Int32, mscorlib"> 
    250     <value>22</value> 
     250    <value>5</value> 
     251  </data> 
     252  <data name="typeSettingsPnl.Text" xml:space="preserve"> 
     253    <value>Settings</value> 
    251254  </data> 
    252255  <data name="&gt;&gt;typeSettingsPnl.Name" xml:space="preserve"> 
    … …  
    254257  </data> 
    255258  <data name="&gt;&gt;typeSettingsPnl.Type" xml:space="preserve"> 
    256     <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     259    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    257260  </data> 
    258261  <data name="&gt;&gt;typeSettingsPnl.Parent" xml:space="preserve"> 
    … …  
    266269  </data> 
    267270  <data name="typeCmb.Location" type="System.Drawing.Point, System.Drawing"> 
    268     <value>129, 35</value> 
     271    <value>129, 6</value> 
    269272  </data> 
    270273  <data name="typeCmb.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    272275  </data> 
    273276  <data name="typeCmb.TabIndex" type="System.Int32, mscorlib"> 
    274     <value>21</value> 
     277    <value>2</value> 
    275278  </data> 
    276279  <data name="&gt;&gt;typeCmb.Name" xml:space="preserve"> 
    … …  
    290293  </data> 
    291294  <data name="typeLbl.Location" type="System.Drawing.Point, System.Drawing"> 
    292     <value>5, 38</value> 
     295    <value>5, 9</value> 
    293296  </data> 
    294297  <data name="typeLbl.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    296299  </data> 
    297300  <data name="typeLbl.TabIndex" type="System.Int32, mscorlib"> 
    298     <value>20</value> 
     301    <value>1</value> 
    299302  </data> 
    300303  <data name="typeLbl.Text" xml:space="preserve"> 
Note: See TracChangeset for help on using the changeset viewer.