Thread: [Ap-python-commits] python/aptk init.py,1.4,1.5 control.py,1.9,1.10 info.py,1.10,1.11 language.p

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	__init__.py control.py info.py language.py misc.py pan.py 
	playlist.py position.py speed.py volume.py 
Log Message:
Make __data__ and __version__ mean what they should mean. I18N. Fix distclean and uninstall targets.

Index: __init__.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/__init__.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** __init__.py	16 Aug 2002 05:36:11 -0000	1.4
--- __init__.py	19 Aug 2002 16:45:37 -0000	1.5
***************
*** 22,36 ****

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$"
! __version__ = "$Revision$"
  __license__ = "GNU"
- 
- import misc
- import control
- import volume
- import speed
- import pan
- import position
- import info
- import playlist
- import language
--- 22,26 ----

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$".split()[1]
! __version__ = "$Revision$".split()[1]
  __license__ = "GNU"

Index: control.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/control.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** control.py	28 Jul 2002 13:45:46 -0000	1.9
--- control.py	19 Aug 2002 16:45:37 -0000	1.10
***************
*** 25,34 ****

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$"
! __version__ = "$Revision$"
  __license__ = "GNU"

! import aptk, alsaplayer, gtk
! gdk = gtk.gdk

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 25,36 ----

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$".split()[1]
! __version__ = "$Revision$".split()[1]
  __license__ = "GNU"

! import alsaplayer, gtk, aptk.misc, aptk.playlist, aptk.language
! 
! # Setup for i18n
! _ = aptk.language.tr

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 39,43 ****
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.play.button.label',   'Play')
      ])

--- 41,45 ----
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.play.button.label',   _('Play'))
      ])

***************
*** 56,62 ****

      def __gtkcb_clicked (self, w):
! 	gdk.threads_leave ()
  	self.__pl.play (self.__pl.get_current ())
! 	gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 58,64 ----

      def __gtkcb_clicked (self, w):
! 	gtk.gdk.threads_leave ()
  	self.__pl.play (self.__pl.get_current ())
! 	gtk.gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 67,71 ****
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.next.button.label',   'Next')
      ])

--- 69,73 ----
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.next.button.label',   _('Next'))
      ])

***************
*** 84,90 ****

      def __gtkcb_clicked (self, w):
! 	gdk.threads_leave ()
  	self.__pl.next ()
! 	gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 86,92 ----

      def __gtkcb_clicked (self, w):
! 	gtk.gdk.threads_leave ()
  	self.__pl.next ()
! 	gtk.gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 95,99 ****
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.prev.button.label',   'Prev')
      ])

--- 97,101 ----
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.prev.button.label',   _('Prev'))
      ])

***************
*** 112,118 ****

      def __gtkcb_clicked (self, w):
! 	gdk.threads_leave ()
  	self.__pl.prev ()
! 	gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 114,120 ----

      def __gtkcb_clicked (self, w):
! 	gtk.gdk.threads_leave ()
  	self.__pl.prev ()
! 	gtk.gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 123,127 ****
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.stop.button.label',   'Stop')
      ])

--- 125,129 ----
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.stop.button.label',   _('Stop'))
      ])

***************
*** 140,146 ****

      def __gtkcb_clicked (self, w):
! 	gdk.threads_leave ()
  	self.__pl.stop ()
! 	gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 142,148 ----

      def __gtkcb_clicked (self, w):
! 	gtk.gdk.threads_leave ()
  	self.__pl.stop ()
! 	gtk.gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 153,157 ****
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.playlist.button.label',   'Playlist')
      ])

--- 155,159 ----
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.playlist.button.label',   _('Playlist'))
      ])

Index: info.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/info.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** info.py	28 Jul 2002 13:45:46 -0000	1.10
--- info.py	19 Aug 2002 16:45:37 -0000	1.11
***************
*** 22,31 ****

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$"
! __version__ = "$Revision$"
  __license__ = "GNU"

  import aptk.misc, alsaplayer, gtk, locale
- gdk = gtk.gdk

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 22,30 ----

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$".split()[1]
! __version__ = "$Revision$".split()[1]
  __license__ = "GNU"

  import aptk.misc, alsaplayer, gtk, locale

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 50,56 ****

  	# Update label
! 	gdk.threads_enter ()
  	self.set_text (s)
! 	gdk.threads_leave ()

  	return 1
--- 49,55 ----

  	# Update label
! 	gtk.gdk.threads_enter ()
  	self.set_text (s)
! 	gtk.gdk.threads_leave ()

  	return 1
***************
*** 93,99 ****
  	if status:
  	    # Show status
! 	    gdk.threads_enter ()
  	    self.set_text (status)
! 	    gdk.threads_leave ()
  	else:
  	    # Show time
--- 92,98 ----
  	if status:
  	    # Show status
! 	    gtk.gdk.threads_enter ()
  	    self.set_text (status)
! 	    gtk.gdk.threads_leave ()
  	else:
  	    # Show time
***************
*** 107,113 ****
  	    t_m, t_s = divmod (total, 60)

! 	    gdk.threads_enter ()
  	    self.set_text ("%02u:%02u/%02u:%02u" % (m, s,  t_m, t_s))
! 	    gdk.threads_leave ()

      def __gtkcb_press_event (self, widget, event):
--- 106,112 ----
  	    t_m, t_s = divmod (total, 60)

! 	    gtk.gdk.threads_enter ()
  	    self.set_text ("%02u:%02u/%02u:%02u" % (m, s,  t_m, t_s))
! 	    gtk.gdk.threads_leave ()

      def __gtkcb_press_event (self, widget, event):
***************
*** 121,125 ****

  	# Calculate time based on a position adjustment value 
! 	gdk.threads_leave ()

  	played = self.__cp.get_current_time (self.__adj.value) / 100
--- 120,124 ----

  	# Calculate time based on a position adjustment value 
! 	gtk.gdk.threads_leave ()

  	played = self.__cp.get_current_time (self.__adj.value) / 100
***************
*** 130,134 ****
  	t_m, t_s = divmod (total, 60)

! 	gdk.threads_enter ()

  	# Update label
--- 129,133 ----
  	t_m, t_s = divmod (total, 60)

! 	gtk.gdk.threads_enter ()

  	# Update label
***************
*** 141,154 ****

  	# Dragging is done, so we should show now playing position
! 	gdk.threads_leave ()
  	self.cb_position_notify ()
! 	gdk.threads_enter ()

      def __gtkcb_destroy (self, widget):
  	"""Callback handler for a destroy signal."""

!         gdk.threads_leave ()
  	self.__cp.unregister_notifier (self)
!         gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 140,153 ----

  	# Dragging is done, so we should show now playing position
! 	gtk.gdk.threads_leave ()
  	self.cb_position_notify ()
! 	gtk.gdk.threads_enter ()

      def __gtkcb_destroy (self, widget):
  	"""Callback handler for a destroy signal."""

!         gtk.gdk.threads_leave ()
  	self.__cp.unregister_notifier (self)
!         gtk.gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 253,264 ****

  	# Set right value
! 	if thread:  gdk.threads_enter ()
  	self.set_text (s)
! 	if thread:  gdk.threads_leave ()

      def __gtkcb_destroy (self, widget):
  	"""Callback for a destroy signal."""

!         gdk.threads_leave ()
  	self.__cp.unregister_notifier (self)
!         gdk.threads_enter ()
--- 252,263 ----

  	# Set right value
! 	if thread:  gtk.gdk.threads_enter ()
  	self.set_text (s)
! 	if thread:  gtk.gdk.threads_leave ()

      def __gtkcb_destroy (self, widget):
  	"""Callback for a destroy signal."""

!         gtk.gdk.threads_leave ()
  	self.__cp.unregister_notifier (self)
!         gtk.gdk.threads_enter ()

Index: language.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/language.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** language.py	16 Aug 2002 05:43:08 -0000	1.1
--- language.py	19 Aug 2002 16:45:37 -0000	1.2
***************
*** 18,64 ****
  #   $Id$
  #
- # XXX  XXX XXX XXX XXX XXX XXX XXX XXX XXX  XXX
- # XXX This is UTF8 encoded file. Be careful XXX
- # XXX  XXX XXX XXX XXX XXX XXX XXX XXX XXX  XXX

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$"
! __version__ = "$Revision$"
  __license__ = "GNU"

! import locale
! 
! language, charset = locale.getlocale ()
! 
! # All translations
! translations = {
!     # Russian
!     'ru_RU' : { 
! 		'Sorting field'			:   "ÐÐ¾Ð»Ðµ ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ¸",
! 		'Add'				:   "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ",
! 		'Remove'			:   "Ð£Ð´Ð°Ð»Ð¸ÑÑ",
! 		'Playtime'			:   "ÐÐ»Ð¸ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ",
! 		'Year'				:   "ÐÐ¾Ð´",
! 		'Track'				:   "ÐÐ¾Ð¼ÐµÑ",
! 		'Title'				:   "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº",
! 		'Album'				:   "ÐÐ»ÑÐ±Ð¾Ð¼",
! 		'Artist'			:   "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»Ñ",
! 		'Genre'				:   "ÐÐ°Ð½Ñ",
! 		'Comment'			:   "ÐÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹",
! 		'Filename'			:   "ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð°",
! 		'Clear'				:   "ÐÑÐ¸ÑÑÐ¸ÑÑ",
! 		'Do you want to clear playlist?'
! 						:   "ÐÑ ÑÐ¾ÑÐ¸ÑÐµ Ð¾ÑÐ¸ÑÑÐ¸ÑÑ Ð¿Ð»ÑÐ¹Ð»Ð¸ÑÑ?",
! 		'Do you want to remove selected items from the playlist?'
! 						:   "ÐÑ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ ÐºÐ¾Ð¼Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¸ Ð¸Ð· Ð¿Ð»ÑÐ¹Ð»Ð¸ÑÑÐ°?",
! 		'Sort'				:   "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ",
! 		'Sorting priorities'		:   "ÐÑÐ¸Ð¾ÑÐ¸ÑÐµÑÑ ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ¸"
! 	      }
! }
! 
! # Select only one translation which is good for a current language
! translation = translations [language]
! del translations

! def tr (sentence):
!     return translation.get (sentence, sentence)
--- 18,36 ----
  #   $Id$
  #

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$".split()[1]
! __version__ = "$Revision$".split()[1]
  __license__ = "GNU"

! import gettext

! # Set translation handler
! try:
!     tr = gettext.translation ("aptk").ugettext
! except IOError:
!     try:
! 	tr = gettext.translation ("aptk", "/usr/local/share/locale").ugettext
!     except IOError:
! 	def tr (s):
! 	    return s

Index: misc.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/misc.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** misc.py	16 Aug 2002 05:36:11 -0000	1.7
--- misc.py	19 Aug 2002 16:45:37 -0000	1.8
***************
*** 20,25 ****

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$"
! __version__ = "$Revision$"
  __license__ = "GNU"

--- 20,25 ----

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$".split()[1]
! __version__ = "$Revision$".split()[1]
  __license__ = "GNU"

Index: pan.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/pan.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pan.py	28 Jul 2002 13:45:46 -0000	1.6
--- pan.py	19 Aug 2002 16:45:37 -0000	1.7
***************
*** 20,29 ****

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$"
! __version__ = "$Revision$"
  __license__ = "GNU"

! import aptk.misc, alsaplayer, gtk
! gdk = gtk.gdk

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 20,31 ----

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$".split()[1]
! __version__ = "$Revision$".split()[1]
  __license__ = "GNU"

! import aptk.misc, alsaplayer, gtk, aptk.language
! 
! # Setup for i18n
! _ = aptk.language.tr

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 54,65 ****
  	self.connect ("destroy", self.__gtkcb_destroy)

- 
      def __gtkcb_pan_changed (self, w):
  	"""Gtk callback handler for scale changes."""

  	if not self.__cp_locked:
! 	    gdk.threads_leave ()
  	    self.__cp.set_pan (w.value);
! 	    gdk.threads_enter ()

      def cb_pan_changed (self, pan):
--- 56,66 ----
  	self.connect ("destroy", self.__gtkcb_destroy)

      def __gtkcb_pan_changed (self, w):
  	"""Gtk callback handler for scale changes."""

  	if not self.__cp_locked:
! 	    gtk.gdk.threads_leave ()
  	    self.__cp.set_pan (w.value);
! 	    gtk.gdk.threads_enter ()

      def cb_pan_changed (self, pan):
***************
*** 68,74 ****
  	self.__cp_locked = 1

!         gdk.threads_enter ()
  	self.__adj.set_value (pan)
!         gdk.threads_leave ()

  	self.__cp_locked = 0
--- 69,75 ----
  	self.__cp_locked = 1

!         gtk.gdk.threads_enter ()
  	self.__adj.set_value (pan)
!         gtk.gdk.threads_leave ()

  	self.__cp_locked = 0
***************
*** 77,83 ****
  	"""Called on the destroy."""

!         gdk.threads_leave ()
  	self.__cp.unregister_notifier (self)
!         gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 78,84 ----
  	"""Called on the destroy."""

!         gtk.gdk.threads_leave ()
  	self.__cp.unregister_notifier (self)
!         gtk.gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 109,115 ****

      def __gtkcb_clicked (self, w):
!         gdk.threads_leave ()
  	self.__cp.set_pan (self.__value)
!         gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 110,116 ----

      def __gtkcb_clicked (self, w):
!         gtk.gdk.threads_leave ()
  	self.__cp.set_pan (self.__value)
!         gtk.gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 117,123 ****
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.pan.left.button.label',	'Left'),
! 	    ('**.pan.center.button.label',	'Center'),
! 	    ('**.pan.right.button.label',	'Right')
      ])

--- 118,124 ----
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.pan.left.button.label',	_('Left')),
! 	    ('**.pan.center.button.label',	_('Center')),
! 	    ('**.pan.right.button.label',	_('Right'))
      ])

Index: playlist.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/playlist.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** playlist.py	16 Aug 2002 05:36:11 -0000	1.13
--- playlist.py	19 Aug 2002 16:45:37 -0000	1.14
***************
*** 20,44 ****

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$"
! __version__ = "$Revision$"
  __license__ = "GNU"

! import gtk, aptk, gobject, locale, aptk.language
! gdk = gtk.gdk

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
  class List (gtk.ScrolledWindow):
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.list.columns',		    ('current', 'playtime', 'track', 'title', 'album',
! 					    'artist', 'year', 'genre')),
! 	    ('**.list.playtime.label',	    aptk.language.tr ('Playtime')),
! 	    ('**.list.year.label',	    aptk.language.tr ('Year')),
! 	    ('**.list.track.label',	    aptk.language.tr ('Track')),
! 	    ('**.list.title.label',	    aptk.language.tr ('Title')),
! 	    ('**.list.album.label',	    aptk.language.tr ('Album')),
! 	    ('**.list.artist.label',	    aptk.language.tr ('Artist')),
! 	    ('**.list.genre.label',	    aptk.language.tr ('Genre')),
! 	    ('**.list.comment.label',	    aptk.language.tr ('Comment')),
! 	    ('**.list.filename.label',	    aptk.language.tr ('Filename')),
  	    ('**.list.current.label',	    ''),
  	    ('**.list.mark.label',	    '-->'),
--- 20,47 ----

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$".split()[1]
! __version__ = "$Revision$".split()[1]
  __license__ = "GNU"

! import gtk, gobject, locale, aptk.language
! 
! # Setup for i18n
! _ = aptk.language.tr

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
  class List (gtk.ScrolledWindow):
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.list.columns',		    ('current', 'playtime', 'track',
! 	    				     'title', 'album', 'artist',
! 					     'year', 'genre')),
! 	    ('**.list.playtime.label',	    _('Playtime')),
! 	    ('**.list.year.label',	    _('Year')),
! 	    ('**.list.track.label',	    _('Track')),
! 	    ('**.list.title.label',	    _('Title')),
! 	    ('**.list.album.label',	    _('Album')),
! 	    ('**.list.artist.label',	    _('Artist')),
! 	    ('**.list.genre.label',	    _('Genre')),
! 	    ('**.list.comment.label',	    _('Comment')),
! 	    ('**.list.filename.label',	    _('Filename')),
  	    ('**.list.current.label',	    ''),
  	    ('**.list.mark.label',	    '-->'),
***************
*** 53,59 ****

      # Types of the first columns
!     __types = (gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING,
! 	       gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING,
! 	       gobject.TYPE_STRING)

      # Numbers for columns
--- 56,62 ----

      # Types of the first columns
!     __types = (gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING,
!     	       gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING,
! 	       gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)

      # Numbers for columns
***************
*** 70,74 ****

      # Blank pixbuf
!     __blank_pixbuf = gdk.Pixbuf (gdk.COLORSPACE_RGB, 1, 8, 1, 1)
      __blank_pixbuf.fill (0)

--- 73,77 ----

      # Blank pixbuf
!     __blank_pixbuf = gtk.gdk.Pixbuf (gtk.gdk.COLORSPACE_RGB, 1, 8, 1, 1)
      __blank_pixbuf.fill (0)

***************
*** 94,98 ****
  	mark_file = prop.get_value (prefix + ".mark.file")
  	if mark_file:
! 	    self.__mark_pixbuf = gdk.pixbuf_new_from_file (mark_file)
  	    current_column_type = gobject.TYPE_OBJECT
  	else:
--- 97,101 ----
  	mark_file = prop.get_value (prefix + ".mark.file")
  	if mark_file:
! 	    self.__mark_pixbuf = gtk.gdk.pixbuf_new_from_file (mark_file)
  	    current_column_type = gobject.TYPE_OBJECT
  	else:
***************
*** 236,241 ****
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.clear.button.label',	    aptk.language.tr ('Clear')),
! 	    ('**.clear.warning',	    aptk.language.tr ('Do you want to clear playlist?')),
  	    ('**.clear.confirm',	    1)
      ])
--- 239,244 ----
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.clear.button.label',	    _('Clear')),
! 	    ('**.clear.warning',	    _('Do you want to clear playlist?')),
  	    ('**.clear.confirm',	    1)
      ])
***************
*** 275,281 ****

  	# Clear if answer is Yes
! 	gtk.threads_leave ()
  	self.__pl.clear ()
! 	gtk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 278,284 ----

  	# Clear if answer is Yes
! 	gtk.gdk.threads_leave ()
  	self.__pl.clear ()
! 	gtk.gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 286,293 ****
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.remove.button.label',
! 			    aptk.language.tr ('Remove')),
! 	    ('**.remove.warning',	    
! 			    aptk.language.tr ('Do you want to remove selected items from the playlist?')),
  	    ('**.remove.confirm',	    1)
      ])
--- 289,295 ----
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.remove.button.label', _('Remove')),
! 	    ('**.remove.warning',
! 	    		_('Do you want to remove selected items from the playlist?')),
  	    ('**.remove.confirm',	    1)
      ])
***************
*** 337,344 ****

  	# TODO: FIx this dumb algorithm
!         gdk.threads_leave ()
  	for n in list:
  	    self.__pl.remove (n+1, n+1)
!         gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 339,346 ----

  	# TODO: FIx this dumb algorithm
!         gtk.gdk.threads_leave ()
  	for n in list:
  	    self.__pl.remove (n+1, n+1)
!         gtk.gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 349,353 ****
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.sort.button.label',	    aptk.language.tr ('Sort'))
      ])

--- 351,355 ----
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.sort.button.label',	    _('Sort'))
      ])

***************
*** 379,385 ****

  	    # Clear if answer is Yes
! 	    gtk.threads_leave ()
  	    self.__pl.sort (d.sequence)
! 	    gtk.threads_enter ()

  	    if rc != gtk.RESPONSE_APPLY:  break
--- 381,387 ----

  	    # Clear if answer is Yes
! 	    gtk.gdk.threads_leave ()
  	    self.__pl.sort (d.sequence)
! 	    gtk.gdk.threads_enter ()

  	    if rc != gtk.RESPONSE_APPLY:  break
***************
*** 391,408 ****
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.dialog.list.field.label',	    aptk.language.tr ('Sorting field')),
  	    ('**.dialog.sequence',		    'AyLNTFGPC'),
! 	    ('**.dialog.title',			    aptk.language.tr ('Sorting priorities')),
! 	    ('**.dialog.list.playtime',		    aptk.language.tr ('Playtime')),
! 	    ('**.dialog.list.year',		    aptk.language.tr ('Year')),
! 	    ('**.dialog.list.track',		    aptk.language.tr ('Track')),
! 	    ('**.dialog.list.title',		    aptk.language.tr ('Title')),
! 	    ('**.dialog.list.album',		    aptk.language.tr ('Album')),
! 	    ('**.dialog.list.artist',		    aptk.language.tr ('Artist')),
! 	    ('**.dialog.list.genre',		    aptk.language.tr ('Genre')),
! 	    ('**.dialog.list.comment',		    aptk.language.tr ('Comment')),
! 	    ('**.dialog.list.filename',		    aptk.language.tr ('Filename'))
      ])

      __chars = {
  	    'a'	    :   ("artist",	gtk.TRUE),
--- 393,411 ----
      # Defualt properties
      __properties = aptk.misc.WidgetProperties ([
! 	    ('**.dialog.list.field.label',	    _('Sorting field')),
  	    ('**.dialog.sequence',		    'AyLNTFGPC'),
! 	    ('**.dialog.title',			    _('Sorting priorities')),
! 	    ('**.dialog.list.playtime',		    _('Playtime')),
! 	    ('**.dialog.list.year',		    _('Year')),
! 	    ('**.dialog.list.track',		    _('Track')),
! 	    ('**.dialog.list.title',		    _('Title')),
! 	    ('**.dialog.list.album',		    _('Album')),
! 	    ('**.dialog.list.artist',		    _('Artist')),
! 	    ('**.dialog.list.genre',		    _('Genre')),
! 	    ('**.dialog.list.comment',		    _('Comment')),
! 	    ('**.dialog.list.filename',		    _('Filename'))
      ])

+     # Chars meaning
      __chars = {
  	    'a'	    :   ("artist",	gtk.TRUE),
***************
*** 588,592 ****
  	"""Alsaplayer's callback."""

! 	gdk.threads_enter ()

  	for item in items:
--- 591,595 ----
  	"""Alsaplayer's callback."""

! 	gtk.gdk.threads_enter ()

  	for item in items:
***************
*** 603,612 ****
  	    pos += 1

! 	gdk.threads_leave ()

      def cb_updated (self, item, pos):
  	"""Alsaplayer's callback."""

! 	gdk.threads_enter ()

  	self.__list.set (pos,
--- 606,615 ----
  	    pos += 1

! 	gtk.gdk.threads_leave ()

      def cb_updated (self, item, pos):
  	"""Alsaplayer's callback."""

! 	gtk.gdk.threads_enter ()

  	self.__list.set (pos,
***************
*** 621,639 ****
  			 filename = item.filename)

! 	gdk.threads_leave ()

      def cb_set_current (self, row):
  	"""Alsaplayer's callback."""

!         gdk.threads_enter ()
  	self.__list.mark_row (row-1)
!         gdk.threads_leave ()

      def cb_clear (self):
  	"""Alsaplayer's callback."""

!         gdk.threads_enter ()
  	self.__list.clear ()
! 	gdk.threads_leave ()

      def cb_remove (self, start, end):
--- 624,642 ----
  			 filename = item.filename)

! 	gtk.gdk.threads_leave ()

      def cb_set_current (self, row):
  	"""Alsaplayer's callback."""

!         gtk.gdk.threads_enter ()
  	self.__list.mark_row (row-1)
!         gtk.gdk.threads_leave ()

      def cb_clear (self):
  	"""Alsaplayer's callback."""

!         gtk.gdk.threads_enter ()
  	self.__list.clear ()
! 	gtk.gdk.threads_leave ()

      def cb_remove (self, start, end):
***************
*** 646,657 ****
  	"""Handler for a row activated signal."""

! 	gdk.threads_leave ()
  	self.__pl.play (path [0] + 1)
!         gdk.threads_enter ()

      def __gtkcb_destroy (self, widget):
  	"""Called on the destroy."""

!         gdk.threads_leave ()
  	self.__pl.unregister (self)
!         gdk.threads_enter ()
--- 649,660 ----
  	"""Handler for a row activated signal."""

! 	gtk.gdk.threads_leave ()
  	self.__pl.play (path [0] + 1)
!         gtk.gdk.threads_enter ()

      def __gtkcb_destroy (self, widget):
  	"""Called on the destroy."""

!         gtk.gdk.threads_leave ()
  	self.__pl.unregister (self)
!         gtk.gdk.threads_enter ()

Index: position.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/position.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** position.py	21 Jul 2002 18:15:43 -0000	1.4
--- position.py	19 Aug 2002 16:45:37 -0000	1.5
***************
*** 20,29 ****

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$"
! __version__ = "$Revision$"
  __license__ = "GNU"

  import alsaplayer, gtk, aptk.misc
- gdk = gtk.gdk

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 20,28 ----

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$".split()[1]
! __version__ = "$Revision$".split()[1]
  __license__ = "GNU"

  import alsaplayer, gtk, aptk.misc

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
***************
*** 60,69 ****
  	can_seek = self.__cp.can_seek ()

! 	if thread:  gdk.threads_enter ()

  	self.__adj.upper = float (self.__cp.get_frames () - 34)
  	self.set_sensitive (can_seek)

! 	if thread:  gdk.threads_leave ()

      def cb_position_notify (self, pos):
--- 59,68 ----
  	can_seek = self.__cp.can_seek ()

! 	if thread:  gtk.gdk.threads_enter ()

  	self.__adj.upper = float (self.__cp.get_frames () - 34)
  	self.set_sensitive (can_seek)

! 	if thread:  gtk.gdk.threads_leave ()

      def cb_position_notify (self, pos):
***************
*** 75,81 ****
  	    # FIXME:
  	    # Hack derived from Andy's gtk_interface.cpp. Why 34 is here? ;)
! 	    gdk.threads_enter ()
  	    self.__adj.set_value (pos)
! 	    gdk.threads_leave ()

      def __gtkcb_press_event (self, widget, event):
--- 74,80 ----
  	    # FIXME:
  	    # Hack derived from Andy's gtk_interface.cpp. Why 34 is here? ;)
! 	    gtk.gdk.threads_enter ()
  	    self.__adj.set_value (pos)
! 	    gtk.gdk.threads_leave ()

      def __gtkcb_press_event (self, widget, event):
***************
*** 94,100 ****

  	if self.__motion:
! 	    gdk.threads_leave ()
  	    self.__cp.seek (self.__adj.value)
! 	    gdk.threads_enter ()

  	self.__dragging = 0
--- 93,99 ----

  	if self.__motion:
! 	    gtk.gdk.threads_leave ()
  	    self.__cp.seek (self.__adj.value)
! 	    gtk.gdk.threads_enter ()

  	self.__dragging = 0
***************
*** 103,109 ****
  	"""Called on the destroy."""

!         gdk.threads_leave ()
  	self.__cp.unregister_notifier (self)
!         gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
--- 102,108 ----
  	"""Called on the destroy."""

!         gtk.gdk.threads_leave ()
  	self.__cp.unregister_notifier (self)
!         gtk.gdk.threads_enter ()

  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

Index: speed.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/speed.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** speed.py	28 Jul 2002 13:45:47 -0000	1.6
--- speed.py	19 Aug 2002 16:45:37 -0000	1.7
***************
*** 20,29 ****

  __author__ = "Evgeny Chukreev <co...@ec...>"
! __date__ = "$Date$"
! __version__ = "$Revision$"
  __license__ = "GNU"

  import alsaplayer, gtk, aptk.misc
- gdk = gtk.gdk

  # # # # # # # # # # ...

[truncated message content]

Thread: [Ap-python-commits] python/aptk __init__.py,1.4,1.5 control.py,1.9,1.10 info.py,1.10,1.11 language.p

ap-python-commits

Thread: [Ap-python-commits] python/aptk init.py,1.4,1.5 control.py,1.9,1.10 info.py,1.10,1.11 language.p