From 5b699c17759e1d99ef4acaa7dc087b5c49e25617 Mon Sep 17 00:00:00 2001 From: Cutls Date: Thu, 7 Mar 2019 00:48:18 +0900 Subject: [PATCH] TheDesk Miria (17.1.1) --- .travis.yml | 2 ++ app/js/common/version.js | 27 ++++++++++++++++++++++++++- app/js/lang/lang.en.js | 1 + app/js/lang/lang.ja.js | 1 + app/js/login/manager.js | 2 +- app/package.json | 2 +- app/view/en/index.html | 2 +- app/view/ja/index.html | 2 +- app/view/ps/index.html | 2 +- 9 files changed, 35 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9236f48a..7e900de2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ before_deploy: - electron-builder --win --x64 - mv ../build/TheDesk-setup.exe ../TheDesk-setup.exe - mv ../build/TheDesk*.exe ../TheDesk.exe + - mv ../build/TheDesk*.appx ../TheDesk.appx - cd ../ - ls after_deploy: ls @@ -26,6 +27,7 @@ deploy: - TheDesk-setup.exe - TheDesk-ia32.exe - TheDesk-setup-ia32.exe + - TheDesk.appx on: repo: cutls/TheDesk branches: diff --git a/app/js/common/version.js b/app/js/common/version.js index 963bdb53..2a0e4e86 100644 --- a/app/js/common/version.js +++ b/app/js/common/version.js @@ -16,7 +16,32 @@ function verck(ver,winstore) { $("#release-"+verp).show(); }); } - + var name="Web"; + 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"; diff --git a/app/js/lang/lang.en.js b/app/js/lang/lang.en.js index 1165fbde..341e3470 100644 --- a/app/js/lang/lang.en.js +++ b/app/js/lang/lang.en.js @@ -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", diff --git a/app/js/lang/lang.ja.js b/app/js/lang/lang.ja.js index 73c1dcde..c44be155 100644 --- a/app/js/lang/lang.ja.js +++ b/app/js/lang/lang.ja.js @@ -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":"認証せずに見る", diff --git a/app/js/login/manager.js b/app/js/login/manager.js index 29cba80a..ee7e24d5 100644 --- a/app/js/login/manager.js +++ b/app/js/login/manager.js @@ -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); diff --git a/app/package.json b/app/package.json index 57416f0f..ae7f07a3 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "17.0.2", + "version": "17.1.1", "description": "TheDesk is a Mastodon client for PC.", "main": "main.js", "scripts": { diff --git a/app/view/en/index.html b/app/view/en/index.html index a563688c..ad6f51c6 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -32,7 +32,7 @@