Changeset 2672


Ignore:
Timestamp:
Feb 12, 2011, 2:39:00 PM (11 years ago)
Author:
nolte
Message:

-Replaced Button from KeysearcherP2P Presentation with a Link
-Added Headline to the Statistic Presentation
-Replaced Progress Buttons with X Button in Headline
-Gave Tabs a better Visualisation
(Only Keysearcher Statistic Tabs are replaced)

Location:
trunk/CrypPlugins/KeySearcher/Presentation/Controls
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/KeySearcher/Presentation/Controls/P2PQuickWatchPresentation.xaml

    r2620 r2672  
    4141                                        <Grid Height="48" Background="#AFE2E2FF">
    4242                        <Grid.RowDefinitions>
    43                             <RowDefinition Height="48" />
     43                            <RowDefinition Height="30" />
     44                            <RowDefinition Height="18" />
    4445                        </Grid.RowDefinitions>
    4546                                                <Grid.ColumnDefinitions>
     
    4950                            <ColumnDefinition Width="*" />
    5051                                                </Grid.ColumnDefinitions>
    51                         <Border BorderThickness="1" BorderBrush="Black" LayoutTransform="{StaticResource HeaderRotate}" Grid.Column="0" Background="#FF5C5CFF">
     52                        <Border BorderThickness="1" BorderBrush="Black" LayoutTransform="{StaticResource HeaderRotate}" Grid.RowSpan="2" Grid.Column="0" Background="#FF5C5CFF">
    5253                            <Label Content="{Loc Static_}" FontSize="11" HorizontalAlignment="Center" Foreground="White" />
    5354                        </Border>
     55                        <TextBlock Width="110" Grid.Column="3" Grid.Row="1" Cursor="Hand" HorizontalAlignment="Right" Margin="5,0,0,2" Foreground="Blue">
     56                            <Underline MouseDown="SwitchView">More Information...</Underline>
     57                        </TextBlock>
    5458                        <Label Content="{Loc Total_Chunks_}" VerticalAlignment="Center" Grid.Column="1" />
    5559                        <Label Content="-" Name="TotalAmountOfChunks" VerticalAlignment="Center" Grid.Column="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
     
    7579                            <Label Content="Global" FontSize="11" HorizontalAlignment="Center" Foreground="White" />
    7680                        </Border>
    77                         <Button Name="statButton" Content="Show Statistics" Click="SwitchView" Width="111" Height="23" Margin="0,0,67,2" Grid.Column="1" Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Right" Background="LightBlue" BorderBrush="DarkBlue" Foreground="DarkBlue" />
     81                        <!-- <Button Name="statButton" Content="Show Statistics" Click="SwitchView" Width="111" Height="23" Margin="0,0,67,2" Grid.Column="1" Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Right" Background="LightBlue" BorderBrush="DarkBlue" Foreground="DarkBlue" />
     82                        -->
    7883                        <Label Content="{Loc Participants_}" Grid.Column="1" />
    7984                        <Label Content="{Binding TotalAmountOfParticipants, FallbackValue=-}" Grid.Column="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
  • trunk/CrypPlugins/KeySearcher/Presentation/Controls/StatisticsPresentation.xaml

    r2624 r2672  
    4848        </EventTrigger>
    4949    </UserControl.Triggers>
    50    
    51         <TabControl>
     50    <Grid Background="Beige">
     51        <Grid.RowDefinitions>
     52            <RowDefinition Height="25"/>
     53            <RowDefinition Height="*" />
     54        </Grid.RowDefinitions>
     55        <Label Content="K e y s e a r c h e r   G l o b a l   S t a t i s t i c" FontWeight="bold" FontSize="13" Grid.Row="0"  HorizontalAlignment="Stretch" VerticalAlignment="Top"/>
     56        <Button Name="myProgButton" Content="X" Click="SwitchView" Width="25" Height="17" VerticalAlignment="Top" HorizontalAlignment="Right" FontWeight="bold" FontSize="9" Foreground="White" Background="Crimson" BorderBrush="DarkBlue"/>
     57
     58        <TabControl Grid.Row="2" >
     59            <TabControl.Resources>
     60                <Style TargetType="{x:Type TabItem}">
     61                    <Style.Triggers>
     62                        <Trigger Property="IsSelected" Value="True">
     63                            <Setter Property="Background">
     64                                <Setter.Value>
     65                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
     66                                        <GradientStop Color="#FFF3F3F3" Offset="0"/>
     67                                        <GradientStop Color="#FFF11818" Offset="1"/>
     68                                    </LinearGradientBrush>
     69                                </Setter.Value>
     70                            </Setter>
     71                        </Trigger>
     72                    </Style.Triggers>
     73                </Style>
     74            </TabControl.Resources>
     75           
    5276            <TabItem Header="{Loc _Information_}">
    5377                <Viewbox>
     
    115139                            </Border>
    116140                       </StackPanel>
    117                        <Button Name="myProgButton" Content="Progress" Click="SwitchView" Width="75" Height="23" Margin="10,10" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontWeight="bold" Background="LightBlue" BorderBrush="DarkBlue" Foreground="DarkBlue" />
    118                     </Grid>
     141                     </Grid>
    119142                </Viewbox>
    120143               
     
    176199                        </TreeView.ItemTemplate>
    177200                    </TreeView>
    178                     <Button Name="myProgButton2" Content="Progress" Click="SwitchView" Width="75" Height="23" Margin="0,0,6,6" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontWeight="bold" Background="LightBlue" BorderBrush="DarkBlue" Foreground="DarkBlue" Grid.Column="1" Grid.Row="1" />
    179201                </Grid>
    180202                </TabItem>
     
    215237                        </TreeView.ItemTemplate>
    216238                    </TreeView>
    217                     <Button Name="myProgButton3" Content="Progress" Click="SwitchView" Width="75" Height="23" Margin="0,0,6,6" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontWeight="bold" Background="LightBlue" BorderBrush="DarkBlue" Foreground="DarkBlue" Grid.Column="1" Grid.Row="1" />
    218239                </Grid>
    219240                </TabItem>       
    220         </TabControl>   
     241        </TabControl>
     242    </Grid>
    221243</UserControl>
Note: See TracChangeset for help on using the changeset viewer.