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

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

@@ -32,7 +32,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script>
var ver="Miria (17.0.1) beta4";
var ver="Miria (17.0.1)";
//betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta";

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

@@ -30,7 +30,7 @@
</div>
<div class="collapsible-body">
<h5>言語</h5>
<a onclick="changelang('ja')" class="pointer">日本語</a>/<a onclick="changelang('en')" class="pointer">English</a>/<a onclick="changelang('ps')" class="pointer">Crowdin In-context translation(beta)</a>
<a href="../ja/setting.html">日本語(Japanese)</a>/<a href="../en/setting.html">English</a>/<a href="../ps/setting.html">Crowdin web translate</a>/
<h5>設定のインポートとエクスポート</h5>
<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">エクスポート</button>
<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">インポート</button>
@@ -64,6 +64,10 @@
<input type="text" style="width:50px" id="width">px以上
<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
<br>
<h5>TweetDeckの固定幅</h5>
<input type="text" style="width:50px" id="fixwidth">px以上
<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
<br>
<h5>フォント</h5>
「選択」を押してフォントを選んでください。<br>
<button class="btn waves-effect" style="width:100px;" onclick="font()">選択</button><br>

69
app/view/ja/update.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>アップデートがあります</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;">開始</button>
<div id="checkbox">
Options:<br>
<input type="checkbox" class="filled-in" id="portable" value="true" />
<label for="portable">ポータブル版</label><br>
<input type="checkbox" class="filled-in" id="rewrite" value="true" />
<label for="rewrite">上書きしない</label><br>
</div>
<button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">インストーラー版(推奨)</button>
<button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">ポータブル版</button>
<button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">開始</button>
<button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">開始</button>
<br>
問題が発生しますか？<br><a href="https://thedesk.top">公式HP</a>からダウンロードをお試しください。
</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(){