TheDesk Usamin (18.6.0) - fix
This commit is contained in:
@@ -24,9 +24,8 @@ function dl(mainWindow, lang_path, base, dirname) {
|
||||
width: 600,
|
||||
height: 400,
|
||||
"transparent": false, // ウィンドウの背景を透過
|
||||
"frame": true, // 枠の無いウィンドウ
|
||||
"resizable": true,
|
||||
"modal": true
|
||||
"frame": false, // 枠の無いウィンドウ
|
||||
"resizable": false
|
||||
});
|
||||
var lang = fs.readFileSync(lang_path, 'utf8');
|
||||
updatewin.loadURL(base + lang + '/update.html');
|
||||
|
@@ -65,6 +65,28 @@ function templete(lang, mainWindow, packaged, dir) {
|
||||
"en": "Close"
|
||||
}
|
||||
}
|
||||
if(packaged){
|
||||
var ifDev = [
|
||||
{
|
||||
label: dict.reload[lang],
|
||||
accelerator: 'CmdOrCtrl+R',
|
||||
click: function () { mainWindow.reload(); }
|
||||
}
|
||||
]
|
||||
}else{
|
||||
var ifDev = [
|
||||
{
|
||||
label: 'Toggle Developer Tools',
|
||||
accelerator: 'Alt+Command+I',
|
||||
click: function () { if (!packaged) { mainWindow.toggleDevTools(); } }
|
||||
},
|
||||
{
|
||||
label: dict.reload[lang],
|
||||
accelerator: 'CmdOrCtrl+R',
|
||||
click: function () { mainWindow.reload(); }
|
||||
}
|
||||
]
|
||||
}
|
||||
const menu = [{
|
||||
label: dict.application[lang],
|
||||
submenu: [
|
||||
@@ -103,18 +125,7 @@ function templete(lang, mainWindow, packaged, dir) {
|
||||
]
|
||||
}, {
|
||||
label: dict.view[lang],
|
||||
submenu: [
|
||||
{
|
||||
label: 'Toggle Developer Tools',
|
||||
accelerator: 'Alt+Command+I',
|
||||
click: function () { if (!packaged) { mainWindow.toggleDevTools(); } }
|
||||
},
|
||||
{
|
||||
label: dict.reload[lang],
|
||||
accelerator: 'CmdOrCtrl+R',
|
||||
click: function () { mainWindow.reload(); }
|
||||
}
|
||||
]
|
||||
submenu: ifDev
|
||||
},
|
||||
{
|
||||
label: dict.window[lang],
|
||||
|
@@ -42,7 +42,7 @@ function system(mainWindow, dir, lang, dirname) {
|
||||
});
|
||||
//プラットフォーム
|
||||
ipc.on('getPlatform', function (e, arg) {
|
||||
e.sender.webContents.send('platform', [process.platform, process.arch]);
|
||||
e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron]);
|
||||
})
|
||||
//言語
|
||||
ipc.on('lang', function (e, arg) {
|
||||
@@ -137,30 +137,23 @@ function system(mainWindow, dir, lang, dirname) {
|
||||
})
|
||||
|
||||
ipc.on('quit', (e, args) => {
|
||||
|
||||
app.quit();
|
||||
});
|
||||
ipc.on('about', (e, args) => {
|
||||
|
||||
about();
|
||||
});
|
||||
ipc.on('aboutData', (e, args) => {
|
||||
e.sender.webContents.send('aboutDataRender', [process.version, process.versions.chrome, process.versions.electron]);
|
||||
});
|
||||
function about() {
|
||||
var ver = app.getVersion()
|
||||
var window = new BrowserWindow({
|
||||
webPreferences: {
|
||||
webviewTag: false,
|
||||
nodeIntegration: false,
|
||||
contextIsolation: false,
|
||||
preload: join(dirname,"js", "platform", "preload.js")
|
||||
nodeIntegration: false
|
||||
},
|
||||
width: 300,
|
||||
height: 480,
|
||||
"transparent": false, // ウィンドウの背景を透過
|
||||
"frame": true, // 枠の無いウィンドウ
|
||||
"resizable": true
|
||||
"frame": false, // 枠の無いウィンドウ
|
||||
"resizable": false
|
||||
});
|
||||
window.loadURL(dir + '/about.html?ver=' + ver);
|
||||
return "true"
|
||||
|
Reference in New Issue
Block a user