Skip to content

Commit

Permalink
feature: add rotation; fix: fix zoom; chore: further split .resx
Browse files Browse the repository at this point in the history
  • Loading branch information
lukegor committed Jul 14, 2024
1 parent 4e49bf2 commit 068979a
Show file tree
Hide file tree
Showing 27 changed files with 1,255 additions and 193 deletions.
40 changes: 26 additions & 14 deletions JSharp/JSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<UseWPF>true</UseWPF>
<Authors>Łukasz Górski</Authors>
<Copyright>Copyright © 2024 Łukasz Górski</Copyright>
<ApplicationIcon>Resources\Icons\icon1.ico</ApplicationIcon>
<ApplicationIcon>Resources\Icons\ToolBar_Icons\JSharp.ico</ApplicationIcon>
<RepositoryUrl>https://github.com/lukegor/JSharp</RepositoryUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PublishSingleFile>true</PublishSingleFile>
Expand All @@ -18,25 +18,24 @@
</PropertyGroup>

<ItemGroup>
<None Remove="Resources\ClearCanvas.ico" />
<None Remove="Resources\DrawRectangle.ico" />
<None Remove="Resources\LineSegment.ico" />
<None Remove="Resources\N-A-icon.ico" />
<None Remove="Resources\NoneIcon.ico" />
<None Remove="zzz.jpg" />
<None Remove="Resources\Icons\ToolBar_Icons\ClearCanvas.ico" />
<None Remove="Resources\Icons\ToolBar_Icons\DrawRectangle.ico" />
<None Remove="Resources\Icons\ToolBar_Icons\LineSegment.ico" />
<None Remove="Resources\Icons\ToolBar_Icons\N-A-icon.ico" />
<None Remove="Resources\Icons\ToolBar_Icons\NoneIcon.ico" />
</ItemGroup>

<ItemGroup>
<Content Include="Resources\Icons\icon1.ico" />
<Content Include="Resources\Icons\ToolBar_Icons\JSharp.ico" />
</ItemGroup>

<ItemGroup>
<Resource Include="Resources\Icons\ClearCanvas.ico" />
<Resource Include="Resources\Icons\DrawRectangle.ico" />
<Resource Include="Resources\Icons\icon1.ico" />
<Resource Include="Resources\Icons\LineSegment.ico" />
<Resource Include="Resources\Icons\N-A-icon.ico" />
<Resource Include="Resources\Icons\NoneIcon.ico" />
<Resource Include="Resources\Icons\ToolBar_Icons\ClearCanvas.ico" />
<Resource Include="Resources\Icons\ToolBar_Icons\DrawRectangle.ico" />
<Resource Include="Resources\Icons\ToolBar_Icons\JSharp.ico" />
<Resource Include="Resources\Icons\ToolBar_Icons\LineSegment.ico" />
<Resource Include="Resources\Icons\ToolBar_Icons\N-A-icon.ico" />
<Resource Include="Resources\Icons\ToolBar_Icons\NoneIcon.ico" />
</ItemGroup>

<ItemGroup>
Expand All @@ -58,6 +57,11 @@
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Update="Resources\Errors.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Errors.resx</DependentUpon>
</Compile>
<Compile Update="Resources\Histogram.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
Expand Down Expand Up @@ -91,6 +95,10 @@
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Resources\Errors.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Errors.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Histogram.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Histogram.Designer.cs</LastGenOutput>
Expand Down Expand Up @@ -127,4 +135,8 @@
</None>
</ItemGroup>

<ItemGroup>
<Folder Include="Resources\Icons\Menu_Icons\" />
</ItemGroup>

</Project>
135 changes: 135 additions & 0 deletions JSharp/Resources/Errors.Designer.cs

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

144 changes: 144 additions & 0 deletions JSharp/Resources/Errors.de.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
<?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>
<data name="AlreadyGrayscale_Error" xml:space="preserve">
<value>Das Bild ist bereits in Graustufen dargestellt</value>
</data>
<data name="HistogramAlreadyOpen" xml:space="preserve">
<value>Das Histogramm für das Bild ist bereits geöffnet.</value>
</data>
<data name="HistogramNotOpen" xml:space="preserve">
<value>Für den Vorgang muss das Histogramm des ausgewählten Bildes geöffnet sein.</value>
</data>
<data name="ImageNotColor" xml:space="preserve">
<value>Der ausgewählte Vorgang kann nur für Farbbilder ausgeführt werden.</value>
</data>
<data name="ImageNotGrayscale" xml:space="preserve">
<value>Der ausgewählte Vorgang kann nur für Graustufenbilder ausgeführt werden.</value>
</data>
<data name="LoadingFailed" xml:space="preserve">
<value>Bild konnte nicht geladen werden.</value>
</data>
<data name="NoImageFocused" xml:space="preserve">
<value>Kein Bild ist fokussiert</value>
</data>
<data name="NoImageOpen" xml:space="preserve">
<value>Kein Bild ist geöffnet</value>
</data>
</root>
Loading

0 comments on commit 068979a

Please sign in to comment.