Commit 649d873f authored by David Byers's avatar David Byers
Browse files

More commands in menus

Better reporting in kom-change-parenthesis
Review command fail more gracefully
Increase field length for conference numbers in lyskom-list-conf-print
parent d5d321b0
2002-10-16 David Byers <david.byers@swipnet.se>
* menus.el (lyskom-menu-template): Applied patch from Per Starbäck
to add more commands to the menus.
* commands1.el (kom-change-parenthesis): Print error message if
name contains more than one parenthesis.
2002-09-21 David Byers <david.byers@swipnet.se>
Make review commands fail more gracefully:
* review.el (lyskom-cant-review-error): Set error-message
property.
(lyskom-review-error): Set error-conditions property.
2002-09-20 David Byers <david.byers@swipnet.se>
More fixes for bug 619:
* commands1.el (lyskom-list-conf-print): Increased field length
for conference number.
2002-10-13 Per Cederqvist <ceder@ceder.dyndns.org>
* distribution-README.end: Added two missing quote characters.
......@@ -10,6 +31,7 @@
"triangle".
(lyskom-fill-message): Updated for the above change.
>>>>>>> 44.630
2002-09-19 David Byers <davby@metzengerstein.dyndns.org>
* Release of 0.47.1-BETA-2
......
......@@ -1786,7 +1786,7 @@ Those that you are not a member in will be marked with an asterisk."
(defun lyskom-list-conf-print (conf-z)
"Print a line of info about CONF-NO.
If you are not member in the conference it will be flagged with an asterisk."
(lyskom-format-insert "%[%#1@%4#2:m %#3c %#2M%]\n"
(lyskom-format-insert "%[%#1@%5#2:m %#3c %#2M%]\n"
(lyskom-default-button 'conf (conf-z-info->conf-no conf-z))
conf-z
(lyskom-list-conf-membership-char (conf-z-info->conf-no conf-z))))
......@@ -1960,22 +1960,25 @@ If it is 'conf, only conferences will be listed."
t)))
(if (null conf-stat)
(lyskom-insert-string 'no-such-conf-or-pers)
(if (string-match "^\\(.*\\)(\\(.*\\))\\(.*\\)$" (conf-stat->name conf-stat))
(let* ((pre-paren (match-string 1 (conf-stat->name conf-stat)))
(post-paren (match-string 3 (conf-stat->name conf-stat)))
(old-paren (match-string 2 (conf-stat->name conf-stat)))
(paren (lyskom-read-string (lyskom-get-string 'new-paren)
old-paren))
(name (concat pre-paren "(" paren ")" post-paren)))
(if (blocking-do 'change-name (conf-stat->conf-no conf-stat) name)
(progn
(lyskom-format-insert 'change-name-done name
(lyskom-default-button 'conf conf-stat))
(cache-del-conf-stat (conf-stat->conf-no conf-stat)))
(lyskom-format-insert 'change-name-nope name
(lyskom-get-error-text lyskom-errno)
lyskom-errno)))
(lyskom-insert-string 'no-paren-in-name)))))
(cond
((string-match ".*(.*).*(.*)" (conf-stat->name conf-stat))
(lyskom-insert-string 'too-many-parens-in-name))
((string-match "^\\(.*\\)(\\(.*\\))\\(.*\\)$" (conf-stat->name conf-stat))
(let* ((pre-paren (match-string 1 (conf-stat->name conf-stat)))
(post-paren (match-string 3 (conf-stat->name conf-stat)))
(old-paren (match-string 2 (conf-stat->name conf-stat)))
(paren (lyskom-read-string (lyskom-get-string 'new-paren)
old-paren))
(name (concat pre-paren "(" paren ")" post-paren)))
(if (blocking-do 'change-name (conf-stat->conf-no conf-stat) name)
(progn
(lyskom-format-insert 'change-name-done name
(lyskom-default-button 'conf conf-stat))
(cache-del-conf-stat (conf-stat->conf-no conf-stat)))
(lyskom-format-insert 'change-name-nope name
(lyskom-get-error-text lyskom-errno)
lyskom-errno))))
(t (lyskom-insert-string 'no-paren-in-name))))))
......
......@@ -413,6 +413,7 @@ and you have finished reading. Please come back later.
(no-such-conf-or-pers . "The conference or user doesn't exist.\n")
(new-name . "New name: ")
(new-paren . "New parenthesis: ")
(too-many-parens-in-name . "Multiple parentheses in name. Use \"Change name\" instead.\n")
(no-paren-in-name . "The name doesn't contain a parenthesis.\n")
(who-to-change-supervisor-for . "Change supervisor of whom/what? ")
(new-supervisor . "New supervisor: ")
......
......@@ -175,7 +175,11 @@ The text to add is passed in TEXT-NO"
(def-kom-command kom-review-faq (&optional conf-no)
"View the FAQs for a conference"
(interactive (list (lyskom-read-conf-no 'view-which-faq '(conf pers) t nil t)))
(interactive
(list
(let* ((conf-stat (blocking-do 'get-conf-stat lyskom-current-conf))
(initial (and conf-stat (cons (conf-stat->name conf-stat) 0))))
(lyskom-read-conf-no 'view-which-faq '(conf pers) t initial t))))
(if (zerop conf-no)
(lyskom-review-faq nil (server-info->aux-item-list
(blocking-do 'get-server-info)))
......
......@@ -49,20 +49,35 @@
'((menu read
((item kom-view-next-text)
(item kom-list-news)
(item kom-list-summary)
(hline review-separator)
(item kom-view)
(item kom-review-by-to)
;; (item kom-review-first)
(item kom-review-last-normally-read)
(item kom-review-more)
(item kom-review-backward)
(item kom-review-clear)
(hline review-comments-separator)
(item kom-view-commented-text)
(item kom-view-previous-commented-text)
;; (item kom-view-previous-commented-text)
(item kom-review-comments)
(item kom-review-tree)
(item kom-find-root)
(item kom-find-root-review)
(item kom-review-clear)
(hline marks-separator)
;; Maybe kom-[un]mark-text shouldn't be in this menu, but the
;; other commands for marked messages are here.
(item kom-mark-text)
(item kom-unmark-text)
(item kom-list-marks)
(item kom-review-marked-texts)
(item kom-review-all-marked-texts)
(item kom-review-clear)
(hline save-separator)
(item kom-save-text)
(item kom-save-text-body)
(hline jump-separator)
(item kom-postpone)
(item kom-jump)
(item kom-super-jump)
(item kom-set-unread)))
......@@ -71,7 +86,21 @@
(item kom-send-letter)
(item kom-write-comment)
(item kom-private-answer)
(item kom-comment-previous)
(item kom-write-footnote)
;; Mostly confusing for menu users:
;; (item kom-comment-previous)
;; (item kom-private-answer-previous)
;; Sort of logical to have commands for affecting
;; already written texts here
(hline change-separator)
(item kom-move-text)
(item kom-add-recipient)
(item kom-add-copy)
(item kom-add-bcc)
(item kom-sub-recipient)
(item kom-add-cross-reference)
(item kom-add-comment)
(item kom-sub-comment)
(hline send-separator)
(item kom-send-message)))
(menu conference
......@@ -80,24 +109,53 @@
(hline info-separator)
(item kom-membership)
(item kom-list-conferences)
(item kom-list-re)
(item kom-list-created-conferences)
(item kom-status-conf)
(item kom-review-presentation)
(item kom-create-conf)
(item kom-delete-conf)
;; (item kom-change-conf-motd)
;; (item kom-unset-conf-motd)
;; (item kom-set-super-conf)
;; (item kom-set-permitted-submitters)
(item kom-set-garb-nice)
(hline member-separator)
(item kom-add-self)
(item kom-sub-self)
(item kom-add-member)
(item kom-sub-member)
(item kom-prioritize)))
(menu person
((item kom-who-is-on)
(item kom-who-is-on-in-conference)
(item kom-who-is-present-in-conference)
(item kom-who-is-on-and-friend)
(item kom-status-session)
(hline info-separator)
(item kom-list-persons)
(item kom-list-re)
(item kom-status-person)
(item kom-review-presentation)
(hline change-separator)
(item kom-change-name)
(item kom-change-password)))
(item kom-change-password)
(item kom-change-presentation)
;; (item kom-set-motd-text)
(item kom-change-conf-motd)
(item kom-unset-conf-motd)))
(menu other
((item kom-customize))))
((item kom-help)
(item kom-customize)
(item kom-change-language)
(item kom-set-session-priority)
(item kom-where-is)
(item kom-display-time)
(item kom-recover)
(item kom-start-anew)
;; (item kom-get-appreciation)
;; (item kom-get-abuse)
(item kom-quit))))
"The menus used in LysKOM.")
(defvar lyskom-popup-menu-template
......
......@@ -998,13 +998,13 @@ START and END are the starting and ending points of the region."
(let ((entry-list (lp--map-region start end 'identity)))
(lp--select-entries entry-list (not current-prefix-arg))))
(defun lp--select-prioriy (priority)
(defun lp--select-priority (priority)
"Select all entries with a priority PRIORITY.
With numeric prefix argument select entries with that priority."
(interactive "P")
(lp--do-select-priority priority t))
(defun lp--deselect-prioriy (priority)
(defun lp--deselect-priority (priority)
"Deselect all entries with a priority PRIORITY.
With numeric prefix argument deselect entries with that priority."
(interactive "P")
......
......@@ -43,11 +43,10 @@
(eval-when-compile
(require 'lyskom-command "command"))
(put 'lyskom-cant-review-error
'error-conditions
'(error lyskom-error lyskom-review-error))
(put 'lyskom-review-error 'error-message
"Review error")
(put 'lyskom-cant-review-error 'error-conditions '(error lyskom-error lyskom-review-error))
(put 'lyskom-cant-review-error 'error-message "Can't review")
(put 'lyskom-review-error 'error-condiions '(error lyskom-error))
(put 'lyskom-review-error 'error-message "Review error")
;;; ======================================================================
......
......@@ -270,7 +270,7 @@ f
(what-ancestor . "Vilken av de kommenterade texterna nskas? ")
(who-letter-to . "Vem vill du skicka brev till? ")
(who-send-text-to . "Vem vill du skicka inlgget till? ")
(who-send-text-to . "Vart vill du skicka inlgget? ")
(has-motd . "%#1P har en lapp p drren:\n\n")
(motd-persist-q . "Vill du fortfarande skicka brevet? ")
......@@ -383,6 +383,7 @@ du har l
(no-such-conf-or-pers . "Mtet eller personen finns ej.\n")
(new-name . "Nytt namn: ")
(new-paren . "Ny parentes: ")
(too-many-parens-in-name . "Namnet innehller mer n en parentes. Anvnd \"ndra namn\" istllet.\n")
(no-paren-in-name . "Namnet innehller ingen parentes.\n")
(who-to-change-supervisor-for . "Vem vill du ndra organisatr fr? ")
(new-supervisor . "Ny organisatr: ")
......
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