Skip to content

Commit

Permalink
bump electron (#1647)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kim Neunert authored Apr 27, 2022
1 parent c664e8a commit 7385f03
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 26 deletions.
8 changes: 2 additions & 6 deletions pyinstaller/electron/error_logs.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<link rel="stylesheet" type="text/css" href="./styles.css">
<body style="overflow: auto; height: 100%;">
<div class="card" style="width:90%; max-width: 1000px;">
<div class="card" style="width:90%">
This window shows you the last 700 lines Logs of the specterApp. This also includes
the Logs of specterd which are marked as such. It might give you hints on why specter is not coming up properly.
The best approach is to scroll to the bottom and then search upwards for errors.
Expand All @@ -16,11 +16,7 @@
const helpers = require('./helpers')
helpers.getSpecterAppLogs( (lines) => {
document.getElementById('specterapp-logs').innerText = lines
})




})

</script>
</body>
Expand Down
13 changes: 9 additions & 4 deletions pyinstaller/electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -481,13 +481,16 @@ function setMainMenu() {
}


function openNewWindow(htmlContentFile) {
function openNewWindow(htmlContentFile, width, height) {
if (! width) {width=700}
if (! height) {height=750}
prefWindow = new BrowserWindow({
width: 700,
height: 750,
width: width,
height: height,
autoHideMenuBar: true,
webPreferences: {
nodeIntegration: true,
contextIsolation: false, // acceptable as this is not the mainwindow. No remote content!
enableRemoteModule: true,

}
Expand All @@ -506,7 +509,9 @@ function openPreferences() {
}

function openErrorLog() {
openNewWindow("error_logs.html")
width = parseInt(dimensions.width * 0.7),
height = parseInt(dimensions.height * 0.7)
openNewWindow("error_logs.html", width, height)
}

function showError(error) {
Expand Down
33 changes: 18 additions & 15 deletions pyinstaller/electron/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyinstaller/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"author": "Specter",
"license": "MIT",
"devDependencies": {
"electron": "^11.5.0",
"electron": "^13.6.9",
"electron-builder": "^22.9.1"
},
"build": {
Expand Down

0 comments on commit 7385f03

Please sign in to comment.