Changeset 2053


Ignore:
Timestamp:
5/4/2010 4:41:38 AM (4 years ago)
Author:
lowjoel
Message:

Handle configurers without UIs just like non-existent configurers.

Location:
trunk/eraser/Eraser
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/eraser/Eraser/Strings.en.resx

    r2028 r2053  
    292292    <value>(This erasure type does not have any settings to define.)</value> 
    293293  </data> 
    294   <data name="The erasure target type could be configured, but it does not provide a user interface for configuring." xml:space="preserve"> 
    295     <value>The erasure target type could be configured, but it does not provide a user interface for configuring.</value> 
    296   </data> 
    297   <data name="Select Data to Erase " xml:space="preserve"> 
    298     <value>Select Data to Erase</value> 
    299   </data> 
    300294  <data name="The erasure method selected does not support unused disk space erasures." xml:space="preserve"> 
    301295    <value>The erasure method selected does not support unused disk space erasures.</value> 
  • trunk/eraser/Eraser/Strings.it.resx

    r2028 r2053  
    292292    <value>(Untranslated)</value> 
    293293  </data> 
    294   <data name="The erasure target type could be configured, but it does not provide a user interface for configuring." xml:space="preserve"> 
    295     <value>(Untranslated)</value> 
    296   </data> 
    297   <data name="Select Data to Erase " xml:space="preserve"> 
    298     <value>(Untranslated)</value> 
    299   </data> 
    300294  <data name="The erasure method selected does not support unused disk space erasures." xml:space="preserve"> 
    301295    <value>Il metodo di pulizia selezionato non consente la pulizia dello spazio libero.</value> 
  • trunk/eraser/Eraser/Strings.nl.resx

    r2028 r2053  
    292292    <value>(Untranslated)</value> 
    293293  </data> 
    294   <data name="The erasure target type could be configured, but it does not provide a user interface for configuring." xml:space="preserve"> 
    295     <value>(Untranslated)</value> 
    296   </data> 
    297   <data name="Select Data to Erase " xml:space="preserve"> 
    298     <value>(Untranslated)</value> 
    299   </data> 
    300294  <data name="The erasure method selected does not support unused disk space erasures." xml:space="preserve"> 
    301295    <value>Deze geselecteerde wis methode kan geen ongebruikte schijfruimte te wissen.</value> 
  • trunk/eraser/Eraser/Strings.pl.resx

    r2028 r2053  
    292292    <value>(Untranslated)</value> 
    293293  </data> 
    294   <data name="The erasure target type could be configured, but it does not provide a user interface for configuring." xml:space="preserve"> 
    295     <value>(Untranslated)</value> 
    296   </data> 
    297   <data name="Select Data to Erase " xml:space="preserve"> 
    298     <value>(Untranslated)</value> 
    299   </data> 
    300294  <data name="The erasure method selected does not support unused disk space erasures." xml:space="preserve"> 
    301295    <value>Wybrana metoda, nie wspiera wymazywania nieużywanego miejsca.</value> 
  • trunk/eraser/Eraser/Strings.resx

    r2028 r2053  
    292292    <value>(This erasure type does not have any settings to define.)</value> 
    293293  </data> 
    294   <data name="The erasure target type could be configured, but it does not provide a user interface for configuring." xml:space="preserve"> 
    295     <value>The erasure target type could be configured, but it does not provide a user interface for configuring.</value> 
    296   </data> 
    297   <data name="Select Data to Erase " xml:space="preserve"> 
    298     <value>Select Data to Erase </value> 
    299   </data> 
    300294  <data name="The erasure method selected does not support unused disk space erasures." xml:space="preserve"> 
    301295    <value>The erasure method selected does not support unused disk space erasures.</value> 
  • trunk/eraser/Eraser/TaskDataSelectionForm.cs

    r2044 r2053  
    131131            ErasureType type = (ErasureType)typeCmb.SelectedItem; 
    132132            if (type.Configurer == null) 
     133                type.Configurer = type.Target.Configurer; 
     134 
     135            if (type.Configurer == null || !(type.Configurer is Control)) 
    133136            { 
    134                 type.Configurer = type.Target.Configurer; 
    135                 if (type.Configurer == null) 
    136                 { 
    137                     Label label = new Label(); 
    138                     label.Text = S._("(This erasure type does not have any settings to define.)"); 
    139                     label.Dock = DockStyle.Fill; 
    140                     typeSettingsPnl.Controls.Add(label); 
    141                     return; 
    142                 } 
     137                Label label = new Label(); 
     138                label.Text = S._("(This erasure type does not have any settings to define.)"); 
     139                label.Dock = DockStyle.Fill; 
     140                typeSettingsPnl.Controls.Add(label); 
     141                return; 
    143142            } 
    144  
    145             if (!(type.Configurer is Control)) 
    146                 MessageBox.Show(S._("The erasure target type could be configured, but it does " + 
    147                     "not provide a user interface for configuring."), S._("Select Data to Erase "), 
    148                     MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1, 
    149                     Localisation.IsRightToLeft(this) ? 
    150                         MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign : 0); 
    151143 
    152144            Control control = type.Configurer as Control; 
Note: See TracChangeset for help on using the changeset viewer.