win7 fixes

This commit is contained in:
smartfrigde 2024-04-30 11:42:36 +02:00
parent bc9e8ec9a2
commit 0d0bc81273
4 changed files with 15 additions and 23 deletions

View file

@ -36,7 +36,7 @@
"@typescript-eslint/eslint-plugin": "^5.59.2", "@typescript-eslint/eslint-plugin": "^5.59.2",
"@typescript-eslint/parser": "^5.59.2", "@typescript-eslint/parser": "^5.59.2",
"copyfiles": "^2.4.1", "copyfiles": "^2.4.1",
"electron": "30.0.1", "electron": "22.3.27",
"electron-builder": "^24.9.1", "electron-builder": "^24.9.1",
"eslint": "^8.40.0", "eslint": "^8.40.0",
"eslint-config-dmitmel": "github:dmitmel/eslint-config-dmitmel", "eslint-config-dmitmel": "github:dmitmel/eslint-config-dmitmel",

View file

@ -43,8 +43,8 @@ importers:
specifier: ^2.4.1 specifier: ^2.4.1
version: 2.4.1 version: 2.4.1
electron: electron:
specifier: 30.0.1 specifier: 22.3.27
version: 30.0.1 version: 22.3.27
electron-builder: electron-builder:
specifier: ^24.9.1 specifier: ^24.9.1
version: 24.9.1 version: 24.9.1
@ -180,15 +180,15 @@ packages:
'@types/ms@0.7.31': '@types/ms@0.7.31':
resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==} resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
'@types/node@16.18.96':
resolution: {integrity: sha512-84iSqGXoO+Ha16j8pRZ/L90vDMKX04QTYMTfYeE1WrjWaZXuchBehGUZEpNgx7JnmlrIHdnABmpjrQjhCnNldQ==}
'@types/node@18.11.9': '@types/node@18.11.9':
resolution: {integrity: sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==} resolution: {integrity: sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==}
'@types/node@18.15.11': '@types/node@18.15.11':
resolution: {integrity: sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==} resolution: {integrity: sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==}
'@types/node@20.11.28':
resolution: {integrity: sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==}
'@types/plist@3.0.2': '@types/plist@3.0.2':
resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==} resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==}
@ -546,8 +546,8 @@ packages:
electron-publish@24.8.1: electron-publish@24.8.1:
resolution: {integrity: sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==} resolution: {integrity: sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==}
electron@30.0.1: electron@22.3.27:
resolution: {integrity: sha512-iwxkI/n2wBd29NH7TH0ZY8aWGzCoKpzJz+D10u7aGSJi1TV6d4MSM3rWyKvT/UkAHkTKOEgYfUyCa2vWQm8L0g==} resolution: {integrity: sha512-7Rht21vHqj4ZFRnKuZdFqZFsvMBCmDqmjetiMqPtF+TmTBiGne1mnstVXOA/SRGhN2Qy5gY5bznJKpiqogjM8A==}
engines: {node: '>= 12.20.55'} engines: {node: '>= 12.20.55'}
hasBin: true hasBin: true
@ -1371,9 +1371,6 @@ packages:
engines: {node: '>=4.2.0'} engines: {node: '>=4.2.0'}
hasBin: true hasBin: true
undici-types@5.26.5:
resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
universalify@0.1.2: universalify@0.1.2:
resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
engines: {node: '>= 4.0.0'} engines: {node: '>= 4.0.0'}
@ -1632,14 +1629,12 @@ snapshots:
'@types/ms@0.7.31': {} '@types/ms@0.7.31': {}
'@types/node@16.18.96': {}
'@types/node@18.11.9': {} '@types/node@18.11.9': {}
'@types/node@18.15.11': {} '@types/node@18.15.11': {}
'@types/node@20.11.28':
dependencies:
undici-types: 5.26.5
'@types/plist@3.0.2': '@types/plist@3.0.2':
dependencies: dependencies:
'@types/node': 18.15.11 '@types/node': 18.15.11
@ -2112,10 +2107,10 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
electron@30.0.1: electron@22.3.27:
dependencies: dependencies:
'@electron/get': 2.0.2 '@electron/get': 2.0.2
'@types/node': 20.11.28 '@types/node': 16.18.96
extract-zip: 2.0.1 extract-zip: 2.0.1
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -2957,8 +2952,6 @@ snapshots:
typescript@4.9.3: {} typescript@4.9.3: {}
undici-types@5.26.5: {}
universalify@0.1.2: {} universalify@0.1.2: {}
universalify@2.0.0: {} universalify@2.0.0: {}

View file

@ -1,7 +1,6 @@
import * as path from "path"; import * as path from "path";
import * as fs from "fs"; import * as fs from "fs";
import {addStyle} from "../utils"; import {addStyle} from "../utils";
import {WebviewTag} from "electron";
var webview = `<webview src="${path.join("file://", __dirname, "../", "/settings/settings.html")}" preload="${path.join( var webview = `<webview src="${path.join("file://", __dirname, "../", "/settings/settings.html")}" preload="${path.join(
"file://", "file://",
@ -18,8 +17,8 @@ export function injectSettings() {
document.addEventListener("DOMContentLoaded", function (_event) { document.addEventListener("DOMContentLoaded", function (_event) {
const settingsCssPath = path.join(__dirname, "../", "/content/css/inAppSettings.css"); const settingsCssPath = path.join(__dirname, "../", "/content/css/inAppSettings.css");
addStyle(fs.readFileSync(settingsCssPath, "utf8")); addStyle(fs.readFileSync(settingsCssPath, "utf8"));
const webview = document.querySelector("webview") as WebviewTag; const webview: any = document.querySelector("webview");
webview.addEventListener("console-message", (e) => { webview.addEventListener("console-message", (e: any) => {
console.log("Settings page logged a message:", e.message); console.log("Settings page logged a message:", e.message);
}); });
}); });

View file

@ -56,7 +56,7 @@ async function doAfterDefiningTheWindow(): Promise<void> {
mainWindow.hide(); // please don't flashbang the user mainWindow.hide(); // please don't flashbang the user
} }
if ((await getConfig("windowStyle")) == "transparency" && process.platform === "win32") { if ((await getConfig("windowStyle")) == "transparency" && process.platform === "win32") {
mainWindow.setBackgroundMaterial("mica"); //mainWindow.setBackgroundMaterial("mica");
if ((await getConfig("startMinimized")) == false) { if ((await getConfig("startMinimized")) == false) {
mainWindow.show(); mainWindow.show();
} }