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

TheDesk Mizuki (ver.6)

Browse Source
This commit is contained in:
cutls 2018-04-16 22:58:14 +09:00
parent 8902ef55c1
commit 223296a4cd
18 changed files with 177 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LATEST.md
View File

@ -1,16 +1,18 @@
## For Astarte(kirishima.cloud), My Primary Instance ## For Astarte(kirishima.cloud), My Primary Instance
TheDesk :thedesk: Mizuki (ver.5[fixed]) TheDesk :thedesk: Mizuki (ver.6)
・画像添付時のバグを修正 ・リストに関するバグを修正
・ユーザーデータの表示に関するバグを修正 ・サポートインスタンスに関する修正
・カラーテーマ追加
ほか ほか
https://thedesk.top https://thedesk.top
:github: https://github.com/cutls/TheDesk #Desk #DeskUpdate :github: https://github.com/cutls/TheDesk #Desk #DeskUpdate
## For Other Instances ## For Other Instances
PCクライアントTheDesk :thedesk: Mizuki (ver.5[fixed]) PCクライアントTheDesk :thedesk: Mizuki (ver.6)
・画像添付時のバグを修正 ・リストに関するバグを修正
・ユーザーデータの表示に関するバグを修正 ・サポートインスタンスに関する修正
・カラーテーマ追加
TheDeskはマルチカラム，マルチアカウントはもちろんのこと，なにかとマストドンライフをシンプルに効率化するクライアントです。 TheDeskはマルチカラム，マルチアカウントはもちろんのこと，なにかとマストドンライフをシンプルに効率化するクライアントです。
https://thedesk.top https://thedesk.top

3
README.md
View File

@ -26,6 +26,9 @@ app:Raw files(you can download to modify or check)
app:そのままのファイル。ダウンロード→テスト用 app:そのままのファイル。ダウンロード→テスト用
desk.icns: If you build yourself on macOS, you can use this .icns file as icon.
desk.icns: macOS向けアイコン。セルフビルドにどうぞ。
## Language/言語 ## Language/言語
Japanese Japanese

46
app/css/master.css
View File

@ -200,14 +200,50 @@ blockquote:before, .quote:before {
.blacktheme #imagemodal,.blacktheme #videomodal,.blacktheme #tootmodal { .blacktheme #imagemodal,.blacktheme #videomodal,.blacktheme #tootmodal {
background-color: black; background-color: black;
} }
.blacktheme .collapsible-header { .blacktheme .collapsible-header,.blacktheme .tabs,.blacktheme #pip {
background-color: #212121; background-color: #212121;
} }
.blacktheme .tabs { /*indigo theme*/
background-color: #212121; .indigotheme body {
color: white;
background-color: #031833;
} }
.blacktheme #pip { .indigotheme #drag {
background-color: #212121; color: white;
background-color: rgba(0, 0, 0, 0.8);
position: fixed;
width: 100vw;
height: 100vh;
z-index: 99999;
justify-content: center;
align-items: center;
}
.indigotheme #imagemodal,.indigotheme #videomodal,.indigotheme #tootmodal {
background-color: #0d1351;
}
.indigotheme .collapsible-header,.indigotheme .tabs,.indigotheme #pip {
background-color: #0d1351;
}
/*brown theme*/
.browntheme body {
color: white;
background-color: #261411;
}
.browntheme #drag {
color: white;
background-color: rgba(0, 0, 0, 0.8);
position: fixed;
width: 100vw;
height: 100vh;
z-index: 99999;
justify-content: center;
align-items: center;
}
.browntheme #imagemodal,.browntheme #videomodal,.browntheme #tootmodal {
background-color: #261411;
}
.browntheme .collapsible-header,.browntheme .tabs,.browntheme #pip {
background-color: #4e342e;
} }
/*スクロールバー*/ /*スクロールバー*/

21
app/css/post.css
View File

@ -57,7 +57,6 @@
height: calc(100% - 190px); height: calc(100% - 190px);
overflow-y: scroll; overflow-y: scroll;
} }
.emoji-control {}
#preview-field { #preview-field {
display: none; display: none;
} }
@ -65,11 +64,25 @@
color:white; color:white;
margin-right:2px; margin-right:2px;
} }
.character-counter{
position: relative;
top: -25px;
}
/*black theme*/ /*black theme*/
.blacktheme #post-box { .blacktheme #post-box {
background-color: #424242; background-color: #424242;
} }
/*indigo theme*/
.indigotheme #post-box {
background-color: #1a237e ;
}
/*brown theme*/
.browntheme #post-box {
background-color: #4e342e;
}
/*
.blacktheme #drag { .blacktheme #drag {
width: 100%; width: 100%;
height: 100px; height: 100px;
@ -77,10 +90,8 @@
color: white; color: white;
padding: 3px; padding: 3px;
} }
.character-counter{ */
position: relative;
top: -25px;
}
/*mini*/ /*mini*/
.mini-post .mize{ .mini-post .mize{

44
app/css/tl.css
View File

@ -309,30 +309,50 @@ p:not(:last-child){
} }
/*black theme*/ /*black theme*/
.blacktheme .notf-box { .blacktheme .notf-box,.blacktheme .modal-footer,.blacktheme #sidebar {
background-color: #424242; background-color: #424242;
} }
.blacktheme .modal-footer { .blacktheme .btn-flat,.blacktheme .mention ,.blacktheme #sidebar a {
background-color: #424242;
}
.blacktheme .btn-flat {
color: white color: white
} }
.blacktheme .shared { .blacktheme .shared {
background-color: #004d40; background-color: #004d40;
} }
.blacktheme .mention {
color: white;
}
.blacktheme .notice-box { .blacktheme .notice-box {
background-color: #333333; background-color: #333333;
} }
.blacktheme .emphasized { .blacktheme .emphasized {
background-color: #4e342e; background-color: #4e342e;
} }
.blacktheme #sidebar{ /*indigo theme*/
background-color: #424242; .indigotheme .notf-box,.indigotheme .modal-footer,.indigotheme #sidebar {
background-color: #0d1351;
} }
.blacktheme #sidebar a{ .indigotheme .btn-flat,.indigotheme .mention ,.indigotheme #sidebar a {
color:white; color: white
}
.indigotheme .shared {
background-color: #004d40;
}
.indigotheme .notice-box {
background-color: #0d47a1;
}
.indigotheme .emphasized {
background-color: #4e342e;
}
/*brown theme*/
.browntheme .notf-box,.browntheme .modal-footer,.browntheme #sidebar {
background-color: #4e342e;
}
.browntheme .btn-flat,.browntheme .mention ,.browntheme #sidebar a {
color: white
}
.browntheme .shared {
background-color: #004d40;
}
.browntheme .notice-box {
background-color: #4e342e;
}
.browntheme .emphasized {
background-color: #0d47a1;
} }

14
app/css/userdata.css
View File

@ -41,4 +41,18 @@
} }
.blacktheme .active-back{ .blacktheme .active-back{
background-color:#757575; background-color:#757575;
}
/*indigo theme*/
.indigotheme #his-data-show {
background-color: rgba(13, 19, 81,0.8);
}
.indigotheme .active-back{
background-color:#757575;
}
/*brown theme*/
.browntheme #his-data-show {
background-color: rgba(62, 39, 35,0.8);
}
.browntheme .active-back{
background-color:#757575;
} }

BIN
app/desk.icns Normal file
View File

Binary file not shown.

2
app/index.html
View File

@ -26,7 +26,7 @@
<script type="text/javascript" src="./js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="./js/ui/jquery-ui.min.js"></script>
<script> <script>
//必ずアプデ時のremove instance消して！ //必ずアプデ時のremove instance消して！
var ver="Mizuki (ver.5[fixed])"; var ver="Mizuki (ver.6)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//var ver="beta"; //var ver="beta";
var acct_id=0; var acct_id=0;

19
app/js/login/login.js
View File

@ -3,6 +3,7 @@
//アスタルテ判定初期化 //アスタルテ判定初期化
localStorage.removeItem("kirishima") localStorage.removeItem("kirishima")
localStorage.removeItem("imas")
localStorage.removeItem("image"); localStorage.removeItem("image");
var idata={ var idata={
"kirishima.cloud":"instance", "kirishima.cloud":"instance",
@ -12,7 +13,7 @@ var idata={
"kirishima.cloud_markdown":"disabled", "kirishima.cloud_markdown":"disabled",
"minohdon.jp":"instance", "minohdon.jp":"instance",
"minohdon.jp_name":"箕面丼", "minohdon.jp_name":"箕面丼",
"minohdon.jp_letters":"5000", "minohdon.jp_letters":"500",
"minohdon.jp_bbcode":"disabled", "minohdon.jp_bbcode":"disabled",
"minohdon.jp_markdown":"disabled", "minohdon.jp_markdown":"disabled",
"knzk.me":"instance", "knzk.me":"instance",
@ -64,7 +65,7 @@ var idata={
"mstdn.kemono-friends.info_public":"ジャパリパーク", "mstdn.kemono-friends.info_public":"ジャパリパーク",
"itabashi.0j0.jp":"instance", "itabashi.0j0.jp":"instance",
"itabashi.0j0.jp_name":"板橋丼", "itabashi.0j0.jp_name":"板橋丼",
"itabashi.0j0.jp_letters":"500", "itabashi.0j0.jp_letters":"1024",
"itabashi.0j0.jp_bbcode":"disabled", "itabashi.0j0.jp_bbcode":"disabled",
"itabashi.0j0.jp_markdown":"disabled", "itabashi.0j0.jp_markdown":"disabled",
}; };
@ -306,6 +307,8 @@ function ckdb(acct_id) {
if(domain=="kirishima.cloud"){ if(domain=="kirishima.cloud"){
localStorage.setItem("kirishima", "true"); localStorage.setItem("kirishima", "true");
$("#ranking-btn").show(); $("#ranking-btn").show();
}else if(domain=="imastodon.nat"){
localStorage.setItem("imas", "true");
} }
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem(domain + "_at");
var bbcode = domain + "_bbcode"; var bbcode = domain + "_bbcode";
@ -325,11 +328,7 @@ function ckdb(acct_id) {
$("[data-activates='bbcode']").addClass("disabled"); $("[data-activates='bbcode']").addClass("disabled");
$("[data-activates='bbcode']").addClass("disabled", true); $("[data-activates='bbcode']").addClass("disabled", true);
} }
if (json[letters]) {
if($("#textarea").attr("data-length")<json[letters]){
$("#textarea").attr("data-length", json[letters]);
}
} else {}
if (json[domain + "_markdown"] == "enabled") { if (json[domain + "_markdown"] == "enabled") {
localStorage.setItem("md_" + acct_id, "true"); localStorage.setItem("md_" + acct_id, "true");
$(".markdown").show(); $(".markdown").show();
@ -391,6 +390,12 @@ function multi() {
var list = key * 1 + 1; var list = key * 1 + 1;
if (key == last) { if (key == last) {
sel = "selected"; sel = "selected";
var domain = localStorage.getItem("domain_" + key);
if(idata[domain+"_letters"]){
$("#textarea").attr("data-length", idata[domain+"_letters"])
}else{
$("#textarea").attr("data-length", 500)
}
var profimg=localStorage.getItem("prof_"+key); var profimg=localStorage.getItem("prof_"+key);
var domain=localStorage.getItem("domain_"+key); var domain=localStorage.getItem("domain_"+key);
if(!profimg){ if(!profimg){

5
app/js/post/bb-md.js
View File

@ -28,6 +28,11 @@ function mdCheck(){
}else{ }else{
$("#faicon-btn").hide(); $("#faicon-btn").hide();
} }
if(idata[domain+"_letters"]){
$("#textarea").attr("data-length", idata[domain+"_letters"])
}else{
$("#textarea").attr("data-length", 500)
}
} }
//BOXのトグルボタン //BOXのトグルボタン
function mdToggle(){ function mdToggle(){

2
app/js/tl/parse.js
View File

@ -333,7 +333,7 @@ function parse(obj, mix, acct_id, tlid, popup) {
var vis = var vis =
'<i class="text-darken-3 material-icons blue-text vis-data pointer" title="未収載(クリックして本文コピー)" data-vis="unlisted" onclick="staCopy(\''+id+'\')">lock_open</i>'; '<i class="text-darken-3 material-icons blue-text vis-data pointer" title="未収載(クリックして本文コピー)" data-vis="unlisted" onclick="staCopy(\''+id+'\')">lock_open</i>';
var can_rt = ""; var can_rt = "";
} else if (visen == "plivate") { } else if (visen == "private") {
var vis = var vis =
'<i class="text-darken-3 material-icons orange-text vis-data pointer" title="非公開(クリックして本文コピー)" data-vis="private" onclick="staCopy(\''+id+'\')">lock</i>'; '<i class="text-darken-3 material-icons orange-text vis-data pointer" title="非公開(クリックして本文コピー)" data-vis="private" onclick="staCopy(\''+id+'\')">lock</i>';
var can_rt = "hide"; var can_rt = "hide";

2
app/js/tl/tl.js
View File

@ -198,6 +198,8 @@ function moreload(type, tlid) {
if(tag=="local"){ if(tag=="local"){
data=data+"&local=true"; data=data+"&local=true";
} }
}else if(type=="list"){
var data=obj[tlid].data;
} }
var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id"); var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id");
if (localStorage.getItem("morelock") != sid) { if (localStorage.getItem("morelock") != sid) {

2
app/js/ui/layout.js
View File

@ -103,7 +103,7 @@ function parseColumn() {
')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除"'+icnsert+'>cancel</i></a></div>'+ ')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除"'+icnsert+'>cancel</i></a></div>'+
'<div class="area-a3"><a onclick="setToggle(' + key + '<div class="area-a3"><a onclick="setToggle(' + key +
')" class="setting nex" title="このカラムの設定"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+ ')" class="setting nex" title="このカラムの設定"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
'<div class="hide notf-indv-box" id="notf-box_' + key + '<div class="hide notf-indv-box z-depth-4" id="notf-box_' + key +
'"><div id="notifications_' + key + '"><div id="notifications_' + key +
'" data-notf="' + acct.domain + '"></div></div><div class="hide notf-indv-box" id="util-box_' + key + '" data-notf="' + acct.domain + '"></div></div><div class="hide notf-indv-box" id="util-box_' + key +
'" style="padding:5px;"><a onclick="mediaToggle(' + key + '" style="padding:5px;"><a onclick="mediaToggle(' + key +

3
app/js/ui/settings.js
View File

@ -130,6 +130,9 @@ function settings() {
//読み込み時の設定ロード //読み込み時の設定ロード
function load() { function load() {
if(localStorage.getItem("kirishima")){
$(".imas").removeClass("hide");
}
var prof = localStorage.getItem("prof"); var prof = localStorage.getItem("prof");
$("#my-prof").attr("src", prof); $("#my-prof").attr("src", prof);
var datetype = localStorage.getItem("datetype"); var datetype = localStorage.getItem("datetype");

24
app/js/ui/theme.js
View File

@ -8,8 +8,30 @@ function themes(theme) {
} }
} }
if (theme == "black") { if (theme == "black") {
$("html").removeClass("indigotheme");
$("html").removeClass("greentheme");
$("html").removeClass("browntheme");
$("html").addClass("blacktheme"); $("html").addClass("blacktheme");
} else { } else if (theme == "indigo") {
$("html").removeClass("blacktheme");
$("html").removeClass("greentheme");
$("html").removeClass("browntheme");
$("html").addClass("indigotheme");
} else if (theme == "green") {
$("html").removeClass("indigotheme");
$("html").removeClass("greentheme");
$("html").removeClass("browntheme");
$("html").removeClass("blacktheme");
$("html").addClass("greentheme");
} else if (theme == "brown") {
$("html").removeClass("indigotheme");
$("html").removeClass("greentheme");
$("html").removeClass("blacktheme");
$("html").addClass("browntheme");
} else{
$("html").removeClass("indigotheme");
$("html").removeClass("greentheme");
$("html").removeClass("browntheme");
$("html").removeClass("blacktheme"); $("html").removeClass("blacktheme");
} }
} }

10
app/main.js
View File

@ -41,7 +41,6 @@ try {
height: 750 height: 750
}; // デフォルトバリュー }; // デフォルトバリュー
} }
// 全てのウィンドウが閉じたら終了 // 全てのウィンドウが閉じたら終了
app.on('window-all-closed', function() { app.on('window-all-closed', function() {
if (process.platform != 'darwin') { if (process.platform != 'darwin') {
@ -52,7 +51,14 @@ app.on('window-all-closed', function() {
function createWindow() { function createWindow() {
// メイン画面の表示。ウィンドウの幅、高さを指定できる // メイン画面の表示。ウィンドウの幅、高さを指定できる
mainWindow = new BrowserWindow(window_size); var platform=process.platform;
var bit=process.arch;
if(platform=="linux"){
var arg={width:window_size.width,height:window_size.height,icon: __dirname + '/thedesk.ico'}
}else{
var arg=window_size
}
mainWindow = new BrowserWindow(arg);
electron.session.defaultSession.clearCache(() => {}) electron.session.defaultSession.clearCache(() => {})
if(process.argv){ if(process.argv){
if(process.argv[1]){ if(process.argv[1]){

2
app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "TheDesk", "name": "TheDesk",
"version": "14.5.1", "version": "14.6.0",
"description": "TheDesk on Mastodonはシンプルと多機能を両立したデスクトップ向けクライアントです", "description": "TheDesk on Mastodonはシンプルと多機能を両立したデスクトップ向けクライアントです",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

8
app/setting.html
View File

@ -22,9 +22,13 @@
<div class="collapsible-body"> <div class="collapsible-body">
<h5>テーマの設定</h5> <h5>テーマの設定</h5>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" /> <input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
<label for="black">黒</label> <label for="black">Black</label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" /> <input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
<label for="white">白</label> <label for="white">White</label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
<br> <br>
<h5>新規通知のポップアップお知らせの表示秒数</h5>0に設定すると表示されません <h5>新規通知のポップアップお知らせの表示秒数</h5>0に設定すると表示されません
<br> <br>