Author: duncan
Date: Fri Jul 13 09:57:26 2007
New Revision: 9756
Log:
[ 1752971 ] Scrollable Headlines
Patch from Adam Charrett applied
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/share/skins/main/basic.fxd
branches/rel-1/freevo/src/plugins/headlines.py
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Fri Jul 13 09:57:26 2007
@@ -21,6 +21,7 @@
* Added sounds to menu selection, enabled with OSD_SOUNDS_ENABLED (F#1732380)
* Added translation for Greek (F#)
* Added XINE_BOOKMARK for when xine has support for get_time, default is off
(B#1745076)
+ * Updated headlines to allow the window to be scrolled (F#1752971)
* Updated childapp to use subprocess instead of popen (F#1729597)
* Updated freevo to allow X server options to be passed when using -fs
(F#1749908)
* Updated local_conf.py.example with MPLAYER_HAS_FIELD_DOMINANCE (F#1729404)
Modified: branches/rel-1/freevo/share/skins/main/basic.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/basic.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/basic.fxd Fri Jul 13 09:57:26 2007
@@ -814,7 +814,10 @@
<screen layout="screen" x="0" y="0" width="800" height="600"/>
<title visible="not idlebar" layout="title" x="10" y="10"
width="780" height="80"/>
- <info layout="info" x="10" y="110" width="780" height="480"/>
+ <scrollabletext layout="info" x="10" y="110" width="740"
height="480 - buttonbar_height">
+ <image x="758" y="110" width="32" height="32" label="uparrow"
filename="up.png"/>
+ <image x="758" y="max-32" width="32" height="32"
label="downarrow" filename="down.png"/>
+ </scrollabletext>
</headlines>
<!--
*******************************************************
Modified: branches/rel-1/freevo/src/plugins/headlines.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/headlines.py (original)
+++ branches/rel-1/freevo/src/plugins/headlines.py Fri Jul 13 09:57:26 2007
@@ -49,10 +49,10 @@
#get the singletons so we get skin info and access the osd
-skin = skin.get_singleton()
+skin_object = skin.get_singleton()
osd = osd.get_singleton()
-skin.register('headlines', ('screen', 'title', 'info', 'plugin'))
+skin_object.register('headlines', ('screen', 'title', 'scrollabletext',
'plugin'))
#check every 30 minutes
MAX_HEADLINE_AGE = 1800
@@ -96,7 +96,8 @@
self.menuw = menuw
self.menuw.hide(clear=False)
rc.app(self)
- skin.draw('headlines', item)
+ self.scrollable_text = skin.ScrollableText(item.description)
+ skin_object.draw('headlines', self)
def eventhandler(self, event, menuw=None):
@@ -107,6 +108,14 @@
rc.app(None)
self.menuw.show()
return True
+ elif event == 'MENU_UP':
+ self.scrollable_text.scroll(True)
+ skin_object.draw('headlines', self)
+ return True
+ elif event == 'MENU_DOWN':
+ self.scrollable_text.scroll(False)
+ skin_object.draw('headlines', self)
+ return True
return False
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
