Merge branch 'develop' into release/eni_7.2.7

ENI2/ENI2.csproj

@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>7</ApplicationRevision>
+    <ApplicationRevision>9</ApplicationRevision>
-    <ApplicationVersion>7.2.7.7</ApplicationVersion>
+    <ApplicationVersion>7.2.7.9</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -914,10 +914,6 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Content Include="..\misc\Logo.gif">
-      <Link>Report\Logo.gif</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="..\misc\report.db">
       <Link>report.db</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -1026,6 +1022,9 @@
     <Resource Include="Resources\departure_worker.png" />
     <Resource Include="Resources\clock.png" />
     <Resource Include="ILLink\ILLink.Descriptors.LibraryBuild.xml" />
+    <Content Include="Report\Logo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

ENI2/Report/ReportDocument.cs

@@ -254,7 +254,7 @@ namespace ENI2.Report
             table.AddColumn(140);
 
             Row row = table.AddRow();
-            Image logoImage = row.Cells[0].AddImage(@"Report\Logo.gif"); // kann man offenbar nur von einem Pfad laden
+            Image logoImage = row.Cells[0].AddImage(@"Report\Logo.png"); // kann man offenbar nur von einem Pfad laden
             logoImage.Width = 80;
             row.Cells[0].MergeDown = 6;