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

TheDesk Miria (17.0.1)

Browse Source
This commit is contained in:
Cutls
2019-02-27 01:51:37 +09:00
parent 3c00ff5695
commit 4d5916b595
26 changed files with 1237 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -559,7 +559,10 @@ var tlid=0;
バグ修正<br>
(Mastodon 2.7)<b>時間指定投稿が利用できます。</b><br>
(Mastodon 2.7)<b>「インスタンス」を「サーバー」に変更</b><br>
CW付きのトゥートの再編集に対応<br>
インストール場所が指定できるように<br>
トゥートのコピペができない不具合を修正<br>
TweetDeckの横幅だけ広げられる機能
</div>
<br><br>
<h3>{{supportme}}</h3>

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

@@ -17,8 +17,10 @@
"nativenotf":"Native notification",
"nnwarn":"This does not work on Windows Portable ver.",
"nntest":"Notification test",
"minwidth":"Minimam width of columns",
"minwidth":"Minimum width of columns",
"minwidthwarn":"Scroll bar will be shown when your window size is more than ammounts of columns.",
"fixwidth":"Minimum width of TweetDeck browser",
"fixwidthwarn":"",
"above":"above",
"font":"Font",
"fontwarn":"Select your favorite font to 'Select'",

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

@@ -19,6 +19,8 @@
"nntest":"通知テスト",
"minwidth":"マルチカラムの最低横幅",
"minwidthwarn":"画面全体の横幅÷コラム数がこの値を超えた時、横スクロールとなります。",
"fixwidth":"TweetDeckの限定の最低横幅",
"fixwidthwarn":"",
"above":"以上",
"font":"フォント",
"fontwarn":"「選択」を押してフォントを選んでください。",

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

@@ -2,7 +2,7 @@
"updatehere":"Get latest TheDesk",
"download":"Start",
"portable":"Portable ver.",
"winzip":"Durling unzippng, TheDesk may freeze. It takes several seconds.",
"installer":"Installer ver.",
"unrewrite":"Not rewrite",
"sureupd":"You may lose a cool experience!",
"skipupd":"Skip this update",

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

@@ -2,7 +2,7 @@
"updatehere":"アップデートがあります",
"download":"開始",
"portable":"ポータブル版",
"unrewrite":"上書きしない",
"installer":"インストーラー版(推奨)",
"sureupd":"アップデートは必ず行ってください",
"skipupd":"アップデートをスキップする",
"nexttl":"次回TL表示時まで",

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

@@ -64,6 +64,10 @@
<input type="text" style="width:50px" id="width">px{{above}}
<button class="btn waves-effect" style="width:100px;" onclick="settings()">{{set}}</button>
<br>
<h5>{{fixwidth}}</h5>{{fixwidthwarn}}
<input type="text" style="width:50px" id="fixwidth">px{{above}}
<button class="btn waves-effect" style="width:100px;" onclick="settings()">{{set}}</button>
<br>
<h5>{{font}}</h5>
{{fontwarn}}<br>
<button class="btn waves-effect" style="width:100px;" onclick="font()">{{select}}</button><br>

69
app/view/make/update.sample.html
View File

@@ -62,6 +62,9 @@ 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>
@@ -75,14 +78,11 @@ a,button,input,label,i{
<p>{{updatehere}}</p>
<span id="now"></span>→<b id="ver"></b><br>
<span id="det"></span><br>
<button id="update" class="waves-effect btn" onclick="update('true')" style="margin-left:15px;">{{download}}</button>
<div id="checkbox">
Options:<br>
<input type="checkbox" class="filled-in" id="portable" value="true" />
<label for="portable">{{portable}}</label><br>
<input type="checkbox" class="filled-in" id="rewrite" value="true" />
<label for="rewrite">{{unrewrite}}</label><br>
</div>
<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>
<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>
<br>
{{problem1}}<br>{{problem2}}
</div>
<div id="skipper" class="hide">
@@ -123,17 +123,34 @@ function update(sel){
$("#dlnow").toggleClass("hide");
$("#dlnow").toggleClass("show");
$("#prog").text("");
if($('#rewrite:checked').val()=="true"){
var versioning=true;
}else{
var versioning=false;
}
if($('#portable:checked').val()=="true"){
var zip=true;
}else{
var zip=false;
}
ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
var remote=electron.remote;
var bit=process.arch;
var start="https://thedesk.top/ver.json";
fetch(start, {
method: 'GET',
headers: {'content-type': 'application/json'},
}).then(function(response) {
return response.json();
}).catch(function(error) {
todo(error);
console.error(error);
}).then(function(json) {
if(sel=="installer"){
if(bit=="64"){
var url=json["winx64"];
}else if(bit=="32"){
var url=json["winia32"];
}
}else if(sel=="portable"){
if(bit=="64"){
var url=json["winx64p"];
}else if(bit=="32"){
var url=json["winia32p"];
}
}
ipc.send('download-btn', url);
});
}
function quit(){
ipc.send('quit', 'go');
@@ -149,9 +166,14 @@ ipc.on('mess', function (event, arg) {
})
function verck(){
var remote=electron.remote;
var platform=remote.process.platform;
if(platform!="win32"){
$('#portable').prop("disabled",true)
var platform=remote.process.platform;
var bit=process.arch;
if(platform=="linux"){
$('.windows').hide()
$('.linux').show()
}else if(platform=="mac"){
$('.windows').hide()
$('.mac').show()
}
var start="https://thedesk.top/ver.json";
fetch(start, {
@@ -167,7 +189,8 @@ function verck(){
$("#ver").text(json.desk);
localStorage.setItem("next-ver",json.desk);
$("#det").html(json.detail);
$("#now").text(localStorage.getItem("ver"));
$("#now").text(localStorage.getItem("ver"));
});
}
function nextv(){