Changeset 13340

Timestamp:

11/23/15 17:16:35 (9 years ago)

Author:

gkronber

Message:

#2522: added release name to SplashScreen, added AssemblyInfo.cs.frame file for HeuristicLab.PluginInfrastructure.UI

Location:

branches/RefactorPluginInfrastructure-2522

Files:

• HeuristicLab.PluginInfrastructure.UI (modified) (1 prop)
• HeuristicLab.PluginInfrastructure.UI/HeuristicLab.PluginInfrastructure.UI-4.0.csproj (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure.UI/HeuristicLab.snk (added)
• HeuristicLab.PluginInfrastructure.UI/Properties/AssemblyInfo.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.PluginInfrastructure.UI/SplashScreen.Designer.cs (modified) (5 diffs)
• HeuristicLab.PluginInfrastructure.UI/SplashScreen.cs (modified) (1 diff)
• HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) (1 diff)

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/HeuristicLab.PluginInfrastructure.UI-4.0.csproj

@@ -131 +131 @@
       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
@@ -138 +139 @@
   <ItemGroup>
     <None Include="HeuristicLab.snk" />
+    <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/SplashScreen.Designer.cs

@@ -58 +58 @@
       this.versionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.versionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 6F);
-      this.versionLabel.Location = new System.Drawing.Point(436, 147);
+      this.versionLabel.Location = new System.Drawing.Point(320, 147);
       this.versionLabel.Name = "versionLabel";
-      this.versionLabel.Size = new System.Drawing.Size(150, 9);
+      this.versionLabel.Size = new System.Drawing.Size(266, 10);
       this.versionLabel.TabIndex = 1;
       this.versionLabel.Text = "Version ";
@@ -67 +67 @@
       // infoLabel
       // 
-      this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.infoLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
       this.infoLabel.ForeColor = System.Drawing.Color.DarkOrange;
@@ -91 +91 @@
       // pictureBox
       // 
-      this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.pictureBox.Image = Resources.HeuristicLabBanner;
+      this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.pictureBox.Image = global::HeuristicLab.PluginInfrastructure.UI.Resources.HeuristicLabBanner;
       this.pictureBox.Location = new System.Drawing.Point(0, 0);
       this.pictureBox.Name = "pictureBox";
@@ -103 +103 @@
       // SplashScreen
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.BackColor = System.Drawing.Color.White;
@@ -113 +112 @@
       this.Controls.Add(this.infoLabel);
       this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-      this.Icon = Resources.HeuristicLab;
+      this.Icon = global::HeuristicLab.PluginInfrastructure.UI.Resources.HeuristicLab;
       this.MaximizeBox = false;
       this.MinimizeBox = false;

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/SplashScreen.cs

@@ -44 +44 @@
       RegisterPluginManagerEventHandlers();
 
-      versionLabel.Text = "Version " + AssemblyExtensions.GetFileVersion(GetType().Assembly);
+      versionLabel.Text = "Version " + typeof(PluginManager).Assembly.GetFileVersion() + " Windischgarsten (11/2015)";
       infoLabel.Text = "";
 
-      var attr = (AssemblyCopyrightAttribute)this.GetType().Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false).Single();
+      var attr = (AssemblyCopyrightAttribute)typeof(PluginManager).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false).Single();
       copyrightLabel.Text = "Copyright " + attr.Copyright;
 

branches/RefactorPluginInfrastructure-2522/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -191 +191 @@
       <Project>{7af3c7b6-8ba5-44f3-8d5b-2bf7a23cf12d}</Project>
       <Name>HeuristicLab.PluginInfrastructure.UI-4.0</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

@@ -1 +1 @@
 bin
 obj
+*.user