Ignore:
Timestamp:
Dec 2, 2008, 7:53:02 PM (13 years ago)
Author:
Timo Eckhardt
Message:

Fixed some Bugs

Location:
trunk/CrypPlugins/Primes/Primes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/Primes/Primes/Resources/lang/WpfControls/Distribution/Distribution.Designer.cs

    r4 r106  
    143143       
    144144        /// <summary>
    145         ///   Looks up a localized string similar to Das logarihtmische Integral.
     145        ///   Looks up a localized string similar to Das logarithmische Integral.
    146146        /// </summary>
    147147        public static string graph_linname {
  • trunk/CrypPlugins/Primes/Primes/Resources/lang/WpfControls/Distribution/Distribution.resx

    r4 r106  
    146146  </data>
    147147  <data name="graph_linname" xml:space="preserve">
    148     <value>Das logarihtmische Integral</value>
     148    <value>Das logarithmische Integral</value>
    149149  </data>
    150150  <data name="graph_pincountinfo" xml:space="preserve">
  • trunk/CrypPlugins/Primes/Primes/WpfControls/PrimesDistribution/Numberline/NumberlineControl.xaml

    r26 r106  
    198198
    199199  </UserControl.Resources>
     200 
     201 
    200202  <Grid Margin="20">
    201203    <Grid.RowDefinitions>
     
    282284    <TextBlock Grid.Row="2" TextWrapping="Wrap" Margin="0,10,0,10" Text="{x:Static lang:Distribution.numberline_maxinterval}">
    283285      </TextBlock>
    284 
    285     <Grid Grid.Row="4" VerticalAlignment="Top" HorizontalAlignment="Stretch" >
     286    <Grid Grid.Row="3" Margin="0,0,0,0">
    286287      <Grid.RowDefinitions>
    287         <RowDefinition Height="10" />
    288         <RowDefinition Height="30" />
     288        <RowDefinition  Height="Auto"/>
     289        <RowDefinition Height="*"/>
    289290      </Grid.RowDefinitions>
    290       <!--<Canvas Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="ActuallNumberButtonArea" Background="Transparent" MouseMove="ActuallNumberButtonArea_MouseMove" MouseLeave="ActuallNumberButtonArea_MouseLeave">-->
    291       <Canvas Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="ActuallNumberButtonArea" Background="Transparent" MouseMove="ActuallNumberButtonArea_MouseMove">
    292 
    293         <Polygon Canvas.Top="0" Canvas.Left="0" Name="pFromNumber" Points="0,0, 15,0, 7.5,10" Fill="Blue" Stroke="Black" StrokeThickness="0.5" ToolTip="von" Width="0">
    294 
    295         </Polygon>
    296         <Polygon Canvas.Top="0" Canvas.Left="0" Name="pToNumber" Points="0,0, 15,0, 7.5,10" Fill="Violet" Stroke="Black" StrokeThickness="0.5" ToolTip="bis" Width="0">
    297 
    298         </Polygon>
    299         <DockPanel Canvas.Top="0" Canvas.Left="0" Name="pActualNumber">
    300           <Polygon Canvas.Top="0" Canvas.Left="0"  Points="0,0, 15,0, 7.5,10" Fill="Yellow" Stroke="Black" StrokeThickness="0.5" DragDrop.DragEnter="pActualNumber_DragEnter" />
    301           <TextBlock Canvas.Top="0" Canvas.Left="0" Name="textActualNumber" Text="2" FontSize="10" VerticalAlignment="Top" Margin="0"/>
    302          
    303         </DockPanel>
    304       </Canvas>
    305       <Canvas Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="LineArea" Background="Transparent" >
    306         <Rectangle Height="2" Fill="Black" Name="numberline" Canvas.Top="20">
    307 
    308         </Rectangle>
    309       </Canvas>
    310 
    311       <!--<Canvas Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="PaintArea" Background="Transparent" MouseMove="ActuallNumberButtonArea_MouseMove" MouseLeave="ActuallNumberButtonArea_MouseLeave">-->
    312       <Canvas Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="PaintArea" Background="Transparent" >
    313 
    314       </Canvas>
    315 
    316 
    317     </Grid>
    318     <StackPanel Grid.Row="2" Margin="0,14,0,0">
    319       <TextBlock Margin="14,0,0,0" Name="tbInfoError" Foreground="Blue"></TextBlock>
    320       <Grid Margin="0,0,0,10">
     291      <TextBlock Grid.Row="0" Name="tbInfoError" Foreground="Blue" Height="Auto"></TextBlock>
     292      <Grid Margin="0,0,0,10" Grid.Row="1">
    321293        <Grid.ColumnDefinitions>
    322294          <ColumnDefinition Width="Auto" />
     
    371343            <TextBlock HorizontalAlignment="Center" Text="{x:Static lang:Distribution.numberline_pointsdisplayed}"></TextBlock>
    372344            <TextBlock HorizontalAlignment="Center" Name="lblCountPoints" VerticalAlignment="Center">44</TextBlock>
     345
    373346          </StackPanel>
    374347
     
    406379        </Polygon>
    407380      </Grid>
    408     </StackPanel>
    409     <Button Grid.Row="3" HorizontalAlignment="Center" Margin="5" Padding="2" Name="btnCancelAll" Click="btnCancelAll_Click" IsEnabled="False" Content="{x:Static lang:Distribution.numberline_cancelcalculations}"></Button>
    410 
    411     <ScrollViewer Grid.Row="5" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
     381    </Grid>
     382    <Button Grid.Row="4" HorizontalAlignment="Center" Margin="5" Padding="2" Name="btnCancelAll" Click="btnCancelAll_Click" IsEnabled="False" Content="{x:Static lang:Distribution.numberline_cancelcalculations}"></Button>
     383
     384    <Grid Grid.Row="5" VerticalAlignment="Top" HorizontalAlignment="Stretch" >
     385      <Grid.RowDefinitions>
     386        <RowDefinition Height="10" />
     387        <RowDefinition Height="30" />
     388      </Grid.RowDefinitions>
     389      <!--<Canvas Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="ActuallNumberButtonArea" Background="Transparent" MouseMove="ActuallNumberButtonArea_MouseMove" MouseLeave="ActuallNumberButtonArea_MouseLeave">-->
     390      <Canvas Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="ActuallNumberButtonArea" Background="Transparent" MouseMove="ActuallNumberButtonArea_MouseMove">
     391
     392        <Polygon Canvas.Top="0" Canvas.Left="0" Name="pFromNumber" Points="0,0, 15,0, 7.5,10" Fill="Blue" Stroke="Black" StrokeThickness="0.5" ToolTip="von" Width="0">
     393
     394        </Polygon>
     395        <Polygon Canvas.Top="0" Canvas.Left="0" Name="pToNumber" Points="0,0, 15,0, 7.5,10" Fill="Violet" Stroke="Black" StrokeThickness="0.5" ToolTip="bis" Width="0">
     396
     397        </Polygon>
     398        <DockPanel Canvas.Top="0" Canvas.Left="0" Name="pActualNumber">
     399          <Polygon Canvas.Top="0" Canvas.Left="0"  Points="0,0, 15,0, 7.5,10" Fill="Yellow" Stroke="Black" StrokeThickness="0.5" DragDrop.DragEnter="pActualNumber_DragEnter" />
     400          <TextBlock Canvas.Top="0" Canvas.Left="0" Name="textActualNumber" Text="2" FontSize="10" VerticalAlignment="Top" Margin="0"/>
     401         
     402        </DockPanel>
     403      </Canvas>
     404      <Canvas Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="LineArea" Background="Transparent" >
     405        <Rectangle Height="2" Fill="Black" Name="numberline" Canvas.Top="20">
     406
     407        </Rectangle>
     408      </Canvas>
     409
     410      <!--<Canvas Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="PaintArea" Background="Transparent" MouseMove="ActuallNumberButtonArea_MouseMove" MouseLeave="ActuallNumberButtonArea_MouseLeave">-->
     411      <Canvas Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="PaintArea" Background="Transparent" >
     412
     413      </Canvas>
     414
     415
     416    </Grid>
     417
     418
     419    <ScrollViewer Grid.Row="6" HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible">
    412420
    413421      <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="pnlContent" MinWidth="500" >
Note: See TracChangeset for help on using the changeset viewer.