Commit a72c1685 authored by David Byers's avatar David Byers
Browse files

Bug fixes and fixes to prioritize mode.

parent 96e76618
Wed May 1 11:34:02 1996 David Byers <davby@sen2.ida.liu.se>
* english-strings.el,swedish-strings.el (lyskom-strings): Lade till
newline i ngra strngar. Lade till ngra strngar, rttade andra.
* prioritize.el (kom-prioritize-help): Ny funktion
(lyskom-prioritize-mode): Bttre doc-strng
* english-strings.el, swedish-strings.el (lyskom-prioritize-mode-map):
Byggde om keymappen lite.
* lyskom-rest.el (lyskom-format-aux-help): Generera knappar fr ?M och
?P ven om argumentet inte r en conf-stat.
* lyskom-buttons.el (lyskom-default-button): Hantera knappskapande fr
mten och personer utan att ha hela conf-staten.
* cache.el (cache-construct-uconf-stat): Rttade en bug.
* komtypes.el (lyskom-uconf-stat-p): Lade till denna funktion.
(uconf-stat->garb-nice): Rttade en bug.
* english-strings.el, swedish-strings.el (lyskom-button-actions):
Kommenterade bort srbehandling av textnumret i inlggsfoten.
Mon Apr 29 09:24:16 1996 David Byers <davby@sen2.ida.liu.se>
* review-new.el (lyskom-get-texts-by): Fixade s inte information om
* review.el (lyskom-get-texts-by): Fixade s inte information om
hemliga texter returneras.
Mon Apr 29 02:26:14 1996 David Kgedal <davidk@lysator.liu.se>
......
......@@ -50,15 +50,18 @@ cache it."
(defun cache-construct-uconf-stat (conf)
"If conf is non-nil, create an uconf-stat from conf and cache it.
Return the new uconf-stat or nil"
(and conf
(cache-add-uconf-stat
(lyskom-create-uconf-stat (conf-stat->conf-no conf)
(conf-stat->name conf)
(conf-stat->conf-type conf)
(+
(conf-stat->first-local-no conf)
(conf-stat->no-of-texts conf))
(conf-stat->garb-nice conf)))))
(let ((tmp nil))
(and conf
(cache-add-uconf-stat
(setq tmp
(lyskom-create-uconf-stat (conf-stat->conf-no conf)
(conf-stat->name conf)
(conf-stat->conf-type conf)
(+
(conf-stat->first-local-no conf)
(conf-stat->no-of-texts conf))
(conf-stat->garb-nice conf)))))
tmp))
(defun cache-add-uconf-stat (uconf-stat)
"Insert a UCONF-STAT in the cache."
......
......@@ -360,7 +360,7 @@ and you have finished reading. Please come back later.
(memberships-line . "%16#1s %#2d\t%#3d\t%#4M\n")
(conf-for-status . "Get status of which conference: ")
(no-such-conf . "The conference doesn't exist.")
(no-such-conf . "The conference doesn't exist.\n")
(status-record . "Status of conference %#1M (%#2m) %#3s\n\n")
(Mailbox . "Mailbox")
(Protected . "Protected")
......@@ -389,7 +389,7 @@ and you have finished reading. Please come back later.
(secret-membership . "--- Secret line ---\n")
(conf-membership-line . "%#1s%#2M\n")
(pers-for-status . "Get status of which user: ")
(no-such-pers . "The user doesn't exist.")
(no-such-pers . "The user doesn't exist.\n")
(pers-status-record . "Status of user %#1P (%#2p)\n")
(created-time . "Created:%34#1s\n\n")
(created-confs . "Conferences created:%22#1d\n")
......@@ -1216,9 +1216,13 @@ Cf. paragraph-start.")
(define-key lyskom-prioritize-mode-map [down-mouse-3] 'kom-mouse-3)
(define-key lyskom-prioritize-mode-map [mouse-3] 'kom-mouse-null)
(define-key lyskom-prioritize-mode-map "*" 'kom-key-mouse-2)
(define-key lyskom-prioritize-mode-map "\C-m" 'kom-prioritize-select)
(define-key lyskom-prioritize-mode-map "\C-j" 'kom-prioritize-select)
(define-key lyskom-prioritize-mode-map "?" 'kom-prioritize-help)
(define-key lyskom-prioritize-mode-map "\C-k" 'kom-prioritize-select)
(define-key lyskom-prioritize-mode-map "\C-y" 'kom-prioritize-yank)
(define-key lyskom-prioritize-mode-map " " 'kom-prioritize-select)
(define-key lyskom-prioritize-mode-map "\C-m" 'kom-prioritize-next-line)
(define-key lyskom-prioritize-mode-map "\C-j" 'kom-prioritize-next-line)
(define-key lyskom-prioritize-mode-map "\C-?" 'kom-prioritize-previous-line)
(define-key lyskom-prioritize-mode-map [down] 'kom-prioritize-next-line)
(define-key lyskom-prioritize-mode-map "\C-n" 'kom-prioritize-next-line)
(define-key lyskom-prioritize-mode-map [up] 'kom-prioritize-previous-line)
......@@ -1237,7 +1241,7 @@ Cf. paragraph-start.")
(define-key lyskom-prioritize-mode-map "p" 'kom-prioritize-set-priority)
(define-key lyskom-prioritize-mode-map "s" 'kom-prioritize-save)
(define-key lyskom-prioritize-mode-map "q" 'kom-prioritize-quit)
(define-key lyskom-prioritize-mode-map "\C-y" 'kom-prioritize-yank))
)
(defvar lyskom-prioritize-header-lines 2
"Number of lines in the header of the prioritization buffer")
......@@ -1279,7 +1283,9 @@ This variable is stored in the LysKOM server.")
("Write personal reply" . lyskom-button-private-comment-text)
("Mark article" . lyskom-button-mark-text)
("Unmark article" . lyskom-button-unmark-text))
((nil lyskom-print-text footer lyskom-button-comment-text)))
nil
; ((nil lyskom-print-text footer lyskom-button-comment-text))
)
(conf
conf-text
lyskom-button-view-conf-presentation
......@@ -1293,8 +1299,7 @@ This variable is stored in the LysKOM server.")
(pers
pers-text
lyskom-button-view-pers-presentation
(("View presentation" .
lyskom-button-view-pers-presentation)
(("View presentation" . lyskom-button-view-pers-presentation)
("View user status" . lyskom-button-view-pers-status)
("Send letter" . lyskom-button-mail)
("Send personal message" . lyskom-button-send-message))
......
......@@ -125,13 +125,18 @@ CONF-NO is a conf-no and CONF-NO-LIST is a conf-no-list."
(defsubst uconf-stat->garb-nice (conf)
"Get garb-nice from a conference."
(elt (cd conf) 4))
(elt (cdr conf) 4))
;;; Modifiers
;;; You shouldn't need modifiers
;;; Predicate
(defsubst lyskom-uconf-stat-p (object)
"Return t if OBJECT is a conf-stat."
(eq (car-safe object) 'UCONF-STAT))
;;; ================================================================
;;; conf-stat
......
......@@ -337,7 +337,7 @@ type TYPE before being send to lyskom-generate-button."
(setq type 'pers))
(setq xarg (conf-stat->conf-no arg)
text (conf-stat->name arg)))
((numberp arg) (setq text ""))
((numberp arg) (setq text "" xarg arg))
(t (setq text "" xarg 0))))
((eq type 'pers)
(cond ((lyskom-conf-stat-p arg)
......@@ -346,7 +346,7 @@ type TYPE before being send to lyskom-generate-button."
((lyskom-pers-stat-p arg)
(setq xarg (pers-stat->pers-no arg)
text ""))
((numberp arg) (setq text ""))
((numberp arg) (setq text "" xarg arg))
(t (setq text "" xarg 0))))
((eq type 'text)
(cond ((stringp arg) (setq xarg (string-to-number arg)
......
No preview for this file type
......@@ -273,6 +273,11 @@
;;; User commands
;;;
(defun kom-prioritize-help ()
"Get brief help on prioritize mode."
(interactive)
(lyskom-message "%s" (lyskom-get-string 'prioritize-help)))
(defun kom-prioritize-select (&optional arg)
"Select the record on the line containing point.
If ARG is null, toggle selection. Positive arg means always select and
......@@ -681,12 +686,15 @@ of conferences you are a member of."
"\\<lyskom-prioritize-mode-map>Mode for prioritizing conferences in LysKOM.
Commands:
\\[kom-prioritize-move-up]\tMove conference on current line one line up.
\\[kom-prioritize-move-down]\tMove conference on current line one line down.
\\[kom-prioritize-set-priority]\tAlter the priority of the conference.
\\[kom-prioritize-save]\tSave changes to priorities.
\\[kom-prioritize-move-up]\tMove conference on current line up one line.
\\[kom-prioritize-move-down]\tMove conference on current line down one line.
\\[kom-prioritize-yank]\tMove all selected conferences to near the current line.
\\[kom-prioritize-select]\tToggle selection of the conference on the current line.
\\[kom-prioritize-goto-priority]\tMove cursor to an entry with a certain priority.
\\[kom-prioritize-set-priority]\tAlter the priority of the selected conferences.
\\[kom-prioritize-repriorize]\tChange one priority to another.
\\[kom-prioritize-quit]\tReturn to LysKOM.
\\[kom-prioritize-save]\tSave changes to priorities.
\\[kom-prioritize-quit]\tSave changes and return to LysKOM.
All bindings:
\\{lyskom-prioritize-mode-map}
......
......@@ -358,7 +358,7 @@ du har l\344st klart allting. Kom tillbaks senare.
(memberships-header . "Senast inne Prio Ol\344sta M\366tesnamn\n")
(memberships-line . "%16#1s %#2d\t%#3d\t%#4M\n")
(conf-for-status . "Vilket m\366te vill du se statusen f\366r? ")
(no-such-conf . "M\366tet finns ej.")
(no-such-conf . "M\366tet finns ej.\n")
(status-record . "Status f\366r m\366te %#1M (%#2m) %#3s\n\n")
(Mailbox . "Brevl\345da")
(Protected . "Skyddat")
......@@ -387,7 +387,7 @@ du har l\344st klart allting. Kom tillbaks senare.
(secret-membership . "*** Hemlig rad ***\n")
(conf-membership-line . "%#1s%#2M\n")
(pers-for-status . "Vem vill du se statusen f\366r? ")
(no-such-pers . "Det finns ingen s\345dan person.")
(no-such-pers . "Det finns ingen s\345dan person.\n")
(pers-status-record . "Status f\366r person %#1P (%#2p)\n")
(created-time . "Skapad:%34#1s\n\n")
(created-confs . "Skapade m\366ten:%27#1d\n")
......@@ -687,6 +687,8 @@ Gruppmeddelande till %#3M fr\345n %#2P (%#4s):
(cannot-get-membership . "Kan ej h\344mta medlemsskap f\366r dig.")
(cannot-get-pers-stat . "Kan ej h\344mta personstatus f\366r dig.")
(prioritize-help .
"u,n Flytta mte, SPC markera, p prioritera markerade, q avsluta, C-h m hjlp")
(your-priorities . " Prioritet M\366tesnamn
----------------------------------------------------------------------------
")
......@@ -826,7 +828,8 @@ Felmeddelande: %#1s**************************************************")
(filter-edit-save-p . "Spara f\366r\344ndringar? ")
(filter-edit-remove-empty . "Tomma filter g\366r att alla texter filtreras. Vill du ta bort dessa? ")
(filter-edit-restart-p . "Du har gjort \344ndringar. Vill du verkligen b\366rja om? ")
(filter-edit-help . "p Upp, n Ned, i Ny rad, M-i Nytt filter, d Radera rad, M-d Radera filter")
(filter-edit-help .
"p,n Upp/ned, i/M-i Ny rad/filter, d/M-d Radera rad/filter, C-h m Mer hj\344lp")
(filter-edit-header . "\304ndra filter f\366r \"%s\"\n")
(filter-edit-saving . "Sparar \344ndringarna...")
(filter-edit-saving-done . "Sparar \344ndringarna...klart")
......@@ -1275,11 +1278,15 @@ Cf. paragraph-start.")
(define-key lyskom-prioritize-mode-map [down-mouse-3] 'kom-mouse-3)
(define-key lyskom-prioritize-mode-map [mouse-3] 'kom-mouse-null)
(define-key lyskom-prioritize-mode-map "*" 'kom-key-mouse-2)
(define-key lyskom-prioritize-mode-map "\C-m" 'kom-prioritize-select)
(define-key lyskom-prioritize-mode-map "\C-j" 'kom-prioritize-select)
(define-key lyskom-prioritize-mode-map "?" 'kom-prioritize-help)
(define-key lyskom-prioritize-mode-map "\C-k" 'kom-prioritize-select)
(define-key lyskom-prioritize-mode-map "\C-y" 'kom-prioritize-yank)
(define-key lyskom-prioritize-mode-map " " 'kom-prioritize-select)
(define-key lyskom-prioritize-mode-map "\C-m" 'kom-prioritize-next-line)
(define-key lyskom-prioritize-mode-map "\C-j" 'kom-prioritize-next-line)
(define-key lyskom-prioritize-mode-map [down] 'kom-prioritize-next-line)
(define-key lyskom-prioritize-mode-map "n" 'kom-prioritize-next-line)
(define-key lyskom-prioritize-mode-map "\C-n" 'kom-prioritize-next-line)
(define-key lyskom-prioritize-mode-map "\C-?" 'kom-prioritize-previous-line)
(define-key lyskom-prioritize-mode-map [up] 'kom-prioritize-previous-line)
(define-key lyskom-prioritize-mode-map "\C-p" 'kom-prioritize-previous-line)
(define-key lyskom-prioritize-mode-map "p" 'kom-prioritize-previous-line)
......@@ -1296,7 +1303,7 @@ Cf. paragraph-start.")
(define-key lyskom-prioritize-mode-map "p" 'kom-prioritize-set-priority)
(define-key lyskom-prioritize-mode-map "s" 'kom-prioritize-save)
(define-key lyskom-prioritize-mode-map "q" 'kom-prioritize-quit)
(define-key lyskom-prioritize-mode-map "\C-y" 'kom-prioritize-yank))
)
(defvar lyskom-prioritize-header-lines 2
......@@ -1342,7 +1349,9 @@ This variable is stored in the LysKOM server.")
("Personligt svar" . lyskom-button-private-comment-text)
("Markera texten" . lyskom-button-mark-text)
("Avmarkera texten" . lyskom-button-unmark-text))
((nil lyskom-print-text footer lyskom-button-comment-text)))
nil
; ((nil lyskom-print-text footer lyskom-button-comment-text))
)
(conf
conf-text
lyskom-button-view-conf-presentation
......
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