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
34 changed files with 835 additions and 1253 deletions
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -112,6 +112,13 @@ iframe {
  border-top:none;
  display:flex;
  flex-direction: column;
+  margin-bottom: -10px;
+}
+.img_FTL{
+  display:none;
+}
+.bbcode_FTL{
+  display:none;
 }
 .boxIn{
  height: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/lang/lang.en.js
+++ b/app/js/lang/lang.en.js
@@ -153,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
@@ -108,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}}",
@@ -153,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/post/img.js
+++ b/app/js/post/img.js
@@ -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")) {
+    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);

--- 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/parse.js
+++ b/app/js/tl/parse.js
@@ -228,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,
--- 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
@@ -146,6 +146,7 @@ function parseColumn() {
 			'<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 +
@@ -433,7 +434,7 @@ function webviewParse(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;
--- 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');
@@ -107,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();
 	}
@@ -140,527 +133,21 @@ function createWindow() {
 	if(platform=="darwin"){
 		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={
-				win:true,
-				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
--- 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
--- a/app/package.json
+++ b/app/package.json
@@ -97,8 +97,7 @@
  },
  "devDependencies": {
    "electron": "^4.0.6",
-    "electron-packager": "^13.0.1",
-    "electron-prebuilt": "^1.4.13",
+    "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.1.1)";
+var ver="Usamin (18.1.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -608,8 +608,8 @@ 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 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/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/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.1.1)";
+var ver="Usamin (18.1.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -608,8 +608,8 @@ 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 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/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/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
@@ -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>
@@ -608,8 +607,8 @@ 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 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/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/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/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.1.1)";
+var ver="Usamin (18.1.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -608,8 +608,8 @@ 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 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/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/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