Author: dmeyer
Date: Fri Dec 7 16:45:00 2007
New Revision: 10188
Log:
fix playlist and directory info in skin
Modified:
trunk/ui/share/skins/main/blurr.fxd
trunk/ui/src/playlist.py
Modified: trunk/ui/share/skins/main/blurr.fxd
==============================================================================
--- trunk/ui/share/skins/main/blurr.fxd (original)
+++ trunk/ui/share/skins/main/blurr.fxd Fri Dec 7 16:45:00 2007
@@ -193,12 +193,12 @@
<item type="playlist">
<text font="info label">Playlist</text>
<newline/>
- <if expression="len(playlist)>0">
- <text font="info value" expression="len(playlist)"/>
+ <if expression="len(choices)>0">
+ <text font="info value" expression="len(choices)"/>
<text font="info value"> items in this playlist</text>
<newline/>
</if>
- <if expression="len(playlist)==0">
+ <if expression="len(choices)==0">
<text font="info value">This playlist is empty!</text>
<newline/>
</if>
@@ -321,11 +321,11 @@
<content x="0" y="0" type="text" spacing="20" font="default">
<!-- audio dir -->
<item type="default">
- <if expression="display_type == 'audio' and artist">
+ <if expression="artist">
<text font="info tagline" expression="artist"/>
<newline/>
</if>
- <if expression="display_type == 'audio' and album">
+ <if expression="album">
<text font="info value" expression="album" mode="soft"
/>
<newline/>
</if>
@@ -334,18 +334,18 @@
<newline/>
</if>
- <if expression="display_type == 'audio' and year">
+ <if expression="year">
<if expression="album or artist">
<text font="info value" expression="year"/>
<newline/>
</if>
</if>
- <if expression="display_type == 'audio' and length">
+ <if expression="length">
<text font="info value" expression="length"/>
<newline/>
</if>
<if expression="type == 'playlist'">
- <text font="info value" expression="len(playlist)"/>
+ <text font="info value" expression="len(choices)"/>
<text font="info value"> Items</text>
<newline/>
</if>
@@ -484,7 +484,7 @@
<item type="playlist">
<text font="info tagline" width="max" expression="name"/>
<newline/>
- <text font="info value" expression="len(playlist)"/>
+ <text font="info value" expression="len(choices)"/>
<text font="info value"> Items</text>
<!-- other values are num_play_items and num_dir_items -->
</item>
Modified: trunk/ui/src/playlist.py
==============================================================================
--- trunk/ui/src/playlist.py (original)
+++ trunk/ui/src/playlist.py Fri Dec 7 16:45:00 2007
@@ -124,15 +124,6 @@
return playlist
- def __len__(self):
- """
- Return length of playlist.
- """
- if not self._playlist_valid:
- self._playlist_create_items()
- return len(self.choices)
-
-
def _read_pls(self, plsname, content):
"""
This is the (pls) playlist reading function.
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
