Changeset 2422


Ignore:
Timestamp:
Jan 22, 2011, 3:11:30 PM (11 years ago)
Author:
Matthäus Wander
Message:

KeySearcher:

  • right-aligned numbers in presentation table (more space for DE strings)
Location:
trunk/CrypPlugins/KeySearcher/Presentation/Controls
Files:
2 edited

Legend:

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

    r2295 r2422  
    44    <UserControl.Resources>
    55        <RotateTransform x:Key="HeaderRotate" Angle="270" />
    6         <Style x:Key="ValueRow1">
    7             <Setter Property="Label.Margin" Value="80,0,0,0" />
    8         </Style>
    9         <Style x:Key="ValueRow2">
    10             <Setter Property="Label.Margin" Value="110,0,0,0" />
    11         </Style>
    126    </UserControl.Resources>
    137    <Viewbox>
     
    3024
    3125                    <Label Content="{Loc Keys_sec_OpenCL_}" Grid.Column="1" Grid.Row="0" />
    32                     <Label Name="keysPerSecondOpenCL" Style="{StaticResource ValueRow2}" Grid.Column="1" Grid.Row="0" />
     26                    <Label Name="keysPerSecondOpenCL" Grid.Column="1" Grid.Row="0" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    3327                    <Label Content="{Loc Keys_sec_CPU_}" Grid.Column="2" Grid.Row="0" />
    34                     <Label Name="keysPerSecondCPU" Style="{StaticResource ValueRow2}" Grid.Column="2" Grid.Row="0" />
     28                    <Label Name="keysPerSecondCPU" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    3529                   
    3630                    <Label Content="{Loc Devices_}" Grid.Column="1" Grid.Row="1" />
    37                     <Label Name="devices" Style="{StaticResource ValueRow2}" Grid.Column="1" Grid.Row="1" />
     31                    <Label Name="devices" Grid.Column="1" Grid.Row="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    3832
    3933                    <Label Content="{Loc Work_Items_}" Grid.Column="2" Grid.Row="1" />
    40                     <Label Name="workItems" Style="{StaticResource ValueRow2}" Grid.Column="2" Grid.Row="1" />
     34                    <Label Name="workItems" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    4135                   
    4236                    <Label Content="{Loc Ration_}" Grid.Column="1" Grid.Row="2" />
    43                     <Label Name="ratio" Style="{StaticResource ValueRow2}" Grid.Column="1" Grid.Row="2" />
     37                    <Label Name="ratio" Grid.Column="1" Grid.Row="2" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    4438                </Grid>
    4539            </Border>           
  • trunk/CrypPlugins/KeySearcher/Presentation/Controls/P2PQuickWatchPresentation.xaml

    r2306 r2422  
    66        <Converter:TimeSpanToStringConverter x:Key="TimeSpanToStringConverter" />
    77        <RotateTransform x:Key="HeaderRotate" Angle="270" />
    8         <Style x:Key="ValueRow1">
    9             <Setter Property="Label.Margin" Value="90,0,0,0" />
    10         </Style>
    11         <Style x:Key="ValueRow2">
    12             <Setter Property="Label.Margin" Value="110,0,0,0" />
    13         </Style>
    14         <Style x:Key="ValueRow3">
    15             <Setter Property="Label.Margin" Value="90,0,0,0" />
    16         </Style>
    178        <Storyboard x:Key="EndgameStoryboard" RepeatBehavior="Forever">
    189                <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" Storyboard.TargetName="EndgameGrid">
     
    6253                        </Border>
    6354                        <Label Content="{Loc Total_Chunks_}" VerticalAlignment="Center" Grid.Column="1" />
    64                         <Label Content="-" Name="TotalAmountOfChunks" Style="{StaticResource ValueRow1}" VerticalAlignment="Center" Grid.Column="1" />
     55                        <Label Content="-" Name="TotalAmountOfChunks" VerticalAlignment="Center" Grid.Column="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    6556                        <Label Content="{Loc Keys_Per_Chunk_}" VerticalAlignment="Center" Grid.Column="2" />
    66                         <Label Content="-" Name="KeysPerChunk" Style="{StaticResource ValueRow2}" VerticalAlignment="Center" Grid.Column="2" />
     57                        <Label Content="-" Name="KeysPerChunk" VerticalAlignment="Center" Grid.Column="2" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    6758                        <Label Content="{Loc Tested_Bits_}" VerticalAlignment="Center" Grid.Column="3" />
    68                         <Label Content="-" Name="TestedBits" Style="{StaticResource ValueRow3}" VerticalAlignment="Center" Grid.Column="3" />
     59                        <Label Content="-" Name="TestedBits" VerticalAlignment="Center" Grid.Column="3" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    6960                                        </Grid>
    7061                                </Border>
     
    8576                        </Border>
    8677                        <Label Content="{Loc Participants_}" Grid.Column="1" />
    87                         <Label Content="{Binding TotalAmountOfParticipants, FallbackValue=-}" Style="{StaticResource ValueRow1}" Grid.Column="1" />
     78                        <Label Content="{Binding TotalAmountOfParticipants, FallbackValue=-}" Grid.Column="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    8879                        <Label Content="{Loc Start_}" Grid.Column="2" />
    89                         <Label Content="{Binding StartDate, FallbackValue=-, Converter={StaticResource DateTimeConverter}}" Style="{StaticResource ValueRow2}" Grid.Column="2" />
     80                        <Label Content="{Binding StartDate, FallbackValue=-, Converter={StaticResource DateTimeConverter}}" Grid.Column="2" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    9081                        <Label Content="{Loc End_}" HorizontalAlignment="Left" Grid.Column="3" />
    91                         <Label Content="{Binding EstimatedFinishDate, FallbackValue=-}" Style="{StaticResource ValueRow3}" Grid.Column="3" />
     82                        <Label Content="{Binding EstimatedFinishDate, FallbackValue=-}" Grid.Column="3" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    9283                        <Label Content="{Loc Elapsed_}" Grid.Column="2" Grid.Row="2" />
    93                         <Label Content="{Binding ElapsedTime, FallbackValue=-, Converter={StaticResource TimeSpanToStringConverter}}" Style="{StaticResource ValueRow2}" Grid.Column="2" Grid.Row="2" />
     84                        <Label Content="{Binding ElapsedTime, FallbackValue=-, Converter={StaticResource TimeSpanToStringConverter}}" Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    9485                        <Label Content="{Loc Remaining_}" Grid.Column="3" Grid.Row="2" />
    95                         <Label Content="{Binding RemainingTimeTotal, FallbackValue=-, Converter={StaticResource TimeSpanToStringConverter}}" Style="{StaticResource ValueRow3}" Grid.Column="3" Grid.Row="2" />
     86                        <Label Content="{Binding RemainingTimeTotal, FallbackValue=-, Converter={StaticResource TimeSpanToStringConverter}}" Grid.Column="3" Grid.Row="2" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    9687                    </Grid>
    9788                                </Border>
     
    113104                        </Border>
    114105                        <Label Content="{Loc Finished_Chunks_}" Grid.Column="1" Grid.Row="0" />
    115                         <Label Content="{Binding LocalFinishedChunks, FallbackValue=-}" Style="{StaticResource ValueRow1}" Grid.Column="1" Grid.Row="0" />
     106                        <Label Content="{Binding LocalFinishedChunks, FallbackValue=-}" Grid.Column="1" Grid.Row="0" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    116107                        <Label Content="{Loc Keys_Sec_}" Grid.Column="2" Grid.Row="0" />
    117                         <Label Name="keysPerSecond" Style="{StaticResource ValueRow2}" Grid.Column="2" Grid.Row="0" />
    118                         <TextBlock Text="{Binding KeysPerSecond, StringFormat=' {0:0,0}', FallbackValue=-}" Style="{StaticResource ValueRow2}" Grid.Column="2" Grid.Row="0" />
     108                        <Label Name="keysPerSecond" Grid.Column="2" Grid.Row="0" />
     109                        <TextBlock Text="{Binding KeysPerSecond, StringFormat=' {0:0,0}', FallbackValue=-}" Grid.Column="2" Grid.Row="0" HorizontalAlignment="Right" Padding="5,5,20,5" />
    119110                        <Label Content="{Loc Current_Chunk_}" Grid.Column="3" />
    120                         <Label Content="{Binding CurrentChunk, FallbackValue=-}" Style="{StaticResource ValueRow3}" Grid.Column="3" Grid.Row="0" />
     111                        <Label Content="{Binding CurrentChunk, FallbackValue=-}" Grid.Column="3" Grid.Row="0" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    121112                        <Grid  Grid.Column="1" Grid.ColumnSpan="3" Grid.Row="1">
    122113                            <ProgressBar Value="{Binding ProgressOfCurrentChunk, FallbackValue=0}" IsIndeterminate="{Binding IsCurrentProgressIndeterminate, FallbackValue=false}" Maximum="1" />
     
    146137                        </Border>
    147138                        <Label Content="{Loc Store_}" Grid.Column="1" Grid.Row="0" />
    148                         <Label Content="{Binding StoreRequests, FallbackValue=-}" Style="{StaticResource ValueRow1}" Grid.Column="1" Grid.Row="0" />
     139                        <Label Content="{Binding StoreRequests, FallbackValue=-}" Grid.Column="1" Grid.Row="0" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    149140                        <Label Content="{Loc Retrieve_}" Grid.Column="2" Grid.Row="0" />
    150                         <Label Content="{Binding RetrieveRequests, FallbackValue=-}" Style="{StaticResource ValueRow2}" Grid.Column="2" Grid.Row="0" />
     141                        <Label Content="{Binding RetrieveRequests, FallbackValue=-}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    151142                        <Label Content="{Loc Remove_}" Grid.Column="3" Grid.Row="0" />
    152                         <Label Content="{Binding RemoveRequests, FallbackValue=-}" Style="{StaticResource ValueRow3}" Grid.Column="3" Grid.Row="0" />
     143                        <Label Content="{Binding RemoveRequests, FallbackValue=-}" Grid.Column="3" Grid.Row="0" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    153144                        <Label Content="{Loc Total_}" Grid.Column="2" Grid.Row="1" />
    154                         <Label Content="{Binding TotalDhtRequests, FallbackValue=-}" Style="{StaticResource ValueRow2}" Grid.Column="2" Grid.Row="1" />
     145                        <Label Content="{Binding TotalDhtRequests, FallbackValue=-}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    155146                        <Label Content="{Loc Per_Chunk_}" Grid.Column="3" Grid.Row="1" />
    156                         <Label Content="{Binding RequestsPerNode, FallbackValue=-}" Style="{StaticResource ValueRow3}" Grid.Column="3" Grid.Row="1" />
     147                        <Label Content="{Binding RequestsPerNode, FallbackValue=-}" Grid.Column="3" Grid.Row="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    157148                        <Label Content="{Loc Overhead_Abs_}" Grid.Column="2" Grid.Row="2" />
    158                         <Label Content="{Binding DhtOverheadInReadableTime, FallbackValue=-, Converter={StaticResource TimeSpanToStringConverter}}" Style="{StaticResource ValueRow2}" Grid.Column="2" Grid.Row="2" />
     149                        <Label Content="{Binding DhtOverheadInReadableTime, FallbackValue=-, Converter={StaticResource TimeSpanToStringConverter}}" Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    159150                        <Label Content="{Loc Overhead_Perc_}" Grid.Column="3" Grid.Row="2" />
    160                         <Label Content="{Binding DhtOverheadInPercent, FallbackValue=-}" Style="{StaticResource ValueRow3}" Grid.Column="3" Grid.Row="2" />
     151                        <Label Content="{Binding DhtOverheadInPercent, FallbackValue=-}" Grid.Column="3" Grid.Row="2" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    161152                    </Grid>
    162153                </Border>
     
    177168                        </Border>
    178169                        <Label Content="{Loc Sent_Payload_}" Grid.Column="1" Grid.Row="0" />
    179                         <Label Content="{Binding StoredBytes, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Style="{StaticResource ValueRow1}" Grid.Column="1" Grid.Row="0" />
     170                        <Label Content="{Binding StoredBytes, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Grid.Column="1" Grid.Row="0" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    180171                        <Label Content="{Loc Received_Payload_}" Grid.Column="2" Grid.Row="0" />
    181                         <Label Content="{Binding RetrievedBytes, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Style="{StaticResource ValueRow2}" Grid.Column="2" Grid.Row="0" />
     172                        <Label Content="{Binding RetrievedBytes, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    182173                        <Label Content="{Loc Total_Payload_}" Grid.Column="3" Grid.Row="0" />
    183                         <Label Content="{Binding TotalBytes, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Style="{StaticResource ValueRow3}" Grid.Column="3" Grid.Row="0" />
     174                        <Label Content="{Binding TotalBytes, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Grid.Column="3" Grid.Row="0" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    184175                        <Label Content="{Loc Sent_Link_}" Grid.Column="1" Grid.Row="1" />
    185                         <Label Content="{Binding SentBytesByLinkManager, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Style="{StaticResource ValueRow1}"  Grid.Column="1" Grid.Row="1" />
     176                        <Label Content="{Binding SentBytesByLinkManager, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Grid.Column="1" Grid.Row="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    186177                        <Label Content="{Loc Received_Link_}" Grid.Column="2" Grid.Row="2" />
    187                         <Label Content="{Binding ReceivedBytesByLinkManager, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Style="{StaticResource ValueRow2}" Grid.Column="2" Grid.Row="1" />
     178                        <Label Content="{Binding ReceivedBytesByLinkManager, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    188179                        <Label Content="{Loc Total_Link_}" Grid.Column="3" Grid.Row="2" />
    189                         <Label Content="{Binding TotalBytesByLinkManager, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Style="{StaticResource ValueRow3}" Grid.Column="3" Grid.Row="1" />
     180                        <Label Content="{Binding TotalBytesByLinkManager, FallbackValue=-, Converter={StaticResource LongToSizeMetricString}}" Grid.Column="3" Grid.Row="1" HorizontalContentAlignment="Right" Padding="5,5,20,5" />
    190181                    </Grid>
    191182                                </Border>
Note: See TracChangeset for help on using the changeset viewer.