Commit 94491426 authored by David Kågedal's avatar David Kågedal
Browse files

Några små ändringar

parent 4bc47083
Sun May 26 03:01:01 1996 David Kgedal <davidk@lysator.liu.se>
* swedish-strings.el (lyskom-strings): La in en radbrytning i
message-from-to.
* english-strings.el (lyskom-strings): Dito.
Fri May 24 03:24:37 1996 David Kgedal <davidk@lysator.liu.se>
* commands2.el (kom-send-message): Skriv ut vart meddelandet
skickas.
Wed May 22 06:27:46 1996 David Kgedal <davidk@lysator.liu.se>
* commands2.el (lyskom-update-lyskom-buffer-list): Satte in nya
buffertar p fel stlle ibland.
Tue May 21 23:45:56 1996 David Kgedal <davidk@lysator.liu.se>
* commands2.el (kom-status-conf): Frga om medlemslistan ska vara
snabb eller fullstndig (ungefr).
* swedish-strings.el (lyskom-strings): La till strngen
show-membership-info-q.
Mon May 20 11:29:39 1996 David Kgedal <davidk@lysator.liu.se>
* commands2.el: En bunt ndringar frn Bellman.
......
......@@ -39,6 +39,9 @@ Buggar
Allmänna förbättringar
Definiera faces när man startar klienten istället för när den
laddas.
Inläggsnumren borde vara mer kontextkänsliga. Om man klickar på
ett inläggs eget nummer, alltså det som står precis innan datumet
och det som står inom parentesen precis efter inläggstexten, så
......
......@@ -135,17 +135,18 @@ otherwise: the conference is read with lyskom-completing-read."
conf-stat
(cond
((or box ori pro sec)
(concat "("
(if box (lyskom-get-string 'Mailbox) "")
(if (and box (or sec ori pro)) ", " "")
(if sec (lyskom-get-string
'Protected) "")
(if (and sec (or ori pro)) ", " "")
(if ori (lyskom-get-string
'no-comments) "")
(if (and ori pro) ", " "")
(if pro (lyskom-get-string 'closed) "")
")"))
(concat
"("
(if box (lyskom-get-string 'Mailbox) "")
(if (and box (or sec ori pro)) ", " "")
(if sec (lyskom-get-string
'Protected) "")
(if (and sec (or ori pro)) ", " "")
(if ori (lyskom-get-string
'no-comments) "")
(if (and ori pro) ", " "")
(if pro (lyskom-get-string 'closed) "")
")"))
(t ""))))
(let ((creator (conf-stat->creator conf-stat)))
(lyskom-format-insert 'created-by
......@@ -206,40 +207,50 @@ otherwise: the conference is read with lyskom-completing-read."
;; Show all members of CONF-STAT if the user so wishes."
(lyskom-scroll)
(if (null (lyskom-j-or-n-p
(lyskom-get-string 'show-members-list-also-q)))
nil
(let ((member-list (blocking-do 'get-members
(conf-stat->conf-no conf-stat)
0 lyskom-max-int)))
(lyskom-format-insert 'conf-has-these-members
conf-stat)
(lyskom-insert-string 'member-list-header)
(lyskom-traverse
member (conf-no-list->conf-nos member-list)
(let ((membership (blocking-do 'query-read-texts
member
(conf-stat->conf-no conf-stat))))
;; Print a row describing the membership of MEMBER
;; (described by MEMBERSHIP) in CONF-STAT.
(if (or (null membership))
(lyskom-insert-string 'secret-membership)
(lyskom-insert
(format "%17s"
(lyskom-return-date-and-time
(membership->last-time-read membership))))
(let ((unread (- (+ (conf-stat->first-local-no conf-stat)
(conf-stat->no-of-texts conf-stat))
(membership->last-text-read membership)
(length (membership->read-texts
membership))
1)))
(lyskom-format-insert 'conf-membership-line
(if (zerop unread)
" "
(format "%7d " unread))
member))))))))))
(if (lyskom-j-or-n-p
(lyskom-get-string 'show-members-list-also-q))
(let ((member-list (blocking-do 'get-members
(conf-stat->conf-no conf-stat)
0 lyskom-max-int)))
(lyskom-format-insert 'conf-has-these-members
conf-stat)
(if (lyskom-j-or-n-p (lyskom-get-string 'show-membership-info-q))
(progn
(lyskom-insert-string 'member-list-header)
(lyskom-traverse
member (conf-no-list->conf-nos member-list)
(let ((membership (blocking-do
'query-read-texts
member
(conf-stat->conf-no conf-stat))))
;; Print a row describing the membership of MEMBER
;; (described by MEMBERSHIP) in CONF-STAT.
(if (or (null membership))
(lyskom-insert-string 'secret-membership)
(lyskom-insert
(format "%17s"
(lyskom-return-date-and-time
(membership->last-time-read membership))))
(let ((unread (- (+ (conf-stat->first-local-no
conf-stat)
(conf-stat->no-of-texts conf-stat))
(membership->last-text-read membership)
(length (membership->read-texts
membership))
1)))
(lyskom-format-insert 'conf-membership-line
(if (zerop unread)
" "
(format "%7d " unread))
member))))))
;; Don't show membership info
(lyskom-insert "\n")
(lyskom-traverse
member (conf-no-list->conf-nos member-list)
(lyskom-format-insert " %#1P\n" member))))))))
;;; ================================================================
......@@ -308,7 +319,7 @@ otherwise: the conference is read with lyskom-completing-read."
(pers-stat->read-texts pers-stat))
(if (= (pers-stat->pers-no pers-stat) lyskom-pers-no)
(lyskom-format-insert 'marked-texts
(pers-stat->no-of-marks pers-stat)))
(pers-stat->no-of-marks pers-stat)))
(lyskom-format-insert 'time-for-last-letter
(lyskom-return-date-and-time
(conf-stat->last-written conf-stat)))
......@@ -344,52 +355,50 @@ otherwise: the conference is read with lyskom-completing-read."
(conf-stat->conf-no conf-stat)))
(lyskom-count-var 0))
;; "Receive an array of memberships and print them using
;; lyskom-status-pers-5.
(if (null membership-list)
(lyskom-format-insert 'not-allowed-see-confs conf-stat)
(lyskom-format-insert 'is-member-of conf-stat)
(lyskom-insert-string 'membership-list-header)
(setq lyskom-count-var 0)
(lyskom-traverse
membership membership-list
(let ((cs (cache-get-conf-stat
(membership->conf-no membership))))
(and cs
(lyskom-time-greater
(membership->last-time-read membership)
(conf-stat->last-written conf-stat))
(cache-del-conf-stat (membership->conf-no membership))))
membership membership-list
(let ((cs (cache-get-conf-stat
(membership->conf-no membership))))
(and cs
(lyskom-time-greater
(membership->last-time-read membership)
(conf-stat->last-written conf-stat))
(cache-del-conf-stat (membership->conf-no membership))))
;; "Print a row describing the membership of
;; MEMBER-CONF-STAT
(let ((member-conf-stat
(blocking-do 'get-conf-stat
(membership->conf-no membership))))
(if (or (null member-conf-stat)
(null membership))
(lyskom-insert-string 'secret-membership)
(lyskom-insert
(format "%17s"
(lyskom-return-date-and-time
(membership->last-time-read membership))))
(let ((unread (- (+ (conf-stat->first-local-no
member-conf-stat)
(conf-stat->no-of-texts
member-conf-stat))
(membership->last-text-read membership)
(length (membership->read-texts
membership))
1)))
(lyskom-format-insert
'pers-membership-line
(if (zerop unread) " " (format "%6d " unread))
(if (= (conf-stat->conf-no conf-stat)
(conf-stat->supervisor member-conf-stat))
(lyskom-get-string 'is-supervisor-mark)
" ")
member-conf-stat)
(setq lyskom-count-var (+ lyskom-count-var unread)))))))
;; "Print a row describing the membership of
;; MEMBER-CONF-STAT
(let ((member-conf-stat
(blocking-do 'get-conf-stat
(membership->conf-no membership))))
(if (or (null member-conf-stat)
(null membership))
(lyskom-insert-string 'secret-membership)
(lyskom-insert
(format "%17s"
(lyskom-return-date-and-time
(membership->last-time-read membership))))
(let ((unread (- (+ (conf-stat->first-local-no
member-conf-stat)
(conf-stat->no-of-texts
member-conf-stat))
(membership->last-text-read membership)
(length (membership->read-texts
membership))
1)))
(lyskom-format-insert
'pers-membership-line
(if (zerop unread) " " (format "%6d " unread))
(if (= (conf-stat->conf-no conf-stat)
(conf-stat->supervisor member-conf-stat))
(lyskom-get-string 'is-supervisor-mark)
" ")
member-conf-stat)
(setq lyskom-count-var (+ lyskom-count-var unread)))))))
;; "Print the total number of unread texts for the person CONF-STAT."
(lyskom-format-insert 'his-total-unread
......@@ -409,31 +418,33 @@ otherwise: the conference is read with lyskom-completing-read."
(def-kom-command kom-send-message (&optional who message)
"Send a message to one of the users in KOM right now."
(interactive)
(lyskom-send-message
(or who
(lyskom-read-conf-no
(format (lyskom-get-string 'who-to-send-message-to)
(lyskom-get-string 'everybody))
'all t
;; Initial string:
(cond
((eq kom-default-message-recipient 'everybody) nil)
((and (eq kom-default-message-recipient 'group)
lyskom-last-group-message-recipient)
(cons lyskom-last-group-message-recipient 0))
((or (and (eq kom-default-message-recipient 'group)
(null lyskom-last-group-message-recipient))
(and (eq kom-default-message-recipient 'sender)
lyskom-last-personal-message-sender))
(cons lyskom-last-personal-message-sender 0))
(t
(if lyskom-last-personal-message-sender
(cons lyskom-last-personal-message-sender 0)
""))) t))
message))
(let ((target (or who
(lyskom-read-conf-no
(format (lyskom-get-string 'who-to-send-message-to)
(lyskom-get-string 'everybody))
'all t
;; Initial string:
(cond
((eq kom-default-message-recipient 'everybody) nil)
((and (eq kom-default-message-recipient 'group)
lyskom-last-group-message-recipient)
(cons lyskom-last-group-message-recipient 0))
((or (and (eq kom-default-message-recipient 'group)
(null lyskom-last-group-message-recipient))
(and (eq kom-default-message-recipient 'sender)
lyskom-last-personal-message-sender))
(cons lyskom-last-personal-message-sender 0))
(t
(if lyskom-last-personal-message-sender
(cons lyskom-last-personal-message-sender 0)
""))) t))))
(if (zerop target)
(lyskom-insert 'message-all-info)
(lyskom-format-insert 'message-recipient-info target))
(lyskom-send-message target message)))
(def-kom-command kom-send-alarm (&optional message)
......@@ -1278,9 +1289,13 @@ membership info."
(if (and (lyskom-buffer-p buf)
(not (memq buf lyskom-buffer-list)))
;; This is a LysKOM buffer that we haven't seen yet --
;; add it to the end of lyskom-buffer-list.
(setq lyskom-buffer-list
(nconc lyskom-buffer-list (list buf))))))
;; If it is the current buffer, add it at the start
;; of lyskom-buffer-list, otherwise add it to the end
(if (eq buf (current-buffer))
(setq lyskom-buffer-list (cons buf
lyskom-buffer-list))
(setq lyskom-buffer-list
(nconc lyskom-buffer-list (list buf)))))))
(buffer-list))
(mapcar (function
(lambda (buf)
......
......@@ -394,6 +394,7 @@ Read all about it at http://www.lysator.liu.se/history/")
(Everybody . "Everyone")
(show-members-list-also-q . "List members? ")
(show-membership-info-q . "Show number of unreads? ")
(conf-has-these-members . "\n%#1M has the following members:\n")
(member-list-header . "Last entered Unread Name\n\n")
(secret-membership . "--- Secret line ---\n")
......@@ -442,6 +443,8 @@ Your public message:
%#1t
----------------------------------------------------------------
")
(message-all-info . "Send public message\n")
(message-recipient-info . "Send message to %#1M\n")
(message-nope .
"Unable to send the message. Perhaps the recipient isn't logged on.
The message you were sending to %#1M was:
......@@ -668,7 +671,7 @@ Personal message from %#1P (%#3s):
")
(message-from-to .
"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Group message to %#3M from %#2P (%#4s):
Group message to %#3M\nfrom %#2P (%#4s):
%#1t
----------------------------------------------------------------
......
......@@ -396,6 +396,7 @@ i svensk datorhistoria. L\344s mer p
(Everybody . "Alla")
(show-members-list-also-q . "Vill du se medlemslistan ocks\345? ")
(show-membership-info-q . "Visa antalet olsta? ")
(conf-has-these-members . "\n%#1M har f\366ljande medlemmar:\n")
(member-list-header . "Senast inne Osett Namn\n\n")
(secret-membership . "*** Hemlig rad ***\n")
......@@ -444,6 +445,8 @@ Ditt allm\344nna meddelande l\366d:
%#1t
----------------------------------------------------------------
")
(message-all-info . "S\344nd allm\345nt meddelande\n")
(message-recipient-info . "S\344nd meddelande till %#1M\n")
(message-nope .
"Du kunde inte skicka meddelandet. Mottagaren var kanske inte inloggad.
Meddelandet du f\366rs\366kte s\344nda till %#1M var:
......@@ -683,7 +686,7 @@ Personligt meddelande fr\345n %#1P (%#3s):
")
(message-from-to .
"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Gruppmeddelande till %#3M fr\345n %#2P (%#4s):
Gruppmeddelande till %#3M\nfr\345n %#2P (%#4s):
%#1t
----------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment