Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
AonaSuzutsuki committed Aug 26, 2018
2 parents 48abf4c + 92865ea commit 75a4b33
Show file tree
Hide file tree
Showing 13 changed files with 654 additions and 24 deletions.
34 changes: 31 additions & 3 deletions KeyConverter/KeyConverterGUI/KeyConverterGUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,22 @@
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Constants.cs" />
<Compile Include="LangResource\ResourceService.cs" />
<Compile Include="LangResource\Resources\Resources.en-US.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.en-US.resx</DependentUpon>
</Compile>
<Compile Include="LangResource\Resources\ResourcesKeyboard.en-US.Designer.cs">
<DependentUpon>ResourcesKeyboard.en-US.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="LangResource\Resources\ResourcesKeyboard.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>ResourcesKeyboard.resx</DependentUpon>
</Compile>
<Compile Include="Models\InterceptKey\CtrlAltReverser.cs" />
<Compile Include="Views\ObservableDictionary.cs" />
<Page Include="Styles\Button.xaml">
Expand Down Expand Up @@ -134,7 +150,7 @@
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<Compile Include="LangResource\Resources\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
Expand All @@ -144,10 +160,22 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<EmbeddedResource Include="LangResource\Resources\Resources.en-US.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.en-US.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="LangResource\Resources\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="LangResource\Resources\ResourcesKeyboard.en-US.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>ResourcesKeyboard.en-US.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="LangResource\Resources\ResourcesKeyboard.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>ResourcesKeyboard.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.manifest" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
Expand Down
69 changes: 69 additions & 0 deletions KeyConverter/KeyConverterGUI/LangResource/ResourceService.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
using KeyConverterGUI.LangResource.Resources;
using System.ComponentModel;
using System.Globalization;

namespace LangResource
{
/// <summary>
/// 多言語化されたリソースと、言語の切り替え機能を提供します。
/// </summary>
public class ResourceService : INotifyPropertyChanged
{
#region Static Members
public const string Japanese = "ja";
public const string English = "en-US";
#endregion

#region singleton members

private static readonly ResourceService current = new ResourceService();
public static ResourceService Current
{
get { return current; }
}

#endregion

/// <summary>
/// 多言語化されたリソースを取得します。
/// </summary>
public Resources Resources { get; } = new Resources();
public ResourcesKeyboard ResourcesKeyboard { get; } = new ResourcesKeyboard();


#region INotifyPropertyChanged members

public event PropertyChangedEventHandler PropertyChanged;

protected virtual void RaisePropertyChanged(string propertyName = null)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}

#endregion

/// <summary>
/// 指定されたカルチャ名を使用して、リソースのカルチャを変更します。
/// </summary>
/// <param name="name">カルチャの名前。</param>
public void ChangeCulture(string name)
{
var cultureInfo = CultureInfo.GetCultureInfo(name);
Resources.Culture = cultureInfo;
ResourcesKeyboard.Culture = cultureInfo;
RaisePropertyChanged("Resources");
RaisePropertyChanged("ResourcesKeyboard");
}

public string Culture
{
get
{
if (Resources.Culture != null)
return Resources.Culture.Name;
else
return CultureInfo.CurrentCulture.Name;
}
}
}
}

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

Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
<?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="UI_Detect_Mabinogi" xml:space="preserve">
<value>Detect Mabinogi</value>
</data>
<data name="UI_Disabled" xml:space="preserve">
<value>Now Disabled</value>
</data>
<data name="UI_Enabled" xml:space="preserve">
<value>Now Enabled</value>
</data>
<data name="UI_Keyboard_Mapping" xml:space="preserve">
<value>Keyboard Mapping</value>
</data>
</root>
Loading

0 comments on commit 75a4b33

Please sign in to comment.