From thenriksen at common-lisp.net Tue Jan 15 07:44:37 2008 From: thenriksen at common-lisp.net (thenriksen) Date: Tue, 15 Jan 2008 02:44:37 -0500 (EST) Subject: [gsharp-cvs] CVS gsharp Message-ID: <20080115074437.147A31603E@common-lisp.net> Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv1652 Modified Files: packages.lisp Log Message: Fixed name conflict. --- /project/gsharp/cvsroot/gsharp/packages.lisp 2007/10/18 15:02:47 1.63 +++ /project/gsharp/cvsroot/gsharp/packages.lisp 2008/01/15 07:44:37 1.64 @@ -35,6 +35,7 @@ (defpackage :score-pane (:use :clim :clim-extensions :clim-lisp :sdl :esa) + (:import-from :esa-io #:buffer) (:shadow #:rest) (:export #:draw-fiveline-staff #:draw-lyrics-staff #:draw-stem #:draw-right-stem #:draw-left-stem From crhodes at common-lisp.net Tue Jan 15 15:43:52 2008 From: crhodes at common-lisp.net (crhodes) Date: Tue, 15 Jan 2008 10:43:52 -0500 (EST) Subject: [gsharp-cvs] CVS gsharp Message-ID: <20080115154352.DD50F37011@common-lisp.net> Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv8200 Modified Files: packages.lisp Log Message: Remove name conflict from gsharp package; now gsharp loads. (It can't yet handle entering notes; fix in mcclim forthcoming.) --- /project/gsharp/cvsroot/gsharp/packages.lisp 2008/01/15 07:44:37 1.64 +++ /project/gsharp/cvsroot/gsharp/packages.lisp 2008/01/15 15:43:52 1.65 @@ -188,7 +188,7 @@ :gsharp-measure :sdl :midi :gsharp-play) (:shadowing-import-from :gsharp-numbering #:number) - (:shadowing-import-from :gsharp-buffer #:rest) + (:shadowing-import-from :gsharp-buffer #:rest #:buffer) (:export #:gsharp #:edit-file)) (in-package :gsharp-numbering) From thenriksen at common-lisp.net Wed Jan 30 09:59:25 2008 From: thenriksen at common-lisp.net (thenriksen) Date: Wed, 30 Jan 2008 04:59:25 -0500 (EST) Subject: [gsharp-cvs] CVS gsharp Message-ID: <20080130095925.03C8F5E146@common-lisp.net> Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv31373 Modified Files: gui.lisp Log Message: Added the ESA menus the Gsharp menu. --- /project/gsharp/cvsroot/gsharp/gui.lisp 2007/12/19 11:06:03 1.92 +++ /project/gsharp/cvsroot/gsharp/gui.lisp 2008/01/30 09:59:25 1.93 @@ -268,7 +268,8 @@ (make-command-table 'menubar-command-table :errorp nil - :menu '(("File" :menu file-command-table) + :menu '(("File" :menu esa-io-menu-table) + ("Macros" :menu keyboard-macro-menu-table) ("Buffer" :menu buffer-command-table) ("Stuff" :menu segment-command-table) ("Segment" :menu segment-command-table) @@ -277,19 +278,8 @@ ("Measure" :menu measure-command-table) ("Modes" :menu modes-command-table) ("Staves" :menu staves-command-table) - ("Play" :menu play-command-table))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; -;;; file menu - -(make-command-table - 'file-command-table - :errorp nil - :menu `(("Find" :command (esa-io::com-find-file ,esa::*unsupplied-argument-marker*)) - ("Save" :command esa-io::com-save-buffer) - ("Save as" :command (esa-io::com-write-buffer ,esa::*unsupplied-argument-marker*)) - ("Quit" :command com-quit))) + ("Play" :menu play-command-table) + ("Help" :menu help-menu-table))) (define-gsharp-command (com-new-buffer :name t) () (let* ((buffer (make-instance 'buffer))