Compare commits

...

44 Commits

Author SHA1 Message Date
cutls
219695f9ae TheDesk 20.3.2 (Kawaii) 2020-04-18 11:00:56 +09:00
cutls
2dc3ca51a3 Mastodon 3.1.3 2020-04-11 16:09:46 +09:00
cutls
b2564cfabb Fix: Pleroma image upload 2020-04-11 10:41:04 +09:00
cutls
6ddc613b5a fix 2020-04-08 18:12:58 +09:00
cutls
3373ff417f TheDesk 20.3.1 (Kawaii) 2020-04-08 17:58:37 +09:00
cutls
9bee8afe95 misc 2020-04-08 15:30:20 +09:00
cutls
f79da2b692 tips versioning and Spotify player bug 2020-04-08 15:28:04 +09:00
cutls
fedb1ee858 misskey login 2020-04-08 15:27:47 +09:00
cutls
50e11ec035 v1 media bug 2020-04-08 14:54:25 +09:00
cutls
233442936a Fix: delete when unreblog 2020-04-08 14:54:14 +09:00
cutls
b68ae81782 TheDesk 20.3.0 (Usamin) 2020-04-07 17:44:59 +09:00
cutls
835234885b Add: v2/media uploader 2020-04-07 17:41:57 +09:00
cutls
6995155392 preparing: TheDesk 20.3.0 (Usamin) 2020-04-07 16:13:36 +09:00
cutls
2d7d127266 Some bugs, quality up on #208 2020-04-07 15:53:53 +09:00
cutls
ee6cbf922e Fix loader 2020-04-07 15:06:29 +09:00
Cutls
2c2ba89434 Merge pull request #241 from cutls/dependabot/npm_and_yarn/app/electron-rebuild-1.10.1
Bump electron-rebuild from 1.10.0 to 1.10.1 in /app
2020-04-07 15:03:23 +09:00
Cutls
68b23dc25a Merge branch 'master' into dependabot/npm_and_yarn/app/electron-rebuild-1.10.1 2020-04-07 15:03:17 +09:00
Cutls
181e8b47fd Merge pull request #242 from cutls/dependabot/npm_and_yarn/app/electron-builder-22.4.1
Bump electron-builder from 22.1.0 to 22.4.1 in /app
2020-04-07 15:02:39 +09:00
Cutls
8004643768 Merge branch 'master' into dependabot/npm_and_yarn/app/electron-builder-22.4.1 2020-04-07 15:02:30 +09:00
Cutls
681b2f207a Merge pull request #251 from cutls/dependabot/npm_and_yarn/app/fortawesome/fontawesome-free-5.13.0
Bump @fortawesome/fontawesome-free from 5.12.1 to 5.13.0 in /app
2020-04-07 15:01:22 +09:00
dependabot-preview[bot]
8ba1fa5e18 Bump electron-builder from 22.1.0 to 22.4.1 in /app
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.1.0 to 22.4.1.
- [Release notes](https://github.com/electron-userland/electron-builder/releases)
- [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/electron-userland/electron-builder/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-07 06:01:02 +00:00
dependabot-preview[bot]
3b4fe169d0 Bump @fortawesome/fontawesome-free from 5.12.1 to 5.13.0 in /app
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.12.1 to 5.13.0.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.12.1...5.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-07 06:01:02 +00:00
Cutls
8ea7cde8e6 Merge pull request #258 from cutls/dependabot/npm_and_yarn/app/sweetalert2-9.10.9
Bump sweetalert2 from 9.10.3 to 9.10.9 in /app
2020-04-07 15:00:29 +09:00
Cutls
db23b2b016 Merge branch 'master' into dependabot/npm_and_yarn/app/sweetalert2-9.10.9 2020-04-07 15:00:14 +09:00
Cutls
e8b0fb3e6c Merge pull request #259 from cutls/dependabot/npm_and_yarn/app/json5-2.1.3
Bump json5 from 2.1.2 to 2.1.3 in /app
2020-04-07 14:59:30 +09:00
Cutls
b47079e4c8 Merge pull request #260 from cutls/dependabot/npm_and_yarn/app/jimp-0.10.1
Bump jimp from 0.9.6 to 0.10.1 in /app
2020-04-07 14:59:15 +09:00
Cutls
bae2d84d81 New Crowdin translations (#261)
* New translations setting.json (Russian)

* New translations setting.json (Portuguese)

* New translations setting.json (Romanian)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Polish)

* New translations setting.json (Norwegian)

* New translations setting.json (Italian)

* New translations setting.json (Serbian (Cyrillic))

* New translations setting.json (Vietnamese)

* New translations setting.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations setting.json (Swedish)

* New translations setting.json (Spanish, Argentina)

* New translations setting.json (Spanish)

* New translations setting.json (Hungarian)

* New translations setting.json (Chinese Traditional)

* New translations setting.json (Chinese Simplified)

* New translations setting.json (Catalan)

* New translations setting.json (Bulgarian)

* New translations setting.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations setting.json (Czech)

* New translations setting.json (Hebrew)

* New translations setting.json (Greek)

* New translations setting.json (German)

* New translations setting.json (French)

* New translations setting.json (Finnish)

* New translations setting.json (Dutch)

* New translations setting.json (Danish)

* New translations setting.json (English)
2020-04-07 14:58:55 +09:00
cutls
73a57c86cb use API #208 2020-04-07 14:58:30 +09:00
cutls
50a2ce1470 Add: #208 Apple Music artwork request 2020-04-07 14:40:27 +09:00
cutls
429a5c764f Add, Fix: percent, versioning, start 2020-04-07 14:00:20 +09:00
cutls
6fbfdf0323 Fix: cannot list fonts up 2020-04-07 13:20:50 +09:00
cutls
7822b2c740 Fix: CW toggle 2020-04-07 13:02:20 +09:00
cutls
0014890881 Fix: hidden titlebar with frameless mode on macOS 2020-04-07 12:52:42 +09:00
dependabot-preview[bot]
8e909cf3b2 Bump jimp from 0.9.6 to 0.10.1 in /app
Bumps [jimp](https://github.com/oliver-moran/jimp) from 0.9.6 to 0.10.1.
- [Release notes](https://github.com/oliver-moran/jimp/releases)
- [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliver-moran/jimp/compare/v0.9.6...v0.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-06 20:16:21 +00:00
dependabot-preview[bot]
f7be9e9143 Bump json5 from 2.1.2 to 2.1.3 in /app
Bumps [json5](https://github.com/json5/json5) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/master/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.1.2...v2.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-06 20:15:46 +00:00
dependabot-preview[bot]
e44fee2165 Bump sweetalert2 from 9.10.3 to 9.10.9 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.10.3 to 9.10.9.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.10.3...v9.10.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-02 20:20:11 +00:00
Cutls
940514c97d Merge pull request #244 from cutls/dependabot/npm_and_yarn/app/json5-2.1.2
Bump json5 from 2.1.1 to 2.1.2 in /app
2020-03-22 01:11:08 +09:00
Cutls
4839c64878 Merge pull request #246 from cutls/dependabot/npm_and_yarn/app/jimp-0.9.6
Bump jimp from 0.9.3 to 0.9.6 in /app
2020-03-22 01:10:49 +09:00
Cutls
8c660d8499 Merge pull request #248 from cutls/dependabot/npm_and_yarn/app/sweetalert2-9.10.3
Bump sweetalert2 from 9.7.2 to 9.10.3 in /app
2020-03-22 01:10:24 +09:00
Cutls
2d0c7bdcea New Crowdin translations (#247)
* New translations setting.json (Russian)

* New translations setting.json (Portuguese)

* New translations index.json (Russian)

* New translations setting.json (Romanian)

* New translations index.json (Romanian)

* New translations setting.json (Portuguese, Brazilian)

* New translations index.json (Portuguese, Brazilian)

* New translations index.json (Portuguese)

* New translations setting.json (Polish)

* New translations index.json (Polish)

* New translations setting.json (Norwegian)

* New translations index.json (Norwegian)

* New translations setting.json (Italian)

* New translations index.json (Serbian (Cyrillic))

* New translations setting.json (Serbian (Cyrillic))

* New translations index.json (English)

* New translations setting.json (Vietnamese)

* New translations index.json (Vietnamese)

* New translations setting.json (Ukrainian)

* New translations index.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations index.json (Turkish)

* New translations setting.json (Swedish)

* New translations index.json (Swedish)

* New translations setting.json (Spanish, Argentina)

* New translations index.json (Spanish, Argentina)

* New translations setting.json (Spanish)

* New translations index.json (Spanish)

* New translations index.json (Italian)

* New translations setting.json (Hungarian)

* New translations index.json (Czech)

* New translations setting.json (Chinese Traditional)

* New translations index.json (Chinese Traditional)

* New translations setting.json (Chinese Simplified)

* New translations index.json (Chinese Simplified)

* New translations setting.json (Catalan)

* New translations index.json (Catalan)

* New translations setting.json (Bulgarian)

* New translations index.json (Bulgarian)

* New translations setting.json (Arabic)

* New translations index.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations index.json (Afrikaans)

* New translations setting.json (Czech)

* New translations index.json (Danish)

* New translations index.json (German)

* New translations index.json (Hungarian)

* New translations setting.json (Hebrew)

* New translations index.json (Hebrew)

* New translations setting.json (Greek)

* New translations index.json (Greek)

* New translations setting.json (German)

* New translations setting.json (French)

* New translations index.json (French)

* New translations setting.json (Finnish)

* New translations index.json (Finnish)

* New translations setting.json (Dutch)

* New translations index.json (Dutch)

* New translations setting.json (Danish)

* New translations setting.json (English)
2020-03-22 01:08:11 +09:00
dependabot-preview[bot]
9ecdb4fdb6 Bump sweetalert2 from 9.7.2 to 9.10.3 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.7.2 to 9.10.3.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.7.2...v9.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-19 21:02:51 +00:00
dependabot-preview[bot]
2d67a7df23 Bump jimp from 0.9.3 to 0.9.6 in /app
Bumps [jimp](https://github.com/oliver-moran/jimp) from 0.9.3 to 0.9.6.
- [Release notes](https://github.com/oliver-moran/jimp/releases)
- [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliver-moran/jimp/compare/v0.9.3...v0.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-18 20:12:41 +00:00
dependabot-preview[bot]
38db36602c Bump json5 from 2.1.1 to 2.1.2 in /app
Bumps [json5](https://github.com/json5/json5) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/master/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.1.1...v2.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-16 20:14:26 +00:00
dependabot-preview[bot]
2e1264173e Bump electron-rebuild from 1.10.0 to 1.10.1 in /app
Bumps [electron-rebuild](https://github.com/electron/electron-rebuild) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/electron/electron-rebuild/releases)
- [Changelog](https://github.com/electron/electron-rebuild/blob/master/.releaserc.json)
- [Commits](https://github.com/electron/electron-rebuild/compare/v1.10.0...v1.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-11 20:16:06 +00:00
95 changed files with 1254 additions and 777 deletions

1
.gitignore vendored
View File

@@ -23,3 +23,4 @@ app/view/es-AR
app/git
*.code-workspace
releasenote.md
app/yarn-error.log

View File

@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
TheDesk icon, Cutls P.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-->
<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!--
TheDesk icon, Cutls P.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
<style type="text/css">

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

2
app/img/picture.svg Normal file
View File

@@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>

After

Width:  |  Height:  |  Size: 259 B

View File

@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
ThinkingDesk: Cutls P's icon, Cutls P.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-->
<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

@@ -47,6 +47,9 @@ function ck() {
multiSelector(false)
verck(ver, jp)
$('.stw').show()
if (localStorage.getItem('tips')) {
tips(localStorage.getItem('tips'))
}
$('#something-wrong img').attr('src', '../../img/thinking.svg')
}
}

View File

@@ -506,7 +506,7 @@ function misskeyLogin(url) {
if (!url) {
var url = $('#misskey-url').val()
}
var start = 'http://' + url + '/api/app/create'
var start = 'https://' + url + '/api/app/create'
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')

View File

@@ -86,7 +86,7 @@ function handleFileUpload(files, obj, no) {
}
//ファイルアップロード
function media(b64, type, no, stamped) {
async function media(b64, type, no, stamped) {
var acct_id = $('#post-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
var user = localStorage.getItem('user_' + acct_id)
@@ -130,12 +130,45 @@ function media(b64, type, no, stamped) {
httpreq.send(fd)
} else {
var previewer = 'preview_url'
var start = 'https://' + domain + '/api/v1/media'
httpreq.open('POST', start, true)
httpreq.upload.addEventListener('progress', progshow, false)
httpreq.responseType = 'json'
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.send(fd)
//v2/media
try {
var id = await v2MediaUpload(domain, at, fd)
if(!id) {
var start = 'https://' + domain + '/api/v1/media'
httpreq.open('POST', start, true)
httpreq.upload.addEventListener('progress', progshow, false)
httpreq.responseType = 'json'
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.send(fd)
} else {
var mediav = $('#media').val()
var regExp = new RegExp('tmp_' + r, 'g')
mediav = mediav.replace(regExp, id)
$('#media').val(mediav)
var html = `<img src="../../img/picture.svg" class="preview-img pointer unknown" data-media="${id}" oncontextmenu="deleteImage('${id}')" onclick="altImage('${acct_id}','${id}')" title="${lang.lang_postimg_delete}">`
$('#preview').append(html)
todc()
if (localStorage.getItem('nsfw_' + acct_id)) {
$('#nsfw').addClass('yellow-text')
$('#nsfw').html('visibility')
$('#nsfw').addClass('nsfw-avail')
}
$('.toot-btn-group').prop('disabled', false)
$('select').formSelect()
$('#mec').text(lang.lang_there)
M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
$('#imgup').text('')
$('#imgsel').show()
localStorage.removeItem('image')
}
} catch {
var start = 'https://' + domain + '/api/v1/media'
httpreq.open('POST', start, true)
httpreq.upload.addEventListener('progress', progshow, false)
httpreq.responseType = 'json'
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.send(fd)
}
}
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
@@ -159,6 +192,10 @@ function media(b64, type, no, stamped) {
M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
return false
}
$('#imgup').text('')
$('.toot-btn-group').prop('disabled', false)
$('select').formSelect()
$('#imgsel').show()
var img = localStorage.getItem('img')
if (json.type.indexOf('image') != -1) {
var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${json['id']}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${json['id']}')" title="${lang.lang_postimg_delete}">`
@@ -178,19 +215,6 @@ function media(b64, type, no, stamped) {
if (img == 'url' && json['text_url']) {
$('#textarea').val($('#textarea').val() + ' ' + json['text_url'])
}
todc()
if (localStorage.getItem('nsfw_' + acct_id)) {
$('#nsfw').addClass('yellow-text')
$('#nsfw').html('visibility')
$('#nsfw').addClass('nsfw-avail')
}
$('.toot-btn-group').prop('disabled', false)
$('select').formSelect()
$('#mec').text(lang.lang_there)
M.toast({ html: lang.lang_postimg_aftupload, displayLength: 1000 })
$('#imgup').text('')
$('#imgsel').show()
localStorage.removeItem('image')
}
}
}
@@ -275,54 +299,84 @@ function altImage(acct_id, id) {
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/media/' + id
Swal.fire({
title: lang.lang_postimg_desc,
text: lang.lang_postimg_leadContext,
input: 'text',
inputAttributes: {
autocapitalize: 'off'
},
showCancelButton: true,
confirmButtonText: 'Post',
showLoaderOnConfirm: true,
preConfirm: data => {
return fetch(start, {
method: 'PUT',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
},
body: JSON.stringify({
description: data
if($('[data-media=' + id + ']').hasClass('unknown')) {
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
console.log(json)
$('[data-media=' + id + ']').removeClass('unknown')
if(json.preview_url) {
$('[data-media=' + id + ']').attr('src', json.preview_url)
}
})
} else {
Swal.fire({
title: lang.lang_postimg_desc,
text: lang.lang_postimg_leadContext,
input: 'text',
inputAttributes: {
autocapitalize: 'off'
},
showCancelButton: true,
confirmButtonText: 'Post',
showLoaderOnConfirm: true,
preConfirm: data => {
return fetch(start, {
method: 'PUT',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
},
body: JSON.stringify({
description: data
})
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
console.log(json)
$('[data-media=' + id + ']').attr('title', data)
})
},
allowOutsideClick: () => !Swal.isLoading()
}).then(result => {
if (result.value) {
Swal.fire({
title: 'Complete'
})
.then(function(json) {
console.log(json)
$('[data-media=' + id + ']').attr('title', data)
})
},
allowOutsideClick: () => !Swal.isLoading()
}).then(result => {
if (result.value) {
Swal.fire({
title: 'Complete'
})
}
})
}
})
}
}
function stamp() {
if ($('#stamp').hasClass('stamp-avail')) {
@@ -332,4 +386,42 @@ function stamp() {
$('#stamp').html('On')
$('#stamp').addClass('stamp-avail')
}
}
//v2/media対応
async function v2MediaUpload(domain, at, fd) {
var start = 'https://' + domain + '/api/v2/media'
let promise = await fetch(start, {
method: 'POST',
headers: {
Authorization:
'Bearer ' + at
},
body: fd
})
var json = await promise.json()
if(json.id) {
return json.id
} else {
return false
}
}
function alertProcessUnfinished() {
Swal.fire({
title: lang.lang_post_unfinishedMedia,
type: 'error',
showCancelButton: true,
confirmButtonText: lang.lang_post_retry,
cancelButtonText: lang.lang_no
}).then(result => {
if (result.value) {
post()
}
})
}
function syncDetail() {
Swal.fire({
title: lang.lang_post_syncDetail,
text: lang.lang_post_syncDetailText,
type: 'info'
})
}

View File

@@ -166,18 +166,32 @@ function post(mode, postvis) {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, json)
if(media && this.status == 422) {
$('#ideKey').val('')
$('.toot-btn-group').prop('disabled', false)
alertProcessUnfinished()
} else {
setLog(start, this.status, json)
var box = localStorage.getItem('box')
if (box == 'yes' || !box) {
$('#textarea').blur()
hide()
}
$('.toot-btn-group').prop('disabled', false)
todc()
clear()
}
} else {
$('#ideKey').val('')
var box = localStorage.getItem('box')
if (box == 'yes' || !box) {
$('#textarea').blur()
hide()
}
$('.toot-btn-group').prop('disabled', false)
todc()
clear()
}
var box = localStorage.getItem('box')
if (box == 'yes' || !box) {
$('#textarea').blur()
hide()
}
$('.toot-btn-group').prop('disabled', false)
todc()
clear()
}
}
}

View File

@@ -96,9 +96,9 @@ function cw() {
}
}
//TLでコンテントワーニングを表示トグル
function cw_show(id) {
$('.cw_hide_' + id).toggleClass('cw')
$('.cw-long-' + id).toggleClass('hide')
function cw_show(e) {
$(e).parent().parent().find('.cw_hide').toggleClass('cw')
$(e).parent().find('.cw_long').toggleClass('hide')
}
$(function() {
$('#cw-text').on('change', function(event) {

View File

@@ -360,22 +360,20 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
if ((toot.cw || toot.cw == "") && cw) {
var content = escapeHTML(toot.text);
var spoil = escapeHTMLtemp(toot.cw);
var spoiler = "cw cw_hide_" + toot.id;
var spoiler = "cw cw_hide";
var api_spoil = "gray";
var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
'\')" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
var spoiler_show = '<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
} else {
var ct1 = nl2br(toot.text).split('<br />').length - 2;
var ct2 = nl2br(toot.text).split('<br>').length - 2;
if (ct1 > ct2) { var ct = ct1; } else { var ct = ct2; }
if ((sent < ct && $.mb_strlen($.strip_tagstemp(toot.text)) > 5) || ($.strip_tagstemp(toot.text).length > ltr && $.mb_strlen($.strip_tagstemp(toot.text)) > 5)) {
var content = '<span class="gray">' + lang.lang_parse_fulltext + '</span><br>' + escapeHTMLtemp(toot.text)
var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tagstemp(
var spoil = '<span class="cw_long">' + $.mb_substr($.strip_tagstemp(
toot.text), 0, 100) +
'</span><span class="gray">' + lang.lang_parse_autofold + '</span>';
var spoiler = "cw cw_hide_" + toot.id;
var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
'\')" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
var spoiler = "cw cw_hide";
var spoiler_show = '<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
} else {
var content = escapeHTMLtemp(toot.text);
if (toot.cw) {

View File

@@ -516,9 +516,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
}
if (toot.spoiler_text && cw) {
var spoil = escapeHTML(toot.spoiler_text)
var spoiler = 'cw cw_hide_' + toot.id
var spoiler = 'cw cw_hide'
var api_spoil = 'gray'
var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>`
var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>`
} else {
if (content) {
var ct1 = content.split('</p>').length + content.split('<br />').length - 2
@@ -538,14 +538,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
($.mb_strlen($.strip_tags(content)) > ltr && $.mb_strlen($.strip_tags(content)) > 5)
) {
var content = `<span class="gray">${lang.lang_parse_fulltext}</span><br>` + content
var spoil = `<span class="cw-long-${toot.id}">${$.mb_substr(
var spoil = `<span class="cw_long">${$.mb_substr(
$.strip_tags(content),
0,
100
)}</span>
<span class="gray">${lang.lang_parse_autofold}</span>`
var spoiler = 'cw cw_hide_' + toot.id
var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">
var spoiler = 'cw cw_hide'
var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">
${lang.lang_parse_more}
</a><br>`
} else {

View File

@@ -116,8 +116,11 @@ function tsAdd(q) {
parseColumn('add')
}
function tootsearch(tlid, q) {
if(!q || q=='undefined') {
return false
}
var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
console.log('Toot srrach at ' + start)
console.log('Toot search at ' + start)
$('#notice_' + tlid).text('tootsearch(' + q + ')')
$('#notice_icon_' + tlid).text('search')
fetch(start, {

View File

@@ -273,15 +273,15 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
if (typeA == 'delete') {
var obj = JSON.parse(mess.data).payload
if (delc == 'true') {
$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
$('#timeline_' + tlid + ' [unique-id=' + JSON.parse(mess.data).payload + ']').addClass(
'emphasized'
)
$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
$('#timeline_' + tlid + ' [unique-id=' + JSON.parse(mess.data).payload + ']').addClass(
'by_delcatch'
)
} else {
$('[toot-id=' + JSON.parse(mess.data).payload + ']').hide()
$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
$('[unique-id=' + JSON.parse(mess.data).payload + ']').hide()
$('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
}
} else if (typeA == 'update' || typeA == 'conversation') {
if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {

View File

@@ -507,11 +507,11 @@ function fontList(arg) {
var font = arg[i]
$('#fonts').append(
'<div class="font pointer" style="font-family:' +
font.family +
font +
'" onclick="insertFont(\'' +
font.family +
font +
'\')">' +
font.family +
font +
'</div>'
)
}

View File

@@ -42,6 +42,12 @@ function checkSpotify() {
} else {
$("#awk_no").prop("checked", true);
}
var flag2 = localStorage.getItem("complete-artwork");
if (flag2) {
$("#amw_yes").prop("checked", true);
} else {
$("#amw_no").prop("checked", true);
}
}
function spotifyFlagSave() {
var awk = $("[name=awk]:checked").val();
@@ -53,6 +59,16 @@ function spotifyFlagSave() {
M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
}
}
function aMusicFlagSave() {
var awk = $("[name=amw]:checked").val();
if (awk == "yes") {
localStorage.setItem("complete-artwork", "yes");
M.toast({ html: lang.lang_spotify_img, displayLength: 3000 });
} else {
localStorage.removeItem("complete-artwork");
M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
}
}
function nowplaying(mode) {
if (mode == "spotify") {
var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
@@ -124,7 +140,7 @@ function nowplaying(mode) {
postMessage(["itunes", ""], "*");
}
}
function npCore(arg) {
async function npCore(arg) {
console.table(arg);
var content = localStorage.getItem("np-temp");
if (!content || content == "" || content == "null") {
@@ -139,6 +155,9 @@ function npCore(arg) {
} else if (platform == "darwin") {
if (flag && arg.artwork) {
media(arg.artwork, "image/png", "new");
} else if (flag && localStorage.getItem('complete-artwork')) {
var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name;
postMessage(["bmpImage", [await getUnknownAA(q), 0]], "*");
}
}
var regExp = new RegExp("{song}", "g");
@@ -183,3 +202,15 @@ if (location.search) {
} else {
}
}
async function getUnknownAA(q) {
const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song'
let promise = await fetch(start, {
method: 'GET'
})
const json = await promise.json()
if(!json.resultCount) {
return []
}
const data = json.results[0].artworkUrl100
return data.replace(/100x100/, '512x512')
}

View File

@@ -159,6 +159,10 @@ function spotifytips() {
})
.then(function(json) {
var ms = json.progress_ms
if(!ms) {
tips('ver')
return false
}
var last = 1000 - (ms % 1000)
var item = json.item
var img = item.album.images[0].url
@@ -218,6 +222,8 @@ function spotifytips() {
type: 'info',
title: lang.lang_spotify_acct
})
tips('ver')
return false
}
}
function spotStart() {
@@ -288,6 +294,4 @@ function tipsToggle() {
$('#tips').toggleClass('hide')
$('#tips-menu').toggleClass('hide')
}
if (localStorage.getItem('tips')) {
tips(localStorage.getItem('tips'))
}

View File

@@ -102,8 +102,10 @@ try {
var frameRaw = fs.readFileSync(frame_path, 'utf8')
if(frameRaw == 'false') {
var frame = false
var frameTitle = 'hidden'
} else {
var frame = true
var frameTitle = 'default'
}
} catch {
var frame = true
@@ -186,6 +188,7 @@ function createWindow() {
y: window_size.y,
simpleFullscreen: true,
show: false,
titleBarStyle: frameTitle,
frame: frame,
}
}

View File

@@ -34,11 +34,12 @@ function dl(mainWindow, lang_path, base, dirname) {
}
})
//アプデDL
ipc.on('download-btn', (e, args) => {
ipc.on('download-btn', async (e, args) => {
function dl(url, file, dir, e) {
e.sender.webContents.send('mess', 'ダウンロードを開始します。')
const opts = {
directory: dir,
filename: file,
openFolderWhenDone: true,
onProgress: function(event) {
e.sender.webContents.send('prog', event)
@@ -54,29 +55,27 @@ function dl(mainWindow, lang_path, base, dirname) {
}
var platform = process.platform
var bit = process.arch
dialog.showSaveDialog(
null,
{
title: 'Save',
defaultPath: app.getPath('home') + '/' + args[1]
},
savedFiles => {
console.log(savedFiles)
if (!savedFiles) {
return false
}
if (platform == 'win32') {
var m = savedFiles.match(/(.+)\\(.+)$/)
} else {
var m = savedFiles.match(/(.+)\/(.+)$/)
}
//console.log(m);
if (isExistFile(savedFiles)) {
fs.unlinkSync(savedFiles)
}
dl(args[0], args[1], m[1], e)
}
)
var options = {
title: 'Save',
defaultPath: app.getPath('home') + '/' + args[1]
}
const file = await dialog.showSaveDialog(null, options)
const savedFiles = file.filePath
console.log(savedFiles)
if (!savedFiles) {
return false
}
if (platform == 'win32') {
var m = savedFiles.match(/(.+)\\(.+)$/)
} else {
var m = savedFiles.match(/(.+)\/(.+)$/)
}
//console.log(m);
if (isExistFile(savedFiles)) {
fs.unlinkSync(savedFiles)
}
console.log(m)
dl(args[0], m[2], m[1], e)
})
function isExistFile(file) {

View File

@@ -25,6 +25,7 @@ function np(mainWindow) {
} catch (error) {
console.error(error)
e.sender.webContents.send('itunes-np', error)
}
} else {
}

View File

@@ -242,11 +242,10 @@ function system(mainWindow, dir, lang, dirname) {
fn(data); // ソート後の配列を返す
}
ipc.on("fonts", (e, arg) => {
const fm = require("font-manager");
var fonts = fm.getAvailableFontsSync();
object_array_sort(fonts, "family", "asc", function(fonts_sorted) {
e.sender.webContents.send("font-list", fonts_sorted);
});
var SystemFonts = require('system-font-families').default;
var fm = new SystemFonts();
const fontList = fm.getFontsSync();
e.sender.webContents.send("font-list", fontList);
});
//コピー
ipc.on("copy", (e, arg) => {

View File

@@ -1,6 +1,7 @@
{
"name": "thedesk",
"version": "20.2.0",
"version": "20.3.2",
"codename": "Kawaii",
"description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk",
"main": "main.js",
@@ -51,28 +52,28 @@
],
"license": "GPL-3.0",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.12.1",
"@fortawesome/fontawesome-free": "^5.13.0",
"custom-electron-titlebar": "^3.2.2-hotfix62",
"electron-dl": "^3.0.0",
"jimp": "^0.9.3",
"jimp": "^0.10.1",
"jquery": "^3.4.1",
"jquery-ui-dist": "^1.12.1",
"json5": "^2.1.1",
"json5": "^2.1.3",
"lodash": "^4.17.15",
"materialize-css": "git://github.com/cutls/materialize#v1-dev",
"sumchecker": "^3.0.1",
"sweetalert2": "^9.7.2",
"sweetalert2": "^9.10.9",
"system-font-families": "^0.4.1",
"vue": "^2.6.11"
},
"optionalDependencies": {
"font-manager": "0.3.0",
"itunes-nowplaying-mac": "0.3.1"
"itunes-nowplaying-mac": "git://github.com/cutls/itunes-nowplaying-mac"
},
"devDependencies": {
"chokidar": "^3.3.1",
"electron": "^8.0.0",
"electron-builder": "^22.1.0",
"electron-rebuild": "^1.10.0",
"electron-builder": "^22.4.1",
"electron-rebuild": "^1.10.1",
"readline-sync": "1.4.10"
},
"build": {

View File

@@ -1,5 +1,15 @@
{
"latest":[],
"3.1.3": [],
"3.1.2": [],
"3.1.1": [],
"3.1.0": [
"ブックマーク機能",
"お知らせ機能",
"プロフィールをワードフィルターする",
"フォローリクエストが通知に表示される"
],
"3.0.1": [],
"3.0.0": [
"プロフィールディレクトリの表示",
"ホワイトリスト式のトレンドタグ(3.0の機能)",

View File

@@ -1189,20 +1189,15 @@
<a href="https://thedesk.top" target="_blank">HP</a><br />
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
<br />
<div id="release-20-2-0_Kawaii" class="release-do" style="display:none; ">
<div id="release-20-3-2_Kawaii" class="release-do" style="display:none; ">
<br />
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br />
Pixiv
FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note 20.1.2 (Kawaii)</h5>
アップデートウィンドウのデザイン改善 <a onclick="udgEx('https://cutls.com/@Cutls','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
・新しいテーマカラー(Polar Night, Snow Storm)の追加 <a onclick="udgEx('https://cutls.com/@Cutls','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
・画像モーダルの改善(ウィンドウが狭いとき) <a onclick="udgEx('https://cutls.com/@Cutls','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a> <a onclick="udgEx('https://pawoo.net/@FoxClover','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/77073692-fafcc500-6a32-11ea-84d2-0305f223f408.png">FoxClover</a><br>
・Pleromaでown_votesがNullになることがあった <a onclick="udgEx('https://cutls.com/@Cutls','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a> <a onclick="udgEx('https://pleroma.damnx.net/damnxcsy','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/77073522-c7219f80-6a32-11ea-89f8-704333981157.png">damnxcsy</a><br>
・ウィンドウのフレームを消して、オリジナルデザインのメニューバーを表示させる <a onclick="udgEx('https://cutls.com/@Cutls','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
・一部ロケールの改善 <a onclick="udgEx('https://pl.kpherox.dev/users/kPherox','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/66582379-a3714800-ebbc-11e9-8402-d81a35a3be9f.png">kPherox</a><br>
<br />
<h5>Release Note 20.3.2 (Kawaii)</h5>
Pleromaでメディアアップロードができない不具合 <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a><br>
</div>
<div id="release-en" style="display:none">
<h5>Let's make it native!</h5>

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -184,5 +184,5 @@
"acctManDesc": "Добавете още акаунти и излезте от тях.",
"settingDesc": "Много. много предпочитания са тук. Няма да можете да ги проверите всички!",
"nanoDescPlus": "Клиент мини прозорец (експериментално)",
"menuDesc": "Всички настройки на TheDesk и Mastodon, като <b> добавяне и сортиране на колони </b>, <b> списък и проверка на филтрите </b>."
}
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}

View File

@@ -4,6 +4,8 @@
"yes": "Да",
"no": "Не",
"none": "Няма",
"show": "Покажи",
"hide": "Hide",
"default": "По подразбиране",
"change": "Промяна",
"select": "Избери",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk ще използва това местоназначение, когато се опитва да запази снимки или да прави екранни снимки.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "абсолютна стойност",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Ano",
"no": "Ne",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Změnit",
"select": "Vybrat",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolutní hodnota",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini-Fenster-Klient (experimentell)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Ja",
"no": "Nein",
"none": "Ohne",
"show": "Zeige",
"hide": "Hide",
"default": "Standard",
"change": "Ändern",
"select": "Auswahl",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk verwendet diesen Ordner, wenn es versucht Bilder zu speichern oder Screenshots zu machen.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "Absoluter Wert",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -178,10 +178,11 @@
"active": "crwdns3392:0crwdne3392:0",
"newcomer": "crwdns3394:0crwdne3394:0",
"local_only": "crwdns3396:0crwdne3396:0",
"menu": "crwdns4466:0crwdne4466:0",
"demoBottomBtns": "crwdns3398:0crwdne3398:0",
"lookAtBottom": "crwdns3400:0crwdne3400:0",
"acctManDesc": "crwdns3402:0crwdne3402:0",
"settingDesc": "crwdns3404:0crwdne3404:0",
"nanoDescPlus": "crwdns3406:0crwdne3406:0",
"listDesc": "crwdns3408:0crwdne3408:0"
"menuDesc": "crwdns4468:0crwdne4468:0"
}

View File

@@ -4,6 +4,8 @@
"yes": "crwdns3912:0crwdne3912:0",
"no": "crwdns3914:0crwdne3914:0",
"none": "crwdns3916:0crwdne3916:0",
"show": "crwdns4458:0crwdne4458:0",
"hide": "crwdns4460:0crwdne4460:0",
"default": "crwdns3918:0crwdne3918:0",
"change": "crwdns3920:0crwdne3920:0",
"select": "crwdns3922:0crwdne3922:0",
@@ -34,6 +36,9 @@
"savefolderwarn": "crwdns3970:0crwdne3970:0",
"useragent": "crwdns4372:0crwdne4372:0",
"useragentWarn": "crwdns4374:0crwdne4374:0",
"frame": "crwdns4462:0crwdne4462:0",
"frameWarn": "crwdns4464:0crwdne4464:0",
"downloadWin": "crwdns4470:0crwdne4470:0",
"absolute": "crwdns3972:0crwdne3972:0",
"srcUrl": "crwdns4455:0crwdne4455:0",
"srcUrlWarn": "crwdns4457:0{q}crwdne4457:0",

View File

@@ -60,6 +60,8 @@
"lang_postimg_delete": "Click to add description, right-click to delete this",
"lang_postimg_desc": "Description",
"lang_postimg_leadContext": "right-click the thumbnail to delete this",
"lang_post_syncDetail": "Upload media synchronously",
"lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
"lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
"lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
"lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
"lang_post_btn1": "Cancel (will not post)",
"lang_post_btn2": "Make text hidden automatically",
"lang_post_btn3": "Continue to post",
"lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
"lang_post_retry": "Retry",
"lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
"lang_status_btWarn": "It will take a miunte to boost a remote toot.",
"lang_status_follow": "Follow",

View File

@@ -18,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -38,6 +38,7 @@
"useragentWarn":"Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",
@@ -172,6 +173,8 @@
"template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"template3": "",
"postartwork": "Attach an Artwork of Spotify",
"searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
"searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
"tts": "TTS(text to speech) Preferences",
"bouyomi": "BouyomiChan connect",
"bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

View File

@@ -184,5 +184,5 @@
"acctManDesc": "Agregá más cuentas y administralas.",
"settingDesc": "Muchas configuraciones. ¡No vas a poder con todas!",
"nanoDescPlus": "Miniventana (experimental)",
"menuDesc": "Toda la configuración diaria de TheDesk y Mastodon como <b>agergar y ordenar columnas</b>, <b>revisión de listas y filtros</b>."
}
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}

View File

@@ -4,6 +4,8 @@
"yes": "Sí",
"no": "No",
"none": "Ninguno",
"show": "Mostrar",
"hide": "Hide",
"default": "Predeterminado",
"change": "Cambiar",
"select": "Seleccionar",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk usa esta configuración para guardar imágenes en general y capturas de pantallas.",
"useragent": "Cadena de agente de usuario",
"useragentWarn": "Reiniciar cuando se cambie",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "valor absoluto",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Cambiar",
"select": "Seleccionar",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk utiliza este valor cuando intenta guardar fotos o tomar capturas de pantalla.",
"useragent": "Agente de usuario",
"useragentWarn": "Reiniciar al cambiar",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "valor absoluto",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Oui",
"no": "Non",
"none": "Aucun",
"show": "Show",
"hide": "Hide",
"default": "Par défaut",
"change": "Modifier",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Thèmes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -59,6 +59,8 @@
"lang_postimg_delete": "クリック: 画像に説明付ける/右クリック: 削除",
"lang_postimg_desc": "説明",
"lang_postimg_leadContext": "画像を削除するんやったら右クリック",
"lang_post_syncDetail": "同期アップロード",
"lang_post_syncDetailText": "小さな画像をアップロードするだけの場合、投稿可能になってすぐ投稿ボタンを押しても構いませんが、重いメディアの場合はしばらく待って、画像アイコンをクリックして、プレビューが表示されることを確認してからアップロードしてください。処理が完了している場合、各画像アイコンをクリックするとプレビューを取得します。",
"lang_post_tagTL": "デフォルトタグ無いしこのまま投稿するとローカルには表示されへんで。",
"lang_post_tagVis": "公開範囲が「公開」以外やったら、タグTLには出えへんで。(一部インスタンスを除く)",
"lang_post_cwtitle": "長文投稿の警告",
@@ -68,6 +70,8 @@
"lang_post_btn3": "これはええねん(そのまま投稿)",
"lang_status_favWarn": "お気に入り登録したんやけどインスタンスがちゃうときは時間がかかるで、知らんけど。",
"lang_status_btWarn": "ブーストしたんやけどインスタンスがちゃうときは時間がかかるで、知らんけど。",
"lang_post_unfinishedMedia": "処理未了のメディアがあります。再試行してください。",
"lang_post_retry": "再試行",
"lang_status_follow": "フォロー",
"lang_status_unfollow": "フォロー解除",
"lang_status_block": "ブロック",

View File

@@ -37,6 +37,7 @@
"useragentWarn":"再起動すんで。",
"frame": "ウィンドウのフレーム",
"frameWarn": "フレーム無しやとタイトルバーがシュッとするで。再起動すんで。",
"downloadWin": "バージョニングする(Windowsのダウンローダ)",
"absolute": "絶対指定",
"srcUrl": "検索エンジン",
"srcUrlWarn": "{q}が検索文字列になるで。",
@@ -170,6 +171,8 @@
"template2": "macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}",
"template3": "",
"postartwork": "アルバムアートワークを付ける(Spotify)",
"searchArtwork": "アルバムアートワークが無い時補完する(macOS)",
"searchArtworkWarn": "アルバムアートワークが見つからん時には、APIを使うて適切やと推定されるアートワークをつけとくで。気に入らない場合はアップロード完了後にアルバムアートワークを副ボタンのクリック(右クリック)をしたら消せるで。",
"tts": "読み上げの設定",
"bouyomi": "棒読みちゃん連携",
"bouyomiWarn": "「棒読みちゃん用のWebSocket受付プラグイン」が要るで。",

View File

@@ -59,6 +59,9 @@
"lang_postimg_failupload": "アップロードに失敗しました。",
"lang_postimg_delete": "クリック: 画像に説明を追加/右クリック: 削除",
"lang_postimg_desc": "説明",
"lang_postimg_sync": "処理は同期的に行われます。最初にご確認ください→",
"lang_post_syncDetail": "同期アップロード",
"lang_post_syncDetailText": "小さな画像をアップロードするだけの場合、投稿可能になってすぐ投稿ボタンを押しても構いませんが、重いメディアの場合はしばらく待って、画像アイコンをクリックして、プレビューが表示されることを確認してからアップロードしてください。処理が完了している場合、各画像アイコンをクリックするとプレビューを取得します。",
"lang_postimg_leadContext": "画像を削除するためには右クリック",
"lang_post_tagTL": "デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。",
"lang_post_tagVis": "公開範囲が「公開」以外だと、タグTLに表示されません。(一部インスタンスを除く)",
@@ -67,6 +70,8 @@
"lang_post_btn1": "キャンセル(投稿しない)",
"lang_post_btn2": "自動でCWを付ける",
"lang_post_btn3": "そのまま投稿",
"lang_post_unfinishedMedia": "処理未了のメディアがあります。再試行してください。",
"lang_post_retry": "再試行",
"lang_status_favWarn": "お気に入り登録しました。インスタンスが違うときは時間がかかる場合があります。",
"lang_status_btWarn": "ブーストしました。インスタンスが違うときは時間がかかる場合があります。",
"lang_status_follow": "フォロー",

View File

@@ -38,6 +38,7 @@
"useragentWarn":"再起動します。",
"frame": "ウィンドウのフレーム",
"frameWarn": "フレーム無しだと、タイトルバーのデザインがクールになります。再起動します。",
"downloadWin": "バージョニングする(Windowsのダウンローダ)",
"absolute": "絶対指定",
"srcUrl": "検索エンジン",
"srcUrlWarn": "{q}が検索文字列に置換されます。",
@@ -171,7 +172,9 @@
"template1": "Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL",
"template2": "macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}",
"template3": "",
"postartwork": "アルバムアートワークを添付する(Spotify)",
"postartwork": "アルバムアートワークを添付する",
"searchArtwork": "アルバムアートワークが無い時補完する(macOS)",
"searchArtworkWarn": "アルバムアートワークが無い場合、APIを使用して適切だと推定されるアートワークを添付します。気に入らない場合はアップロード完了後にアルバムアートワークを副ボタンのクリック(右クリック)をして削除してください。",
"tts": "読み上げの設定",
"bouyomi": "棒読みちゃん連携",
"bouyomiWarn": "「棒読みちゃん用のWebSocket受付プラグイン」が必要です。",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Ja",
"no": "Nei",
"none": "Ingen",
"show": "Vis",
"hide": "Hide",
"default": "Standard",
"change": "Endre",
"select": "Velg",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Slå av maskinvareakselerasjon",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Temaer",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "Brukeragent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -184,5 +184,5 @@
"acctManDesc": "Добавьте больше аккаунтов и выйдите из них.",
"settingDesc": "Здесь очень много настроек. Вы не сможете проверить все!",
"nanoDescPlus": "Клиент мини-окна (экспериментальный)",
"menuDesc": "Все ежедневные настройки TheDesk и Mastodon, такие как <b>добавить и сортировать столбцы</b>, <b>список и проверка фильтра</b>."
}
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}

View File

@@ -4,6 +4,8 @@
"yes": "Да",
"no": "Нет",
"none": "None",
"show": "Показать",
"hide": "Hide",
"default": "Default",
"change": "Изменить",
"select": "Выбрать",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk использует это значение, когда он пытается сохранить фотографии или сделать скриншоты.",
"useragent": "User agent",
"useragentWarn": "Перезапустить, когда изменилось",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "абсолютное значение",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "默认",
"change": "Change",
"select": "Select",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -185,4 +185,4 @@
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}
}

View File

@@ -4,6 +4,8 @@
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Change",
"select": "Select",
@@ -16,7 +18,7 @@
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"theme": "Themes",
"popup": "Popup notification(on Windows)",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
"s": "sec",
"nativenotf": "Native notification",
@@ -34,6 +36,9 @@
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "absolute value",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",

View File

@@ -1,4 +1,11 @@
let ver = '20.2.0 (Kawaii)'
const fs = require('fs')
const path = require('path')
const basefile = path.join(__dirname, '../../')
const package = fs.readFileSync(basefile + 'package.json')
const data = JSON.parse(package)
const version = data.version
const codename = data.codename
let ver = `${version} (${codename})`
if (process.argv.indexOf('--automatic') === -1) {
let input = require('readline-sync').question('version string [empty: ' + ver + ' (default)]? ')
if (input) {
@@ -9,16 +16,14 @@ var pwa = false
if (process.argv.indexOf('--pwa') > 0) {
var pwa = true
}
const path = require('path')
const basefile = path.join(__dirname, '../../')
function main(ver, basefile, pwa) {
const fs = require('fs')
const execSync = require('child_process').execSync
let gitHash = execSync('git rev-parse HEAD')
.toString()
.trim()
fs.writeFileSync(basefile + 'git', gitHash)
console.log('Constructing view files ' + ver + ': make sure to update package.json')
console.log('Constructing view files ' + ver)
const langs = ['ja', 'ja-KS', 'en', 'bg', 'cs', 'de', 'es-AR', 'ps']
const langsh = [
'日本語',

View File

@@ -417,7 +417,18 @@
value="no" />
<span>@@no@@</span>
</label>
<h5>@@searchArtwork@@</h5>
@@searchArtworkWarn@@<br />
<label>
<input class="with-gap" onchange="aMusicFlagSave()" name="amw" type="radio" id="amw_yes"
value="yes" />
<span>@@yes@@</span>
</label>
<label>
<input class="with-gap" onchange="aMusicFlagSave()" name="amw" type="radio" id="amw_no"
value="no" />
<span>@@no@@</span>
</label>
<br>
</div>
</li>

View File

@@ -162,6 +162,16 @@ var envConstruction = [
}
]
}
},{
id: 'download',
storage: 'dl-win',
checkbox: true,
setValue: 'no',
text: {
head: '@@downloadWin@@',
desc: 'ex: TheDesk-1.0.0-setup.exe',
checkbox: yesno
}
}
]
var tlConstruction = [

View File

@@ -166,22 +166,42 @@
if (sel == "install") {
if (bit == "x64") {
var url = json["winx64"];
var file = "TheDesk-setup.exe";
if(localStorage.getItem("dl-win") == "yes") {
var file = "TheDesk-" + json.unique + "-setup.exe";
} else {
var file = "TheDesk-setup.exe";
}
} else if (bit == "ia32") {
var url = json["winia32"];
var file = "TheDesk-setup-ia32.exe";
if(localStorage.getItem("dl-win") == "yes") {
var file = "TheDesk-" + json.unique + "-setup-ia32.exe";
} else {
var file = "TheDesk-setup-ia32.exe";
}
}
} else if (sel == "portable") {
if (bit == "x64") {
var url = json["winx64p"];
var file = "TheDesk.exe";
if(localStorage.getItem("dl-win") == "yes") {
var file = "TheDesk-" + json.unique + ".exe";
} else {
var file = "TheDesk.exe";
}
} else if (bit == "ia32") {
var url = json["winia32p"];
var file = "TheDesk-ia32.exe";
if(localStorage.getItem("dl-win") == "yes") {
var file = "TheDesk-" + json.unique + "-ia32.exe";
} else {
var file = "TheDesk-ia32.exe";
}
}
} else if (sel == "linux") {
var url = json["linuxx64"];
var file = "thedesk.zip";
if(localStorage.getItem("dl-win") == "yes") {
var file = "thedesk-" + json.unique_linux + ".zip";
} else {
var file = "thedesk.zip";
}
} else if (sel == "linuxdeb") {
var url = json["linuxdeb"];
var file = "thedesk_" + json.unique_linux + "_amd64.deb";
@@ -199,9 +219,8 @@
postMessage(["sendSinmpleIpc", "quit"], "*");
}
function updateProg(arg) {
console.log(arg);
$(".determinate").css("width", arg * 100 + "%");
$("#prog").text(Math.floor(arg * 100) + "%");
$(".determinate").css("width", arg.percent * 100 + "%");
$("#prog").text(Math.floor(arg.percent * 100) + "%");
}
function updateMess(arg) {
console.log(arg);

File diff suppressed because it is too large Load Diff