cage/tinmop
1
0
Fork 0
mirror of https://codeberg.org/cage/tinmop/ synced 2025-02-22 08:57:37 +01:00
Code Issues

- improved appereance of gemini subscriptions window.

Browse Source
This commit is contained in:
cage 2022-07-21 17:25:37 +02:00
parent d45388e4dc
commit 6e883ca21b
4 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/default-theme.conf
View File

@ -611,6 +611,10 @@ gemini-subscription-window.input.selected.background = cyan
gemini-subscription-window.input.selected.foreground = black gemini-subscription-window.input.selected.foreground = black
gemini-subscription-window.uri.foreground = #ffac00
gemini-subscription-window.count.foreground = #ffac00
# gemini text table of contents window # gemini text table of contents window
gemini-toc-window.height = 1 gemini-toc-window.height = 1

40
src/gemini-subscription-window.lisp
View File

@ -39,19 +39,33 @@
object) object)
(defun gemlog->text (gemlog-db-row window) (defun gemlog->text (gemlog-db-row window)
(format nil (let ((unseen-count (db:row-unseen-count gemlog-db-row)))
"~a ~s ~a/~a" (reduce (lambda (a b) (cat-tui-string a b :color-attributes-contagion nil))
(tui:text-ellipsis (db:row-title gemlog-db-row) (list (make-tui-string (format nil
(truncate (/ (win-width window) " ~a/~a "
3))) unseen-count
(if (db:row-subtitle gemlog-db-row) (+ unseen-count
(tui:text-ellipsis (db:row-subtitle gemlog-db-row) (db:row-seen-count gemlog-db-row)))
(truncate (/ (win-width window) :fgcolor (when (> unseen-count 0)
3))) (swconf:gemini-subscription-count-fg)))
(_ "No subtitle")) (make-tui-string (format nil
(db:row-unseen-count gemlog-db-row) "~a"
(+ (db:row-unseen-count gemlog-db-row) (tui:text-ellipsis (db:row-url gemlog-db-row)
(db:row-seen-count gemlog-db-row)))) (truncate (* (win-width window)
1/3))))
:fgcolor (when (> unseen-count 0)
(swconf:gemini-subscription-url-fg)))
(make-tui-string (format nil
" ~a ~s"
(tui:text-ellipsis (db:row-title gemlog-db-row)
(truncate (* (win-width window)
1/3)))
(if (db:row-subtitle gemlog-db-row)
(tui:text-ellipsis (db:row-subtitle gemlog-db-row)
(truncate (* (win-width window)
1/3)))
(_ "No subtitle")))
:attributes (attribute-bold))))))
(defmethod resync-rows-db ((object gemini-subscription-window) (defmethod resync-rows-db ((object gemini-subscription-window)
&key &key

2
src/package.lisp
View File

@ -1218,6 +1218,8 @@
:gemini-h3-prefix :gemini-h3-prefix
:gemini-bullet-prefix :gemini-bullet-prefix
:gemini-preformatted-fg :gemini-preformatted-fg
:gemini-subscription-url-fg
:gemini-subscription-count-fg
:gemini-certificates-window-colors :gemini-certificates-window-colors
:gemini-toc-padding-char :gemini-toc-padding-char
:signature-file-path :signature-file-path

16
src/software-configuration.lisp
View File

@ -479,6 +479,7 @@
position position
exclusive exclusive
mode mode
count
toc toc
downloading downloading
animation animation
@ -494,6 +495,7 @@
padding padding
value value
scheme scheme
uri
link link
links links
http http
@ -776,6 +778,18 @@
+key-foreground+) +key-foreground+)
:white)) :white))
(defun gemini-subscription-url-fg ()
(access-non-null-conf-value *software-configuration*
+key-gemini-subscription-window+
+key-uri+
+key-foreground+))
(defun gemini-subscription-count-fg ()
(access-non-null-conf-value *software-configuration*
+key-gemini-subscription-window+
+key-count+
+key-foreground+))
(defun gemini-certificates-window-colors () (defun gemini-certificates-window-colors ()
"return three color values" "return three color values"
(values (access:accesses *software-configuration* (values (access:accesses *software-configuration*
@ -1464,6 +1478,8 @@
#'gemini-h2-prefix #'gemini-h2-prefix
#'gemini-h3-prefix #'gemini-h3-prefix
#'gemini-bullet-prefix #'gemini-bullet-prefix
#'gemini-subscription-url-fg
#'gemini-subscription-count-fg
#'signature-file-path #'signature-file-path
#'window-titles-ends #'window-titles-ends
#'tags-new-message-mark #'tags-new-message-mark