Changeset 2390


Ignore:
Timestamp:
Jan 19, 2011, 3:17:51 PM (10 years ago)
Author:
kopal
Message:
  • created new view for activating email address
Location:
trunk/CrypPlugins/P2PEditor
Files:
2 added
5 edited

Legend:

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

    r2378 r2390  
    44             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    55             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:GUI="clr-namespace:Cryptool.P2PEditor.GUI" mc:Ignorable="d"
    6              d:DesignHeight="320" d:DesignWidth="680">
     6             d:DesignHeight="340" d:DesignWidth="693">
    77    <Grid>
    88    <ScrollViewer Name="RequestPage" VerticalScrollBarVisibility="Auto">
    99        <Grid Height="320" Width="670">
    1010            <Grid.ColumnDefinitions>
    11                 <ColumnDefinition Width="75" />
     11                <ColumnDefinition Width="110" />
    1212                <ColumnDefinition Width="*" />
    1313            </Grid.ColumnDefinitions>
    1414            <Grid.RowDefinitions>
    15                 <RowDefinition Height="90"/>
     15                <RowDefinition Height="100"/>
    1616                <RowDefinition Height="28"/>
    1717                <RowDefinition Height="28"/>
     
    1919                <RowDefinition Height="28" />
    2020                <RowDefinition Height="28" />
    21                 <RowDefinition Height="80" />                   
    22             </Grid.RowDefinitions>
     21                <RowDefinition Height="80" />
     22                    <RowDefinition Height="12*" />
     23                </Grid.RowDefinitions>
    2324            <Label Content="Account Creation"  Grid.ColumnSpan="2" Margin="0,0,0,56" FontSize="15" FontWeight="Bold" HorizontalAlignment="Center" />
    2425            <TextBlock Grid.ColumnSpan="2" Margin="5,32,0,0" FlowDirection="LeftToRight" HorizontalAlignment="Center">
     
    2829            <LineBreak/>
    2930            your account data. This data will be stored into your application data folder of windows.
     31            <LineBreak/>
     32            We will send you an activation code. Use this code to activate your account by clicking the activate button.
    3033            </TextBlock>
    3134            <Label Name="MessageLabel" Foreground="Red" Grid.Row="1" Grid.ColumnSpan="2" />
     
    3437            <Label Content="_Password:" Target="{Binding ElementName=PasswordField}" Grid.Row="4" Grid.Column="0" />
    3538            <Label Content="_Confirm:" Target="{Binding ElementName=ConfirmField}" Grid.Row="5" Grid.Column="0" />
    36 
    3739            <TextBox Text="{Binding Name}" x:Name="UsernameField" Grid.Row="2" Grid.Column="1" Height="24" />
    3840            <TextBox Text="{Binding Name}" x:Name="EmailField" Grid.Row="3" Grid.Column="1" Height="24" />
    3941            <PasswordBox x:Name="PasswordField" Grid.Row="4" Grid.Column="1" Height="24" />
    4042            <PasswordBox x:Name="ConfirmField" Grid.Row="5" Grid.Column="1" Height="24" />
    41             <Button Name="RequestButton" Content="_Request" HorizontalAlignment="Right" Width="80" Grid.Row="6" Grid.Column="1" Height="24" Click="Request_Click" Margin="0,19,114,35" />
    42             <Button Name="BackButton" Content="_Back" Height="24" HorizontalAlignment="Right" Margin="0,19,18,35" Width="80" Grid.Row="6" Grid.Column="1" Click="BackButton_Click" />
     43            <Button Name="RequestButton" Content="_Request" HorizontalAlignment="Left" Width="54" Grid.Row="6" Grid.Column="1" Height="24" Click="Request_Click" Margin="378,20,0,36" />
     44            <Button Name="BackButton" Content="_Back" Height="24" HorizontalAlignment="Right" Margin="0,20,6,36" Width="54" Grid.Row="6" Grid.Column="1" Click="BackButton_Click" />
     45            <Button Name="ActivateButton" Content="_Activate" Height="24" HorizontalAlignment="Left" Margin="438,20,0,36" Width="56" Grid.Column="1" Grid.Row="6" Click="ActivateButton_Click"/>
    4346            <Label Name="RequestLabel" Content="Requesting certificate..." Visibility="Hidden" Target="{Binding ElementName=ConfirmField}" Grid.Row="6" Margin="0,19,325,27" HorizontalAlignment="Right" Width="151" Grid.Column="1" FontWeight="Bold" />
    4447            <Image Name="WorldIcon" Source="..\..\images\connected.png" Grid.Column="1" Margin="200,0,194,0" Grid.Row="6" RenderTransformOrigin="0.5,0.5">
     
    4649                    <RotateTransform x:Name="WorldIconImageRotate"/>
    4750                </Image.RenderTransform>
    48             </Image>
    49         </Grid>
     51            </Image>               
     52            </Grid>
    5053    </ScrollViewer>
    5154    <ScrollViewer Name="OKPage" VerticalScrollBarVisibility="Auto" Visibility="Hidden">
    5255    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Margin="80,55,80,53">
    53         <Label FontSize="16" HorizontalContentAlignment="Center">Account succesfully created</Label>
     56        <Label FontSize="16" HorizontalContentAlignment="Center">Account succesfully requested</Label>
    5457        <Image Name="Account" Source="..\..\images\account.png"  Margin="5,5,5,5" Width="48" />
    5558        <TextBlock Grid.ColumnSpan="2" Margin="15,15,15,15" FlowDirection="LeftToRight" HorizontalAlignment="Center">
    56         Your new account was created successfully and can now be used.
     59        Your new account was requested successfully and can be used after verification.
    5760        <LineBreak/>
    58         Press the OK button to proceed to the login.
     61        Press the OK button to proceed.
    5962        </TextBlock>
    6063        <Button Name="OKButton" Content="_OK" Height="24" Width="50" Click="OKButton_Click" />
  • trunk/CrypPlugins/P2PEditor/GUI/Controls/GetNewCertificateView.xaml.cs

    r2379 r2390  
    297297            this.P2PEditorPresentation.ShowConnectView();
    298298        }
     299
     300        private void ActivateButton_Click(object sender, RoutedEventArgs e)
     301        {
     302            this.P2PEditorPresentation.ShowActivateEmailView();
     303        }
    299304    }
    300305}
  • trunk/CrypPlugins/P2PEditor/GUI/P2PEditorPresentation.xaml

    r2387 r2390  
    1414            <controls:ConnectTab x:Name="Connect" IsP2PConnecting="{Binding IsP2PConnecting, ElementName=P2PEditorControl}" Visibility="Hidden" />
    1515            <controls:GetNewCertificate x:Name="GetNewCertificate" Visibility="Hidden"/>
     16            <controls:ActivateEmailView x:Name="ActivateEmailView" Visibility="Hidden"/>
    1617            <Frame Name="Help" Source="../DetailedDescription/Description.xaml" Visibility="Hidden"/>           
    1718        </Grid>
  • trunk/CrypPlugins/P2PEditor/GUI/P2PEditorPresentation.xaml.cs

    r2373 r2390  
    136136            this.JobDisplay.Visibility = Visibility.Hidden;
    137137            this.Connect.Visibility = Visibility.Hidden;
    138             this.GetNewCertificate.Visibility = Visibility.Hidden;           
     138            this.GetNewCertificate.Visibility = Visibility.Hidden;
     139            this.ActivateEmailView.Visibility = Visibility.Hidden;
    139140        }
    140141
     
    143144            hideAllViews();
    144145            this.GetNewCertificate.Visibility = Visibility.Visible;           
     146        }
     147
     148        internal void ShowActivateEmailView()
     149        {
     150            hideAllViews();
     151            this.ActivateEmailView.Visibility = Visibility.Visible;
    145152        }
    146153
  • trunk/CrypPlugins/P2PEditor/P2PEditor.csproj

    r2376 r2390  
    6767    <Compile Include="GUI\Controls\GetNewCertificateView.xaml.cs">
    6868      <DependentUpon>GetNewCertificateView.xaml</DependentUpon>
     69    </Compile>
     70    <Compile Include="GUI\Controls\ActivateEmailView.xaml.cs">
     71      <DependentUpon>ActivateEmailView.xaml</DependentUpon>
    6972    </Compile>
    7073    <Compile Include="GUI\P2PUserControl.cs" />
     
    163166      <Generator>MSBuild:Compile</Generator>
    164167    </Page>
     168    <Page Include="GUI\Controls\ActivateEmailView.xaml">
     169      <Generator>MSBuild:Compile</Generator>
     170      <SubType>Designer</SubType>
     171    </Page>
    165172    <Page Include="GUI\P2PEditorPresentation.xaml">
    166173      <SubType>Designer</SubType>
Note: See TracChangeset for help on using the changeset viewer.