* test/Makefile.am (EXTRA_DIST): Add test-riece.el.

[riece] / lisp / riece-menu.el

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 7aede3a..94665e0 100644 (file)
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -29,12 +29,17 @@
 
 ;;; Code:
 
+(require 'riece-options)
+(require 'riece-globals)
+(require 'riece-identity)
+(require 'riece-layout)
+(require 'riece-server)
+
 (defvar riece-menu-items
   `("Riece"
     ["Version" riece-version t]
     "----"
-    ["Change Window Layout"
-     riece-command-change-layout t]
+    ("Change Window Layout..." :filter riece-menu-create-layouts-menu)
     ["Toggle Freeze Channel Buffer"
      riece-command-toggle-freeze t]
     ["Toggle Freeze Channel Buffer Until Next Message"
@@ -48,12 +53,30 @@
     "----"
     ["Join Channel" riece-command-join t]
     ["Change Nickname" riece-command-change-nickname t]
+    ["Mark As Away" riece-command-toggle-away t]
     ["Quit IRC" riece-command-quit t]
     "----"
+    ["Part Channel" riece-command-part riece-current-channel]
+    ["Set Channel Topic" riece-command-topic riece-current-channel]
+    ["Kick User" riece-command-kick riece-current-channel]
+    ["Invite User" riece-command-invite riece-current-channel]
+    "----"
+    ["Next Channel" riece-command-next-channel riece-current-channels]
+    ["Previous Channel" riece-command-previous-channel riece-current-channels]
+    "----"
     ("Channels" :filter riece-menu-create-channels-menu)
     ("Servers" :filter riece-menu-create-servers-menu))
   "Menu used in command mode.")
 
+(defconst riece-menu-description
+  "Setup command menus on menubar")
+
+(defun riece-menu-create-layouts-menu (menu)
+  (mapcar (lambda (entry)
+           (vector (car entry) (list 'riece-command-change-layout (car entry))
+                   t))
+         riece-layout-alist))
+
 (defun riece-menu-create-channels-menu (menu)
   (mapcar (lambda (channel)
            (list (riece-format-identity channel)
@@ -77,6 +100,8 @@
                          (riece-server-opened (car entry)))))
          riece-server-alist))
 
+(defvar riece-command-mode-map)
+(defvar riece-menu)
 (defun riece-menu-insinuate ()
   (add-hook 'riece-command-mode-hook
            (lambda ()