Changeset 2463


Ignore:
Timestamp:
Jan 25, 2011, 10:25:55 AM (11 years ago)
Author:
kopal
Message:
  • Password reset functionality of p2p editor implemented completely
  • some small fixes (typos, design changes)
Location:
trunk/CrypPlugins/P2PEditor
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/P2PEditor/GUI/Controls/ActivateEmailView.xaml

    r2408 r2463  
    3232            <Button Name="BackButton" Content="_Back" Height="24" HorizontalAlignment="Right" Margin="0,20,6,36" Width="54" Grid.Row="4" Grid.Column="1" Click="BackButton_Click" />
    3333            <Button Name="ActivateButton" Content="_Activate" Height="24" HorizontalAlignment="Left" Margin="438,20,0,36" Width="56" Grid.Column="1" Grid.Row="4" Click="ActivateButton_Click"/>
    34             <Label Name="RequestLabel" Content="Activating certificate..." Visibility="Hidden" Target="{Binding ElementName=ConfirmField}" Grid.Row="4" Margin="0,19,325,27" HorizontalAlignment="Right" Width="151" Grid.Column="1" FontWeight="Bold" />
     34            <Label Name="RequestLabel" Content="Activating account..." Visibility="Hidden" Target="{Binding ElementName=ConfirmField}" Grid.Row="4" Margin="0,19,325,27" HorizontalAlignment="Right" Width="151" Grid.Column="1" FontWeight="Bold" />
    3535            <Image Name="WorldIcon" Source="..\..\images\connected.png" Grid.Column="1" Margin="200,0,194,0" Grid.Row="4" RenderTransformOrigin="0.5,0.5">
    3636                <Image.RenderTransform>
     
    4242    <ScrollViewer Name="OKPage" VerticalScrollBarVisibility="Auto" Visibility="Hidden">
    4343    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Margin="80,55,80,53">
    44         <Label FontSize="16" HorizontalContentAlignment="Center">Account succesfully activated</Label>
     44            <Label FontSize="16" HorizontalContentAlignment="Center">Account successfully activated</Label>
    4545        <Image Name="Account" Source="..\..\images\account.png"  Margin="5,5,5,5" Width="48" />
    4646        <TextBlock Grid.ColumnSpan="2" Margin="15,15,15,15" FlowDirection="LeftToRight" HorizontalAlignment="Center">
  • trunk/CrypPlugins/P2PEditor/GUI/Controls/ActivateEmailView.xaml.cs

    r2413 r2463  
    144144                        this.Dispatcher.Invoke(DispatcherPriority.Normal, (SendOrPostCallback)delegate
    145145                        {
    146                             this.MessageLabel.Content = "Invalid certificate request: " + args.Type;
     146                            this.MessageLabel.Content = "Invalid certificate request: " + args.Message;
    147147                            this.MessageLabel.Visibility = Visibility.Visible;
    148148                        }, null);
  • trunk/CrypPlugins/P2PEditor/GUI/Controls/ForgotPasswordView.xaml

    r2447 r2463  
    2626            <Label Name="MessageLabel" Foreground="Red" Grid.Row="1" Grid.ColumnSpan="2" />
    2727            <Label Content="_Username:" Target="{Binding ElementName=UsernameField}" Grid.Row="2" Grid.Column="0" />
    28                 <TextBox Text="{Binding Name}" x:Name="UsernameField" Grid.Row="2" Grid.Column="1" Height="24" />
    29                 <Button Name="ResetButton" Content="_Reset" HorizontalAlignment="Left" Width="54" Grid.Row="3" Grid.Column="1" Height="24" Click="Request_Click" Margin="378,20,0,36" />
     28            <TextBox Text="{Binding Name}" x:Name="UsernameField" Grid.Row="2" Grid.Column="1" Height="24" />
     29            <Button Name="ResetButton" Content="_Reset" HorizontalAlignment="Left" Width="54" Grid.Row="3" Grid.Column="1" Height="24" Click="Request_Click" Margin="378,20,0,36" />
    3030            <Button Name="BackButton" Content="_Back" Height="24" HorizontalAlignment="Right" Margin="0,20,6,36" Width="54" Grid.Row="3" Grid.Column="1" Click="BackButton_Click" />
    31             <Button Name="VerifyButton" Content="_Verifiy" Height="24" HorizontalAlignment="Left" Margin="438,20,0,36" Width="56" Grid.Column="1" Grid.Row="3" Click="ActivateButton_Click"/>
     31            <Button Name="VerifyButton" Content="_Verifiy" Height="24" HorizontalAlignment="Left" Margin="438,20,0,36" Width="56" Grid.Column="1" Grid.Row="3" Click="VerifyButton_Click"/>
    3232            <Label Name="RequestLabel" Content="Resetting password..." Visibility="Hidden" Target="{Binding ElementName=ConfirmField}" Grid.Row="3" Margin="0,19,325,27" HorizontalAlignment="Right" Width="151" Grid.Column="1" FontWeight="Bold" />
    3333            <Image Name="WorldIcon" Source="..\..\images\connected.png" Grid.Column="1" Margin="200,0,194,0" Grid.Row="3" RenderTransformOrigin="0.5,0.5">
  • trunk/CrypPlugins/P2PEditor/GUI/Controls/ForgotPasswordView.xaml.cs

    r2447 r2463  
    305305        }
    306306
    307         private void ActivateButton_Click(object sender, RoutedEventArgs e)
    308         {
    309            
     307        private void VerifyButton_Click(object sender, RoutedEventArgs e)
     308        {
     309            this.P2PEditorPresentation.ShowVerifyPasswordResetView();
    310310        }
    311311    }
  • trunk/CrypPlugins/P2PEditor/GUI/P2PEditorPresentation.xaml

    r2447 r2463  
    1616            <controls:ActivateEmailView x:Name="ActivateEmailView" Visibility="Hidden"/>
    1717            <controls:ForgotPasswordView x:Name="ForgotPasswordView" Visibility="Hidden"/>
     18            <controls:VerifyPasswordResetView x:Name="VerifyPasswordResetView" Visibility="Hidden"/>
    1819            <Frame Name="Help" Source="../DetailedDescription/Description.xaml" Visibility="Hidden"/>           
    1920        </Grid>
  • trunk/CrypPlugins/P2PEditor/GUI/P2PEditorPresentation.xaml.cs

    r2447 r2463  
    139139            this.ActivateEmailView.Visibility = Visibility.Hidden;
    140140            this.ForgotPasswordView.Visibility = Visibility.Hidden;
     141            this.VerifyPasswordResetView.Visibility = Visibility.Hidden;
    141142        }
    142143
     
    176177            hideAllViews();
    177178            this.ForgotPasswordView.Visibility = Visibility.Visible;
     179        }
     180
     181        internal void ShowVerifyPasswordResetView()
     182        {
     183            hideAllViews();
     184            this.VerifyPasswordResetView.Visibility = Visibility.Visible;
    178185        }
    179186
  • trunk/CrypPlugins/P2PEditor/P2PEditor.csproj

    r2447 r2463  
    6565      <DependentUpon>ConnectView.xaml</DependentUpon>
    6666    </Compile>
     67    <Compile Include="GUI\Controls\VerifyPasswordResetView.xaml.cs">
     68      <DependentUpon>VerifyPasswordResetView.xaml</DependentUpon>
     69    </Compile>
    6770    <Compile Include="GUI\Controls\GetNewCertificateView.xaml.cs">
    6871      <DependentUpon>GetNewCertificateView.xaml</DependentUpon>
     
    153156      <Generator>MSBuild:Compile</Generator>
    154157    </Page>
     158    <Page Include="GUI\Controls\VerifyPasswordResetView.xaml">
     159      <Generator>MSBuild:Compile</Generator>
     160      <SubType>Designer</SubType>
     161    </Page>
    155162    <Page Include="GUI\Controls\GetNewCertificateView.xaml">
    156163      <Generator>MSBuild:Compile</Generator>
Note: See TracChangeset for help on using the changeset viewer.