fix keyboard layout

This commit is contained in:
cutls 2021-06-02 15:19:58 +09:00
parent bdae21bd12
commit d6fd519086
3 changed files with 606 additions and 584 deletions

View File

@ -11,9 +11,11 @@ var envView = new Vue({
} else { } else {
ls = ls.data ls = ls.data
} }
console.log(ls)
for (var j = 0; j < ls.length; j++) { for (var j = 0; j < ls.length; j++) {
var id = ls[j].id var lsi = ls[j]
localStorage.setItem(ls[j].storage, val) if (!val || j > 0) val = lsi.setValue
localStorage.setItem(lsi.storage, val)
} }
if (ls[0].id == 'ha') { if (ls[0].id == 'ha') {
hardwareAcceleration(val) hardwareAcceleration(val)
@ -185,6 +187,7 @@ function load() {
//$("#log").val(localStorage.getItem("errors")) //$("#log").val(localStorage.getItem("errors"))
$('#lastFmUser').val(localStorage.getItem('lastFmUser')) $('#lastFmUser').val(localStorage.getItem('lastFmUser'))
} }
function customVol() { function customVol() {
var cvol = $('#soundvol').val() var cvol = $('#soundvol').val()
$('#soundVolVal').text(cvol) $('#soundVolVal').text(cvol)
@ -241,6 +244,7 @@ function climute() {
}) })
} }
} }
function cliMuteDel(key) { function cliMuteDel(key) {
var cli = localStorage.getItem('client_mute') var cli = localStorage.getItem('client_mute')
var obj = JSON.parse(cli) var obj = JSON.parse(cli)
@ -260,6 +264,7 @@ function wordmute() {
data: obj, data: obj,
}) })
} }
function wordmuteSave() { function wordmuteSave() {
var word = M.Chips.getInstance($('#wordmute')).chipsData var word = M.Chips.getInstance($('#wordmute')).chipsData
var json = JSON.stringify(word) var json = JSON.stringify(word)
@ -276,11 +281,13 @@ function wordemp() {
data: obj, data: obj,
}) })
} }
function wordempSave() { function wordempSave() {
var word = M.Chips.getInstance($('#wordemp')).chipsData var word = M.Chips.getInstance($('#wordemp')).chipsData
var json = JSON.stringify(word) var json = JSON.stringify(word)
localStorage.setItem('word_emp', json) localStorage.setItem('word_emp', json)
} }
function notftest() { function notftest() {
var os = localStorage.getItem('platform') var os = localStorage.getItem('platform')
var options = { var options = {
@ -289,11 +296,13 @@ function notftest() {
} }
var n = new Notification('TheDesk' + lang.lang_setting_notftest, options) var n = new Notification('TheDesk' + lang.lang_setting_notftest, options)
} }
function oks(no) { function oks(no) {
var txt = $('#oks-' + no).val() var txt = $('#oks-' + no).val()
localStorage.setItem('oks-' + no, txt) localStorage.setItem('oks-' + no, txt)
M.toast({ html: lang.lang_setting_ksref, displayLength: 3000 }) M.toast({ html: lang.lang_setting_ksref, displayLength: 3000 })
} }
function oksload() { function oksload() {
if (localStorage.getItem('oks-1')) { if (localStorage.getItem('oks-1')) {
$('#oks-1').val(localStorage.getItem('oks-1')) $('#oks-1').val(localStorage.getItem('oks-1'))
@ -305,11 +314,13 @@ function oksload() {
$('#oks-3').val(localStorage.getItem('oks-3')) $('#oks-3').val(localStorage.getItem('oks-3'))
} }
} }
function changeLang() { function changeLang() {
const lang = $('#langsel-sel').val() const lang = $('#langsel-sel').val()
console.log(lang) console.log(lang)
if (lang) postMessage(['lang', lang], '*') if (lang) postMessage(['lang', lang], '*')
} }
function exportSettings() { function exportSettings() {
var exp = exportSettingsCore() var exp = exportSettingsCore()
$('#imp-exp').val(JSON5.stringify(exp)) $('#imp-exp').val(JSON5.stringify(exp))
@ -326,6 +337,7 @@ function exportSettings() {
} }
}) })
} }
function exportSettingsCore() { function exportSettingsCore() {
var exp = {} var exp = {}
//Accounts //Accounts
@ -391,6 +403,7 @@ function exportSettingsCore() {
exp.meta.platform = localStorage.getItem('platform') exp.meta.platform = localStorage.getItem('platform')
return exp return exp
} }
function importSettings() { function importSettings() {
Swal.fire({ Swal.fire({
title: 'Warning', title: 'Warning',
@ -409,6 +422,7 @@ function importSettings() {
} }
}) })
} }
function importSettingsCore(obj) { function importSettingsCore(obj) {
if (obj) { if (obj) {
localStorage.clear() localStorage.clear()
@ -502,6 +516,7 @@ function importSettingsCore(obj) {
}) })
} }
} }
function savefolder() { function savefolder() {
postMessage(['sendSinmpleIpc', 'savefolder'], '*') postMessage(['sendSinmpleIpc', 'savefolder'], '*')
} }
@ -514,6 +529,7 @@ function font() {
$('#fonts').addClass('hide') $('#fonts').addClass('hide')
} }
} }
function fontList(arg) { function fontList(arg) {
$('#fonts').removeClass('hide') $('#fonts').removeClass('hide')
for (var i = 0; i < arg.length; i++) { for (var i = 0; i < arg.length; i++) {
@ -521,10 +537,12 @@ function fontList(arg) {
$('#fonts').append('<div class="font pointer" style="font-family:' + font + '" onclick="insertFont(\'' + font + '\')">' + font + '</div>') $('#fonts').append('<div class="font pointer" style="font-family:' + font + '" onclick="insertFont(\'' + font + '\')">' + font + '</div>')
} }
} }
function insertFont(name) { function insertFont(name) {
$('#fonts').addClass('hide') $('#fonts').addClass('hide')
$('#font').val(name) $('#font').val(name)
} }
function copyColor(from, to) { function copyColor(from, to) {
let props = [ let props = [
'background', 'subcolor', 'text', 'accent', 'background', 'subcolor', 'text', 'accent',
@ -559,6 +577,7 @@ function copyColor(from, to) {
i++ i++
} }
} }
function customComp(preview) { function customComp(preview) {
var nameC = $('#custom_name').val() var nameC = $('#custom_name').val()
if (!nameC && !preview) { if (!nameC && !preview) {
@ -623,6 +642,7 @@ function customComp(preview) {
} }
} }
function deleteIt() { function deleteIt() {
var id = $('#custom-sel-sel').val() var id = $('#custom-sel-sel').val()
$('#custom_name').val('') $('#custom_name').val('')
@ -635,9 +655,11 @@ function deleteIt() {
} }
postMessage(['themeJsonDelete', id + '.thedesktheme'], '*') postMessage(['themeJsonDelete', id + '.thedesktheme'], '*')
} }
function ctLoad() { function ctLoad() {
postMessage(['sendSinmpleIpc', 'theme-json-list'], '*') postMessage(['sendSinmpleIpc', 'theme-json-list'], '*')
} }
function ctLoadCore(args) { function ctLoadCore(args) {
var template = '' var template = ''
var editTemplate = '' var editTemplate = ''

View File

@ -27,7 +27,7 @@
<body class=""> <body class="">
<script> <script>
var ver = '22.2.0 (Koume)' var ver = '22.2.0 (Koume)'
var gitHash = '8acf86d9cb88488a71de6a158f6bdab4b09ae2d9' var gitHash = 'bdae21bd12da4c1a23f57188586622db7915422d'
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//var ver="beta"; //var ver="beta";
var acct_id = 0 var acct_id = 0

View File

@ -688,7 +688,7 @@
style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25" style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25"
style="padding-top:5px;">Main author: Cutls@1m.cutls.com</a> style="padding-top:5px;">Main author: Cutls@1m.cutls.com</a>
<br> <br>
TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/8acf86d9cb88488a71de6a158f6bdab4b09ae2d9">8acf86d9cb88488a71de6a158f6bdab4b09ae2d9</a> - <a TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/bdae21bd12da4c1a23f57188586622db7915422d">bdae21bd12da4c1a23f57188586622db7915422d</a> - <a
onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';" onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';"
class="pointer pwa">Sprawdź aktualizacje</a><br> class="pointer pwa">Sprawdź aktualizacje</a><br>
<br> <br>
@ -698,7 +698,7 @@
<img src="https://status.cutls.com/badge-service?site=thedesk.top"> <img src="https://status.cutls.com/badge-service?site=thedesk.top">
</a><br> </a><br>
<h5>OSS License</h5> <h5>OSS License</h5>
<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/8acf86d9cb88488a71de6a158f6bdab4b09ae2d9" <a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/bdae21bd12da4c1a23f57188586622db7915422d"
alt="FOSSA Status"><img alt="FOSSA Status"><img
src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a> src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a>
<br> <br>