ap-python-commits

[<sj...@us...>]

Update of /cvsroot/ap-python/python/examples/aptk
In directory usw-pr-cvs1:/tmp/cvs-serv9288/examples/aptk

Modified Files:
	panel.py playlist.py 
Log Message:
Rewrite playlist widget for gtk2.0

Index: panel.py
===================================================================
RCS file: /cvsroot/ap-python/python/examples/aptk/panel.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** panel.py	21 Jul 2002 18:15:43 -0000	1.5
--- panel.py	22 Jul 2002 16:26:28 -0000	1.6
***************
*** 46,53 ****
  win.set_resizable (gtk.FALSE)
  win.set_decorated (gtk.FALSE)
  
  # Properties
  properties = aptk.misc.WidgetProperties ([
!     ('.tagsinfo.format',			'%t - %a (%y - %l)'),
      ('.control.play.button.file',		'play-sm.xpm'),
      ('.control.next.button.file',		'next-sm.xpm'),
--- 46,54 ----
  win.set_resizable (gtk.FALSE)
  win.set_decorated (gtk.FALSE)
+ win.set_type_hint ("toolbar")
  
  # Properties
  properties = aptk.misc.WidgetProperties ([
!     ('.tagsinfo.format',			'%a - %t (%y - %l)'),
      ('.control.play.button.file',		'play-sm.xpm'),
      ('.control.next.button.file',		'next-sm.xpm'),

Index: playlist.py
===================================================================
RCS file: /cvsroot/ap-python/python/examples/aptk/playlist.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** playlist.py	19 Jul 2002 18:04:56 -0000	1.4
--- playlist.py	22 Jul 2002 16:26:28 -0000	1.5
***************
*** 26,57 ****
  
  import alsaplayer, aptk, gtk
  
! #####################################################################
! properties = {
!     'playlist.columns'		:  ['current', 'playtime', 'track', 'title',
! 				    'album', 'artist', 'year', 'genre'],
!     'playlist.title.playtime'   :  ("playtime.xpm",),
!     'playlist.title.track'	:  ("track.xpm",),
!     'playlist.title.title'	:  'Title',
!     'playlist.title.current'	:  ' ',
!     'playlist.title.album'	:  'Album',
!     'playlist.title.artist'	:  'Artist',
!     'playlist.title.year'	:  'Year',
!     'playlist.title.genre'	:  'Genre',
!     'playlist.current.mark'	:  ("current_play.xpm",)
! }
  
  #####################################################################
  pl = alsaplayer.get_playlist ()
- cp = pl.get_coreplayer ()
- 
- def delete_event (foo, bar):
-     gtk.mainquit ();
  
  win = aptk.playlist.PlaylistWindow (pl, properties)
! win.connect ("delete_event", delete_event)
  win.show ()
  
! gtk.threads_enter ()
  gtk.mainloop ()
! gtk.threads_leave ()
--- 26,54 ----
  
  import alsaplayer, aptk, gtk
+ gdk = gtk.gdk
  
! # Init GDK threads
! gdk.threads_init ()
! 
! # Properties
! properties = aptk.misc.WidgetProperties ([
! 	('.playlist.list.columns',	    ('playtime', 'track', 'title',
! 					     'album', 'artist', 'year',
! 					     'genre', 'filename')),
! 	('.playlist.list.playtime.file',    'playtime.xpm'),
! 	('.playlist.list.track.file',	    'track.xpm'),
! 	('.playlist.list.title.label',	    'îÁÚ×ÁÎÉÅ ÐÅÓÎÉ'.decode ('koi8-r')),
! 	('.playlist.list.album.label',	    'áÌØÂÏÍ'.decode ('koi8-r')),
! 	('.playlist.list.artist.label',	    'éÓÐÏÌÎÉÔÅÌØ'.decode ('koi8-r'))
! ])
  
  #####################################################################
  pl = alsaplayer.get_playlist ()
  
  win = aptk.playlist.PlaylistWindow (pl, properties)
! win.connect ("destroy", lambda win: gtk.main_quit ())
  win.show ()
  
! gdk.threads_enter ()
  gtk.mainloop ()
! gdk.threads_leave ()