From 251b1431cc111703f9579dc5d2c5b3d6035de01a Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Wed, 20 May 2020 17:13:33 +0200 Subject: [PATCH] Make all history nav buttons hideable and add default settings --- resources/index.html | 10 ++++----- resources/js/index.js | 29 +++++++++++++++++------- resources/js/settings.js | 26 ++++++++++++++++++++++ resources/settings.html | 13 +++++++++++ resources/style/layout.css | 2 +- resources/style/service-settings.css | 5 +++++ src/Config.js | 33 +++++++++++++++++++++++++++- src/main.js | 14 ++++++++++-- 8 files changed, 115 insertions(+), 17 deletions(-) diff --git a/resources/index.html b/resources/index.html index fe137cb..ff4d20a 100644 --- a/resources/index.html +++ b/resources/index.html @@ -18,7 +18,7 @@
diff --git a/resources/style/layout.css b/resources/style/layout.css index 40c3b9b..24f32c9 100644 --- a/resources/style/layout.css +++ b/resources/style/layout.css @@ -76,7 +76,7 @@ button:hover { } .hidden { - display: none; + display: none !important; } ::-webkit-scrollbar { diff --git a/resources/style/service-settings.css b/resources/style/service-settings.css index 362dbc4..732ea91 100644 --- a/resources/style/service-settings.css +++ b/resources/style/service-settings.css @@ -88,6 +88,11 @@ form { margin-left: 8px; } +label.form-group { + line-height: 29px; + text-align: left; +} + #buttons { grid-template-columns: repeat(2, 1fr); } diff --git a/src/Config.js b/src/Config.js index d379bcb..f8c0132 100644 --- a/src/Config.js +++ b/src/Config.js @@ -9,6 +9,15 @@ const configDir = Meta.isDevMode() ? getAppDataPath('tabs-app-dev') : getAppData const configFile = path.resolve(configDir, 'config.json'); export default class Config { + updateCheckSkip = undefined; + securityButton = true; + homeButton = false; + backButton = true; + forwardButton = false; + refreshButton = false; + + properties = []; + constructor() { // Load data from config file let data = {}; @@ -33,7 +42,13 @@ export default class Config { this.services.push(new Service('welcome', 'Welcome', 'rocket', false, 'https://github.com/ArisuOngaku/tabs', false)); } - this.updateCheckSkip = data.updateCheckSkip; + this.defineProperty('updateCheckSkip', data); + + this.defineProperty('securityButton', data); + this.defineProperty('homeButton', data); + this.defineProperty('backButton', data); + this.defineProperty('forwardButton', data); + this.defineProperty('refreshButton', data); this.save(); } @@ -44,4 +59,20 @@ export default class Config { fs.writeFileSync(configFile, JSON.stringify(this, null, 4)); console.log('> Config saved to', configFile.toString()); } + + defineProperty(name, data) { + if (data[name] !== undefined) { + this[name] = data[name]; + } + + this.properties.push(name); + } + + update(data) { + for (const prop of this.properties) { + if (data[prop] !== undefined) { + this[prop] = data[prop]; + } + } + } } \ No newline at end of file diff --git a/src/main.js b/src/main.js index 578a844..7b5572a 100644 --- a/src/main.js +++ b/src/main.js @@ -252,6 +252,7 @@ async function createWindow() { let syncListener; ipcMain.on('syncSettings', syncListener = () => { settingsWindow.webContents.send('current-version', updater.getCurrentVersion()); + settingsWindow.webContents.send('config', config); }); let checkForUpdatesListener; @@ -260,9 +261,18 @@ async function createWindow() { settingsWindow.webContents.send('updateStatus', available, version); }); }); + + let saveConfigListener; + ipcMain.on('save-config', saveConfigListener = (e, data) => { + config.update(data); + config.save(); + sendData(); + }); + settingsWindow.on('close', () => { - ipcMain.removeListener('sync-settings', syncListener); + ipcMain.removeListener('syncSettings', syncListener); ipcMain.removeListener('checkForUpdates', checkForUpdatesListener); + ipcMain.removeListener('save-config', saveConfigListener); }); settingsWindow.loadFile(path.resolve(resourcesDir, 'settings.html')) .catch(console.error); @@ -274,7 +284,7 @@ async function createWindow() { function sendData() { console.log('Syncing data'); - window.webContents.send('data', Meta.title, brandIcons, solidIcons, config.services, selectedService, path.resolve(resourcesDir, 'empty.html')); + window.webContents.send('data', Meta.title, brandIcons, solidIcons, selectedService, path.resolve(resourcesDir, 'empty.html'), config); } function setActiveService(index) {