From 08a561bcfdd5e75c9d815bd7bdfc59977e7eef63 Mon Sep 17 00:00:00 2001
From: futpib <futpib@gmail.com>
Date: Wed, 21 Nov 2018 18:22:28 +0300
Subject: [PATCH] Add option to hide on-screen buttons, add cards & prefs to
 menu

---
 components/cards/index.js       |  8 ++++----
 components/hot-keys/index.js    |  9 ++++++++-
 components/menu/index.js        | 15 +++++++++++++--
 components/preferences/index.js | 15 +++++++++++----
 reducers/preferences.js         |  2 ++
 renderer.js                     |  9 +++++----
 6 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/components/cards/index.js b/components/cards/index.js
index 91275ad..9a191e3 100644
--- a/components/cards/index.js
+++ b/components/cards/index.js
@@ -51,15 +51,15 @@ class Cards extends React.Component {
 				open,
 			},
 		}, open ? [
-			r.div([
+			!this.props.preferences.hideOnScreenButtons && r(React.Fragment, [
 				r(Button, {
 					style: { width: '100%' },
 					autoFocus: true,
 					onClick: toggle,
 				}, 'Close'),
-			]),
 
-			r.hr(),
+				r.hr(),
+			]),
 
 			...map(card => r(Label, {
 				title: card.name,
@@ -92,7 +92,7 @@ class Cards extends React.Component {
 				JSON.stringify(this.props, null, 2),
 			]),
 		] : [
-			r(Button, {
+			!this.props.preferences.hideOnScreenButtons && r(Button, {
 				autoFocus: true,
 				onClick: toggle,
 			}, 'Cards'),
diff --git a/components/hot-keys/index.js b/components/hot-keys/index.js
index 0a7686d..c5a3baa 100644
--- a/components/hot-keys/index.js
+++ b/components/hot-keys/index.js
@@ -85,13 +85,20 @@ class MyHotKeys extends React.Component {
 	}
 
 	render() {
+		const handlers = map(f => bind(f, this), pick(keys(keyMap), this));
 		return r(HotKeys, {
 			keyMap,
-			handlers: map(f => bind(f, this), pick(keys(keyMap), this)),
+			handlers,
 		}, this.props.children({
 			graphRef: this.graphRef,
 			cardsRef: this.cardsRef,
 			preferencesRef: this.preferencesRef,
+
+			actions: {
+				focusGraph: handlers.hotKeyFocusGraph,
+				focusCards: handlers.hotKeyFocusCards,
+				focusPreferences: handlers.hotKeyFocusPreferences,
+			},
 		}));
 	}
 }
diff --git a/components/menu/index.js b/components/menu/index.js
index 15f1529..482d919 100644
--- a/components/menu/index.js
+++ b/components/menu/index.js
@@ -16,14 +16,14 @@ const MenuProvider = ({ children, ...props }) => r(Provider, { electron }, r(Rea
 	...[].concat(children),
 ]));
 
-const WindowMenu = ({ openConnectToServerModal }) => r(WindowMenuBase, [
+const WindowMenu = props => r(WindowMenuBase, [
 	r(MenuItem, {
 		label: 'File',
 	}, [
 		r(MenuItem, {
 			label: 'Connect to server...',
 			accelerator: 'CommandOrControl+N',
-			onClick: openConnectToServerModal,
+			onClick: props.openConnectToServerModal,
 		}),
 
 		r(MenuItem.Separator),
@@ -37,6 +37,17 @@ const WindowMenu = ({ openConnectToServerModal }) => r(WindowMenuBase, [
 	r(MenuItem, {
 		label: 'View',
 	}, [
+		r(MenuItem, {
+			label: 'Cards',
+			onClick: props.focusCards,
+		}),
+		r(MenuItem, {
+			label: 'Preferences',
+			onClick: props.focusPreferences,
+		}),
+
+		r(MenuItem.Separator),
+
 		r(MenuItem, {
 			label: 'Reload',
 			role: 'reload',
diff --git a/components/preferences/index.js b/components/preferences/index.js
index 1f3964f..43d19e2 100644
--- a/components/preferences/index.js
+++ b/components/preferences/index.js
@@ -58,15 +58,15 @@ class Preferences extends React.Component {
 				open,
 			},
 		}, open ? [
-			r.div([
+			!this.props.preferences.hideOnScreenButtons && r(React.Fragment, [
 				r(Button, {
 					style: { width: '100%' },
 					autoFocus: true,
 					onClick: toggle,
 				}, 'Close'),
-			]),
 
-			r.hr(),
+				r.hr(),
+			]),
 
 			r.div([
 				r(Checkbox, {
@@ -153,6 +153,13 @@ class Preferences extends React.Component {
 
 			r.hr(),
 
+			r.div([
+				r(Checkbox, {
+					checked: this.props.preferences.hideOnScreenButtons,
+					onChange: () => this.props.actions.toggle('hideOnScreenButtons'),
+				}, 'Hide on-screen buttons'),
+			]),
+
 			r.div([
 				r(Checkbox, {
 					checked: this.props.preferences.doNotAskForConfirmations,
@@ -176,7 +183,7 @@ class Preferences extends React.Component {
 				}, 'Reset to defaults'),
 			]),
 		] : [
-			r(Button, {
+			!this.props.preferences.hideOnScreenButtons && r(Button, {
 				autoFocus: true,
 				onClick: toggle,
 			}, 'Preferences'),
diff --git a/reducers/preferences.js b/reducers/preferences.js
index 0366b14..be49b21 100644
--- a/reducers/preferences.js
+++ b/reducers/preferences.js
@@ -8,6 +8,8 @@ const { handleActions } = require('redux-actions');
 const { preferences } = require('../actions');
 
 const initialState = {
+	hideOnScreenButtons: false,
+
 	hideDisconnectedClients: true,
 	hideDisconnectedModules: true,
 	hideDisconnectedSources: false,
diff --git a/renderer.js b/renderer.js
index d934fd7..928904b 100644
--- a/renderer.js
+++ b/renderer.js
@@ -22,11 +22,12 @@ const theme = require('./utils/theme');
 const Root = () => r(ReduxProvider, {
 	store: createStore(),
 }, r(HotKeys, {
-}, ({ graphRef, cardsRef, preferencesRef }) => r(Modals, {
-}, ({ actions }) => r(MenuProvider, {
-	...actions,
+}, ({ graphRef, cardsRef, preferencesRef, actions: hotKeysActions }) => r(Modals, {
+}, ({ actions: modalsActions }) => r(MenuProvider, {
+	...modalsActions,
+	...hotKeysActions,
 }, [
-	r(Graph, { ref: graphRef, ...actions }),
+	r(Graph, { ref: graphRef, ...modalsActions }),
 	r(Cards, { ref: cardsRef }),
 	r(Preferences, { ref: preferencesRef }),
 	r(ServerInfo),