[gsharp-cvs] CVS update: gsharp/gui.lisp gsharp/modes.lisp gsharp/packages.lisp gsharp/system.lisp

[Robert Strandh]

Update of /project/gsharp/cvsroot/gsharp
In directory common-lisp.net:/tmp/cvs-serv23448

Modified Files:
	gui.lisp modes.lisp packages.lisp system.lisp 
Log Message:
fixed some minor problems

Date: Mon Jul 25 13:14:38 2005
Author: rstrandh

Index: gsharp/gui.lisp
diff -u gsharp/gui.lisp:1.19 gsharp/gui.lisp:1.20
--- gsharp/gui.lisp:1.19	Mon Jul 25 11:52:14 2005
+++ gsharp/gui.lisp	Mon Jul 25 13:14:37 2005
@@ -9,8 +9,6 @@
 
 (defvar *gsharp-frame* nil)
 
-(defparameter *modes* (list *melody-layer-mode-table* *global-mode-table*))
-
 (defclass gsharp-minibuffer-pane (minibuffer-pane)
   ()
   (:default-initargs
@@ -426,9 +424,8 @@
     (if success layer (error 'no-such-layer))))
 
 (defmethod select-layer :after (cursor (layer layer))
-  (setf *modes* (list (cond ((typep layer 'melody-layer) *melody-layer-mode-table*)
-			    ((typep layer 'lyrics-layer) *lyrics-layer-mode-table*))
-		      *global-mode-table*)))
+  ;; set the command tables here
+  )
 
 (define-gsharp-command (com-select-layer :name t) ()
   (let ((selected-layer (accept 'layer :prompt "Select layer")))


Index: gsharp/modes.lisp
diff -u gsharp/modes.lisp:1.4 gsharp/modes.lisp:1.5
--- gsharp/modes.lisp:1.4	Mon Jul 25 11:52:14 2005
+++ gsharp/modes.lisp	Mon Jul 25 13:14:37 2005
@@ -13,13 +13,14 @@
 (set-key 'com-left 'global-gsharp-table '((#\l :meta)))
 (set-key 'com-right 'global-gsharp-table '((#\r :meta)))
 (set-key 'com-rotate-notehead 'global-gsharp-table '((#\r :control)))
+(set-key 'com-load-file 'global-gsharp-table '((#\x :control) (#\f :control)))
 
 ;;; melody table
 
 (define-command-table melody-table)
 
-(set-key 'com-lower 'melody-table '((#\L :shift)))
-(set-key 'com-higher 'melody-table '((#\H :shift)))
+(set-key 'com-lower 'melody-table '(#\L))
+(set-key 'com-higher 'melody-table '(#\H))
 (set-key 'com-insert-note-a 'melody-table '(#\a))
 (set-key 'com-insert-note-b 'melody-table '(#\b))
 (set-key 'com-insert-note-c 'melody-table '(#\c))


Index: gsharp/packages.lisp
diff -u gsharp/packages.lisp:1.9 gsharp/packages.lisp:1.10
--- gsharp/packages.lisp:1.9	Mon Jul 25 11:52:14 2005
+++ gsharp/packages.lisp	Mon Jul 25 13:14:38 2005
@@ -204,7 +204,7 @@
 (defpackage :gsharp
   (:use :clim :clim-lisp :gsharp-utilities :esa
 	:gsharp-buffer :gsharp-cursor :gsharp-drawing :gsharp-numbering
-	:gsharp-measure :sdl :midi :sequence-dico)
+	:gsharp-measure :sdl :midi)
   (:shadowing-import-from :gsharp-numbering #:number)
   (:shadowing-import-from :gsharp-buffer #:rest))
 


Index: gsharp/system.lisp
diff -u gsharp/system.lisp:1.6 gsharp/system.lisp:1.7
--- gsharp/system.lisp:1.6	Mon Jul 25 11:52:14 2005
+++ gsharp/system.lisp	Mon Jul 25 13:14:38 2005
@@ -22,6 +22,7 @@
 
 (gsharp-defsystem (:gsharp :depends-on (:mcclim))
    "packages"
+   "esa"
    "utilities"
    "gf"
    "sdl"
@@ -39,5 +40,4 @@
    "input-state"
    "midi"
    "modes"
-   "esa"
    "gui")