More changes

Author: hovancik

app/contributor-preferences-preload.mjs

@@ -0,0 +1,15 @@
+import { ipcRenderer, contextBridge } from 'electron'
+
+contextBridge.exposeInMainWorld('settings', {
+  currentSettings: async () => {
+    return await ipcRenderer.invoke('current-settings')
+  },
+  saveSettings: async (key, value) => {
+    ipcRenderer.send('save-setting', key, value)
+  }
+})
+
+contextBridge.exposeInMainWorld('i18next', {
+  t: (key, options) => ipcRenderer.invoke('i18next-translate', key, options),
+  dir: () => ipcRenderer.invoke('i18next-dir')
+})

app/contributor-preferences-renderer.js

@@ -0,0 +1,77 @@
+import HtmlTranslate from './utils/htmlTranslate.js'
+import { setSameWidths } from './utils/sameWidths.js'
+import './platform.js'
+
+let eventsAttached = false
+
+window.onload = async (event) => {
+  const settings = await window.settings.currentSettings()
+  new HtmlTranslate(document).translate()
+
+  setTimeout(() => { eventsAttached = true }, 500)
+
+  document.ondragover = event =>
+    event.preventDefault()
+
+  document.ondrop = event =>
+    event.preventDefault()
+
+  document.querySelectorAll('input[type="checkbox"]').forEach(checkbox => {
+    const isNegative = checkbox.classList.contains('negative')
+    checkbox.checked = isNegative ? !settings[checkbox.value] : settings[checkbox.value]
+    if (!eventsAttached) {
+      checkbox.onchange = (event) =>
+        window.settings.saveSettings(checkbox.value,
+          isNegative ? !checkbox.checked : checkbox.checked)
+    }
+  })
+
+  document.querySelectorAll('input[type="radio"]').forEach(radio => {
+    let value
+    switch (radio.value) {
+      case 'true':
+        value = true
+        break
+      case 'false':
+        value = false
+        break
+      default:
+        value = radio.value
+    }
+    radio.checked = settings[radio.name] === value
+    if (!eventsAttached) {
+      radio.onchange = (event) => {
+        window.settings.saveSettings(radio.name, value)
+      }
+    }
+  })
+
+  document.querySelectorAll('select').forEach(select => {
+    select.value = settings[select.name]
+    if (!eventsAttached) {
+      select.onchange = (event) => {
+        window.settings.saveSettings(select.name, select.value)
+      }
+    }
+  })
+
+  document.querySelectorAll('input[type="range"]').forEach(async range => {
+    const divisor = range.dataset.divisor
+    const output = range.closest('div').querySelector('output')
+    range.value = settings[range.name] / divisor
+    const unit = output.dataset.unit
+    output.innerHTML = await window.i18next.t(`utils.${unit}`, { count: parseInt(range.value) })
+    if (!eventsAttached) {
+      range.onchange = async event => {
+        output.innerHTML = await window.i18next.t(`utils.${unit}`, { count: parseInt(range.value) })
+        window.settings.saveSettings(range.name, range.value * divisor)
+      }
+      range.oninput = async event => {
+        output.innerHTML = await window.i18next.t(`utils.${unit}`, { count: parseInt(range.value) })
+      }
+    }
+  })
+
+  new HtmlTranslate(document).translate()
+  setSameWidths()
+}

app/contributor-preferences.html

@@ -493,4 +493,5 @@
       </div>
     </div>
   </body>
+  <script type="module" src="./contributor-preferences-renderer.js"></script>
 </html>

app/contributor-preferences.js

@@ -1,5 +1,4 @@
 import { ipcRenderer, shell, contextBridge } from 'electron'
-import remote from '@electron/remote'
 
 contextBridge.exposeInMainWorld('ElectronBridge', {
   // helloWorld: () {
@@ -8,7 +7,7 @@ contextBridge.exposeInMainWorld('ElectronBridge', {
 
   showContributorPreferences: () => {
     ipcRenderer.send('open-contributor-preferences')
-    remote.getCurrentWindow().close()
+    ipcRenderer.send('close-current-window')
   },
 
   setContributor: () => {
@@ -20,7 +19,7 @@ contextBridge.exposeInMainWorld('ElectronBridge', {
   },
 
   stretchlyVersion: () => {
-    return remote.app.getVersion()
+    return ipcRenderer.invoke('get-version')
   },
 
   currentSettings: async () => {

app/electron-bridge.js app/electron-bridge.mjsapp/electron-bridge.js renamed to app/electron-bridge.mjs

@@ -2,5 +2,9 @@ import { contextBridge } from 'electron'
 
 contextBridge.exposeInMainWorld('process', {
   platform: () => process.platform,
-  windowsStore: () => process.windowsStore
+  node: () => process.versions.node,
+  chrome: () => process.versions.chrome,
+  electron: () => process.versions.electron,
+  windowsStore: () => process.versions.windowsStore,
+  getSystemVersion: () => process.getSystemVersion()
 })