From 75a397aafde3aaa7ce4b56fab27f01966d508e07 Mon Sep 17 00:00:00 2001 From: Cutls Date: Wed, 27 Feb 2019 10:17:35 +0900 Subject: [PATCH] TheDesk Miria (17.0.1) --- README.md | 6 +- app/main.js | 107 ++---------------------------- app/package.json | 2 +- app/view/en/index.html | 5 +- app/view/en/setting.html | 8 +-- app/view/en/update.html | 18 ++++- app/view/ja/index.html | 5 +- app/view/ja/setting.html | 6 +- app/view/ja/update.html | 18 ++++- app/view/make/setting.sample.html | 4 +- app/view/make/update.sample.html | 18 ++++- app/view/ps/index.html | 5 +- app/view/ps/setting.html | 4 +- app/view/ps/update.html | 18 ++++- 14 files changed, 101 insertions(+), 123 deletions(-) diff --git a/README.md b/README.md index 37b0af29..216bdd21 100644 --- a/README.md +++ b/README.md @@ -86,11 +86,11 @@ WindowsでPython 2.xやVisualC++を一発でインストールできるツール ### electron-packager Windows -`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=3.0.10 --icon=.\app\thedesk.ico --overwrite` +`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=4.0.5 --icon=.\app\thedesk.ico --overwrite` Linux -`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=3.0.10 --overwrite` +`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.5 --overwrite` macOS -`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=3.0.10 --icon=./app/icon.icns --overwrite` +`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite` ### electron-builder diff --git a/app/main.js b/app/main.js index 94281bda..9cdb8cd7 100644 --- a/app/main.js +++ b/app/main.js @@ -280,65 +280,13 @@ ipc.on('shot-img-dl', (e, args) => { }) //アプデDL ipc.on('download-btn', (e, args) => { + console.log(args); var platform=process.platform; var bit=process.arch; - var versioning=args[3]; - var portable=args[2]; - if(platform=="win32" || platform=="linux" || platform=="darwin" ){ - var exe=false; - if(platform=="win32" && bit=="x64"){ - if(portable){ - var zip="TheDesk.exe"; - }else{ - var zip="TheDesk-setup.exe"; - } - exe=true; - }else if(platform=="win32" && bit=="ia32"){ - if(portable){ - var zip="TheDesk-ia32.exe"; - }else{ - var zip="TheDesk-setup-ia32.exe"; - } - exe=true; - }else if(platform=="linux" && bit=="x64"){ - var zip="TheDesk-linux-x64.zip"; - }else if(platform=="linux" && bit=="ia32"){ - var zip="TheDesk-linux-ia32.zip"; - }else if(platform=="darwin"){ - var zip="TheDesk-darwin-x64.zip"; - }else{ - return; - } - if(versioning && !exe){ - zip=zip.replace(".zip","."+args[1]+".zip"); - }else if(versioning){ - zip=zip.replace(".exe","."+args[1]+".exe"); - } - }else{ - const options = { - type: 'info', - title: 'Other OS Supporting System', - message: "thedesk.topをブラウザで開きます。", - buttons: ['OK'] - } - dialog.showMessageBox(options, function(index) { - shell.openExternal("https://thedesk.top"); - }) - return; - if(bit=="x64"){ - var zip="TheDesk-linux-x64.zip"; - }else if(bit=="ia32"){ - var zip="TheDesk-linux-ia32.zip"; - } - } - var ver=args[1]; - - console.log(zip); - if(args[0]=="true"){ dialog.showSaveDialog(null, { title: '保存', properties: ['openFile', 'createDirectory'], - defaultPath: zip + defaultPath: args[1] }, (savedFiles) => { console.log(savedFiles); if(!savedFiles){ @@ -354,13 +302,8 @@ ipc.on('download-btn', (e, args) => { fs.statSync(savedFiles); fs.unlink(savedFiles); } - console.log(m[1]+":"+savedFiles) - dl(portable,ver,m[1],savedFiles); + dl(args[0],args[1],savedFiles); }); - }else{ - dl(portable,ver); - } - }); function isExistFile(file) { try { @@ -370,48 +313,10 @@ function isExistFile(file) { if(err.code === 'ENOENT') return false } } -function dl(portable,ver,files,fullname){ - console.log(files); - var platform=process.platform; - var bit=process.arch; - if(platform=="win32"){ - if(bit=="x64"){ - if(portable){ - var zip="TheDesk.exe"; - }else{ - var zip="TheDesk-setup.exe"; - } - }else if(bit=="ia32"){ - if(portable){ - var zip="TheDesk-ia32.exe"; - }else{ - var zip="TheDesk-setup-ia32.exe"; - } - } - }else if(platform=="linux"){ - if(bit=="x64"){ - var zip="TheDesk-linux-x64.zip"; - }else if(bit=="ia32"){ - var zip="TheDesk-linux-ia32.zip"; - } - }else if(platform=="darwin"){ - var zip="TheDesk-darwin-x64.zip"; - } - //zip=zip+"?"+ver; - var l = 8; - - // 生成する文字列に含める文字セット - var c = "abcdefghijklmnopqrstuvwxyz0123456789"; - - var cl = c.length; - var r = ""; - for(var i=0; i { updatewin.webContents.send('mess', "ダウンロードが完了しました。"); app.quit(); diff --git a/app/package.json b/app/package.json index 9616df85..8d1fff60 100644 --- a/app/package.json +++ b/app/package.json @@ -76,7 +76,7 @@ "electronVersion": "3.0.10" }, "devDependencies": { - "electron": "^3.0.10", + "electron": "^4.0.5", "electron-packager": "^13.0.1", "electron-prebuilt": "^1.4.13", "electron-rebuild": "^1.8.4" diff --git a/app/view/en/index.html b/app/view/en/index.html index 8179ff26..8799ce9d 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -559,7 +559,10 @@ var tlid=0; バグ修正
(Mastodon 2.7)時間指定投稿が利用できます。
(Mastodon 2.7)「インスタンス」を「サーバー」に変更
- + CW付きのトゥートの再編集に対応
+ インストール場所が指定できるように
+ トゥートのコピペができない不具合を修正
+ TweetDeckの横幅だけ広げられる機能

Support TheDesk!

diff --git a/app/view/en/setting.html b/app/view/en/setting.html index cf0298fa..364830ee 100644 --- a/app/view/en/setting.html +++ b/app/view/en/setting.html @@ -59,12 +59,12 @@
-
Minimam width of columns
Scroll bar will be shown when your window size is more than ammounts of columns. +
Minimum width of columns
Scroll bar will be shown when your window size is more than ammounts of columns.
pxabove
-
Width of TweetDeck browser
+
Minimum width of TweetDeck browser
pxabove
@@ -319,7 +319,7 @@ Spotify and NowPlaying Preferences
-
NowPlaying Provider(Windows)
+ h5>NowPlaying Provider(Windows) macOS and Linux are not supported. AIMP and iTunes were checked by developer.
CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox
WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.
For foobar2000, foo_cad plugin is required.
@@ -334,7 +334,7 @@ -

+
Click music_noteicon to NowPlaying
Account Connection
TheDesk save your data on thedesk.top server.
diff --git a/app/view/en/update.html b/app/view/en/update.html index 7f59fdaf..71fd2349 100644 --- a/app/view/en/update.html +++ b/app/view/en/update.html @@ -80,6 +80,7 @@ a,button,input,label,i{
+ {{snap}}
@@ -138,17 +139,32 @@ function update(sel){ if(sel=="installer"){ if(bit=="64"){ var url=json["winx64"]; + var file="TheDesk-setup.exe"; }else if(bit=="32"){ var url=json["winia32"]; + var file="TheDesk-setup-ia32.exe"; } }else if(sel=="portable"){ if(bit=="64"){ var url=json["winx64p"]; + var file="TheDesk.exe"; }else if(bit=="32"){ var url=json["winia32p"]; + var file="TheDesk-ia32.exe"; } + }else if(sel=="linux"){ + if(bit=="64"){ + var url=json["linuxx64"]; + var file="TheDesk-linux-x64.zip"; + }else if(bit=="32"){ + var url=json["linuxia64"]; + var file="TheDesk-linux-ia32.zip"; + } + }else if(sel=="mac"){ + var url=json["mac"]; + var file="TheDesk-darwin-x64.zip"; } - ipc.send('download-btn', url); + ipc.send('download-btn', [url,file]); }); } diff --git a/app/view/ja/index.html b/app/view/ja/index.html index b9e6f2a4..459a11a2 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -559,7 +559,10 @@ var tlid=0; バグ修正
(Mastodon 2.7)時間指定投稿が利用できます。
(Mastodon 2.7)「インスタンス」を「サーバー」に変更
- + CW付きのトゥートの再編集に対応
+ インストール場所が指定できるように
+ トゥートのコピペができない不具合を修正
+ TweetDeckの横幅だけ広げられる機能


ご支援ください。

diff --git a/app/view/ja/setting.html b/app/view/ja/setting.html index 67245e24..d016e80d 100644 --- a/app/view/ja/setting.html +++ b/app/view/ja/setting.html @@ -64,7 +64,7 @@ px以上
-
TweetDeckの固定幅
+
TweetDeckの限定の最低横幅
px以上
@@ -319,7 +319,7 @@ SpotifyとNowPlayingの設定
-
NowPlayingのソース(Windows)
+ h5>NowPlayingのソース(Windows) macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。
foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。
ただし、foobar2000はfoo_cad pluginが必要です。
@@ -334,7 +334,7 @@ -

+
music_noteボタンから簡単にNowPlayingができます。
アカウントの連携
APIの性質上，thedesk.topへアクセスします。
diff --git a/app/view/ja/update.html b/app/view/ja/update.html index e8bdf93d..a8489517 100644 --- a/app/view/ja/update.html +++ b/app/view/ja/update.html @@ -80,6 +80,7 @@ a,button,input,label,i{
+ {{snap}}
@@ -138,17 +139,32 @@ function update(sel){ if(sel=="installer"){ if(bit=="64"){ var url=json["winx64"]; + var file="TheDesk-setup.exe"; }else if(bit=="32"){ var url=json["winia32"]; + var file="TheDesk-setup-ia32.exe"; } }else if(sel=="portable"){ if(bit=="64"){ var url=json["winx64p"]; + var file="TheDesk.exe"; }else if(bit=="32"){ var url=json["winia32p"]; + var file="TheDesk-ia32.exe"; } + }else if(sel=="linux"){ + if(bit=="64"){ + var url=json["linuxx64"]; + var file="TheDesk-linux-x64.zip"; + }else if(bit=="32"){ + var url=json["linuxia64"]; + var file="TheDesk-linux-ia32.zip"; + } + }else if(sel=="mac"){ + var url=json["mac"]; + var file="TheDesk-darwin-x64.zip"; } - ipc.send('download-btn', url); + ipc.send('download-btn', [url,file]); }); } diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html index 5b2fe8cf..0082df32 100644 --- a/app/view/make/setting.sample.html +++ b/app/view/make/setting.sample.html @@ -319,7 +319,7 @@ {{spotify}}
-
{{npProvider}}
+ h5>{{npProvider}} {{npPeoviderWarn}}
@@ -334,7 +334,7 @@ -

+
{{spotifynote1}}music_note{{spotifynote2}}
{{link}}
{{linkwarn}}
diff --git a/app/view/make/update.sample.html b/app/view/make/update.sample.html index 14305bff..1db1b514 100644 --- a/app/view/make/update.sample.html +++ b/app/view/make/update.sample.html @@ -80,6 +80,7 @@ a,button,input,label,i{
+ {{snap}}
@@ -138,17 +139,32 @@ function update(sel){ if(sel=="installer"){ if(bit=="64"){ var url=json["winx64"]; + var file="TheDesk-setup.exe"; }else if(bit=="32"){ var url=json["winia32"]; + var file="TheDesk-setup-ia32.exe"; } }else if(sel=="portable"){ if(bit=="64"){ var url=json["winx64p"]; + var file="TheDesk.exe"; }else if(bit=="32"){ var url=json["winia32p"]; + var file="TheDesk-ia32.exe"; } + }else if(sel=="linux"){ + if(bit=="64"){ + var url=json["linuxx64"]; + var file="TheDesk-linux-x64.zip"; + }else if(bit=="32"){ + var url=json["linuxia64"]; + var file="TheDesk-linux-ia32.zip"; + } + }else if(sel=="mac"){ + var url=json["mac"]; + var file="TheDesk-darwin-x64.zip"; } - ipc.send('download-btn', url); + ipc.send('download-btn', [url,file]); }); } diff --git a/app/view/ps/index.html b/app/view/ps/index.html index 8f128f87..eab45869 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -559,7 +559,10 @@ var tlid=0; バグ修正
(Mastodon 2.7)時間指定投稿が利用できます。
(Mastodon 2.7)「インスタンス」を「サーバー」に変更
- + CW付きのトゥートの再編集に対応
+ インストール場所が指定できるように
+ トゥートのコピペができない不具合を修正
+ TweetDeckの横幅だけ広げられる機能


crwdns473:0crwdne473:0

diff --git a/app/view/ps/setting.html b/app/view/ps/setting.html index bccb4863..27c33c28 100644 --- a/app/view/ps/setting.html +++ b/app/view/ps/setting.html @@ -319,7 +319,7 @@ crwdns624:0crwdne624:0
-
{{npProvider}}
+ h5>{{npProvider}} {{npPeoviderWarn}}
@@ -334,7 +334,7 @@ -

+
crwdns625:0crwdne625:0music_notecrwdns626:0crwdne626:0
crwdns627:0crwdne627:0
crwdns628:0crwdne628:0
diff --git a/app/view/ps/update.html b/app/view/ps/update.html index 22e3fcfe..bb75188d 100644 --- a/app/view/ps/update.html +++ b/app/view/ps/update.html @@ -80,6 +80,7 @@ a,button,input,label,i{
+ {{snap}}
@@ -138,17 +139,32 @@ function update(sel){ if(sel=="installer"){ if(bit=="64"){ var url=json["winx64"]; + var file="TheDesk-setup.exe"; }else if(bit=="32"){ var url=json["winia32"]; + var file="TheDesk-setup-ia32.exe"; } }else if(sel=="portable"){ if(bit=="64"){ var url=json["winx64p"]; + var file="TheDesk.exe"; }else if(bit=="32"){ var url=json["winia32p"]; + var file="TheDesk-ia32.exe"; } + }else if(sel=="linux"){ + if(bit=="64"){ + var url=json["linuxx64"]; + var file="TheDesk-linux-x64.zip"; + }else if(bit=="32"){ + var url=json["linuxia64"]; + var file="TheDesk-linux-ia32.zip"; + } + }else if(sel=="mac"){ + var url=json["mac"]; + var file="TheDesk-darwin-x64.zip"; } - ipc.send('download-btn', url); + ipc.send('download-btn', [url,file]); }); }