Small tweaks (#302)

* Small cleanups * ElectronJS tweaks: (1) It won't open debug console by default anymore. (2) It binds a shortcut to open debug console in production build, too.
mkoskim · Dec 14, 2024 · 403d4b5 · 403d4b5
1 parent 366a328
commit 403d4b5
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 32 deletions.
diff --git a/public/electron.js b/public/electron.js
@@ -71,7 +71,7 @@ async function createWindow()
   mainWindow.setMenu(null);
   //console.log("Languages:", mainWindow.webContents.session.availableSpellCheckerLanguages)
   //mainWindow.webContents.session.setSpellCheckerLanguages(['fi'])
-  mainWindow.webContents.openDevTools();
+  //mainWindow.webContents.openDevTools();
 
   if(isDev)
   {
@@ -112,7 +112,7 @@ const reduxDevToolsPath = path.join(
 const {app, session} = electron;
 
 app.whenReady().then(async () => {
-  try {
+  if(isDev) try {
     console.log("Loading extension:", reactDevToolsPath)
     await session.defaultSession.loadExtension(reactDevToolsPath)
     //session.defaultSession.loadExtension(reduxDevToolsPath)
@@ -121,6 +121,12 @@ app.whenReady().then(async () => {
   }
   createWindow();
   //globalShortcut.register('CommandOrControl+Q', () => { app.quit() });
+
+  if(!isDev) {
+    globalShortcut.register('F12', () => {
+      mainWindow.webContents.openDevTools();
+    });
+  }
 });
 
 app.on("window-all-closed", () => {

diff --git a/src/document/index.js b/src/document/index.js
@@ -8,7 +8,6 @@
 
 import {loadmawe, createmawe, buf2tree, fromXML} from "./xmljs/load"
 import {savemawe, toXML} from "./xmljs/save"
-import {asRTF, asHTML} from "./print"
 
 import {info} from "./head"
 
@@ -33,9 +32,6 @@ export const mawe = {
   },
   decodebuf, file2buf, buf2tree, fromXML,
   toXML,
-
-  // Exporting
-  asRTF, asHTML,
 }
 
 export {elemAsText, elemName, filterCtrlElems}
@@ -72,7 +68,7 @@ function create(buffer) {
 
 //-----------------------------------------------------------------------------
 
-export async function saveas(doc, filename) {
+async function saveas(doc, filename) {
   //const file = await fs.fstat(filename)
   //console.log("Saving:", doc)
   // TODO: Fill in basename + suffix
@@ -82,6 +78,6 @@ export async function saveas(doc, filename) {
   })
 }
 
-export async function save(doc) {
+async function save(doc) {
   return await savemawe(doc);
 }
diff --git a/src/document/print.js b/src/document/print.js
diff --git a/src/gui/editor/styles/editor.css → src/gui/editor/editor.css b/src/gui/editor/styles/editor.css → src/gui/editor/editor.css
diff --git a/src/gui/editor/editor.js b/src/gui/editor/editor.js
@@ -6,7 +6,7 @@
 //*****************************************************************************
 //*****************************************************************************
 
-import "./styles/editor.css"
+import "./editor.css"
 import "../common/styles/sheet.css"
 
 /* eslint-disable no-unused-vars */

diff --git a/src/gui/export/styles/export.css → src/gui/export/export.css b/src/gui/export/styles/export.css → src/gui/export/export.css
diff --git a/src/gui/export/export.js b/src/gui/export/export.js
@@ -4,7 +4,7 @@
 //
 // ****************************************************************************
 
-import "./styles/export.css"
+import "./export.css"
 import "../common/styles/sheet.css"
 
 import React, {

diff --git a/src/gui/import/styles/import.css → src/gui/import/import.css b/src/gui/import/styles/import.css → src/gui/import/import.css
diff --git a/src/gui/import/import.js b/src/gui/import/import.js
@@ -6,7 +6,7 @@
 //*****************************************************************************
 //*****************************************************************************
 
-import "./styles/import.css"
+import "./import.css"
 import "../common/styles/sheet.css"
 
 import React, {