Changeset 2376


Ignore:
Timestamp:
Jan 18, 2011, 4:28:47 PM (11 years ago)
Author:
kopal
Message:

replaced "new certificate"- and "forgot password"-buttons with labels

Location:
trunk/CrypPlugins/P2PEditor
Files:
1 added
3 edited

Legend:

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

    r2372 r2376  
    22        <GUI:P2PUserControl.Resources>
    33                <Converters:InverseBooleanConverter x:Key="InverseBooleanConverter" />
     4        <Converters:ForegroundColorConverter x:Key="ForegroundColorConverter" />
    45        <Storyboard x:Key="AnimateBigWorldIcon">
    56            <DoubleAnimation Storyboard.TargetName="WorldIconImageRotate" Storyboard.TargetProperty="Angle" By="360" Duration="00:00:10" BeginTime="00:00:00" RepeatBehavior="Forever"/>
     
    1819                <Label>Username:</Label>
    1920                <TextBox Name="Username" TextChanged="Username_TextChanged" IsEnabled="{Binding IsP2PConnecting, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource InverseBooleanConverter}}" />
     21                <TextBlock FontSize="12" MouseDown="GetACertificateLabel_Click" Cursor="Hand" HorizontalAlignment="Right" IsEnabled="{Binding IsP2PConnecting, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource InverseBooleanConverter}}" Foreground="{Binding IsP2PConnecting, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource ForegroundColorConverter}}">
     22                    <Underline>Create a new account</Underline>
     23                </TextBlock>
    2024                <Label>Password:</Label>
    2125                <PasswordBox Name="Password" PasswordChanged="Password_PasswordChanged" IsEnabled="{Binding IsP2PConnecting, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource InverseBooleanConverter}}" />
     26                <TextBlock FontSize="12" MouseDown="ForgotPasswordLabel_Click" Cursor="Hand" HorizontalAlignment="Right" IsEnabled="{Binding IsP2PConnecting, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource InverseBooleanConverter}}" Foreground="{Binding IsP2PConnecting, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource ForegroundColorConverter}}">
     27                    <Underline>Forgot password</Underline>
     28                </TextBlock>
    2229                <Label/>
    23                 <Button Name="ConnectButton" IsDefault="True" Content="Connect" Height="38" FontFamily="Consolas" FontSize="20" Click="ConnectButtonClick" IsEnabled="{Binding IsP2PConnecting, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource InverseBooleanConverter}}" />
    24                 <Button Name="GetACertificateButton" Content="Create a new account!" FontFamily="Consolas" FontSize="12" Height="20" Margin="0,10,0,0" Click="GetACertificateButton_Click" IsEnabled="{Binding IsP2PConnecting, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource InverseBooleanConverter}}"/>
    25                 <Button Name="ForgotPassword" Content="Forgot password" FontFamily="Consolas" FontSize="12" Height="20" Margin="0,10,0,0" IsEnabled="False"/>
     30                <Button Name="ConnectButton" IsDefault="True" Content="Connect" Height="38" FontFamily="Consolas" FontSize="20" Click="ConnectButtonClick" IsEnabled="{Binding IsP2PConnecting, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource InverseBooleanConverter}}" />               
    2631            </StackPanel>
    2732        </ScrollViewer>
  • trunk/CrypPlugins/P2PEditor/GUI/Controls/ConnectView.xaml.cs

    r2372 r2376  
    8989            ((P2PEditorPresentation) P2PEditor.Presentation).ShowHelp();
    9090        }
    91 
    92         private void GetACertificateButton_Click(object sender, RoutedEventArgs e)
     91       
     92        private void GetACertificateLabel_Click(object sender, RoutedEventArgs e)
    9393        {
    9494            P2PEditorPresentation.ShowGetNewCertificateView();
    9595        }
    96        
     96
     97        private void ForgotPasswordLabel_Click(object sender, RoutedEventArgs e)
     98        {
     99           //todo
     100        }
     101
    97102        private void Username_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
    98103        {
  • trunk/CrypPlugins/P2PEditor/P2PEditor.csproj

    r2348 r2376  
    5555  <ItemGroup>
    5656    <Compile Include="Converters\ConnectivityToVisibilityConverter.cs" />
     57    <Compile Include="Converters\ForegroundColorConverter.cs" />
    5758    <Compile Include="Converters\StatusToColorConverter.cs" />
    5859    <Compile Include="Converters\StringEmptyToVisibilityConverter.cs" />
Note: See TracChangeset for help on using the changeset viewer.