Skip to content

Commit bbda4a9

Browse files
davghousedavghouse
authored
Merge pull request #15 from davghouse/develop
UI enhancements
2 parents b2100ec + fc4ee56 commit bbda4a9

21 files changed

+165
-155
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ wordament-solver
33

44
Wordament solver that supports an arbitrary number of digram, prefix, suffix, and either/or tiles.
55

6-
Latest release [here](https://github.com/davghouse/wordament-solver/releases/tag/v1.2.1).
6+
Latest release [here](https://github.com/davghouse/wordament-solver/releases/tag/v1.3.0).
77

88
![before](/Screenshots/BeforeSolving.png)
99
![after](/Screenshots/AfterSolving.png)

‎Screenshots/AfterSolving.png

-3.46 KB
Loading

‎Screenshots/BeforeSolving.png

-3.05 KB
Loading

‎WordamentSolver/Models/WordComparers/PathLengthComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class PathLengthComparer : WordComparer
44
{
5-
public override string Name => "path length (p.l.)";
5+
public override string Name => "path length";
66

77
public override int Compare(Word x, Word y)
88
=> x.PathLength != y.PathLength

‎WordamentSolver/Models/WordComparers/PointsOverPathLengthComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class PointsOverPathLengthComparer : WordComparer
44
{
5-
public override string Name => "points / p.l.";
5+
public override string Name => "points / path length";
66

77
public override int Compare(Word x, Word y)
88
=> x.PointsOverPathLength != y.PointsOverPathLength

‎WordamentSolver/Models/WordComparers/PointsOverWordLengthComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class PointsOverWordLengthComparer : WordComparer
44
{
5-
public override string Name => "points / w.l.";
5+
public override string Name => "points / word length";
66

77
public override int Compare(Word x, Word y)
88
=> x.PointsOverWordLength != y.PointsOverWordLength

‎WordamentSolver/Models/WordComparers/StartLetterByPointsOverPathLengthComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class StartLetterByPointsOverPathLengthComparer : WordComparer
44
{
5-
public override string Name => "start letter by: points / p.l.";
5+
public override string Name => "start letter by: points / path length";
66

77
public override int Compare(Word x, Word y)
88
=> x.StartLetter != y.StartLetter

‎WordamentSolver/Models/WordComparers/StartLetterByPointsOverWordLengthComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class StartLetterByPointsOverWordLengthComparer : WordComparer
44
{
5-
public override string Name => "start letter by: points / w.l.";
5+
public override string Name => "start letter by: points / word length";
66

77
public override int Compare(Word x, Word y)
88
=> x.StartLetter != y.StartLetter

‎WordamentSolver/Models/WordComparers/StartLetterByWordLengthComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class StartLetterByWordLengthComparer : WordComparer
44
{
5-
public override string Name => "start letter by: w.l.";
5+
public override string Name => "start letter by: word length";
66

77
public override int Compare(Word x, Word y)
88
=> x.StartLetter != y.StartLetter

‎WordamentSolver/Models/WordComparers/StartPositionByPointsOverPathLengthComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class StartPositionByPointsOverPathLengthComparer : WordComparer
44
{
5-
public override string Name => "start position by: points / p.l.";
5+
public override string Name => "start position by: points / path length";
66

77
public override int Compare(Word x, Word y)
88
=> x.StartPosition != y.StartPosition

‎WordamentSolver/Models/WordComparers/StartPositionByPointsOverWordLengthComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class StartPositionByPointsOverWordLengthComparer : WordComparer
44
{
5-
public override string Name => "start position by: points / w.l.";
5+
public override string Name => "start position by: points / word length";
66

77
public override int Compare(Word x, Word y)
88
=> x.StartPosition != y.StartPosition

‎WordamentSolver/Models/WordComparers/StartPositionByWordLengthAscendingComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class StartPositionByWordLengthAscendingComparer : WordComparer
44
{
5-
public override string Name => "start position by: w.l. ascending";
5+
public override string Name => "start position by: word length ascending";
66

77
public override int Compare(Word x, Word y)
88
=> x.StartPosition != y.StartPosition

‎WordamentSolver/Models/WordComparers/StartPositionByWordLengthComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class StartPositionByWordLengthComparer : WordComparer
44
{
5-
public override string Name => "start position by: w.l.";
5+
public override string Name => "start position by: word length";
66

77
public override int Compare(Word x, Word y)
88
=> x.StartPosition != y.StartPosition

‎WordamentSolver/Models/WordComparers/WordLengthAscendingComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class WordLengthAscendingComparer : WordComparer
44
{
5-
public override string Name => "w.l. ascending";
5+
public override string Name => "word length ascending";
66

77
public override int Compare(Word x, Word y)
88
=> x.WordLength != y.WordLength

‎WordamentSolver/Models/WordComparers/WordLengthComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public sealed class WordLengthComparer : WordComparer
44
{
5-
public override string Name => "word length (w.l.)";
5+
public override string Name => "word length";
66

77
public override int Compare(Word x, Word y)
88
=> x.WordLength != y.WordLength

‎WordamentSolver/Properties/Resources.Designer.cs

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WordamentSolver/Properties/Resources.resx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
4747
mimetype: application/x-microsoft.net.object.binary.base64
4848
value : The object must be serialized with
49-
: System.Serialization.Formatters.Binary.BinaryFormatter
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
5151
5252
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
6060
: and then encoded with base64 encoding.
6161
-->
6262
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
6364
<xsd:element name="root" msdata:IsDataSet="true">
6465
<xsd:complexType>
6566
<xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
6869
<xsd:sequence>
6970
<xsd:element name="value" type="xsd:string" minOccurs="0" />
7071
</xsd:sequence>
71-
<xsd:attribute name="name" type="xsd:string" />
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
7273
<xsd:attribute name="type" type="xsd:string" />
7374
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
7476
</xsd:complexType>
7577
</xsd:element>
7678
<xsd:element name="assembly">
@@ -85,9 +87,10 @@
8587
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
8688
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
8789
</xsd:sequence>
88-
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
8991
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
9092
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
9194
</xsd:complexType>
9295
</xsd:element>
9396
<xsd:element name="resheader">
@@ -109,9 +112,13 @@
109112
<value>2.0</value>
110113
</resheader>
111114
<resheader name="reader">
112-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
113116
</resheader>
114117
<resheader name="writer">
115-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116119
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="BigWIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Resources\BigWIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
117124
</root>

‎WordamentSolver/Resources/BigWIcon.ico

114 KB
Binary file not shown.

0 commit comments

Comments
 (0)