Changeset 1701


Ignore:
Timestamp:
Jun 25, 2010, 9:50:44 AM (11 years ago)
Author:
Paul Lelgemann
Message:

o P2PEditor fixes

Location:
trunk/CrypPlugins
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/KeySearcher/KeySearcherSettings.cs

    r1682 r1701  
    4040                    keysearcher.GuiLogMessage("Wrong key pattern!", NotificationLevel.Error);
    4141                HasChanges = true;
    42                 OnPropertyChanged("TotalAmountOfChunks");
    4342            }
    4443        }
     
    128127                    chunkSize = value;
    129128                    OnPropertyChanged("ChunkSize");
    130                     OnPropertyChanged("TotalAmountOfChunks");
    131129                    HasChanges = true;
    132130                }
  • trunk/CrypPlugins/KeySearcher/Presentation/Controls/P2PQuickWatchPresentation.xaml

    r1698 r1701  
    99                <Border BorderBrush="Silver" BorderThickness="0,0,0,2" Visibility="{Binding IsSearchingForReservedNodes, FallbackValue=Collapsed, Converter={StaticResource TrueToVisibleOrCollapsedConverter}}">
    1010                                        <Grid Height="36" Background="#C8D1E3FF">
    11                                                 <Label Content="Calculation nearly finished: Using reserved nodes..." Height="28" HorizontalAlignment="Center" VerticalAlignment="Center" />
     11                                                <Label Content="Endgame mode: Using reserved nodes, calculation nearly finished..." Height="28" HorizontalAlignment="Center" VerticalAlignment="Center" />
    1212                                        </Grid>
    1313                                </Border>
  • trunk/CrypPlugins/P2PEditor/Distributed/DistributedJob.cs

    r1643 r1701  
    1515            JobGuid = Guid.NewGuid();
    1616            JobOwner = P2PSettings.Default.PeerName;
    17             JobDate = new DateTime();
     17            JobDate = DateTime.Now;
    1818        }
    1919
  • trunk/CrypPlugins/P2PEditor/GUI/Controls/JobDisplay.xaml

    r1619 r1701  
    1313    </GUI:P2PUserControl.Resources>
    1414        <Grid Background="White">
    15         <ListBox x:Name="JobListBox" ItemsSource="{Binding Jobs, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" ItemTemplate="{StaticResource jobDisplayTemplate}" Style="{StaticResource jobListDisplayStyle}" KeyUp="JobListBox_KeyUp" Margin="0,0,0,35">
     15        <ListBox x:Name="JobListBox" HorizontalContentAlignment="Stretch" ItemsSource="{Binding Jobs, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" ItemTemplate="{StaticResource jobDisplayTemplate}" Style="{StaticResource jobListDisplayStyle}" KeyUp="JobListBox_KeyUp" Margin="0,0,0,35">
    1616            <ListBox.ItemContainerStyle>
    1717                <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
  • trunk/CrypPlugins/P2PEditor/GUI/Controls/JobDisplay.xaml.cs

    r1634 r1701  
    104104            P2PEditor.GuiLogMessage("Received new job list...", NotificationLevel.Debug);
    105105            Jobs = updateWorker.RefreshedJobList;
    106             Jobs.Reverse();
     106
     107            if (Jobs != null)
     108                Jobs.Reverse();
    107109        }
    108110
  • trunk/CrypPlugins/P2PEditor/GUI/Controls/JobDisplayTemplate.xaml

    r1549 r1701  
    11<ResourceDictionary x:Class="Cryptool.P2PEditor.GUI.Controls.JobDisplayTemplate"
    22              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    3     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Distributed="clr-namespace:Cryptool.P2PEditor.Distributed">
     3    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Distributed="clr-namespace:Cryptool.P2PEditor.Distributed" xmlns:Converters="clr-namespace:Cryptool.P2PEditor.Converters">
    44
    5     <DataTemplate DataType="{x:Type Distributed:DistributedJob}" x:Key="jobDisplayTemplate">
     5        <Converters:DateTimeConverter x:Key="DateTimeConverter" />
     6        <DataTemplate DataType="{x:Type Distributed:DistributedJob}" x:Key="jobDisplayTemplate">
    67        <Grid>
    78            <Grid.ColumnDefinitions>
    8                 <ColumnDefinition Width="70" />
     9                <ColumnDefinition Width="75" />
    910                <ColumnDefinition Width="*" />
     11                <ColumnDefinition Width="130" />
    1012            </Grid.ColumnDefinitions>
    1113            <StackPanel Grid.Column="0">
    12                 <Label Content="Name:" Height="28" FontSize="13" FontWeight="Bold" />
    13                 <Label Content="Workspace:" Height="28" FontSize="11" FontWeight="Bold" />
     14                <Label Content="Name" FontWeight="Bold" Height="24" />
     15                <Label Content="Author:" FontWeight="Bold" FontSize="10" Height="23" />
     16                <Label Content="Workspace:" FontWeight="Bold" FontSize="10" Height="23" />
    1417            </StackPanel>
    1518            <StackPanel Grid.Column="1">
    16                 <Label Content="{Binding JobName}" Height="28" FontSize="13" />
    17                 <Label Content="{Binding FileName}" Height="28" FontSize="11" />
     19                <Label Content="{Binding JobName}" Height="24" />
     20                <Label Content="{Binding JobOwner}" Height="23" FontSize="10" />
     21                <Label Content="{Binding FileName}" Height="23" FontSize="10" />
    1822            </StackPanel>
    19             <Label Content="{Binding JobDescription}" Grid.ColumnSpan="2" Margin="0,50,0,0"  FontSize="11" />
     23            <StackPanel Grid.Column="2" HorizontalAlignment="Right">
     24                <Label Content="{Binding JobDate, Converter={StaticResource DateTimeConverter}}" VerticalAlignment="Top" FontSize="10" Height="23" />
     25                <Label Content="" VerticalAlignment="Top" FontSize="10" Height="23" />
     26            </StackPanel>
    2027        </Grid>
    2128    </DataTemplate>
  • trunk/CrypPlugins/P2PEditor/P2PEditor.csproj

    r1669 r1701  
    7070  <ItemGroup>
    7171    <Compile Include="Converters\ConnectivityToVisibilityConverter.cs" />
     72    <Compile Include="Converters\DateTimeConverter.cs" />
    7273    <Compile Include="GUI\Controls\ConnectTab.xaml.cs">
    7374      <DependentUpon>ConnectTab.xaml</DependentUpon>
Note: See TracChangeset for help on using the changeset viewer.