Merge pull request #33 from cutls/WIP-(before-CI)

TheDesk Usamin (18.0.3)

README.md

@@ -11,6 +11,11 @@ Contact me(bug report...):GitHub Issues, mention to [Cutls@kirishima.cloud](http
 
 バグレポートなど:GitHub Issuesや[Cutls@kirishima.cloud](https://kirishima.cloud/@Cutls)へのリプ,または#Deskでトゥートして下さい.  
 
+### Contribute/コントリビュート
+
+Please make a pull request to ***WIP(before CI)*** brunch  
+***WIP(before CI)*** ブランチにプルリクエストをお願いします。
+
 ## License/ライセンス
 
 [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)  

app/css/tl.css

@@ -419,10 +419,6 @@ p:not(:last-child){
   max-height: 190px;
   overflow-y: scroll;
 }
-.u-url {
-  color: var(--color);
-  cursor: text;
-}
 .type-b{
   display:none;
 }

app/js/common/version.js

@@ -14,7 +14,12 @@ function verck(ver) {
 			verp=verp.replace( ')', '');
 			verp=verp.replace( ' ', '_');
 			console.log(verp);
-			$("#release-"+verp).show();
+			if(lang.language=="ja"){
+				$("#release-"+verp).show();
+			}else{
+				$("#release-en").show();
+			}
+			
 		  });
 	}
 	var electron = require("electron");

app/js/lang/lang.en.js

@@ -184,6 +184,7 @@ var lang={
     "lang_parse_vote":"Voted",
     "lang_parse_unvoted":"Show the result without voting",
     "lang_parse_endedvote":"Expired",
+    "lang_parse_thread":"Show thread",
     //misskey
     "lang_misskeyparse_renote":"Repost",
     "lang_misskeyparse_renoteqt":"Renote",

app/js/lang/lang.ja.js

@@ -184,6 +184,7 @@ var lang={
     "lang_parse_vote":"投票",
     "lang_parse_unvoted":"結果だけ見る",
     "lang_parse_endedvote":"終了済み",
+    "lang_parse_thread":"会話を表示",
     //misskey
     "lang_misskeyparse_renote":"再投稿",
     "lang_misskeyparse_renoteqt":"引用",

app/js/post/secure.js

@@ -60,7 +60,7 @@ function loadVis(){
 					memory = "public";
 				}
 				vis(memory);
-			} else if(vist == "server") {
+			} else if(vist == "useapi") {
 				var acct_id = $("#post-acct-sel").val();
 				var multi = localStorage.getItem("multi");
 				var obj = JSON.parse(multi);

app/js/tl/datails.js

@@ -1,6 +1,11 @@
 //トゥートの詳細
-function details(id, acct_id, tlid) {
+function details(id, acct_id, tlid, mode) {
-	$(".toot-reset").html(lang.lang_details_nodata);
+	if(mode=="dm"){
+		$(".dm-hide").hide();
+	}else{
+		$(".dm-hide").show();
+	}
+	$(".toot-reset").html('<span class="no-data">'+lang.lang_details_nodata+'</span>');
 	var html = $("#timeline_"+tlid+" [toot-id=" + id + "]").html();
 	$("#toot-this").html(html);
 	$('#tootmodal').modal('open');
@@ -149,6 +154,9 @@ function replyTL(id, acct_id) {
 			}
 		}else{
 			var templete = parse([json], '', acct_id,"","",mute);
+			if(templete!=""){
+				$("#toot-reply .no-data").hide();
+			}
 			$("#toot-reply").prepend(templete);
 			$("#toot-reply .hide").html(lang.lang_details_filtered);
 			$("#toot-reply .by_filter").css("display","block");
@@ -211,6 +219,9 @@ function context(id, acct_id) {
 				var mute=[];
 			}
 			var templete = parse(json.descendants, '', acct_id,"","",mute);
+			if(templete!=""){
+				$("#toot-after .no-data").hide();
+			}
 			$("#toot-after").html(templete);
 			$("#toot-after .hide").html(lang.lang_details_filtered);
 			$("#toot-after .by_filter").css("display","block");
@@ -262,6 +273,9 @@ function beforeToot(id, acct_id, domain) {
 			console.error(error);
 		}).then(function(json) {
 			var templete = parse(json, 'noauth', acct_id);
+			if(templete!=""){
+				$("#toot-before .no-data").hide();
+			}
 			$("#toot-before").html(templete);
 			jQuery("time.timeago").timeago();
 		});
@@ -309,6 +323,9 @@ function userToot(id, acct_id, user) {
 			console.error(error);
 		}).then(function(json) {
 			var templete = parse(json, '', acct_id);
+			if(templete!=""){
+				$("#user-before .no-data").hide();
+			}
 			$("#user-before").html(templete);
 			jQuery("time.timeago").timeago();
 		});
@@ -335,6 +352,9 @@ function faved(id, acct_id) {
 		console.error(error);
 	}).then(function(json) {
 		var templete = userparse(json, '', acct_id);
+		if(templete!=""){
+			$("#toot-fav .no-data").hide();
+		}
 		$("#toot-fav").html(templete);
 	});
 }

app/js/tl/dm.js

@@ -16,7 +16,7 @@ function dm(acct_id, tlid, type,delc,voice) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
-        var templete = dmParse(json, type, acct_id, tlid, "", mute);
+        var templete = '<div id="convList'+tlid+'">'+dmListParse(json, type, acct_id, tlid, "", mute)+'</div>';
         localStorage.setItem("lastobj_"+ tlid,json[0].id)
         $("#timeline_" + tlid).html(templete);
 	    additional(acct_id, tlid);
@@ -27,9 +27,37 @@ function dm(acct_id, tlid, type,delc,voice) {
     });
     
 }
+function dmmore(tlid){
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	var acct_id = obj[tlid].domain;
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
+	var start = "https://" + domain + "/api/v1/conversations?max_id="+sid;
+	var type="dm";
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		todo(error);
+		console.error(error);
+	}).then(function(json) {
+		var templete = '<div id="convList'+tlid+'">'+dmListParse(json, type, acct_id, tlid, "", mute)+'</div>';
+        $("#timeline_" + tlid).append(templete);
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+			moreloading=false;
+	})
+}
 //DMオブジェクトパーサー(トゥート)
-function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) {
+function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
-    console.log(obj);
+	console.log(obj);
 	var templete = '';
 	if(obj[0]){
 		localStorage.setItem("lastunix_"+ tlid,date(obj[0].created_at, 'unix'));
@@ -172,6 +200,7 @@ function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	var local = [];
 	var times=[];
 	Object.keys(obj).forEach(function(key) {
+		var conv_id=obj[key].id;
 		var toot = obj[key].last_status;
 		var dis_name=escapeHTML(toot.account.display_name);
 		if(toot.account.emojis){
@@ -373,60 +402,6 @@ function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 			tags = '<div style="float:right">' + tags + '</div>';
 		}
-		//リプ数
-		if(toot.replies_count || toot.replies_count===0){
-			var replyct=toot.replies_count;
-		}else{
-			var replyct="";
-        }
-		//公開範囲を取得
-		var vis = "";
-		var visen = toot.visibility;
-		if (visen == "public") {
-			var vis =
-				'<i class="text-darken-3 material-icons gray sml vis-data pointer" title="'+lang.lang_parse_public+'('+lang.lang_parse_clickcopy+')" data-vis="public" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">public</i>';
-			var can_rt = "";
-		} else if (visen == "unlisted") {
-			var vis =
-				'<i class="text-darken-3 material-icons blue-text vis-data pointer" title="'+lang.lang_parse_unlisted+'('+lang.lang_parse_clickcopy+')" data-vis="unlisted" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock_open</i>';
-			var can_rt = "";
-		} else if (visen == "private") {
-			var vis =
-				'<i class="text-darken-3 material-icons orange-text vis-data pointer" title="'+lang.lang_parse_private+'('+lang.lang_parse_clickcopy+')" data-vis="private" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock</i>';
-			var can_rt = "hide";
-		} else if (visen == "direct") {
-			var vis =
-				'<i class="text-darken-3 material-icons red-text vis-data pointer" title="'+lang.lang_parse_direct+'('+lang.lang_parse_clickcopy+')" data-vis="direct" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">mail</i>';
-			var can_rt = "hide";
-		}
-		if (toot.account.acct == localStorage.getItem("user_" + acct_id)) {
-			var if_mine = "";
-			var mine_via="type-b";
-		} else {
-			var if_mine = "hide";
-			var mine_via="";
-		}
-		if (toot.favourited) {
-			var if_fav = " yellow-text";
-			var fav_app = "faved";
-		} else {
-			var if_fav = "";
-			var fav_app = "";
-		}
-		if (toot.reblogged) {
-			var if_rt = "teal-text";
-			var rt_app = "rted";
-		} else {
-			var if_rt = "";
-			var rt_app = "";
-		}
-		if (toot.pinned) {
-			var if_pin = "blue-text";
-			var pin_app = "pinned";
-		} else {
-			var if_pin = "";
-			var pin_app = "";
-		}
 		//アニメ再生
 		if (gif == "yes") {
 			var avatar = toot.account.avatar;
@@ -467,6 +442,13 @@ function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}else{
 			var trans="";
 		}
+		if (toot.favourited) {
+			var if_fav = " yellow-text";
+			var fav_app = "faved";
+		} else {
+			var if_fav = "";
+			var fav_app = "";
+		}
 		//Cards
 		if (!card && toot.card) {
 			var cards=toot.card;
@@ -508,7 +490,7 @@ function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
-			boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
+			boostback + ' ' + fav_app + 
 			' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
 				key].created_at, 'unix') + '" '+if_notf+' onclick="dmStatus()">' +
 			'<div class="area-notice"><span class="gray sharesta">' + notice + home +
@@ -532,9 +514,10 @@ function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'</span><span class="toot ' + spoiler + '">' + content +
 			'</span>' +
 			'' + viewer + '' +
-			'</div>'+
+			'<br><a onclick="details(\'' + toot.id + '\',' + acct_id +
+			',\''+tlid+'\',\'dm\')" class="pointer waves-effect">'+lang.lang_parse_thread+'</a></div>'+
 			'<div class="area-vis"></div>'+
 			'</div></div>';
 	});
 	return templete;
-}
+}

app/js/tl/mix.js

@@ -54,13 +54,12 @@ function mixtl(acct_id, tlid, type,delc,voice) {
 							var mute=[];
 						}
 						if(type=="integrated"){
-							templete = templete+parse([timeline[key]], '', acct_id, tlid, "", mute);
+							templete = templete+parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
 						}else if(type=="plus"){
 							if(timeline[key].account.acct==timeline[key].account.username){
-								templete = templete+parse([timeline[key]], '', acct_id, tlid, "", mute);
+								templete = templete+parse([timeline[key]], '', acct_id, tlid, "", mute, "plus");
 							}
 						}
-                        
                     }
                 }
 
@@ -124,7 +123,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 				if(voice){
 					say(obj.content)
 				}	
-				var templete = parse([obj], type, acct_id, tlid,"",mute);
+				var templete = parse([obj], type, acct_id, tlid,"",mute, "mix");
 				var pool = localStorage.getItem("pool_" + tlid);
 				if (pool) {
 					pool = templete + pool;
@@ -168,7 +167,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 				var templete = parse([obj], '', acct_id, tlid);
 			}else if(TLtype=="plus"){
 				if(obj.account.acct==obj.account.username){
-					var templete = parse([obj], '', acct_id, tlid,"",mute);
+					var templete = parse([obj], '', acct_id, tlid,"",mute, "mix");
 				}else{
 					var templete="";
 				}
@@ -177,7 +176,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 				if(voice){
 					say(obj.content)
 				}	
-				var templete = parse([obj], type, acct_id, tlid,"",mute);
+				var templete = parse([obj], type, acct_id, tlid,"",mute,"mix");
 				var pool = localStorage.getItem("pool_" + tlid);
 				if (pool) {
 					pool = templete + pool;
@@ -291,10 +290,10 @@ function mixmore(tlid,type) {
 							var mute=[];
 						}
                         if(type=="integrated"){
-							templete = templete+parse([timeline[key]], '', acct_id, tlid,"",mute);
+							templete = templete+parse([timeline[key]], '', acct_id, tlid,"",mute,"mix");
 						}else if(type=="plus"){
 							if(timeline[key].account.acct==timeline[key].account.username){
-								templete = templete+parse([timeline[key]], '', acct_id, tlid,"",mute);
+								templete = templete+parse([timeline[key]], '', acct_id, tlid,"",mute,"mix");
 							}
 						}
                     }

app/js/tl/parse.js

@@ -1,5 +1,5 @@
 //オブジェクトパーサー(トゥート)
-function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
+function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 	var templete = '';
 	if(obj[0]){
 		if(tlid===1){
@@ -145,6 +145,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		var noauth="";
 		var antinoauth="hide";
 	}
+	//DMTL
+	if(type=="dm"){
+		var dmHide="hide";
+		var antidmHide="";
+	}else{
+		var dmHide="";
+		var antidmHide="hide";
+	}
+
+
 	//マウスオーバーのみ
 	var mouseover=localStorage.getItem("mouseover");
 	if(!mouseover){
@@ -163,6 +173,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	var times=[];
 	Object.keys(obj).forEach(function(key) {
 		var toot = obj[key];
+		if(type=="dm"){
+			var dmid=toot.id;
+			toot=toot.last_status;
+		}
 		var dis_name=escapeHTML(toot.account.display_name);
 		if(toot.account.emojis){
 			var actemojick = toot.account.emojis[0];
@@ -745,6 +759,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'<div class="area-actions '+mouseover+'">' +
 			'<div class="action">'+vis+'</div>'+
 			'<div class="action '+antinoauth+'"><a onclick="detEx(\''+toot.url+'\',\'main\')" class="waves-effect waves-dark details" style="padding:0">'+lang.lang_parse_det+'</a></div>' +
+			'<div class="action '+antidmHide+'"><a onclick="details(\'' + toot.id + '\',' + acct_id +',\''+tlid+'\',\'normal\')" class="waves-effect waves-dark details" style="padding:0">'+lang.lang_parse_thread+'</a></div>' +
 			'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="re(\'' + toot.id +
 			'\',\'' + to_mention + '\',' +
 			acct_id + ',\''+visen+
@@ -777,7 +792,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'</span>'+
 			'</div><div class="area-side '+mouseover+'"><div class="action ' + if_mine + ' '+noauth+'"><a onclick="toggleAction(\'' + toot.id + '\',\''+tlid+'\',\''+acct_id+'\')" class="waves-effect waves-dark btn-flat" style="padding:0"><i class="text-darken-3 material-icons act-icon">expand_more</i></a></div>' +
 			'<div class="action '+noauth+'"><a onclick="details(\'' + toot.id + '\',' + acct_id +
-			',\''+tlid+'\')" class="waves-effect waves-dark btn-flat details" style="padding:0"><i class="text-darken-3 material-icons">more_vert</i></a></div>' +
+			',\''+tlid+'\',\'normal\')" class="waves-effect waves-dark btn-flat details '+dmHide+'" style="padding:0"><i class="text-darken-3 material-icons">more_vert</i></a></div>' +
 			'</div></div>' +
 			'</div></div>';
 	});

app/js/tl/tl.js

@@ -58,7 +58,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		dm(acct_id, tlid, "plus",delc,voice);
 		$("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem(
 			"user_" + acct_id) + "@" + domain + ")");
-			$("#notice_icon_" + tlid).text("notifications");
+			$("#notice_icon_" + tlid).text("mail_outline");
 		return;
 	}*/
 	localStorage.setItem("now", type);
@@ -113,7 +113,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 					url=url+"local=true";
 				}
 			}
-			var start = "https://" + domain + "/api/v1/timelines/" + url;
+			if(type=="dm"){
+				var start = "https://" + domain + "/api/v1/conversations";
+			}else{
+				var start = "https://" + domain + "/api/v1/timelines/" + url;
+			}
 			var method="GET";
 			var i={
 				method: method,
@@ -138,7 +142,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		if(misskey){
 			var templete = misskeyParse(json, type, acct_id, tlid, "", mute);
 		}else{
-			var templete = parse(json, type, acct_id, tlid, "", mute);
+			var templete = parse(json, type, acct_id, tlid, "", mute, type);
 			localStorage.setItem("lastobj_"+ tlid,json[0].id)
 		}
 		$("#timeline_" + tlid).html(templete);
@@ -288,7 +292,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					if(voice){
 						say(obj.content)
 					}	
-					var templete = parse([obj], type, acct_id, tlid,"",mute);
+					var templete = parse([obj], type, acct_id, tlid,"",mute, type);
 					if ($("timeline_box_"+tlid+"_box .tl-box").scrollTop() === 0) {
 						$("#timeline_" + tlid).prepend(templete);
 					}else{
@@ -427,6 +431,10 @@ function moreload(type, tlid) {
 			var misskey=false;
 			var start = "https://" + domain + "/api/v1/timelines/" + com(type,data) +
 			"max_id=" + sid;
+			if(type=="dm"){
+				var start = "https://" + domain + "/api/v1/conversations?" +
+					"max_id=" + sid;
+			}
 			var method="GET";
 			var i={
 				method: method,
@@ -441,10 +449,11 @@ function moreload(type, tlid) {
 			todo(error);
 			console.error(error);
 		}).then(function(json) {
+			console.log(json);
 			if(misskey){
 				var templete = misskeyParse(json, '', acct_id, tlid,"",mute);
 			}else{
-				var templete = parse(json, '', acct_id, tlid,"",mute);
+				var templete = parse(json, '', acct_id, tlid,"",mute, type);
 			}
 			$("#timeline_" + tlid).append(templete);
 			additional(acct_id, tlid);

app/js/ui/img.js

@@ -135,61 +135,31 @@ function imgCont(type) {
 			var height = element.naturalHeight;
 			var windowH = $(window).height();
 			var windowW = $(window).width();
-			//小さい画像
+			$("#imagemodal").css("bottom","0")
-			if(width<(windowW - 50) && height<(windowH-1000)){
+			$("#imagemodal img").css("width","auto")
-				$("#imgmodal").css('height',height+"px");
+			if(height<windowH){
-				$("#imgmodal").css('width',width+"px");
+				$("#imagemodal").css("height",height+60+"px")
-				$("#imagewrap").css('height',height+"px");
+				$("#imagemodal img").css("height","100%")
-				$("#imagemodal").css('height',height+100+"px");
+				if(width>windowW*0.8){
-				$("#imagewrap").css('width',width+"px");
+					$("#imagemodal").css("width","80vw")
-				$("#imagemodal").css('width',width+"px");
+					$("#imagemodal img").css("width","100%")
-				$("#imagemodal").css('margin-top',(windowH /2) - (height / 2) +"px");
+					var heightS=windowW*0.8/width*height;
-			}else{
+					$("#imagemodal").css("height",heightS+60+"px")
-				$("#imagemodal").css('margin-top',0);
-				var aspect = width/height;
-				if (aspect < 2.8 && aspect > 0.3){
-					//moderate
-					if(windowW > windowH){
-						//画面が横長(縦幅基準)
-						$("#imgmodal").css('height',windowH/1.2-70+"px");
-						var imgW = (windowH/1.2-70)/height*width;
-						$("#imgmodal").css('width',imgW+"px");
-						$("#imagewrap").css('height',windowH/1.2-60+"px");
-						$("#imagemodal").css('height',windowH/1.2+"px");
-						$("#imagewrap").css('width',imgW+50+"px");
-						$("#imagemodal").css('width',imgW+50+"px");
-					}else{
-						//画面が縦長・正方形(横幅基準)
-						$("#imgmodal").css('width',windowW/1.2-30+"px");
-						var imgH = (windowW/1.2-30)/width*height;
-						$("#imgmodal").css('height',imgH+"px");
-						$("#imagewrap").css('width',windowW/1.2+"px");
-						$("#imagemodal").css('width',windowW/1.2+"px");
-						$("#imagewrap").css('height',imgH+60+"px");
-						$("#imagemodal").css('height',imgH+120+"px");
-					}
 				}else{
-					//極端な画像
+					$("#imagemodal").css("width",width+"px")
-					if(height > width){
-						//縦長
-						$("#imgmodal").css('height',windowH-60+"px");
-						var imgW = (windowH-50)/height*width;
-						$("#imgmodal").css('width',imgW+"px");
-						$("#imagewrap").css('height',windowH-50+"px");
-						$("#imagemodal").css('height',windowH+"px");
-						$("#imagewrap").css('width',imgW+50+"px");
-						$("#imagemodal").css('width',imgW+50+"px");
-					}else{
-						//横長・正方形
-						$("#imgmodal").css('width',windowW-30+"px");
-						var imgH = (windowW-50)/width*height;
-						$("#imgmodal").css('height',imgH+"px");
-						$("#imagewrap").css('width',windowW+"px");
-						$("#imagemodal").css('width',windowW+"px");
-						$("#imagewrap").css('height',imgH+60+"px");
-						$("#imagemodal").css('height',imgH+120+"px");
-					}
 				}
+			}else{
+				console.log("long")
+				$("#imagemodal img").css("width","auto")
+				var widthS=windowH/height*width;
+				if(widthS<windowW){
+					$("#imagemodal").css("width",widthS+"px")
+				}else{
+					$("#imagemodal").css("width","100vw")
+				}
+				
+				$("#imagemodal").css("height","100vh")
+				$("#imagemodal img").css("height","calc(100vh - 60px)")
 			}
 		}
 		if ($("#" + id + "-image-" + (key * 1 + 1)).length === 0) {

app/js/ui/layout.js

@@ -54,10 +54,10 @@ function parseColumn() {
 	}
 	var acctlist=obj;
 	console.log(obj);
-	var xed=localStorage.getItem("xed");
+	/*var xed=localStorage.getItem("xed");
 	if(xed){
 		xpand();
-	}
+	}*/
 	var col = localStorage.getItem("column");
 	if (!col) {
 		var obj = [{

app/js/ui/settings.js

@@ -6,6 +6,10 @@ var envView = new Vue({
 		complete: function (i,val) {
 			var ls=envView.config[i].storage;
 			Materialize.toast("Complete", 3000);
+			if(!val){
+				var id=envView.config[i].id;
+				var val=$("#"+id).val()
+			}
 			localStorage.setItem(ls,val)
 			if(ls=="ha"){
 				hardwareAcceleration(val)
@@ -20,6 +24,10 @@ var tlView = new Vue({
 	methods: {
 		complete: function (i,val) {
 			var ls=tlView.config[i].storage;
+			if(!val){
+				var id=tlView.config[i].id;
+				var val=$("#"+id).val()
+			}
 			Materialize.toast("Complete", 3000);
 			localStorage.setItem(ls,val)
 			return true
@@ -33,6 +41,10 @@ var postView = new Vue({
 		complete: function (i,val) {
 			var ls=postView.config[i].storage;
 			Materialize.toast("Complete", 3000);
+			if(!val){
+				var id=postView.config[i].id;
+				var val=$("#"+id).val()
+			}
 			localStorage.setItem(ls,val)
 			return true
 		}
@@ -77,17 +89,23 @@ function load() {
 	var max=envView.config.length;
 	for(var i=0;i<max;i++){
 		var ls=envView.config[i].storage;
-		envView.config[i].setValue=localStorage.getItem(ls)
+		if(localStorage.getItem(ls)){
+			envView.config[i].setValue=localStorage.getItem(ls)
+		}
 	}
 	var max=tlView.config.length;
 	for(var i=0;i<max;i++){
 		var ls=tlView.config[i].storage;
-		tlView.config[i].setValue=localStorage.getItem(ls)
+		if(localStorage.getItem(ls)){
+			tlView.config[i].setValue=localStorage.getItem(ls)
+		}
 	}
 	var max=postView.config.length;
 	for(var i=0;i<max;i++){
 		var ls=postView.config[i].storage;
-		postView.config[i].setValue=localStorage.getItem(ls)
+		if(localStorage.getItem(ls)){
+			postView.config[i].setValue=localStorage.getItem(ls)
+		}
 	}
 	if(localStorage.getItem("imas")){
 		$(".imas").removeClass("hide");

app/language.js

@@ -1,5 +1,5 @@
 // Create the Application's main menu
-function templete(lang){
+function templete(lang,mainWindow){
     const electron = require("electron");
     const app = electron.app;
     const BrowserWindow = electron.BrowserWindow;

app/main.js

@@ -60,14 +60,15 @@ try {
 try {
 	var lang = fs.readFileSync(lang_path, 'utf8');
 } catch (e) {
-	var lang=app.getLocale();
+	var langs=app.getLocale();
-	if(~lang.indexOf("ja")){
+	if(~langs.indexOf("ja")){
 		lang="ja";
 	}else{
 		lang="en";
 	}
 	fs.writeFileSync(lang_path,lang);
 }
+console.log(app.getLocale());
 console.log("launch:"+lang);
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function() {
@@ -137,7 +138,7 @@ function createWindow() {
 	var platform=process.platform;
 	var bit=process.arch;
 	if(platform=="darwin"){
-		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang)));
+		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang,mainWindow)));
 	}
 }
 // Electronの初期化完了後に実行

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "18.0.1",
+  "version": "18.0.3",
   "description": "TheDesk is a Mastodon client for PC.",
   "main": "main.js",
   "scripts": {
@@ -53,13 +53,20 @@
       "output": "../build"
     },
     "win": {
-      "icon": "thedesk.ico",
+      "icon": "build/thedesk.ico",
       "target": [
         "nsis",
         "portable",
         "appx"
       ]
     },
+    "appx": {
+      "identityName":"53491Cutls.TheDesk",
+      "applicationId":"Cutls.TheDesk",
+      "publisherDisplayName":"Cutls",
+      "publisher":"CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
+      "languages":["JA-JP","EN-US"]
+    },
     "nsis": {
       "oneClick": false,
       "allowToChangeInstallationDirectory": true,

app/view/en/index.html

@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.0.1)";
+var ver="Usamin (18.0.3)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -307,14 +307,14 @@ var tlid=0;
 		<div class="collapsible-body toot-reset" id="toot-after">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="material-icons">people_outline</i>Local TL before this toot
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-before">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="material-icons">person_outline</i>User TL before this toot
 		</div>
@@ -328,7 +328,7 @@ var tlid=0;
 		<div class="collapsible-body toot-reset" id="toot-fav">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="text-darken-3 fa fa-retweet"></i>People who boosted it
 		</div>
@@ -336,6 +336,7 @@ var tlid=0;
 		</div>
 	</li>
 	</ul>
+	<div class="dm-hide">
 	Use other account(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>:unfav and unBT are disabled.)<br>
 	<div class="row">
 		<div class="col s6">
@@ -356,11 +357,12 @@ var tlid=0;
 	<div id="toot-after">
 	</div>
 	</div>
+</div>
 	<div class="modal-footer">
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="brws()">Open in browser</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">Open in browser</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="shot()">Take a screenshot</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="shot()">Take a screenshot</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy()">Copy URL of this toot</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">Copy URL of this toot</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy('emb')">Embed</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">Embed</a>
 	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
 	</div>
 	</div>
@@ -581,12 +583,14 @@ 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-0-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-0-3" 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.0.0)</h5>
+					<h5>Release Note Usamin (18.0.3)</h5>
+・初期段階でカラムが追加できない可能性を修正。<br>
+--以下18.0.0--<br>
 ・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
 ・Alt+Enterでセカンダリートゥートボタン<br>
 ・引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
@@ -597,7 +601,10 @@ var tlid=0;
 ・一部のデフォルト値を修正。<br>
 ・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
 ・イメージビューワーの修正<br>
-					<img class="emoji" draggable="false" alt="⚠" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">TheDeskのMisskeyについての機能追加は終了しています。<br>
+			</div>
+			<div id="release-en">
+				<h5>Let's make it native!</h5>
+				<a href="https://translate.thedesk.top">Crowdin translation project</a>
 			</div>
 			<br><br>
 			<h3>Support TheDesk!</h3>
@@ -642,7 +649,7 @@ var tlid=0;
 			<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>List</span></div>
 			<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>Filter</span></div>
 			<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>Help</span></div>
-			<div class="waves-effect" onclick="about()"><i class="material-icons">info</i><span>About TheDesk</span></div>
+			<div class="waves-effect" onclick="location.href='index.html'"><i class="material-icons">refresh</i><span>Reload TL</span></div>
 		</div>
 		<div id="right-menu">
 				<!--カラム追加-->
@@ -764,8 +771,8 @@ var tlid=0;
 	</div>
 </div>
 		</div>
-		<a href="index.html" class="waves-effect">
+		<a onclick="about()" class="nex waves-effect">
-				<i class="material-icons" style="font-size: 1rem;">refresh</i>Super Reload
+				<i class="material-icons" style="font-size: 1rem;">info</i>About TheDesk
 		</a>&nbsp;|&nbsp;
 		<a onclick="bottomReverse()" class="nex waves-effect">
 				<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>Toot button layout reverse

app/view/en/setting.html

@@ -44,7 +44,7 @@
 		<div id="envView">
             <template v-for="(item, i) in config">
 				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+				<templete v-html=item.text.desc></templete><br>
 				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">Notification test</a><br></template>
                 <template v-if="item.checkbox">
                         <template v-for="(check, j) in item.text.checkbox">

app/view/en/setting.vue.js

@@ -17,7 +17,7 @@ var envConstruction=[
         width:50,
         text:{
             head:"Popup notification(on Windows)",
-            desc:"Hide to set "0"",
+            desc:'Hide to set "0"',
             after:"sec"
         }
     },{
@@ -63,7 +63,7 @@ var envConstruction=[
         setValue:13,
         text:{
             head:"Font size",
-            desc:'<span style="font-size:15px">15px(absolute value)</span>',
+            desc:'<span style="font-size:13px">13px(absolute value)</span>',
             after:"px"
         }
     },{
@@ -273,7 +273,7 @@ var tlConstruction=[
         setValue:"no",
         text:{
             head:"Enable #InstanceTicker",
-            desc:'Show colorful stickers about tooters' server. <a href="https://cdn.weep.me/mastodon/">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.',
+            desc:'Show colorful stickers about the server. <a href="https://cdn.weep.me/mastodon/">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.',
             checkbox:yesno
         }
     },{

app/view/ja/index.html

@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.0.1)";
+var ver="Usamin (18.0.3)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -307,14 +307,14 @@ var tlid=0;
 		<div class="collapsible-body toot-reset" id="toot-after">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="material-icons">people_outline</i>これより前のLocal TL(エアリプソース確認)
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-before">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="material-icons">person_outline</i>これより前のユーザーTL(BTソース確認)
 		</div>
@@ -328,7 +328,7 @@ var tlid=0;
 		<div class="collapsible-body toot-reset" id="toot-fav">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="text-darken-3 fa fa-retweet"></i>このトゥートをブーストした人
 		</div>
@@ -336,6 +336,7 @@ var tlid=0;
 		</div>
 	</li>
 	</ul>
+	<div class="dm-hide">
 	他のアカウントを使用(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>の解除はできません)<br>
 	<div class="row">
 		<div class="col s6">
@@ -356,11 +357,12 @@ var tlid=0;
 	<div id="toot-after">
 	</div>
 	</div>
+</div>
 	<div class="modal-footer">
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="brws()">ブラウザで開く</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">ブラウザで開く</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="shot()">スクリーンショット</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="shot()">スクリーンショット</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy()">URLをコピー</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">URLをコピー</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy('emb')">埋め込む</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">埋め込む</a>
 	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
 	</div>
 	</div>
@@ -581,12 +583,14 @@ 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-0-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-0-3" 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.0.0)</h5>
+					<h5>Release Note Usamin (18.0.3)</h5>
+・初期段階でカラムが追加できない可能性を修正。<br>
+--以下18.0.0--<br>
 ・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
 ・Alt+Enterでセカンダリートゥートボタン<br>
 ・引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
@@ -597,7 +601,10 @@ var tlid=0;
 ・一部のデフォルト値を修正。<br>
 ・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
 ・イメージビューワーの修正<br>
-					<img class="emoji" draggable="false" alt="⚠" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">TheDeskのMisskeyについての機能追加は終了しています。<br>
+			</div>
+			<div id="release-en">
+				<h5>Let's make it native!</h5>
+				<a href="https://translate.thedesk.top">Crowdin translation project</a>
 			</div>
 			<br><br>
 			<h3>ご支援ください。</h3>
@@ -642,7 +649,7 @@ var tlid=0;
 			<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>リスト</span></div>
 			<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>フィルター</span></div>
 			<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>ヘルプ</span></div>
-			<div class="waves-effect" onclick="about()"><i class="material-icons">info</i><span>このソフトについて</span></div>
+			<div class="waves-effect" onclick="location.href='index.html'"><i class="material-icons">refresh</i><span>TL再読込</span></div>
 		</div>
 		<div id="right-menu">
 				<!--カラム追加-->
@@ -764,8 +771,8 @@ var tlid=0;
 	</div>
 </div>
 		</div>
-		<a href="index.html" class="waves-effect">
+		<a onclick="about()" class="nex waves-effect">
-				<i class="material-icons" style="font-size: 1rem;">refresh</i>スーパーリロード
+				<i class="material-icons" style="font-size: 1rem;">info</i>このソフトについて
 		</a>&nbsp;|&nbsp;
 		<a onclick="bottomReverse()" class="nex waves-effect">
 				<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>トゥートボタンの左右入れ替え

app/view/ja/setting.html

@@ -44,7 +44,7 @@
 		<div id="envView">
             <template v-for="(item, i) in config">
 				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+				<templete v-html=item.text.desc></templete><br>
 				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">通知テスト</a><br></template>
                 <template v-if="item.checkbox">
                         <template v-for="(check, j) in item.text.checkbox">

app/view/ja/setting.vue.js

@@ -17,7 +17,7 @@ var envConstruction=[
         width:50,
         text:{
             head:"新規通知のポップアップお知らせの表示秒数",
-            desc:"0に設定すると表示されません",
+            desc:'0に設定すると表示されません',
             after:"秒"
         }
     },{
@@ -63,7 +63,7 @@ var envConstruction=[
         setValue:13,
         text:{
             head:"フォントサイズ",
-            desc:'<span style="font-size:15px">15px(絶対指定)</span>',
+            desc:'<span style="font-size:13px">13px(絶対指定)</span>',
             after:"px"
         }
     },{

app/view/make/index.sample.html

@@ -307,14 +307,14 @@ var tlid=0;
 		<div class="collapsible-body toot-reset" id="toot-after">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="material-icons">people_outline</i>{{beforeLTL}}
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-before">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="material-icons">person_outline</i>{{beforeUTL}}
 		</div>
@@ -328,7 +328,7 @@ var tlid=0;
 		<div class="collapsible-body toot-reset" id="toot-fav">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="text-darken-3 fa fa-retweet"></i>{{btedPeople}}
 		</div>
@@ -336,6 +336,7 @@ var tlid=0;
 		</div>
 	</li>
 	</ul>
+	<div class="dm-hide">
 	{{useOtherAcct1}}(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>{{useOtherAcct2}})<br>
 	<div class="row">
 		<div class="col s6">
@@ -356,11 +357,12 @@ var tlid=0;
 	<div id="toot-after">
 	</div>
 	</div>
+</div>
 	<div class="modal-footer">
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="brws()">{{openBrowser}}</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">{{openBrowser}}</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="shot()">{{screenshot}}</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="shot()">{{screenshot}}</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy()">{{copyURL}}</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">{{copyURL}}</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy('emb')">{{embed}}</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">{{embed}}</a>
 	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">{{close}}</a>
 	</div>
 	</div>
@@ -581,13 +583,13 @@ 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-0-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-0-3" 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.0.1)</h5>
+					<h5>Release Note Usamin (18.0.3)</h5>
-・カラム追加時の不具合についてのバグ<br>
+・初期段階でカラムが追加できない可能性を修正。<br>
 --以下18.0.0--<br>
 ・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
 ・Alt+Enterでセカンダリートゥートボタン<br>
@@ -599,7 +601,10 @@ var tlid=0;
 ・一部のデフォルト値を修正。<br>
 ・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
 ・イメージビューワーの修正<br>
-					<img class="emoji" draggable="false" alt="⚠" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">TheDeskのMisskeyについての機能追加は終了しています。<br>
+			</div>
+			<div id="release-en">
+				<h5>Let's make it native!</h5>
+				<a href="https://translate.thedesk.top">Crowdin translation project</a>
 			</div>
 			<br><br>
 			<h3>{{supportme}}</h3>
@@ -644,7 +649,7 @@ var tlid=0;
 			<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>{{list}}</span></div>
 			<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>{{filter}}</span></div>
 			<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>{{help}}</span></div>
-			<div class="waves-effect" onclick="about()"><i class="material-icons">info</i><span>{{about}}</span></div>
+			<div class="waves-effect" onclick="location.href='index.html'"><i class="material-icons">refresh</i><span>{{f5}}</span></div>
 		</div>
 		<div id="right-menu">
 				<!--カラム追加-->
@@ -766,8 +771,8 @@ var tlid=0;
 	</div>
 </div>
 		</div>
-		<a href="index.html" class="waves-effect">
+		<a onclick="about()" class="nex waves-effect">
-				<i class="material-icons" style="font-size: 1rem;">refresh</i>{{f5}}
+				<i class="material-icons" style="font-size: 1rem;">info</i>{{about}}
 		</a>&nbsp;|&nbsp;
 		<a onclick="bottomReverse()" class="nex waves-effect">
 				<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>{{reverse}}

app/view/make/language/index.en.json

@@ -148,7 +148,7 @@
     "filter":"Filter",
     "setting":"Preferences",
     "reverse":"Toot button layout reverse",
-    "f5":"Super Reload",
+    "f5":"Reload TL",
     "nanoDes":"The smallest Mastodon,",
     "verTips":"Version",
     "clockTips":"Clock",

app/view/make/language/index.ja.json

@@ -148,7 +148,7 @@
     "filter":"フィルター",
     "setting":"設定",
     "reverse":"トゥートボタンの左右入れ替え",
-    "f5":"スーパーリロード",
+    "f5":"TL再読込",
     "nanoDes":"最小のマストドン。",
     "verTips":"バージョン",
     "clockTips":"時計",

app/view/make/language/setting.en.json

@@ -82,7 +82,7 @@
     "or":"or",
     "imgheight":"Height of images",
     "ticker":"Enable #InstanceTicker",
-    "tickerwarn":"Show colorful stickers about tooters' server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+    "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",
     "post":"Posting Preferences",
     "autocw":"Alert before posting a long toot.",

app/view/make/setting.sample.html

@@ -44,7 +44,7 @@
 		<div id="envView">
             <template v-for="(item, i) in config">
 				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+				<templete v-html=item.text.desc></templete><br>
 				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">@@nntest@@</a><br></template>
                 <template v-if="item.checkbox">
                         <template v-for="(check, j) in item.text.checkbox">

app/view/make/setting.sample.js

@@ -17,7 +17,7 @@ var envConstruction=[
         width:50,
         text:{
             head:"@@popup@@",
-            desc:"@@popupwarn@@",
+            desc:'@@popupwarn@@',
             after:"@@s@@"
         }
     },{
@@ -63,7 +63,7 @@ var envConstruction=[
         setValue:13,
         text:{
             head:"@@fontsize@@",
-            desc:'<span style="font-size:15px">15px(@@absolute@@)</span>',
+            desc:'<span style="font-size:13px">13px(@@absolute@@)</span>',
             after:"px"
         }
     },{

app/view/ps/index.html

@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.0.1)";
+var ver="Usamin (18.0.3)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -307,14 +307,14 @@ var tlid=0;
 		<div class="collapsible-body toot-reset" id="toot-after">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="material-icons">people_outline</i>crwdns426:0crwdne426:0
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-before">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="material-icons">person_outline</i>crwdns427:0crwdne427:0
 		</div>
@@ -328,7 +328,7 @@ var tlid=0;
 		<div class="collapsible-body toot-reset" id="toot-fav">
 		</div>
 	</li>
-	<li>
+	<li class="dm-hide">
 		<div class="collapsible-header">
 		<i class="text-darken-3 fa fa-retweet"></i>crwdns429:0crwdne429:0
 		</div>
@@ -336,6 +336,7 @@ var tlid=0;
 		</div>
 	</li>
 	</ul>
+	<div class="dm-hide">
 	crwdns430:0crwdne430:0(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>crwdns431:0crwdne431:0)<br>
 	<div class="row">
 		<div class="col s6">
@@ -356,11 +357,12 @@ var tlid=0;
 	<div id="toot-after">
 	</div>
 	</div>
+</div>
 	<div class="modal-footer">
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="brws()">crwdns435:0crwdne435:0</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">crwdns435:0crwdne435:0</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="shot()">crwdns436:0crwdne436:0</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="shot()">crwdns436:0crwdne436:0</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy()">crwdns437:0crwdne437:0</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">crwdns437:0crwdne437:0</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy('emb')">crwdns438:0crwdne438:0</a>
+	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">crwdns438:0crwdne438:0</a>
 	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">crwdns385:0crwdne385:0</a>
 	</div>
 	</div>
@@ -581,12 +583,14 @@ 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-0-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-0-3" 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.0.0)</h5>
+					<h5>Release Note Usamin (18.0.3)</h5>
+・初期段階でカラムが追加できない可能性を修正。<br>
+--以下18.0.0--<br>
 ・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
 ・Alt+Enterでセカンダリートゥートボタン<br>
 ・引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
@@ -597,7 +601,10 @@ var tlid=0;
 ・一部のデフォルト値を修正。<br>
 ・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
 ・イメージビューワーの修正<br>
-					<img class="emoji" draggable="false" alt="⚠" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">TheDeskのMisskeyについての機能追加は終了しています。<br>
+			</div>
+			<div id="release-en">
+				<h5>Let's make it native!</h5>
+				<a href="https://translate.thedesk.top">Crowdin translation project</a>
 			</div>
 			<br><br>
 			<h3>crwdns473:0crwdne473:0</h3>
@@ -642,7 +649,7 @@ var tlid=0;
 			<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>crwdns444:0crwdne444:0</span></div>
 			<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>crwdns515:0crwdne515:0</span></div>
 			<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>crwdns1894:0crwdne1894:0</span></div>
-			<div class="waves-effect" onclick="about()"><i class="material-icons">info</i><span>{{about}}</span></div>
+			<div class="waves-effect" onclick="location.href='index.html'"><i class="material-icons">refresh</i><span>crwdns518:0crwdne518:0</span></div>
 		</div>
 		<div id="right-menu">
 				<!--カラム追加-->
@@ -764,8 +771,8 @@ var tlid=0;
 	</div>
 </div>
 		</div>
-		<a href="index.html" class="waves-effect">
+		<a onclick="about()" class="nex waves-effect">
-				<i class="material-icons" style="font-size: 1rem;">refresh</i>crwdns518:0crwdne518:0
+				<i class="material-icons" style="font-size: 1rem;">info</i>{{about}}
 		</a>&nbsp;|&nbsp;
 		<a onclick="bottomReverse()" class="nex waves-effect">
 				<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>crwdns517:0crwdne517:0

app/view/ps/setting.html

@@ -44,7 +44,7 @@
 		<div id="envView">
             <template v-for="(item, i) in config">
 				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+				<templete v-html=item.text.desc></templete><br>
 				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">crwdns540:0crwdne540:0</a><br></template>
                 <template v-if="item.checkbox">
                         <template v-for="(check, j) in item.text.checkbox">

app/view/ps/setting.vue.js

@@ -17,7 +17,7 @@ var envConstruction=[
         width:50,
         text:{
             head:"crwdns1898:0crwdne1898:0",
-            desc:"crwdns536:0crwdne536:0",
+            desc:'crwdns536:0crwdne536:0',
             after:"crwdns537:0crwdne537:0"
         }
     },{
@@ -63,7 +63,7 @@ var envConstruction=[
         setValue:13,
         text:{
             head:"crwdns546:0crwdne546:0",
-            desc:'<span style="font-size:15px">15px(crwdns549:0crwdne549:0)</span>',
+            desc:'<span style="font-size:13px">13px(crwdns549:0crwdne549:0)</span>',
             after:"px"
         }
     },{