Skip to content

Commit

Permalink
Use resource files for file name & message strings
Browse files Browse the repository at this point in the history
  • Loading branch information
@MirisWisdom
MirisWisdom committed Nov 21, 2018
1 parent 799afc9 commit e49616b
Show file tree
Hide file tree
Showing 6 changed files with 506 additions and 14 deletions.
18 changes: 18 additions & 0 deletions AmaiSosu/AmaiSosu.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,16 @@
<Compile Include="IO\MoveDirectory.cs" />
<Compile Include="IO\MoveFactory.cs" />
<Compile Include="IO\MoveFile.cs" />
<Compile Include="Resources\FileNames.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>FileNames.resx</DependentUpon>
</Compile>
<Compile Include="Resources\Messages.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Messages.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs" />
Expand Down Expand Up @@ -101,6 +111,14 @@
<Resource Include="icon.ico" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\FileNames.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>FileNames.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Messages.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Messages.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Version.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
Expand Down
28 changes: 14 additions & 14 deletions AmaiSosu/Main.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Windows;
using AmaiSosu.IO;
using AmaiSosu.Properties;
using Atarashii.API;
using static AmaiSosu.Resources.FileNames;
using static AmaiSosu.Resources.Messages;

namespace AmaiSosu
{
Expand All @@ -25,7 +26,7 @@ public sealed class Main : INotifyPropertyChanged
/// <summary>
/// Current state of the OpenSauce installation.
/// </summary>
private string _installState = "Click Browse and select the HCE installation path.";
private string _installState = BrowseHce;

/// <summary>
/// Installation path.
Expand All @@ -41,9 +42,11 @@ public string Version
get
{
using (var stream = Assembly.GetExecutingAssembly()
.GetManifestResourceStream("AmaiSosu.Resources.Version.txt"))
.GetManifestResourceStream(AmaiSosuVersion))
using (var reader = new StreamReader(stream ?? throw new FileNotFoundException()))
{
return reader.ReadToEnd().Trim();
}
}
}

Expand Down Expand Up @@ -104,7 +107,7 @@ public void Initialise()
}
catch (Exception)
{
InstallText = "Click Browse and select the HCE installation path.";
InstallText = BrowseHce;
}
}

Expand All @@ -115,13 +118,13 @@ public void Install()
{
try
{
var backupDir = System.IO.Path.Combine(_path, "AmaiSosu.Backup." + Guid.NewGuid());
var backupDir = System.IO.Path.Combine(_path, AmaiSosuBackup + '.' + Guid.NewGuid());

CommitBackups(backupDir);
OpenSauce.Install(Path);
FinishInstall(backupDir);

InstallText = "Installation has been successful!";
InstallText = InstallSuccess;
}
catch (Exception e)
{
Expand Down Expand Up @@ -159,14 +162,11 @@ private void FinishInstall(string backupDir)
// restore backed up HCE shaders
MoveFactory.Get(MoveFactory.Type.RestoreHceShaders, _path, backupDir).Commit();

// move the OpenSauce IDE data
const string dirName = "OpenSauceIDE";

var source =
System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData),
"Kornner Studios", "OpenSauce", dirName);
OpenSauceDeveloper, OpenSauceDirectory, OpenSauceIDE);

var target = System.IO.Path.Combine(Path, dirName);
var target = System.IO.Path.Combine(Path, OpenSauceIDE);

Copy.All(new DirectoryInfo(source), new DirectoryInfo(target));
Directory.Delete(source, true);
Expand All @@ -180,10 +180,10 @@ private void FinishInstall(string backupDir)
/// </summary>
private void OnPathChanged()
{
CanInstall = Directory.Exists(Path) && File.Exists(System.IO.Path.Combine(Path, "haloce.exe"));
CanInstall = Directory.Exists(Path) && File.Exists(System.IO.Path.Combine(Path, HceExecutable));
InstallText = CanInstall
? "Ready to install OpenSauce to the HCE folder!"
: "Click Browse and select the HCE installation path.";
? InstallReady
: BrowseHce;
}

[NotifyPropertyChangedInvocator]
Expand Down
117 changes: 117 additions & 0 deletions AmaiSosu/Resources/FileNames.Designer.cs
View file

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

138 changes: 138 additions & 0 deletions AmaiSosu/Resources/FileNames.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
<?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="AmaiSosuBackup" xml:space="preserve">
<value>AmaiSosu.Backup</value>
</data>
<data name="AmaiSosuVersion" xml:space="preserve">
<value>AmaiSosu.Resources.Version.txt</value>
</data>
<data name="HceExecutable" xml:space="preserve">
<value>haloce.exe</value>
</data>
<data name="OpenSauceDeveloper" xml:space="preserve">
<value>Kornner Studios</value>
</data>
<data name="OpenSauceDirectory" xml:space="preserve">
<value>OpenSauce</value>
</data>
<data name="OpenSauceIDE" xml:space="preserve">
<value>OpenSauceIDE</value>
</data>
</root>
Loading

0 comments on commit e49616b

Please sign in to comment.