Changeset 4387

Timestamp:

09/14/10 00:18:12 (14 years ago)

Author:

swagner

Message:

Implemented ClientFactory and username / password management (#1187)

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Common/3.3/ClientFactory.cs (added)
• HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Common/3.3/PasswordDialog.Designer.cs (added)
• HeuristicLab.Clients.Common/3.3/PasswordDialog.cs (added)
• HeuristicLab.Clients.Common/3.3/Properties/Settings.Designer.cs (added)
• HeuristicLab.Clients.Common/3.3/Properties/Settings.settings (added)
• HeuristicLab.Clients.Common/3.3/app.config (added)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/AboutMenuItem.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/UsernamePasswordMenuItem.cs (added)
• HeuristicLab/3.3/MergeConfigs.cmd (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj

@@ -105 +105 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ClientFactory.cs" />
     <Compile Include="HeuristicLabClientsCommonPlugin.cs" />
+    <Compile Include="PasswordDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PasswordDialog.Designer.cs">
+      <DependentUpon>PasswordDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <None Include="app.config" />
     <None Include="Properties\AssemblyInfo.frame" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -121 +121 @@
     <Compile Include="MenuItems\AboutMenuItem.cs" />
     <Compile Include="MenuItems\ConvertIntoUserDefinedAlgorithmMenuItem.cs" />
+    <Compile Include="MenuItems\UsernamePasswordMenuItem.cs" />
     <Compile Include="MenuItems\CreateExperimentMenuItem.cs" />
     <Compile Include="MenuItems\CopyToClipboardMenuItem.cs" />
@@ -174 +175 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Clients.Common\3.3\HeuristicLab.Clients.Common-3.3.csproj">
+      <Project>{730A9104-D4D1-4360-966B-E49B7571DDA3}</Project>
+      <Name>HeuristicLab.Clients.Common-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame

@@ -27 +27 @@
   [PluginFile("HeuristicLab.Optimizer-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Clients.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/AboutMenuItem.cs

@@ -30 +30 @@
 
     public override string Name {
-      get { return "&About"; }
+      get { return "&About..."; }
     }
     public override IEnumerable<string> Structure {

trunk/sources/HeuristicLab/3.3/MergeConfigs.cmd

@@ -1 +1 @@
 ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure\3.3\%Outdir%\HeuristicLab.PluginInfrastructure-3.3.dll.config" "HeuristicLab 3.3.exe.config"
+ConfigMerger "%SolutionDir%\HeuristicLab.Clients.Common\3.3\%Outdir%\HeuristicLab.Clients.Common-3.3.dll.config" "HeuristicLab 3.3.exe.config"
 ConfigMerger "%SolutionDir%\HeuristicLab.Optimizer\3.3\%Outdir%\HeuristicLab.Optimizer-3.3.dll.config" "HeuristicLab 3.3.exe.config"
 ConfigMerger "%SolutionDir%\HeuristicLab.Persistence\3.3\%Outdir%\HeuristicLab.Persistence-3.3.dll.config" "HeuristicLab 3.3.exe.config"