Changeset 8667


Ignore:
Timestamp:
Feb 22, 2020, 6:56:59 PM (2 years ago)
Author:
Sven Rech
Message:

PKCS#1 tutorial: Made text components selectable.

Location:
trunk/CrypPlugins/PKCS1
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/DatablockControl.xaml

    r8500 r8667  
    6060                    </Grid.RowDefinitions>
    6161                        <!-- Choose Hashfunction -->
    62                     <Label Grid.Row="0" HorizontalAlignment="Right" Margin="5,0,5,0" Name="lblChooseHash" VerticalAlignment="Top" Width="125">
     62                    <SelectableTextBlock Padding="5" Grid.Row="0" HorizontalAlignment="Right" Margin="5,0,5,0" Name="lblChooseHash" VerticalAlignment="Top" Width="125">
    6363                        <x:Static Member="lang:DatablockCtrl.chooseHashfunction"></x:Static>
    64                     </Label>
     64                    </SelectableTextBlock>
    6565                        <ComboBox Grid.Row="1" Height="20" HorizontalAlignment="Right" Margin="5,0,5,5" Name="cbHashFunc" VerticalAlignment="Top" Width="125" IsEditable="False" SelectionChanged="cbHashFunc_SelectionChanged"/>
    6666                    <Button Grid.Row="2" Height="25" HorizontalAlignment="Right" Margin="5,5,5,5" Name="bGenerate" VerticalAlignment="Bottom" MinWidth="110" Click="bGenerate_Click">
     
    8484                    <RowDefinition Height="*" />
    8585                </Grid.RowDefinitions>
    86                 <Label Grid.Row="0" Margin="0,5,0,0" Name="lblHashIdent">
    87                     <x:Static Member="lang:DatablockCtrl.hi"></x:Static>
    88                 </Label>
    89                     <Label Grid.Row="0" Margin="150,5,0,0" Name="lblHashIdentLength"></Label>
     86                    <SelectableTextBlock Padding="5" Grid.Row="0" Margin="0,5,0,0" Name="lblHashIdent">
     87                        <x:Static Member="lang:DatablockCtrl.hi"></x:Static>
     88                    </SelectableTextBlock>
     89                    <SelectableTextBlock Padding="5" Grid.Row="0" Margin="150,5,0,0" Name="lblHashIdentLength"></SelectableTextBlock>
    9090                    <TextBox Grid.Row="1" Height="35" Margin="5,0,5,0" Name="tbHashIdent" IsReadOnly="True" TextWrapping="Wrap" MaxWidth="450" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" TextChanged="tbHashIdent_TextChanged"/>
    91                 <Label Grid.Row="2" Margin="0,5,0,0" Name="lblHashDigest">
    92                     <x:Static Member="lang:DatablockCtrl.hd"></x:Static>
    93                 </Label>
    94                     <Label Grid.Row="2" Margin="150,5,0,0" Name="lblHashDigestLength"></Label>
     91                    <SelectableTextBlock Padding="5" Grid.Row="2" Margin="0,5,0,0" Name="lblHashDigest">
     92                        <x:Static Member="lang:DatablockCtrl.hd"></x:Static>
     93                    </SelectableTextBlock>
     94                    <SelectableTextBlock Padding="5" Grid.Row="2" Margin="150,5,0,0" Name="lblHashDigestLength"></SelectableTextBlock>
    9595                    <TextBox Grid.Row="3" Height="35" Margin="5,0,5,0" Name="tbHashDigest" IsReadOnly="True" TextWrapping="Wrap" MaxWidth="450" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" TextChanged="tbHashDigest_TextChanged"/>               
    9696            </Grid>
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/DatablockControl.xaml.cs

    r8109 r8667  
    7575            // HashDigest Textboxen leeren; werden bei Execute befüllt
    7676            this.tbHashDigest.Text = String.Empty;
    77             this.lblHashDigestLength.Content = String.Empty;
     77            this.lblHashDigestLength.Text = String.Empty;
    7878        }
    7979
     
    107107            if(this.tbHashIdent.Text != String.Empty )
    108108            {
    109                 this.lblHashIdentLength.Content = String.Format(Common.length, this.tbHashIdent.Text.Length * 4);
     109                this.lblHashIdentLength.Text = String.Format(Common.length, this.tbHashIdent.Text.Length * 4);
    110110            }
    111111        }
     
    115115            if (this.tbHashDigest.Text != String.Empty)
    116116            {
    117                 this.lblHashDigestLength.Content = String.Format(Common.length, this.tbHashDigest.Text.Length * 4);
     117                this.lblHashDigestLength.Text = String.Format(Common.length, this.tbHashDigest.Text.Length * 4);
    118118            }
    119119        }
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/KeyGenControl.xaml

    r8500 r8667  
    3434                            <ColumnDefinition Width="auto" />
    3535                        </Grid.ColumnDefinitions>
    36                         <Label Grid.Row="0" Margin="5,0,5,0">
     36                        <SelectableTextBlock Padding="5" Grid.Row="0" Margin="5,0,5,0">
    3737                            <x:Static Member="lang:RsaKeyGenCtrl.pubKey"></x:Static>
    38                         </Label>
    39                         <Label Grid.Row="1" Margin="5,0,5,0">
     38                        </SelectableTextBlock>
     39                        <SelectableTextBlock Padding="5" Grid.Row="1" Margin="5,0,5,0">
    4040                            <x:Static Member="lang:RsaKeyGenCtrl.bitSize"></x:Static>
    41                         </Label>
     41                        </SelectableTextBlock>
    4242                           
    4343                        <TextBox Grid.Row="0" Grid.Column="1" Name="tbInputPubKey"  Margin="5,0,5,5" MinWidth="50">
     
    6161                           
    6262                        <DockPanel Grid.Row="0" Grid.Column="2">
    63                             <Label Margin="5,0,5,0">
     63                            <SelectableTextBlock Padding="5" Margin="5,0,5,0">
    6464                                <x:Static Member="lang:RsaKeyGenCtrl.pubKeyComment"></x:Static>
    65                             </Label>
     65                            </SelectableTextBlock>
    6666                            <Image Name="btnHelpPubKey" Cursor="Hand" Source="../../Resources/icons/help.png" Width="16" Height="16" HorizontalAlignment="Right" MouseLeftButtonDown="btn_Help_MouseLeftButtonDown" />
    6767                        </DockPanel>
    6868                        <DockPanel Grid.Row="1" Grid.Column="2">
    69                             <Label Margin="5,0,5,0">
     69                            <SelectableTextBlock Padding="5" Margin="5,0,5,0">
    7070                                <x:Static Member="lang:RsaKeyGenCtrl.bitSizeUnit"></x:Static>
    71                             </Label>
     71                            </SelectableTextBlock>
    7272                            <Image Name="btnHelpBitSizeModulus" Cursor="Hand" Source="../../Resources/icons/help.png" Width="16" Height="16" HorizontalAlignment="Right" MouseLeftButtonDown="btn_Help_MouseLeftButtonDown" />
    7373                        </DockPanel>
     
    8080                            <ColumnDefinition Width="auto" />
    8181                        </Grid.ColumnDefinitions>
    82                         <TextBlock Grid.Column="0"  Foreground="Red" FontWeight="Bold" FontSize="10"
     82                        <SelectableTextBlock Grid.Column="0"  Foreground="Red" FontWeight="Bold" FontSize="10"
    8383                                Text="{Binding ElementName=tbInputPubKey,
    8484                                Path=(Validation.Errors),
    8585                                Converter={StaticResource eToMConverter}}" />
    86                         <TextBlock Grid.Column="0"  Foreground="Red" FontWeight="Bold" FontSize="10"
     86                        <SelectableTextBlock Grid.Column="0"  Foreground="Red" FontWeight="Bold" FontSize="10"
    8787                                Text="{Binding ElementName=tbInputMod,
    8888                                Path=(Validation.Errors),
     
    105105                        <RowDefinition Height="auto" />
    106106                    </Grid.RowDefinitions>
    107                     <Label Grid.Row="0">
     107                    <SelectableTextBlock Padding="5" Grid.Row="0">
    108108                        <x:Static Member="lang:RsaKeyGenCtrl.privKey"></x:Static>
    109                     </Label>
    110                     <Label Grid.Row="0" Margin="150,0,0,0" Name="lblPrivKeyLength"></Label>
     109                    </SelectableTextBlock>
     110                    <SelectableTextBlock Padding="5" Grid.Row="0" Margin="150,0,0,0" Name="lblPrivKeyLength"></SelectableTextBlock>
    111111                    <TextBox Grid.Row="1" Name="tbResultPrivKey" IsReadOnly="True" TextWrapping="Wrap" MaxWidth="450" MinHeight="80" Margin="5,0,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextChanged="tbResultPrivKey_TextChanged"></TextBox>
    112                     <Label Grid.Row="2">
     112                    <SelectableTextBlock Padding="5" Grid.Row="2">
    113113                        <x:Static Member="lang:RsaKeyGenCtrl.mod"></x:Static>
    114                     </Label>
    115                     <Label Grid.Row="2" Margin="150,0,0,0" Name="lblModulusLength"></Label>
     114                    </SelectableTextBlock>
     115                    <SelectableTextBlock Padding="5" Grid.Row="2" Margin="150,0,0,0" Name="lblModulusLength"></SelectableTextBlock>
    116116                    <TextBox Grid.Row="3" Name="tbResultModulus" IsReadOnly="True" TextWrapping="Wrap" MaxWidth="450" MinHeight="80" Margin="5,0,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextChanged="tbResultModulus_TextChanged"></TextBox>
    117117                </Grid>
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/KeyGenControl.xaml.cs

    r8109 r8667  
    4949        private void tbResultPrivKey_TextChanged(object sender, TextChangedEventArgs e)
    5050        {
    51             this.lblPrivKeyLength.Content = String.Format(Common.length, this.tbResultPrivKey.Text.Length * 4);
     51            this.lblPrivKeyLength.Text = String.Format(Common.length, this.tbResultPrivKey.Text.Length * 4);
    5252        }
    5353
    5454        private void tbResultModulus_TextChanged(object sender, TextChangedEventArgs e)
    5555        {
    56             this.lblModulusLength.Content = String.Format(Common.length, this.tbResultModulus.Text.Length * 4);
     56            this.lblModulusLength.Text = String.Format(Common.length, this.tbResultModulus.Text.Length * 4);
    5757        }
    5858
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/KeyInputControl.xaml

    r4750 r8667  
    3535               
    3636                <DockPanel Grid.Row="0">
    37                     <Label Margin="0,5,5,0" Width="125" >
     37                    <SelectableTextBlock Padding="5" Margin="0,5,5,0" Width="125" >
    3838                        <x:Static Member="lang:RsaKeyInputCtrl.pubKey"></x:Static>
    39                     </Label>
     39                    </SelectableTextBlock>
    4040                    <Image Name="btnHelpPubKey" Cursor="Hand" Source="../../Resources/icons/help.png" Width="16" Height="16" HorizontalAlignment="Left" MouseLeftButtonDown="btn_Help_MouseLeftButtonDown" />
    4141                </DockPanel>
     
    4949                    </TextBox.Text>
    5050                </TextBox>
    51                 <TextBlock Grid.Row="2"  Foreground="Red" FontWeight="Bold" FontSize="10" Margin="5,0,5,5"
     51                <SelectableTextBlock Grid.Row="2"  Foreground="Red" FontWeight="Bold" FontSize="10" Margin="5,0,5,5"
    5252                                Text="{Binding ElementName=tbPubKey,
    5353                                Path=(Validation.Errors),
     
    5656
    5757                <DockPanel Grid.Row="3">
    58                     <Label Margin="0,5,5,0" Width="125">
     58                    <SelectableTextBlock Padding="5" Margin="0,5,5,0" Width="125">
    5959                        <x:Static Member="lang:RsaKeyInputCtrl.keyLength"></x:Static>
    60                     </Label>
     60                    </SelectableTextBlock>
    6161                    <Image Name="btnHelpBitSizeModulus" Cursor="Hand" Source="../../Resources/icons/help.png" Width="16" Height="16" HorizontalAlignment="left" MouseLeftButtonDown="btn_Help_MouseLeftButtonDown" />
    6262                </DockPanel>
     
    7070                    </TextBox.Text>
    7171                </TextBox>
    72                 <TextBlock Grid.Row="5"  Foreground="Red" FontWeight="Bold" FontSize="10" Margin="5,0,5,5"
     72                <SelectableTextBlock Grid.Row="5"  Foreground="Red" FontWeight="Bold" FontSize="10" Margin="5,0,5,5"
    7373                                Text="{Binding ElementName=tbKeyLength,
    7474                                Path=(Validation.Errors),
     
    7777
    7878                <DockPanel Grid.Row="6">
    79                     <Label HorizontalAlignment="left" Width="102" Margin="0,5,5,0">
     79                    <SelectableTextBlock Padding="5" HorizontalAlignment="left" Width="102" Margin="0,5,5,0">
    8080                        <x:Static Member="lang:RsaKeyInputCtrl.privKey"></x:Static>
    81                     </Label>
     81                    </SelectableTextBlock>
    8282                    <DockPanel HorizontalAlignment="Right">
    8383                        <RadioButton Name="btnPrivKeyDecimal" GroupName="hexDezPriv" VerticalAlignment="Center" Margin="5,5,5,0" Checked="btnDecimal_Click">
     
    9191                <TextBox Grid.Row="7" Name="tbPrivKey" TextWrapping="Wrap" MaxWidth="450" MinHeight="80" Margin="5,0,5,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextChanged="tbPrivKey_TextChanged">                   
    9292                </TextBox>
    93                 <Label  Grid.Row="8" Name="lblErrorPrivKey" Margin="5,0,5,5" Foreground="Red" FontWeight="Bold" FontSize="10"></Label>
     93                <SelectableTextBlock Padding="5" Grid.Row="8" Name="lblErrorPrivKey" Margin="5,0,5,5" Foreground="Red" FontWeight="Bold" FontSize="10"></SelectableTextBlock>
    9494
    9595                <DockPanel  Grid.Row="9">
     
    108108                <TextBox Grid.Row="10" Name="tbModulus" TextWrapping="Wrap" MaxWidth="450" MinHeight="80" Margin="5,0,5,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextChanged="tbModulus_TextChanged">
    109109                </TextBox>
    110                 <Label  Grid.Row="11" Name="lblErrorModulus" Foreground="Red" FontWeight="Bold" FontSize="10" Margin="5,0,5,5"></Label>
     110                <SelectableTextBlock Padding="5" Grid.Row="11" Name="lblErrorModulus" Foreground="Red" FontWeight="Bold" FontSize="10" Margin="5,0,5,5"></SelectableTextBlock>
    111111
    112112                <DockPanel Grid.Row="12">
    113                     <Label Name="lblResult" HorizontalAlignment="Left" Foreground="Red" FontWeight="Bold" FontSize="10"></Label>
     113                    <SelectableTextBlock Padding="5" Name="lblResult" HorizontalAlignment="Left" Foreground="Red" FontWeight="Bold" FontSize="10"></SelectableTextBlock>
    114114                    <Button Name="btnValInput" HorizontalAlignment="Right" Click="btnValInput_Click" Height="25" Width="130" VerticalAlignment="Bottom">
    115115                        <x:Static Member="lang:RsaKeyInputCtrl.takeInput"></x:Static>
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/KeyInputControl.xaml.cs

    r8109 r8667  
    5454        }
    5555
    56         private bool checkInputTextBox(string inputText, int radix, Label outputLabel, ParameterName paramName)
     56        private bool checkInputTextBox(string inputText, int radix, TextBlock outputLabel, ParameterName paramName)
    5757        {
    5858            if (inputText != string.Empty)
     
    6464                    if (tmp.BitLength > Convert.ToInt32(tbKeyLength.Text))
    6565                    {
    66                         outputLabel.Content = RsaKeyInputCtrl.errorBitLengthShorter;
     66                        outputLabel.Text = RsaKeyInputCtrl.errorBitLengthShorter;
    6767                        return false;
    6868                    }
     
    7171                        if (paramName == ParameterName.PrivKey) { RsaKey.Instance.setPrivKey(inputText, radix); }
    7272                        if (paramName == ParameterName.Modulus) { RsaKey.Instance.setModulus(inputText, radix); }
    73                         outputLabel.Content = string.Empty;
     73                        outputLabel.Text = string.Empty;
    7474                        return true;
    7575                    }
     
    7777                else
    7878                {
    79                     outputLabel.Content = RsaKeyInputCtrl.errorValidSignsOnly;
     79                    outputLabel.Text = RsaKeyInputCtrl.errorValidSignsOnly;
    8080                    return false;
    8181                }
     
    8383            else
    8484            {
    85                 outputLabel.Content = RsaKeyInputCtrl.errorInsertNumber;
     85                outputLabel.Text = RsaKeyInputCtrl.errorInsertNumber;
    8686                return false;
    8787            }
     
    135135            {
    136136                this.btnValInput.IsEnabled = true;
    137                 this.lblResult.Content = string.Empty;
     137                this.lblResult.Text = string.Empty;
    138138            }
    139139            else
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/SigGenBleichenbControl.xaml

    r8500 r8667  
    2929                        <RowDefinition Height="auto" />
    3030                    </Grid.RowDefinitions>
    31                     <Label Grid.Row="0" Name="lblRsaKeySize" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
    32                         <x:Static Member="lang:SigGenBleichenbCtrl.rsaKeySize"></x:Static></Label>
    33                     <Label Grid.Row="1" Name="lblPublicKey" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
    34                         <x:Static Member="lang:SigGenBleichenbCtrl.pubKey"></x:Static></Label>
    35                     <Label Grid.Row="2" Name="lblDataBlockPos" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
    36                         <x:Static Member="lang:SigGenBleichenbCtrl.bitPos"></x:Static></Label>
    37                     <Label Grid.Row="3" Name="lblChangeSign" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
     31                    <SelectableTextBlock Padding="5" Grid.Row="0" Name="lblRsaKeySize" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
     32                        <x:Static Member="lang:SigGenBleichenbCtrl.rsaKeySize"></x:Static></SelectableTextBlock>
     33                    <SelectableTextBlock Padding="5" Grid.Row="1" Name="lblPublicKey" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
     34                        <x:Static Member="lang:SigGenBleichenbCtrl.pubKey"></x:Static></SelectableTextBlock>
     35                    <SelectableTextBlock Padding="5" Grid.Row="2" Name="lblDataBlockPos" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
     36                        <x:Static Member="lang:SigGenBleichenbCtrl.bitPos"></x:Static></SelectableTextBlock>
     37                    <SelectableTextBlock Padding="5" Grid.Row="3" Name="lblChangeSign" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
    3838                        <x:Static Member="lang:SigGenBleichenbCtrl.changeSign"></x:Static>
    39                     </Label>
     39                    </SelectableTextBlock>
    4040                </Grid>
    4141                <!-- middle -->
     
    4747                        <RowDefinition Height="auto" />
    4848                    </Grid.RowDefinitions>
    49                     <Label Grid.Row="0" Name="lblRsaKeySizeRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"> </Label>
    50                     <Label Grid.Row="1" Name="lblPublicKeyRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"> </Label>
     49                    <SelectableTextBlock Padding="5" Grid.Row="0" Name="lblRsaKeySizeRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"> </SelectableTextBlock>
     50                    <SelectableTextBlock Padding="5" Grid.Row="1" Name="lblPublicKeyRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"> </SelectableTextBlock>
    5151                    <DockPanel Grid.Row="2" Margin="5,0,5,5">
    5252                        <ComboBox Name="cbPosDataBlock" IsEditable="False" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"></ComboBox>
     
    7878                                <ColumnDefinition Width="auto" />
    7979                            </Grid.ColumnDefinitions>
    80                             <Label Grid.Column="0">'00'</Label>
    81                             <Label Grid.Column="1">'01'</Label>
    82                             <Label Grid.Column="2" Foreground="Green">PS</Label>
    83                             <Label Grid.Column="3">'00'</Label>
    84                             <Label Grid.Column="4" Foreground="Blue">HI</Label>
    85                             <Label Grid.Column="5" Foreground="Red">HD</Label>
    86                             <Label Grid.Column="6">GG</Label>
     80                            <SelectableTextBlock Padding="5" Grid.Column="0">'00'</SelectableTextBlock>
     81                            <SelectableTextBlock Padding="5" Grid.Column="1">'01'</SelectableTextBlock>
     82                            <SelectableTextBlock Padding="5" Grid.Column="2" Foreground="Green">PS</SelectableTextBlock>
     83                            <SelectableTextBlock Padding="5" Grid.Column="3">'00'</SelectableTextBlock>
     84                            <SelectableTextBlock Padding="5" Grid.Column="4" Foreground="Blue">HI</SelectableTextBlock>
     85                            <SelectableTextBlock Padding="5" Grid.Column="5" Foreground="Red">HD</SelectableTextBlock>
     86                            <SelectableTextBlock Padding="5" Grid.Column="6">GG</SelectableTextBlock>
    8787                        </Grid>
    8888                    </GroupBox>
     
    105105                    <RowDefinition Height="*" />
    106106                </Grid.RowDefinitions>
    107                 <Label Grid.Row="0" Margin="0,0,0,0" Name="lblClearText">
    108                     <x:Static Member="lang:SigGenBleichenbCtrl.decrypted"></x:Static></Label>
    109                 <Label Grid.Row="0" Margin="150,0,0,0" Name="lblSignatureLength"></Label>
     107                <SelectableTextBlock Padding="5" Grid.Row="0" Margin="0,0,0,0" Name="lblClearText">
     108                    <x:Static Member="lang:SigGenBleichenbCtrl.decrypted"></x:Static></SelectableTextBlock>
     109                <SelectableTextBlock Padding="5" Grid.Row="0" Margin="150,0,0,0" Name="lblSignatureLength"></SelectableTextBlock>
    110110                <RichTextBox Grid.Row="1" Name="rtbResult" MaxWidth="450" MinHeight="80" IsReadOnly="True" Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextChanged="rtbResult_TextChanged"></RichTextBox>
    111                 <Label Grid.Row="2" Margin="0,0,0,0" Name="lblCipherText">
    112                     <x:Static Member="lang:SigGenBleichenbCtrl.encrypted"></x:Static></Label>
    113                 <Label Grid.Row="2" Margin="150,0,0,0" Name="lblEncryptedSignatureLength"></Label>
     111                <SelectableTextBlock Padding="5" Grid.Row="2" Margin="0,0,0,0" Name="lblCipherText">
     112                    <x:Static Member="lang:SigGenBleichenbCtrl.encrypted"></x:Static></SelectableTextBlock>
     113                <SelectableTextBlock Padding="5" Grid.Row="2" Margin="150,0,0,0" Name="lblEncryptedSignatureLength"></SelectableTextBlock>
    114114                <TextBox Grid.Row="3" Name="tbResultEncrypted" TextWrapping="Wrap" MaxWidth="450" MinHeight="80" IsReadOnly="True" Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextChanged="tbResultEncrypted_TextChanged"></TextBox>
    115115            </Grid>
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/SigGenBleichenbControl.xaml.cs

    r8109 r8667  
    2626        private void handleCustomEvent(ParameterChangeType type)
    2727        {           
    28             this.lblPublicKeyRes.Content = RsaKey.Instance.PubExponent.ToString();
    29             this.lblRsaKeySizeRes.Content = RsaKey.Instance.RsaKeySize.ToString();           
     28            this.lblPublicKeyRes.Text = RsaKey.Instance.PubExponent.ToString();
     29            this.lblRsaKeySizeRes.Text = RsaKey.Instance.RsaKeySize.ToString();           
    3030            this.loadComboDataBlocPos(24);
    3131        }
     
    6464        private void rtbResult_TextChanged(object sender, TextChangedEventArgs e)
    6565        {
    66             this.lblSignatureLength.Content = String.Format( Common.length, UserControlHelper.GetRtbTextLength(this.rtbResult) * 4 );
     66            this.lblSignatureLength.Text = String.Format( Common.length, UserControlHelper.GetRtbTextLength(this.rtbResult) * 4 );
    6767        }
    6868
    6969        private void tbResultEncrypted_TextChanged(object sender, TextChangedEventArgs e)
    7070        {
    71             this.lblEncryptedSignatureLength.Content = String.Format(Common.length, this.tbResultEncrypted.Text.Length * 4);
     71            this.lblEncryptedSignatureLength.Text = String.Format(Common.length, this.tbResultEncrypted.Text.Length * 4);
    7272        }
    7373
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/SigGenControl.xaml

    r8500 r8667  
    2727                        <RowDefinition Height="*" />
    2828                    </Grid.RowDefinitions>
    29                     <Label Grid.Row="0" Name="lblRsaKeySize" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
    30                         <x:Static Member="lang:SigGenKuehnCtrl.rsaKeySize"></x:Static></Label>
    31                     <Label Grid.Row="1" Name="lblPublicKey" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
    32                         <x:Static Member="lang:SigGenKuehnCtrl.pubKey"></x:Static></Label>
     29                    <SelectableTextBlock Padding="5" Grid.Row="0" Name="lblRsaKeySize" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
     30                        <x:Static Member="lang:SigGenKuehnCtrl.rsaKeySize"></x:Static></SelectableTextBlock>
     31                    <SelectableTextBlock Padding="5" Grid.Row="1" Name="lblPublicKey" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
     32                        <x:Static Member="lang:SigGenKuehnCtrl.pubKey"></x:Static></SelectableTextBlock>
    3333                   
    3434                </Grid>
     
    3939                        <RowDefinition Height="auto" />
    4040                        <RowDefinition Height="*" />
    41                     </Grid.RowDefinitions>                   
    42                     <Label Grid.Row="0" Name="lblRsaKeySizeRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"></Label>
    43                     <Label Grid.Row="1" Name="lblPublicKeyRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"></Label>
     41                    </Grid.RowDefinitions>
     42                    <SelectableTextBlock Padding="5" Grid.Row="0" Name="lblRsaKeySizeRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"></SelectableTextBlock>
     43                    <SelectableTextBlock Padding="5" Grid.Row="1" Name="lblPublicKeyRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"></SelectableTextBlock>
    4444                </Grid>
    4545                <!-- right -->
     
    6363                                <ColumnDefinition Width="auto" />
    6464                            </Grid.ColumnDefinitions>
    65                             <Label Grid.Column="0">'00'</Label>
    66                             <Label Grid.Column="1">'01'</Label>
    67                             <Label Grid.Column="2" Foreground="Green">PS</Label>
    68                             <Label Grid.Column="3">'00'</Label>
    69                             <Label Grid.Column="4" Foreground="Blue">HI</Label>
    70                             <Label Grid.Column="5" Foreground="Red">HD</Label>
     65                            <SelectableTextBlock Padding="5" Grid.Column="0">'00'</SelectableTextBlock>
     66                            <SelectableTextBlock Padding="5" Grid.Column="1">'01'</SelectableTextBlock>
     67                            <SelectableTextBlock Padding="5" Grid.Column="2" Foreground="Green">PS</SelectableTextBlock>
     68                            <SelectableTextBlock Padding="5" Grid.Column="3">'00'</SelectableTextBlock>
     69                            <SelectableTextBlock Padding="5" Grid.Column="4" Foreground="Blue">HI</SelectableTextBlock>
     70                            <SelectableTextBlock Padding="5" Grid.Column="5" Foreground="Red">HD</SelectableTextBlock>
    7171                        </Grid>
    7272                    </GroupBox>
     
    9090                    <RowDefinition Height="*" />
    9191                </Grid.RowDefinitions>
    92                 <Label Grid.Row="0" Margin="0,0,0,0" Name="lblClearText">
    93                     <x:Static Member="lang:SigGenKuehnCtrl.decrypted"></x:Static></Label>
    94                 <Label Grid.Row="0" Margin="150,0,0,0" Name="lblSignatureLength"></Label>
     92                <SelectableTextBlock Padding="5" Grid.Row="0" Margin="0,0,0,0" Name="lblClearText">
     93                    <x:Static Member="lang:SigGenKuehnCtrl.decrypted"></x:Static></SelectableTextBlock>
     94                <SelectableTextBlock Padding="5" Grid.Row="0" Margin="150,0,0,0" Name="lblSignatureLength"></SelectableTextBlock>
    9595                <RichTextBox Grid.Row="1" Name="rtbResult" MaxWidth="450" MinHeight="80" IsReadOnly="True" Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextChanged="rtbResult_TextChanged"></RichTextBox>
    96                 <Label Grid.Row="2" Margin="0,0,0,0" Name="lblCipherText">
    97                     <x:Static Member="lang:SigGenKuehnCtrl.encrypted"></x:Static></Label>
    98                 <Label Grid.Row="2" Margin="150,0,0,0" Name="lblEncryptedSignatureLength"></Label>
     96                <SelectableTextBlock Padding="5" Grid.Row="2" Margin="0,0,0,0" Name="lblCipherText">
     97                    <x:Static Member="lang:SigGenKuehnCtrl.encrypted"></x:Static></SelectableTextBlock>
     98                <SelectableTextBlock Padding="5" Grid.Row="2" Margin="150,0,0,0" Name="lblEncryptedSignatureLength"></SelectableTextBlock>
    9999                <TextBox Grid.Row="3" Name="tbResultEncrypted" TextWrapping="Wrap" MaxWidth="450" MinHeight="80" IsReadOnly="True" Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextChanged="tbResultEncrypted_TextChanged"></TextBox>
    100100            </Grid>
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/SigGenControl.xaml.cs

    r8109 r8667  
    2525        {
    2626            this.tbResultEncrypted.Text = String.Empty;
    27             this.lblPublicKeyRes.Content = RsaKey.Instance.PubExponent.ToString();
    28             this.lblRsaKeySizeRes.Content = RsaKey.Instance.RsaKeySize.ToString();
     27            this.lblPublicKeyRes.Text = RsaKey.Instance.PubExponent.ToString();
     28            this.lblRsaKeySizeRes.Text = RsaKey.Instance.RsaKeySize.ToString();
    2929        }
    3030
     
    4242        private void tbResultEncrypted_TextChanged(object sender, TextChangedEventArgs e)
    4343        {
    44             this.lblEncryptedSignatureLength.Content = String.Format( Common.length, this.tbResultEncrypted.Text.Length * 4 );
     44            this.lblEncryptedSignatureLength.Text = String.Format( Common.length, this.tbResultEncrypted.Text.Length * 4 );
    4545        }
    4646
    4747        private void rtbResult_TextChanged(object sender, TextChangedEventArgs e)
    4848        {
    49             this.lblSignatureLength.Content = String.Format(Common.length, UserControlHelper.GetRtbTextLength(this.rtbResult) * 4);
     49            this.lblSignatureLength.Text = String.Format(Common.length, UserControlHelper.GetRtbTextLength(this.rtbResult) * 4);
    5050        }
    5151    }
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/SigGenKuehnControl.xaml

    r8500 r8667  
    3333                        <RowDefinition Height="*" />
    3434                    </Grid.RowDefinitions>
    35                     <Label Grid.Row="0" Name="lblRsaKeySize" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
    36                         <x:Static Member="lang:SigGenKuehnCtrl.rsaKeySize"></x:Static></Label>
    37                     <Label Grid.Row="1" Name="lblPublicKey" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
    38                         <x:Static Member="lang:SigGenKuehnCtrl.pubKey"></x:Static></Label>
    39                     <Label Grid.Row="2" Name="lblIterations" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
    40                         <x:Static Member="lang:SigGenKuehnCtrl.maxIterations"></x:Static></Label>
     35                    <SelectableTextBlock Padding="5" Grid.Row="0" Name="lblRsaKeySize" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
     36                        <x:Static Member="lang:SigGenKuehnCtrl.rsaKeySize"></x:Static></SelectableTextBlock>
     37                    <SelectableTextBlock Padding="5" Grid.Row="1" Name="lblPublicKey" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
     38                        <x:Static Member="lang:SigGenKuehnCtrl.pubKey"></x:Static></SelectableTextBlock>
     39                    <SelectableTextBlock Padding="5" Grid.Row="2" Name="lblIterations" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top">
     40                        <x:Static Member="lang:SigGenKuehnCtrl.maxIterations"></x:Static></SelectableTextBlock>
    4141                </Grid>
    4242                <!-- middle -->
     
    4848                        <RowDefinition Height="*" />
    4949                    </Grid.RowDefinitions>
    50                     <Label Grid.Row="0" Name="lblRsaKeySizeRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"></Label>
    51                     <Label Grid.Row="1" Name="lblPublicKeyRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"></Label>
     50                    <SelectableTextBlock Padding="5" Grid.Row="0" Name="lblRsaKeySizeRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"></SelectableTextBlock>
     51                    <SelectableTextBlock Padding="5" Grid.Row="1" Name="lblPublicKeyRes" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50" MaxWidth="150"></SelectableTextBlock>
    5252                    <DockPanel Grid.Row="2">
    5353                    <TextBox Grid.Row="2" Name="tbIterations" Margin="5,0,5,5" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="50">                       
     
    6060                    <Image Name="btnHelpIterations" Cursor="Hand" Source="../../Resources/icons/help.png" Width="16" Height="16" HorizontalAlignment="Right" MouseLeftButtonDown="btn_Help_MouseLeftButtonDown" />
    6161                    </DockPanel>
    62                     <TextBlock Grid.Row="3"  Foreground="Red" FontWeight="Bold" FontSize="10"
     62                    <SelectableTextBlock Grid.Row="3"  Foreground="Red" FontWeight="Bold" FontSize="10"
    6363                                Text="{Binding ElementName=tbIterations,
    6464                                Path=(Validation.Errors),
     
    8585                                <ColumnDefinition Width="auto" />
    8686                            </Grid.ColumnDefinitions>
    87                             <Label Grid.Column="0">'00'</Label>
    88                             <Label Grid.Column="1">'01'</Label>
    89                             <Label Grid.Column="2" Foreground="Green">PS</Label>
    90                             <Label Grid.Column="3">'00'</Label>
    91                             <Label Grid.Column="4" Foreground="Blue">HI</Label>
    92                             <Label Grid.Column="5" Foreground="Red">HD</Label>
    93                             <Label Grid.Column="6">GG</Label>
     87                            <SelectableTextBlock Padding="5" Grid.Column="0">'00'</SelectableTextBlock>
     88                            <SelectableTextBlock Padding="5" Grid.Column="1">'01'</SelectableTextBlock>
     89                            <SelectableTextBlock Padding="5" Grid.Column="2" Foreground="Green">PS</SelectableTextBlock>
     90                            <SelectableTextBlock Padding="5" Grid.Column="3">'00'</SelectableTextBlock>
     91                            <SelectableTextBlock Padding="5" Grid.Column="4" Foreground="Blue">HI</SelectableTextBlock>
     92                            <SelectableTextBlock Padding="5" Grid.Column="5" Foreground="Red">HD</SelectableTextBlock>
     93                            <SelectableTextBlock Padding="5" Grid.Column="6">GG</SelectableTextBlock>
    9494                        </Grid>
    9595                    </GroupBox>
     
    101101
    102102        <!-- Error -->
    103         <TextBlock Grid.Row="1" Foreground="Red" FontWeight="Bold" FontSize="10" Name="tbError"></TextBlock>
     103        <SelectableTextBlock Grid.Row="1" Foreground="Red" FontWeight="Bold" FontSize="10" Name="tbError"></SelectableTextBlock>
    104104       
    105105        <!-- Result -->
     
    112112                    <RowDefinition Height="*" />
    113113                </Grid.RowDefinitions>
    114                 <Label Grid.Row="0" Margin="0,0,0,0" Name="lblClearText">
    115                     <x:Static Member="lang:SigGenKuehnCtrl.decrypted"></x:Static></Label>
    116                 <Label Grid.Row="0" Margin="150,0,0,0" Name="lblSignatureLength"></Label>
     114                <SelectableTextBlock Padding="5" Grid.Row="0" Margin="0,0,0,0" Name="lblClearText">
     115                    <x:Static Member="lang:SigGenKuehnCtrl.decrypted"></x:Static></SelectableTextBlock>
     116                <SelectableTextBlock Padding="5" Grid.Row="0" Margin="150,0,0,0" Name="lblSignatureLength"></SelectableTextBlock>
    117117                <RichTextBox Grid.Row="1" Name="rtbResult" MinHeight="80" IsReadOnly="True" Margin="5,5,5,5" MaxWidth="450" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" TextChanged="rtbResult_TextChanged"></RichTextBox>
    118                 <Label Grid.Row="2" Margin="0,0,0,0" Name="lblCipherText">
    119                     <x:Static Member="lang:SigGenKuehnCtrl.encrypted"></x:Static></Label>
    120                 <Label Grid.Row="2" Margin="150,0,0,0" Name="lblEncryptedSignatureLength"></Label>
     118                <SelectableTextBlock Padding="5" Grid.Row="2" Margin="0,0,0,0" Name="lblCipherText">
     119                    <x:Static Member="lang:SigGenKuehnCtrl.encrypted"></x:Static></SelectableTextBlock>
     120                <SelectableTextBlock Padding="5" Grid.Row="2" Margin="150,0,0,0" Name="lblEncryptedSignatureLength"></SelectableTextBlock>
    121121                <TextBox Grid.Row="3" Name="tbResultEncrypted" TextWrapping="Wrap" MinHeight="80" IsReadOnly="True" Margin="5,5,5,5" MaxWidth="450" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" TextChanged="tbResultEncrypted_TextChanged"></TextBox>
    122122            </Grid>
  • trunk/CrypPlugins/PKCS1/WpfControls/Components/SigGenKuehnControl.xaml.cs

    r8109 r8667  
    2929        private void handleCustomEvent(ParameterChangeType type)
    3030        {
    31             this.lblPublicKeyRes.Content = RsaKey.Instance.PubExponent.ToString();
    32             this.lblRsaKeySizeRes.Content = RsaKey.Instance.RsaKeySize.ToString();
     31            this.lblPublicKeyRes.Text = RsaKey.Instance.PubExponent.ToString();
     32            this.lblRsaKeySizeRes.Text = RsaKey.Instance.RsaKeySize.ToString();
    3333        }
    3434
     
    5353        private void tbResultEncrypted_TextChanged(object sender, TextChangedEventArgs e)
    5454        {           
    55             this.lblEncryptedSignatureLength.Content = String.Format( Common.length, this.tbResultEncrypted.Text.Length * 4  );
     55            this.lblEncryptedSignatureLength.Text = String.Format( Common.length, this.tbResultEncrypted.Text.Length * 4  );
    5656        }
    5757
    5858        private void rtbResult_TextChanged(object sender, TextChangedEventArgs e)
    5959        {
    60             this.lblSignatureLength.Content = String.Format(Common.length, UserControlHelper.GetRtbTextLength(this.rtbResult) * 4);
     60            this.lblSignatureLength.Text = String.Format(Common.length, UserControlHelper.GetRtbTextLength(this.rtbResult) * 4);
    6161        }
    6262
  • trunk/CrypPlugins/PKCS1/WpfControls/SigVal/SigValControl.xaml

    r4750 r8667  
    3535                                <RowDefinition Height="auto" />
    3636                            </Grid.RowDefinitions>
    37                             <Label Grid.Row="0" >
     37                            <SelectableTextBlock Padding="5" Grid.Row="0" >
    3838                                <x:Static Member="lang:SigValCtrl.sigToTest"></x:Static>
    39                             </Label>
     39                            </SelectableTextBlock>
    4040                            <RadioButton Grid.Row="1" Name="rbSigPkcs" Margin="5,5,5,5" Checked="rbSigPkcs_Checked">
    4141                                <x:Static Member="lang:SigValCtrl.rsaSig"></x:Static></RadioButton>
     
    5252                                <RowDefinition Height="auto" />
    5353                            </Grid.RowDefinitions>
    54                             <Label Grid.Row="0" >
    55                                 <x:Static Member="lang:SigValCtrl.impl"></x:Static></Label>
     54                            <SelectableTextBlock Padding="5" Grid.Row="0" >
     55                                <x:Static Member="lang:SigValCtrl.impl"></x:Static></SelectableTextBlock>
    5656                            <RadioButton Grid.Row="1" Name="rbVal" Margin="5,5,5,5" Checked="rbVal_Checked">
    5757                                <x:Static Member="lang:SigValCtrl.implCorrect"></x:Static></RadioButton>
     
    6464                </GroupBox>
    6565                <DockPanel Grid.Row="1">
    66                     <Label VerticalAlignment="Top" HorizontalAlignment="Left" Margin="5,5,5,5">
    67                         <x:Static Member="lang:SigValCtrl.result"></x:Static></Label>
     66                    <SelectableTextBlock Padding="5" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="5,5,5,5">
     67                        <x:Static Member="lang:SigValCtrl.result"></x:Static></SelectableTextBlock>
    6868                    <Image Name="imgResult" Height="26" Width="24" Source="../../Resources/icons/equal.png" Visibility="Hidden" />
    69                     <Label Name="lblResult" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,5,5"> </Label>
    70                     <Label Name="lblHashAlgo" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5,5,5,5"></Label>
     69                    <SelectableTextBlock Padding="5" Name="lblResult" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,5,5"> </SelectableTextBlock>
     70                    <SelectableTextBlock Padding="5" Name="lblHashAlgo" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5,5,5,5"></SelectableTextBlock>
    7171                </DockPanel>
    7272            </Grid>
     
    8383                    <RowDefinition Height="auto" />
    8484                </Grid.RowDefinitions>
    85                     <Label Grid.Row="0">
    86                         <x:Static Member="lang:SigValCtrl.encSig"></x:Static></Label>
     85                    <SelectableTextBlock Padding="5" Grid.Row="0">
     86                        <x:Static Member="lang:SigValCtrl.encSig"></x:Static></SelectableTextBlock>
    8787                <TextBox Grid.Row="1" Name="tbSignatureEnc" TextWrapping="Wrap" MaxWidth="450" MinHeight="80"  IsReadOnly="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,5,5,5" />
    88                     <Label Grid.Row="2">
    89                         <x:Static Member="lang:SigValCtrl.decSig"></x:Static></Label>
     88                    <SelectableTextBlock Padding="5" Grid.Row="2">
     89                        <x:Static Member="lang:SigValCtrl.decSig"></x:Static></SelectableTextBlock>
    9090                <TextBox Grid.Row="3" Name="tbSignatureDec" TextWrapping="Wrap" MaxWidth="450" MinHeight="80" IsReadOnly="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,5,5,5" />
    9191            </Grid>
  • trunk/CrypPlugins/PKCS1/WpfControls/SigVal/SigValControl.xaml.cs

    r8109 r8667  
    176176        private void ResultValid()
    177177        {
    178             this.lblResult.Content = SigValCtrl.resSigValid;
     178            this.lblResult.Text = SigValCtrl.resSigValid;
    179179            this.imgResult.Source = new BitmapImage(new Uri("../../Resources/icons/equal.png", UriKind.Relative));
    180180            this.imgResult.Visibility = Visibility.Visible;
    181             this.lblHashAlgo.Content = SigValCtrl.resIdentifiedHash + " " + this.validator.getHashFunctionName();
     181            this.lblHashAlgo.Text = SigValCtrl.resIdentifiedHash + " " + this.validator.getHashFunctionName();
    182182        }
    183183
    184184        private void ResultNotValid()
    185185        {
    186             this.lblResult.Content = SigValCtrl.resSigNotValid;
     186            this.lblResult.Text = SigValCtrl.resSigNotValid;
    187187            this.imgResult.Source = new BitmapImage(new Uri("../../Resources/icons/unequal.png", UriKind.Relative));
    188188            this.imgResult.Visibility = Visibility.Visible;
    189189            if (this.validator.getHashFunctionName() != String.Empty)
    190190            {
    191                 this.lblHashAlgo.Content = SigValCtrl.resIdentifiedHash + " " + this.validator.getHashFunctionName();
     191                this.lblHashAlgo.Text = SigValCtrl.resIdentifiedHash + " " + this.validator.getHashFunctionName();
    192192            }
    193193            else
    194194            {
    195                 this.lblHashAlgo.Content = " " + SigValCtrl.resHashNotReadable;
     195                this.lblHashAlgo.Text = " " + SigValCtrl.resHashNotReadable;
    196196            }
    197197        }
     
    199199        private void ResultEmpty()
    200200        {
    201             this.lblResult.Content = String.Empty;
     201            this.lblResult.Text = String.Empty;
    202202            this.imgResult.Visibility = Visibility.Hidden;
    203             this.lblHashAlgo.Content = String.Empty;
     203            this.lblHashAlgo.Text = String.Empty;
    204204        }
    205205
  • trunk/CrypPlugins/PKCS1/WpfResources/Shared.xaml

    r8500 r8667  
    11<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    22    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     3    xmlns:System="clr-namespace:System;assembly=mscorlib"
    34    xmlns:local="clr-namespace:PKCS1.WpfControls.Components">
    45    <ResourceDictionary.MergedDictionaries>
     
    4142                        <Border Name="Header" Padding="3,1,3,0" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1">
    4243                            <Label FontWeight="Bold">
    43                                 <ContentPresenter ContentSource="Header" RecognizesAccessKey="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
     44                                <ContentPresenter ContentSource="Header" RecognizesAccessKey="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
     45                                    <ContentPresenter.ContentTemplate>
     46                                        <DataTemplate DataType="{x:Type System:String}">
     47                                            <SelectableTextBlock Text="{Binding}" />
     48                                        </DataTemplate>
     49                                    </ContentPresenter.ContentTemplate>
     50                                </ContentPresenter>
    4451                            </Label>
    4552                        </Border>
  • trunk/CrypPlugins/PKCS1/WpfVisualization/Pkcs1Control.xaml

    r8504 r8667  
    3939            </Grid.RowDefinitions>
    4040            <DockPanel Grid.Row="0">
    41                 <Label Name="lblTitel" Margin="10,0,0,0" FontSize="17" HorizontalAlignment="Left" VerticalAlignment="Center">Label</Label>
     41                <SelectableTextBlock Padding="5" Name="lblTitel" Margin="10,0,0,0" FontSize="17" HorizontalAlignment="Left" VerticalAlignment="Center">Label</SelectableTextBlock>
    4242                <Image Cursor="Hand" Source="../Resources/icons/help32.gif" Width="24" Height="24" MouseLeftButtonDown="Image_MouseLeftButtonDown" HorizontalAlignment="Left" VerticalAlignment="Center"/>
    4343            </DockPanel>
  • trunk/CrypPlugins/PKCS1/WpfVisualization/Pkcs1Control.xaml.cs

    r8109 r8667  
    8989            {
    9090                case NavigationCommandType.RsaKeyGen:
    91                     lblTitel.Content = RsaKeyGenCtrl.title;                     
     91                    lblTitel.Text = RsaKeyGenCtrl.title;                     
    9292                    break;
    9393                case NavigationCommandType.Start:
    94                     lblTitel.Content = Common.startTitle;
     94                    lblTitel.Text = Common.startTitle;
    9595                    break;
    9696                case NavigationCommandType.SigGen:
    97                     lblTitel.Content = SigGenRsaCtrl.title;
     97                    lblTitel.Text = SigGenRsaCtrl.title;
    9898                    break;
    9999                case NavigationCommandType.SigGenFakeBleichenb:
    100                     lblTitel.Content = SigGenBleichenbCtrl.title;
     100                    lblTitel.Text = SigGenBleichenbCtrl.title;
    101101                    break;
    102102                case NavigationCommandType.SigGenFakeShort:
    103                     lblTitel.Content = SigGenKuehnCtrl.title;
     103                    lblTitel.Text = SigGenKuehnCtrl.title;
    104104                    break;
    105105                case NavigationCommandType.SigVal:
    106                     lblTitel.Content = SigValCtrl.title;
     106                    lblTitel.Text = SigValCtrl.title;
    107107                    break;
    108108            }
Note: See TracChangeset for help on using the changeset viewer.