From fdc6ec906cf3c8ea153df12efb0bd63725485dbd Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 16 Mar 2019 00:29:54 +0900 Subject: [PATCH] =?UTF-8?q?=E9=80=94=E4=B8=AD=E3=81=A7=E3=83=97=E3=83=AB?= =?UTF-8?q?=E3=83=AA=E3=82=AF=E3=82=92=E5=87=A6=E7=90=86=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/css/master.css | 36 +++++++++++-- app/css/tl.css | 2 + app/js/common/version.js | 13 +++-- app/js/ui/img.js | 78 +++++++++------------------- app/js/ui/layout.js | 7 +++ app/main.js | 2 +- app/view/en/index.html | 31 +++++------ app/view/ja/index.html | 31 +++++------ app/view/make/index.sample.html | 29 ++++++----- app/view/make/language/index.en.json | 7 +-- app/view/make/language/index.ja.json | 5 +- app/view/ps/index.html | 31 +++++------ 12 files changed, 146 insertions(+), 126 deletions(-) diff --git a/app/css/master.css b/app/css/master.css index 66977556..9b193194 100644 --- a/app/css/master.css +++ b/app/css/master.css @@ -52,6 +52,7 @@ option { } #imagemodal .modal-content { overflow: hidden; + padding:0; } #imagemodal .modal-footer{ overflow-x:scroll; @@ -309,7 +310,7 @@ blockquote:before, .quote:before { position:fixed; z-index:9999; background-color: var(--box); - width:520px; + width:540px; top:calc(50% - 150px); left:calc(50% - 250px); padding: 5px; @@ -341,12 +342,41 @@ blockquote:before, .quote:before { background-color: var(--emphasized); } #right-menu{ - width:350px; - max-height:325px; + width:380px; + max-height:375px; overflow-y:scroll; overflow-x:hidden; padding:5px; } +#tltype{ + display:flex; + flex-wrap: wrap; + +} +#tltype .type{ + display:flex; + flex-wrap: wrap; + align-items:center; + width:170px; + height:40px; + cursor:pointer; +} +#tltype .type:hover { + background-color: var(--beforehover); +} +#tltype .active{ + background-color: var(--emphasized); +} +#tltype i{ + font-size:30px; +} +#tltype i.sub-icon{ + font-size: 20px; + position: relative; + color: var(--beforehover); + left: -15px; + +} .drag-bar{ cursor:move; text-align:center; diff --git a/app/css/tl.css b/app/css/tl.css index aa536ece..891fe985 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -488,6 +488,7 @@ p:not(:last-child){ .votebtn:hover{ background-color:var(--color); } + @keyframes fadeInDown { from { opacity: 0; @@ -523,3 +524,4 @@ p:not(:last-child){ animation-duration: 0.1s; animation-name: fadeInDown; } + diff --git a/app/js/common/version.js b/app/js/common/version.js index 4a7dccc2..409a4411 100644 --- a/app/js/common/version.js +++ b/app/js/common/version.js @@ -1,5 +1,6 @@ //バージョンチェッカー -function verck(ver,winstore) { +function verck(ver) { + console.log("Welcome") if(localStorage.getItem("ver")!=ver){ localStorage.setItem("ver", ver); console.log("Thank you for your update"); @@ -27,7 +28,6 @@ function verck(ver,winstore) { message: lang.lang_version_platform, buttons: [lang.lang_no,lang.lang_yesno] } - console.log(localStorage.getItem("winstore")) if(!localStorage.getItem("winstore")){ dialog.showMessageBox(options, function(arg) { @@ -42,7 +42,6 @@ function verck(ver,winstore) { if(localStorage.getItem("winstore")=="unix"){ localStorage.removeItem("winstore") } - console.log(localStorage.getItem("winstore")) if(!localStorage.getItem("winstore")){ const options = { type: 'info', @@ -61,6 +60,11 @@ function verck(ver,winstore) { }else{ localStorage.setItem("winstore","unix") } + if(localStorage.getItem("winstore")=="snapcraft" || localStorage.getItem("winstore")=="winstore"){ + var winstore=true; + }else{ + var winstore=false; + } var l = 5; // 生成する文字列に含める文字セット var c = "abcdefghijklmnopqrstuvwxyz0123456789"; @@ -90,7 +94,7 @@ function verck(ver,winstore) { } if (newest == ver) { todo(lang.lang_version_usever.replace("{{ver}}" ,mess.desk)); - //betaかWInstoreならアプデチェックしない + //betaかWinstoreならアプデチェックしない } else if (ver.indexOf("beta")!=-1 || winstore) { }else{ @@ -100,6 +104,7 @@ function verck(ver,winstore) { var ipc = electron.ipcRenderer; ipc.send('update', "true"); }else{ + console.log(lang.lang_version_skipver); todo(lang.lang_version_skipver); } }else{ diff --git a/app/js/ui/img.js b/app/js/ui/img.js index 50f90f37..88d0e8f2 100644 --- a/app/js/ui/img.js +++ b/app/js/ui/img.js @@ -10,6 +10,7 @@ function imgv(id, key, acct_id) { $("#imagemodal").attr("data-acct",acct_id); $(document).ready(function() { if (type == "image") { + $('#imagemodal').modal('open'); xhr = new XMLHttpRequest; xhr.open('GET', murl, true); xhr.addEventListener('progress', function (event) { @@ -29,7 +30,6 @@ function imgv(id, key, acct_id) { xhr.send(); $('#imgmodal').attr('src', murl); $('#imagewrap').dragScroll(); // ドラッグスクロール設定 - $('#imagemodal').modal('open'); $('#imgmodal').show(); $('#imagemodal').attr('data-key', key); $('#imagemodal').attr('data-id', id); @@ -45,61 +45,31 @@ function imgv(id, key, acct_id) { var height = element.naturalHeight; var windowH = $(window).height(); var windowW = $(window).width(); - //小さい画像 - if(width<(windowW - 50) && height<(windowH-1000)){ - $("#imgmodal").css('height',height+"px"); - $("#imgmodal").css('width',width+"px"); - $("#imagewrap").css('height',height+"px"); - $("#imagemodal").css('height',height+100+"px"); - $("#imagewrap").css('width',width+"px"); - $("#imagemodal").css('width',width+"px"); - $("#imagemodal").css('margin-top',(windowH /2) - (height / 2) +"px"); - }else{ - $("#imagemodal").css('margin-top',0); - var aspect = width/height; - if (aspect < 2.8 && aspect > 0.3){ - //moderate - if(windowW > windowH){ - //画面が横長(縦幅基準) - $("#imgmodal").css('height',windowH/1.2-70+"px"); - var imgW = (windowH/1.2-70)/height*width; - $("#imgmodal").css('width',imgW+"px"); - $("#imagewrap").css('height',windowH/1.2-60+"px"); - $("#imagemodal").css('height',windowH/1.2+"px"); - $("#imagewrap").css('width',imgW+50+"px"); - $("#imagemodal").css('width',imgW+50+"px"); - }else{ - //画面が縦長・正方形(横幅基準) - $("#imgmodal").css('width',windowW/1.2-30+"px"); - var imgH = (windowW/1.2-30)/width*height; - $("#imgmodal").css('height',imgH+"px"); - $("#imagewrap").css('width',windowW/1.2+"px"); - $("#imagemodal").css('width',windowW/1.2+"px"); - $("#imagewrap").css('height',imgH+60+"px"); - $("#imagemodal").css('height',imgH+120+"px"); - } + $("#imagemodal").css("bottom","0") + $("#imagemodal img").css("width","auto") + if(heightwindowW*0.8){ + $("#imagemodal").css("width","80vw") + $("#imagemodal img").css("width","100%") + var heightS=windowW*0.8/width*height; + $("#imagemodal").css("height",heightS+60+"px") }else{ - //極端な画像 - if(height > width){ - //縦長 - $("#imgmodal").css('height',windowH-60+"px"); - var imgW = (windowH-50)/height*width; - $("#imgmodal").css('width',imgW+"px"); - $("#imagewrap").css('height',windowH-50+"px"); - $("#imagemodal").css('height',windowH+"px"); - $("#imagewrap").css('width',imgW+50+"px"); - $("#imagemodal").css('width',imgW+50+"px"); - }else{ - //横長・正方形 - $("#imgmodal").css('width',windowW-30+"px"); - var imgH = (windowW-50)/width*height; - $("#imgmodal").css('height',imgH+"px"); - $("#imagewrap").css('width',windowW+"px"); - $("#imagemodal").css('width',windowW+"px"); - $("#imagewrap").css('height',imgH+60+"px"); - $("#imagemodal").css('height',imgH+120+"px"); - } + $("#imagemodal").css("width",width+"px") } + }else{ + console.log("long") + $("#imagemodal img").css("width","auto") + var widthS=windowH/height*width; + if(widthS
@@ -643,6 +642,7 @@ var tlid=0;
view_headlineList
filter_listFilter
help_outlineHelp
+
infoAbout TheDesk
@@ -654,18 +654,19 @@ var tlid=0;
- - + + Show this TL: +
+
people_outline
Local
+
people_outlineperm_media
Local(Media)
+
home
Home
+
language
Federated
+
languageperm_media
Federated(Media)
+
mail_outline
Direct Message
+
merge_type
Integrated(Local/Home)
+
merge_typereply
LTL+Reply+BT
+
notifications
Notifications
+
Show this TL: diff --git a/app/view/ja/index.html b/app/view/ja/index.html index 1ff5fd1b..0a3141d1 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -32,15 +32,14 @@
@@ -643,6 +642,7 @@ var tlid=0;
view_headlineリスト
filter_listフィルター
help_outlineヘルプ
+
infoこのソフトについて
@@ -654,18 +654,19 @@ var tlid=0;
- - + + 表示するタイムライン +
+
people_outline
ローカル
+
people_outlineperm_media
ローカル(メディア)
+
home
ホーム
+
language
連合
+
languageperm_media
連合(メディア)
+
mail_outline
ダイレクトメッセージ
+
merge_type
統合(ローカルとホーム)
+
merge_typereply
統合(LTL+BT+返信)
+
notifications
通知
+
表示するタイムライン diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 28a9b2a4..3fd064e9 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -37,10 +37,9 @@ var ver="{{versionLetter}}"; //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //var ver="beta"; //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除 -var winstore=false; var acct_id=0; var tlid=0; - verck(ver,winstore); + verck(ver);
@@ -643,6 +642,7 @@ var tlid=0;
view_headline{{list}}
filter_list{{filter}}
help_outline{{help}}
+
info{{about}}
@@ -654,18 +654,19 @@ var tlid=0;
- - + + {{showThisTL}} +
+
people_outline
{{local}}
+
people_outlineperm_media
{{localMedia}}
+
home
{{home}}
+
language
{{fed}}
+
languageperm_media
{{fedMedia}}
+
mail_outline
{{dm}}
+
merge_type
{{integratedTLDes}}
+
merge_typereply
{{localPlusDes}}
+
notifications
{{notf}}
+
{{showThisTL}} diff --git a/app/view/make/language/index.en.json b/app/view/make/language/index.en.json index 9c3a7b07..aa7bf93f 100644 --- a/app/view/make/language/index.en.json +++ b/app/view/make/language/index.en.json @@ -115,8 +115,8 @@ "fed":"Federated", "fedMedia":"Federated(Media)", "dm":"Direct Message", - "integratedTLDes":"Integrated(Local and Home)", - "localPlusDes":"Integrated(Local and replies and BT on Home)", + "integratedTLDes":"Integrated(Local/Home)", + "localPlusDes":"LTL+Reply+BT", "notf":"Notifications", "showThisTL":"Show this TL:", "webviewWarn":"TweetDeck with customed TJDeck(Code/TJDeck). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.", @@ -154,5 +154,6 @@ "clockTips":"Clock", "ramTips":"RAM status", "changeTips":"Change Tips", - "help":"Help" + "help":"Help", + "about":"About TheDesk" } \ No newline at end of file diff --git a/app/view/make/language/index.ja.json b/app/view/make/language/index.ja.json index 5092ea9b..7f57fe9d 100644 --- a/app/view/make/language/index.ja.json +++ b/app/view/make/language/index.ja.json @@ -116,7 +116,7 @@ "fedMedia":"連合(メディア)", "dm":"ダイレクトメッセージ", "integratedTLDes":"統合(ローカルとホーム)", - "localPlusDes":"統合(ローカルとブースト・リプライ)", + "localPlusDes":"統合(LTL+BT+返信)", "notf":"通知", "showThisTL":"表示するタイムライン", "webviewWarn":"TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(Code/TJDeck)。キーボードショートカットが邪魔をするので、文字入力時はカラムの「WebView優先」にチェックを入れてください。", @@ -154,5 +154,6 @@ "clockTips":"時計", "ramTips":"システムメモリ容量", "changeTips":"Tips変更", - "help":"ヘルプ" + "help":"ヘルプ", + "about":"このソフトについて" } \ No newline at end of file diff --git a/app/view/ps/index.html b/app/view/ps/index.html index e4f60ec4..ca567c11 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -32,15 +32,14 @@
@@ -643,6 +642,7 @@ var tlid=0;
view_headlinecrwdns444:0crwdne444:0
filter_listcrwdns515:0crwdne515:0
help_outlinecrwdns1894:0crwdne1894:0
+
info{{about}}
@@ -654,18 +654,19 @@ var tlid=0;
- - + + crwdns489:0crwdne489:0 +
+
people_outline
crwdns480:0crwdne480:0
+
people_outlineperm_media
crwdns481:0crwdne481:0
+
home
crwdns482:0crwdne482:0
+
language
crwdns483:0crwdne483:0
+
languageperm_media
crwdns484:0crwdne484:0
+
mail_outline
crwdns485:0crwdne485:0
+
merge_type
crwdns486:0crwdne486:0
+
merge_typereply
crwdns487:0crwdne487:0
+
notifications
crwdns488:0crwdne488:0
+
crwdns489:0crwdne489:0