From 7cce80676f85b6ce955befbd616410109acc97cd Mon Sep 17 00:00:00 2001 From: "(null)" <(null)> Date: Tue, 3 Apr 2007 07:40:10 -0700 Subject: [PATCH] Theme changes, fix for unicode conversion errors, misc --- images/gtk-media-forward.svg | 254 --------------- images/gtk-media-next.svg | 281 ----------------- images/gtk-media-pause.svg | 312 ------------------- images/gtk-media-play.svg | 273 ---------------- images/gtk-media-previous.svg | 284 ----------------- images/gtk-media-record.svg | 192 ------------ images/gtk-media-rewind.svg | 254 --------------- images/gtk-media-stop.svg | 705 ------------------------------------------ images/media-eject.svg | 264 ---------------- musicbox.py | 5 +- playlist.py | 20 +- 11 files changed, 11 insertions(+), 2833 deletions(-) delete mode 100644 images/gtk-media-forward.svg delete mode 100644 images/gtk-media-next.svg delete mode 100644 images/gtk-media-pause.svg delete mode 100644 images/gtk-media-play.svg delete mode 100644 images/gtk-media-previous.svg delete mode 100644 images/gtk-media-record.svg delete mode 100644 images/gtk-media-rewind.svg delete mode 100644 images/gtk-media-stop.svg delete mode 100644 images/media-eject.svg diff --git a/images/gtk-media-forward.svg b/images/gtk-media-forward.svg deleted file mode 100644 index 6256bef..0000000 --- a/images/gtk-media-forward.svg +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/gtk-media-next.svg b/images/gtk-media-next.svg deleted file mode 100644 index e759660..0000000 --- a/images/gtk-media-next.svg +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/gtk-media-pause.svg b/images/gtk-media-pause.svg deleted file mode 100644 index a0a5cf1..0000000 --- a/images/gtk-media-pause.svg +++ /dev/null @@ -1,312 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/gtk-media-play.svg b/images/gtk-media-play.svg deleted file mode 100644 index cf3f956..0000000 --- a/images/gtk-media-play.svg +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/gtk-media-previous.svg b/images/gtk-media-previous.svg deleted file mode 100644 index 5abd00b..0000000 --- a/images/gtk-media-previous.svg +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/gtk-media-record.svg b/images/gtk-media-record.svg deleted file mode 100644 index 9b4df4f..0000000 --- a/images/gtk-media-record.svg +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/gtk-media-rewind.svg b/images/gtk-media-rewind.svg deleted file mode 100644 index 55d54b9..0000000 --- a/images/gtk-media-rewind.svg +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/gtk-media-stop.svg b/images/gtk-media-stop.svg deleted file mode 100644 index 53fb500..0000000 --- a/images/gtk-media-stop.svg +++ /dev/null @@ -1,705 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/media-eject.svg b/images/media-eject.svg deleted file mode 100644 index b233a51..0000000 --- a/images/media-eject.svg +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/musicbox.py b/musicbox.py index e6c78c5..a18ed10 100644 --- a/musicbox.py +++ b/musicbox.py @@ -57,9 +57,10 @@ BTN_OPTIONS = 8 factory = gtk.IconFactory() for name in [ # uncomment these two lines to use the icons in 'images' directory instead of GTK theme -# 'gtk-media-stop', 'gtk-media-pause', 'gtk-media-play', 'gtk-media-record' +# 'gtk-media-stop', 'gtk-media-pause', 'gtk-media-play', 'gtk-media-record', # 'gtk-media-next', 'gtk-media-previous', 'gtk-media-forward', 'gtk-media-rewind', - 'media-eject', 'media-repeat', 'media-shuffle', +# 'media-eject', + 'media-repeat', 'media-shuffle', # 'media_track', 'stock_playlist', # 'stock_volume-max', 'stock_volume-med', 'stock_volume-min', # 'stock_volume-mute', 'stock_volume-0' diff --git a/playlist.py b/playlist.py index 27a22fc..5afc3cf 100644 --- a/playlist.py +++ b/playlist.py @@ -283,18 +283,14 @@ class Playlist(saving.Saveable, gobject.GObject): except: rox.info('Unsupported format: %s' % song.filename) - try: - song.title = song.title.encode('utf8') - except: rox.report_exception() - try: - song.artist = song.artist.encode('utf8') - except: rox.report_exception() - try: - song.album = song.album.encode('utf8') - except: rox.report_exception() - try: - song.genre = song.genre.encode('utf8') - except: rox.report_exception() + try: song.title = song.title.encode('utf8') + except: pass + try: song.artist = song.artist.encode('utf8') + except: pass + try: song.album = song.album.encode('utf8') + except: pass + try: song.genre = song.genre.encode('utf8') + except: pass song.title = strip_padding(song.title) song.artist = strip_padding(song.artist) -- 2.11.4.GIT