diff options
| author | Nat <Nat@localhost.localdomain> | 2007-02-20 23:21:49 (GMT) |
|---|---|---|
| committer | Nat <Nat@localhost.localdomain> | 2007-02-20 23:21:49 (GMT) |
| commit | 92bc2d9c240cb791c740b8454e92f87b2662c05f (patch) | |
| tree | b04a1979922b9c9e73f5cea3e24ce038599038a0 /Util | |
| parent | 745bfc5b4325147e0cef5157bfc34925a80ce763 (diff) | |
| parent | 3c2f9c561fc2739cf288cdbfd016aaa61f3e3c2e (diff) | |
Merge branch 'master' of git+ssh://natcl@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'Util')
| -rw-r--r-- | Util/CSoundClient.py | 2 | ||||
| -rw-r--r-- | Util/NoteDB.py | 2 | ||||
| -rw-r--r-- | Util/ThemeWidgets.py | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Util/CSoundClient.py b/Util/CSoundClient.py index c493954..835c73e 100644 --- a/Util/CSoundClient.py +++ b/Util/CSoundClient.py @@ -108,7 +108,7 @@ class _CSoundClientPlugin: sc_loop_delScoreEvent( (page << 16) + id) def loopStart(self): sc_loop_playing(1) - def loopStop(self): + def loopPause(self): sc_loop_playing(0) def loopSetTick(self,t): sc_loop_setTick(t) diff --git a/Util/NoteDB.py b/Util/NoteDB.py index f96123b..67b4044 100644 --- a/Util/NoteDB.py +++ b/Util/NoteDB.py @@ -152,6 +152,8 @@ class NoteDB: for n in self.noteD[cp][t].keys(): self.duplicateNote( cp, t, n, new[cp], t, 0 ) + return new + def movePages( self, which, after = False ): sorted = [] if after: at = self.tune.index(after)+1 diff --git a/Util/ThemeWidgets.py b/Util/ThemeWidgets.py index cfc1130..83d0cb1 100644 --- a/Util/ThemeWidgets.py +++ b/Util/ThemeWidgets.py @@ -50,6 +50,7 @@ widget "*%s*" style "scale_style" self.connect( "expose-event", self.expose ) self.connect( "size-allocate", self.size_allocate ) self.connect( "button-release-event", self.button_release ) + adjustment.connect( "changed", self.value_changed ) adjustment.connect( "value-changed", self.value_changed ) def size_allocate( self, widget, allocation ): @@ -86,6 +87,7 @@ widget "*%s*" style "scale_style" else: sliderX = int((self.alloc.width - self.pixbufWidth)*(val-adj.lower)/(adj.upper - adj.lower)) + print self.alloc.width, self.pixbufWidth, adj.upper, adj.lower, val if self.insensitivePixbuf != None and self.state == gtk.STATE_INSENSITIVE: self.window.draw_pixbuf( gc, self.insensitivePixbuf, 0, 0, self.alloc.x + sliderX, self.alloc.y + self.sliderY, self.pixbufWidth, self.pixbufHeight, gtk.gdk.RGB_DITHER_NORMAL, 0, 0 ) else: @@ -435,7 +437,6 @@ class RoundHBox( gtk.HBox ): return False - class RoundVBox( gtk.VBox ): def __init__( self, radius = 5, fillcolor = "#000", bordercolor = "#FFF", homogeneous = False, spacing = 0 ): gtk.VBox.__init__( self, homogeneous, spacing ) |