dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed logo and updated logo loading to avoid stupid color palette exception

Browse Source
This commit is contained in:
Daniel Schick 2022-04-29 07:46:39 +02:00
parent 6ba287ad0c
commit aaa88db061
7 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ENI2/ENI2.csproj
View File

@ -139,8 +139,8 @@
<Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL"> <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
<HintPath>packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath> <HintPath>packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath> <HintPath>packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"> <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath> <HintPath>packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
@ -187,20 +187,20 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="Xceed.Wpf.AvalonDock, Version=4.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"> <Reference Include="Xceed.Wpf.AvalonDock, Version=4.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath> <HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"> <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath> <HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"> <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath> <HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"> <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath> <HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xceed.Wpf.Toolkit, Version=4.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"> <Reference Include="Xceed.Wpf.Toolkit, Version=4.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath> <HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -772,7 +772,6 @@
</None> </None>
<Resource Include="Resources\floppy_disk_edit.png" /> <Resource Include="Resources\floppy_disk_edit.png" />
<Resource Include="Resources\floppy_disks.png" /> <Resource Include="Resources\floppy_disks.png" />
<Resource Include="Resources\logo_transparent_babyblau.png" />
<None Include="Resources\flash_red.png" /> <None Include="Resources\flash_red.png" />
<None Include="Resources\flash_yellow.png" /> <None Include="Resources\flash_yellow.png" />
<None Include="Resources\lightbulb_on.png" /> <None Include="Resources\lightbulb_on.png" />
@ -814,6 +813,7 @@
<Resource Include="Resources\undo.png" /> <Resource Include="Resources\undo.png" />
<Resource Include="Resources\Logo.gif" /> <Resource Include="Resources\Logo.gif" />
<Resource Include="Resources\excel.png" /> <Resource Include="Resources\excel.png" />
<Resource Include="Resources\logo_eni.png" />
<Content Include="x64\SQLite.Interop.dll"> <Content Include="x64\SQLite.Interop.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>

20
ENI2/Properties/Resources.Designer.cs generated
View File

@ -590,6 +590,16 @@ namespace ENI2.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap logo_eni {
get {
object obj = ResourceManager.GetObject("logo_eni", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// </summary> /// </summary>
@ -600,16 +610,6 @@ namespace ENI2.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap logo_transparent_babyblau {
get {
object obj = ResourceManager.GetObject("logo_transparent_babyblau", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>

6
ENI2/Properties/Resources.resx
View File

@ -550,9 +550,6 @@
<data name="textConfirmation" xml:space="preserve"> <data name="textConfirmation" xml:space="preserve">
<value>Confirmation</value> <value>Confirmation</value>
</data> </data>
<data name="logo_transparent_babyblau" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\logo_transparent_babyblau.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="delete2" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="delete2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\delete2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\delete2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
@ -1837,4 +1834,7 @@
<data name="textNotKnown" xml:space="preserve"> <data name="textNotKnown" xml:space="preserve">
<value>not known</value> <value>not known</value>
</data> </data>
<data name="logo_eni" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\logo_eni.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

BIN
ENI2/Resources/logo_eni.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
ENI2/Resources/logo_transparent_babyblau.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

6
ENI2/SplashScreenWindow.xaml
View File

@ -12,7 +12,11 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="22" /> <RowDefinition Height="22" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Image Source="Resources/logo_transparent_babyblau.png"/> <Image>
<Image.Source>
<BitmapImage UriSource="Resources/logo_eni.png" CreateOptions="IgnoreColorProfile" />
</Image.Source>
</Image>
<Label Name="labelStartupInfo" Grid.Row="1" Content="ENI-2" HorizontalContentAlignment="Center" Background="White" FontSize="11" VerticalContentAlignment="Center" /> <Label Name="labelStartupInfo" Grid.Row="1" Content="ENI-2" HorizontalContentAlignment="Center" Background="White" FontSize="11" VerticalContentAlignment="Center" />
</Grid> </Grid>
</Window> </Window>

4
ENI2/packages.config
View File

@ -4,8 +4,8 @@ Sample license text.
--> -->
<packages> <packages>
<package id="ExcelDataReader" version="3.6.0" targetFramework="net452" /> <package id="ExcelDataReader" version="3.6.0" targetFramework="net452" />
<package id="Extended.Wpf.Toolkit" version="4.1.0" targetFramework="net452" /> <package id="Extended.Wpf.Toolkit" version="4.3.0" targetFramework="net452" />
<package id="log4net" version="2.0.13" targetFramework="net452" /> <package id="log4net" version="2.0.14" targetFramework="net452" />
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net452" /> <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net452" />
<package id="PDFsharp-MigraDoc-gdi" version="1.50.5147" targetFramework="net452" /> <package id="PDFsharp-MigraDoc-gdi" version="1.50.5147" targetFramework="net452" />
<package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.115.0" targetFramework="net452" /> <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.115.0" targetFramework="net452" />