Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TheDesk Usamin (18.6.0)

Browse Source
This commit is contained in:
Cutls 2019-06-15 23:07:18 +09:00
parent a5f8e34ee6
commit 334fbdab3f
22 changed files with 171 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/css/master.css
View File

@ -50,6 +50,7 @@ option {
max-height: 100vh; max-height: 100vh;
position: fixed; position: fixed;
z-index: 9; z-index: 9;
top: 0 !important;
} }
#videomodal, #videomodal,
#tootmodal { #tootmodal {

3
app/css/post.css
View File

@ -12,6 +12,9 @@
padding: 5px; padding: 5px;
border-radius: 5px; border-radius: 5px;
} }
textarea{
min-height: 100px !important;
}
.cancel { .cancel {
font-size: 0.5rem; font-size: 0.5rem;

47
app/js/platform/end.js
View File

@ -120,3 +120,50 @@ function playSound() {
volumeControl.gain.value = 0.8 volumeControl.gain.value = 0.8
source.start(0); source.start(0);
} }
onmessage = function (e) {
if (e.data[0] == "details") {
details(e.data[1][0], e.data[1][1])
} else if (e.data[0] == "udg") {
udg(e.data[1][0], e.data[1][1])
} else if (e.data[0] == "media") {
media(e.data[1][0], e.data[1][1], e.data[1][2])
} else if (e.data[0] == "post") {
post("pass")
} else if (e.data[0] == "toastSaved") {
M.toast({ html: lang.lang_img_DLDone + e.data[1][0] + '<button class="btn-flat toast-action" onclick="openFinder(\'' + e.data[1][1] + '\')">Show</button>', displayLength: 5000 })
} else if (e.data[0] == "toastMute") {
M.toast({ html: escapeHTML(e.data[1]) + lang.lang_parse_mute, displayLength: 2000 })
} else if (e.data[0] == "toastEmp") {
M.toast({ html: escapeHTML(e.data[1]) + lang.lang_status_emphas, displayLength: 2000 })
} else if (e.data[0] == "toastUnEmp") {
M.toast({ html: escapeHTML(e.data[1]) + lang.lang_status_unemphas, displayLength: 2000 })
} else if (e.data[0] == "parseColumn") {
parseColumn()
} else if (e.data[0] == "sortload") {
sortload()
} else if (e.data[0] == "exportSettingsCore") {
exportSettingsCore()
} else if (e.data[0] == "fontList") {
fontList(e.data[1])
} else if (e.data[0] == "customSoundSave") {
customSoundSave(e.data[1][0], e.data[1][1])
} else if (e.data[0] == "ctLoadCore") {
ctLoadCore(e.data[1])
} else if (e.data[0] == "ctLoad") {
ctLoad()
} else if (e.data[0] == "customConnect") {
customConnect(e.data[1])
} else if (e.data[0] == "clearCustomImport") {
clearCustomImport()
} else if (e.data[0] == "npCore") {
npCore(e.data[1]);
} else if (e.data[0] == "renderMem") {
renderMem(e.data[1][0], e.data[1][1], e.data[1][2])
} else if (e.data[0] == "updateProg") {
updateProg(e.data[1]);
} else if (e.data[0] == "updateMess") {
updateMess(e.data[1]);
} else if (e.data[0] == "renderAbout") {
renderAbout(e.data[1]);
}
}

74
app/js/platform/preload.js
View File

@ -16,6 +16,7 @@ onmessage = function (e) {
} else if (e.data[0] == "dialogCW") { } else if (e.data[0] == "dialogCW") {
ipc.send("dialogCW", e.data[1]) ipc.send("dialogCW", e.data[1])
} else if (e.data[0] == "nativeNotf") { } else if (e.data[0] == "nativeNotf") {
console.log(e.data[1])
ipc.send('native-notf', e.data[1]); ipc.send('native-notf', e.data[1]);
} else if (e.data[0] == "dialogClient") { } else if (e.data[0] == "dialogClient") {
ipc.send("dialogClient", e.data[1]) ipc.send("dialogClient", e.data[1])
@ -42,7 +43,8 @@ onmessage = function (e) {
} else if (e.data[0] == "ha") { } else if (e.data[0] == "ha") {
ipc.send('ha', had); ipc.send('ha', had);
} else if (e.data[0] == "itunes") { } else if (e.data[0] == "itunes") {
if (ipc.listenerCount('itunes-np') > 0) { console.log("NowPlaying" + ipc.listenerCount('itunes-np'))
if (ipc.listenerCount('itunes-np') > 1) {
return false; return false;
} else { } else {
ipc.send("itunes", e.data[1]) ipc.send("itunes", e.data[1])
@ -55,8 +57,9 @@ onmessage = function (e) {
} }
//version.js //version.js
ipc.send("getPlatform", "") ipc.send("getPlatform", "")
ipc.on('platform', function (event, arg) { ipc.on('platform', function (event, args) {
localStorage.setItem("platform", arg) localStorage.setItem("platform", args[0])
localStorage.setItem("bit", args[1])
}) })
ipc.on('winstore', function (event, arg) { ipc.on('winstore', function (event, arg) {
localStorage.setItem("winstore", arg) localStorage.setItem("winstore", arg)
@ -65,22 +68,12 @@ ipc.on('winstore', function (event, arg) {
ipc.on('reload', function (event, arg) { ipc.on('reload', function (event, arg) {
location.reload(); location.reload();
}) })
ipc.on('mess', function (event, arg) {
if (arg == "unzip") {
if (lang == "ja") {
$("body").text("アップデートを展開中です。");
} else {
$("body").text("Unzipping...");
}
}
})
//Native Notf //Native Notf
ipc.on('shownotf', function (event, args) { ipc.on('shownotf', function (event, args) {
if (args["type"] == "toot") { if (args["type"] == "toot") {
details(id, acct_id) postMessage(["details", [id, acct_id]], "*")
} else if (args["type"] == "userdata") { } else if (args["type"] == "userdata") {
udg(user, acct_id) postMessage(["udg", [user, acct_id]], "*")
} }
}) })
function nano() { function nano() {
@ -107,7 +100,7 @@ ipc.on('theme-css-response', function (event, arg) {
}) })
//img.js //img.js
ipc.on('bmp-img-comp', function (event, b64) { ipc.on('bmp-img-comp', function (event, b64) {
media(b64[0], "image/png", b64[1]); postMessage(["media", [b64[0], "image/png", b64[1]]], "*")
}); });
//post.js //post.js
ipc.on('dialogCWRender', function (event, arg) { ipc.on('dialogCWRender', function (event, arg) {
@ -116,9 +109,9 @@ ipc.on('dialogCWRender', function (event, arg) {
$("#cw").addClass("yellow-text"); $("#cw").addClass("yellow-text");
$("#cw").addClass("cw-avail"); $("#cw").addClass("cw-avail");
$("#cw-text").val(plus); $("#cw-text").val(plus);
post("pass"); postMessage(["post", ""], "*")
} else if (arg === 2) { } else if (arg === 2) {
post("pass"); postMessage(["post", ""], "*")
} }
}); });
//parse.js //parse.js
@ -129,7 +122,7 @@ ipc.on('dialogClientRender', function (event, arg) {
if (!obj) { if (!obj) {
var obj = []; var obj = [];
obj.push(name); obj.push(name);
M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 }) postMessage(["toastEmp", name], "*")
} else { } else {
var can; var can;
Object.keys(obj).forEach(function (key) { Object.keys(obj).forEach(function (key) {
@ -139,12 +132,12 @@ ipc.on('dialogClientRender', function (event, arg) {
} else { } else {
can = true; can = true;
obj.splice(key, 1); obj.splice(key, 1);
M.toast({ html: escapeHTML(name) + lang.lang_status_unemphas, displayLength: 2000 }) postMessage(["toastUnEmp", name], "*")
} }
}); });
if (!can) { if (!can) {
obj.push(name); obj.push(name);
M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 }) postMessage(["toastEmp", name], "*")
} else { } else {
} }
@ -160,7 +153,7 @@ ipc.on('dialogClientRender', function (event, arg) {
obj.push(name); obj.push(name);
var json = JSON.stringify(obj); var json = JSON.stringify(obj);
localStorage.setItem("client_mute", json); localStorage.setItem("client_mute", json);
M.toast({ html: escapeHTML(name) + lang.lang_parse_mute, displayLength: 2000 }) postMessage(["toastMute", name], "*")
} else { } else {
return; return;
} }
@ -172,11 +165,14 @@ ipc.on('general-dl-prog', function (event, arg) {
}) })
ipc.on('general-dl-message', function (event, arg) { ipc.on('general-dl-message', function (event, arg) {
var argC = arg.replace(/\\/g, "\\\\") + "\\\\."; var argC = arg.replace(/\\/g, "\\\\") + "\\\\.";
M.toast({ html: lang.lang_img_DLDone + arg + '<button class="btn-flat toast-action" onclick="openFinder(\'' + argC + '\')">Show</button>', displayLength: 5000 }) console.log("saved")
postMessage(["toastSaved", [arg, argC]], "*")
}) })
//layout.js //layout.js
ipc.on('column-del-reply', function (event, args) { ipc.on('column-del-reply', function (event, args) {
if (args[0] === 1) { if (args[0] === 1) {
var multi = localStorage.getItem("column");
var obj = JSON.parse(multi);
localStorage.removeItem("card_" + args[1]); localStorage.removeItem("card_" + args[1]);
obj.splice(args[1], 1); obj.splice(args[1], 1);
for (var i = 0; i < obj.length; i++) { for (var i = 0; i < obj.length; i++) {
@ -185,8 +181,8 @@ ipc.on('column-del-reply', function (event, args) {
} }
var json = JSON.stringify(obj); var json = JSON.stringify(obj);
localStorage.setItem("column", json); localStorage.setItem("column", json);
parseColumn(); postMessage(["parseColumn", ""], "*")
sortload() postMessage(["sortload", ""], "*")
} }
}) })
//setting.js //setting.js
@ -201,54 +197,54 @@ ipc.on('exportSettingsFile', function (event, savedFiles) {
//lang //lang
}); });
ipc.on('config', function (event, arg) { ipc.on('config', function (event, arg) {
importSettingsCore(arg) postMessage(["importSettingsCore", arg], "*")
}); });
ipc.on('savefolder', function (event, arg) { ipc.on('savefolder', function (event, arg) {
localStorage.setItem("savefolder", arg); localStorage.setItem("savefolder", arg);
}); });
ipc.on('font-list', function (event, arg) { ipc.on('font-list', function (event, arg) {
fontList(arg) postMessage(["fontList", arg], "*")
}); });
ipc.on('customSoundRender', function (event, args) { ipc.on('customSoundRender', function (event, args) {
customSoundSave(args[0], args[1]) postMessage(["customSoundSave", [args[0], args[1]]], "*")
}); });
ipc.on('theme-json-list-response', function (event, args) { ipc.on('theme-json-list-response', function (event, args) {
ctLoadCore(args) postMessage(["ctLoadCore", args], "*")
}); });
ipc.on('theme-json-delete-complete', function (event, args) { ipc.on('theme-json-delete-complete', function (event, args) {
ctLoad() postMessage(["ctLoad", ""], "*")
}); });
ipc.on('theme-json-response', function (event, args) { ipc.on('theme-json-response', function (event, args) {
customConnect(args) postMessage(["customConnect", args], "*")
}); });
ipc.on('theme-json-create-complete', function (event, args) { ipc.on('theme-json-create-complete', function (event, args) {
clearCustomImport() postMessage(["clearCustomImport", ""], "*")
ctLoad() postMessage(["ctLoad", ""], "*")
}); });
//spotify.js //spotify.js
ipc.once('itunes-np', function (event, arg) { ipc.once('itunes-np', function (event, arg) {
npCore(arg) postMessage(["npCore", arg], "*")
}) })
//tips.js //tips.js
ipc.on('memory', function (event, arg) { ipc.on('memory', function (event, arg) {
var use = arg[0]; var use = arg[0];
var cpu = arg[1]; var cpu = arg[1];
var total = arg[2] var total = arg[2]
renderMem(use, cpu, total) postMessage(["renderMem", [use, cpu, total]], "*")
}) })
//update.html //update.html
ipc.on('prog', function (event, arg) { ipc.on('prog', function (event, arg) {
updateProg(arg) postMessage(["updateProg", arg], "*")
}) })
ipc.on('mess', function (event, arg) { ipc.on('mess', function (event, arg) {
updateMess(arg) postMessage(["updateMess", arg], "*")
}) })
//about.html //about.html
ipc.on('aboutDataRender', function (event, arg) { ipc.on('aboutDataRender', function (event, arg) {
renderAbout(arg) postMessage(["renderAbout", arg], "*")
}) })
var webviewDom = document.getElementById('webview'); var webviewDom = document.getElementById('webview');
if(webviewDom){ if (webviewDom) {
webviewDom.addEventListener('new-window', function (e) { webviewDom.addEventListener('new-window', function (e) {
shell.openExternal(e.url); shell.openExternal(e.url);
}); });

2
app/js/tl/parse.js
View File

@ -712,7 +712,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} }
if (toot.pinned) { if (toot.pinned) {
var if_pin = "blue-text"; var if_pin = "blue-text";
var pin_app = "pinned"; var pin_app = "pinnedToot";
} else { } else {
var if_pin = ""; var if_pin = "";
var pin_app = ""; var pin_app = "";

2
app/js/ui/layout.js
View File

@ -364,8 +364,6 @@ function addselCk() {
function removeColumn(tlid) { function removeColumn(tlid) {
$("#sort-box").addClass("hide"); $("#sort-box").addClass("hide");
$("#sort-box").removeClass("show"); $("#sort-box").removeClass("show");
var multi = localStorage.getItem("column");
var obj = JSON.parse(multi);
//聞く //聞く
postMessage(["columnDel", tlid], "*") postMessage(["columnDel", tlid], "*")
} }

14
app/main/dl.js
View File

@ -19,13 +19,13 @@ function dl(mainWindow, lang_path, base, dirname) {
webviewTag: false, webviewTag: false,
nodeIntegration: false, nodeIntegration: false,
contextIsolation: true, contextIsolation: true,
preload: "../js/platform/preload.js" preload: join(dirname,"js", "platform", "preload.js")
}, },
width: 600, width: 600,
height: 400, height: 400,
"transparent": false, // ウィンドウの背景を透過 "transparent": false, // ウィンドウの背景を透過
"frame": false, // 枠の無いウィンドウ "frame": true, // 枠の無いウィンドウ
"resizable": false, "resizable": true,
"modal": true "modal": true
}); });
var lang = fs.readFileSync(lang_path, 'utf8'); var lang = fs.readFileSync(lang_path, 'utf8');
@ -44,7 +44,7 @@ function dl(mainWindow, lang_path, base, dirname) {
const opts = { const opts = {
directory: dir, directory: dir,
openFolderWhenDone: true, openFolderWhenDone: true,
onProgress: function (e) { onProgress: function (event) {
e.sender.webContents.send('prog', e); e.sender.webContents.send('prog', e);
}, },
saveAs: false saveAs: false
@ -91,7 +91,7 @@ function dl(mainWindow, lang_path, base, dirname) {
} }
ipc.on('general-dl', (e, args) => { ipc.on('general-dl', (event, args) => {
var name = ""; var name = "";
var platform = process.platform; var platform = process.platform;
@ -110,14 +110,14 @@ function dl(mainWindow, lang_path, base, dirname) {
filename: name, filename: name,
openFolderWhenDone: false, openFolderWhenDone: false,
onProgress: function (e) { onProgress: function (e) {
e.sender.webContents.send('general-dl-prog', e); event.sender.webContents.send('general-dl-prog', e);
}, },
saveAs: false saveAs: false
}; };
download(BrowserWindow.getFocusedWindow(), download(BrowserWindow.getFocusedWindow(),
args[0], opts) args[0], opts)
.then(dl => { .then(dl => {
e.sender.webContents.send('general-dl-message', dir); event.sender.webContents.send('general-dl-message', dir);
}) })
.catch(console.error); .catch(console.error);
}); });

7
app/main/system.js
View File

@ -42,7 +42,7 @@ function system(mainWindow, dir, lang, dirname) {
}); });
//プラットフォーム //プラットフォーム
ipc.on('getPlatform', function (e, arg) { ipc.on('getPlatform', function (e, arg) {
e.sender.webContents.send('platform', process.platform); e.sender.webContents.send('platform', [process.platform, process.arch]);
}) })
//言語 //言語
ipc.on('lang', function (e, arg) { ipc.on('lang', function (e, arg) {
@ -120,7 +120,7 @@ function system(mainWindow, dir, lang, dirname) {
{ name: 'All', extensions: ['*'] }, { name: 'All', extensions: ['*'] },
] ]
}, (fileNames) => { }, (fileNames) => {
e.sender.webContents.send('customSoundRender', [key, fileNames[0]]); e.sender.webContents.send('customSoundRender', [arg, fileNames[0]]);
}); });
}) })
@ -166,8 +166,7 @@ function system(mainWindow, dir, lang, dirname) {
return "true" return "true"
} }
ipc.on('column-del', (e, tlid) => { ipc.on('column-del', (e, tlid) => {
console.log(tlid);
console.log(lang);
var options = language.delsel(lang) var options = language.delsel(lang)
dialog.showMessageBox(options, function (index) { dialog.showMessageBox(options, function (index) {
e.sender.webContents.send('column-del-reply', [index, tlid]); e.sender.webContents.send('column-del-reply', [index, tlid]);

2
app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "thedesk", "name": "thedesk",
"version": "18.5.1", "version": "18.6.0",
"description": "TheDesk is a Mastodon client for PC.", "description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk", "repository": "https://github.com/cutls/TheDesk",
"main": "main.js", "main": "main.js",

14
app/view/en/index.html
View File

@ -36,7 +36,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver = "Usamin (18.5.1)"; var ver = "Usamin (18.6.0)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -676,17 +676,15 @@
<a href="https://thedesk.top" target="_blank">HP</a><br> <a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br> <br>
<div id="release-Usamin_18-5-1" class="release-do" style="display:none; "> <div id="release-Usamin_18-6-0" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br> <a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br> Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Usamin (18.5.1)</h5> <h5>Release Note Usamin (18.6.0)</h5>
・Misskeyの投稿範囲に関する不具合修正<br> ・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
・絵文字に関する不具合修正<br> ・投票済みのアンケートについて修正。<br>
・要らんところに通知フィルターボタンが出ていた。<br> ・<b>セキュリティの大幅な強化。</b>
・というか通知フィルターが動かなかった。<br>
・支援をお願いするダイアログが1か月に1回出ます。ご理解のほどよろしくお願いいたします。<br>
<br> <br>
<h5>ThinkingDeskラベル</h5> <h5>ThinkingDeskラベル</h5>
<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br> <img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>

18
app/view/en/setting.html
View File

@ -331,32 +331,32 @@
<h5>NowPlaying Provider(Windows)</h5> <h5>NowPlaying Provider(Windows)</h5>
macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required. And MusicBee requires CAD.<br> macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required. And MusicBee requires CAD.<br>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="aimp" value="AIMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span> <span>AIMP</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="itunes" value="ITUNES" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
<span>iTunes</span> <span>iTunes</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="npmm" <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" /> value="MEDIAMONKEY" />
<span>MediaMonkey</span> <span>MediaMonkey</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="winamp" value="WINAMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
<span>Winamp</span> <span>Winamp</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="wmp" value="WMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span> <span>WMP</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="wlm" value="WLM" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span> <span>WLM</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="cad" value="CAD" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span> <span>CAD</span>
</label> </label>
<br><br> <br><br>
@ -381,11 +381,11 @@
<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button> <button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
<h5>Attach an Artwork of Spotify</h5> <h5>Attach an Artwork of Spotify</h5>
<label> <label>
<input class="with-gap" onchange="settings()" name="awk" type="radio" id="awk_yes" value="yes" /> <input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
<span>Yes</span> <span>Yes</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="awk" type="radio" id="awk_no" value="no" /> <input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
<span>No</span> <span>No</span>
</label> </label>

8
app/view/en/update.html
View File

@ -142,8 +142,7 @@
$("#dlnow").toggleClass("hide"); $("#dlnow").toggleClass("hide");
$("#dlnow").toggleClass("show"); $("#dlnow").toggleClass("show");
$("#prog").text(""); $("#prog").text("");
var remote = electron.remote; var bit = localStorage.getItem("bit");
var bit = process.arch;
var start = "https://thedesk.top/ver.json"; var start = "https://thedesk.top/ver.json";
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -200,9 +199,8 @@
$("#prog").text(arg); $("#prog").text(arg);
} }
function verck() { function verck() {
var remote = electron.remote; var platform = localStorage.getItem("platform");
var platform = remote.process.platform; var bit = localStorage.getItem("bit");
var bit = process.arch;
if (platform == "win32") { if (platform == "win32") {
$('.windows').removeClass("hide") $('.windows').removeClass("hide")
} else if (platform == "linux") { } else if (platform == "linux") {

14
app/view/ja/index.html
View File

@ -36,7 +36,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver = "Usamin (18.5.1)"; var ver = "Usamin (18.6.0)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -676,17 +676,15 @@
<a href="https://thedesk.top" target="_blank">HP</a><br> <a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br> <br>
<div id="release-Usamin_18-5-1" class="release-do" style="display:none; "> <div id="release-Usamin_18-6-0" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br> <a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br> Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Usamin (18.5.1)</h5> <h5>Release Note Usamin (18.6.0)</h5>
・Misskeyの投稿範囲に関する不具合修正<br> ・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
・絵文字に関する不具合修正<br> ・投票済みのアンケートについて修正。<br>
・要らんところに通知フィルターボタンが出ていた。<br> ・<b>セキュリティの大幅な強化。</b>
・というか通知フィルターが動かなかった。<br>
・支援をお願いするダイアログが1か月に1回出ます。ご理解のほどよろしくお願いいたします。<br>
<br> <br>
<h5>ThinkingDeskラベル</h5> <h5>ThinkingDeskラベル</h5>
<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br> <img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>

18
app/view/ja/setting.html
View File

@ -331,32 +331,32 @@
<h5>NowPlayingのソース(Windows)</h5> <h5>NowPlayingのソース(Windows)</h5>
macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a>が必要です。MusicBeeもCADを有効にする必要があります。<br> macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a>が必要です。MusicBeeもCADを有効にする必要があります。<br>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="aimp" value="AIMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span> <span>AIMP</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="itunes" value="ITUNES" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
<span>iTunes</span> <span>iTunes</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="npmm" <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" /> value="MEDIAMONKEY" />
<span>MediaMonkey</span> <span>MediaMonkey</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="winamp" value="WINAMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
<span>Winamp</span> <span>Winamp</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="wmp" value="WMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span> <span>WMP</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="wlm" value="WLM" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span> <span>WLM</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="cad" value="CAD" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span> <span>CAD</span>
</label> </label>
<br><br> <br><br>
@ -381,11 +381,11 @@
<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button> <button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button>
<h5>アルバムアートワークを添付する(Spotify/Windows)</h5> <h5>アルバムアートワークを添付する(Spotify/Windows)</h5>
<label> <label>
<input class="with-gap" onchange="settings()" name="awk" type="radio" id="awk_yes" value="yes" /> <input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
<span>はい</span> <span>はい</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="awk" type="radio" id="awk_no" value="no" /> <input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
<span>いいえ</span> <span>いいえ</span>
</label> </label>

8
app/view/ja/update.html
View File

@ -142,8 +142,7 @@
$("#dlnow").toggleClass("hide"); $("#dlnow").toggleClass("hide");
$("#dlnow").toggleClass("show"); $("#dlnow").toggleClass("show");
$("#prog").text(""); $("#prog").text("");
var remote = electron.remote; var bit = localStorage.getItem("bit");
var bit = process.arch;
var start = "https://thedesk.top/ver.json"; var start = "https://thedesk.top/ver.json";
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -200,9 +199,8 @@
$("#prog").text(arg); $("#prog").text(arg);
} }
function verck() { function verck() {
var remote = electron.remote; var platform = localStorage.getItem("platform");
var platform = remote.process.platform; var bit = localStorage.getItem("bit");
var bit = process.arch;
if (platform == "win32") { if (platform == "win32") {
$('.windows').removeClass("hide") $('.windows').removeClass("hide")
} else if (platform == "linux") { } else if (platform == "linux") {

12
app/view/make/index.sample.html
View File

@ -676,17 +676,15 @@
<a href="https://thedesk.top" target="_blank">HP</a><br> <a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br> <br>
<div id="release-Usamin_18-5-1" class="release-do" style="display:none; "> <div id="release-Usamin_18-6-0" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br> <a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br> Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Usamin (18.5.1)</h5> <h5>Release Note Usamin (18.6.0)</h5>
・Misskeyの投稿範囲に関する不具合修正<br> ・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
・絵文字に関する不具合修正<br> ・投票済みのアンケートについて修正。<br>
・要らんところに通知フィルターボタンが出ていた。<br> ・<b>セキュリティの大幅な強化。</b>
・というか通知フィルターが動かなかった。<br>
・支援をお願いするダイアログが1か月に1回出ます。ご理解のほどよろしくお願いいたします。<br>
<br> <br>
<h5>ThinkingDeskラベル</h5> <h5>ThinkingDeskラベル</h5>
<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br> <img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>

2
app/view/make/make.js
View File

@ -2,7 +2,7 @@ const fs = require("fs")
const readlineSync = require('readline-sync'); const readlineSync = require('readline-sync');
let ver = readlineSync.question('version string (empty: default string)? '); let ver = readlineSync.question('version string (empty: default string)? ');
if (!ver) { if (!ver) {
ver = "Usamin (18.5.1)" ver = "Usamin (18.6.0)"
} }
console.log("Constructing view files " + ver + ": make sure to update package.json") console.log("Constructing view files " + ver + ": make sure to update package.json")
const langs = ["ja", "en", "ps"] const langs = ["ja", "en", "ps"]

18
app/view/make/setting.sample.html
View File

@ -331,32 +331,32 @@
<h5>@@npProvider@@</h5> <h5>@@npProvider@@</h5>
@@npPeoviderWarn@@<br> @@npPeoviderWarn@@<br>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="aimp" value="AIMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span> <span>AIMP</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="itunes" value="ITUNES" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
<span>iTunes</span> <span>iTunes</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="npmm" <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" /> value="MEDIAMONKEY" />
<span>MediaMonkey</span> <span>MediaMonkey</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="winamp" value="WINAMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
<span>Winamp</span> <span>Winamp</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="wmp" value="WMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span> <span>WMP</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="wlm" value="WLM" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span> <span>WLM</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="cad" value="CAD" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span> <span>CAD</span>
</label> </label>
<br><br> <br><br>
@ -381,11 +381,11 @@
<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">@@set@@</button> <button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">@@set@@</button>
<h5>@@postartwork@@</h5> <h5>@@postartwork@@</h5>
<label> <label>
<input class="with-gap" onchange="settings()" name="awk" type="radio" id="awk_yes" value="yes" /> <input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
<span>@@yes@@</span> <span>@@yes@@</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="awk" type="radio" id="awk_no" value="no" /> <input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
<span>@@no@@</span> <span>@@no@@</span>
</label> </label>

8
app/view/make/update.sample.html
View File

@ -142,8 +142,7 @@
$("#dlnow").toggleClass("hide"); $("#dlnow").toggleClass("hide");
$("#dlnow").toggleClass("show"); $("#dlnow").toggleClass("show");
$("#prog").text(""); $("#prog").text("");
var remote = electron.remote; var bit = localStorage.getItem("bit");
var bit = process.arch;
var start = "https://thedesk.top/ver.json"; var start = "https://thedesk.top/ver.json";
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -200,9 +199,8 @@
$("#prog").text(arg); $("#prog").text(arg);
} }
function verck() { function verck() {
var remote = electron.remote; var platform = localStorage.getItem("platform");
var platform = remote.process.platform; var bit = localStorage.getItem("bit");
var bit = process.arch;
if (platform == "win32") { if (platform == "win32") {
$('.windows').removeClass("hide") $('.windows').removeClass("hide")
} else if (platform == "linux") { } else if (platform == "linux") {

14
app/view/ps/index.html
View File

@ -36,7 +36,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver = "Usamin (18.5.1)"; var ver = "Usamin (18.6.0)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -676,17 +676,15 @@
<a href="https://thedesk.top" target="_blank">HP</a><br> <a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br> <br>
<div id="release-Usamin_18-5-1" class="release-do" style="display:none; "> <div id="release-Usamin_18-6-0" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br> <a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br> Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Usamin (18.5.1)</h5> <h5>Release Note Usamin (18.6.0)</h5>
・Misskeyの投稿範囲に関する不具合修正<br> ・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
・絵文字に関する不具合修正<br> ・投票済みのアンケートについて修正。<br>
・要らんところに通知フィルターボタンが出ていた。<br> ・<b>セキュリティの大幅な強化。</b>
・というか通知フィルターが動かなかった。<br>
・支援をお願いするダイアログが1か月に1回出ます。ご理解のほどよろしくお願いいたします。<br>
<br> <br>
<h5>ThinkingDeskラベル</h5> <h5>ThinkingDeskラベル</h5>
<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br> <img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>

18
app/view/ps/setting.html
View File

@ -331,32 +331,32 @@
<h5>crwdns2354:0crwdne2354:0</h5> <h5>crwdns2354:0crwdne2354:0</h5>
crwdns2356:0crwdne2356:0<br> crwdns2356:0crwdne2356:0<br>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="aimp" value="AIMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span> <span>AIMP</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="itunes" value="ITUNES" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
<span>iTunes</span> <span>iTunes</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="npmm" <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" /> value="MEDIAMONKEY" />
<span>MediaMonkey</span> <span>MediaMonkey</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="winamp" value="WINAMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
<span>Winamp</span> <span>Winamp</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="wmp" value="WMP" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span> <span>WMP</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="wlm" value="WLM" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span> <span>WLM</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="npp" type="radio" id="cad" value="CAD" /> <input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span> <span>CAD</span>
</label> </label>
<br><br> <br><br>
@ -381,11 +381,11 @@
<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button> <button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
<h5>crwdns635:0crwdne635:0</h5> <h5>crwdns635:0crwdne635:0</h5>
<label> <label>
<input class="with-gap" onchange="settings()" name="awk" type="radio" id="awk_yes" value="yes" /> <input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
<span>crwdns526:0crwdne526:0</span> <span>crwdns526:0crwdne526:0</span>
</label> </label>
<label> <label>
<input class="with-gap" onchange="settings()" name="awk" type="radio" id="awk_no" value="no" /> <input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
<span>crwdns527:0crwdne527:0</span> <span>crwdns527:0crwdne527:0</span>
</label> </label>

8
app/view/ps/update.html
View File

@ -142,8 +142,7 @@
$("#dlnow").toggleClass("hide"); $("#dlnow").toggleClass("hide");
$("#dlnow").toggleClass("show"); $("#dlnow").toggleClass("show");
$("#prog").text(""); $("#prog").text("");
var remote = electron.remote; var bit = localStorage.getItem("bit");
var bit = process.arch;
var start = "https://thedesk.top/ver.json"; var start = "https://thedesk.top/ver.json";
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -200,9 +199,8 @@
$("#prog").text(arg); $("#prog").text(arg);
} }
function verck() { function verck() {
var remote = electron.remote; var platform = localStorage.getItem("platform");
var platform = remote.process.platform; var bit = localStorage.getItem("bit");
var bit = process.arch;
if (platform == "win32") { if (platform == "win32") {
$('.windows').removeClass("hide") $('.windows').removeClass("hide")
} else if (platform == "linux") { } else if (platform == "linux") {