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

TheDesk Usamin (18.1.2) Released
2019-04-03 13:14:40 +09:00 · 2019-04-03 12:59:29 +09:00 · 2019-04-02 23:51:17 +09:00 · 2019-04-02 23:42:25 +09:00 · 2019-03-29 19:34:46 +09:00 · 2019-03-29 18:10:15 +09:00
53 changed files with 1103 additions and 1373 deletions
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@

 [![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)  
-[![Server-up time](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com/)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのWindows/Linuxクライアント  
 Download:[TheDesk](https://thedesk.top)  
@@ -57,7 +56,7 @@ Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.
 * sumchecker(in package.json)
 * Ability to read unformated files!(install yourself)

-## Contributors/コントリビューター
+## Contributors/主なコントリビューター

 macOSビルダー  

@@ -67,6 +66,10 @@ Linuxビルダー

 * [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)

+iTunes NowPlayingにアルバムアートワークを付けてくれた人
+
+* [kPherox](https://www.kr-kp.com/)
+
 ## Build/ビルド

 Misskey(misskey.xyz) application token is not in cutls/TheDesk  
--- a/app/css/post.css
+++ b/app/css/post.css
@@ -68,6 +68,15 @@
 #preview-field {
  display: none;
 }
+.preview-img{
+  width:50px;
+  max-height:100px;
+}
+.pi-wrap{
+  display:inline-block;
+  width:50px;
+  max-height:100px;
+}
 #default-emoji a{
  color:white;
  margin-right:2px;
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -108,10 +108,22 @@ iframe {
 .box {
  overflow: hidden;
  min-width: 300px;
-  height: 100vh;
  flex: 1;
-  border: thin solid gray;
  border-top:none;
+  display:flex;
+  flex-direction: column;
+  margin-bottom: -10px;
+}
+.img_FTL{
+  display:none;
+}
+.bbcode_FTL{
+  display:none;
+}
+.boxIn{
+  height:100%;
+  border: thin solid gray;
+  overflow: hidden;
 }
 .box .pin,#his-data .pin{
  display:none;
@@ -131,7 +143,11 @@ iframe {
 .faicon_FTL{
  display:none;
 }
-.tl-box{ height:calc(100% - 40px); overflow-y:scroll; overflow-x:hidden }
+.tl-box{
+  position:relative;
+  height:calc(100% - 40px);
+  overflow-y:scroll;
+  overflow-x:hidden }
 .additional {
  overflow-x: scroll;
  width: 100%;
@@ -266,6 +282,7 @@ grid-area: toot;
 .toot-img {
  object-fit: cover;
  width: 100%;
+  margin-right:1px;
 }
 .toot img:not(.emoji-img) {
  max-width: 100%;
--- a/app/index.start.html
+++ b/app/index.start.html
@@ -1,5 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta http-equiv="refresh" content="0;URL='language.html?mode=redirect'" />
-</head>
--- a/app/js/common/keyshortcut.js
+++ b/app/js/common/keyshortcut.js
@@ -92,6 +92,7 @@ $(function($) {
 			if (e.keyCode === 88) {
 				if (!$("#post-box").hasClass("appear")) {
 					show();
+					$('textarea').focus();
 				} else {
 					hide();
 				}
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@@ -62,10 +62,29 @@ function verck(ver) {
 				  }
 			});
 		}
+	  }else if(platform=="darwin"){
+		if(localStorage.getItem("winstore")=="unix"){
+			localStorage.removeItem("winstore")
+		}
+		if(!localStorage.getItem("winstore")){
+			const options = {
+				type: 'info',
+				title: "Select your platform",
+				message: lang.lang_version_platform_mac,
+				buttons: [lang.lang_no,lang.lang_yesno]
+			  }
+			  dialog.showMessageBox(options, function(arg) {
+				if(arg==1){
+					localStorage.setItem("winstore","brewcask")
+				  }else{
+					localStorage.setItem("winstore","localinstall")
+				  }
+			});
+		}
 	}else{
 		  localStorage.setItem("winstore","unix")
 	  }
-	  if(localStorage.getItem("winstore")=="snapcraft" || localStorage.getItem("winstore")=="winstore"){
+	  if(localStorage.getItem("winstore")=="brewcask" || localStorage.getItem("winstore")=="snapcraft" || localStorage.getItem("winstore")=="winstore"){
 		var winstore=true;
 	  }else{
 		  var winstore=false;
@@ -178,10 +197,14 @@ function verck(ver) {
 		}
 	}
 	});
+}
+var infostreaming=false;
+function infowebsocket(){
 	infows = new WebSocket("wss://thedesk.top/ws/");
 	infows.onopen = function(mess) {
 		console.log(tlid + ":Connect Streaming Info:");
 		console.log(mess);
+		infostreaming=true;
 	}
 	infows.onmessage = function(mess) {
 		console.log(":Receive Streaming:");
@@ -227,11 +250,19 @@ function verck(ver) {
 	}
 	}
 	infows.onerror = function(error) {
+		infostreaming=false;
 		console.error("Error closing:info");
 		console.error(error);
 		return false;
 	};
 	infows.onclose = function() {
+		infostreaming=false;
 		console.error("Closing:info");
 	};
-}
+}
+setInterval(function(){
+    if(!infostreaming){
+		console.log("try to connect")
+		infowebsocket();
+	}
+}, 10000);
--- a/app/js/lang/lang.en.js
+++ b/app/js/lang/lang.en.js
@@ -23,6 +23,7 @@ var lang={
    "lang_version_skipver":"Update was ignored.",
    "lang_version_platform":"Was this software installed at Microsoft Store? When select 'yes', any update was ignored.",
    "lang_version_platform_linux":"Was this software installed at Snapcraft(snapd)? When select 'yes', any update was ignored.",
+    "lang_version_platform_mac":"Was this software installed at Homebrew Cask? When select 'yes', any update was ignored.",
    //login
    //login/login.js
    "lang_login_noauth":"Show TL of unlogined accounts",
@@ -45,6 +46,7 @@ var lang={
    //post/img.js
    "lang_postimg_previewdis":"cannot preview",
    "lang_postimg_aftupload":"You cannot change accounts after uploading.",
+    "lang_postimg_delete":"Delete this image.",
    //post/post.js
    "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.",
@@ -122,6 +124,8 @@ var lang={
    "lang_layout_webviewmode":"Prefer WebView",
    "lang_excluded":"Excluded type of notification",
    "lang_layout_excludingbt":"Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_leftFold":"Stack to the left",
+    "lang_layout_leftUnfold":"Dock on the right",
    //ui/sort.js
    "lang_sort_gothis":"Go to this column",
    "lang_sort_remthis":"Delete this column",
@@ -149,6 +153,7 @@ var lang={
    "lang_parse_faved":" favourited your toot",
    "lang_parse_bted":" boosted your toot",
    "lang_parse_btedsimple":" boosted",
+    "lang_parse_polled":"'s poll",
    "lang_parse_notftime":"Actioned at",
    "lang_parse_cwshow":"Show",
    "lang_parse_fulltext":"Full size text:",
--- a/app/js/lang/lang.ja.js
+++ b/app/js/lang/lang.ja.js
@@ -23,6 +23,7 @@ var lang={
    "lang_version_skipver":"アップデートはスキップされました。",
    "lang_version_platform":"このソフトウェアはMicrosoft Storeからダウンロードされましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
    "lang_version_platform_linux":"このソフトウェアはSnapcraft(snapd)からインストールしましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
+    "lang_version_platform_mac":"このソフトウェアはHomebrew Caskからインストールしましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
 //login
 //login/login.js
    "lang_login_noauth":"認証せずに見る",
@@ -45,6 +46,7 @@ var lang={
 //post/img.js
    "lang_postimg_previewdis":"プレビューできません。",
    "lang_postimg_aftupload":"アップロード後はアカウントを切り替えられません。",
+    "lang_postimg_delete":"この画像を削除します",
 //post/post.js
    "lang_post_tagTL":"デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。",
    "lang_post_tagVis":"公開範囲が「公開」以外だと、タグTLに表示されません。(一部インスタンスを除く)",
@@ -106,6 +108,8 @@ var lang={
 //tl/tl.js
    "lang_tl_media":"メディア",
    "lang_tl_reconnect":"Streamingに再接続しました",
+//ui/img.js
+    "lang_img_DLDone":"ダウンロード先:",
 //ui/layout.js
    "lang_layout_gotop":"一番上へ。アイコンが赤のときはストリーミングに接続できていません。F5等で再読込をお試し下さい。",
    "lang_layout_thisacct":"このアカウントの{{notf}}",
@@ -122,6 +126,8 @@ var lang={
    "lang_layout_webviewmode":"WebView優先",
    "lang_excluded":"除外する通知",
    "lang_layout_excludingbt":"BT表示(OFF/BT除外/BTのみ)",
+    "lang_layout_leftFold":"左へ重ねる",
+    "lang_layout_leftUnfold":"右へ出す",
 //ui/sort.js
    "lang_sort_gothis":"このカラムへ",
    "lang_sort_remthis":"このカラムを削除",
@@ -149,6 +155,7 @@ var lang={
    "lang_parse_faved":"がお気に入り登録しました",
    "lang_parse_bted":"がブーストしました",
    "lang_parse_btedsimple":"がブースト",
+    "lang_parse_polled":"のアンケート",
    "lang_parse_notftime":"通知された時間",
    "lang_parse_cwshow":"見る",
    "lang_parse_fulltext":"以下全文",
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -335,7 +335,29 @@ function misskeyLogin(url) {
 	httpreq.send(JSON.stringify({
 			name: "TheDesk(PC)",
 			description: "Mastodon client for PC",
-			permission: ["read","write","follow"]
+			permission: [
+				"account-read",
+				"account-write",
+				"account/read",
+				"account/write",
+				"drive-read",
+				"drive-write",
+				"favorite-read",
+				"favorite-write",
+				"favorites-read",
+				"following-read",
+				"following-write",
+				"messaging-read",
+				"messaging-write",
+				"note-read",
+				"note-write",
+				"notification-read",
+				"notification-write",
+				"reaction-read",
+				"reaction-write",
+				"vote-read",
+				"vote-write"
+			]
 	}));
    httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -171,10 +171,10 @@ function opendev(){
 	  */
 }

-var webview = document.getElementById('webview');
+var webviewDom = document.getElementById('webview');
 const {
 	shell
 } = require('electron');
-webview.addEventListener('new-window', function(e) {
+webviewDom.addEventListener('new-window', function(e) {
    shell.openExternal(e.url);
 });
--- a/app/js/post/img.js
+++ b/app/js/post/img.js
@@ -131,7 +131,7 @@ function media(b64, type, no) {
 			console.log(json);
 			var img = localStorage.getItem("img");
 			if (json.type.indexOf("image")!=-1) {
-				var html = '<img src="' + json[previewer] + '" style="width:50px; max-height:100px;">';
+				var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="'+json["id"]+'" onclick="deleteImage(\''+json["id"]+'\')" title="'+lang.lang_postimg_delete+'">';
 				$('#preview').append(html);
 			} else {
 				$('#preview').append(lang.lang_postimg_previewdis);
@@ -183,22 +183,20 @@ function toBlob(base64, type) {
 var element =  document.querySelector("#textarea");
 element.addEventListener("paste", function(e){
 	console.log(e)
-    // 画像の場合
-    // e.clipboardData.types.length == 0
-    // かつ
-    // e.clipboardData.types[0] == "Files"
-    // となっているので、それ以外を弾く
-    if (!e.clipboardData 
-            || !e.clipboardData.types
-            || (e.clipboardData.types.length != 1)
-            || (e.clipboardData.types[0] != "Files")) {
-				console.log("not image")
-            return true;
+    if (!e.clipboardData || !e.clipboardData.items) {
+        return true;
+    }
+    // DataTransferItemList に画像が含まれいない場合は終了する
+	var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image'));
+    if (imageItems.length == 0) {
+		console.log("not image")
+        return true;
    }

    // ファイルとして得る
-    // (なぜかgetAsStringでは上手くいかなかった)
-    var imageFile = e.clipboardData.items[0].getAsFile();
+    // DataTransferItem の kind は file なので getAsString ではなく getAsFile を呼ぶ
+    var imageFile = imageItems[0].getAsFile();
+    var imageType = imageItems[0].type;

    // FileReaderで読み込む
    var fr = new FileReader();
@@ -209,7 +207,8 @@ element.addEventListener("paste", function(e){
 		if(mediav){
 			var i=mediav.split(",").length;
 		}
-		media(base64, "image/png", i)
+        // DataTransferItem の type に mime tipes があるのでそれを使う
+		media(base64, imageType, i)
    };
    fr.readAsDataURL(imageFile);

@@ -222,4 +221,20 @@ function adobe(){
 }
 ipc.on('adobeagree', function (event, arg) {
 	localStorage.setItem("adobeagree",arg);
-  });
+	});
+function deleteImage(key){
+	console.log(key);
+	if(!confirm(lang.lang_postimg_delete)){
+		return false;
+	}
+	var media = $("#media").val();
+	var arr=media.split(",");
+	for(var i=0;i<media.length;i++){
+		if(arr[i]==key){
+				arr.splice(i, 1);
+				break;
+		}
+	}
+	$("#media").val(arr.join(","));
+	$('#preview [data-media='+key+']').remove();
+}
--- a/app/js/post/secure.js
+++ b/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);
--- a/app/js/post/suggest.js
+++ b/app/js/post/suggest.js
@@ -115,7 +115,7 @@ input.addEventListener("focus", function() {
 							}
 						});
 						$("#right-side").show()
-						$("#suggest").html("@:<br>" + accts);
+						$("#suggest").html(accts);
 						$("#poll").addClass("hide")
 						$("#emoji").addClass("hide")
 					} else {
--- a/app/js/post/use-txtbox.js
+++ b/app/js/post/use-txtbox.js
@@ -8,7 +8,9 @@ function re(id,ats_cm,acct_id,mode){
 	for(var i=0;i<ats.length;i++){
 		var at=ats[i];
 		var te=$("#textarea").val();
-		$("#textarea").val("@"+at+" "+te);
+		if(at!=localStorage.getItem("user_"+acct_id)){
+			$("#textarea").val("@"+at+" "+te);
+		}
 	}
 	$("#rec").text(lang.lang_yesno);
 	$("#post-acct-sel").val(acct_id);
--- a/app/js/tl/datails.js
+++ b/app/js/tl/datails.js
@@ -412,62 +412,6 @@ function staCopy(id){
 	}
 	
 }
-//魚拓
-function shot(){
-	var title=$("#tootmodal").attr("data-id");
-	var off = $('#toot-this').offset();
-	var w=$("#toot-this").width()+50;
-	var h=$("#toot-this").height()+50;
-	var electron = require("electron");
-	const fs = require("fs");
-	const os = require('os')
-	const shell = electron.shell;
-	const path = require('path')
-	var ipc = electron.ipcRenderer;
-	let options = {
-        types: ['screen'],
-        thumbnailSize: {
-            width: window.parent.screen.width,
-            height: window.parent.screen.height
-          }
-	}
-	const desktopCapturer = electron.desktopCapturer;
-	desktopCapturer.getSources(options, function(error, sources) {
-		if (error) return console.log(error)
-
-		sources.forEach(function(source) {
-			if (source.name === 'Screen 1' || source.name === 'TheDesk') {
-                var durl=source.thumbnail.toDataURL();
-                var b64 = durl.match(
-                    /data:image\/png;base64,(.+)/
-                );
-                const screenshotPath = path.join(os.tmpdir(), 'screenshot.png');
-                const savePath = path.join(os.tmpdir(), 'screenshot.png');
-					var ipc = electron.ipcRenderer;
-					if(localStorage.getItem("savefolder")){
-						var save=localStorage.getItem("savefolder");
-					}else{
-						var save="";
-					}
-                    ipc.send('shot', ['file://' + screenshotPath,w,h,b64[1],title,off.top+50,off.left,save]);
-                    if($("#toot-this .img-parsed").length>0){
-                        for(i=0;i<$("#toot-this .img-parsed").length;i++){
-							var url=$("#toot-this .img-parsed").eq(i).attr("data-url");
-							if(localStorage.getItem("savefolder")){
-								var save=localStorage.getItem("savefolder");
-							}else{
-								var save="";
-							}
-                            ipc.send('shot-img-dl', [url,title+"_img"+i+".png",save]);
-                        }
-                    }
-                    return;
-					const message = `Saved screenshot to: ${screenshotPath}`
-					//screenshotMsg.textContent = message
-			}
-		})
-	})
-}
 //翻訳
 function trans(tar,to){
 	var html=$("#toot-this .toot").html();
--- a/app/js/tl/filter.js
+++ b/app/js/tl/filter.js
@@ -421,6 +421,16 @@ function exclude(key){
 		}else{
 			excludetxt="?exclude_types[]=follow"
 		}
+		var follow=true;
+	}else{
+		var follow=false;
+	}
+	if($('#exc-poll-'+key+':checked').val()){
+		if(reply || bt || fav || follow){
+			excludetxt=excludetxt+"&exclude_types[]=poll"
+		}else{
+			excludetxt="?exclude_types[]=poll"
+		}
 	}else{
 	}
 	localStorage.setItem("exclude-"+key,excludetxt)
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -606,7 +606,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 			poll='<div class="vote_'+toot.id+'">'+poll+'</div>';
 		}
-        //Reactions
+		//Reactions
        if(toot.reactionCounts){
        if(toot.reactionCounts.like){
            var like=toot.reactionCounts.like;
--- a/app/js/tl/mix.js
+++ b/app/js/tl/mix.js
@@ -239,6 +239,7 @@ function mixmore(tlid,type) {
 	var multi = localStorage.getItem("column");
 	var obj = JSON.parse(multi);
 	var acct_id = obj[tlid].domain;
+	moreloading=true;
 	todo("Integrated TL MoreLoading...(Local)");
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -302,9 +303,9 @@ function mixmore(tlid,type) {
            });
            
             $("#timeline_" + tlid).append(templete);
-            mixre(acct_id, tlid);
 			additional(acct_id, tlid);
 			jQuery("time.timeago").timeago();
+			moreloading=false;
 			todc();
        });
 	});
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -33,6 +33,11 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 	var ltr = localStorage.getItem("letters");
 	var gif = localStorage.getItem("gif");
 	var imh = localStorage.getItem("img-height");
+	if(imh=="full"){
+		imh="auto";
+	}else{
+		imh=imh+"px";
+	}
 	//独自ロケール
 	var locale = localStorage.getItem("locale");
 	if(locale=="yes"){
@@ -223,6 +228,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				if(!locale && localStorage.getItem("fav_" + acct_id)){
 					what = localStorage.getItem("fav_" + acct_id);
 				}
+			} else if (toot.type == "poll") {
+				var what = lang.lang_parse_polled;
+				var icon = "fa-tasks  purple-text";
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at,
 				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at,
@@ -510,7 +518,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
 					'" data-type="' + media.type + '" class="img-parsed"><img draggable="false" src="' +
 					purl + '" class="' + sense +
-					' toot-img pointer" style="width:' + cwdt + '%; height:'+imh+'px;"></a></span>';
+					' toot-img pointer" style="width:calc(' + cwdt + '% - 1px); height:'+imh+';"></a></span>';
 			});
 			media_ids = media_ids.slice(0, -1) ;
 		} else {
--- a/app/js/ui/img.js
+++ b/app/js/ui/img.js
@@ -287,6 +287,10 @@ function dlImg(){
 		console.log(arg);
 	})
 	ipc.on('general-dl-message', function (event, arg) {
-		console.log(arg);
+		var argC=arg.replace(/\\/g,"\\\\")+"\\\\.";
+		Materialize.toast(lang.lang_img_DLDone+arg+'<button class="btn-flat toast-action" onclick="openFinder(\''+argC+'\')">Show</button>', 5000);
 	})
+}
+function openFinder(dir){
+	ipc.send('open-finder', dir);
 }
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -54,8 +54,7 @@ function parseColumn() {
 	}
 	var acctlist=obj;
 	console.log(obj);
-	/*
-var xed=localStorage.getItem("xed");
+	/*var xed=localStorage.getItem("xed");
 	if(xed){
 		xpand();
 	}*/
@@ -73,7 +72,9 @@ var xed=localStorage.getItem("xed");
 	if ($("#timeline-container").length) {
 		$("#timeline-container").html("");
 	}
-	Object.keys(obj).forEach(function(key) {
+	var basekey=0;
+	for(var key=0;key<obj.length;key++){
+		var next=key+1;
 		var acct = obj[key];
 		if(acct.type=="notf"){
 			var notf_attr=' data-notf='+acct.domain;
@@ -109,7 +110,7 @@ var xed=localStorage.getItem("xed");
 			icnsert=' style="color: #'+ichex+'" ';
 			}
 		}
-		console.log(acct.domain);
+		console.log(acct);
 		if(acctlist[acct.domain]){
 			if(acctlist[acct.domain].background!="def"){
 				insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background+";";
@@ -127,7 +128,7 @@ var xed=localStorage.getItem("xed");
 			}else{
 				var css="";
 			}
-			var html =webview("https://tweetdeck.twitter.com",key,insert,icnsert,css);
+			var html =webviewParse("https://tweetdeck.twitter.com",key,insert,icnsert,css);
 			$("#timeline-container").append(html);
 		}else{
 			var width = localStorage.getItem("width");
@@ -145,6 +146,7 @@ var xed=localStorage.getItem("xed");
 			'<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> '+
 			'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fa fa-retweet exc-icons"></i></label> '+
 			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fa fa-users exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fa fa-tasks exc-icons"></i></label> '+
 			'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>';
 		}else if(acct.type=="home"){
 			var exclude='<a onclick="ebtToggle(' + key +
@@ -153,7 +155,18 @@ var xed=localStorage.getItem("xed");
 		}else{
 			var exclude="";
 		}
-		var html = '<div style="'+css+'" class="box '+animecss+'" id="timeline_box_' + key + '_box" tlid="' + key +
+			if(!acct.left_fold){
+				basekey=key;
+				var basehtml = '<div style="'+css+'" class="box '+animecss+'" id="timeline_box_' + basekey + '_parentBox"></div>';
+				$("#timeline-container").append(basehtml);
+				var left_hold='<a onclick="leftFoldSet(' + key +')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_leftFold+'">view_agenda</i></a>'+lang.lang_layout_leftFold+'</span><br>';
+			}else{
+				var left_hold='<a onclick="leftFoldRemove(' + key +')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_leftUnfold+'">view_column</i></a>'+lang.lang_layout_leftUnfold+'</span><br>';
+			}
+			if(key===0){
+				left_hold='';
+			}
+			var html='<div class="boxIn" 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>'+
@@ -167,7 +180,7 @@ var xed=localStorage.getItem("xed");
 		  '<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
 		  '"><div id="notifications_' + key +
 		  '" data-notf="' + acct.domain + '" data-type="notf"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key +
-		  '" style="padding:5px;">'+exclude+'<a onclick="mediaToggle(' + key +
+		  '" style="padding:5px;">'+exclude+left_hold+'<a onclick="mediaToggle(' + key +
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_mediafil +'">perm_media</i><span id="sta-media-' +
 		  key + '">On</span></a>'+lang.lang_layout_mediafil +'<br><a onclick="cardToggle(' + key +
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_linkanades +'">link</i><span id="sta-card-' +
@@ -175,8 +188,8 @@ var xed=localStorage.getItem("xed");
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_tts +'">hearing</i><span id="sta-voice-' +
 		  key + '">On</span></a>'+lang.lang_layout_tts +'TL<br><a onclick="reconnector(' + key +
 		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
-			'" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div></div>';
-		$("#timeline-container").append(html);
+			'" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div>'
+			$('#timeline_box_' + basekey + '_parentBox').append(html);
 		localStorage.removeItem("pool_" + key);
 		if (acct.data) {
 			var data = acct.data;
@@ -201,7 +214,7 @@ var xed=localStorage.getItem("xed");
 		catchCheck(key);
 		voiceCheck(key);
 		}
-	});
+	}
 	var box = localStorage.getItem("box");
 	if (box == "absolute") {
 		setTimeout(show, 1000);
@@ -409,7 +422,7 @@ function coloradd(key,bg,txt){
 	}
 }
 //禁断のTwitter
-function webview(url,key,insert,icnsert,css){
+function webviewParse(url,key,insert,icnsert,css){
 	var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
 			'" 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>'+
@@ -421,8 +434,24 @@ function webview(url,key,insert,icnsert,css){
 		  ')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
 		  '<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
 		  '"></div><div class="column-hide notf-indv-box" id="util-box_' + key +
-		  '" style="padding:5px;">'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '" style="width:100%;height:calc(100% - 110px);"><div id="timeline_' + key +
+		  '" style="padding:5px;">'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '" style="width:100%;height:100%;"><div id="timeline_' + key +
 			'" class="tl" tlid="' + key + '" data-type="webview" style="width:100%;height:100%;"><webview src="'+url+'" style="width:100%;height:100%;" id="webview" preload="./js/platform/twitter.js"></webview></div></div></div>';
 	
 	return html;
-}
+}
+function leftFoldSet(key){
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	obj[key].left_fold=true;
+	var json = JSON.stringify(obj);
+	localStorage.setItem("column", json);
+	parseColumn();
+}
+function leftFoldRemove(key){
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	obj[key].left_fold=false;
+	var json = JSON.stringify(obj);
+	localStorage.setItem("column", json);
+	parseColumn();
+}
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -89,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");
@@ -396,7 +402,7 @@ function importSettings(){
 					localStorage.setItem("card_" + i,"true");
 					localStorage.removeItem("catch_" + i);
 				}
-				location.href="language.html";
+				location.href="index.html";
 			}else{
 				alert("Error.")
 			}
--- a/app/js/ui/spotify.js
+++ b/app/js/ui/spotify.js
@@ -123,16 +123,28 @@ function nowplaying(mode){
    }else if(mode=="itunes"){
        var electron = require("electron");
 	    var ipc = electron.ipcRenderer;
+        if (ipc.listenerCount('itunes-np') > 0) {
+            return false;
+        }
+
 	    ipc.send('itunes', "");
-	    ipc.on('itunes-np', function (event, arg) {
+	    ipc.once('itunes-np', function (event, arg) {
            console.log(arg);
            var content=localStorage.getItem("np-temp");
            if(!content || content=="" || content=="null"){
                var content="#NowPlaying {song} / {album} / {artist}\n{url}";
            }
            var flag=localStorage.getItem("artwork");
-            if(flag && arg.path){
-                media(arg.path,"image/png","new");
+            var remote=electron.remote;
+            var platform=remote.process.platform;
+            if(platform=="win32"){
+                if(flag && arg.path){
+                    media(arg.path,"image/png","new");
+                }
+            }else if(platform=="darwin"){
+                if(flag && arg.artworks[0]){
+                    ipc.send('bmp-image', [arg.artworks[0].path,0]);
+                }
            }
            var regExp = new RegExp("{song}", "g");
            content = content.replace(regExp, arg.name);
@@ -145,11 +157,11 @@ function nowplaying(mode){
            var regExp = new RegExp("{composer}", "g");
            content = content.replace(regExp, arg.composer);
            var regExp = new RegExp("{hz}", "g");
+            content = content.replace(regExp, arg.sampleRate/1000+"kHz");
            var regExp = new RegExp("{lyricist}", "g");
            content = content.replace(regExp, "");
            var regExp = new RegExp("{bpm}", "g");
            content = content.replace(regExp, "");
-            content = content.replace(regExp, arg.sampleRate/1000+"kHz");
            var regExp = new RegExp("{bitRate}", "g");
            content = content.replace(regExp, arg.bitRate+"kbps");
            var regExp = new RegExp("{genre}", "g");
--- a/app/language.html
+++ b/app/language.html
@@ -1,75 +0,0 @@
-<!doctype html>
-<html lang="ja">
-<head>
-	<title>Languages - TheDesk</title>
-	<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">
-	<link href="./css/master.css" type="text/css" rel="stylesheet">
-	<link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans" rel="stylesheet">
-	<meta charset="utf-8">
-</head>
-<body style="max-width:100vw; width:500px; padding:10px;">
-<script type="text/javascript" src="./js/common/jquery.js"></script>
-<script type="text/javascript" src="./js/platform/first.js"></script>
-<script type="text/javascript" src="./js/common/materialize.js"></script>
-<script type="text/javascript" src="./js/lang/lang.js"></script>
-<script type="text/javascript" src="./js/ui/theme.js"></script>
-<h3 id="language"></h3>
-<select id="language-sel" style="color:black" onchange="btn();"></select>
-<button class="btn waves-effect indigo nex" style="width:100%; max-width:200px;" onclick="sel()" id="sel"></button>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;" id="back"></a><br>
-<br>
-<span id="notice"></span>
-<script>
-    //コード受信
-    if(location.search){
-	    var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)/);
-	    var mode=m[1];
-	    if(mode=="redirect"){
-		    if(localStorage.getItem("lang")){
-                changelang(localStorage.getItem("lang"))
-            }
-	    }
-    }
-    var fstlang="";
-    var langtxt="";
-    var addit="";
-    Object.keys(lang_lang).forEach(function(i) {
-        if(langtxt==""){
-            langtxt=lang_lang[i];
-            $("#sel").text(lang_set[i]);
-            $("#back").text(lang_back[i]);
-        }else{
-            langtxt=langtxt+"/"+lang_lang[i];
-        }
-        addit=addit+"<br>"+lang_langadd[i];
-        var loc=lang_langlocale[i];
-        $("#language-sel").append('<option value="'+i+'">'+loc+'</option>');
-    });
-    
-$("#language").text(langtxt)
-$("#notice").html(addit)
-$('select').material_select('update');
-function sel(){
-    var val=$("#language-sel").val();
-    changelang(val);
-}
-function changelang(val){
-    var electron = require("electron");
-    var ipc = electron.ipcRenderer;
-    localStorage.setItem("lang",val);
-    ipc.send('lang', val);
-	ipc.on('langres', function (event, arg) {
-        location.href="index.html";
-	})
-
-}
-function btn(){
-    var val=$("#language-sel").val();
-    $("#sel").text(lang_set[val]);
-    $("#back").text(lang_back[val]);
-}
-</script>
-<script type="text/javascript" src="./js/platform/end.js"></script>
--- a/app/main.js
+++ b/app/main.js
@@ -1,33 +1,26 @@
 'use strict';
-
+var dir='file://' + __dirname;
+var base=dir + '/view/';
 // Electronのモジュール
 const electron = require("electron");
 const fs = require("fs");
-const dialog = require('electron').dialog;
-var Jimp = require("jimp");
-const shell = electron.shell;
-const os = require('os')
-const path = require('path')
-const fm = require('font-manager');
-const language = require('./language.js');
+const language = require('./main/language.js');
+const css = require('./main/css.js');
+const dl = require('./main/dl.js');
+const img = require('./main/img.js');
+const np = require('./main/np.js');
+const systemFunc = require('./main/system.js');
 const Menu=electron.Menu
-var updatewin=null;
 const join = require('path').join;
-var JSON5 = require('json5');
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
 // ウィンドウを作成するモジュール
 const BrowserWindow = electron.BrowserWindow;
-const {
-	download
-} = require('electron-dl');
 // メインウィンドウはGCされないようにグローバル宣言
 let mainWindow;
 var info_path = join(app.getPath("userData"), "window-size.json");
 var max_info_path = join(app.getPath("userData"), "max-window-size.json");
 var lang_path=join(app.getPath("userData"), "language");
-var customcss=join(app.getPath("userData"), "custom.css");
-var tmp_img = join(app.getPath("userData"), "tmp.png");
 var ha_path=join(app.getPath("userData"), "hardwareAcceleration");
 try{
 	fs.readFileSync(ha_path, 'utf8');
@@ -60,14 +53,15 @@ try {
 try {
 	var lang = fs.readFileSync(lang_path, 'utf8');
 } catch (e) {
-	var lang=app.getLocale();
-	if(~lang.indexOf("ja")){
+	var langs=app.getLocale();
+	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() {
@@ -106,7 +100,7 @@ function createWindow() {
 	}else{
 		var plus="";
 	}
-	mainWindow.loadURL('file://' + __dirname + '/view/'+lang+'/index.html'+plus);
+	mainWindow.loadURL(base+lang+'/index.html'+plus);
 	if(!window_size.x && !window_size.y){
 		mainWindow.center();
 	}
@@ -137,528 +131,23 @@ function createWindow() {
 	var platform=process.platform;
 	var bit=process.arch;
 	if(platform=="darwin"){
-		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang,mainWindow)));
+		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang,mainWindow,false)));
 	}
+	//CSS
+	css.css(mainWindow);
+	//アップデータとダウンロード
+	dl.dl(mainWindow,lang_path,base);
+	//画像選択と画像処理
+	img.img(mainWindow,dir);
+	//NowPlaying
+	np.TheDeskNowPlaying(mainWindow);
+	//その他system
+	systemFunc.system(mainWindow,dir,lang);
 }
 // Electronの初期化完了後に実行
 app.on('ready', createWindow);
 var onError = function(err,response){
    console.error(err,response);
 };
-var ipc = electron.ipcMain;
-ipc.on('minimize', function(e, args) {
-	mainWindow.minimize();
-});
-ipc.on('maximize', function(e, args) {
-	mainWindow.isMaximized() ? mainWindow.unmaximize() : mainWindow.maximize();
-});
-ipc.on('native-notf', function(e, args) {
-	var platform=process.platform;
-	var bit=process.arch;
-	if(platform=="win32"){
-		const notifier = require('node-notifier')
-		var tmp_imge=tmp_img;
-	Jimp.read(args[2], function (err, lenna) {
-		if(!err && lenna){
-			lenna.write(tmp_img);
-			var tmp_imge=tmp_img;
-		}else{
-			var tmp_imge="";
-		}
-		notifier.notify({
-			appID: "top.thedesk",
-			message: args[1],
-			title: args[0],
-			icon : tmp_imge,
-			sound: false,
-			wait: true,
-		},
-		function(err, response) {
-		  console.log(err, response)
-		});	
-	});
-	}
-});
-//言語
-ipc.on('lang', function(e, arg) {
-	console.log("set:"+arg);
-	fs.writeFileSync(lang_path,arg);
-	mainWindow.webContents.send('langres', "");
-})
-//CSS
-ipc.on('custom-css-create', function(e, arg) {
-	fs.writeFileSync(customcss,arg);
-	mainWindow.webContents.send('custom-css-create-complete', "");
-})
-ipc.on('custom-css-request', function(e, arg) {
-	try {
-		var css = fs.readFileSync(customcss, 'utf8');
-	} catch (e) {
-		var css="";
-	}
-	mainWindow.webContents.send('custom-css-response', css);
-})
-ipc.on('theme-json-create', function(e, arg) {
-	var themecss=join(app.getPath("userData"), JSON5.parse(arg)["id"]+".thedesktheme");
-	fs.writeFileSync(themecss,JSON.stringify(JSON5.parse(arg)));
-	if(JSON5.parse(arg)["id"]){
-		mainWindow.webContents.send('theme-json-create-complete', "");
-	}else{
-		mainWindow.webContents.send('theme-json-create-complete', "error");	
-	}
-})
-ipc.on('theme-json-delete', function(e, arg) {
-	var themecss=join(app.getPath("userData"), arg+".thedesktheme");
-	console.log(themecss);
-	fs.unlink(themecss, function (err) {
-		mainWindow.webContents.send('theme-json-delete-complete', "");
-	});
-})
-ipc.on('theme-json-request', function(e, arg) {
-	var themecss=join(app.getPath("userData"), arg+".thedesktheme");
-	var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
-	mainWindow.webContents.send('theme-json-response', json);
-})
-ipc.on('theme-css-request', function(e, arg) {
-	var themecss=join(app.getPath("userData"), arg+".thedesktheme");
-	try {
-		var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
-		
-		var primary=json.vars.primary;
-		var secondary=json.vars.secondary;
-		var text=json.vars.text;
-		if(json.base=="light"){
-			var drag="rgba(255, 255, 255, 0.8)";
-			var beforehover="#757575";
-		}else{
-			var drag="rgba(0, 0, 0, 0.8)";
-			var beforehover="#9e9e9e";
-		}
-		if(json.props){
-			if(json.props.TheDeskAccent){
-				var emphasized=json.props.TheDeskAccent
-			}else{
-				var emphasized=secondary;
-			}
-		}else{
-			var emphasized=primary;
-		}
-		
-		var css=".customtheme {--bg:"+secondary+";--drag:"+drag+";"+
-			"--color:"+text+";--beforehover:"+beforehover+";--modal:"+secondary+";--subcolor:"+primary+";--box:"+primary+";--sidebar:"+primary+";--shared:"+emphasized+";"+
-			"--notfbox:"+secondary+";--emphasized:"+primary+";--his-data:"+secondary+
-			"--active:"+primary+";--postbox:"+primary+";--modalfooter:"+primary+";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}";
-			mainWindow.webContents.send('theme-css-response', css);
-	} catch (e) {
-		var css="";
-	}
-	
-})
-ipc.on('theme-json-list', function(e, arg) {
-	fs.readdir(app.getPath("userData"), function(err, files){
-		if (err) throw err;
-		var fileList = files.filter(function(file){
-			var tfile=join(app.getPath("userData"), file);
-			return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile); //絞り込み
-		})
-		var themes=[];
-		for(var i=0;i<fileList.length;i++){
-			var themecss=join(app.getPath("userData"), fileList[i]);
-			var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
-			themes.push({
-				name:json.name,
-				id:json.id
-			})
-		}
-		mainWindow.webContents.send('theme-json-list-response', themes);
-	});
-})
-//ハードウェアアクセラレーションの無効化
-ipc.on('ha', function(e, arg) {
-	if(arg=="true"){
-		fs.writeFileSync(ha_path,arg);
-	}else{
-		fs.unlink(ha_path, function (err) {});
-	}
-	app.relaunch()
-	app.exit()
-})
-
-ipc.on('update', function(e, x, y) {
-	var platform=process.platform;
-	var bit=process.arch;
-	if(platform!="others"){
-	updatewin = new BrowserWindow({
-		width: 600,
-		height: 400,
-		"transparent": false, // ウィンドウの背景を透過
-		"frame": false, // 枠の無いウィンドウ
-		"resizable": false,
-		"modal":true
-	});
-	var lang = fs.readFileSync(lang_path, 'utf8');
-	updatewin.loadURL('file://' + __dirname + '/view/'+lang+'/update.html');
-
-	return "true"
-	}else{
-		return false;
-	}
-})
-//Web魚拓
-ipc.on('shot', function(e, args) {
-	console.log("link:"+args[0]+" width:"+args[1]+" height:"+args[2]+" title:"+args[4]+" top:"+args[5]+" left:"+args[6]);
-	var platform=process.platform;
-	var bit=process.arch;
-	if(args[7]==""){
-		if(platform=="win32"){
-			var dir=app.getPath('home')+"\\Pictures\\TheDesk\\Screenshots\\"+args[4]+"-toot.png";
-			var folder=app.getPath('home')+"\\Pictures\\TheDesk\\Screenshots\\";
-		}else if(platform=="linux" || platform=="darwin" ){
-			var dir=app.getPath('home')+"/Pictures/TheDesk/Screenshots/"+args[4]+"-toot.png";
-			var folder=app.getPath('home')+"/Pictures/TheDesk/Screenshots/";
-		}
-	}else{
-		var folder=args[7];
-		var dir=folder+args[4]+"-toot.png";
-	}
-	
-	Jimp.read(Buffer.from( args[3],'base64'), function (err, lenna) {
-		if (err) throw err;
-		lenna.crop( args[6], args[5], args[1], args[2] ).write(dir);
-	});
-	shell.showItemInFolder(folder);
-})
-ipc.on('shot-img-dl', (e, args) => {
-	Jimp.read(args[0], function (err, lenna) {
-		if (err) throw err;
-		if(args[1]==""){
-			if(process.platform=="win32"){
-				var folder=app.getPath('home')+"\\Pictures\\TheDesk\\Screenshots\\";
-			}else if(process.platform=="linux" || process.platform=="darwin" ){
-				var folder=app.getPath('home')+"/Pictures/TheDesk/Screenshots/";
-			}
-		}else{
-			var folder=args[2];
-		}
-		
-		lenna.write(folder+args[1]);
-	});
-})
-//アプデDL
-ipc.on('download-btn', (e, args) => {
-	//console.log(args[1]);
-	var platform=process.platform;
-	var bit=process.arch;
-		dialog.showSaveDialog(null, {
-      title: 'Save',
-			defaultPath: app.getPath('home')+"/"+args[1]
-        }, (savedFiles) => {
-			console.log(savedFiles);
-			if(!savedFiles){
-				return false;
-			}
-			if(platform=="win32"){
-				var m = savedFiles.match(/(.+)\\(.+)$/);
-			}else{
-				var m = savedFiles.match(/(.+)\/(.+)$/);
-			}
-			//console.log(m);
-			  if(isExistFile(savedFiles)){
-					fs.unlinkSync(savedFiles);
-			  }
-              dl(args[0],args[1],m[1]);
-        });
-});
-function isExistFile(file) {
-	try {
-	  fs.statSync(file);
-	  return true
-	} catch(err) {
-	  if(err.code === 'ENOENT') return false
-	}
-  }
-function dl(url,file,dir){
-	updatewin.webContents.send('mess', "ダウンロードを開始します。");
-	const opts = {
-		directory:dir,
-		openFolderWhenDone: true,
-		onProgress: function(e) {
-			updatewin.webContents.send('prog', e);
-		},
-		saveAs: false
-	};
-	download(BrowserWindow.getFocusedWindow(),
-			url, opts)
-		.then(dl => {
-			updatewin.webContents.send('mess', "ダウンロードが完了しました。");
-			app.quit();
-			
-		})
-		.catch(console.error);
-}
-ipc.on('general-dl', (e, args) => {
-	var name="";
-	var platform=process.platform;
-	var bit=process.arch;
-	if(args[1]==""){
-		if(platform=="win32"){
-			var dir=app.getPath('home')+"\\Pictures\\TheDesk";
-		}else if(platform=="linux" || platform=="darwin" ){
-			var dir=app.getPath('home')+"/Pictures/TheDesk";
-		}
-	}else{
-		var dir=args[1];
-	}	
-	mainWindow.webContents.send('general-dl-message', "ダウンロードを開始します。");
-	const opts = {
-		directory: dir,
-		filename:name,
-		openFolderWhenDone: true,
-		onProgress: function(e) {
-			mainWindow.webContents.send('general-dl-prog', e);
-		},
-		saveAs: false
-	};
-	download(BrowserWindow.getFocusedWindow(),
-			args[0], opts)
-		.then(dl => {
-			mainWindow.webContents.send('general-dl-message', "ダウンロードが完了しました。");
-		})
-		.catch(console.error);
-});
-ipc.on('quit', (e, args) => {
-	app.quit();
-});
-ipc.on('about', (e, args) => {
-	about();
-});
-function about(){
-	var ver=app.getVersion()
-	var window = new BrowserWindow({width: 300, height: 460,
-			"transparent": false,    // ウィンドウの背景を透過
-			"frame": false,     // 枠の無いウィンドウ
-			"resizable": false });
-	   window.loadURL('file://' + __dirname + '/about.html?ver='+ver);
-	   return "true"
-}
-
-ipc.on('itunes', (e, args) => {
-	console.log("Access");
-	if(args[0]=="set"){
-		var {NowPlaying,PlayerName} = require("nowplaying-node");
-		var nppath=join(app.getPath("userData"), "nowplaying");
-		var npProvider;
-		try {
-			npProvider = args[1];
-		} catch (e) {
-			npProvider="AIMP";
-		}
-		var myAIMP = new NowPlaying({
-			fetchCover: true,
-			player: PlayerName[npProvider],
-		});
-		fs.writeFileSync(nppath, npProvider);
-	}else{
-		var platform=process.platform;
-		var bit=process.arch;
-		if(platform=="darwin"){
-		const nowplaying = require("itunes-nowplaying-mac")
-		nowplaying.getRawData().then(function (value) {
-		mainWindow.webContents.send('itunes-np', value);
-		}).catch(function (error) {
-			// 非同期処理失敗。呼ばれない
-			console.log(error);
-		});
-		}else{
-			var {NowPlaying,PlayerName} = require("nowplaying-node");
-			var nppath=join(app.getPath("userData"), "nowplaying");
-			var npProvider;
-			try {
-				npProvider = fs.readFileSync(nppath, 'utf8');
-			} catch (e) {
-				npProvider="AIMP";
-			}
-			var myAIMP = new NowPlaying({
-				fetchCover: true,
-				player: PlayerName[npProvider],
-			});
-			myAIMP.update();
-			var path=myAIMP.getCoverPath();
-			if(path){
-				var bin = fs.readFileSync(path, 'base64');
-			}else{
-				var bin=false;
-			}
-			
-			var value={
-				name:myAIMP.getTitle(),
-				artist:myAIMP.getArtist(),
-				album:myAIMP.getAlbum(),
-				path:bin
-			}
-			mainWindow.webContents.send('itunes-np', value);
-		}
-		}
-	
-});
-ipc.on('file-select', (e, args) => {
-	dialog.showOpenDialog(null, {
-		properties: ['openFile', 'multiSelections'],
-		title: '添付ファイルを選択',
-		defaultPath: '.',
-		filters: [
-			{name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg','mp4','webm']},
-			{name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg']},
-      		{name: '動画', extensions: ['mp4','webm']},
-      		{name: '全てのファイル', extensions: ['*']}
-		]
-	}, (fileNames) => {
-		if(!fileNames){
-			return false;
-		}
-		for(var i=0;i<fileNames.length;i++){
-			var path=fileNames[i];
-			var bin = fs.readFileSync(path, 'base64');
-			mainWindow.webContents.send('bmp-img-comp', [bin,'new']);
-		}
-	});
-});
-
-ipc.on('column-del', (e, args) => {
-	console.log(lang);
-	var options=language.delsel(lang)
-  dialog.showMessageBox(options, function(index) {
-    mainWindow.webContents.send('column-del-reply', index);
-  })
-});
-ipc.on('bmp-image', (e, args) => {
-	var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
-	Jimp.read(args[0], function (err, lenna) {
-		if (err) throw err;
-		lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
-			mainWindow.webContents.send('bmp-img-comp', [src,args[1]]);
-	   });
-	});
-	
-});
-ipc.on('nano', function (e, x, y) {
-	var nano_info_path = join(app.getPath("userData"), "nano-window-position.json");
-	var window_pos;
-	try {
-		window_pos = JSON.parse(fs.readFileSync(nano_info_path, 'utf8'));
-	} catch (e) {
-	window_pos = [0,0]; // デフォルトバリュー
-	}
-	var nanowindow = new BrowserWindow({width: 350, height: 200,
-		"transparent": false,    // ウィンドウの背景を透過
-		 "frame": false,     // 枠の無いウィンドウ
-		 "resizable": false });
-	nanowindow.loadURL('file://' + __dirname + '/nano.html');
-	nanowindow.setAlwaysOnTop(true);
-
-	nanowindow.setPosition(window_pos[0], window_pos[1]);
-   nanowindow.on('close', function() {
-		fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
-	});
-	return true;
- })
- ipc.on('adobe', (e, arg) => {
-	 if(!arg){
-		const options = {
-			type: 'info',
-			title: 'Adobeフォトエディタ',
-			message: "「許可」または「永続的に許可」をクリックするとTheDeskとAdobeで情報を共有します。\n次のウィンドウを開いている時以外は一切提供しません。",
-			buttons: ['拒否', '許可','永続的に許可']
-		  }
-		  dialog.showMessageBox(options, function(index) {
-			if(index===2){
-				mainWindow.webContents.send('adobeagree', "true");
-			}
-			if(index>0){
-				adobeWindow();
-			}
-		  })
-	 }else{
-		adobeWindow();
-	 }
-});
-function adobeWindow(){
-	var window = new BrowserWindow({
-		width: 1000,
-		height: 750
-	});
-	window.loadURL('file://' + __dirname + '/adobe.html');
-}
-var cbTimer1;
-ipc.on('startmem', (e, arg) => {
-	cbTimer1 = setInterval(mems, 1000);
-});
-ipc.on('endmem', (e, arg) => {
-	if(cbTimer1){
-		clearInterval(cbTimer1);
-	}
-});
-function mems(){
-	var mem=os.totalmem()-os.freemem();
-	if(mainWindow){
-		mainWindow.webContents.send('memory', [mem,os.cpus()[0].model,os.totalmem()]);
-	}
-}
-ipc.on('mkc', (e, arg) => {
-	var platform=process.platform;
-	if(platform=="linux" || platform=="win32" ){
-		var mkc = fs.readFileSync(__dirname + '/.tkn', 'utf8');
-		
-	}else{
-		var mkc = "";
-	}
-	mainWindow.webContents.send('mkcr', mkc);
-});
-ipc.on('export', (e, args) => {
-	fs.writeFileSync(args[0], args[1]);
-});
-ipc.on('import', (e, arg) => {
-	mainWindow.webContents.send('config', fs.readFileSync(arg, 'utf8'));
-});
-//フォント
-function object_array_sort(data,key,order,fn){
-	//デフォは降順(DESC)
-	var num_a = -1;
-	var num_b = 1;
-   
-	if(order === 'asc'){//指定があれば昇順(ASC)
-	  num_a = 1;
-	  num_b = -1;
-	}
-   
-	data = data.sort(function(a, b){
-	  var x = a[key];
-	  var y = b[key];
-	  if (x > y) return num_a;
-	  if (x < y) return num_b;
-	  return 0;
-	});
-   
-	//重複排除
-	var arrObj = {};
-	for (var i = 0; i < data.length; i++) {
-	  arrObj[data[i]['family']] = data[i];
-	}
-   
-	data = [];
-	for (var key in arrObj) {
-	  data.push(arrObj[key]);
-	}
-   
-	fn(data); // ソート後の配列を返す
-  }
-ipc.on('fonts', (e, arg) => {
-	var fonts = fm.getAvailableFontsSync();
-object_array_sort(fonts, 'family', 'asc', function(fonts_sorted){
-	mainWindow.webContents.send('font-list', fonts_sorted);
-});
-});
-
-

 app.setAsDefaultProtocolClient('thedesk')
--- a/app/main/css.js
+++ b/app/main/css.js
@@ -0,0 +1,105 @@
+function css(mainWindow) {
+	const electron = require("electron");
+	const fs = require("fs");
+	const path = require('path')
+	var ipc = electron.ipcMain;
+	var JSON5 = require('json5');
+	const app = electron.app;
+	const join = require('path').join;
+	var customcss = join(app.getPath("userData"), "custom.css");
+
+	ipc.on('custom-css-create', function(e, arg) {
+		fs.writeFileSync(customcss, arg);
+		mainWindow.webContents.send('custom-css-create-complete', "");
+	})
+	ipc.on('custom-css-request', function(e, arg) {
+		try {
+			var css = fs.readFileSync(customcss, 'utf8');
+		} catch (e) {
+			var css = "";
+		}
+		mainWindow.webContents.send('custom-css-response', css);
+	})
+	ipc.on('theme-json-create', function(e, arg) {
+		var themecss = join(app.getPath("userData"), JSON5.parse(arg)["id"] +
+			".thedesktheme");
+		fs.writeFileSync(themecss, JSON.stringify(JSON5.parse(arg)));
+		if (JSON5.parse(arg)["id"]) {
+			mainWindow.webContents.send('theme-json-create-complete', "");
+		} else {
+			mainWindow.webContents.send('theme-json-create-complete', "error");
+		}
+	})
+	ipc.on('theme-json-delete', function(e, arg) {
+		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		console.log(themecss);
+		fs.unlink(themecss, function(err) {
+			mainWindow.webContents.send('theme-json-delete-complete', "");
+		});
+	})
+	ipc.on('theme-json-request', function(e, arg) {
+		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+		mainWindow.webContents.send('theme-json-response', json);
+	})
+	ipc.on('theme-css-request', function(e, arg) {
+		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		try {
+			var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+
+			var primary = json.vars.primary;
+			var secondary = json.vars.secondary;
+			var text = json.vars.text;
+			if (json.base == "light") {
+				var drag = "rgba(255, 255, 255, 0.8)";
+				var beforehover = "#757575";
+			} else {
+				var drag = "rgba(0, 0, 0, 0.8)";
+				var beforehover = "#9e9e9e";
+			}
+			if (json.props) {
+				if (json.props.TheDeskAccent) {
+					var emphasized = json.props.TheDeskAccent
+				} else {
+					var emphasized = secondary;
+				}
+			} else {
+				var emphasized = primary;
+			}
+
+			var css = ".customtheme {--bg:" + secondary + ";--drag:" + drag + ";" +
+				"--color:" + text + ";--beforehover:" + beforehover + ";--modal:" +
+				secondary + ";--subcolor:" + primary + ";--box:" + primary +
+				";--sidebar:" + primary + ";--shared:" + emphasized + ";" +
+				"--notfbox:" + secondary + ";--emphasized:" + primary + ";--his-data:" +
+				secondary +
+				";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" +
+				primary +
+				";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}";
+			mainWindow.webContents.send('theme-css-response', css);
+		} catch (e) {
+			var css = "";
+		}
+
+	})
+	ipc.on('theme-json-list', function(e, arg) {
+		fs.readdir(app.getPath("userData"), function(err, files) {
+			if (err) throw err;
+			var fileList = files.filter(function(file) {
+				var tfile = join(app.getPath("userData"), file);
+				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile); //絞り込み
+			})
+			var themes = [];
+			for (var i = 0; i < fileList.length; i++) {
+				var themecss = join(app.getPath("userData"), fileList[i]);
+				var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+				themes.push({
+					name: json.name,
+					id: json.id
+				})
+			}
+			mainWindow.webContents.send('theme-json-list-response', themes);
+		});
+	})
+}
+exports.css = css;
--- a/app/main/dl.js
+++ b/app/main/dl.js
@@ -0,0 +1,123 @@
+function dl(mainWindow,lang_path,base) {
+    const electron = require("electron");
+    const shell=electron.shell;
+	const fs = require("fs");
+	const {download} = require('electron-dl');
+    const BrowserWindow = electron.BrowserWindow;
+    const dialog = electron.dialog;
+	var updatewin = null;
+    var ipc = electron.ipcMain;
+    const app = electron.app;
+    const join = require('path').join;
+	ipc.on('update', function(e, x, y) {
+            
+			var platform = process.platform;
+			var bit = process.arch;
+			if (platform != "others") {
+				updatewin = new BrowserWindow({
+					width: 600,
+					height: 400,
+					"transparent": false, // ウィンドウの背景を透過
+					"frame": false, // 枠の無いウィンドウ
+					"resizable": false,
+					"modal": true
+				});
+				var lang = fs.readFileSync(lang_path, 'utf8');
+				updatewin.loadURL(base + lang + '/update.html');
+
+				return "true"
+			} else {
+				return false;
+			}
+		})
+		//アプデDL
+	ipc.on('download-btn', (e, args) => {
+		
+		var platform = process.platform;
+		var bit = process.arch;
+		dialog.showSaveDialog(null, {
+			title: 'Save',
+			defaultPath: app.getPath('home') + "/" + args[1]
+		}, (savedFiles) => {
+			console.log(savedFiles);
+			if (!savedFiles) {
+				return false;
+			}
+			if (platform == "win32") {
+				var m = savedFiles.match(/(.+)\\(.+)$/);
+			} else {
+				var m = savedFiles.match(/(.+)\/(.+)$/);
+			}
+			//console.log(m);
+			if (isExistFile(savedFiles)) {
+				fs.unlinkSync(savedFiles);
+			}
+			dl(args[0], args[1], m[1]);
+		});
+	});
+
+	function isExistFile(file) {
+		try {
+			fs.statSync(file);
+			return true
+		} catch (err) {
+			if (err.code === 'ENOENT') return false
+		}
+	}
+
+	function dl(url, file, dir) {
+        
+		updatewin.webContents.send('mess', "ダウンロードを開始します。");
+		const opts = {
+			directory: dir,
+			openFolderWhenDone: true,
+			onProgress: function(e) {
+				updatewin.webContents.send('prog', e);
+			},
+			saveAs: false
+		};
+		download(BrowserWindow.getFocusedWindow(),
+				url, opts)
+			.then(dl => {
+				updatewin.webContents.send('mess', "ダウンロードが完了しました。");
+				app.quit();
+
+			})
+			.catch(console.error);
+	}
+	ipc.on('general-dl', (e, args) => {
+        
+		var name = "";
+		var platform = process.platform;
+		var bit = process.arch;
+		if (args[1] == "") {
+			if (platform == "win32") {
+				var dir = app.getPath('home') + "\\Pictures\\TheDesk";
+			} else if (platform == "linux" || platform == "darwin") {
+				var dir = app.getPath('home') + "/Pictures/TheDesk";
+			}
+		} else {
+			var dir = args[1];
+		}
+		const opts = {
+			directory: dir,
+			filename: name,
+			openFolderWhenDone: false,
+			onProgress: function(e) {
+				mainWindow.webContents.send('general-dl-prog', e);
+			},
+			saveAs: false
+		};
+		download(BrowserWindow.getFocusedWindow(),
+				args[0], opts)
+			.then(dl => {
+				mainWindow.webContents.send('general-dl-message', dir);
+			})
+			.catch(console.error);
+    });
+    ipc.on('open-finder', (e, folder) => {
+        
+		shell.showItemInFolder(folder)
+    });
+}
+exports.dl = dl;
--- a/app/main/img.js
+++ b/app/main/img.js
@@ -0,0 +1,71 @@
+function img(mainWindow,dir){
+    const electron = require("electron");
+    const dialog = electron.dialog;
+    const fs = require("fs");
+    var Jimp = require("jimp");
+    var ipc = electron.ipcMain;
+    const BrowserWindow = electron.BrowserWindow;
+    ipc.on('file-select', (e, args) => {
+        
+        dialog.showOpenDialog(null, {
+            properties: ['openFile', 'multiSelections'],
+            title: '添付ファイルを選択',
+            defaultPath: '.',
+            filters: [
+                {name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg','mp4','webm']},
+                {name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg']},
+                  {name: '動画', extensions: ['mp4','webm']},
+                  {name: '全てのファイル', extensions: ['*']}
+            ]
+        }, (fileNames) => {
+            if(!fileNames){
+                return false;
+            }
+            for(var i=0;i<fileNames.length;i++){
+                var path=fileNames[i];
+                var bin = fs.readFileSync(path, 'base64');
+                mainWindow.webContents.send('bmp-img-comp', [bin,'new']);
+            }
+        });
+    });
+    ipc.on('adobe', (e, arg) => {
+        
+        if(!arg){
+           const options = {
+               type: 'info',
+               title: 'Adobeフォトエディタ',
+               message: "「許可」または「永続的に許可」をクリックするとTheDeskとAdobeで情報を共有します。\n次のウィンドウを開いている時以外は一切提供しません。",
+               buttons: ['拒否', '許可','永続的に許可']
+             }
+             dialog.showMessageBox(options, function(index) {
+               if(index===2){
+                   mainWindow.webContents.send('adobeagree', "true");
+               }
+               if(index>0){
+                   adobeWindow();
+               }
+             })
+        }else{
+           adobeWindow();
+        }
+   });
+   function adobeWindow(){
+       var window = new BrowserWindow({
+           width: 1000,
+           height: 750
+       });
+       window.loadURL(dir + '/adobe.html');
+   }
+   ipc.on('bmp-image', (e, args) => {
+       
+	var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
+	Jimp.read(args[0], function (err, lenna) {
+		if (err) throw err;
+		lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
+			mainWindow.webContents.send('bmp-img-comp', [src,args[1]]);
+	   });
+	});
+	
+});
+}
+exports.img = img;
--- a/app/main/language.js
+++ b/app/main/language.js
@@ -1,5 +1,5 @@
 // Create the Application's main menu
-function templete(lang,mainWindow){
+function templete(lang,mainWindow,packaged){
    const electron = require("electron");
    const app = electron.app;
    const BrowserWindow = electron.BrowserWindow;
@@ -95,7 +95,7 @@ function templete(lang,mainWindow){
            {
                label: 'Toggle Developer Tools',
                accelerator: 'Alt+Command+I',
-                click: function() { mainWindow.toggleDevTools(); }
+                click: function() { if(!packaged){mainWindow.toggleDevTools();} }
              },
          {
            label: dict.reload[lang],
--- a/app/main/np.js
+++ b/app/main/np.js
@@ -0,0 +1,69 @@
+function np(mainWindow){
+    const electron = require("electron");
+    const join = require('path').join;
+    const app = electron.app;
+    const fs = require("fs");
+    var ipc = electron.ipcMain;
+    ipc.on('itunes', (e, args) => {
+        //Verified on Windows
+        console.log("Access");
+        if(args[0]=="set"){
+            var {NowPlaying,PlayerName} = require("nowplaying-node");
+            var nppath=join(app.getPath("userData"), "nowplaying");
+            var npProvider;
+            try {
+                npProvider = args[1];
+            } catch (e) {
+                npProvider="AIMP";
+            }
+            var myAIMP = new NowPlaying({
+                fetchCover: true,
+                player: PlayerName[npProvider],
+            });
+            fs.writeFileSync(nppath, npProvider);
+        }else{
+            var platform=process.platform;
+            var bit=process.arch;
+            if(platform=="darwin"){
+            const nowplaying = require("itunes-nowplaying-mac")
+            nowplaying.getRawData().then(function (value) {
+                mainWindow.webContents.send('itunes-np', value);
+            }).catch(function (error) {
+                // 非同期処理失敗。呼ばれない
+                console.log(error);
+            });
+            }else{
+                var {NowPlaying,PlayerName} = require("nowplaying-node");
+                var nppath=join(app.getPath("userData"), "nowplaying");
+                var npProvider;
+                try {
+                    npProvider = fs.readFileSync(nppath, 'utf8');
+                } catch (e) {
+                    npProvider="AIMP";
+                }
+                var myAIMP = new NowPlaying({
+                    fetchCover: true,
+                    player: PlayerName[npProvider],
+                });
+                myAIMP.update();
+                var path=myAIMP.getCoverPath();
+                if(path){
+                    var bin = fs.readFileSync(path, 'base64');
+                }else{
+                    var bin=false;
+                }
+                
+                var value={
+                    win:true,
+                    name:myAIMP.getTitle(),
+                    artist:myAIMP.getArtist(),
+                    album:myAIMP.getAlbum(),
+                    path:bin
+                }
+                mainWindow.webContents.send('itunes-np', value);
+            }
+            }
+        
+    });
+}
+exports.TheDeskNowPlaying = np;
--- a/app/main/system.js
+++ b/app/main/system.js
@@ -0,0 +1,181 @@
+function system(mainWindow, dir, lang) {
+    const electron = require("electron");
+    const app = electron.app;
+	const join = require('path').join;
+	var Jimp = require("jimp");
+	const fs = require("fs");
+	var ipc = electron.ipcMain;
+	var tmp_img = join(app.getPath("userData"), "tmp.png");
+	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
+	var lang_path = join(app.getPath("userData"), "language");
+	const BrowserWindow = electron.BrowserWindow;
+	const dialog = electron.dialog;
+	const os = require('os')
+    const fm = require('font-manager');
+    const language=require("../main/language.js");
+	ipc.on('native-notf', function(e, args) {
+        
+		var platform = process.platform;
+		var bit = process.arch;
+		if (platform == "win32") {
+			const notifier = require('node-notifier')
+			var tmp_imge = tmp_img;
+			Jimp.read(args[2], function(err, lenna) {
+				if (!err && lenna) {
+					lenna.write(tmp_img);
+					var tmp_imge = tmp_img;
+				} else {
+					var tmp_imge = "";
+				}
+				notifier.notify({
+						appID: "top.thedesk",
+						message: args[1],
+						title: args[0],
+						icon: tmp_imge,
+						sound: false,
+						wait: true,
+					},
+					function(err, response) {
+						console.log(err, response)
+					});
+			});
+		}
+	});
+	//言語
+	ipc.on('lang', function(e, arg) {
+            
+			console.log("set:" + arg);
+			fs.writeFileSync(lang_path, arg);
+			mainWindow.webContents.send('langres', "");
+		})
+		//ハードウェアアクセラレーションの無効化
+	ipc.on('ha', function(e, arg) {
+        
+		if (arg == "true") {
+			fs.writeFileSync(ha_path, arg);
+		} else {
+			fs.unlink(ha_path, function(err) {});
+		}
+		app.relaunch()
+		app.exit()
+	})
+
+	ipc.on('quit', (e, args) => {
+        
+		app.quit();
+	});
+	ipc.on('about', (e, args) => {
+        
+		about();
+	});
+
+	function about() {
+        
+		var ver = app.getVersion()
+		var window = new BrowserWindow({
+			width: 300,
+			height: 460,
+			"transparent": false, // ウィンドウの背景を透過
+			"frame": false, // 枠の無いウィンドウ
+			"resizable": false
+		});
+		window.loadURL(dir + '/about.html?ver=' + ver);
+		return "true"
+	}
+	ipc.on('column-del', (e, args) => {
+         
+		console.log(lang);
+		var options = language.delsel(lang)
+		dialog.showMessageBox(options, function(index) {
+			mainWindow.webContents.send('column-del-reply', index);
+		})
+	});
+	ipc.on('nano', function(e, x, y) {
+        
+		var nano_info_path = join(app.getPath("userData"),
+			"nano-window-position.json");
+		var window_pos;
+		try {
+			window_pos = JSON.parse(fs.readFileSync(nano_info_path, 'utf8'));
+		} catch (e) {
+			window_pos = [0, 0]; // デフォルトバリュー
+		}
+		var nanowindow = new BrowserWindow({
+			width: 350,
+			height: 200,
+			"transparent": false, // ウィンドウの背景を透過
+			"frame": false, // 枠の無いウィンドウ
+			"resizable": false
+		});
+		nanowindow.loadURL(dir + '/nano.html');
+		nanowindow.setAlwaysOnTop(true);
+
+		nanowindow.setPosition(window_pos[0], window_pos[1]);
+		nanowindow.on('close', function() {
+			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
+		});
+		return true;
+	})
+
+	var cbTimer1;
+	ipc.on('startmem', (e, arg) => {
+		cbTimer1 = setInterval(mems, 1000);
+	});
+	ipc.on('endmem', (e, arg) => {
+		if (cbTimer1) {
+			clearInterval(cbTimer1);
+		}
+	});
+
+	function mems() {
+		var mem = os.totalmem() - os.freemem();
+		if (mainWindow) {
+			mainWindow.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()]);
+		}
+	}
+	ipc.on('export', (e, args) => {
+		fs.writeFileSync(args[0], args[1]);
+	});
+	ipc.on('import', (e, arg) => {
+		mainWindow.webContents.send('config', fs.readFileSync(arg, 'utf8'));
+	});
+	//フォント
+	function object_array_sort(data, key, order, fn) {
+		//デフォは降順(DESC)
+		var num_a = -1;
+		var num_b = 1;
+
+		if (order === 'asc') { //指定があれば昇順(ASC)
+			num_a = 1;
+			num_b = -1;
+		}
+
+		data = data.sort(function(a, b) {
+			var x = a[key];
+			var y = b[key];
+			if (x > y) return num_a;
+			if (x < y) return num_b;
+			return 0;
+		});
+
+		//重複排除
+		var arrObj = {};
+		for (var i = 0; i < data.length; i++) {
+			arrObj[data[i]['family']] = data[i];
+		}
+
+		data = [];
+		for (var key in arrObj) {
+			data.push(arrObj[key]);
+		}
+
+		fn(data); // ソート後の配列を返す
+	}
+	ipc.on('fonts', (e, arg) => {
+		var fonts = fm.getAvailableFontsSync();
+		object_array_sort(fonts, 'family', 'asc', function(fonts_sorted) {
+			mainWindow.webContents.send('font-list', fonts_sorted);
+		});
+	});
+}
+exports.system = system;
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "thedesk",
-  "version": "17.3.0",
+  "version": "18.1.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -15,14 +15,14 @@
      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
    },
    "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+      "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
      "requires": {
-        "co": "^4.6.0",
-        "fast-deep-equal": "^1.0.0",
+        "fast-deep-equal": "^2.0.1",
        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
      }
    },
    "ansi-regex": {
@@ -60,40 +60,36 @@
      "dev": true
    },
    "asar": {
-      "version": "0.14.6",
-      "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.6.tgz",
-      "integrity": "sha512-ZqybKcdO5At6y3ge2RHxVImc6Eltb2t3sxT7lk4T4zjZBSFUuIGCIZY6f41dCjlvJSizN5QPRr8YTgMhpgBjLg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/asar/-/asar-1.0.0.tgz",
+      "integrity": "sha512-MBiDU5cDr9UWuY2F0zq2fZlnyRq1aOPmJGMas22Qa14K1odpRXL3xkMHPN3uw2hAK5mD89Q+/KidOUtpi4V0Cg==",
      "dev": true,
      "requires": {
        "chromium-pickle-js": "^0.2.0",
-        "commander": "^2.9.0",
-        "cuint": "^0.2.1",
-        "glob": "^6.0.4",
-        "minimatch": "^3.0.3",
-        "mkdirp": "^0.5.0",
-        "mksnapshot": "^0.3.4",
-        "tmp": "0.0.28"
+        "commander": "^2.19.0",
+        "cuint": "^0.2.2",
+        "glob": "^7.1.3",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1",
+        "tmp-promise": "^1.0.5"
      },
      "dependencies": {
-        "glob": {
-          "version": "6.0.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
        }
      }
    },
    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
    },
    "assert-plus": {
      "version": "1.0.0",
@@ -117,9 +113,9 @@
      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
    },
    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
    },
    "balanced-match": {
      "version": "1.0.0",
@@ -133,10 +129,9 @@
      "dev": true
    },
    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true,
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
      "requires": {
        "tweetnacl": "^0.14.3"
      }
@@ -146,16 +141,6 @@
      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz",
      "integrity": "sha1-g4qZLan51zfg9LLbC+YrsJ3Qxeg="
    },
-    "binary": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-      "dev": true,
-      "requires": {
-        "buffers": "~0.1.1",
-        "chainsaw": "~0.1.0"
-      }
-    },
    "block-stream": {
      "version": "0.0.9",
      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -175,14 +160,6 @@
      "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.0.3.tgz",
      "integrity": "sha1-ZBE+nHzxICs3btYHvzBibr5XsYo="
    },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-      "requires": {
-        "hoek": "4.x.x"
-      }
-    },
    "brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -225,12 +202,6 @@
      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
      "dev": true
    },
-    "buffers": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
-      "dev": true
-    },
    "builtin-modules": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
@@ -266,15 +237,6 @@
      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
    },
-    "chainsaw": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-      "dev": true,
-      "requires": {
-        "traverse": ">=0.3.0 <0.4"
-      }
-    },
    "chalk": {
      "version": "2.4.2",
      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -357,11 +319,6 @@
      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
      "dev": true
    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-    },
    "code-point-at": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -397,9 +354,9 @@
      }
    },
    "commander": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
      "dev": true
    },
    "compare-version": {
@@ -448,24 +405,6 @@
        "which": "^1.2.9"
      }
    },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "requires": {
-        "boom": "5.x.x"
-      },
-      "dependencies": {
-        "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
-          "requires": {
-            "hoek": "4.x.x"
-          }
-        }
-      }
-    },
    "cuint": {
      "version": "0.2.2",
      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
@@ -503,47 +442,6 @@
      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
      "dev": true
    },
-    "decompress-zip": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz",
-      "integrity": "sha1-rjvLfjTGWHmt/nfhnDD4ZgK0vbA=",
-      "dev": true,
-      "requires": {
-        "binary": "^0.3.0",
-        "graceful-fs": "^4.1.3",
-        "mkpath": "^0.1.0",
-        "nopt": "^3.0.1",
-        "q": "^1.1.2",
-        "readable-stream": "^1.1.8",
-        "touch": "0.0.3"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
    "deep-extend": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -581,12 +479,12 @@
      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
    },
    "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true,
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
      "requires": {
-        "jsbn": "~0.1.0"
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
      }
    },
    "electron": {
@@ -662,48 +560,40 @@
      }
    },
    "electron-download": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz",
-      "integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz",
+      "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
      "dev": true,
      "requires": {
-        "debug": "^2.2.0",
-        "fs-extra": "^0.30.0",
-        "home-path": "^1.0.1",
+        "debug": "^3.0.0",
+        "env-paths": "^1.0.0",
+        "fs-extra": "^4.0.1",
        "minimist": "^1.2.0",
-        "nugget": "^2.0.0",
-        "path-exists": "^2.1.0",
-        "rc": "^1.1.2",
-        "semver": "^5.3.0",
-        "sumchecker": "^1.2.0"
+        "nugget": "^2.0.1",
+        "path-exists": "^3.0.0",
+        "rc": "^1.2.1",
+        "semver": "^5.4.1",
+        "sumchecker": "^2.0.2"
      },
      "dependencies": {
-        "es6-promise": {
-          "version": "4.2.5",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
-          "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==",
-          "dev": true
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
        },
        "fs-extra": {
-          "version": "0.30.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
-          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
          "dev": true,
          "requires": {
            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0",
-            "path-is-absolute": "^1.0.0",
-            "rimraf": "^2.2.8"
-          }
-        },
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
          }
        },
        "minimist": {
@@ -712,24 +602,11 @@
          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
          "dev": true
        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "sumchecker": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz",
-          "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.2.0",
-            "es6-promise": "^4.0.5"
-          }
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
        }
      }
    },
@@ -752,26 +629,6 @@
            "ms": "^2.1.1"
          }
        },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
        "ms": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -803,12 +660,12 @@
      }
    },
    "electron-packager": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-13.0.1.tgz",
-      "integrity": "sha512-fXfldaZ1wihpPaMTSGMxvCeETJwVArlnMmKafVXLJbbZwS+WTjY4iL7ju9WMQ0LNGuiiIwSMCQFxt5iA087mqg==",
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-13.1.1.tgz",
+      "integrity": "sha512-3Drgcw8OEOP3Psw/PprloAFJSkSUSQgjUq3AmWffJGB3Kj5WXmZl6A3GOUs8aT7bP/8GWg4oYqSiCSnA5PQkdQ==",
      "dev": true,
      "requires": {
-        "asar": "^0.14.0",
+        "asar": "^1.0.0",
        "debug": "^4.0.1",
        "electron-download": "^4.1.1",
        "electron-notarize": "^0.0.5",
@@ -824,15 +681,9 @@
        "resolve": "^1.1.6",
        "sanitize-filename": "^1.6.0",
        "semver": "^5.3.0",
-        "yargs-parser": "^11.0.0"
+        "yargs-parser": "^13.0.0"
      },
      "dependencies": {
-        "camelcase": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
-          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
-          "dev": true
-        },
        "debug": {
          "version": "4.1.1",
          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -842,71 +693,6 @@
            "ms": "^2.1.1"
          }
        },
-        "electron-download": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz",
-          "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
-          "dev": true,
-          "requires": {
-            "debug": "^3.0.0",
-            "env-paths": "^1.0.0",
-            "fs-extra": "^4.0.1",
-            "minimist": "^1.2.0",
-            "nugget": "^2.0.1",
-            "path-exists": "^3.0.0",
-            "rc": "^1.2.1",
-            "semver": "^5.4.1",
-            "sumchecker": "^2.0.2"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.2.6",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-              "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-              "dev": true,
-              "requires": {
-                "ms": "^2.1.1"
-              }
-            },
-            "fs-extra": {
-              "version": "4.0.3",
-              "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-              "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-              "dev": true,
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "jsonfile": "^4.0.0",
-                "universalify": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
        "ms": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -920,9 +706,9 @@
          "dev": true
        },
        "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "version": "13.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
+          "integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
          "dev": true,
          "requires": {
            "camelcase": "^5.0.0",
@@ -931,16 +717,6 @@
        }
      }
    },
-    "electron-prebuilt": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/electron-prebuilt/-/electron-prebuilt-1.4.13.tgz",
-      "integrity": "sha1-Cg5Ne/iVokIGHM+rKTlNzaHaM9I=",
-      "dev": true,
-      "requires": {
-        "electron-download": "^3.0.1",
-        "extract-zip": "^1.0.3"
-      }
-    },
    "electron-rebuild": {
      "version": "1.8.4",
      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.8.4.tgz",
@@ -1048,9 +824,9 @@
      }
    },
    "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
    },
    "extract-zip": {
      "version": "1.6.7",
@@ -1070,9 +846,9 @@
      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
    },
    "fast-deep-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
    },
    "fast-json-stable-stringify": {
      "version": "2.0.0",
@@ -1144,15 +920,6 @@
            "universalify": "^0.1.0"
          }
        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
        "ms": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -1250,15 +1017,6 @@
            "universalify": "^0.1.0"
          }
        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
        "ms": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -1420,11 +1178,11 @@
      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
    },
    "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
      "requires": {
-        "ajv": "^5.1.0",
+        "ajv": "^6.5.5",
        "har-schema": "^2.0.0"
      }
    },
@@ -1439,28 +1197,6 @@
      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
    },
-    "hawk": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "integrity": "sha1-r02RTrBl+bXOTZ0RwcshJu7MMDg=",
-      "requires": {
-        "boom": "4.x.x",
-        "cryptiles": "3.x.x",
-        "hoek": "4.x.x",
-        "sntp": "2.x.x"
-      }
-    },
-    "hoek": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
-      "integrity": "sha1-ljRQKqEsRF3Vp8VzS1cruHOKrLs="
-    },
-    "home-path": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz",
-      "integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw==",
-      "dev": true
-    },
    "hosted-git-info": {
      "version": "2.7.1",
      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
@@ -1600,12 +1336,6 @@
      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
    },
-    "itunes-nowplaying-mac": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/itunes-nowplaying-mac/-/itunes-nowplaying-mac-0.2.3.tgz",
-      "integrity": "sha512-1n418TnV4BnpSP6IzuxVECgPYnlm/nUZIXsblvzFVu4+rxmswXPnz3xi8XUq0r28I9njTi3g6vmBFa5YFHb8TA==",
-      "optional": true
-    },
    "jimp": {
      "version": "0.2.28",
      "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.2.28.tgz",
@@ -1637,8 +1367,7 @@
    "jsbn": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
    },
    "json-schema": {
      "version": "0.2.3",
@@ -1646,9 +1375,9 @@
      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
    },
    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
    },
    "json-stringify-safe": {
      "version": "5.0.1",
@@ -1690,15 +1419,6 @@
        "verror": "1.10.0"
      }
    },
-    "klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
    "lcid": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
@@ -1888,47 +1608,6 @@
        "minimist": "0.0.8"
      }
    },
-    "mkpath": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
-      "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=",
-      "dev": true
-    },
-    "mksnapshot": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.4.tgz",
-      "integrity": "sha512-FgUTiWiY+35LgL95P/MDYrBuQO5o0s3MmaWKX6ZJWoX4vMOY9vPsAv763l1OSSelL9jPsBQ/wf4bzfqTLNPSFg==",
-      "dev": true,
-      "requires": {
-        "decompress-zip": "0.3.0",
-        "fs-extra": "0.26.7",
-        "request": "2.x"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "0.26.7",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-          "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0",
-            "path-is-absolute": "^1.0.0",
-            "rimraf": "^2.2.8"
-          }
-        },
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        }
-      }
-    },
    "modify-filename": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/modify-filename/-/modify-filename-1.1.0.tgz",
@@ -2191,9 +1870,9 @@
      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
    },
    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
    },
    "object-assign": {
      "version": "4.1.1",
@@ -2516,16 +2195,10 @@
      "resolved": "https://registry.npmjs.org/pupa/-/pupa-1.0.0.tgz",
      "integrity": "sha1-mpVopa9+ZXuEYqbp1TKHQ1YM7/Y="
    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true
-    },
    "qs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha1-NJzfbu+J7EXBLX1es/wMhwNDptg="
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
    },
    "rc": {
      "version": "1.2.8",
@@ -2613,32 +2286,50 @@
      }
    },
    "request": {
-      "version": "2.83.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha1-ygtl2gLtYpNYh4COb1EDgQNOM1Y=",
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
      "requires": {
        "aws-sign2": "~0.7.0",
-        "aws4": "^1.6.0",
+        "aws4": "^1.8.0",
        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.1",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.1",
-        "har-validator": "~5.0.3",
-        "hawk": "~6.0.2",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
        "http-signature": "~1.2.0",
        "is-typedarray": "~1.0.0",
        "isstream": "~0.1.2",
        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.17",
-        "oauth-sign": "~0.8.2",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
        "performance-now": "^2.1.0",
-        "qs": "~6.5.1",
-        "safe-buffer": "^5.1.1",
-        "stringstream": "~0.0.5",
-        "tough-cookie": "~2.3.3",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.1.0"
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.38.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
+          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="
+        },
+        "mime-types": {
+          "version": "2.1.22",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
+          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
+          "requires": {
+            "mime-db": "~1.38.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        }
      }
    },
    "require-directory": {
@@ -2694,6 +2385,11 @@
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
    "sanitize-filename": {
      "version": "1.6.1",
      "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz",
@@ -2752,14 +2448,6 @@
        "string-width": "^1.0.1"
      }
    },
-    "sntp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-      "integrity": "sha1-LGzsFP7cIiJznK+bXD2F0cxaLMg=",
-      "requires": {
-        "hoek": "4.x.x"
-      }
-    },
    "sort-keys": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
@@ -2826,9 +2514,9 @@
      "dev": true
    },
    "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
      "requires": {
        "asn1": "~0.2.3",
        "assert-plus": "^1.0.0",
@@ -2837,6 +2525,7 @@
        "ecc-jsbn": "~0.1.1",
        "getpass": "^0.1.1",
        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
        "tweetnacl": "~0.14.0"
      }
    },
@@ -2871,11 +2560,6 @@
        "safe-buffer": "~5.1.0"
      }
    },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-    },
    "strip-ansi": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -2998,48 +2682,33 @@
      "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
    },
    "tmp": {
-      "version": "0.0.28",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz",
-      "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=",
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
      "dev": true,
      "requires": {
-        "os-tmpdir": "~1.0.1"
+        "os-tmpdir": "~1.0.2"
      }
    },
-    "touch": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz",
-      "integrity": "sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=",
+    "tmp-promise": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.5.tgz",
+      "integrity": "sha512-hOabTz9Tp49wCozFwuJe5ISrOqkECm6kzw66XTP23DuzNU7QS/KiZq5LC9Y7QSy8f1rPSLy4bKaViP0OwGI1cA==",
      "dev": true,
      "requires": {
-        "nopt": "~1.0.10"
-      },
-      "dependencies": {
-        "nopt": {
-          "version": "1.0.10",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-          "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
-          "dev": true,
-          "requires": {
-            "abbrev": "1"
-          }
-        }
+        "bluebird": "^3.5.0",
+        "tmp": "0.0.33"
      }
    },
    "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
      "requires": {
+        "psl": "^1.1.24",
        "punycode": "^1.4.1"
      }
    },
-    "traverse": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
-      "dev": true
-    },
    "trim": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
@@ -3077,8 +2746,7 @@
    "tweetnacl": {
      "version": "0.14.5",
      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "optional": true
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
    },
    "typedarray": {
      "version": "0.0.6",
@@ -3136,9 +2804,9 @@
      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
    },
    "uuid": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-      "integrity": "sha1-EsUou51Y0LkmXZovbw/ovhf/HxQ="
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
    },
    "validate-npm-package-license": {
      "version": "3.0.4",
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "thedesk",
-  "version": "18.0.3",
+  "version": "18.1.0",
  "description": "TheDesk is a Mastodon client for PC.",
  "main": "main.js",
  "scripts": {
@@ -30,6 +30,11 @@
      "name": "ぽぷんじゃ",
      "url": "https://popon.pptdn.jp/@popn_ja",
      "email": "popn.ja@gmail.com"
+    },
+    {
+      "name": "kPherox",
+      "url": "https://www.kr-kp.com/",
+      "email": "admin@mail.kr-kp.com"
    }
  ],
  "license": "GPL-3.0",
@@ -43,8 +48,8 @@
    "vue": "^2.6.9"
  },
  "optionalDependencies": {
-    "itunes-nowplaying-mac": "^0.2.3",
-    "nowplaying-node": "^0.1.3"
+    "nowplaying-node": "^0.1.3",
+    "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/1/head"
  },
  "build": {
    "productName": "TheDesk",
@@ -61,11 +66,14 @@
      ]
    },
    "appx": {
-      "identityName":"53491Cutls.TheDesk",
-      "applicationId":"Cutls.TheDesk",
-      "publisherDisplayName":"Cutls",
-      "publisher":"CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
-      "languages":["JA-JP","EN-US"]
+      "identityName": "53491Cutls.TheDesk",
+      "applicationId": "Cutls.TheDesk",
+      "publisherDisplayName": "Cutls",
+      "publisher": "CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
+      "languages": [
+        "JA-JP",
+        "EN-US"
+      ]
    },
    "nsis": {
      "oneClick": false,
@@ -83,14 +91,13 @@
      "target": "dmg"
    },
    "electronDownload": {
-      "version": "4.0.5"
+      "version": "4.0.6"
    },
-    "electronVersion": "4.0.5"
+    "electronVersion": "4.0.6"
  },
  "devDependencies": {
-    "electron": "^4.0.5",
-    "electron-packager": "^13.0.1",
-    "electron-prebuilt": "^1.4.13",
+    "electron": "^4.0.6",
+    "electron-packager": "^13.1.1",
    "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="Usamin (18.0.3)";
+var ver="Usamin (18.1.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -136,7 +136,7 @@ var tlid=0;
 </div>
 <div class="col s12 mize" style="margin-bottom:5px; padding:0;">
 	<div id="taglist"></div>
-<span id="preview" class="mize"></span>
+<div id="preview" class="mize"></div>
 <span class=" sml mize"><span data-trans="reply">Reply</span>:
 <span id="rec">No</span>/<span data-trans="file">Attaching files</span>:
 <span id="mec">None</span>/<span data-trans="vis">Adjust status privacy</span>:
@@ -583,24 +583,20 @@ 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-3" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-1-1" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.0.3)</h5>
-・初期段階でカラムが追加できない可能性を修正。<br>
--以下18.0.0--<br>
-・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
-・Alt+Enterでセカンダリートゥートボタン<br>
-・引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
-・実況機能をまともに書き直した。<br>
-・サジェストをトゥートボックスの右に<br>
-・ハードウェアアクセラレーションを無効化するオプション。(設定の表示などが乱れるときに設定)<br>
-・返信時に「@」が複数含まれない仕様を訂正<br>
-・一部のデフォルト値を修正。<br>
-・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
-・イメージビューワーの修正<br>
+					<h5>Release Note Usamin (18.1.1)</h5>
+・お知らせ機能改善<br>
+・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+--以下18.1.0--<br>
+・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
+・画像を個別に削除する(画像をクリックして)<br>
+・何個もアルバムアートワークが投稿されるバグを修正<br>
+・Misskeyでログインしたまま何もできないバグを修正(権限回り)
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -612,9 +608,9 @@ var tlid=0;
 			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
  				Support on Enty
 			</a>
-			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://osushi.love/Cutls_P" target="_blank">
-  				Osushi.love: give me sushi
-			</a>
+			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
+				Support on Pixiv FANBOX
+		</a>
 			<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
 				Amazon Wish List
 			</a>
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -350,10 +350,10 @@
 <button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>About TheDesk</button>
 <a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>Website</a>
 <a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Enty)</a>
+<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Pixiv FANBOX)</a>
 <a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>Help/Docs(Constructing)</a>
 <a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
 <a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
-<a class="btn waves-effect red lighten-2" href="https://osushi.love/Cutls_P" target="_blank" style="width:100%; max-width:500px;"><img src="../../img/sushi.svg" class="left" width="25" style="padding-top:5px;">Give me a sushi!</a>
 <br>
 Kyash<br>
 			<img src="../../img/kyash.png" width="100"><br>
--- a/app/view/en/setting.vue.js
+++ b/app/view/en/setting.vue.js
@@ -263,7 +263,7 @@ var tlConstruction=[
        setValue:200,
        text:{
            head:"Height of images",
-            desc:"",
+            desc:'Option:Set "full" to uncrop.',
            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
        }
    },{
--- a/app/view/en/update.html
+++ b/app/view/en/update.html
@@ -62,9 +62,6 @@ 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>
@@ -78,11 +75,10 @@ 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 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>
+        <button class="waves-effect btn windows hide" onclick="update('install')" style="margin-left:15px;">Installer ver.</button>
+        <button class="waves-effect btn windows hide" onclick="update('portable')" style="margin-left:15px;">Portable ver.</button>
+        <button class="waves-effect btn linux hide" onclick="update('linux')" style="margin-left:15px;">Start</button>
+        <button class="waves-effect btn mac hide" 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>
@@ -184,12 +180,12 @@ function verck(){
    var remote=electron.remote;
    var platform=remote.process.platform;
    var bit=process.arch;
-	if(platform=="linux"){
-        $('.windows').hide()
-        $('.linux').show()
-	}else if(platform=="mac"){
-        $('.windows').hide()
-        $('.mac').show()
+	if(platform=="win32"){
+        $('.windows').removeClass("hide")
+	}else if(platform=="linux"){
+        $('.linux').removeClass("hide")
+	}else if(platform=="darwin"){
+        $('.mac').removeClass("hide")
 	}
 	var start="https://thedesk.top/ver.json";
 	fetch(start, {
--- 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="Usamin (18.0.3)";
+var ver="Usamin (18.1.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -136,7 +136,7 @@ var tlid=0;
 </div>
 <div class="col s12 mize" style="margin-bottom:5px; padding:0;">
 	<div id="taglist"></div>
-<span id="preview" class="mize"></span>
+<div id="preview" class="mize"></div>
 <span class=" sml mize"><span data-trans="reply">返信モード</span>:
 <span id="rec">いいえ</span>/<span data-trans="file">添付ファイル</span>:
 <span id="mec">なし</span>/<span data-trans="vis">公開範囲</span>:
@@ -583,24 +583,20 @@ 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-3" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-1-1" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.0.3)</h5>
-・初期段階でカラムが追加できない可能性を修正。<br>
--以下18.0.0--<br>
-・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
-・Alt+Enterでセカンダリートゥートボタン<br>
-・引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
-・実況機能をまともに書き直した。<br>
-・サジェストをトゥートボックスの右に<br>
-・ハードウェアアクセラレーションを無効化するオプション。(設定の表示などが乱れるときに設定)<br>
-・返信時に「@」が複数含まれない仕様を訂正<br>
-・一部のデフォルト値を修正。<br>
-・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
-・イメージビューワーの修正<br>
+					<h5>Release Note Usamin (18.1.1)</h5>
+・お知らせ機能改善<br>
+・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+--以下18.1.0--<br>
+・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
+・画像を個別に削除する(画像をクリックして)<br>
+・何個もアルバムアートワークが投稿されるバグを修正<br>
+・Misskeyでログインしたまま何もできないバグを修正(権限回り)
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -612,9 +608,9 @@ var tlid=0;
 			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
  				Entyで支援
 			</a>
-			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://osushi.love/Cutls_P" target="_blank">
-  				Osushi.loveで寿司を贈る
-			</a>
+			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
+				Pixiv FANBOXで支援
+		</a>
 			<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
 				Amazonほしいものリスト
 			</a>
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -350,10 +350,10 @@
 <button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>このソフトについて</button>
 <a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>公式HP</a>
 <a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>支援(Enty)</a>
+<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>支援(Pixiv FANBOX)</a>
 <a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>ヘルプ/Docs(Constructing)</a>
 <a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
 <a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
-<a class="btn waves-effect red lighten-2" href="https://osushi.love/Cutls_P" target="_blank" style="width:100%; max-width:500px;"><img src="../../img/sushi.svg" class="left" width="25" style="padding-top:5px;">寿司を投げる</a>
 <br>
 Kyash<br>
 			<img src="../../img/kyash.png" width="100"><br>
--- a/app/view/ja/setting.vue.js
+++ b/app/view/ja/setting.vue.js
@@ -263,7 +263,7 @@ var tlConstruction=[
        setValue:200,
        text:{
            head:"画像の高さ",
-            desc:"",
+            desc:'オプション:「full」と指定すると全ての画像をクロップしません。',
            after:"px"
        }
    },{
--- a/app/view/ja/update.html
+++ b/app/view/ja/update.html
@@ -62,9 +62,6 @@ 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>
@@ -78,11 +75,10 @@ a,button,input,label,i{
        <p>アップデートがあります</p>
        <span id="now"></span>→<b id="ver"></b><br>
        <span id="det"></span><br>
-        <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>
+        <button class="waves-effect btn windows hide" onclick="update('install')" style="margin-left:15px;">インストーラー版(推奨)</button>
+        <button class="waves-effect btn windows hide" onclick="update('portable')" style="margin-left:15px;">ポータブル版</button>
+        <button class="waves-effect btn linux hide" onclick="update('linux')" style="margin-left:15px;">開始</button>
+        <button class="waves-effect btn mac hide" onclick="update('mac')" style="margin-left:15px;">開始</button>
        <br>
        問題が発生しますか？<br><a href="https://thedesk.top">公式HP</a>からダウンロードをお試しください。
    </div>
@@ -184,12 +180,12 @@ function verck(){
    var remote=electron.remote;
    var platform=remote.process.platform;
    var bit=process.arch;
-	if(platform=="linux"){
-        $('.windows').hide()
-        $('.linux').show()
-	}else if(platform=="mac"){
-        $('.windows').hide()
-        $('.mac').show()
+	if(platform=="win32"){
+        $('.windows').removeClass("hide")
+	}else if(platform=="linux"){
+        $('.linux').removeClass("hide")
+	}else if(platform=="darwin"){
+        $('.mac').removeClass("hide")
 	}
 	var start="https://thedesk.top/ver.json";
 	fetch(start, {
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -136,7 +136,7 @@ var tlid=0;
 </div>
 <div class="col s12 mize" style="margin-bottom:5px; padding:0;">
 	<div id="taglist"></div>
-<span id="preview" class="mize"></span>
+<div id="preview" class="mize"></div>
 <span class=" sml mize"><span data-trans="reply">{{replyMode}}</span>:
 <span id="rec">{{no}}</span>/<span data-trans="file">{{temp}}</span>:
 <span id="mec">{{nothing}}</span>/<span data-trans="vis">{{vis}}</span>:
@@ -360,7 +360,6 @@ var tlid=0;
 </div>
 	<div class="modal-footer">
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">{{openBrowser}}</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 dm-hide" onclick="cbCopy()">{{copyURL}}</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>
@@ -583,24 +582,20 @@ 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-3" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-1-1" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.0.3)</h5>
-・初期段階でカラムが追加できない可能性を修正。<br>
--以下18.0.0--<br>
-・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
-・Alt+Enterでセカンダリートゥートボタン<br>
-・引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
-・実況機能をまともに書き直した。<br>
-・サジェストをトゥートボックスの右に<br>
-・ハードウェアアクセラレーションを無効化するオプション。(設定の表示などが乱れるときに設定)<br>
-・返信時に「@」が複数含まれない仕様を訂正<br>
-・一部のデフォルト値を修正。<br>
-・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
-・イメージビューワーの修正<br>
+					<h5>Release Note Usamin (18.1.1)</h5>
+・お知らせ機能改善<br>
+・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+--以下18.1.0--<br>
+・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
+・画像を個別に削除する(画像をクリックして)<br>
+・何個もアルバムアートワークが投稿されるバグを修正<br>
+・Misskeyでログインしたまま何もできないバグを修正(権限回り)
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -612,9 +607,9 @@ var tlid=0;
 			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
  				{{EntySupport}}
 			</a>
-			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://osushi.love/Cutls_P" target="_blank">
-  				{{sendSushi}}
-			</a>
+			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
+				{{PixivSupport}}
+		</a>
 			<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
 				{{AWLSupport}}
 			</a>
--- a/app/view/make/language/index.en.json
+++ b/app/view/make/language/index.en.json
@@ -105,6 +105,7 @@
    "supportme":"Support TheDesk!",
    "TheDeskDes":"TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!",
    "EntySupport":"Support on Enty",
+    "PixivSupport":"Support on Pixiv FANBOX",
    "AWLSupport":"Amazon Wish List",
    "SendAmazonGift1":"Give me Amazon Gift Card:",
    "SendAmazonGift2":"",
--- a/app/view/make/language/index.ja.json
+++ b/app/view/make/language/index.ja.json
@@ -105,6 +105,7 @@
    "supportme":"ご支援ください。",
    "TheDeskDes":"TheDeskは営利目的ではないため、有料機能や広告は一切ありません。<br>皆様のあたたかいご支援のもとで製作されています。",
    "EntySupport":"Entyで支援",
+    "PixivSupport":"Pixiv FANBOXで支援",
    "AWLSupport":"Amazonほしいものリスト",
    "SendAmazonGift1":"",
    "SendAmazonGift2":"にAmazonギフトカードを送る",
--- a/app/view/make/language/setting.en.json
+++ b/app/view/make/language/setting.en.json
@@ -81,8 +81,9 @@
    "letters":"letters",
    "or":"or",
    "imgheight":"Height of images",
+    "imgheightwarn":"Option:Set \"full\" to uncrop.",
    "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.",
--- a/app/view/make/language/setting.ja.json
+++ b/app/view/make/language/setting.ja.json
@@ -81,6 +81,7 @@
    "letters":"文字",
    "or":"または",
    "imgheight":"画像の高さ",
+    "imgheightwarn":"オプション:「full」と指定すると全ての画像をクロップしません。",
    "ticker":"#InstanceTickerを使う",
    "tickerwarn":"トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://cdn.weep.me/mastodon/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
    "animation":"タイムラインのアニメーション",
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -350,10 +350,10 @@
 <button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>@@about@@</button>
 <a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>@@hp@@</a>
 <a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>@@support@@(Enty)</a>
+<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>@@support@@(Pixiv FANBOX)</a>
 <a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>@@help@@/Docs(Constructing)</a>
 <a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
 <a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
-<a class="btn waves-effect red lighten-2" href="https://osushi.love/Cutls_P" target="_blank" style="width:100%; max-width:500px;"><img src="../../img/sushi.svg" class="left" width="25" style="padding-top:5px;">@@sushi@@</a>
 <br>
 Kyash<br>
 			<img src="../../img/kyash.png" width="100"><br>
--- a/app/view/make/setting.sample.js
+++ b/app/view/make/setting.sample.js
@@ -263,7 +263,7 @@ var tlConstruction=[
        setValue:200,
        text:{
            head:"@@imgheight@@",
-            desc:"",
+            desc:'@@imgheightwarn@@',
            after:"px"
        }
    },{
--- a/app/view/make/update.sample.html
+++ b/app/view/make/update.sample.html
@@ -62,9 +62,6 @@ 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>
@@ -78,11 +75,10 @@ a,button,input,label,i{
        <p>{{updatehere}}</p>
        <span id="now"></span>→<b id="ver"></b><br>
        <span id="det"></span><br>
-        <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>
+        <button class="waves-effect btn windows hide" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
+        <button class="waves-effect btn windows hide" onclick="update('portable')" style="margin-left:15px;">{{portable}}</button>
+        <button class="waves-effect btn linux hide" onclick="update('linux')" style="margin-left:15px;">{{download}}</button>
+        <button class="waves-effect btn mac hide" onclick="update('mac')" style="margin-left:15px;">{{download}}</button>
        <br>
        {{problem1}}<br>{{problem2}}
    </div>
@@ -184,12 +180,12 @@ function verck(){
    var remote=electron.remote;
    var platform=remote.process.platform;
    var bit=process.arch;
-	if(platform=="linux"){
-        $('.windows').hide()
-        $('.linux').show()
-	}else if(platform=="mac"){
-        $('.windows').hide()
-        $('.mac').show()
+	if(platform=="win32"){
+        $('.windows').removeClass("hide")
+	}else if(platform=="linux"){
+        $('.linux').removeClass("hide")
+	}else if(platform=="darwin"){
+        $('.mac').removeClass("hide")
 	}
 	var start="https://thedesk.top/ver.json";
 	fetch(start, {
--- a/app/view/ps/index.html
+++ b/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.3)";
+var ver="Usamin (18.1.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -136,7 +136,7 @@ var tlid=0;
 </div>
 <div class="col s12 mize" style="margin-bottom:5px; padding:0;">
 	<div id="taglist"></div>
-<span id="preview" class="mize"></span>
+<div id="preview" class="mize"></div>
 <span class=" sml mize"><span data-trans="reply">crwdns396:0crwdne396:0</span>:
 <span id="rec">crwdns397:0crwdne397:0</span>/<span data-trans="file">crwdns399:0crwdne399:0</span>:
 <span id="mec">crwdns400:0crwdne400:0</span>/<span data-trans="vis">crwdns401:0crwdne401:0</span>:
@@ -583,24 +583,20 @@ 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-3" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-1-1" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.0.3)</h5>
-・初期段階でカラムが追加できない可能性を修正。<br>
--以下18.0.0--<br>
-・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
-・Alt+Enterでセカンダリートゥートボタン<br>
-・引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
-・実況機能をまともに書き直した。<br>
-・サジェストをトゥートボックスの右に<br>
-・ハードウェアアクセラレーションを無効化するオプション。(設定の表示などが乱れるときに設定)<br>
-・返信時に「@」が複数含まれない仕様を訂正<br>
-・一部のデフォルト値を修正。<br>
-・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
-・イメージビューワーの修正<br>
+					<h5>Release Note Usamin (18.1.1)</h5>
+・お知らせ機能改善<br>
+・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+--以下18.1.0--<br>
+・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
+・画像を個別に削除する(画像をクリックして)<br>
+・何個もアルバムアートワークが投稿されるバグを修正<br>
+・Misskeyでログインしたまま何もできないバグを修正(権限回り)
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -612,9 +608,9 @@ var tlid=0;
 			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
  				crwdns475:0crwdne475:0
 			</a>
-			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://osushi.love/Cutls_P" target="_blank">
-  				crwdns479:0crwdne479:0
-			</a>
+			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
+				{{PixivSupport}}
+		</a>
 			<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
 				crwdns476:0crwdne476:0
 			</a>
--- a/app/view/ps/setting.html
+++ b/app/view/ps/setting.html
@@ -350,10 +350,10 @@
 <button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>crwdns662:0crwdne662:0</button>
 <a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>crwdns663:0crwdne663:0</a>
 <a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Enty)</a>
+<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Pixiv FANBOX)</a>
 <a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>crwdns665:0crwdne665:0/Docs(Constructing)</a>
 <a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
 <a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
-<a class="btn waves-effect red lighten-2" href="https://osushi.love/Cutls_P" target="_blank" style="width:100%; max-width:500px;"><img src="../../img/sushi.svg" class="left" width="25" style="padding-top:5px;">crwdns666:0crwdne666:0</a>
 <br>
 Kyash<br>
 			<img src="../../img/kyash.png" width="100"><br>
--- a/app/view/ps/setting.vue.js
+++ b/app/view/ps/setting.vue.js
@@ -263,7 +263,7 @@ var tlConstruction=[
        setValue:200,
        text:{
            head:"crwdns586:0crwdne586:0",
-            desc:"",
+            desc:'@@imgheightwarn@@',
            after:"px"
        }
    },{
--- a/app/view/ps/update.html
+++ b/app/view/ps/update.html
@@ -62,9 +62,6 @@ 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>
@@ -78,11 +75,10 @@ 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 class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">crwdns2382:0crwdne2382:0</button>
-        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">crwdns1950:0crwdne1950:0</button>
-        <span class="linux">crwdns2384:0crwdne2384:0<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>
+        <button class="waves-effect btn windows hide" onclick="update('install')" style="margin-left:15px;">crwdns2382:0crwdne2382:0</button>
+        <button class="waves-effect btn windows hide" onclick="update('portable')" style="margin-left:15px;">crwdns1950:0crwdne1950:0</button>
+        <button class="waves-effect btn linux hide" onclick="update('linux')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
+        <button class="waves-effect btn mac hide" onclick="update('mac')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
        <br>
        crwdns678:0crwdne678:0<br>crwdns679:0crwdne679:0
    </div>
@@ -184,12 +180,12 @@ function verck(){
    var remote=electron.remote;
    var platform=remote.process.platform;
    var bit=process.arch;
-	if(platform=="linux"){
-        $('.windows').hide()
-        $('.linux').show()
-	}else if(platform=="mac"){
-        $('.windows').hide()
-        $('.mac').show()
+	if(platform=="win32"){
+        $('.windows').removeClass("hide")
+	}else if(platform=="linux"){
+        $('.linux').removeClass("hide")
+	}else if(platform=="darwin"){
+        $('.mac').removeClass("hide")
 	}
 	var start="https://thedesk.top/ver.json";
 	fetch(start, {
Author	SHA1	Message	Date
Cutls	9e982dca37	Merge pull request #46 from cutls/WIP-(before-CI) TheDesk Usamin (18.1.2) Released	2019-04-03 13:14:40 +09:00
Cutls	6f25ece72d	TheDesk Usamin (18.1.2) Released	2019-04-03 12:59:29 +09:00
Cutls	b28023bec2	Merge pull request #45 from cutls/WIP-(before-CI) TheDesk Usamin (18.1.2)	2019-04-02 23:51:17 +09:00
Cutls	0df8baa7bf	TheDesk Usamin (18.1.2) Plus	2019-04-02 23:42:25 +09:00
Cutls	14c647ca46	Merge pull request #43 from kPherox/patch-1 Fix TweetDeck height	2019-03-29 19:34:46 +09:00
kPherox	f2ff82c810	Fix TweetDeck height	2019-03-29 18:10:15 +09:00
Cutls	2ce9f55f28	edit margin	2019-03-29 02:37:20 +09:00
Cutls	4c3c1ac56e	Merge branch 'WIP-(before-CI)' of https://github.com/cutls/TheDesk into WIP-(before-CI)	2019-03-29 02:12:37 +09:00
Cutls	4aa14a14a2	TheDesk Usain (18.1.2)	2019-03-29 02:12:25 +09:00
Cutls	a398fae023	Merge pull request #42 from kPherox/fix-paste-image Change the method to chack clipboardData type	2019-03-23 17:32:23 +09:00
kPherox	100bd648a9	Fix paste image when image copied from web browser	2019-03-23 05:51:22 +09:00
Cutls	348c5c31c0	Merge pull request #41 from cutls/WIP-(before-CI) TheDesk Usamin (18.1.1)	2019-03-22 23:11:18 +09:00
Cutls	7556e5560d	TheDesk Usamin (18.1.1)	2019-03-22 23:10:23 +09:00
Cutls	931afc3dd2	Merge pull request #40 from kPherox/fix-duplicate-integrated-tl Fix duplicate fetch in Integrated TL	2019-03-22 14:47:44 +09:00
kPherox	b25244aa9a	Fix duplicate websocket connection	2019-03-22 02:59:04 +09:00
kPherox	abe3a2ccb6	Fix duplicate more loading	2019-03-22 02:58:26 +09:00
Cutls	f7a80da21b	Uncrop setting	2019-03-21 23:38:15 +09:00
Cutls	e11f0293fe	Merge pull request #39 from kPherox/ignore-update-for-brewcask Homebrew Caskでインストールした時にアップデート通知を無視できるようにする	2019-03-21 22:14:07 +09:00
Cutls	5ec617a778	Merge pull request #38 from kPherox/dont-fire-itunes-event 'itunes-np' リスナが残っているときにnowplayingのイベントを無視する	2019-03-21 22:13:56 +09:00
kPherox	eb86966d33	Ignore update for homebrew cask	2019-03-21 17:01:55 +09:00
kPherox	e44014a1a9	Don't fire 'itunes' event when 'itunes-np' listener is present Remove `uploadnow` variable as it is no longer needed	2019-03-21 16:01:36 +09:00
Cutls	c38cc6fd5a	Merge pull request #37 from cutls/WIP-(before-CI) package to travis	2019-03-21 14:59:54 +09:00
Cutls	cdc6840808	package to travis	2019-03-21 14:58:33 +09:00
Cutls	abba6fcaa9	Merge pull request #36 from cutls/WIP-(before-CI) TheDesk Usamin (18.1.0)	2019-03-21 14:24:49 +09:00
Cutls	293a373632	electron some fix	2019-03-21 14:23:10 +09:00
Cutls	5b3dd86a5e	Webview some fixed	2019-03-21 14:21:02 +09:00
cutls	d2719cec41	Toot when nowplaying without artworks	2019-03-20 21:45:34 -07:00
Cutls	153f1aacee	check something	2019-03-21 13:39:30 +09:00
Cutls	5d0b5e9c94	Fix(lock when posting artwork)	2019-03-21 05:49:59 +09:00
Cutls	a6cb385375	THeDesk Usamin (18.1.0)	2019-03-21 04:43:01 +09:00
Cutls	ba074dd1b0	Column(Stack/Dock)	2019-03-21 04:42:47 +09:00
Cutls	22d54ab2ab	Merge pull request #35 from kPherox/fix-itunes-np-template Fix NowPlaying template for macOS	2019-03-21 02:36:07 +09:00
Cutls	0dfe864f12	Merge pull request #34 from kPherox/fix-duplicate-listener Fix duplicate listener for iTunes NowPlaying	2019-03-21 02:35:52 +09:00
Cutls	32a16eb2a4	iTunes templete	2019-03-21 02:26:42 +09:00
kPherox	f35056a916	Fix duplicate "itunes-np" listener	2019-03-20 22:58:38 +09:00
kPherox	6e9b0b4d10	Fix template {hz}	2019-03-20 22:57:59 +09:00
Cutls	216191563e	readme update	2019-03-20 20:11:03 +09:00
Cutls	cf827e7c25	some fix	2019-03-20 20:08:33 +09:00
cutls	e36379de44	Nowplaying on macOS with an album artwork	2019-03-20 04:02:59 -07:00
Cutls	25662e8736	prepare for itunes-nowplaying artworks	2019-03-20 15:29:13 +09:00
Cutls	e16c9fba43	compare for itunes-artworks	2019-03-20 13:50:00 +09:00
Cutls	7037f63b44	Merge pull request #33 from cutls/WIP-(before-CI) TheDesk Usamin (18.0.3)	2019-03-19 00:26:46 +09:00
Cutls	f9e3b4129b	vis bug/setting bug	2019-03-19 00:24:46 +09:00