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

sound

Browse Source
This commit is contained in:
Cutls
2019-04-15 00:45:04 +09:00
parent 4c375e2d0a
commit af97f88d0a
19 changed files with 438 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<!doctype html>
<html lang="en">
<html lang="en" style="overflow:scroll">
<head>
<title>Settings - TheDesk</title>
@@ -56,8 +56,8 @@
<div id="envView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.id=='notf'"><a onclick="notftest()"
class="pointer">Notification test</a><br></template>
@@ -85,7 +85,7 @@
</template>
</div>
<h5>Font</h5>
Select your favorite font to 'Select'<br>
Select your favorite font to 'Select'(Windows/ macOS only)<br>
<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
<br>
@@ -158,11 +158,11 @@
<input type="hidden" id="color-picker2_value">
</div>
<div>
<h5>Accent</h5>Background of boosts
<div id="color-picker3-wrap">
<div class="color-picker" id="color-picker3"></div>
</div>
<input type="hidden" id="color-picker3_value">
<h5>Accent</h5>Background of boosts
<div id="color-picker3-wrap">
<div class="color-picker" id="color-picker3"></div>
</div>
<input type="hidden" id="color-picker3_value">
</div>
</div>
<button class="btn-large waves-effect" onclick="customComp()">Change</button>&nbsp;<button
@@ -184,8 +184,8 @@
<div id="tlView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">
@@ -210,6 +210,11 @@
</template><br>
</template>
</div>
<h5>Custom sound</h5>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
</div>
</li>
<li>
@@ -220,8 +225,8 @@
<div id="postView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">

61
app/view/en/setting.vue.js
View File

@@ -7,6 +7,27 @@ var yesno=[
value:"no"
}
];
var sound=[
{
text:"None",
value:"none"
},{
text:"Default",
value:"default"
},{
text:"Custom 1",
value:"c1"
},{
text:"Custom 2",
value:"c2"
},{
text:"Custom 3",
value:"c3"
},{
text:"Custom 4",
value:"c4"
}
];
var envConstruction=[
{
id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
desc:"",
checkbox:yesno
}
},{
id:"replySound",
storage:"replySound",
checkbox:true,
setValue:"default",
text:{
head:"Sound(Reply)",
desc:"",
checkbox:sound
}
},{
id:"favSound",
storage:"favSound",
checkbox:true,
setValue:"default",
text:{
head:"Sound(Fav)",
desc:"",
checkbox:sound
}
},{
id:"btSound",
storage:"btSound",
checkbox:true,
setValue:"default",
text:{
head:"Sound(Boost)",
desc:"",
checkbox:sound
}
},{
id:"followSound",
storage:"followSound",
checkbox:true,
setValue:"default",
text:{
head:"Sound(Follow)",
desc:"",
checkbox:sound
}
}
];
var postConstruction=[

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

@@ -1,5 +1,5 @@
<!doctype html>
<html lang="ja">
<html lang="ja" style="overflow:scroll">
<head>
<title>Settings - TheDesk</title>
@@ -56,8 +56,8 @@
<div id="envView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.id=='notf'"><a onclick="notftest()"
class="pointer">通知テスト</a><br></template>
@@ -85,7 +85,7 @@
</template>
</div>
<h5>フォント</h5>
「選択」を押してフォントを選んでください。<br>
「選択」を押してフォントを選んでください。(Linuxでは動きません)<br>
<button class="btn waves-effect" style="width:100px;" onclick="font()">選択</button><br>
<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
<br>
@@ -158,11 +158,11 @@
<input type="hidden" id="color-picker2_value">
</div>
<div>
<h5>Accent</h5>ブーストの背景色など
<div id="color-picker3-wrap">
<div class="color-picker" id="color-picker3"></div>
</div>
<input type="hidden" id="color-picker3_value">
<h5>Accent</h5>ブーストの背景色など
<div id="color-picker3-wrap">
<div class="color-picker" id="color-picker3"></div>
</div>
<input type="hidden" id="color-picker3_value">
</div>
</div>
<button class="btn-large waves-effect" onclick="customComp()">変更</button>&nbsp;<button
@@ -184,8 +184,8 @@
<div id="tlView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">
@@ -210,6 +210,11 @@
</template><br>
</template>
</div>
<h5>カスタム通知音</h5>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
</div>
</li>
<li>
@@ -220,8 +225,8 @@
<div id="postView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">

61
app/view/ja/setting.vue.js
View File

@@ -7,6 +7,27 @@ var yesno=[
value:"no"
}
];
var sound=[
{
text:"なし",
value:"none"
},{
text:"既定",
value:"default"
},{
text:"Custom 1",
value:"c1"
},{
text:"Custom 2",
value:"c2"
},{
text:"Custom 3",
value:"c3"
},{
text:"Custom 4",
value:"c4"
}
];
var envConstruction=[
{
id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
desc:"",
checkbox:yesno
}
},{
id:"replySound",
storage:"replySound",
checkbox:true,
setValue:"default",
text:{
head:"リプライの通知音",
desc:"",
checkbox:sound
}
},{
id:"favSound",
storage:"favSound",
checkbox:true,
setValue:"default",
text:{
head:"お気に入り登録の通知音",
desc:"",
checkbox:sound
}
},{
id:"btSound",
storage:"btSound",
checkbox:true,
setValue:"default",
text:{
head:"ブーストの通知音",
desc:"",
checkbox:sound
}
},{
id:"followSound",
storage:"followSound",
checkbox:true,
setValue:"default",
text:{
head:"フォローの通知音",
desc:"",
checkbox:sound
}
}
];
var postConstruction=[

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

@@ -580,24 +580,18 @@ var tlid=0;
<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-Usamin_18-2-3" class="release-do" style="display:none; ">
<div id="release-Usamin_18-3-0" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Usamin (18.2.3)</h5>
・バグの修正
<h5>Release Note Usamin (18.2.0)</h5>
・tootsearchをひとつのカラムにしてエゴサが捗る<br>
・イントロダクション(初回起動時)の挙動修正<br>
・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
・(Misskey)MFM追加flipやjumpなど<br>
・(Misskey)リストに対応<br>
・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
・一部機能の統廃合とバグの修正<br>
・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
<h5>Release Note Usamin (18.3.0)</h5>
・(既定はオフ)ふぁぼ、フォロー、BTごとの通知音追加(なし/既定/カスタム(4種))<br>
・(Misskey)引用Renoteの簡易表示<br>
・(dtp-mstdn.jp他)引用(quote)の簡易表示<br>
<br>
通知音「Arctic Bleeze in East 7」はクリエイティブコモンズ(CC BY)で利用できます。<br>
(C) Cutls P 2019<s>GarageBand適当に叩いたらできた音ですのでご自由に変更どうぞ</s>
</div>
<div id="release-en">
<h5>Let's make it native!</h5>

9
app/view/make/language/setting.en.json
View File

@@ -3,6 +3,8 @@
"set":"Save",
"yes":"Yes",
"no":"No",
"none":"None",
"default":"Default",
"change":"Change",
"select":"Select",
"env":"System Preferences",
@@ -25,7 +27,7 @@
"fixwidthwarn":"",
"above":"above",
"font":"Font",
"fontwarn":"Select your favorite font to 'Select'",
"fontwarn":"Select your favorite font to 'Select'(Windows/ macOS only)",
"fontsize":"Font size",
"savefolder":"Folder to save",
"savefolderwarn":"TheDesk uses this value when it try to save pictures or take screenshots.",
@@ -85,6 +87,11 @@
"ticker":"Enable #InstanceTicker",
"tickerwarn":"Show colorful stickers about the server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
"animation":"Animation of timelines",
"replySound":"Sound(Reply)",
"favSound":"Sound(Fav)",
"btSound":"Sound(Boost)",
"followSound":"Sound(Follow)",
"customSound":"Custom sound",
"post":"Posting Preferences",
"autocw":"Alert before posting a long toot.",
"autocwwarn":"Show dialog whether you make too-long text hidden.",

9
app/view/make/language/setting.ja.json
View File

@@ -3,6 +3,8 @@
"set":"設定",
"yes":"はい",
"no":"いいえ",
"none":"なし",
"default":"既定",
"change":"変更",
"select":"選択",
"env":"環境設定",
@@ -25,7 +27,7 @@
"fixwidthwarn":"",
"above":"以上",
"font":"フォント",
"fontwarn":"「選択」を押してフォントを選んでください。",
"fontwarn":"「選択」を押してフォントを選んでください。(Linuxでは動きません)",
"fontsize":"フォントサイズ",
"savefolder":"デフォルトの保存先",
"savefolderwarn":"画像ダウンロードやスクリーンショットに影響します。",
@@ -85,6 +87,11 @@
"ticker":"#InstanceTickerを使う",
"tickerwarn":"トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://cdn.weep.me/mastodon/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
"animation":"タイムラインのアニメーション",
"replySound":"リプライの通知音",
"favSound":"お気に入り登録の通知音",
"btSound":"ブーストの通知音",
"followSound":"フォローの通知音",
"customSound":"カスタム通知音",
"post":"投稿設定",
"autocw":"長文投稿時に警告",
"autocwwarn":"下で指定した以上のトゥートを投稿するときにCWするかのダイアログを表示します。",

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

@@ -1,5 +1,5 @@
<!doctype html>
<html lang="@@lang@@">
<html lang="@@lang@@" style="overflow:scroll">
<head>
<title>Settings - TheDesk</title>
@@ -56,8 +56,8 @@
<div id="envView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.id=='notf'"><a onclick="notftest()"
class="pointer">@@nntest@@</a><br></template>
@@ -158,11 +158,11 @@
<input type="hidden" id="color-picker2_value">
</div>
<div>
<h5>Accent</h5>@@accent@@
<div id="color-picker3-wrap">
<div class="color-picker" id="color-picker3"></div>
</div>
<input type="hidden" id="color-picker3_value">
<h5>Accent</h5>@@accent@@
<div id="color-picker3-wrap">
<div class="color-picker" id="color-picker3"></div>
</div>
<input type="hidden" id="color-picker3_value">
</div>
</div>
<button class="btn-large waves-effect" onclick="customComp()">@@change@@</button>&nbsp;<button
@@ -184,8 +184,8 @@
<div id="tlView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">
@@ -210,6 +210,11 @@
</template><br>
</template>
</div>
<h5>@@customSound@@</h5>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
</div>
</li>
<li>
@@ -220,8 +225,8 @@
<div id="postView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">

61
app/view/make/setting.sample.js
View File

@@ -7,6 +7,27 @@ var yesno=[
value:"no"
}
];
var sound=[
{
text:"@@none@@",
value:"none"
},{
text:"@@default@@",
value:"default"
},{
text:"Custom 1",
value:"c1"
},{
text:"Custom 2",
value:"c2"
},{
text:"Custom 3",
value:"c3"
},{
text:"Custom 4",
value:"c4"
}
];
var envConstruction=[
{
id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
desc:"",
checkbox:yesno
}
},{
id:"replySound",
storage:"replySound",
checkbox:true,
setValue:"none",
text:{
head:"@@replySound@@",
desc:"",
checkbox:sound
}
},{
id:"favSound",
storage:"favSound",
checkbox:true,
setValue:"none",
text:{
head:"@@favSound@@",
desc:"",
checkbox:sound
}
},{
id:"btSound",
storage:"btSound",
checkbox:true,
setValue:"none",
text:{
head:"@@btSound@@",
desc:"",
checkbox:sound
}
},{
id:"followSound",
storage:"followSound",
checkbox:true,
setValue:"none",
text:{
head:"@@followSound@@",
desc:"",
checkbox:sound
}
}
];
var postConstruction=[

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

@@ -1,5 +1,5 @@
<!doctype html>
<html lang="ps">
<html lang="ps" style="overflow:scroll">
<head>
<title>Settings - TheDesk</title>
@@ -56,8 +56,8 @@
<div id="envView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.id=='notf'"><a onclick="notftest()"
class="pointer">crwdns540:0crwdne540:0</a><br></template>
@@ -158,11 +158,11 @@
<input type="hidden" id="color-picker2_value">
</div>
<div>
<h5>Accent</h5>crwdns2434:0crwdne2434:0
<div id="color-picker3-wrap">
<div class="color-picker" id="color-picker3"></div>
</div>
<input type="hidden" id="color-picker3_value">
<h5>Accent</h5>crwdns2434:0crwdne2434:0
<div id="color-picker3-wrap">
<div class="color-picker" id="color-picker3"></div>
</div>
<input type="hidden" id="color-picker3_value">
</div>
</div>
<button class="btn-large waves-effect" onclick="customComp()">crwdns528:0crwdne528:0</button>&nbsp;<button
@@ -184,8 +184,8 @@
<div id="tlView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">
@@ -210,6 +210,11 @@
</template><br>
</template>
</div>
<h5>@@customSound@@</h5>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
</div>
</li>
<li>
@@ -220,8 +225,8 @@
<div id="postView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if=item.text.desc>
<templete v-html=item.text.desc></templete><br>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">

61
app/view/ps/setting.vue.js
View File

@@ -7,6 +7,27 @@ var yesno=[
value:"no"
}
];
var sound=[
{
text:"@@none@@",
value:"none"
},{
text:"@@default@@",
value:"default"
},{
text:"Custom 1",
value:"c1"
},{
text:"Custom 2",
value:"c2"
},{
text:"Custom 3",
value:"c3"
},{
text:"Custom 4",
value:"c4"
}
];
var envConstruction=[
{
id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
desc:"",
checkbox:yesno
}
},{
id:"replySound",
storage:"replySound",
checkbox:true,
setValue:"default",
text:{
head:"@@replySound@@",
desc:"",
checkbox:sound
}
},{
id:"favSound",
storage:"favSound",
checkbox:true,
setValue:"default",
text:{
head:"@@favSound@@",
desc:"",
checkbox:sound
}
},{
id:"btSound",
storage:"btSound",
checkbox:true,
setValue:"default",
text:{
head:"@@btSound@@",
desc:"",
checkbox:sound
}
},{
id:"followSound",
storage:"followSound",
checkbox:true,
setValue:"default",
text:{
head:"@@followSound@@",
desc:"",
checkbox:sound
}
}
];
var postConstruction=[