From 023939c3c030eb714d66ac5c70ee0d0b81f94c3c Mon Sep 17 00:00:00 2001 From: "Silas S. Brown" <ssb22@cam.ac.uk> Date: Thu, 26 Nov 2009 12:01:06 +0000 Subject: [PATCH] Gradint update git-svn-id: http://svn.code.sf.net/p/e-guidedog/code/ssb22/gradint@459 29193198-4895-4776-b068-10539e920549 --- gradint-build/Makefile | 2 +- gradint-build/src/booktime.py | 2 +- gradint-build/src/filescan.py | 2 +- gradint-build/src/frontend.py | 2 +- gradint-build/src/lessonplan.py | 2 +- gradint-build/src/loop.py | 2 +- gradint-build/src/makeevent.py | 2 +- gradint-build/src/play.py | 2 +- gradint-build/src/recording.py | 8 +++++--- gradint-build/src/sequence.py | 2 +- gradint-build/src/synth.py | 2 +- gradint-build/src/system.py | 2 +- gradint-build/src/top.py | 2 +- gradint-build/thindown.py | 2 +- 14 files changed, 18 insertions(+), 16 deletions(-) diff --git a/gradint-build/Makefile b/gradint-build/Makefile index db426db..2d83c54 100644 --- a/gradint-build/Makefile +++ b/gradint-build/Makefile @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/booktime.py b/gradint-build/src/booktime.py index 73d5dd5..572e539 100644 --- a/gradint-build/src/booktime.py +++ b/gradint-build/src/booktime.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/filescan.py b/gradint-build/src/filescan.py index 392fa2d..fac14ae 100644 --- a/gradint-build/src/filescan.py +++ b/gradint-build/src/filescan.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/frontend.py b/gradint-build/src/frontend.py index b8fa7ef..912f1ad 100644 --- a/gradint-build/src/frontend.py +++ b/gradint-build/src/frontend.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/lessonplan.py b/gradint-build/src/lessonplan.py index 3d1b451..a04d02a 100644 --- a/gradint-build/src/lessonplan.py +++ b/gradint-build/src/lessonplan.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/loop.py b/gradint-build/src/loop.py index 3debe6f..ec47ccf 100644 --- a/gradint-build/src/loop.py +++ b/gradint-build/src/loop.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/makeevent.py b/gradint-build/src/makeevent.py index 91b9768..345354a 100644 --- a/gradint-build/src/makeevent.py +++ b/gradint-build/src/makeevent.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/play.py b/gradint-build/src/play.py index 330f418..cd03b60 100644 --- a/gradint-build/src/play.py +++ b/gradint-build/src/play.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/recording.py b/gradint-build/src/recording.py index d1a4511..0337bd7 100644 --- a/gradint-build/src/recording.py +++ b/gradint-build/src/recording.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or @@ -351,8 +351,9 @@ class RecorderControls: row += 1 if len(newNames)==1 and row<self.addMoreRow: # put cursor on the next one if not (row,col) in self.coords2buttons: row += 1 # skip extra row if there are notes - origName=self.coords2buttons[(row,col)]["text"] - if not isDirectory(unicode2filename(self.currentDir+os.sep+origName)): self.startRename(row,0,origName) + if row<self.addMoreRow: + origName=self.coords2buttons[(row,col)]["text"] + if not isDirectory(unicode2filename(self.currentDir+os.sep+origName)): self.startRename(row,0,origName) def cancelRename(self,row,col): if hasattr(self,"renameToCancel"): del self.renameToCancel origName = self.coords2buttons[(row,col)].origName @@ -427,6 +428,7 @@ class RecorderControls: button.focus() self.continueScrollIntoView(button) def continueScrollIntoView(self,button): + if not hasattr(self,"ourCanvas"): return # closing down? by,bh,cy,ch = button.winfo_rooty(),button.winfo_height(),self.ourCanvas.winfo_rooty(),self.ourCanvas.winfo_height() if not by or not bh or not cy or not ch: return app.after(10,lambda *args:self.continueScrollIntoView(button)) if by+bh >= cy+ch-cond(ch>2*bh,bh,0): diff --git a/gradint-build/src/sequence.py b/gradint-build/src/sequence.py index fd7525e..d1dcbb7 100644 --- a/gradint-build/src/sequence.py +++ b/gradint-build/src/sequence.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/synth.py b/gradint-build/src/synth.py index 323efa7..fc2f041 100644 --- a/gradint-build/src/synth.py +++ b/gradint-build/src/synth.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/system.py b/gradint-build/src/system.py index de7b476..beb9a35 100644 --- a/gradint-build/src/system.py +++ b/gradint-build/src/system.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or diff --git a/gradint-build/src/top.py b/gradint-build/src/top.py index 4149d9d..d9cf0e9 100644 --- a/gradint-build/src/top.py +++ b/gradint-build/src/top.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -program_name = "gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+." +program_name = "gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+." # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/gradint-build/thindown.py b/gradint-build/thindown.py index fb46e19..a3bd7d6 100644 --- a/gradint-build/thindown.py +++ b/gradint-build/thindown.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.9938 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9939 (c) 2002-2009 Silas S. Brown. GPL v3+. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or -- GitLab