Titlebar(test)

2019-03-13 00:51:07 +09:00
parent 28e39cdd3d
commit 2856aec405
28 changed files with 240 additions and 63 deletions
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -125,7 +125,6 @@ var tlid=0;
 <span class="sml gray pointer anti-markdown mize">
 <a onclick="mdToggle()">Markdownエディタを表示</a>
 </span>
-<span id="suggest"></span>
 </div>
 <div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 		<i class="waves-effect gray material-icons" id="nsfw" title="Mark media as sensitive" onclick="nsfw()">visibility_off</i>
@@ -202,6 +201,7 @@ var tlid=0;
 </div>
 </div>
 <div id="right-side">
+<div id="suggest"></div>
 <!--絵文字ピッカー-->
 <div id="emoji" class="hide">
 		<span class="gray sml">
@@ -879,4 +879,5 @@ var tlid=0;
 <script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
 <script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
 <script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/ui/menubar.js"></script>
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -255,6 +255,11 @@
 		<label for="anime_yes">Yes</label>
 		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
 		<label for="anime_no">No</label>
+		<br>
+		<h5>{{actionBtns}}</h5>
+		<input type="text" style="width:150px" id="action_btns"><br>
+		{{actionBtnsDesc}}<br>
+		{{alltoots}}<input type="text" style="width:50px" id="icons">{{icons}}
 	</div>
 	</li>
 	<li>
@@ -320,8 +325,9 @@
 		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_mention" value="mention" />
 		<label for="q_mention">URL and acct(mention to the user)</label>
 		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_full" value="full" />
-		<label for="q_full">URL, text and acct(mention to the user)
-		</label>
+		<label for="q_full">URL, text and acct(mention to the user)</label>
+		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_nothing" value="nothing" />
+		<label for="q_nothing">Disabled(Hide buttons on TLs)</label>
 		<br>
 		<h5>Default accounts of actions</h5>
 		Main account can be set on Account Manager.<br>
@@ -462,6 +468,7 @@
 <li>X:Toggle toot box</li>
 <li>Ctrl+Enter:Post</li>
 <li>Ctrl+Enter+Shift:Post(secondary toot)</li>
+<li>Alt+Enter:Secondary Toot Button</li>
 <li>Ctrl+E:Make all notifications read</li>
 <li>Esc:Hide toot box</li>
 <li>F5:Super Reload</li>
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -125,7 +125,6 @@ var tlid=0;
 <span class="sml gray pointer anti-markdown mize">
 <a onclick="mdToggle()">Markdownエディタを表示</a>
 </span>
-<span id="suggest"></span>
 </div>
 <div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 		<i class="waves-effect gray material-icons" id="nsfw" title="画像に制限を付与" onclick="nsfw()">visibility_off</i>
@@ -202,6 +201,7 @@ var tlid=0;
 </div>
 </div>
 <div id="right-side">
+<div id="suggest"></div>
 <!--絵文字ピッカー-->
 <div id="emoji" class="hide">
 		<span class="gray sml">サーバーによって実装が異なります。
@@ -879,4 +879,5 @@ var tlid=0;
 <script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
 <script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
 <script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/ui/menubar.js"></script>
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -255,6 +255,11 @@
 		<label for="anime_yes">はい</label>
 		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
 		<label for="anime_no">いいえ</label>
+		<br>
+		<h5>{{actionBtns}}</h5>
+		<input type="text" style="width:150px" id="action_btns"><br>
+		{{actionBtnsDesc}}<br>
+		{{alltoots}}<input type="text" style="width:50px" id="icons">{{icons}}
 	</div>
 	</li>
 	<li>
@@ -320,8 +325,9 @@
 		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_mention" value="mention" />
 		<label for="q_mention">URLとアカウント名(相手に通知)</label>
 		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_full" value="full" />
-		<label for="q_full">本文・URL・アカウント名
-		</label>
+		<label for="q_full">本文・URL・アカウント名</label>
+		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_nothing" value="nothing" />
+		<label for="q_nothing">使わない(TL上にボタンも表示されません)</label>
 		<br>
 		<h5>投稿後や起動時のアカウント</h5>
 		メインアカウントはアカウント設定で指定できます。投稿以外のアカウント選択にも影響します。<br>
@@ -462,6 +468,7 @@
 <li>X:投稿パネルを開閉</li>
 <li>Ctrl+Enter:投稿</li>
 <li>Ctrl+Enter+Shift:投稿(セカンダリートゥート)</li>
+<li>Alt+Enter:セカンダリートゥートボタン</li>
 <li>Ctrl+E:全ての通知を既読にする</li>
 <li>Esc:投稿パネルを消す</li>
 <li>F5:スーパーリロード</li>
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -125,7 +125,6 @@ var tlid=0;
 <span class="sml gray pointer anti-markdown mize">
 <a onclick="mdToggle()">Markdownエディタを表示</a>
 </span>
-<span id="suggest"></span>
 </div>
 <div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 		<i class="waves-effect gray material-icons" id="nsfw" title="{{nsfwDes}}" onclick="nsfw()">visibility_off</i>
@@ -202,6 +201,7 @@ var tlid=0;
 </div>
 </div>
 <div id="right-side">
+<div id="suggest"></div>
 <!--絵文字ピッカー-->
 <div id="emoji" class="hide">
 		<span class="gray sml">{{emojiWarn}}
@@ -582,17 +582,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-Miria_17-2-0" class="release-do" style="display:none; ">
+			<div id="release-Miria_17-2-1" 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 Miria (17.2.0)</h5>
-					カスタムテーマを実装。Misskeyのテーマとの一定の互換性あり。<a href="https://assets.msky.cafe/" target="_blank">MiAS</a>から80を超えるテーマを入手。
-					<a href="https://thedesk.top/mias.html">注意点</a><br>
-					Misskeyのログイン方法変更につき、いちいちDevCenterに行かなくてもよくなりました。<br>
-					日本語でベタ書きしていたダイアログを一部多言語対応に変更。<br>
-					
+					<h5>Release Note Miria (17.2.1)</h5>
+					Alt+Enterでセカンダリートゥートボタン<br>
+					引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
+					実況機能をまともに書き直した。<br>
+					サジェストをトゥートボックスの右に<br>
+					ハードウェアアクセラレーションを無効化するオプション。(設定の表示などが乱れるときに設定)<br>
+					返信時に「@」が複数含まれない仕様を訂正<br>
 					<img class="emoji" draggable="false" alt="⚠" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">TheDeskのMisskeyについての機能追加は終了しています。<br>
 			</div>
 			<br><br>
@@ -879,4 +880,5 @@ var tlid=0;
 <script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
 <script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
 <script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/ui/menubar.js"></script>
--- a/app/view/make/language/setting.en.json
+++ b/app/view/make/language/setting.en.json
@@ -104,6 +104,7 @@
    "simple":"Only URL",
    "mention":"URL and acct(mention to the user)",
    "full":"URL, text and acct(mention to the user)",
+    "notqt":"Disabled(Hide buttons on TLs)",
    "main":"Default accounts of actions",
    "mainwarn":"Main account can be set on Account Manager.",
    "lastacct":"Account you used recently",
--- a/app/view/make/language/setting.ja.json
+++ b/app/view/make/language/setting.ja.json
@@ -104,6 +104,7 @@
    "simple":"URLのみ",
    "mention":"URLとアカウント名(相手に通知)",
    "full":"本文・URL・アカウント名",
+    "notqt":"使わない(TL上にボタンも表示されません)",
    "main":"投稿後や起動時のアカウント",
    "mainwarn":"メインアカウントはアカウント設定で指定できます。投稿以外のアカウント選択にも影響します。",
    "lastacct":"最後に使用したアカウント",
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -255,6 +255,11 @@
 		<label for="anime_yes">{{yes}}</label>
 		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
 		<label for="anime_no">{{no}}</label>
+		<br>
+		<h5>{{actionBtns}}</h5>
+		<input type="text" style="width:150px" id="action_btns"><br>
+		{{actionBtnsDesc}}<br>
+		{{alltoots}}<input type="text" style="width:50px" id="icons">{{icons}}
 	</div>
 	</li>
 	<li>
@@ -320,8 +325,9 @@
 		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_mention" value="mention" />
 		<label for="q_mention">{{mention}}</label>
 		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_full" value="full" />
-		<label for="q_full">{{full}}
-		</label>
+		<label for="q_full">{{full}}</label>
+		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_nothing" value="nothing" />
+		<label for="q_nothing">{{notqt}}</label>
 		<br>
 		<h5>{{main}}</h5>
 		{{mainwarn}}<br>
@@ -462,6 +468,7 @@
 <li>X:{{keytoggle}}</li>
 <li>Ctrl+Enter:{{keypost}}</li>
 <li>Ctrl+Enter+Shift:{{keysecpost}}</li>
+<li>Alt+Enter:{{secondary}}</li>
 <li>Ctrl+E:{{keyunread}}</li>
 <li>Esc:{{keyesc}}</li>
 <li>F5:{{keyf5}}</li>
--- a/app/view/ps/acct.html
+++ b/app/view/ps/acct.html
@@ -20,13 +20,13 @@ body,html{overflow-y: scroll;}
 .card .colorsel div.exc{width:40px;height:20px;}
 </style>
 <meta charset="utf-8">
-{{comment-start}}
+
 <script type="text/javascript">
 	var _jipt = [];
 	_jipt.push(['project', 'thedesk']);
 </script>
 <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-{{comment-end}}
+
 </head>
 <body id="mainView">
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@@ -13,13 +13,13 @@
 	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
-	{{comment-start}}
+	
 	<script type="text/javascript">
 		var _jipt = [];
 		_jipt.push(['project', 'thedesk']);
 	</script>
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-	{{comment-end}}
+	
 </head>
 <body>
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
@@ -125,7 +125,6 @@ var tlid=0;
 <span class="sml gray pointer anti-markdown mize">
 <a onclick="mdToggle()">Markdownエディタを表示</a>
 </span>
-<span id="suggest"></span>
 </div>
 <div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 		<i class="waves-effect gray material-icons" id="nsfw" title="crwdns389:0crwdne389:0" onclick="nsfw()">visibility_off</i>
@@ -202,6 +201,7 @@ var tlid=0;
 </div>
 </div>
 <div id="right-side">
+<div id="suggest"></div>
 <!--絵文字ピッカー-->
 <div id="emoji" class="hide">
 		<span class="gray sml">crwdns409:0crwdne409:0
@@ -879,4 +879,5 @@ var tlid=0;
 <script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
 <script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
 <script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/ui/menubar.js"></script>
--- a/app/view/ps/setting.html
+++ b/app/view/ps/setting.html
@@ -2,13 +2,13 @@
 <html lang="ps">
 <head>
 	<title>Settings - TheDesk</title>
-	{{comment-start}}
+	
 	<script type="text/javascript">
 		var _jipt = [];
 		_jipt.push(['project', 'thedesk']);
 	</script>
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-	{{comment-end}}
+	
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
@@ -255,6 +255,11 @@
 		<label for="anime_yes">crwdns526:0crwdne526:0</label>
 		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
 		<label for="anime_no">crwdns527:0crwdne527:0</label>
+		<br>
+		<h5>{{actionBtns}}</h5>
+		<input type="text" style="width:150px" id="action_btns"><br>
+		{{actionBtnsDesc}}<br>
+		{{alltoots}}<input type="text" style="width:50px" id="icons">{{icons}}
 	</div>
 	</li>
 	<li>
@@ -320,8 +325,9 @@
 		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_mention" value="mention" />
 		<label for="q_mention">crwdns605:0crwdne605:0</label>
 		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_full" value="full" />
-		<label for="q_full">crwdns606:0crwdne606:0
-		</label>
+		<label for="q_full">crwdns606:0crwdne606:0</label>
+		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_nothing" value="nothing" />
+		<label for="q_nothing">{{notqt}}</label>
 		<br>
 		<h5>crwdns607:0crwdne607:0</h5>
 		crwdns608:0crwdne608:0<br>
@@ -462,6 +468,7 @@
 <li>X:crwdns650:0crwdne650:0</li>
 <li>Ctrl+Enter:crwdns651:0crwdne651:0</li>
 <li>Ctrl+Enter+Shift:crwdns1924:0crwdne1924:0</li>
+<li>Alt+Enter:crwdns1916:0crwdne1916:0</li>
 <li>Ctrl+E:crwdns652:0crwdne652:0</li>
 <li>Esc:crwdns653:0crwdne653:0</li>
 <li>F5:crwdns654:0crwdne654:0</li>
--- a/app/view/ps/update.html
+++ b/app/view/ps/update.html
@@ -6,13 +6,13 @@
 <link href="../../css/master.css" type="text/css" rel="stylesheet">
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 <meta charset="utf-8">
-{{comment-start}}
+
 <script type="text/javascript">
 	var _jipt = [];
 	_jipt.push(['project', 'thedesk']);
 </script>
 <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-{{comment-end}}
+
 </head>
 <body>
 <style>