Skip to content

Commit

Permalink
Merge pull request #58 from amorist/feat-set-hitokoto-interval-time
Browse files Browse the repository at this point in the history
fIxed
  • Loading branch information
amorist committed Mar 22, 2020
2 parents 081a746 + f551fbd commit 370b898
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
5 changes: 3 additions & 2 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ function createWindow() {
x: width - MAIN_WIDTH,
y: height - MAIN_HEIGHT,
webPreferences: {
devTools: app.isPackaged ? false : true,
nodeIntegration: true,
nodeIntegrationInWorker: true
}
});
mainWindow.on("closed", () => (mainWindow = null));
mainWindow.loadFile("index.html");
mainWindow.loadFile(path.join(__dirname, 'index.html'));
mainWindow.once("ready-to-show", () => {
mainWindow.show();
mainWindow.setTouchBar(touchBar);
Expand Down Expand Up @@ -98,7 +99,7 @@ ipcMain.on("show-setting-window", () => {
},
show: false
});
settingWindow.loadFile("setting.html");
settingWindow.loadFile(path.join(__dirname, 'setting.html'));
settingWindow.show();
});

Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"files": [
"assets/",
"index.html",
"setting.html",
"main.js",
"node_modules/",
"package.json"
Expand All @@ -57,10 +58,10 @@
"license": "MIT",
"devDependencies": {
"electron": "^8.1.1",
"electron-builder": "^22.4.1",
"electron-store": "^5.1.1"
"electron-builder": "^22.4.1"
},
"dependencies": {
"dark-mode": "^3.0.0"
"dark-mode": "^3.0.0",
"electron-store": "^5.1.1"
}
}

0 comments on commit 370b898

Please sign in to comment.