From f52665ee6dbf28cc23935d60568ea89c2eb24ab8 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Fri, 6 Oct 2017 15:08:10 +0100
Subject: [PATCH] [client+server] Add new icons to interface from openiconic,
 and send files to client byte-for-byte

---
 Nibriboard/ClientFiles/images/icons/brush.png | Bin 0 -> 656 bytes
 Nibriboard/ClientFiles/images/icons/pan.png   | Bin 0 -> 405 bytes
 Nibriboard/ClientFiles/images/icons/point.png | Bin 0 -> 546 bytes
 Nibriboard/ClientFiles/index.html             |   6 +++---
 Nibriboard/Nibriboard.csproj                  |   8 +++++++-
 Nibriboard/NibriboardApp.cs                   |   2 +-
 Nibriboard/lib/GlidingSquirrel                |   2 +-
 README.md                                     |   2 ++
 8 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 Nibriboard/ClientFiles/images/icons/brush.png
 create mode 100644 Nibriboard/ClientFiles/images/icons/pan.png
 create mode 100644 Nibriboard/ClientFiles/images/icons/point.png

diff --git a/Nibriboard/ClientFiles/images/icons/brush.png b/Nibriboard/ClientFiles/images/icons/brush.png
new file mode 100644
index 0000000000000000000000000000000000000000..f98435a2ac3766633d522eb79685a142c6f48bbe
GIT binary patch
diff --git a/Nibriboard/ClientFiles/images/icons/pan.png b/Nibriboard/ClientFiles/images/icons/pan.png
new file mode 100644
index 0000000000000000000000000000000000000000..7af8340f396097e6abeee47d90730e109374c5f6
GIT binary patch
diff --git a/Nibriboard/ClientFiles/images/icons/point.png b/Nibriboard/ClientFiles/images/icons/point.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfd6bb982eb4ec109f77e558e3caa815fde04da4
GIT binary patch
diff --git a/Nibriboard/ClientFiles/index.html b/Nibriboard/ClientFiles/index.html
index 2550563..5849064 100644
--- a/Nibriboard/ClientFiles/index.html
+++ b/Nibriboard/ClientFiles/index.html
@@ -22,9 +22,9 @@
 			</section>
 			
 			<section class="tools">
-				<span class="tool-selector" data-tool-name="brush" title="Draw lines with a brush." data-selected>&#x1f58c;</span>
-				<span class="tool-selector" data-tool-name="pan" title="Pan around the plane.">&#x1f591;</span>
-				<span class="tool-selector" data-tool-name="pointer" title="Point at things, but don't change them.">&#x2739;</span>
+				<span class="tool-selector" data-tool-name="brush" title="Draw lines with a brush." data-selected><img src="images/icons/brush.png" aria-hidden="true" /></span>
+				<span class="tool-selector" data-tool-name="pan" title="Pan around the plane."><img src="images/icons/pan.png" aria-hidden="true" /></span>
+				<span class="tool-selector" data-tool-name="pointer" title="Point at things, but don't change them."><img src="images/icons/point.png" aria-hidden="true" /></span>
 			</section>
 			
 			<hr />
diff --git a/Nibriboard/Nibriboard.csproj b/Nibriboard/Nibriboard.csproj
index d4415cc..9cbfa77 100644
--- a/Nibriboard/Nibriboard.csproj
+++ b/Nibriboard/Nibriboard.csproj
@@ -127,6 +127,9 @@
     <EmbeddedResource Include="ClientFiles\favicon.ico" />
     <EmbeddedResource Include="ClientFiles\nibriboard.svg" />
     <EmbeddedResource Include="ClientFiles\images\transparent-square-tiles.png" />
+    <EmbeddedResource Include="ClientFiles\images\icons\brush.png" />
+    <EmbeddedResource Include="ClientFiles\images\icons\pan.png" />
+    <EmbeddedResource Include="ClientFiles\images\icons\point.png" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="RippleSpace\" />
@@ -144,7 +147,10 @@
     <MonoDevelop>
       <Properties>
         <Policies>
-          <DotNetNamingPolicy ResourceNamePolicy="FileFormatDefault" DirectoryNamespaceAssociation="PrefixedHierarchical" />
+          <DotNetNamingPolicy ResourceNamePolicy="FileFormatDefault" DirectoryNamespaceAssociation="PrefixedHierarchical">
+            <inheritsSet />
+            <inheritsScope />
+          </DotNetNamingPolicy>
         </Policies>
       </Properties>
     </MonoDevelop>
diff --git a/Nibriboard/NibriboardApp.cs b/Nibriboard/NibriboardApp.cs
index efa7a0b..a1aaa82 100644
--- a/Nibriboard/NibriboardApp.cs
+++ b/Nibriboard/NibriboardApp.cs
@@ -115,7 +115,7 @@ namespace Nibriboard
 
 			response.ContentType = LookupMimeType(expandedFilePath);
 
-			string embeddedFile = EmbeddedFiles.ReadAllText(expandedFilePath);
+            byte[] embeddedFile = EmbeddedFiles.ReadAllBytes(expandedFilePath);
 
 			try
 			{
diff --git a/Nibriboard/lib/GlidingSquirrel b/Nibriboard/lib/GlidingSquirrel
index e3cfbfd..62f67e9 160000
--- a/Nibriboard/lib/GlidingSquirrel
+++ b/Nibriboard/lib/GlidingSquirrel
@@ -1 +1 @@
-Subproject commit e3cfbfdbbb4cbc5c7a8732ab51a53471cd92aff1
+Subproject commit 62f67e924c652d84956ed2bbf87588fd5ae963a9
diff --git a/README.md b/README.md
index c30a0fc..ab11dc2 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,8 @@ An infinite whiteboard for recording those big ideas.
  	 - [rollupify](https://www.npmjs.com/package/rollupify) - Adds support for es6 modules to browserify, and removes unused code from the final bundle
  - Images:
      - [Transparent Square Tiles](https://www.toptal.com/designers/subtlepatterns/transparent-square-tiles/) from [subtlepatterns.com](https://subtlepatterns.com/)
+     - Icons:
+         - [OpenIconic](https://useiconic.com/open) - brush, move -> pan, sun -> point
  - Future reference: Libraries I am considering
 	 - [Paper.js](http://paperjs.org/) - Client-side rendering
  - [IotWeb](http://sensaura.org/pages/tools/iotweb/) - Underlying HTTP / WebSocket server
