diff --git a/.vs/TheDesk/v15/.suo b/.vs/TheDesk/v15/.suo new file mode 100644 index 00000000..777c4860 Binary files /dev/null and b/.vs/TheDesk/v15/.suo differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 00000000..6b611411 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,6 @@ +{ + "ExpandedNodes": [ + "" + ], + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 00000000..61953a52 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/app/acct.html b/app/acct.html index 91f3e419..e254b30c 100644 --- a/app/acct.html +++ b/app/acct.html @@ -1,5 +1,5 @@ - + Account Manager - TheDesk @@ -27,26 +27,26 @@ body,html{overflow-y: scroll;} -戻る
-
アカウント一覧
+Back
+
List of accounts
-
アカウントを追加

+
Add an account

- Windows以外でご使用の方やPleromaにログインされる方はチェックを入れて下さい。
+ Check if TheDesk is not working on Windows, you want to login Pleroma instance.
-
+
-
+

@@ -55,19 +55,19 @@ body,html{overflow-y: scroll;}
-
メインアカウント
-
アカウントを選択 +
Main an account
+
Select an account
@@ -75,12 +75,12 @@ body,html{overflow-y: scroll;} Instance data by instances.social API

@
-ドメイン名:
-接続インスタンス数:
-トゥート数:
-ユーザー数:ユーザー数
-コネクション:%
-Mastodonバージョン:
+Domain:
+Federated instances:
+Toots:
+Users:Users
+Connection:%
+Mastodon version:
diff --git a/app/css/userdata.css b/app/css/userdata.css index 3b4f83fa..56913f9f 100644 --- a/app/css/userdata.css +++ b/app/css/userdata.css @@ -4,27 +4,67 @@ background-image: url('/img/loading.svg'); overflow-y: hidden; } +#his-name{ + font-size:1.5rem; +} #his-prof { float: left; width: 100px; + margin-right:5px; } .his-float { float: left; - width: calc(50% - 50px); - height: 122px; overflow-y: scroll; padding: 5px; } +#his-float-data{ + width: 400px; +} +#his-float-timeline{ + width: calc(100% - 400px); + height:100%; + overflow-y:hidden; +} +#his-basic-prof{ + min-height:130px; +} +#his-matching-list{ + overflow-y: scroll; + overflow-x: hidden; +} +#his-field{ + vertical-align: baseline; + text-align:center; + padding:0; +} +#his-field tr{ + height:1.5rem; +} +.his-field-title{ + height:1.5rem; padding:0; background-color:#757575; text-align:center; + padding:5px; + margin-bottom:1px; +} +.his-field-content{ + height:1.5rem; padding:0; padding-left:5px; +} +#his-data a span.ellipsis:after{ + content:"..."; +} +#his-data a:not(.mention) span:last-of-type{ + display:none; +} #his-data-show { - margin: 50px; + margin: 20px; background-color:var(--his-data); - width: calc(100% - 50px); - height: calc(100% - 50px); + width: calc(100% - 20px); + height: calc(100% - 20px); margin-bottom: 0; padding: 5px; } .tab-content { overflow-y: scroll; + overflow-x: hidden; height: calc(100% - 240px) } .my-data-width { @@ -36,3 +76,12 @@ #his-name .emojione,#his-name .emoji-img{ width: 20px; } +#his-plus-action .btn{ + width:170px +} +.custom-tabs{ + display:flex; +} +.custom-tabs .custom-tab a{ + padding: 8px 12px; +} \ No newline at end of file diff --git a/app/index.html b/app/index.html index 65e7a91e..49b2c49d 100644 --- a/app/index.html +++ b/app/index.html @@ -1,5 +1,810 @@ - - \ No newline at end of file + TheDesk + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
Drag here to upload +
+ +
+
+
+
+ +
+ +
+ + + +
+
+ +
+ + cancel + + +
+
+
+format_bold +format_italic +format_underlined +strikethrough_s +format_quote +short_text +code +format_list_bulleted +format_list_numbered + + +autorenew +flare +swap_vert +swap_horiz + +Markdownエディタを隠す + +
+format_size +px +color_lens + +
+link +  + +
+image +  + +
+
+
+
+
+ +Edit + +
+
+ + + +
+ +Preview + + +Markdownエディタを表示 + + +
+
+ visibility_off + public + CW + photo_library + format_shapes + tag_faces + music_note + clear +
+
+
+ +Reply: +No/Attaching files: +None/Adjust status privacy: +public + +
+ +
+
+ + + + + + +
+
+ +
+
+ +
+ + Refresh emojis list + cancel +
+
+ +
+
+
+ + / + + +
+ +
+ + + + + + + + + + + +
+ chevron_right  + expand_less  + close +
+
+
+ +
+
Select an account +
+ + +
+
+
+ + +
+
Show this TL: + +
+
+ +
+
+
+ +
+
+ +
+search + + + +
+
+
+ +
+ +
+
    +
    + + +
    +
    + +
    +
    + + +
    +
    + +
    +

    +
    +
    + + +
    + +
    +
    + + +
    +
    + +
    +
    + +
    + Filter contexts
    + + + + + + + +
    + Options
    + +
    + Nice for Latin language
    + +
    + Filtered toots will disappear irreversibly, even if filter is later removed
    + Expire afterUnset or "0" means "Never"This value may contain some error

    + days + hours + minutes +
    + Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words. +
    +
    + +
    +

    Welcome to TheDesk


    Add an account or click add to add a column. +
    +
    +
    + +
    + +
    + + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/index.sample.html b/app/index.sample.html index dd856859..f660c3ed 100644 --- a/app/index.sample.html +++ b/app/index.sample.html @@ -307,173 +307,172 @@ var lang="{{lang}}";
    + + '; }); + $("#his-matching-list").css("height",$("#his-float-data").height()-$("#his-basic-prof").height()-$("#his-des").height()-$("#his-plus-action").height()+"px"); $("#his-matching-list-contents").html(templete); }); } diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js index 0d91ab94..b64f6c6c 100644 --- a/app/js/userdata/showOnTL.js +++ b/app/js/userdata/showOnTL.js @@ -123,15 +123,16 @@ function udg(user, acct_id) { $("#his-follow").text(json.following_count); $("#his-follower").text(json.followers_count); $("#his-since").text(crat(json.created_at)); + $("#his-openin").attr("data-href", json.url); var note=json.note; if(json.fields){ if(json.fields.length>0){ - var note=json.note+'My Fields
    ' + var note=json.note+'
    ' for(var i=0;i'; + note=note+''; } note=note+'
    '+fname+''+fval+'
    '+fname+''+fval+'
    ' $("#his-des").html(twemoji.parse(note)); @@ -145,6 +146,7 @@ function udg(user, acct_id) { $("#his-bot").html(lang_showontl_botacct[lang]); } $('#his-data').css('background-size', 'cover'); + $("#his-data .tab-content").css("height",$("#his-float-timeline").height()-70+"px") localStorage.setItem("history" , user); //自分の時 if (json.acct == localStorage.getItem("user_"+acct_id)) { @@ -371,10 +373,22 @@ function relations(user, acct_id) { }else{ $("#his-domain-btn").text(lang_showontl_domain[lang]+lang_status_block[lang]); } + //Endorsed + if(json.endorsed){ + $("#his-end-btn").addClass("endorsed"); + $("#his-end-btn").text(lang_status_unendorse[lang]) + }else{ + $("#his-end-btn").removeClass("endorsed"); + $("#his-end-btn").text(lang_status_endorse[lang]) + } }); } - +function profbrws(){ + const {shell} = require('electron'); + var url=$("#his-openin").attr("data-href") + shell.openExternal(url); +} //オールリセット function hisclose() { $('#his-data').modal('close'); @@ -402,6 +416,7 @@ function reset(){ $("#his-data").removeClass("blocking"); $("#his-data").removeClass("mutingNotf"); $("#his-data").removeClass("blockingDom"); + $("#his-end-btn").removeClass("endorsed"); $("#his-bot").html(""); $("#his-follow-btn").show(); $("#his-block-btn").show(); @@ -425,6 +440,8 @@ function reset(){ $("#his-f2-name").val(""); $("#his-f2-val").val(""); $("#his-f3-name").val(""); $("#his-f3-val").val(""); $("#his-f4-name").val(""); $("#his-f4-val").val(""); + $("#his-endorse").html(""); + $("#his-openin").attr("data-href", ""); } $('#my-data-nav .custom-tab').on('click',function(){ var target=$(this).find("a").attr("go"); diff --git a/app/language/index.en.json b/app/language/index.en.json index 843c8c8f..4d4477c0 100644 --- a/app/language/index.en.json +++ b/app/language/index.en.json @@ -68,6 +68,8 @@ "editProf":"Edit profile", "followReq":"Follow requests", "likeHimOrHer":"Resembling", + "endorse":"Feature on profile", + "openinbrowser":"Open in browser", "frc":"Suggest", "more":"More", "revoverJP":" to ", diff --git a/app/language/index.ja.json b/app/language/index.ja.json index fbe24cfd..2590f2c1 100644 --- a/app/language/index.ja.json +++ b/app/language/index.ja.json @@ -70,6 +70,8 @@ "likeHimOrHer":"似てる", "frc":"おすすめ", "more":"もっと", + "endorse":"紹介する", + "openinbrowser":"ブラウザで開く", "revoverJP":"する", "warnUseOtherAcct":"(解除はできません。)", "revoverJPde":"で", diff --git a/app/package.json b/app/package.json index 77354889..4ea2ccb0 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "16.0.11", + "version": "16.0.13", "description": "TheDesk is a Mastodon client for PC.", "main": "main.js", "scripts": { diff --git a/app/setting.html b/app/setting.html index b349543e..03d4b0ab 100644 --- a/app/setting.html +++ b/app/setting.html @@ -1,5 +1,5 @@ - + Settings - TheDesk @@ -15,20 +15,20 @@ - -

    設定

    + +

    Preferences


    -undo戻る +undoBack
    -
    キーボードショートカット一覧 -
  • Ctrl+1-9:1番目~9番目のTLにスクロール
  • -
  • N:投稿パネルを開く
  • -
  • X:投稿パネルを開閉
  • -
  • Ctrl+Enter:投稿
  • -
  • Ctrl+E:全ての通知を既読にする
  • -
  • Esc:投稿パネルを消す
  • -
  • F5:スーパーリロード
  • -
  • Ctrl+Shift+C:入力内容を消す
  • -
  • Ctrl+Shift+S:設定
  • -
  • Ctrl+Shift+M:アカウントマネージャ
  • +
    Keyboard shortcuts +
  • Ctrl+1-9:Jump to n(1-9)th column
  • +
  • N:Open toot box
  • +
  • X:Toggle toot box
  • +
  • Ctrl+Enter:Post
  • +
  • Ctrl+E:Make all notifications read
  • +
  • Esc:Hide toot box
  • +
  • F5:Super Reload
  • +
  • Ctrl+Shift+C:Clear toot box
  • +
  • Ctrl+Shift+S:Preferences
  • +
  • Ctrl+Shift+M:Account Manager
  • Ctrl+Shift+N:NowPlaying(Spotify)
  • -
  • Ctrl+Shift+P:現在選択中のプロフィール
  • -
  • ←/→:イメージビューワー起動時に画像切り替え
  • -
  • マウスホイール:イメージビューワー時に拡大縮小
  • +
  • Ctrl+Shift+P:Show profile of selecting
  • +
  • ←/→:Show next or previous image
  • +
  • Mousewheel:Zoom a image
  • 以下Markdownに対応したインスタンスのみ。
    @@ -350,17 +350,17 @@ アスタルテ暇人ランキングを開く
    -

    - -web公式HP -trending_up支援(Enty) -listヘルプ/Docs(Constructing) +

    + +webWebsite +trending_upSupport(Enty) +listHelp/Docs(Constructing) GitHub Developer: Cutls@kirishima.cloud -寿司を投げる +Give me a sushi!
    -アップデートを確認
    -OSS License(オープンソースライセンス)
    +Check update
    +OSS License
    Copyright © TheDesk 2018 All Rights Reserved. TheDesk LICENSE (Latest Ver.)
    Developer: Cutls P( diff --git a/app/update.html b/app/update.html index 04d4f5bd..95af5324 100644 --- a/app/update.html +++ b/app/update.html @@ -65,30 +65,30 @@ a,button,input,label,i{

    TheDesk

    -

    アップデートがあります

    +

    Get latest TheDesk



    - +
    Options:
    - -
    + +
    -
    +
    - 問題が発生しますか?
    公式HPからダウンロードをお試しください。 + Some problems?
    Please download on Oficial HP.
    -

    アップデートは必ず行ってください

    - アップデートをスキップする
    +

    You may lose a cool experience!

    + Skip this update
    - アップデートを続行 + Continue updating
    -

    ダウンロード中

    +

    Downloading...