Main developer(author): Cutls P
@@ -114,6 +126,7 @@ var ver = m[1]; $("#ver").text(ver); } + $("#hash").html('' + about[3].slice(0, 7) + ''); $(document).on('click', 'a', e => { var url = $(e.target).attr('href'); postMessage(["openUrl", url], "*") diff --git a/app/css/tl.css b/app/css/tl.css index d0fbe093..82db5723 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -47,6 +47,10 @@ #bottom .leftside { display: flex; } +#tips{ + display: flex; + align-items: center; +} #bottom #tips img { vertical-align: -3px; } diff --git a/app/js/platform/preload.js b/app/js/platform/preload.js index cd4becb2..aea35298 100644 --- a/app/js/platform/preload.js +++ b/app/js/platform/preload.js @@ -2,6 +2,7 @@ var electron = require("electron"); const shell = electron.shell; var ipc = electron.ipcRenderer; onmessage = function (e) { + console.log(e) if (e.data[0] == "openUrl") { urls = e.data[1].match(/https?:\/\/(.+)/); if (urls) { diff --git a/app/js/ui/tips.js b/app/js/ui/tips.js index 9167f59b..4318a0f8 100644 --- a/app/js/ui/tips.js +++ b/app/js/ui/tips.js @@ -25,7 +25,7 @@ function tips(mode) { clearInterval(spotStart); if (mode == "ver") { tipsToggle() - $("#tips-text").html('
TheDesk ' + localStorage.getItem("ver") + '[supervisor_account1+]')
+ $("#tips-text").html('TheDesk ' + localStorage.getItem("ver") + ' {'+ gitHash.slice(0, 7) +'} [supervisor_account1+]')
localStorage.setItem("tips", "ver")
} else if (mode == "clock") {
tipsToggle()
diff --git a/app/main.js b/app/main.js
index 4ee004bf..ed1aabbd 100644
--- a/app/main.js
+++ b/app/main.js
@@ -202,7 +202,7 @@ function createWindow() {
var platform = process.platform;
var bit = process.arch;
- Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir)));
+ Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname)));
//CSS
css.css(mainWindow);
//アップデータとダウンロード
diff --git a/app/main/dl.js b/app/main/dl.js
index 2bc3cfee..95bd49f9 100644
--- a/app/main/dl.js
+++ b/app/main/dl.js
@@ -26,11 +26,9 @@ function dl(mainWindow, lang_path, base, dirname) {
"transparent": false, // ウィンドウの背景を透過
"frame": false, // 枠の無いウィンドウ
"resizable": false
- });
- //updatewin.openDevTools()
+ })
var lang = fs.readFileSync(lang_path, 'utf8');
updatewin.loadURL(base + lang + '/update.html');
-
return "true"
} else {
return false;
diff --git a/app/main/language.js b/app/main/language.js
index 6c86269b..07ef568c 100644
--- a/app/main/language.js
+++ b/app/main/language.js
@@ -1,11 +1,12 @@
// Create the Application's main menu
-function templete(lang, mainWindow, packaged, dir) {
+function templete(lang, mainWindow, packaged, dir, dirname) {
if(lang !="ja" && lang != "en"){
lang = "en"
}
const electron = require("electron");
const app = electron.app;
const BrowserWindow = electron.BrowserWindow;
+ const join = require('path').join;
const dict = {
"application": {
"ja": "アプリケーション",
@@ -101,9 +102,9 @@ function templete(lang, mainWindow, packaged, dir) {
webviewTag: false,
nodeIntegration: false,
contextIsolation: true,
- preload: "../js/platform/preload.js"
+ preload: join(dirname , "js", "platform", "preload.js")
},
- width: 300, height: 460,
+ width: 300, height: 500,
"transparent": false, // ウィンドウの背景を透過
"frame": false, // 枠の無いウィンドウ
"resizable": false
diff --git a/app/main/system.js b/app/main/system.js
index 6caa38b1..c1c8ffb7 100644
--- a/app/main/system.js
+++ b/app/main/system.js
@@ -130,10 +130,12 @@ function system(mainWindow, dir, lang, dirname) {
var window = new BrowserWindow({
webPreferences: {
webviewTag: false,
- nodeIntegration: false
+ nodeIntegration: false,
+ contextIsolation: true,
+ preload: join(dirname, "js", "platform", "preload.js")
},
width: 300,
- height: 480,
+ height: 500,
"transparent": false, // ウィンドウの背景を透過
"frame": false, // 枠の無いウィンドウ
"resizable": false
@@ -156,7 +158,7 @@ function system(mainWindow, dir, lang, dirname) {
webviewTag: false,
nodeIntegration: false,
contextIsolation: true,
- preload: join(dirname,"js", "platform", "preload.js")
+ preload: join(dirname, "js", "platform", "preload.js")
},
width: 350,
height: 200,
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index 4c48af3e..32dcf917 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -992,10 +992,10 @@
Developer: Cutls@cutls.com
