Changeset 2276


Ignore:
Timestamp:
Dec 29, 2010, 1:20:14 PM (11 years ago)
Author:
kopal
Message:
  • created gui to request a certificate for p2p
  • fixed a small bug not checking the password/worldname fields correctly before connecting to p2p
Location:
trunk
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypP2P/Internal/ConnectionManager.cs

    r2164 r2276  
    148148            }
    149149
    150             if (String.IsNullOrEmpty(P2PSettings.Default.PeerName))
     150            if (String.IsNullOrEmpty(P2PSettings.Default.Password))
     151            {
     152                P2PManager.GuiLogMessage("Peer-to-peer not fully configured: password missing.",
     153                                         NotificationLevel.Error);
     154                return false;
     155            }
     156
     157            if (String.IsNullOrEmpty(P2PSettings.Default.WorldName))
    151158            {
    152159                P2PManager.GuiLogMessage("Peer-to-peer not fully configured: world name missing.",
  • trunk/CrypP2P/Worker/ConnectionWorker.cs

    r1698 r2276  
    4848            {
    4949                P2PManager.GuiLogMessage("Connecting to P2P network...", NotificationLevel.Info);
    50 
    51                 // Validate certificats
    52                 if (!PAPCertificate.CheckAndInstallPAPCertificates())
    53                 {
    54                     P2PManager.GuiLogMessage("Certificates not validated, P2P might not be working!",
    55                                                       NotificationLevel.Error);
    56                     return;
    57                 }
    58 
    5950                p2PBase.Initialize();
    6051                p2PBase.SynchStart();
  • trunk/CrypPlugins/P2PEditor/GUI/P2PEditorPresentation.xaml

    r1918 r2276  
    1414                <controls:ConnectTab IsP2PConnecting="{Binding IsP2PConnecting, ElementName=P2PEditorControl}" />
    1515            </TabItem>
     16            <TabItem Header="Get new Certificate" Name="GetNewCertificateTab" Visibility="{Binding IsP2PConnected, ElementName=P2PEditorControl, Converter={StaticResource ConnectivityToVisibilityConverter}}">
     17                <controls:GetNewCertificate />
     18            </TabItem>
    1619            <TabItem Header="About" Name="AboutTab">
    1720                <Frame Source="../DetailedDescription/Description.xaml" />
  • trunk/CrypPlugins/P2PEditor/P2PEditor.csproj

    r1918 r2276  
    5252    <DefineConstants>DEBUG;TRACE</DefineConstants>
    5353  </PropertyGroup>
    54   <ItemGroup Condition=" '$(Platform)' == 'x86' " />
    55   <ItemGroup Condition=" '$(Platform)' == 'x64' " />
    56   <ItemGroup>
     54  <ItemGroup Condition=" '$(Platform)' == 'x86' ">
     55    <Reference Include="CertificateLibrary">
     56      <HintPath>..\..\AppReferences\x86\CertificateLibrary.dll</HintPath>
     57      <Private>false</Private>
     58    </Reference>
     59  </ItemGroup>
     60  <ItemGroup Condition=" '$(Platform)' == 'x64' ">
     61    <Reference Include="CertificateLibrary">
     62      <HintPath>..\..\AppReferences\x64\CertificateLibrary.dll</HintPath>
     63      <Private>false</Private>
     64    </Reference>
     65  </ItemGroup>
     66  <ItemGroup>   
    5767    <Reference Include="PresentationCore" />
    5868    <Reference Include="PresentationFramework" />
     
    6272    <Reference Include="System.Data" />
    6373    <Reference Include="System.Data.Linq" />
     74    <Reference Include="System.Drawing" />
    6475    <Reference Include="System.Windows.Forms" />
    6576    <Reference Include="System.Xaml" />
     
    7889    <Compile Include="GUI\Controls\ConnectTab.xaml.cs">
    7990      <DependentUpon>ConnectTab.xaml</DependentUpon>
     91    </Compile>
     92    <Compile Include="GUI\Controls\GetNewCertificate.xaml.cs">
     93      <DependentUpon>GetNewCertificate.xaml</DependentUpon>
    8094    </Compile>
    8195    <Compile Include="GUI\P2PUserControl.cs" />
     
    158172      <Generator>MSBuild:Compile</Generator>
    159173    </Page>
     174    <Page Include="GUI\Controls\GetNewCertificate.xaml">
     175      <Generator>MSBuild:Compile</Generator>
     176      <SubType>Designer</SubType>
     177    </Page>
    160178    <Page Include="GUI\Controls\JobCreation.xaml">
    161179      <SubType>Designer</SubType>
Note: See TracChangeset for help on using the changeset viewer.