From 63384f59eef6af2c8a5b7d9665447382401ec25b Mon Sep 17 00:00:00 2001 From: fohristiwhirl Date: Wed, 10 Oct 2018 16:31:36 +0100 Subject: [PATCH] finish prefs --- fluorine_renderer.html | 5 +++-- main.js | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/fluorine_renderer.html b/fluorine_renderer.html index ebe5d3e..db5f082 100644 --- a/fluorine_renderer.html +++ b/fluorine_renderer.html @@ -80,11 +80,12 @@ renderer.scrap_counts = null; renderer.absorbed_counts = null; + renderer.offset_x = 0; + renderer.offset_y = 0; + renderer.integer_box_sizes = false; renderer.triangles_show_next = true; renderer.grid_aesthetic = 1; - renderer.offset_x = 0; - renderer.offset_y = 0; // -------------------------------------------------------------- diff --git a/main.js b/main.js index 45d46cd..2b9b279 100644 --- a/main.js +++ b/main.js @@ -1,7 +1,9 @@ "use strict"; const alert = require("./modules/alert"); +const app = require('electron').app; const electron = require("electron"); +const fs = require("fs"); const ipcMain = require("electron").ipcMain; const path = require("path"); const windows = require("./modules/windows"); @@ -12,6 +14,28 @@ let about_message = `Fluorine: Replay viewer for Halite 3\n` + `Node ${process.versions.node}\n` + `V8 ${process.versions.v8}` +// ------------------------------------------------------- +// Read prefs. + +let prefs = Object.create(null); // First, set defaults for everything in case load fails. +prefs.integer_box_sizes = false; +prefs.triangles_show_next = true; +prefs.grid_aesthetic = 1; + +let userdata_path = app.getPath("userData"); + +try { + let filename = path.join(userdata_path, "prefs.json"); + let s = fs.readFileSync(filename, "utf8"); + let o = JSON.parse(s); + + for (let [varname, value] of Object.entries(o)) { + prefs[varname] = value; + } +} catch (err) { + // pass +} + // ------------------------------------------------------- process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true; // FIXME: this is lame. What's the correct way to prevent the console warning? @@ -221,6 +245,7 @@ function make_main_menu() { { label: "Integer box sizes", type: "checkbox", + checked: prefs.integer_box_sizes, click: (menuItem) => { if (menuItem.checked) { windows.send("renderer", "set", ["integer_box_sizes", true]); @@ -235,7 +260,7 @@ function make_main_menu() { { label: "0", type: "radio", - checked: false, + checked: prefs.grid_aesthetic === 0, click: () => { windows.send("renderer", "set", ["grid_aesthetic", 0]); } @@ -243,7 +268,7 @@ function make_main_menu() { { label: "halite / 4", type: "radio", - checked: true, + checked: prefs.grid_aesthetic === 1, click: () => { windows.send("renderer", "set", ["grid_aesthetic", 1]); } @@ -251,7 +276,7 @@ function make_main_menu() { { label: "255 * sqrt(halite / 2048)", type: "radio", - checked: false, + checked: prefs.grid_aesthetic === 2, click: () => { windows.send("renderer", "set", ["grid_aesthetic", 2]); } @@ -259,7 +284,7 @@ function make_main_menu() { { label: "255 * sqrt(halite / 1024)", type: "radio", - checked: false, + checked: prefs.grid_aesthetic === 3, click: () => { windows.send("renderer", "set", ["grid_aesthetic", 3]); } @@ -272,7 +297,7 @@ function make_main_menu() { { label: "Show next move", type: "radio", - checked: true, + checked: prefs.triangles_show_next, click: () => { windows.send("renderer", "set", ["triangles_show_next", true]); } @@ -280,7 +305,7 @@ function make_main_menu() { { label: "Show previous move", type: "radio", - checked: false, + checked: prefs.triangles_show_next === false, click: () => { windows.send("renderer", "set", ["triangles_show_next", false]); }