Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove: NowPlaying on Windows

Browse Source
This commit is contained in:
Cutls 2019-08-14 01:23:25 +09:00
parent 8aac6474da
commit 2346ef7089
27 changed files with 42 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/js/ui/spotify.js
View File

@ -165,24 +165,6 @@ function spotifySave() {
localStorage.setItem("np-temp", temp); localStorage.setItem("np-temp", temp);
M.toast({ html: lang.lang_spotify_np, displayLength: 3000 }) M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
} }
function npprovider() {
var provd = $("[name=npp]:checked").val();
if (!provd) {
if (localStorage.getItem("np_provider")) {
$("[value=" + localStorage.getItem("np_provider") + "]").prop("checked", true);
} else {
$("[value=AIMP]").prop("checked", true);
localStorage.setItem("np_provider", "AIMP");
}
} else {
if (provd != localStorage.getItem("np_provider")) {
M.toast({ html: lang.lang_setting_npprovide.replace("{{set}}", provd), displayLength: 3000 })
}
localStorage.setItem("np_provider", provd);
postMessage(["itunes", ["set", provd]], "*")
}
}
if (location.search) { if (location.search) {
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/); var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
var mode = m[1]; var mode = m[1];
@ -195,11 +177,4 @@ if (location.search) {
} }
} }
$("#npbtn").click(function () {
nowplaying('spotify');
});
$("#npbtn").bind('contextmenu', function () {
nowplaying('itunes');
return false;
});

43
app/main/np.js
View File

@ -8,19 +8,7 @@ function np(mainWindow) {
//Verified on Windows //Verified on Windows
console.log("Access"); console.log("Access");
if (args[0] == "set") { 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 { } else {
var platform = process.platform; var platform = process.platform;
var bit = process.arch; var bit = process.arch;
@ -34,35 +22,6 @@ function np(mainWindow) {
console.error(error); console.error(error);
e.sender.webContents.send('itunes-np', error); e.sender.webContents.send('itunes-np', 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
}
e.sender.webContents.send('itunes-np', value);
} }
} }

1
app/package.json
View File

@ -60,7 +60,6 @@
"vue": "^2.6.10" "vue": "^2.6.10"
}, },
"optionalDependencies": { "optionalDependencies": {
"nowplaying-node": "git+https://github.com/cutls/nowplaying-node",
"itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/4/head", "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/4/head",
"font-manager": "^0.3.0" "font-manager": "^0.3.0"
}, },

5
app/view/bg/index.html
View File

@ -206,7 +206,7 @@
<a onclick="nowplaying('spotify');">Възпроизвеждане сега (Spotify)</a> <a onclick="nowplaying('spotify');">Възпроизвеждане сега (Spotify)</a>
</li> </li>
<li> <li>
<a onclick="nowplaying('itunes');">Възпроизвеждане сега</a> <a onclick="nowplaying('itunes');">Възпроизвеждане сега (macOS)</a>
</li> </li>
<li> <li>
<a onclick="schedule();">Планиран тоот</a> <a onclick="schedule();">Планиран тоот</a>
@ -682,7 +682,8 @@
・一部master追従インスタンスでAPIが削除されたことに対する対応<br> ・一部master追従インスタンスでAPIが削除されたことに対する対応<br>
・アンケートの投票時のバグを修正<br> ・アンケートの投票時のバグを修正<br>
・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br> ・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br>
・カラムを追加, 削除するときに全体を再読込しないようになった ・カラムを追加, 削除するときに全体を再読込しないようになった<br>
・Windows向けNowPlayingを削除(実装的, ライセンス的問題です)
</div> </div>
<div id="release-en" style="display:none"> <div id="release-en" style="display:none">
<h5>Let's make it native!</h5> <h5>Let's make it native!</h5>

33
app/view/bg/setting.html
View File

@ -332,39 +332,6 @@
<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences <i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
</div> </div>
<div class="collapsible-body"> <div class="collapsible-body">
<h5>NowPlaying Provider(Windows)</h5>
macOS и Linux не се поддържат. AIMP и iTunes бяха проверени от разработчика. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a>. И MusicBee изисква CAD.<br>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
value="ITUNES" />
<span>iTunes</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" />
<span>MediaMonkey</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
value="WINAMP" />
<span>Winamp</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span>
</label>
<br><br> <br><br>
Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br> Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
<h5>Account Connection</h5> <h5>Account Connection</h5>

5
app/view/cs/index.html
View File

@ -206,7 +206,7 @@
<a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a> <a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a>
</li> </li>
<li> <li>
<a onclick="nowplaying('itunes');">NowPlaying</a> <a onclick="nowplaying('itunes');">NowPlaying(macOS)</a>
</li> </li>
<li> <li>
<a onclick="schedule();">Plánovaný toot</a> <a onclick="schedule();">Plánovaný toot</a>
@ -682,7 +682,8 @@
・一部master追従インスタンスでAPIが削除されたことに対する対応<br> ・一部master追従インスタンスでAPIが削除されたことに対する対応<br>
・アンケートの投票時のバグを修正<br> ・アンケートの投票時のバグを修正<br>
・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br> ・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br>
・カラムを追加, 削除するときに全体を再読込しないようになった ・カラムを追加, 削除するときに全体を再読込しないようになった<br>
・Windows向けNowPlayingを削除(実装的, ライセンス的問題です)
</div> </div>
<div id="release-en" style="display:none"> <div id="release-en" style="display:none">
<h5>Let's make it native!</h5> <h5>Let's make it native!</h5>

33
app/view/cs/setting.html
View File

@ -332,39 +332,6 @@
<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences <i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
</div> </div>
<div class="collapsible-body"> <div class="collapsible-body">
<h5>NowPlaying Provider(Windows)</h5>
macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a> is required. And MusicBee requires CAD.<br>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
value="ITUNES" />
<span>iTunes</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" />
<span>MediaMonkey</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
value="WINAMP" />
<span>Winamp</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span>
</label>
<br><br> <br><br>
Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br> Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
<h5>Account Connection</h5> <h5>Account Connection</h5>

5
app/view/de/index.html
View File

@ -206,7 +206,7 @@
<a onclick="nowplaying('spotify');">Wird gerade gespielt (Spotify)</a> <a onclick="nowplaying('spotify');">Wird gerade gespielt (Spotify)</a>
</li> </li>
<li> <li>
<a onclick="nowplaying('itunes');">Wird gerade gespielt</a> <a onclick="nowplaying('itunes');">Wird gerade gespielt(macOS)</a>
</li> </li>
<li> <li>
<a onclick="schedule();">Geplanter Tröt</a> <a onclick="schedule();">Geplanter Tröt</a>
@ -682,7 +682,8 @@
・一部master追従インスタンスでAPIが削除されたことに対する対応<br> ・一部master追従インスタンスでAPIが削除されたことに対する対応<br>
・アンケートの投票時のバグを修正<br> ・アンケートの投票時のバグを修正<br>
・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br> ・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br>
・カラムを追加, 削除するときに全体を再読込しないようになった ・カラムを追加, 削除するときに全体を再読込しないようになった<br>
・Windows向けNowPlayingを削除(実装的, ライセンス的問題です)
</div> </div>
<div id="release-en" style="display:none"> <div id="release-en" style="display:none">
<h5>Let's make it native!</h5> <h5>Let's make it native!</h5>

33
app/view/de/setting.html
View File

@ -332,39 +332,6 @@
<i class="fa fa-spotify"></i>Spotify und NowPlaying Einstellungen <i class="fa fa-spotify"></i>Spotify und NowPlaying Einstellungen
</div> </div>
<div class="collapsible-body"> <div class="collapsible-body">
<h5>NowPlaying Provider(Windows)</h5>
macOS und Linux werden nicht unterstützt. AIMP und iTunes wurden von Entwicklern überprüft. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> Für foobar2000 ist <a href=\"http://poiru.github.com/foo-cad/\">foo_cad Plugin</a> erforderlich. MusicBee benötigt CAD.<br>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
value="ITUNES" />
<span>iTunes</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" />
<span>MediaMonkey</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
value="WINAMP" />
<span>Winamp</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span>
</label>
<br><br> <br><br>
Klick <i class="material-icons" style="font-size:24px;">music_note</i>Symbol für NowPlaying<br> Klick <i class="material-icons" style="font-size:24px;">music_note</i>Symbol für NowPlaying<br>
<h5>Kontoverbindung</h5> <h5>Kontoverbindung</h5>

5
app/view/en/index.html
View File

@ -206,7 +206,7 @@
<a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a> <a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a>
</li> </li>
<li> <li>
<a onclick="nowplaying('itunes');">NowPlaying</a> <a onclick="nowplaying('itunes');">NowPlaying(macOS)</a>
</li> </li>
<li> <li>
<a onclick="schedule();">Scheduled toot</a> <a onclick="schedule();">Scheduled toot</a>
@ -682,7 +682,8 @@
・一部master追従インスタンスでAPIが削除されたことに対する対応<br> ・一部master追従インスタンスでAPIが削除されたことに対する対応<br>
・アンケートの投票時のバグを修正<br> ・アンケートの投票時のバグを修正<br>
・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br> ・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br>
・カラムを追加, 削除するときに全体を再読込しないようになった ・カラムを追加, 削除するときに全体を再読込しないようになった<br>
・Windows向けNowPlayingを削除(実装的, ライセンス的問題です)
</div> </div>
<div id="release-en" style="display:none"> <div id="release-en" style="display:none">
<h5>Let's make it native!</h5> <h5>Let's make it native!</h5>

33
app/view/en/setting.html
View File

@ -332,39 +332,6 @@
<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences <i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
</div> </div>
<div class="collapsible-body"> <div class="collapsible-body">
<h5>NowPlaying Provider(Windows)</h5>
macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a> is required. And MusicBee requires CAD.<br>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
value="ITUNES" />
<span>iTunes</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" />
<span>MediaMonkey</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
value="WINAMP" />
<span>Winamp</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span>
</label>
<br><br> <br><br>
Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br> Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
<h5>Account Connection</h5> <h5>Account Connection</h5>

5
app/view/ja/index.html
View File

@ -206,7 +206,7 @@
<a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a> <a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a>
</li> </li>
<li> <li>
<a onclick="nowplaying('itunes');">NowPlaying</a> <a onclick="nowplaying('itunes');">NowPlaying(macOS)</a>
</li> </li>
<li> <li>
<a onclick="schedule();">時間指定投稿</a> <a onclick="schedule();">時間指定投稿</a>
@ -682,7 +682,8 @@
・一部master追従インスタンスでAPIが削除されたことに対する対応<br> ・一部master追従インスタンスでAPIが削除されたことに対する対応<br>
・アンケートの投票時のバグを修正<br> ・アンケートの投票時のバグを修正<br>
・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br> ・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br>
・カラムを追加, 削除するときに全体を再読込しないようになった ・カラムを追加, 削除するときに全体を再読込しないようになった<br>
・Windows向けNowPlayingを削除(実装的, ライセンス的問題です)
</div> </div>
<div id="release-en" style="display:none"> <div id="release-en" style="display:none">
<h5>Let's make it native!</h5> <h5>Let's make it native!</h5>

45
app/view/ja/setting.html
View File

@ -332,39 +332,6 @@
<i class="fa fa-spotify"></i>SpotifyとNowPlayingの設定 <i class="fa fa-spotify"></i>SpotifyとNowPlayingの設定
</div> </div>
<div class="collapsible-body"> <div class="collapsible-body">
<h5>NowPlayingのソース(Windows)</h5>
macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a>が必要です。MusicBeeもCADを有効にする必要があります。<br>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
value="ITUNES" />
<span>iTunes</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" />
<span>MediaMonkey</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
value="WINAMP" />
<span>Winamp</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span>
</label>
<br><br> <br><br>
<i class="material-icons" style="font-size:24px;">music_note</i>ボタンから簡単にNowPlayingができます。<br> <i class="material-icons" style="font-size:24px;">music_note</i>ボタンから簡単にNowPlayingができます。<br>
<h5>アカウントの連携</h5> <h5>アカウントの連携</h5>
@ -377,15 +344,15 @@
<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" <a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
class="fa fa-spotify left"></i>切断</a> class="fa fa-spotify left"></i>切断</a>
<h5>@@templateedit@@</h5> <h5>テンプレートの編集</h5>
@@templateeditwarn@@<br> 以下を編集してテンプレートを変更できます。<br>
<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist} <textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
{url}</textarea><br> {url}</textarea><br>
@@template1@@<br> Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<br>
@@template2@@<br> macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}<br>
@@template3@@<br> <br>
<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button> <button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button>
<h5>アルバムアートワークを添付する(Spotify/Windows)</h5> <h5>アルバムアートワークを添付する(Spotify)</h5>
<label> <label>
<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" <input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes"
value="yes" /> value="yes" />

3
app/view/make/index.sample.html
View File

@ -682,7 +682,8 @@
・一部master追従インスタンスでAPIが削除されたことに対する対応<br> ・一部master追従インスタンスでAPIが削除されたことに対する対応<br>
・アンケートの投票時のバグを修正<br> ・アンケートの投票時のバグを修正<br>
・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br> ・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br>
・カラムを追加, 削除するときに全体を再読込しないようになった ・カラムを追加, 削除するときに全体を再読込しないようになった<br>
・Windows向けNowPlayingを削除(実装的, ライセンス的問題です)
</div> </div>
<div id="release-en" style="display:none"> <div id="release-en" style="display:none">
<h5>Let's make it native!</h5> <h5>Let's make it native!</h5>

2
app/view/make/language/bg/index.json
View File

@ -10,7 +10,7 @@
"selfile": "Прикачи..", "selfile": "Прикачи..",
"insertEmoji": "Емотикони", "insertEmoji": "Емотикони",
"NPSpotify": "Възпроизвеждане сега (Spotify)", "NPSpotify": "Възпроизвеждане сега (Spotify)",
"NPiTunes": "Възпроизвеждане сега", "NPiTunes": "Възпроизвеждане сега (macOS)",
"schedule": "Планиран тоот", "schedule": "Планиран тоот",
"postat": "Публикация в", "postat": "Публикация в",
"scheduleWarn": "2.7.0 ~ Минимален интервал от време:5мин. (часовникът на сървъра може да не е точен.)", "scheduleWarn": "2.7.0 ~ Минимален интервал от време:5мин. (часовникът на сървъра може да не е точен.)",

4
app/view/make/language/bg/setting.json
View File

@ -136,8 +136,6 @@
"useerempwarn": "Set on users data modals.", "useerempwarn": "Set on users data modals.",
"empcolorwarn": "Use this color to emphasis", "empcolorwarn": "Use this color to emphasis",
"spotify": "Spotify and NowPlaying Preferences", "spotify": "Spotify and NowPlaying Preferences",
"npProvider": "NowPlaying Provider(Windows)",
"npPeoviderWarn": "macOS и Linux не се поддържат. AIMP и iTunes бяха проверени от разработчика. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a>. И MusicBee изисква CAD.",
"spotifynote1": "Click ", "spotifynote1": "Click ",
"spotifynote2": "icon to NowPlaying", "spotifynote2": "icon to NowPlaying",
"link": "Account Connection", "link": "Account Connection",
@ -148,7 +146,7 @@
"templeteeditwarn": "", "templeteeditwarn": "",
"templete1": "Spotify:{song}:Име на песен/{album}:Име на албум/{artist}:Име на изпълнителя/{url}:URL адрес в Spotify", "templete1": "Spotify:{song}:Име на песен/{album}:Име на албум/{artist}:Име на изпълнителя/{url}:URL адрес в Spotify",
"templete2": "macOS:{song}:Име на песен/{album}:Име на албум/{artist}:ме на изпълнител/композитор:{composer}/честота на излъчване: {hz}/битрейт:{bitRate}/жанр:{genre}", "templete2": "macOS:{song}:Име на песен/{album}:Име на албум/{artist}:ме на изпълнител/композитор:{composer}/честота на излъчване: {hz}/битрейт:{bitRate}/жанр:{genre}",
"templete3": "Windows:{song}:Име на песен/{album}:Име на албума/{artist}:Име на изпълнителя", "templete3": "",
"postartwork": "Attach an Artwork of Spotify", "postartwork": "Attach an Artwork of Spotify",
"tts": "TTS(text to speech) Preferences", "tts": "TTS(text to speech) Preferences",
"speed": "Speed", "speed": "Speed",

2
app/view/make/language/cs/index.json
View File

@ -10,7 +10,7 @@
"selfile": "Přiložit...", "selfile": "Přiložit...",
"insertEmoji": "Emoji", "insertEmoji": "Emoji",
"NPSpotify": "NowPlaying(Spotify)", "NPSpotify": "NowPlaying(Spotify)",
"NPiTunes": "NowPlaying", "NPiTunes": "NowPlaying(macOS)",
"schedule": "Plánovaný toot", "schedule": "Plánovaný toot",
"postat": "Odeslat jak", "postat": "Odeslat jak",
"scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)", "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",

4
app/view/make/language/cs/setting.json
View File

@ -136,8 +136,6 @@
"useerempwarn": "Set on users data modals.", "useerempwarn": "Set on users data modals.",
"empcolorwarn": "Use this color to emphasis", "empcolorwarn": "Use this color to emphasis",
"spotify": "Spotify and NowPlaying Preferences", "spotify": "Spotify and NowPlaying Preferences",
"npProvider": "NowPlaying Provider(Windows)",
"npPeoviderWarn": "macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a> is required. And MusicBee requires CAD.",
"spotifynote1": "Click ", "spotifynote1": "Click ",
"spotifynote2": "icon to NowPlaying", "spotifynote2": "icon to NowPlaying",
"link": "Account Connection", "link": "Account Connection",
@ -148,7 +146,7 @@
"templeteeditwarn": "", "templeteeditwarn": "",
"templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"templete3": "Windows:{song}:Song name/{album}:Album name/{artist}:Artist name", "templete3": "",
"postartwork": "Attach an Artwork of Spotify", "postartwork": "Attach an Artwork of Spotify",
"tts": "TTS(text to speech) Preferences", "tts": "TTS(text to speech) Preferences",
"speed": "Speed", "speed": "Speed",

2
app/view/make/language/de/index.json
View File

@ -10,7 +10,7 @@
"selfile": "Anhängen...", "selfile": "Anhängen...",
"insertEmoji": "Emojis", "insertEmoji": "Emojis",
"NPSpotify": "Wird gerade gespielt (Spotify)", "NPSpotify": "Wird gerade gespielt (Spotify)",
"NPiTunes": "Wird gerade gespielt", "NPiTunes": "Wird gerade gespielt(macOS)",
"schedule": "Geplanter Tröt", "schedule": "Geplanter Tröt",
"postat": "Senden um", "postat": "Senden um",
"scheduleWarn": "2.7.0~ Mindestzeitraum: von 5min(Uhr auf dem Server ist möglicherweise ungenau.)", "scheduleWarn": "2.7.0~ Mindestzeitraum: von 5min(Uhr auf dem Server ist möglicherweise ungenau.)",

4
app/view/make/language/de/setting.json
View File

@ -136,8 +136,6 @@
"useerempwarn": "Set on users data modals.", "useerempwarn": "Set on users data modals.",
"empcolorwarn": "Diese Farbe zum Hervorheben verwenden", "empcolorwarn": "Diese Farbe zum Hervorheben verwenden",
"spotify": "Spotify und NowPlaying Einstellungen", "spotify": "Spotify und NowPlaying Einstellungen",
"npProvider": "NowPlaying Provider(Windows)",
"npPeoviderWarn": "macOS und Linux werden nicht unterstützt. AIMP und iTunes wurden von Entwicklern überprüft. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> Für foobar2000 ist <a href=\"http://poiru.github.com/foo-cad/\">foo_cad Plugin</a> erforderlich. MusicBee benötigt CAD.",
"spotifynote1": "Klick ", "spotifynote1": "Klick ",
"spotifynote2": "Symbol für NowPlaying", "spotifynote2": "Symbol für NowPlaying",
"link": "Kontoverbindung", "link": "Kontoverbindung",
@ -148,7 +146,7 @@
"templeteeditwarn": "", "templeteeditwarn": "",
"templete1": "Spotify:{song}:Lied/{album}:Album/{artist}:Künstler/{url}:URL zu Spotify", "templete1": "Spotify:{song}:Lied/{album}:Album/{artist}:Künstler/{url}:URL zu Spotify",
"templete2": "macOS:{song}:Liedname/{album}:Albumname/{artist}:Artist/Komponist:{composer}/Spamplingrate:{hz}/Bitrate:{bitRate}/Genre:{genre}", "templete2": "macOS:{song}:Liedname/{album}:Albumname/{artist}:Artist/Komponist:{composer}/Spamplingrate:{hz}/Bitrate:{bitRate}/Genre:{genre}",
"templete3": "Windows:{song}:Lied/{album}:Album/{artist}:Künstler", "templete3": "",
"postartwork": "Das Artwork von Spotify anhängen", "postartwork": "Das Artwork von Spotify anhängen",
"tts": "Einstellungen Vorlesefunktion", "tts": "Einstellungen Vorlesefunktion",
"speed": "Geschwindigkeit", "speed": "Geschwindigkeit",

2
app/view/make/language/en/index.json
View File

@ -11,7 +11,7 @@
"insertEmoji":"Emojis", "insertEmoji":"Emojis",
"NPSpotify":"NowPlaying(Spotify)", "NPSpotify":"NowPlaying(Spotify)",
"NPiTunes":"NowPlaying", "NPiTunes":"NowPlaying(macOS)",
"schedule":"Scheduled toot", "schedule":"Scheduled toot",
"postat":"Post at", "postat":"Post at",
"scheduleWarn":"2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)", "scheduleWarn":"2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",

4
app/view/make/language/en/setting.json
View File

@ -136,8 +136,6 @@
"useerempwarn": "Set on users data modals.", "useerempwarn": "Set on users data modals.",
"empcolorwarn": "Use this color to emphasis", "empcolorwarn": "Use this color to emphasis",
"spotify": "Spotify and NowPlaying Preferences", "spotify": "Spotify and NowPlaying Preferences",
"npProvider": "NowPlaying Provider(Windows)",
"npPeoviderWarn": "macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a> is required. And MusicBee requires CAD.",
"spotifynote1": "Click ", "spotifynote1": "Click ",
"spotifynote2": "icon to NowPlaying", "spotifynote2": "icon to NowPlaying",
"link": "Account Connection", "link": "Account Connection",
@ -148,7 +146,7 @@
"templeteeditwarn": "", "templeteeditwarn": "",
"templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"templete3": "Windows:{song}:Song name/{album}:Album name/{artist}:Artist name", "templete3": "",
"postartwork": "Attach an Artwork of Spotify", "postartwork": "Attach an Artwork of Spotify",
"tts": "TTS(text to speech) Preferences", "tts": "TTS(text to speech) Preferences",
"speed": "Speed", "speed": "Speed",

2
app/view/make/language/ja/index.json
View File

@ -10,7 +10,7 @@
"selfile":"ファイルを選択", "selfile":"ファイルを選択",
"insertEmoji":"絵文字を挿入", "insertEmoji":"絵文字を挿入",
"NPSpotify":"NowPlaying(Spotify)", "NPSpotify":"NowPlaying(Spotify)",
"NPiTunes":"NowPlaying", "NPiTunes":"NowPlaying(macOS)",
"schedule":"時間指定投稿", "schedule":"時間指定投稿",
"postat":"時間指定投稿", "postat":"時間指定投稿",
"scheduleWarn":"2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。", "scheduleWarn":"2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。",

14
app/view/make/language/ja/setting.json
View File

@ -136,20 +136,18 @@
"useerempwarn": "各ユーザーのデータ表示画面で設定できます。", "useerempwarn": "各ユーザーのデータ表示画面で設定できます。",
"empcolorwarn": "強調色(テーマによって異なります。)", "empcolorwarn": "強調色(テーマによって異なります。)",
"spotify": "SpotifyとNowPlayingの設定", "spotify": "SpotifyとNowPlayingの設定",
"npProvider": "NowPlayingのソース(Windows)",
"npPeoviderWarn": "macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a>が必要です。MusicBeeもCADを有効にする必要があります。",
"spotifynote1": "", "spotifynote1": "",
"spotifynote2": "ボタンから簡単にNowPlayingができます。", "spotifynote2": "ボタンから簡単にNowPlayingができます。",
"link": "アカウントの連携", "link": "アカウントの連携",
"linkwarn": "APIの性質上，thedesk.topへアクセスします。", "linkwarn": "APIの性質上，thedesk.topへアクセスします。",
"connect": "接続", "connect": "接続",
"disconnect": "切断", "disconnect": "切断",
"templeteedit": "テンプレートの編集", "templateedit": "テンプレートの編集",
"templeteeditwarn": "以下を編集してテンプレートを変更できます。", "templateeditwarn": "以下を編集してテンプレートを変更できます。",
"templete1": "Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL", "template1": "Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL",
"templete2": "macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}", "template2": "macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}",
"templete3": "Windows:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名", "template3": "",
"postartwork": "アルバムアートワークを添付する(Spotify/Windows)", "postartwork": "アルバムアートワークを添付する(Spotify)",
"tts": "読み上げの設定", "tts": "読み上げの設定",
"speed": "読み上げの速さ", "speed": "読み上げの速さ",
"speedwarn": "1-100まで、デフォルトは10。", "speedwarn": "1-100まで、デフォルトは10。",

33
app/view/make/setting.sample.html
View File

@ -332,39 +332,6 @@
<i class="fa fa-spotify"></i>@@spotify@@ <i class="fa fa-spotify"></i>@@spotify@@
</div> </div>
<div class="collapsible-body"> <div class="collapsible-body">
<h5>@@npProvider@@</h5>
@@npPeoviderWarn@@<br>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
value="ITUNES" />
<span>iTunes</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" />
<span>MediaMonkey</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
value="WINAMP" />
<span>Winamp</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span>
</label>
<br><br> <br><br>
@@spotifynote1@@<i class="material-icons" style="font-size:24px;">music_note</i>@@spotifynote2@@<br> @@spotifynote1@@<i class="material-icons" style="font-size:24px;">music_note</i>@@spotifynote2@@<br>
<h5>@@link@@</h5> <h5>@@link@@</h5>

3
app/view/ps/index.html
View File

@ -682,7 +682,8 @@
・一部master追従インスタンスでAPIが削除されたことに対する対応<br> ・一部master追従インスタンスでAPIが削除されたことに対する対応<br>
・アンケートの投票時のバグを修正<br> ・アンケートの投票時のバグを修正<br>
・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br> ・ストリーミング再接続機能をやめてカラムをリロードする機能を追加<br>
・カラムを追加, 削除するときに全体を再読込しないようになった ・カラムを追加, 削除するときに全体を再読込しないようになった<br>
・Windows向けNowPlayingを削除(実装的, ライセンス的問題です)
</div> </div>
<div id="release-en" style="display:none"> <div id="release-en" style="display:none">
<h5>Let's make it native!</h5> <h5>Let's make it native!</h5>

33
app/view/ps/setting.html
View File

@ -332,39 +332,6 @@
<i class="fa fa-spotify"></i>crwdns624:0crwdne624:0 <i class="fa fa-spotify"></i>crwdns624:0crwdne624:0
</div> </div>
<div class="collapsible-body"> <div class="collapsible-body">
<h5>crwdns2354:0crwdne2354:0</h5>
crwdns2356:0crwdne2356:0<br>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
value="ITUNES" />
<span>iTunes</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" />
<span>MediaMonkey</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
value="WINAMP" />
<span>Winamp</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span>
</label>
<br><br> <br><br>
crwdns625:0crwdne625:0<i class="material-icons" style="font-size:24px;">music_note</i>crwdns626:0crwdne626:0<br> crwdns625:0crwdne625:0<i class="material-icons" style="font-size:24px;">music_note</i>crwdns626:0crwdne626:0<br>
<h5>crwdns627:0crwdne627:0</h5> <h5>crwdns627:0crwdne627:0</h5>