Changeset 2346


Ignore:
Timestamp:
Jan 14, 2011, 10:20:55 PM (11 years ago)
Author:
sauer
Message:

Wizard:

  • added task description label to control
  • updated config files accordingly
Location:
trunk/CrypPlugins/Wizard
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/Wizard/Config/Analysis/wizard.config.analysis.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose between classic or modern encryption</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Age Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select classic or modern encryption.</desc>
    1212
    1313  <!-- Classic Encryption Category -->
  • trunk/CrypPlugins/Wizard/Config/Analysis/wizard.config.classicEn.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose between different classic encryption algorithms</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Algorithm Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select a classic encryption algorithm.</desc>
    1212
    1313  <!-- Caesar Item -->
  • trunk/CrypPlugins/Wizard/Config/Analysis/wizard.config.modernEn.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose between symmetric or asymmetric encryption</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Key Type Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select symmetric or asymmetric encryption.</desc>
    1212
    1313  <!-- Symmetric Encryption Category -->
     
    2727    </description>
    2828
    29     <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    30     <headline lang="en-US" >Choose between different asymmetric encryption algorithms</headline>
     29    <!-- This is the step's headline. It should be short, but precise. -->
     30    <headline lang="en-US" >Algorithm Selection</headline>
    3131
    32     <!-- This is the description's headline. -->
    33     <desc lang="en-US" >Description</desc>
     32    <!-- This is the step's description. -->
     33    <desc lang="en-US" >Select an asymmetric encryption/decryption algorithm.</desc>
    3434   
    3535    <!-- RSA Item -->
  • trunk/CrypPlugins/Wizard/Config/Analysis/wizard.config.modernSymEn.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose between different modern symmetric encryption algorithms</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Algorithm Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select a modern symmetric encryption algorithm.</desc>
    1212
    1313  <!-- AES Item -->
  • trunk/CrypPlugins/Wizard/Config/EnDeCrypt/wizard.config.classicEnDe.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose between different classic encryption/decryption algorithms</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Algorithm Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select a classic encryption/decryption algorithm.</desc>
    1212
    1313  <!-- Caesar Item -->
  • trunk/CrypPlugins/Wizard/Config/EnDeCrypt/wizard.config.enDe.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose between classic or modern encryption/decryption</headline>
    9   <headline lang="de-DE" >Wählen Sie zwischen klassischer oder moderner Verschlüsselung/Entschlüsselung</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Age Selection</headline>
     9  <headline lang="de-DE" >Epochenauswahl</headline>
    1010
    11   <!-- This is the description's headline. -->
    12   <desc lang="en-US" >Description</desc>
    13   <desc lang="de-DE" >Beschreibung</desc>
     11  <!-- This is the step's description. -->
     12  <desc lang="en-US" >Select classic or modern encryption/decryption.</desc>
     13  <desc lang="de-DE" >Wählen Sie zwischen klassischer oder moderner Verschlüsselung/Entschlüsselung.</desc>
    1414
    1515  <!-- Classic Encryption/Decryption Category -->
  • trunk/CrypPlugins/Wizard/Config/EnDeCrypt/wizard.config.modernEnDe.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose between symmetric or asymmetric encryption/decryption</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Key Type Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select symmetric or asymmetric encryption/decryption.</desc>
    1212
    1313  <!-- Symmetric Encryption/Decryption Category -->
     
    2727    </description>
    2828
    29     <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    30     <headline lang="en-US" >Choose between different asymmetric encryption/decryption algorithms</headline>
     29    <!-- This is the step's headline. It should be short, but precise. -->
     30    <headline lang="en-US" >Algorithm Selection</headline>
    3131
    32     <!-- This is the description's headline. -->
    33     <desc lang="en-US" >Description</desc>
     32    <!-- This is the step's description. -->
     33    <desc lang="en-US" >Select an asymmetric encryption/decryption algorithm.</desc>
    3434   
    3535    <!-- RSA Item -->
  • trunk/CrypPlugins/Wizard/Config/EnDeCrypt/wizard.config.modernSymEnDe.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose between different modern symmetric encryption/decryption algorithms</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Algorithm Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select a modern symmetric encryption/decryption algorithm.</desc>
    1212
    1313  <!-- AES Item -->
  • trunk/CrypPlugins/Wizard/Config/Indiv/wizard.config.hash.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose between different hash functions</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Hash Function Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select a hash function.</desc>
    1212
    1313  <!-- MD5 Item -->
  • trunk/CrypPlugins/Wizard/Config/Indiv/wizard.config.indiv.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en" >Choose between individual procedures</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Individual Procedure Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select an individual procedure.</desc>
    1212
    1313  <!-- Hash Functions Category -->
     
    3636    </description>
    3737
    38     <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    39     <headline lang="en-US" >Choose between different key exchange algorithms</headline>
     38    <!-- This is the step's headline. It should be short, but precise. -->
     39    <headline lang="en-US" >Key Exchange Algorithm Selection</headline>
    4040
    41     <!-- This is the description's headline. -->
    42     <desc lang="en-US" >Description</desc>
     41    <!-- This is the step's description. -->
     42    <desc lang="en-US" >Select a key exchange algorithm.</desc>
    4343
    4444    <!-- Diffie Hellman Item -->
  • trunk/CrypPlugins/Wizard/Config/Indiv/wizard.config.prime.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose between different prime number operations</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Prime Number Operation Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select a prime number operation.</desc>
    1212
    1313  <!-- Factorization Item -->
  • trunk/CrypPlugins/Wizard/Config/wizard.config.start.xml

    r2302 r2346  
    55<step>
    66
    7   <!-- This is the step's headline. It should be a short, but precise instruction of what the user is supposed to do. -->
    8   <headline lang="en-US" >Choose your task</headline>
     7  <!-- This is the step's headline. It should be short, but precise. -->
     8  <headline lang="en-US" >Task Selection</headline>
    99
    10   <!-- This is the description's headline. -->
    11   <desc lang="en-US" >Description</desc>
     10  <!-- This is the step's description. -->
     11  <desc lang="en-US" >Select a task.</desc>
    1212 
    1313  <!-- Encryption/Decryption Category -->
     
    1818      Wählen Sie einen Algorithmus, um Klartext zu verschlüsseln oder chiffrierten Text zu entschlüsseln.
    1919    </description>
    20     <description lang="en" >
     20    <description lang="en-US" >
    2121      Select an algorithm to encrypt plaintext or to decrypt ciphertext.
    2222    </description>
  • trunk/CrypPlugins/Wizard/Properties/Resources.Designer.cs

    r2302 r2346  
    8080       
    8181        /// <summary>
     82        ///   Sucht eine lokalisierte Zeichenfolge, die Description ähnelt.
     83        /// </summary>
     84        public static string Description {
     85            get {
     86                return ResourceManager.GetString("Description", resourceCulture);
     87            }
     88        }
     89       
     90        /// <summary>
    8291        ///   Sucht eine lokalisierte Zeichenfolge, die Next ähnelt.
    8392        /// </summary>
  • trunk/CrypPlugins/Wizard/Properties/Resources.de-DE.resx

    r2302 r2346  
    124124    <value>ZurÃŒck</value>
    125125  </data>
     126  <data name="Description" xml:space="preserve">
     127    <value>Beschreibung</value>
     128  </data>
    126129  <data name="NextButton" xml:space="preserve">
    127130    <value>Weiter</value>
  • trunk/CrypPlugins/Wizard/Properties/Resources.resx

    r2302 r2346  
    124124    <value>Back</value>
    125125  </data>
     126  <data name="Description" xml:space="preserve">
     127    <value>Description</value>
     128  </data>
    126129  <data name="NextButton" xml:space="preserve">
    127130    <value>Next</value>
  • trunk/CrypPlugins/Wizard/WizardControl.xaml

    r2333 r2346  
    4545        <Grid.RowDefinitions>
    4646            <RowDefinition Height="Auto" />
     47            <RowDefinition Height="Auto" />
    4748            <RowDefinition />
    4849            <RowDefinition Height="Auto" />
    4950        </Grid.RowDefinitions>
    50         <Label HorizontalAlignment="Center" Name="taskHeader" VerticalAlignment="Top" FontSize="18" Margin="10"/>
    51         <Grid HorizontalAlignment="Stretch" Name="grid1" VerticalAlignment="Stretch" Grid.Row="1" >
     51        <Label HorizontalAlignment="Center" Name="taskHeader" FontSize="18" />
     52        <Label HorizontalAlignment="Stretch" Name="descHeader" FontSize="13" Grid.Row="1" Margin="5" />
     53        <Grid HorizontalAlignment="Stretch" Name="grid1" VerticalAlignment="Stretch" Grid.Row="2" Margin="10" >
    5254        <Grid.ColumnDefinitions>
    5355            <ColumnDefinition Width="Auto" />
     
    6668                        <ColumnDefinition />
    6769                    </Grid.ColumnDefinitions>
    68                     <Label Name="descHeader" HorizontalAlignment="Center" VerticalAlignment="Stretch" FontSize="14" />
     70                    <Label HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" Content="{Loc Description}" />
    6971                    <TextBlock Name="description" TextWrapping="Wrap" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextAlignment="Left" Grid.Row="1" />
    7072                </Grid>
    7173            </ScrollViewer>
    7274        </Grid>
    73         <StackPanel Grid.RowSpan="2" Height="Auto" HorizontalAlignment="Right" Name="buttonStackPanel" VerticalAlignment="Bottom" Margin="2" Grid.Row="2" Orientation="Horizontal" >
     75        <StackPanel Height="Auto" HorizontalAlignment="Right" Name="buttonStackPanel" VerticalAlignment="Bottom" Margin="2" Grid.Row="3" Orientation="Horizontal" >
    7476            <Button Content="{Loc BackButton}" Height="23" Name="backButton" Width="75" Margin="1" Click="backButton_Click"/>
    7577            <Button Content="{Loc NextButton}" Height="23" Name="nextButton" Width="75" Margin="1" IsDefault="True" Click="nextButton_Click"/>
  • trunk/CrypPlugins/Wizard/WizardControl.xaml.cs

    r2333 r2346  
    4949            }
    5050
     51            InitializeComponent();
     52
    5153            selectionBrush.Color = Color.FromArgb(255, 200, 220, 245);
    52 
    53             InitializeComponent();
     54            descScroll.Background = selectionBrush;
    5455            SetupPage(wizardConfigXML);
    5556        }
     
    202203            if (desc != null)
    203204                description.Text = desc.Value;
    204             descScroll.Background = selectionBrush;
    205205            nextButton.IsEnabled = true;
    206206        }
     
    217217                sp.Background = Brushes.Transparent;
    218218            }
    219             descScroll.Background = Brushes.Transparent;
    220219        }
    221220
Note: See TracChangeset for help on using the changeset viewer.