TheDesk Miria (17.0.1)

app/js/lang/lang.en.js

@@ -202,6 +202,7 @@ var lang={
     "lang_setting_selt":"Auto fold:{{set1}} lines and above, {{set2}} letters and above",
     "lang_setting_autocw":"Auto CW:{{set1}} lines and above, {{set2}} letters and above",
     "lang_setting_width":"Minimam width:{{set}}",
+    "lang_setting_fixwidth":"TweetDeck fixed width:{{set}}px",
     "lang_setting_img":"After posting an image:{{set}}",
     "lang_setting_font":"Fonts:{{set}}",
     "lang_setting_default":"default font",

app/js/lang/lang.ja.js

@@ -203,6 +203,7 @@ var lang={
     "lang_setting_selt":"{{set1}}行以上または{{set2}}文字以上でテキストを隠します。",
     "lang_setting_autocw":"{{set1}}行以上または{{set2}}文字以上で警告を表示します。",
     "lang_setting_width":"横幅最低を{{set}}pxに設定しました。",
+    "lang_setting_fixwidth":"TweetDeckの横幅を{{set}}pxに設定しました。",
     "lang_setting_img":"画像投稿後の設定を「{{set}}」に設定しました。",
     "lang_setting_font":"フォントを{{set}}に設定しました。",
     "lang_setting_default":"デフォルト",

app/js/tl/parse.js

@@ -635,7 +635,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		//Ticker
 		var tickerdom="";
 		if(ticker){
-			var tickerdata=JSON.parse(localStorage.getItem("ticker"));
+			var tickerdata=localStorage.getItem("ticker")
+			if(tickerdata){
+			var tickerdata=JSON.parse(tickerdata);
 			
 			var thisdomain=toot.account.acct.split("@");
 			if(thisdomain.length>1){
@@ -649,6 +651,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}
 		   }
 		}
+		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
 			' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[

app/js/ui/layout.js

@@ -106,7 +106,7 @@ function parseColumn() {
 		console.log(acct.domain);
 		if(acctlist[acct.domain]){
 			if(acctlist[acct.domain].background!="def"){
-				insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background;
+				insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background+";";
 			}
 		}
 		if(acct.type=="notf" && localStorage.getItem("setasread")=="no"){
@@ -115,9 +115,19 @@ function parseColumn() {
 			localStorage.removeItem("hasNotfC_" + acct.domain);
 		}
 		if(acct.type=="webview"){
-			var html =webview("https://tweetdeck.twitter.com",key,insert,icnsert);
+			if(localStorage.getItem("fixwidth")){
+				var fixwidth=localStorage.getItem("fixwidth");
+				var css=" min-width:"+fixwidth+"px;"
+			}else{
+				var css="";
+			}
+			var html =webview("https://tweetdeck.twitter.com",key,insert,icnsert,css);
 			$("#timeline-container").append(html);
 		}else{
+			var width = localStorage.getItem("width");
+		if (width) {
+			var css=" min-width:"+width+"px;"
+		}
 		if(acct.type=="notf"){
 			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fa fa-share exc-icons"></i></label> '+
 			'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'"  '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fa fa-star exc-icons"></i></label> '+
@@ -127,8 +137,8 @@ function parseColumn() {
 		}else{
 			var exclude="";
 		}
-		var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
+		var html = '<div style="'+css+'" class="box" id="timeline_box_' + key + '_box" tlid="' + key +
-			'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
+			'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+' ">'+
 			'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="goTop(' + key + ')" title="'+lang.lang_layout_gotop +'"></i></div>'+
 			'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>'+
 			'<div class="area-a1"><a onclick="notfToggle(' + acct.domain + ',' + key +
@@ -175,10 +185,6 @@ function parseColumn() {
 		voiceCheck(key);
 		}
 	});
-	var width = localStorage.getItem("width");
-	if (width) {
-		$(".box").css("min-width", width + "px");
-	}
 	var box = localStorage.getItem("box");
 	if (box == "absolute") {
 		setTimeout(show, 1000);
@@ -388,9 +394,9 @@ function coloradd(key,bg,txt){
 	}
 }
 //禁断のTwitter
-function webview(url,key,insert,icnsert){
+function webview(url,key,insert,icnsert,css){
 	var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
-			'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
+			'" style="'+css+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
 			'<div class="area-notice"><i class="fa fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+
 			'<div class="area-notice_name tl-title">WebView('+url+')</div>'+
 			'<div class="area-sta"><input type="checkbox" id="webviewsel" value="true" class="filled-in"><label for="webviewsel">'+lang.lang_layout_webviewmode +'</label></div>'+

app/js/ui/settings.js

@@ -95,6 +95,12 @@ function settings() {
 	}
 	localStorage.setItem("width", widthd);
 
+	var fwidthd = $("#fixwidth").val();
+	if (fwidthd != localStorage.getItem("fixwidth")) {
+		Materialize.toast(lang.lang_setting_fixwidth.replace("{{set}}" ,fwidthd), 3000);
+	}
+	localStorage.setItem("fixwidth", fwidthd);
+
 	var imgd = $("[name=img]:checked").val();
 	var imgt = $("[for=i_"+imgd+"]").text();
 	if (imgd != localStorage.getItem("img")) {
@@ -297,6 +303,12 @@ function load() {
 	}
 	$("#width").val(width);
 
+	var fwidth = localStorage.getItem("fixwidth");
+	if (!fwidth) {
+		var fwidth = "0";
+	}
+	$("#fixwidth").val(fwidth);
+
 	var cwt = localStorage.getItem("cw-text");
 	if (!cwt) {
 		var cwt = "";
@@ -345,7 +357,7 @@ function load() {
 	}
 	$("#img-height").val(imh);
 
-	var ticker = localStorage.getItem("ticker-ok");
+	var ticker = localStorage.getItem("ticker_ok");
 	if (!ticker) {
 		var ticker = "no";
 	}

app/main.js

@@ -8,14 +8,14 @@ var Jimp = require("jimp");
 const shell = electron.shell;
 const os = require('os')
 const path = require('path')
-const fm = require('font-manager');
+//const fm = require('font-manager');
 const Menu=electron.Menu
 var updatewin=null;
 const join = require('path').join;
 // linuxの時は定義しない
-if (process.platform=='win32') {
+/*if (process.platform=='win32') {
   const {NowPlaying,PlayerName} = require("nowplaying-node");
-}
+}*/
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
 // ウィンドウを作成するモジュール
@@ -474,6 +474,7 @@ function about(){
 }
 ipc.on('itunes', (e, args) => {
 	if(args[0]=="set"){
+		return;
 		var nppath=join(app.getPath("userData"), "nowplaying");
 		var npProvider;
 		try {
@@ -498,6 +499,7 @@ ipc.on('itunes', (e, args) => {
 			console.log(error);
 		});
 		}else{
+			return;
 			var nppath=join(app.getPath("userData"), "nowplaying");
 			var npProvider;
 			try {

app/package.json

@@ -35,13 +35,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "electron-dl": "^1.11.0",
-    "font-manager": "^0.3.0",
     "jimp": "^0.2.28",
     "node-notifier": "^5.2.1",
     "sumchecker": "^2.0.2"
   },
   "optionalDependencies": {
-    "nowplaying-node": "^0.1.3",
     "itunes-nowplaying-mac": "^0.2.3"
   },
   "build": {
@@ -81,6 +79,6 @@
     "electron": "^3.0.10",
     "electron-packager": "^13.0.1",
     "electron-prebuilt": "^1.4.13",
-    "electron-rebuild": "^1.8.2"
+    "electron-rebuild": "^1.8.4"
   }
 }

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="Miria (17.0.1) beta4";
+var ver="Miria (17.0.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";

app/view/en/setting.html

@@ -30,7 +30,7 @@
 	</div>
 	<div class="collapsible-body">
 		<h5>Languages</h5>
-		<a onclick="changelang('ja')" class="pointer">日本語</a>/<a onclick="changelang('en')" class="pointer">English</a>/<a onclick="changelang('ps')" class="pointer">Crowdin In-context translation(beta)</a>
+		<a href="../ja/setting.html">日本語(Japanese)</a>/<a href="../en/setting.html">English</a>/<a href="../ps/setting.html">Crowdin web translate</a>/
 		<h5>Import and export of preferences</h5>
 		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">Export</button>
 		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">Import</button>
@@ -64,6 +64,10 @@
 		<input type="text" style="width:50px" id="width">pxabove
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
 		<br>
+		<h5>Width of TweetDeck browser</h5>
+		<input type="text" style="width:50px" id="fixwidth">pxabove
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+		<br>
 		<h5>Font</h5>
 		Select your favorite font to 'Select'<br>
 		<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>

app/view/en/update.html

@@ -62,6 +62,9 @@ a,button,input,label,i{
 #prog{
     font-size:200%;
 }
+.linux, .mac{
+    display:none;
+}
 </style>
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -75,14 +78,11 @@ a,button,input,label,i{
         <p>Get latest TheDesk</p>
         <span id="now"></span>→<b id="ver"></b><br>
         <span id="det"></span><br>
-        <button id="update" class="waves-effect btn" onclick="update('true')" style="margin-left:15px;">Start</button>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">Installer ver.</button>
-        <div id="checkbox">
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">Portable ver.</button>
-            Options:<br>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">Start</button>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">Start</button>
-            <label for="portable">Portable ver.</label><br>
+        <br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">Not rewrite</label><br>
-        </div>
         Some problems?<br>Please download on <a href="https://thedesk.top">Oficial HP</a>.
     </div>
     <div id="skipper" class="hide">
@@ -123,17 +123,34 @@ function update(sel){
     $("#dlnow").toggleClass("hide");
     $("#dlnow").toggleClass("show");
     $("#prog").text("");
-    if($('#rewrite:checked').val()=="true"){
+    var remote=electron.remote;
-        var versioning=true;
+    var bit=process.arch;
-	}else{
+    var start="https://thedesk.top/ver.json";
-        var versioning=false;
+	fetch(start, {
-    }
+		method: 'GET',
-    if($('#portable:checked').val()=="true"){
+		headers: {'content-type': 'application/json'},
-		var zip=true;
+    }).then(function(response) {
-	}else{
+       return response.json();
-        var zip=false;
+    }).catch(function(error) {
-    }
+        todo(error);
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+		console.error(error);
+    }).then(function(json) {
+        if(sel=="installer"){
+            if(bit=="64"){
+                var url=json["winx64"];
+            }else if(bit=="32"){
+                var url=json["winia32"];
+            }
+        }else if(sel=="portable"){
+            if(bit=="64"){
+                var url=json["winx64p"];
+            }else if(bit=="32"){
+                var url=json["winia32p"];
+            }
+        }
+        ipc.send('download-btn', url);
+    });
+	
 }
 	function quit(){
 				ipc.send('quit', 'go');
@@ -149,9 +166,14 @@ ipc.on('mess', function (event, arg) {
 })
 function verck(){
     var remote=electron.remote;
-	var platform=remote.process.platform;
+    var platform=remote.process.platform;
-	if(platform!="win32"){
+    var bit=process.arch;
-		$('#portable').prop("disabled",true)
+	if(platform=="linux"){
+        $('.windows').hide()
+        $('.linux').show()
+	}else if(platform=="mac"){
+        $('.windows').hide()
+        $('.mac').show()
 	}
 	var start="https://thedesk.top/ver.json";
 	fetch(start, {
@@ -167,7 +189,8 @@ function verck(){
              $("#ver").text(json.desk);
              localStorage.setItem("next-ver",json.desk);
 			 $("#det").html(json.detail);
-			 $("#now").text(localStorage.getItem("ver"));
+             $("#now").text(localStorage.getItem("ver"));
+             
     });
 }
 function nextv(){

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="Miria (17.0.1) beta4";
+var ver="Miria (17.0.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";

app/view/ja/setting.html

@@ -30,7 +30,7 @@
 	</div>
 	<div class="collapsible-body">
 		<h5>言語</h5>
-		<a onclick="changelang('ja')" class="pointer">日本語</a>/<a onclick="changelang('en')" class="pointer">English</a>/<a onclick="changelang('ps')" class="pointer">Crowdin In-context translation(beta)</a>
+		<a href="../ja/setting.html">日本語(Japanese)</a>/<a href="../en/setting.html">English</a>/<a href="../ps/setting.html">Crowdin web translate</a>/
 		<h5>設定のインポートとエクスポート</h5>
 		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">エクスポート</button>
 		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">インポート</button>
@@ -64,6 +64,10 @@
 		<input type="text" style="width:50px" id="width">px以上
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
 		<br>
+		<h5>TweetDeckの固定幅</h5>
+		<input type="text" style="width:50px" id="fixwidth">px以上
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
+		<br>
 		<h5>フォント</h5>
 		「選択」を押してフォントを選んでください。<br>
 		<button class="btn waves-effect" style="width:100px;" onclick="font()">選択</button><br>

app/view/ja/update.html

@@ -62,6 +62,9 @@ a,button,input,label,i{
 #prog{
     font-size:200%;
 }
+.linux, .mac{
+    display:none;
+}
 </style>
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -75,14 +78,11 @@ a,button,input,label,i{
         <p>アップデートがあります</p>
         <span id="now"></span>→<b id="ver"></b><br>
         <span id="det"></span><br>
-        <button id="update" class="waves-effect btn" onclick="update('true')" style="margin-left:15px;">開始</button>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">インストーラー版(推奨)</button>
-        <div id="checkbox">
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">ポータブル版</button>
-            Options:<br>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">開始</button>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">開始</button>
-            <label for="portable">ポータブル版</label><br>
+        <br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">上書きしない</label><br>
-        </div>
         問題が発生しますか？<br><a href="https://thedesk.top">公式HP</a>からダウンロードをお試しください。
     </div>
     <div id="skipper" class="hide">
@@ -123,17 +123,34 @@ function update(sel){
     $("#dlnow").toggleClass("hide");
     $("#dlnow").toggleClass("show");
     $("#prog").text("");
-    if($('#rewrite:checked').val()=="true"){
+    var remote=electron.remote;
-        var versioning=true;
+    var bit=process.arch;
-	}else{
+    var start="https://thedesk.top/ver.json";
-        var versioning=false;
+	fetch(start, {
-    }
+		method: 'GET',
-    if($('#portable:checked').val()=="true"){
+		headers: {'content-type': 'application/json'},
-		var zip=true;
+    }).then(function(response) {
-	}else{
+       return response.json();
-        var zip=false;
+    }).catch(function(error) {
-    }
+        todo(error);
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+		console.error(error);
+    }).then(function(json) {
+        if(sel=="installer"){
+            if(bit=="64"){
+                var url=json["winx64"];
+            }else if(bit=="32"){
+                var url=json["winia32"];
+            }
+        }else if(sel=="portable"){
+            if(bit=="64"){
+                var url=json["winx64p"];
+            }else if(bit=="32"){
+                var url=json["winia32p"];
+            }
+        }
+        ipc.send('download-btn', url);
+    });
+	
 }
 	function quit(){
 				ipc.send('quit', 'go');
@@ -149,9 +166,14 @@ ipc.on('mess', function (event, arg) {
 })
 function verck(){
     var remote=electron.remote;
-	var platform=remote.process.platform;
+    var platform=remote.process.platform;
-	if(platform!="win32"){
+    var bit=process.arch;
-		$('#portable').prop("disabled",true)
+	if(platform=="linux"){
+        $('.windows').hide()
+        $('.linux').show()
+	}else if(platform=="mac"){
+        $('.windows').hide()
+        $('.mac').show()
 	}
 	var start="https://thedesk.top/ver.json";
 	fetch(start, {
@@ -167,7 +189,8 @@ function verck(){
              $("#ver").text(json.desk);
              localStorage.setItem("next-ver",json.desk);
 			 $("#det").html(json.detail);
-			 $("#now").text(localStorage.getItem("ver"));
+             $("#now").text(localStorage.getItem("ver"));
+             
     });
 }
 function nextv(){

app/view/make/index.sample.html

@@ -559,7 +559,10 @@ var tlid=0;
 					バグ修正<br>
 					(Mastodon 2.7)<b>時間指定投稿が利用できます。</b><br>
 					(Mastodon 2.7)<b>「インスタンス」を「サーバー」に変更</b><br>
-					
+					CW付きのトゥートの再編集に対応<br>
+					インストール場所が指定できるように<br>
+					トゥートのコピペができない不具合を修正<br>
+					TweetDeckの横幅だけ広げられる機能
 			</div>
 			<br><br>
 			<h3>{{supportme}}</h3>

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

@@ -17,8 +17,10 @@
     "nativenotf":"Native notification",
     "nnwarn":"This does not work on Windows Portable ver.",
     "nntest":"Notification test",
-    "minwidth":"Minimam width of columns",
+    "minwidth":"Minimum width of columns",
     "minwidthwarn":"Scroll bar will be shown when your window size is more than ammounts of columns.",
+    "fixwidth":"Minimum width of TweetDeck browser",
+    "fixwidthwarn":"",
     "above":"above",
     "font":"Font",
     "fontwarn":"Select your favorite font to 'Select'",

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

@@ -19,6 +19,8 @@
     "nntest":"通知テスト",
     "minwidth":"マルチカラムの最低横幅",
     "minwidthwarn":"画面全体の横幅÷コラム数がこの値を超えた時、横スクロールとなります。",
+    "fixwidth":"TweetDeckの限定の最低横幅",
+    "fixwidthwarn":"",
     "above":"以上",
     "font":"フォント",
     "fontwarn":"「選択」を押してフォントを選んでください。",

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

@@ -2,7 +2,7 @@
     "updatehere":"Get latest TheDesk",
     "download":"Start",
     "portable":"Portable ver.",
-    "winzip":"Durling unzippng, TheDesk may freeze. It takes several seconds.",
+    "installer":"Installer ver.",
     "unrewrite":"Not rewrite",
     "sureupd":"You may lose a cool experience!",
     "skipupd":"Skip this update",

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

@@ -2,7 +2,7 @@
     "updatehere":"アップデートがあります",
     "download":"開始",
     "portable":"ポータブル版",
-    "unrewrite":"上書きしない",
+    "installer":"インストーラー版(推奨)",
     "sureupd":"アップデートは必ず行ってください",
     "skipupd":"アップデートをスキップする",
     "nexttl":"次回TL表示時まで",

app/view/make/setting.sample.html

@@ -64,6 +64,10 @@
 		<input type="text" style="width:50px" id="width">px{{above}}
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">{{set}}</button>
 		<br>
+		<h5>{{fixwidth}}</h5>{{fixwidthwarn}}
+		<input type="text" style="width:50px" id="fixwidth">px{{above}}
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">{{set}}</button>
+		<br>
 		<h5>{{font}}</h5>
 		{{fontwarn}}<br>
 		<button class="btn waves-effect" style="width:100px;" onclick="font()">{{select}}</button><br>

app/view/make/update.sample.html

@@ -62,6 +62,9 @@ a,button,input,label,i{
 #prog{
     font-size:200%;
 }
+.linux, .mac{
+    display:none;
+}
 </style>
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -75,14 +78,11 @@ a,button,input,label,i{
         <p>{{updatehere}}</p>
         <span id="now"></span>→<b id="ver"></b><br>
         <span id="det"></span><br>
-        <button id="update" class="waves-effect btn" onclick="update('true')" style="margin-left:15px;">{{download}}</button>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
-        <div id="checkbox">
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">{{portable}}</button>
-            Options:<br>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">{{download}}</button>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">{{download}}</button>
-            <label for="portable">{{portable}}</label><br>
+        <br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">{{unrewrite}}</label><br>
-        </div>
         {{problem1}}<br>{{problem2}}
     </div>
     <div id="skipper" class="hide">
@@ -123,17 +123,34 @@ function update(sel){
     $("#dlnow").toggleClass("hide");
     $("#dlnow").toggleClass("show");
     $("#prog").text("");
-    if($('#rewrite:checked').val()=="true"){
+    var remote=electron.remote;
-        var versioning=true;
+    var bit=process.arch;
-	}else{
+    var start="https://thedesk.top/ver.json";
-        var versioning=false;
+	fetch(start, {
-    }
+		method: 'GET',
-    if($('#portable:checked').val()=="true"){
+		headers: {'content-type': 'application/json'},
-		var zip=true;
+    }).then(function(response) {
-	}else{
+       return response.json();
-        var zip=false;
+    }).catch(function(error) {
-    }
+        todo(error);
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+		console.error(error);
+    }).then(function(json) {
+        if(sel=="installer"){
+            if(bit=="64"){
+                var url=json["winx64"];
+            }else if(bit=="32"){
+                var url=json["winia32"];
+            }
+        }else if(sel=="portable"){
+            if(bit=="64"){
+                var url=json["winx64p"];
+            }else if(bit=="32"){
+                var url=json["winia32p"];
+            }
+        }
+        ipc.send('download-btn', url);
+    });
+	
 }
 	function quit(){
 				ipc.send('quit', 'go');
@@ -149,9 +166,14 @@ ipc.on('mess', function (event, arg) {
 })
 function verck(){
     var remote=electron.remote;
-	var platform=remote.process.platform;
+    var platform=remote.process.platform;
-	if(platform!="win32"){
+    var bit=process.arch;
-		$('#portable').prop("disabled",true)
+	if(platform=="linux"){
+        $('.windows').hide()
+        $('.linux').show()
+	}else if(platform=="mac"){
+        $('.windows').hide()
+        $('.mac').show()
 	}
 	var start="https://thedesk.top/ver.json";
 	fetch(start, {
@@ -167,7 +189,8 @@ function verck(){
              $("#ver").text(json.desk);
              localStorage.setItem("next-ver",json.desk);
 			 $("#det").html(json.detail);
-			 $("#now").text(localStorage.getItem("ver"));
+             $("#now").text(localStorage.getItem("ver"));
+             
     });
 }
 function nextv(){

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>

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>
@@ -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="Miria (17.0.1) beta4";
+var ver="Miria (17.0.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";

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">
@@ -30,7 +30,7 @@
 	</div>
 	<div class="collapsible-body">
 		<h5>crwdns530:0crwdne530:0</h5>
-		<a onclick="changelang('ja')" class="pointer">日本語</a>/<a onclick="changelang('en')" class="pointer">English</a>/<a onclick="changelang('ps')" class="pointer">Crowdin In-context translation(beta)</a>
+		<a href="../ja/setting.html">日本語(Japanese)</a>/<a href="../en/setting.html">English</a>/<a href="../ps/setting.html">Crowdin web translate</a>/
 		<h5>crwdns531:0crwdne531:0</h5>
 		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">crwdns533:0crwdne533:0</button>
 		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">crwdns532:0crwdne532:0</button>
@@ -64,6 +64,10 @@
 		<input type="text" style="width:50px" id="width">pxcrwdns543:0crwdne543:0
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
 		<br>
+		<h5>{{fixwidth}}</h5>{{fixwidthwarn}}
+		<input type="text" style="width:50px" id="fixwidth">pxcrwdns543:0crwdne543:0
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
+		<br>
 		<h5>crwdns544:0crwdne544:0</h5>
 		crwdns1900:0crwdne1900:0<br>
 		<button class="btn waves-effect" style="width:100px;" onclick="font()">crwdns1896:0crwdne1896:0</button><br>

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>
@@ -62,6 +62,9 @@ a,button,input,label,i{
 #prog{
     font-size:200%;
 }
+.linux, .mac{
+    display:none;
+}
 </style>
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -75,14 +78,11 @@ a,button,input,label,i{
         <p>crwdns669:0crwdne669:0</p>
         <span id="now"></span>→<b id="ver"></b><br>
         <span id="det"></span><br>
-        <button id="update" class="waves-effect btn" onclick="update('true')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
-        <div id="checkbox">
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">crwdns1950:0crwdne1950:0</button>
-            Options:<br>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
-            <label for="portable">crwdns1950:0crwdne1950:0</label><br>
+        <br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">crwdns673:0crwdne673:0</label><br>
-        </div>
         crwdns678:0crwdne678:0<br>crwdns679:0crwdne679:0
     </div>
     <div id="skipper" class="hide">
@@ -123,17 +123,34 @@ function update(sel){
     $("#dlnow").toggleClass("hide");
     $("#dlnow").toggleClass("show");
     $("#prog").text("");
-    if($('#rewrite:checked').val()=="true"){
+    var remote=electron.remote;
-        var versioning=true;
+    var bit=process.arch;
-	}else{
+    var start="https://thedesk.top/ver.json";
-        var versioning=false;
+	fetch(start, {
-    }
+		method: 'GET',
-    if($('#portable:checked').val()=="true"){
+		headers: {'content-type': 'application/json'},
-		var zip=true;
+    }).then(function(response) {
-	}else{
+       return response.json();
-        var zip=false;
+    }).catch(function(error) {
-    }
+        todo(error);
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+		console.error(error);
+    }).then(function(json) {
+        if(sel=="installer"){
+            if(bit=="64"){
+                var url=json["winx64"];
+            }else if(bit=="32"){
+                var url=json["winia32"];
+            }
+        }else if(sel=="portable"){
+            if(bit=="64"){
+                var url=json["winx64p"];
+            }else if(bit=="32"){
+                var url=json["winia32p"];
+            }
+        }
+        ipc.send('download-btn', url);
+    });
+	
 }
 	function quit(){
 				ipc.send('quit', 'go');
@@ -149,9 +166,14 @@ ipc.on('mess', function (event, arg) {
 })
 function verck(){
     var remote=electron.remote;
-	var platform=remote.process.platform;
+    var platform=remote.process.platform;
-	if(platform!="win32"){
+    var bit=process.arch;
-		$('#portable').prop("disabled",true)
+	if(platform=="linux"){
+        $('.windows').hide()
+        $('.linux').show()
+	}else if(platform=="mac"){
+        $('.windows').hide()
+        $('.mac').show()
 	}
 	var start="https://thedesk.top/ver.json";
 	fetch(start, {
@@ -167,7 +189,8 @@ function verck(){
              $("#ver").text(json.desk);
              localStorage.setItem("next-ver",json.desk);
 			 $("#det").html(json.detail);
-			 $("#now").text(localStorage.getItem("ver"));
+             $("#now").text(localStorage.getItem("ver"));
+             
     });
 }
 function nextv(){

package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}