From 4b364b3f2a6e07bfcc1b006ba1828063812c9967 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 18 Jan 2018 05:04:42 +0300
Subject: [PATCH] replaced the utf gear icon with a material icon as the utf
 version is does not seem to be available on mac + preparing to make json
 stringification async...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/features/app.js        | 3 ++-
 ui (gen4)/features/config.js     | 1 +
 ui (gen4)/features/ui-widgets.js | 3 ++-
 ui (gen4)/package-lock.json      | 5 +++++
 ui (gen4)/package.json           | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ui (gen4)/features/app.js b/ui (gen4)/features/app.js
index 161414d6..ac7973e3 100755
--- a/ui (gen4)/features/app.js	
+++ b/ui (gen4)/features/app.js	
@@ -554,7 +554,8 @@ var AppButtonsActions = actions.Actions({
 		'app-buttons': {
 			//'<span/>': ['touch-controls', 'toggleSideButtons -- Toggle touch controls'],
 			// XXX not sure about this...
-			'&#9965;': ['ui-settings', [
+			//'&#9965;': ['ui-settings', [
+			'<span class="material-icons">settings</span>': ['ui-settings', [
 				'browseActions: "Interface/" -- Interface settings...',
 				'toggleSideButtons -- Toggle touch controls',
 			]],
diff --git a/ui (gen4)/features/config.js b/ui (gen4)/features/config.js
index bf38afbd..3e45117f 100755
--- a/ui (gen4)/features/config.js	
+++ b/ui (gen4)/features/config.js	
@@ -250,6 +250,7 @@ module.ConfigLocalStorage = core.ImageGridFeatures.Feature({
 // 		- app
 // 		- home
 // XXX config override location/filename to support portable apps...
+// XXX comment support in json (preferably both reading and writing...)
 
 var ConfigFS = actions.Actions({
 	config: {
diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js
index fa96406c..882b15bd 100755
--- a/ui (gen4)/features/ui-widgets.js	
+++ b/ui (gen4)/features/ui-widgets.js	
@@ -2030,7 +2030,8 @@ var ButtonsActions = actions.Actions({
 		'app-buttons': {
 			//'<span/>': ['touch-controls', 'toggleSideButtons -- Toggle touch controls'],
 			//'&#9965;': ['ui-settings', 'browseActions: "Interface/" -- Interface settings...'],
-			'&#9965;': ['ui-settings', [
+			//'&#9965;': ['ui-settings', [
+			'<span class="material-icons">settings</span>': ['ui-settings', [
 				'browseActions: "Interface/" -- Interface settings...',
 				'toggleSideButtons -- Toggle touch controls',
 			]],
diff --git a/ui (gen4)/package-lock.json b/ui (gen4)/package-lock.json
index f2325548..9b483d9f 100755
--- a/ui (gen4)/package-lock.json	
+++ b/ui (gen4)/package-lock.json	
@@ -27,6 +27,11 @@
       "version": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
       "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
     },
+    "async-json": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/async-json/-/async-json-0.0.2.tgz",
+      "integrity": "sha1-qnEn2wOejkPaxyvR+7Z7oz9WgnA="
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json
index f256b9a0..ec2a8d6b 100755
--- a/ui (gen4)/package.json	
+++ b/ui (gen4)/package.json	
@@ -19,6 +19,7 @@
   },
   "dependencies": {
     "app-module-path": "^1.0.6",
+    "async-json": "0.0.2",
     "commander": "^2.12.2",
     "exiftool": "^0.0.3",
     "fs-extra": "^4.0.3",