Skip to content

Commit

Permalink
Fixes #2289, Fixes #2273, Fixes #2263 (#2297)
Browse files Browse the repository at this point in the history
  • Loading branch information
msevestre authored Aug 5, 2022
1 parent 0a659e5 commit 7442c6d
Show file tree
Hide file tree
Showing 20 changed files with 67,314 additions and 1,887 deletions.
1 change: 0 additions & 1 deletion src/PKSim.Assets.Images/ApplicationImages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public static class ApplicationImages
private static readonly ICache<string, ApplicationImage> _allImages = new Cache<string, ApplicationImage>();
private static IList<ApplicationImage> _allImageList;

public static readonly ApplicationImage Splash = createImageFrom(Images.PKSim, "PKSim");
public static readonly ApplicationImage Model4Comp = createImageFrom(Images.SmallMoleculesStructure, "4Comp");
public static readonly ApplicationImage Model4Comp2Pores = createImageFrom(Images.TwoPoresModelStructure, "TwoPores");

Expand Down
32 changes: 1 addition & 31 deletions src/PKSim.Assets.Images/Images.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions src/PKSim.Assets.Images/Images.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Model4Comp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Model4Comp.TIF;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Model4Comp2Pores" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Model4Comp2Pores.TIF;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="PKSim" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\PKSim.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SmallMoleculesStructure" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\SmallMoleculesStructure.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand Down
Binary file removed src/PKSim.Assets.Images/Resources/Model4Comp.TIF
Binary file not shown.
Binary file not shown.
Binary file removed src/PKSim.Assets.Images/Resources/PKSim.jpg
Binary file not shown.
1,984 changes: 1,308 additions & 676 deletions src/PKSim.Assets.Images/Resources/PKSim.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/PKSim.Assets.Images/Resources/PKSimAbout.png
Binary file not shown.
29 changes: 0 additions & 29 deletions src/PKSim.Assets.Images/Resources/PKSimAbout.svg

This file was deleted.

Binary file removed src/PKSim.Assets.Images/Resources/R_RGB.bmp
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using OSPSuite.Utility.Events;
using PKSim.Presentation.Views.Main;
using OSPSuite.Presentation.Presenters;
using PKSim.Core;

namespace PKSim.Presentation.Presenters.Main
{
Expand All @@ -13,9 +14,12 @@ public interface ISplashViewPresenter : IPresenter<ISplashView>,

public class SplashViewPresenter : AbstractPresenter<ISplashView, ISplashViewPresenter>, ISplashViewPresenter
{
public SplashViewPresenter(ISplashView splashView)
private readonly IPKSimConfiguration _configuration;

public SplashViewPresenter(ISplashView splashView, IPKSimConfiguration configuration)
: base(splashView)
{
_configuration = configuration;
}

public void Handle(ProgressDoneEvent eventToHandle)
Expand All @@ -26,6 +30,7 @@ public void Handle(ProgressDoneEvent eventToHandle)
public void Handle(ProgressInitEvent eventToHandle)
{
View.ProgressValue = 0;
View.VersionInfo = _configuration.FullVersionDisplay;
View.StatusInfo = eventToHandle.Message;
}

Expand Down
1 change: 1 addition & 0 deletions src/PKSim.Presentation/Views/Main/ISplashView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ public interface ISplashView : IView<ISplashViewPresenter>
{
string StatusInfo { set; }
double ProgressValue { set; }
string VersionInfo { set; }
}
}
13 changes: 13 additions & 0 deletions src/PKSim.UI/PKSim.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,26 @@


<ItemGroup>
<Compile Include="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup>


<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
Expand Down
63 changes: 63 additions & 0 deletions src/PKSim.UI/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

120 changes: 120 additions & 0 deletions src/PKSim.UI/Properties/Resources.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
Loading

0 comments on commit 7442c6d

Please sign in to comment.