Merge branch 'master' into WIP-(before-CI)
This commit is contained in:
		
							
								
								
									
										
											BIN
										
									
								
								TheDesk.appx
									
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								TheDesk.appx
									
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							| @@ -16,7 +16,31 @@ function verck(ver,winstore) { | ||||
| 			$("#release-"+verp).show(); | ||||
| 		  }); | ||||
| 	} | ||||
| 	var electron = require("electron"); | ||||
| 	var remote=electron.remote; | ||||
| 	var dialog=remote.dialog; | ||||
| 	const options = { | ||||
| 		type: 'info', | ||||
| 		title: "Select your platform", | ||||
| 		message: lang.lang_version_platform, | ||||
| 		buttons: [lang.lang_no,lang.lang_yesno] | ||||
| 	  } | ||||
| 	  var platform=remote.process.platform; | ||||
| 	  if(platform=="win32"){ | ||||
| 		  console.log(localStorage.getItem("winstore")) | ||||
| 		  if(!localStorage.getItem("winstore")){ | ||||
| 			   | ||||
| 				dialog.showMessageBox(options, function(arg) { | ||||
| 				  if(arg==1){ | ||||
| 					  localStorage.setItem("winstore","winstore") | ||||
| 					}else{ | ||||
| 					  localStorage.setItem("winstore","localinstall") | ||||
| 					} | ||||
| 			  }); | ||||
| 		  } | ||||
| 	  }else{ | ||||
| 		  localStorage.setItem("winstore","unix") | ||||
| 	  } | ||||
| 	var l = 5; | ||||
| 	// 生成する文字列に含める文字セット | ||||
| 	var c = "abcdefghijklmnopqrstuvwxyz0123456789"; | ||||
|   | ||||
| @@ -21,6 +21,7 @@ var lang={ | ||||
|     //common/version.js | ||||
|     "lang_version_usever":"No update is found({{ver}})", | ||||
|     "lang_version_skipver":"Update was ignored.", | ||||
|     "lang_version_platform":"Was this software installed at Microsoft Store? When select 'yes', any update was ignored.", | ||||
|     //login | ||||
|     //login/login.js | ||||
|     "lang_login_noauth":"Show TL of unlogined accounts", | ||||
|   | ||||
| @@ -22,6 +22,7 @@ var lang={ | ||||
| //common/version.js | ||||
|     "lang_version_usever":"お使いのバージョン{{ver}}は最新です。", | ||||
|     "lang_version_skipver":"アップデートはスキップされました。", | ||||
|     "lang_version_platform":"このソフトウェアはMicrosoft Storeからダウンロードされましたか?(「はい」を選択すると次回からアップデート通知を無視します。)", | ||||
| //login | ||||
| //login/login.js | ||||
|     "lang_login_noauth":"認証せずに見る", | ||||
|   | ||||
| @@ -60,7 +60,7 @@ function load() { | ||||
| 	var electron = require("electron"); | ||||
|           var remote=electron.remote; | ||||
|           var platform=remote.process.platform; | ||||
| 	    if(platform=="win32"){ | ||||
| 	    if(localStorage.getItem("winstore")!="localinstall"){ | ||||
| 			$("#linux").prop("checked", false); | ||||
|         }else{ | ||||
| 			$("#linux").prop("checked", true); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	