diff --git a/client/src/App.jsx b/client/src/App.jsx index 8ef8295f6..163518e89 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -1,9 +1,10 @@ -import { lazy, Suspense } from 'react'; +import { lazy, Suspense, useEffect } from 'react'; import { Route, Switch } from 'react-router-dom'; import './App.css'; import { QueryClient, QueryClientProvider } from 'react-query'; import SocketProvider from 'app/context/socketContext'; import withSocket from 'features/viewers/ViewWrapper'; +import tinykeys from 'tinykeys'; const Editor = lazy(() => import('features/editors/Editor')); const PresenterView = lazy(() => @@ -36,6 +37,22 @@ const SLowerThird = withSocket(Lower); const SPip = withSocket(Pip); function App() { + useEffect(() => { + let unsubscribe = tinykeys(window, { + 'Alt+t': () => { + // if we are in electron + if (window.process?.type === undefined) return; + if (window.process.type === 'renderer') { + // ask to see debug + window.ipcRenderer.send('set-window', 'show-dev'); + } + }, + }); + return () => { + unsubscribe(); + }; + }); + return ( diff --git a/server/assets/ontime-install.bmp b/server/assets/ontime-install.bmp new file mode 100644 index 000000000..036b7b59f Binary files /dev/null and b/server/assets/ontime-install.bmp differ diff --git a/server/assets/ontime-uninstall.bmp b/server/assets/ontime-uninstall.bmp new file mode 100644 index 000000000..670c0bdc7 Binary files /dev/null and b/server/assets/ontime-uninstall.bmp differ diff --git a/server/main.js b/server/main.js index e5f3de48b..03ce6079d 100644 --- a/server/main.js +++ b/server/main.js @@ -129,11 +129,6 @@ app.whenReady().then(() => { win.focus(); }); - globalShortcut.register('Alt+t', () => { - // Show dev tools - win.webContents.openDevTools({ mode: 'detach' }); - }); - // recreate window if no others open app.on('activate', () => { if (BrowserWindow.getAllWindows().length === 0) { @@ -245,6 +240,9 @@ ipcMain.on('set-window', (event, arg) => { } else if (arg === 'to-tray') { // window to tray win.hide(); + } else if (arg === 'show-dev') { + // Show dev tools + win.webContents.openDevTools({ mode: 'detach' }); } }); diff --git a/server/package.json b/server/package.json index 875f6d09a..5c5b3e86a 100644 --- a/server/package.json +++ b/server/package.json @@ -54,7 +54,9 @@ "createStartMenuShortcut": true, "deleteAppDataOnUninstall": true, "runAfterFinish": false, - "installerIcon": "icon.ico" + "installerIcon": "icon.ico", + "installerSidebar": "ontime-install.bmp", + "uninstallerSidebar": "ontime-uninstall.bmp" }, "files": [ "**/*",