SudokuBoard displays index of row and column; added application icon.

kurtanr · Aug 13, 2019 · b0db2a3 · b0db2a3
1 parent a9d5e95
commit b0db2a3
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -22,3 +22,6 @@ Out of the well known [Sudoku Solving Techniques](https://sudoku9x9.com/sudoku_s
 * Naked Pair
 * Naked Triple
 * Naked Quad
+* Hidden Pair
+* Hidden Triple
+* Hidden Quad
diff --git a/SimpleSudokuSolver.UI/MainWindow.xaml b/SimpleSudokuSolver.UI/MainWindow.xaml
@@ -5,9 +5,9 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:ui="clr-namespace:SimpleSudokuSolver.UI"
         mc:Ignorable="d"
-        Title="Sudoku" Height="610" Width="550"
+        Title="Sudoku" Height="634" Width="566"
         WindowStartupLocation="CenterScreen" ResizeMode="NoResize"
-        WindowStyle="ToolWindow">
+        WindowStyle="SingleBorderWindow">
     <Window.InputBindings>
         <KeyBinding Modifiers="Control" Key="N" Command="{Binding NewGameCommand}" />
         <KeyBinding Modifiers="Control" Key="L" Command="{Binding LoadGameCommand}" />

diff --git a/SimpleSudokuSolver.UI/Properties/AssemblyInfo.cs b/SimpleSudokuSolver.UI/Properties/AssemblyInfo.cs
@@ -55,6 +55,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.6.0.0")]
-[assembly: AssemblyFileVersion("0.6.0.0")]
-[assembly: AssemblyInformationalVersion("0.6.0.0")]
+[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyFileVersion("0.7.0.0")]
+[assembly: AssemblyInformationalVersion("0.7.0.0")]
diff --git a/SimpleSudokuSolver.UI/SimpleSudokuSolver.UI.csproj b/SimpleSudokuSolver.UI/SimpleSudokuSolver.UI.csproj
@@ -34,6 +34,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -104,5 +107,8 @@
       <Name>SimpleSudokuSolver</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="icon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/SimpleSudokuSolver.UI/SudokuBoard.xaml b/SimpleSudokuSolver.UI/SudokuBoard.xaml
@@ -7,16 +7,59 @@
              mc:Ignorable="d"
              d:DesignHeight="540" d:DesignWidth="540">
     <Grid Margin="2">
-        <UniformGrid>
-            <local:SudokuBlock x:Name="block1" />
-            <local:SudokuBlock x:Name="block2" />
-            <local:SudokuBlock x:Name="block3" />
-            <local:SudokuBlock x:Name="block4" />
-            <local:SudokuBlock x:Name="block5" />
-            <local:SudokuBlock x:Name="block6" />
-            <local:SudokuBlock x:Name="block7" />
-            <local:SudokuBlock x:Name="block8" />
-            <local:SudokuBlock x:Name="block9" />
-        </UniformGrid>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="24" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="16" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Grid.Resources>
+                <Style TargetType="Label">
+                    <Setter Property="HorizontalContentAlignment" Value="Center" />
+                    <Setter Property="Margin" Value="0" />
+                    <Setter Property="VerticalContentAlignment" Value="Center" />
+                </Style>
+            </Grid.Resources>
+
+            <UniformGrid Grid.Row="0" Grid.Column="1" Columns="9" Margin="2,0,2,0">
+                <Label Content="1" />
+                <Label Content="2" />
+                <Label Content="3" Margin="0,0,4,0" />
+                <Label Content="4" Margin="4,0,0,0" />
+                <Label Content="5" />
+                <Label Content="6" Margin="0,0,4,0" />
+                <Label Content="7" Margin="4,0,0,0" />
+                <Label Content="8" />
+                <Label Content="9" />
+            </UniformGrid>
+
+            <UniformGrid Grid.Row="1" Grid.Column="0" Rows="9" Margin="0,2,0,2">
+                <Label Content="1" />
+                <Label Content="2" />
+                <Label Content="3" Margin="0,0,0,4" />
+                <Label Content="4" Margin="0,4,0,0" />
+                <Label Content="5" />
+                <Label Content="6" Margin="0,0,0,4" />
+                <Label Content="7" Margin="0,4,0,0" />
+                <Label Content="8" />
+                <Label Content="9" />
+            </UniformGrid>
+
+            <UniformGrid Grid.Row="1" Grid.Column="1" >
+                <local:SudokuBlock x:Name="block1" />
+                <local:SudokuBlock x:Name="block2" />
+                <local:SudokuBlock x:Name="block3" />
+                <local:SudokuBlock x:Name="block4" />
+                <local:SudokuBlock x:Name="block5" />
+                <local:SudokuBlock x:Name="block6" />
+                <local:SudokuBlock x:Name="block7" />
+                <local:SudokuBlock x:Name="block8" />
+                <local:SudokuBlock x:Name="block9" />
+            </UniformGrid>
+        </Grid>
     </Grid>
 </UserControl>
diff --git a/SimpleSudokuSolver.UI/icon.ico b/SimpleSudokuSolver.UI/icon.ico
diff --git a/SimpleSudokuSolver/SimpleSudokuSolver.csproj b/SimpleSudokuSolver/SimpleSudokuSolver.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Authors>Robert Kurtanjek</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/kurtanr/SimpleSudokuSolver</PackageProjectUrl>

diff --git a/images/SimpleSudokuSolver.UI.png b/images/SimpleSudokuSolver.UI.png