diff options
Diffstat (limited to 'TamTamEdit.activity')
| -rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 21 | ||||
| -rw-r--r-- | TamTamEdit.activity/Edit/TrackInterface.py | 10 |
2 files changed, 19 insertions, 12 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index bb81391..952a799 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -138,11 +138,14 @@ class MainWindow( gtk.EventBox ): #------------------------------------------------------------------------ # page self.GUI["2page"] = gtk.HBox() - self.GUI["2main"].pack_start( self.GUI["2page"], False ) + self.scrollWin = gtk.ScrolledWindow() + self.scrollWin.set_policy(gtk.POLICY_NEVER,gtk.POLICY_AUTOMATIC) + self.scrollWin.add_with_viewport(self.GUI["2page"]) + self.GUI["2main"].pack_start( self.scrollWin, True ) + if 1: # + instrument panel self.GUI["2instrumentPanel"] = gtk.VBox() - self.GUI["2instrumentPanel"].set_size_request( 132, -1 ) - self.GUI["2page"].pack_start( self.GUI["2instrumentPanel"], False ) + self.GUI["2page"].pack_start( self.GUI["2instrumentPanel"], True ) # + + instrument 1 box self.GUI["2instrument1Box"] = formatRoundBox( RoundHBox(), Config.BG_COLOR ) self.GUI["2instrument1Box"].set_size_request( -1, 132 ) @@ -259,12 +262,13 @@ class MainWindow( gtk.EventBox ): self.GUI["2drumButton"].connect('button-release-event',self.GUI["2drumPalette"].setBlock) self.GUI["2drumBox"].pack_start( self.GUI["2drumButton"] ) self.GUI["2instrumentPanel"].pack_start( self.GUI["2drumBox"] ) - self.GUI["2page"].pack_start( self.GUI["2instrumentPanel"], False ) + self.GUI["2page"].pack_start( self.GUI["2instrumentPanel"], True ) # + track interface - self.trackInterface = TrackInterface( self.noteDB, self, self.getScale ) + tracks_width = gtk.gdk.screen_width() - 140 + self.trackInterface = TrackInterface( self.noteDB, self, self.getScale, tracks_width ) self.noteDB.addListener( self.trackInterface, TrackInterfaceParasite, True ) - self.trackInterface.set_size_request( 1068, 693 ) - self.GUI["2page"].pack_start( self.trackInterface, False, False ) + self.trackInterface.set_size_request( tracks_width, -1 ) + self.GUI["2page"].pack_start( self.trackInterface, False ) #------------------------------------------------------------------------ # tune interface @@ -289,7 +293,8 @@ class MainWindow( gtk.EventBox ): self.GUI["2tuneScrollRightButton"].set_size_request( 25, -1 ) self.GUI["2tuneScrollRightButton"].connect( "clicked", lambda a1:self.scrollTune( 1 ) ) self.GUI["2tuneHBox"].pack_start( self.GUI["2tuneScrollRightButton"], False, False ) - self.GUI["2main"].pack_start( self.GUI["2tuneHBox"] ) + self.GUI["2tuneHBox"].set_size_request(-1, 100) + self.GUI["2main"].pack_start( self.GUI["2tuneHBox"], False, True ) # set tooltips for key in self.GUI: diff --git a/TamTamEdit.activity/Edit/TrackInterface.py b/TamTamEdit.activity/Edit/TrackInterface.py index 34883c0..996c731 100644 --- a/TamTamEdit.activity/Edit/TrackInterface.py +++ b/TamTamEdit.activity/Edit/TrackInterface.py @@ -44,7 +44,7 @@ class TrackInterfaceParasite: class TrackInterface( gtk.EventBox ): - def __init__( self, noteDB, owner, getScaleFunction ): + def __init__( self, noteDB, owner, getScaleFunction, width ): gtk.EventBox.__init__( self ) self.noteDB = noteDB @@ -127,14 +127,16 @@ class TrackInterface( gtk.EventBox ): win = gtk.gdk.get_default_root_window() self.gc = gtk.gdk.GC( win ) - def prepareDrawable( name ): + def prepareDrawable( name, width = -1 ): pix = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT+name+".png" ) + if width != -1: + pix = pix.scale_simple(width, pix.get_height(), gtk.gdk.INTERP_BILINEAR) self.image[name] = gtk.gdk.Pixmap( win, pix.get_width(), pix.get_height() ) self.image[name].draw_pixbuf( self.gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE ) def preparePixbuf( name ): self.image[name] = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT+name+".png" ) - prepareDrawable( "trackBG" ) + prepareDrawable( "trackBG", width ) prepareDrawable( "trackBGSelected" ) prepareDrawable( "trackBGDrum" ) prepareDrawable( "trackBGDrumSelected" ) @@ -144,7 +146,7 @@ class TrackInterface( gtk.EventBox ): preparePixbuf( "hitSelected" ) # define dimensions - self.width = self.trackFullWidth = self.image["trackBG"].get_size()[0] + self.width = self.trackFullWidth = width self.trackWidth = self.width - Config.TRACK_SPACING self.trackFullHeight = self.image["trackBG"].get_size()[1] self.trackHeight = self.trackFullHeight - Config.TRACK_SPACING |