TheDesk Miria (17.0.1)

2019-02-27 10:58:29 +09:00 · 2019-02-27 10:17:35 +09:00 · 2019-02-27 01:51:37 +09:00
28 changed files with 1536 additions and 880 deletions
--- a/README.md
+++ b/README.md
@@ -86,11 +86,11 @@ WindowsでPython 2.xやVisualC++を一発でインストールできるツール
 ### electron-packager

 Windows  
-`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=3.0.10 --icon=.\app\thedesk.ico --overwrite`  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=4.0.5 --icon=.\app\thedesk.ico --overwrite`  
 Linux  
-`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=3.0.10 --overwrite`  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.5 --overwrite`  
 macOS  
-`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=3.0.10 --icon=./app/icon.icns --overwrite`  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  

 ### electron-builder

--- a/app/js/lang/lang.en.js
+++ b/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",
--- a/app/js/lang/lang.ja.js
+++ b/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":"デフォルト",
--- a/app/js/tl/parse.js
+++ b/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[
--- a/app/js/ui/layout.js
+++ b/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 +
-			'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
+		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+' ">'+
 			'<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>'+
--- a/app/js/ui/settings.js
+++ b/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";
 	}
--- a/app/main.js
+++ b/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;
 // ウィンドウを作成するモジュール
@@ -280,65 +280,12 @@ ipc.on('shot-img-dl', (e, args) => {
 })
 //アプデDL
 ipc.on('download-btn', (e, args) => {
+	//console.log(args[1]);
 	var platform=process.platform;
 	var bit=process.arch;
-	var versioning=args[3];
-	var portable=args[2];
-	if(platform=="win32" || platform=="linux" || platform=="darwin" ){
-		var exe=false;
-		if(platform=="win32" && bit=="x64"){
-			if(portable){
-				var zip="TheDesk.exe";
-			}else{
-				var zip="TheDesk-setup.exe";
-			}
-			exe=true;
-		}else if(platform=="win32" && bit=="ia32"){
-			if(portable){
-				var zip="TheDesk-ia32.exe";
-			}else{
-				var zip="TheDesk-setup-ia32.exe";
-			}
-			exe=true;
-		}else if(platform=="linux" && bit=="x64"){
-			var zip="TheDesk-linux-x64.zip";
-		}else if(platform=="linux" && bit=="ia32"){
-			var zip="TheDesk-linux-ia32.zip";
-		}else if(platform=="darwin"){
-			var zip="TheDesk-darwin-x64.zip";
-		}else{
-			return;
-		}
-		if(versioning && !exe){
-			zip=zip.replace(".zip","."+args[1]+".zip");
-		}else if(versioning){
-			zip=zip.replace(".exe","."+args[1]+".exe");
-		}
-	}else{
-		const options = {
-			type: 'info',
-			title: 'Other OS Supporting System',
-			message: "thedesk.topをブラウザで開きます。",
-			buttons: ['OK']
-		  }
-		  dialog.showMessageBox(options, function(index) {
-			shell.openExternal("https://thedesk.top");
-		  })
-		  return;
-		if(bit=="x64"){
-			var zip="TheDesk-linux-x64.zip";
-		}else if(bit=="ia32"){
-			var zip="TheDesk-linux-ia32.zip";
-		}
-	}
-	var ver=args[1];
-	
-	console.log(zip);
-	if(args[0]=="true"){
 		dialog.showSaveDialog(null, {
-            title: '保存',
-			properties: ['openFile', 'createDirectory'],
-			defaultPath: zip
+      title: 'Save',
+			defaultPath: app.getPath('home')+"/"+args[1]
        }, (savedFiles) => {
 			console.log(savedFiles);
 			if(!savedFiles){
@@ -349,18 +296,12 @@ ipc.on('download-btn', (e, args) => {
 			}else{
 				var m = savedFiles.match(/(.+)\/(.+)$/);
 			}
-			
+			//console.log(m);
 			  if(isExistFile(savedFiles)){
-				fs.statSync(savedFiles);
-				fs.unlink(savedFiles);
+					fs.unlinkSync(savedFiles);
 			  }
-			  console.log(m[1]+":"+savedFiles)
-              dl(portable,ver,m[1],savedFiles);
+              dl(args[0],args[1],m[1]);
        });
-	}else{
-		dl(portable,ver);
-	}
-	
 });
 function isExistFile(file) {
 	try {
@@ -370,48 +311,10 @@ function isExistFile(file) {
 	  if(err.code === 'ENOENT') return false
 	}
  }
-function dl(portable,ver,files,fullname){
-	console.log(files);
-	var platform=process.platform;
-	var bit=process.arch;
-	if(platform=="win32"){
-		if(bit=="x64"){
-			if(portable){
-				var zip="TheDesk.exe";
-			}else{
-				var zip="TheDesk-setup.exe";
-			}
-		}else if(bit=="ia32"){
-			if(portable){
-				var zip="TheDesk-ia32.exe";
-			}else{
-				var zip="TheDesk-setup-ia32.exe";
-			}
-		}
-	}else if(platform=="linux"){
-		if(bit=="x64"){
-			var zip="TheDesk-linux-x64.zip";
-		}else if(bit=="ia32"){
-			var zip="TheDesk-linux-ia32.zip";
-		}
-	}else if(platform=="darwin"){
-			var zip="TheDesk-darwin-x64.zip";
-	}
-	//zip=zip+"?"+ver;
-	var l = 8;
-
-	// 生成する文字列に含める文字セット
-	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
-
-	var cl = c.length;
-	var r = "";
-	for(var i=0; i<l; i++){
-	  r += c[Math.floor(Math.random()*cl)];
-	}
-
+function dl(url,file,dir){
 	updatewin.webContents.send('mess', "ダウンロードを開始します。");
 	const opts = {
-		directory:fullname,
+		directory:dir,
 		openFolderWhenDone: true,
 		onProgress: function(e) {
 			updatewin.webContents.send('prog', e);
@@ -419,7 +322,7 @@ function dl(portable,ver,files,fullname){
 		saveAs: false
 	};
 	download(BrowserWindow.getFocusedWindow(),
-			'https://dl.thedesk.top/'+zip, opts)
+			url, opts)
 		.then(dl => {
 			updatewin.webContents.send('mess', "ダウンロードが完了しました。");
 			app.quit();
@@ -474,6 +377,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 +402,7 @@ ipc.on('itunes', (e, args) => {
 			console.log(error);
 		});
 		}else{
+			return;
 			var nppath=join(app.getPath("userData"), "nowplaying");
 			var npProvider;
 			try {
--- a/app/package-lock.json
+++ b/app/package-lock.json
--- a/app/package.json
+++ b/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": {
@@ -78,9 +76,9 @@
    "electronVersion": "3.0.10"
  },
  "devDependencies": {
-    "electron": "^3.0.10",
+    "electron": "^4.0.5",
    "electron-packager": "^13.0.1",
    "electron-prebuilt": "^1.4.13",
-    "electron-rebuild": "^1.8.2"
+    "electron-rebuild": "^1.8.4"
  }
 }
--- a/app/view/en/index.html
+++ b/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";
@@ -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>Support TheDesk!</h3>
--- a/app/view/en/setting.html
+++ b/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>
@@ -59,11 +59,15 @@
 		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_no" value="no" />
 		<label for="ntf_no">No</label>
 		<br>
-		<h5>Minimam width of columns</h5>Scroll bar will be shown when your window size is more than ammounts of columns.
+		<h5>Minimum width of columns</h5>Scroll bar will be shown when your window size is more than ammounts of columns.
 		<br>
 		<input type="text" style="width:50px" id="width">pxabove
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
 		<br>
+		<h5>Minimum 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>
@@ -315,7 +319,7 @@
 			<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
 		</div>
 		<div class="collapsible-body">
-			<h5>NowPlaying Provider(Windows)</h5>
+			<!-->h5>NowPlaying Provider(Windows)</h5>
 			macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required.<br>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
 			<label for="aimp">AIMP</label>
@@ -330,7 +334,7 @@
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
 			<label for="wlm">WLM</label>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
-			<label for="cad">CAD</label><br><br>
+			<label for="cad">CAD</label><br><br-->
 			Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
 			<h5>Account Connection</h5>
 			TheDesk save your data on thedesk.top server.<br>
--- a/app/view/en/update.html
+++ b/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,12 @@ 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>
-        <div id="checkbox">
-            Options:<br>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
-            <label for="portable">Portable ver.</label><br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">Not rewrite</label><br>
-        </div>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">Installer ver.</button>
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">Portable ver.</button>
+        <span class="linux">Snap ver may be on Snapcraft<br></span>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">Start</button>
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">Start</button>
+        <br>
        Some problems?<br>Please download on <a href="https://thedesk.top">Oficial HP</a>.
    </div>
    <div id="skipper" class="hide">
@@ -123,17 +124,49 @@ function update(sel){
    $("#dlnow").toggleClass("hide");
    $("#dlnow").toggleClass("show");
    $("#prog").text("");
-    if($('#rewrite:checked').val()=="true"){
-        var versioning=true;
-	}else{
-        var versioning=false;
-    }
-    if($('#portable:checked').val()=="true"){
-		var zip=true;
-	}else{
-        var zip=false;
-    }
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+    var remote=electron.remote;
+    var bit=process.arch;
+    var start="https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET',
+		headers: {'content-type': 'application/json'},
+    }).then(function(response) {
+       return response.json();
+    }).catch(function(error) {
+        todo(error);
+		console.error(error);
+    }).then(function(json) {
+        if(sel=="install"){
+            if(bit=="x64"){
+                var url=json["winx64"];
+                var file="TheDesk-setup.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32"];
+                var file="TheDesk-setup-ia32.exe";
+            }
+        }else if(sel=="portable"){
+            if(bit=="x64"){
+                var url=json["winx64p"];
+                var file="TheDesk.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32p"];
+                var file="TheDesk-ia32.exe";
+            }
+        }else if(sel=="linux"){
+            if(bit=="x64"){
+                var url=json["linuxx64"];
+                var file="TheDesk-linux-x64.zip";
+            }else if(bit=="ia32"){
+                var url=json["linuxia64"];
+                var file="TheDesk-linux-ia32.zip";
+            }
+        }else if(sel=="mac"){
+            var url=json["mac"];
+            var file="TheDesk-darwin-x64.zip";
+        }
+        ipc.send('download-btn', [url,file]);
+    });
+	
 }
 	function quit(){
 				ipc.send('quit', 'go');
@@ -149,9 +182,14 @@ ipc.on('mess', function (event, arg) {
 })
 function verck(){
    var remote=electron.remote;
-	var platform=remote.process.platform;
-	if(platform!="win32"){
-		$('#portable').prop("disabled",true)
+    var platform=remote.process.platform;
+    var bit=process.arch;
+	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 +205,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(){
--- a/app/view/ja/index.html
+++ b/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";
@@ -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>ご支援ください。</h3>
--- a/app/view/ja/setting.html
+++ b/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>
@@ -315,7 +319,7 @@
 			<i class="fa fa-spotify"></i>SpotifyとNowPlayingの設定
 		</div>
 		<div class="collapsible-body">
-			<h5>NowPlayingのソース(Windows)</h5>
+			<!-->h5>NowPlayingのソース(Windows)</h5>
 			macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a>が必要です。<br>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
 			<label for="aimp">AIMP</label>
@@ -330,7 +334,7 @@
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
 			<label for="wlm">WLM</label>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
-			<label for="cad">CAD</label><br><br>
+			<label for="cad">CAD</label><br><br-->
 			<i class="material-icons" style="font-size:24px;">music_note</i>ボタンから簡単にNowPlayingができます。<br>
 			<h5>アカウントの連携</h5>
 			APIの性質上，thedesk.topへアクセスします。<br>
--- a/app/view/ja/update.html
+++ b/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,12 @@ 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>
-        <div id="checkbox">
-            Options:<br>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
-            <label for="portable">ポータブル版</label><br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">上書きしない</label><br>
-        </div>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">インストーラー版(推奨)</button>
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">ポータブル版</button>
+        <span class="linux">snap版はSnapcraft等よりDLしてください。<br></span>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">開始</button>
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">開始</button>
+        <br>
        問題が発生しますか？<br><a href="https://thedesk.top">公式HP</a>からダウンロードをお試しください。
    </div>
    <div id="skipper" class="hide">
@@ -123,17 +124,49 @@ function update(sel){
    $("#dlnow").toggleClass("hide");
    $("#dlnow").toggleClass("show");
    $("#prog").text("");
-    if($('#rewrite:checked').val()=="true"){
-        var versioning=true;
-	}else{
-        var versioning=false;
-    }
-    if($('#portable:checked').val()=="true"){
-		var zip=true;
-	}else{
-        var zip=false;
-    }
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+    var remote=electron.remote;
+    var bit=process.arch;
+    var start="https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET',
+		headers: {'content-type': 'application/json'},
+    }).then(function(response) {
+       return response.json();
+    }).catch(function(error) {
+        todo(error);
+		console.error(error);
+    }).then(function(json) {
+        if(sel=="install"){
+            if(bit=="x64"){
+                var url=json["winx64"];
+                var file="TheDesk-setup.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32"];
+                var file="TheDesk-setup-ia32.exe";
+            }
+        }else if(sel=="portable"){
+            if(bit=="x64"){
+                var url=json["winx64p"];
+                var file="TheDesk.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32p"];
+                var file="TheDesk-ia32.exe";
+            }
+        }else if(sel=="linux"){
+            if(bit=="x64"){
+                var url=json["linuxx64"];
+                var file="TheDesk-linux-x64.zip";
+            }else if(bit=="ia32"){
+                var url=json["linuxia64"];
+                var file="TheDesk-linux-ia32.zip";
+            }
+        }else if(sel=="mac"){
+            var url=json["mac"];
+            var file="TheDesk-darwin-x64.zip";
+        }
+        ipc.send('download-btn', [url,file]);
+    });
+	
 }
 	function quit(){
 				ipc.send('quit', 'go');
@@ -149,9 +182,14 @@ ipc.on('mess', function (event, arg) {
 })
 function verck(){
    var remote=electron.remote;
-	var platform=remote.process.platform;
-	if(platform!="win32"){
-		$('#portable').prop("disabled",true)
+    var platform=remote.process.platform;
+    var bit=process.arch;
+	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 +205,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(){
--- a/app/view/make/index.sample.html
+++ b/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>
--- a/app/view/make/language/main.json
+++ b/app/view/make/language/main.json
@@ -0,0 +1,199 @@
+{
+    "language":"en",
+    "lang_toot":"Toot",
+    "lang_there":"Yes",
+    "lang_nothing":"None",
+    "lang_yesno":"Yes",
+    "lang_no":"No",
+    "lang_progress":"Wait...",
+    "lang_edit":"Edit",
+    "lang_del":"Delete",
+    "lang_add":"Add",
+    "lang_fatalerroroccured":"Some errors are occured, please restart TheDesk.",
+    "lang_speech":"Google US English",
+    "lang_lang":"Language",
+    "lang_langlocale":"English",
+    "lang_back":"Back",
+    "lang_set":"Set",
+    "lang_langadd":"Translate TheDesk to other languages or proofread TheDesk on <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk needs your help.",
+    "lang_version_usever":"No update is found({{ver}})",
+    "lang_version_skipver":"Update was ignored.",
+    "lang_login_noauth":"Show TL of unlogined accounts",
+    "lang_manager_info":"About this instance",
+    "lang_manager_refresh":"Refresh",
+    "lang_manager_delete":"Logout",
+    "lang_manager_color":"Account Color",
+    "lang_manager_confirm":"is about to logout. Continue?",
+    "lang_manager_mainAcct":"Done:choose main account",
+    "lang_manager_def":"Default",
+    "lang_manager_none":"None",
+    "lang_manager_godev":"Open DevCenter of Misskey. We show also an official documents to refer.",
+    "lang_bbmd_misskey":"TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
+    "lang_emoji_get":"Get emojis",
+    "lang_emoji_custom":"Custom emojis",
+    "lang_postimg_previewdis":"cannot preview",
+    "lang_postimg_aftupload":"You cannot change accounts after uploading.",
+    "lang_post_tagTL":"This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
+    "lang_post_tagVis":"This toot(not 'public' toot) is not shown on this tag's TL.",
+    "lang_post_cwtitle":"Auto CW Alert",
+    "lang_post_cwtxt":"You are about to post longer toot than you set.\nWarning text:",
+    "lang_post_btn1":"Cancel (will not post)",
+    "lang_post_btn2":"Make text hidden automatically",
+    "lang_post_btn3":"Continue to post",
+    "lang_status_favWarn":"It will take a miunte to favourite a remote toot.",
+    "lang_status_btWarn":"It will take a miunte to boost a remote toot.",
+    "lang_status_follow":"Follow",
+    "lang_status_unfollow":"Unfollow",
+    "lang_status_block":"Block",
+    "lang_status_unblock":"Unblock",
+    "lang_status_mute":"Mute",
+    "lang_status_unmute":"Unmute",
+    "lang_status_redraft":"Continue to delete & redraft? You lose statuses of this toot. This fanction may contain some bugs. Images of this toot will be deleted on older than Mastodon 2.4.1.",
+    "lang_status_emphas":"'s toots are emphasized. Please reload after this action.",
+    "lang_status_unemphas":"'s toots are not emphasized. Please reload after this action.",
+    "lang_status_unendorse":"Not feature on profile",
+    "lang_status_endorse":"Feature on profile",
+    "lang_suggest_nodata":"Please get emojis list in order to show suggestion.",
+    "lang_usetxtbox_reply":"Reply Mode. Ctrl+Shift+C to clear.",
+    "lang_cards_check":" check",
+    "lang_cards_pip":"PiP mode",
+    "lang_details_nodata":"No data",
+    "lang_details_filtered":"Filtered toot",
+    "lang_details_embed":"Embed HTML is cliped.",
+    "lang_details_url":"URL of this toot is cliped.",
+    "lang_details_txt":"Content of this toot is cliped.",
+    "lang_filter_nodata":"No data",
+    "lang_filter_errordegree":"Please check a context",
+    "lang_list_nodata":"No data",
+    "lang_list_show":"Show",
+    "lang_list_users":"Users list",
+    "lang_list_nouser":"No users in this list.",
+    "lang_list_add":"Add to the list",
+    "lang_list_remove":"Remove from the list",
+    "lang_notf_new":" new notifications",
+    "lang_speech_refresh":"Save value about TTS config",
+    "lang_src_ts":"chronological order",
+    "lang_src_people":" people toot",
+    "lang_tags_always":"Always toots with ",
+    "lang_tags_realtime":"Tag-stream toot",
+    "lang_tags_tagunpin":"Unpin {{tag}}",
+    "lang_tags_tagwarn":"When you toot without {{tag}}, tag-streaming mode will be off.",
+    "lang_tl_media":"Media",
+    "lang_tl_reconnect":"Reconnect to streaming API",
+    "lang_layout_gotop":"Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
+    "lang_layout_thisacct":"{{notf}} of this account",
+    "lang_layout_delthis":"Remove this column",
+    "lang_layout_setthis":"Preferences of this column",
+    "lang_layout_mediafil":"Media filtering",
+    "lang_layout_linkana":"Auto Link Analyzer",
+    "lang_layout_linkanades":"Auto link analyzer",
+    "lang_layout_tts":"Text to speech ",
+    "lang_layout_reconnect":"Reconnect to streaming API",
+    "lang_layout_headercolor":"Header color of this column",
+    "lang_layout_nodata":"[No data]<br>F5/⌘+R to reload",
+    "lang_layout_dm":"Direct Message",
+    "lang_layout_webviewmode":"Prefer WebView",
+    "lang_excluded":"Excluded type of notification",
+    "lang_spotify_img":"Attach an album artwork",
+    "lang_spotify_imgno":"Not attach an album artwork",
+    "lang_spotify_acct":"Connect TheDesk to Spotify",
+    "lang_spotify_np":"Done:templete of NowPlaying",
+    "lang_setting_npprovide":"NowPlaying provider:{{set}}",
+    "lang_hisdata_frcreq":"Required Mastodon 2.4.3 and above",
+    "lang_hisdata_frcwarn":"Unfollow accounts will be shown.",
+    "lang_hisdata_taketime":"It will take 30s ~ several minutes",
+    "lang_hisdata_notonmisskey":"Misskey is unable to request.",
+    "lang_showontl_movetxt":"This account was moved",
+    "lang_showontl_movebtn":"Continue on the new account",
+    "lang_showontl_botacct":"[bot]",
+    "lang_showontl_followed":"Following you",
+    "lang_showontl_notf":"Notification ",
+    "lang_showontl_domain":"Domain ",
+    "lang_showontl_listwarn":"Follow to add this user to lists.",
+    "lang_parse_mentioned":" replied to you",
+    "lang_parse_faved":" favourited your toot",
+    "lang_parse_bted":" boosted your toot",
+    "lang_parse_btedsimple":" boosted",
+    "lang_parse_notftime":"Actioned at",
+    "lang_parse_cwshow":"Show",
+    "lang_parse_fulltext":"Full size text:",
+    "lang_parse_autofold":"Auto folded",
+    "lang_parse_more":"More",
+    "lang_parse_url":"URL Analyzer",
+    "lang_parse_tagTL":"Timeline of {{tag}}",
+    "lang_parse_tagtoot":"Toot with {{tag}}",
+    "lang_parse_tagpin":"Pin {{tag}}",
+    "lang_parse_public":"Public",
+    "lang_parse_unlisted":"Unlisted",
+    "lang_parse_private":"Private",
+    "lang_parse_direct":"Direct",
+    "lang_parse_clickcopy":"Click to copy text of this toot",
+    "lang_parse_clickcopyurl":"Click to copy URL of this toot",
+    "lang_parse_trans":"Translate to Japanese",
+    "lang_parse_replyto":"Reply to this toot",
+    "lang_parse_bt":"Boost this toot",
+    "lang_parse_fav":"Favourite this toot",
+    "lang_parse_quote":"Quote this toot",
+    "lang_parse_del":"Delete this toot",
+    "lang_parse_pin":"Pin this toot",
+    "lang_parse_det":"Details via your main account.",
+    "lang_parse_redraft":"Delete & re-draft",
+    "lang_parse_followed":"Followed you",
+    "lang_parse_clientop":"Operation of this client",
+    "lang_parse_clienttxt":" will be",
+    "lang_parse_clientno":"done nothing",
+    "lang_parse_clientemp":"emphasized(/not emphasized)",
+    "lang_parse_clientmute":"muted",
+    "lang_parse_mute":" will be muted. You can remove on preferences.",
+    "lang_misskeyparse_renote":"Repost",
+    "lang_misskeyparse_renoteqt":"Renote",
+    "lang_misskeyparse_reaction":"Reaction",
+    "lang_misskeyparse_tagnostr":"No streaming API on Tag TLs",
+    "lang_misskeyparse_listnostr":"No streaming API on List TLs",
+    "lang_misskeyparse_home":"Home",
+    "lang_misskeyparse_followers":"Follower",
+    "lang_misskeyparse_specified":"Specified User",
+    "lang_misskeyparse_qt":"Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
+    "lang_misskeyparse_renoted":" renoted your following post.",
+    "lang_misskeyparse_quoted":" quoted your following post.",
+    "lang_misskeyparse_reacted":" reacted your following post.",
+    "lang_setting_time":"Time format:{{set}}",
+    "lang_setting_theme":"Theme:{{set}}",
+    "lang_setting_nsfw":"NSFW:{{set}}",
+    "lang_setting_cw":"CW:{{set}}",
+    "lang_setting_cwtext":"Default CW text:{{set}}",
+    "lang_setting_cws":"Always CW on:{{set}}",
+    "lang_setting_rp":"Reply counter:{{set}}",
+    "lang_setting_vis":"Default visibility:{{set}}",
+    "lang_setting_popup":"Popup notification:{{set}}",
+    "lang_setting_off":"Off",
+    "lang_setting_s":"s",
+    "lang_setting_box":"Default toot box action:{{set}}",
+    "lang_setting_gif":"GIF:{{set}}",
+    "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",
+    "lang_setting_size":"Font size:{{set}}px",
+    "lang_setting_imgheight":"Image height:{{set}}px",
+    "lang_setting_ticker":"#InstanceTicker:{{set}}px",
+    "lang_setting_tag":"Tag TL:{{set}}",
+    "lang_setting_boxConfirm":"Post box:{{set}}",
+    "lang_setting_ul":"Native locale:{{set}}",
+    "lang_setting_notf":"Native notification:{{set}}",
+    "lang_setting_quote":"Quote format:{{set}}",
+    "lang_setting_via":"Via:{{set}}",
+    "lang_setting_mov":"Action buttons hiding:{{set}}",
+    "lang_setting_setasread":"Notification markers:{{set}}",
+    "lang_setting_main":"Default account:{{set}}",
+    "lang_setting_sec":"Secondary toot button:{{set}}",
+    "lang_setting_ksref":"Keyboard shortcuts are refreshed.",
+    "lang_setting_nomuting":"No client is muted.",
+    "lang_setting_notftest":" Notification test ",
+    "lang_setting_notftestprof":"Your icon is shown.",
+    "lang_setting_exportwarn":"Only important data will be exported. You must keep this data secure.",
+    "lang_setting_importwarn":"All data will be deleted."
+}
--- a/app/view/make/language/setting.en.json
+++ b/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'",
--- a/app/view/make/language/setting.ja.json
+++ b/app/view/make/language/setting.ja.json
@@ -19,6 +19,8 @@
    "nntest":"通知テスト",
    "minwidth":"マルチカラムの最低横幅",
    "minwidthwarn":"画面全体の横幅÷コラム数がこの値を超えた時、横スクロールとなります。",
+    "fixwidth":"TweetDeckの限定の最低横幅",
+    "fixwidthwarn":"",
    "above":"以上",
    "font":"フォント",
    "fontwarn":"「選択」を押してフォントを選んでください。",
--- a/app/view/make/language/update.en.json
+++ b/app/view/make/language/update.en.json
@@ -2,7 +2,8 @@
    "updatehere":"Get latest TheDesk",
    "download":"Start",
    "portable":"Portable ver.",
-    "winzip":"Durling unzippng, TheDesk may freeze. It takes several seconds.",
+    "installer":"Installer ver.",
+    "snap":"Snap ver may be on Snapcraft",
    "unrewrite":"Not rewrite",
    "sureupd":"You may lose a cool experience!",
    "skipupd":"Skip this update",
--- a/app/view/make/language/update.ja.json
+++ b/app/view/make/language/update.ja.json
@@ -2,7 +2,8 @@
    "updatehere":"アップデートがあります",
    "download":"開始",
    "portable":"ポータブル版",
-    "unrewrite":"上書きしない",
+    "installer":"インストーラー版(推奨)",
+    "snap":"snap版はSnapcraft等よりDLしてください。",
    "sureupd":"アップデートは必ず行ってください",
    "skipupd":"アップデートをスキップする",
    "nexttl":"次回TL表示時まで",
--- a/app/view/make/setting.sample.html
+++ b/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>
@@ -315,7 +319,7 @@
 			<i class="fa fa-spotify"></i>{{spotify}}
 		</div>
 		<div class="collapsible-body">
-			<h5>{{npProvider}}</h5>
+			<!-->h5>{{npProvider}}</h5>
 			{{npPeoviderWarn}}<br>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
 			<label for="aimp">AIMP</label>
@@ -330,7 +334,7 @@
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
 			<label for="wlm">WLM</label>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
-			<label for="cad">CAD</label><br><br>
+			<label for="cad">CAD</label><br><br-->
 			{{spotifynote1}}<i class="material-icons" style="font-size:24px;">music_note</i>{{spotifynote2}}<br>
 			<h5>{{link}}</h5>
 			{{linkwarn}}<br>
--- a/app/view/make/update.sample.html
+++ b/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,12 @@ 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>
-        <div id="checkbox">
-            Options:<br>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
-            <label for="portable">{{portable}}</label><br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">{{unrewrite}}</label><br>
-        </div>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">{{portable}}</button>
+        <span class="linux">{{snap}}<br></span>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">{{download}}</button>
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">{{download}}</button>
+        <br>
        {{problem1}}<br>{{problem2}}
    </div>
    <div id="skipper" class="hide">
@@ -123,17 +124,49 @@ function update(sel){
    $("#dlnow").toggleClass("hide");
    $("#dlnow").toggleClass("show");
    $("#prog").text("");
-    if($('#rewrite:checked').val()=="true"){
-        var versioning=true;
-	}else{
-        var versioning=false;
-    }
-    if($('#portable:checked').val()=="true"){
-		var zip=true;
-	}else{
-        var zip=false;
-    }
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+    var remote=electron.remote;
+    var bit=process.arch;
+    var start="https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET',
+		headers: {'content-type': 'application/json'},
+    }).then(function(response) {
+       return response.json();
+    }).catch(function(error) {
+        todo(error);
+		console.error(error);
+    }).then(function(json) {
+        if(sel=="install"){
+            if(bit=="x64"){
+                var url=json["winx64"];
+                var file="TheDesk-setup.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32"];
+                var file="TheDesk-setup-ia32.exe";
+            }
+        }else if(sel=="portable"){
+            if(bit=="x64"){
+                var url=json["winx64p"];
+                var file="TheDesk.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32p"];
+                var file="TheDesk-ia32.exe";
+            }
+        }else if(sel=="linux"){
+            if(bit=="x64"){
+                var url=json["linuxx64"];
+                var file="TheDesk-linux-x64.zip";
+            }else if(bit=="ia32"){
+                var url=json["linuxia64"];
+                var file="TheDesk-linux-ia32.zip";
+            }
+        }else if(sel=="mac"){
+            var url=json["mac"];
+            var file="TheDesk-darwin-x64.zip";
+        }
+        ipc.send('download-btn', [url,file]);
+    });
+	
 }
 	function quit(){
 				ipc.send('quit', 'go');
@@ -149,9 +182,14 @@ ipc.on('mess', function (event, arg) {
 })
 function verck(){
    var remote=electron.remote;
-	var platform=remote.process.platform;
-	if(platform!="win32"){
-		$('#portable').prop("disabled",true)
+    var platform=remote.process.platform;
+    var bit=process.arch;
+	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 +205,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(){
--- 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>
@@ -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";
@@ -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>crwdns473:0crwdne473:0</h3>
--- 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">
@@ -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>
@@ -315,7 +319,7 @@
 			<i class="fa fa-spotify"></i>crwdns624:0crwdne624:0
 		</div>
 		<div class="collapsible-body">
-			<h5>{{npProvider}}</h5>
+			<!-->h5>{{npProvider}}</h5>
 			{{npPeoviderWarn}}<br>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
 			<label for="aimp">AIMP</label>
@@ -330,7 +334,7 @@
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
 			<label for="wlm">WLM</label>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
-			<label for="cad">CAD</label><br><br>
+			<label for="cad">CAD</label><br><br-->
 			crwdns625:0crwdne625:0<i class="material-icons" style="font-size:24px;">music_note</i>crwdns626:0crwdne626:0<br>
 			<h5>crwdns627:0crwdne627:0</h5>
 			crwdns628:0crwdne628:0<br>
--- 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>
@@ -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,12 @@ 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>
-        <div id="checkbox">
-            Options:<br>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
-            <label for="portable">crwdns1950:0crwdne1950:0</label><br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">crwdns673:0crwdne673:0</label><br>
-        </div>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">crwdns1950:0crwdne1950:0</button>
+        <span class="linux">{{snap}}<br></span>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
+        <br>
        crwdns678:0crwdne678:0<br>crwdns679:0crwdne679:0
    </div>
    <div id="skipper" class="hide">
@@ -123,17 +124,49 @@ function update(sel){
    $("#dlnow").toggleClass("hide");
    $("#dlnow").toggleClass("show");
    $("#prog").text("");
-    if($('#rewrite:checked').val()=="true"){
-        var versioning=true;
-	}else{
-        var versioning=false;
-    }
-    if($('#portable:checked').val()=="true"){
-		var zip=true;
-	}else{
-        var zip=false;
-    }
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+    var remote=electron.remote;
+    var bit=process.arch;
+    var start="https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET',
+		headers: {'content-type': 'application/json'},
+    }).then(function(response) {
+       return response.json();
+    }).catch(function(error) {
+        todo(error);
+		console.error(error);
+    }).then(function(json) {
+        if(sel=="install"){
+            if(bit=="x64"){
+                var url=json["winx64"];
+                var file="TheDesk-setup.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32"];
+                var file="TheDesk-setup-ia32.exe";
+            }
+        }else if(sel=="portable"){
+            if(bit=="x64"){
+                var url=json["winx64p"];
+                var file="TheDesk.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32p"];
+                var file="TheDesk-ia32.exe";
+            }
+        }else if(sel=="linux"){
+            if(bit=="x64"){
+                var url=json["linuxx64"];
+                var file="TheDesk-linux-x64.zip";
+            }else if(bit=="ia32"){
+                var url=json["linuxia64"];
+                var file="TheDesk-linux-ia32.zip";
+            }
+        }else if(sel=="mac"){
+            var url=json["mac"];
+            var file="TheDesk-darwin-x64.zip";
+        }
+        ipc.send('download-btn', [url,file]);
+    });
+	
 }
 	function quit(){
 				ipc.send('quit', 'go');
@@ -149,9 +182,14 @@ ipc.on('mess', function (event, arg) {
 })
 function verck(){
    var remote=electron.remote;
-	var platform=remote.process.platform;
-	if(platform!="win32"){
-		$('#portable').prop("disabled",true)
+    var platform=remote.process.platform;
+    var bit=process.arch;
+	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 +205,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(){
--- a/package-lock.json
+++ b/package-lock.json
@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}
Author	SHA1	Message	Date
Cutls	560494467b	TheDesk Miria (17.0.1)	2019-02-27 10:58:29 +09:00
Cutls	75a397aafd	TheDesk Miria (17.0.1)	2019-02-27 10:17:35 +09:00
Cutls	4d5916b595	TheDesk Miria (17.0.1)	2019-02-27 01:51:37 +09:00