[Ap-python-commits] python/aptk control.py,1.8,1.9 info.py,1.9,1.10 misc.py,1.5,1.6 pan.py,1.5,1.6 p
Status: Beta
Brought to you by:
sjah
|
From: <sj...@us...> - 2002-07-28 13:45:50
|
Update of /cvsroot/ap-python/python/aptk
In directory usw-pr-cvs1:/tmp/cvs-serv30421/aptk
Modified Files:
control.py info.py misc.py pan.py playlist.py speed.py
Log Message:
Add ** regexp to property key and changed meaning of a * regexp.
Index: control.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/control.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** control.py 28 Jul 2002 13:32:12 -0000 1.8
--- control.py 28 Jul 2002 13:45:46 -0000 1.9
***************
*** 39,43 ****
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('*.play.button.label', 'Play')
])
--- 39,43 ----
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('**.play.button.label', 'Play')
])
***************
*** 67,71 ****
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('*.next.button.label', 'Next')
])
--- 67,71 ----
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('**.next.button.label', 'Next')
])
***************
*** 95,99 ****
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('*.prev.button.label', 'Prev')
])
--- 95,99 ----
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('**.prev.button.label', 'Prev')
])
***************
*** 123,127 ****
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('*.stop.button.label', 'Stop')
])
--- 123,127 ----
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('**.stop.button.label', 'Stop')
])
***************
*** 153,157 ****
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('*.playlist.button.label', 'Playlist')
])
--- 153,157 ----
# 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** info.py 23 Jul 2002 09:01:55 -0000 1.9
--- info.py 28 Jul 2002 13:45:46 -0000 1.10
***************
*** 191,196 ****
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('*.tagsinfo.format', '%a - %t'),
! ('*.tagsinfo.charset', None)
])
--- 191,196 ----
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('**.tagsinfo.format', '%a - %t'),
! ('**.tagsinfo.charset', None)
])
Index: misc.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/misc.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** misc.py 23 Jul 2002 09:01:55 -0000 1.5
--- misc.py 28 Jul 2002 13:45:46 -0000 1.6
***************
*** 47,52 ****
# Allow only * in regexps
! key = key.replace ("*", "MiU2hLo4SpI5GN999UeSED")
key = re.escape (key)
key = "^" + key.replace ("MiU2hLo4SpI5GN999UeSED", ".*") + "$"
--- 47,56 ----
# Allow only * in regexps
! key = key.replace ("**", "MiU2hLo4SpI5GN999UeSED")
! key = key.replace ("*", "wep33prir666wvr22r12rr")
!
key = re.escape (key)
+
+ key = key.replace ("wep33prir666wvr22r12rr", "[a-zA-Z]*")
key = "^" + key.replace ("MiU2hLo4SpI5GN999UeSED", ".*") + "$"
***************
*** 84,90 ****
# Defualt properties
__properties = WidgetProperties ([
! ('*.button.relief', None),
! ('*.button.label', ''),
! ('*.button.file', None),
])
--- 88,94 ----
# Defualt properties
__properties = WidgetProperties ([
! ('**.button.relief', None),
! ('**.button.label', ''),
! ('**.button.file', None),
])
Index: pan.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/pan.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pan.py 21 Jul 2002 18:15:43 -0000 1.5
--- pan.py 28 Jul 2002 13:45:46 -0000 1.6
***************
*** 117,123 ****
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('*.pan.left.button.label', 'Left'),
! ('*.pan.center.button.label', 'Center'),
! ('*.pan.right.button.label', 'Right')
])
--- 117,123 ----
# 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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** playlist.py 28 Jul 2002 13:32:12 -0000 1.11
--- playlist.py 28 Jul 2002 13:45:46 -0000 1.12
***************
*** 32,51 ****
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', '-->'),
! ('*.list.*.file', None),
! ('*.list.*.alignment', 0.5),
! ('*.list.charset', None)
])
--- 32,51 ----
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', '-->'),
! ('**.list.*.file', None),
! ('**.list.*.alignment', 0.5),
! ('**.list.charset', None)
])
***************
*** 238,244 ****
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('*.clear.button.label', 'Clear'),
! ('*.clear.warning', 'Do you want to clear playlist?'),
! ('*.clear.confirm', 1)
])
--- 238,244 ----
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('**.clear.button.label', 'Clear'),
! ('**.clear.warning', 'Do you want to clear playlist?'),
! ('**.clear.confirm', 1)
])
***************
*** 288,294 ****
# 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)
])
--- 288,294 ----
# 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)
])
***************
*** 379,390 ****
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
class PlaylistWindow (gtk.Window):
- __properties = aptk.misc.WidgetProperties ([
- ('*.playlist.clear.button.label', 'Clear'),
- ('*.playlist.remove.button.label', 'Remove'),
- ('*.playlist.add.button.label', 'Add'),
- ('*.playlist.load.button.label', 'Load'),
- ('*.playlist.save.button.label', 'Save')
- ])
-
def __init__ (self, pl, prop = None, prefix = ""):
"""Initializer."""
--- 379,382 ----
***************
*** 394,399 ****
# Create new properties whth our defaults added
- # prop = prop and (prop + self.__properties) or self.__properties
- prop = prop and (prop + self.__properties) or self.__properties
prefix += '.playlist'
--- 386,389 ----
Index: speed.py
===================================================================
RCS file: /cvsroot/ap-python/python/aptk/speed.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** speed.py 21 Jul 2002 18:15:43 -0000 1.5
--- speed.py 28 Jul 2002 13:45:47 -0000 1.6
***************
*** 116,122 ****
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('*.speed.pause.button.label', '||'),
! ('*.speed.backward.button.label', 'Rw'),
! ('*.speed.forward.button.label', 'Fw')
])
--- 116,122 ----
# Defualt properties
__properties = aptk.misc.WidgetProperties ([
! ('**.speed.pause.button.label', '||'),
! ('**.speed.backward.button.label', 'Rw'),
! ('**.speed.forward.button.label', 'Fw')
])
|