Merge lp:wahcade into lp:~andy-balcombe/wahcade/0.99pre5

[rdsanles]

[lp:wahcade]

12. By Andy Balcombe <email address hidden> on 2009-05-17

nearly ready for 99pre8

13. By Andy Balcombe <email address hidden> on 2009-05-19

Fix #377827

14. By Andy Balcombe <email address hidden> on 2009-06-15

couple'o'fixes

15. By Andy Balcombe <email address hidden> on 2009-06-28

New music / movie options

16. By Andy Balcombe <email address hidden> on 2009-07-06

Italian translation

17. By Andy Balcombe <email address hidden> on 2009-07-19

Fix for 400054

18. By Andy Balcombe <email address hidden> on 2009-07-19

0.99pre8

19. By Andy Balcombe <email address hidden> on 2010-02-01

Some bug fixes

20. By Andy Balcombe <email address hidden> on 2010-02-03

Added scroll fix

21. By Andy Balcombe <email address hidden> on 2010-04-02

v1.0 pre1

22. By Andy Balcombe <email address hidden> on 2010-04-22

merged enrico-magrella/wahcade/20100413

23. By Andy Balcombe <email address hidden> on 2010-05-09

Fixed: #573073

24. By Andy Balcombe <email address hidden> on 2011-01-07

video playback rewrite, incomplete

25. By Andy Balcombe <email address hidden> on 2011-03-03

movie fix

Unmerged revisions

25. By Andy Balcombe <email address hidden> on 2011-03-03

movie fix

24. By Andy Balcombe <email address hidden> on 2011-01-07

video playback rewrite, incomplete

23. By Andy Balcombe <email address hidden> on 2010-05-09

Fixed: #573073

22. By Andy Balcombe <email address hidden> on 2010-04-22

merged enrico-magrella/wahcade/20100413

21. By Andy Balcombe <email address hidden> on 2010-04-02

v1.0 pre1

20. By Andy Balcombe <email address hidden> on 2010-02-03

Added scroll fix

19. By Andy Balcombe <email address hidden> on 2010-02-01

Some bug fixes

18. By Andy Balcombe <email address hidden> on 2009-07-19

0.99pre8

17. By Andy Balcombe <email address hidden> on 2009-07-19

Fix for 400054

16. By Andy Balcombe <email address hidden> on 2009-07-06

Italian translation

=== modified file '.bzrignore'
--- .bzrignore	2009-01-07 17:51:46 +0000
+++ .bzrignore	2011-03-03 21:06:42 +0000
@@ -30,3 +30,11 @@
 .layout_editor.py.marks
 .wc_common.py.marks
 .win_main.py.marks
+.wc_setup.py.marks
+glade/layout_editor.glade.bak
+glade/layout_editor.gladep.bak
+glade/wahcade_setup.glade.bak
+glade/wahcade_setup.gladep.bak
+make.log
+.win_filter.py.marks
+.filters.py.marks
 
=== modified file 'VERSION'
--- VERSION	2008-11-30 10:26:19 +0000
+++ VERSION	2011-03-03 21:06:42 +0000
@@ -1,1 +1,1 @@
-0.99pre5
+1.0pre1
 
=== modified file 'bdist_debian.py'
--- bdist_debian.py	2008-11-30 15:09:04 +0000
+++ bdist_debian.py	2011-03-03 21:06:42 +0000
@@ -8,7 +8,8 @@
 #
 # Ammended for Wah!Cade by: Andy Balcombe <[e-mail]> 24-MAR-2008
 
-import os, base64
+import os
+import base64
 import hashlib
 from distutils.core import Command, Distribution
 from distutils.dir_util import remove_tree
@@ -21,6 +22,7 @@
 
 
 class ControlFile(object):
+
     def __init__(self, Installed_Size=0, Long_Description='', Description='', **kwargs):
         self.options = kwargs
         self.description = Description
@@ -36,7 +38,7 @@
         content = []
         for o in order:
             opt = o[2:]
-            if self.options.has_key(opt):
+            if opt in self.options:
                 content.append('%s: %s' % (opt, self.options[opt]))
         #content=['%s: %s' % (k, v) for k,v in self.options.iteritems()]
         content.append('Installed-Size: %d' % self.installed_size)
@@ -101,7 +103,7 @@
         md5sums_fn = './md5sums'
         data_fn = 'data'
         tgz_ext = '.tar.gz'
-        
+
         #
         md5 = ''
         # build everything locally
@@ -121,7 +123,7 @@
                     [m.update(l) for l in file(fname, 'r').readlines()]
                     fname = fname.replace(build_dir, '')[1:]
                     md5 += '%s %s\n' % (m.hexdigest(), fname)
-        
+
         # make compressed tarball
         self.make_archive(os.path.join(dist_dir, data_fn), 'gztar', root_dir=build_dir)
 
@@ -130,17 +132,17 @@
 
         # create control file contents
         ctl = ControlFile(
-            Package = self.name, 
-            Version = self.version, 
-            Section = self.section, 
+            Package = self.name,
+            Version = self.version,
+            Section = self.section,
             Priority = self.priority,
-            Installed_Size = (installed_size / 1024) + 1, 
-            Architecture = 'all', 
+            Installed_Size = (installed_size / 1024) + 1,
+            Architecture = 'all',
             Maintainer = self.maintainer,
-            Depends = self.depends, 
-            Description = self.description, 
+            Depends = self.depends,
+            Description = self.description,
             Long_Description = self.long_description,
-            Recommends = self.recommends, 
+            Recommends = self.recommends,
             Suggests = self.suggests).getContent()
 
         # grab scripts
@@ -154,7 +156,7 @@
 
         # write control file
         file(control_fn, 'wb').write(ctl)
-        
+
         #write md5sums file
         file(md5sums_fn, 'wb').write(md5)
 
@@ -190,9 +192,8 @@
 # new.deb should not cause the same complaints
 #rm -rf tmp
 """ % (package_filename)
-        
+
         #write the script & execute it
         file('fix_deb', 'w').write(fix_script)
         os.chmod('fix_deb', 0755)
         os.system('./fix_deb')
-        
 
=== modified file 'build_deb_package'
--- build_deb_package	2008-11-30 15:09:04 +0000
+++ build_deb_package	2011-03-03 21:06:42 +0000
@@ -22,4 +22,5 @@
 sudo alien --to-rpm $SOURCE/dist/$NAME*$VERSION*.deb
 cp -f $SOURCE/$NAME*$VERSION*.rpm $WWW/projects/$NAME
 mv -f $SOURCE/$NAME*$VERSION*.rpm $SOURCE/dist/rpms
+mv $SOURCE/dist/$NAME*$VERSION*.deb $SOURCE/dist/debs
 
 
=== added directory 'config.dist/layouts/simple_1024x768'
=== added file 'config.dist/layouts/simple_1024x768/layout.lay'
--- config.dist/layouts/simple_1024x768/layout.lay	1970-01-01 00:00:00 +0000
+++ config.dist/layouts/simple_1024x768/layout.lay	2011-03-03 21:06:42 +0000
@@ -0,0 +1,551 @@
+ 1024
+ 768
+ 0
+ main.png
+ 1
+ 5066061
+ 16777215
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 342
+ 0
+ 340
+ 36
+True
+ 1
+ 0
+ 16777215
+Arial
+True
+False
+ 16.0
+ 2
+ 112
+ 21
+ 400
+ 30
+True
+ 1
+ 0
+ 16777215
+Arial
+True
+False
+ 16.0
+ 2
+ 512
+ 21
+ 400
+ 30
+True
+ 1
+ 0
+ 16777215
+Arial
+True
+False
+ 16
+ 2
+ 150
+ 106
+ 724
+ 518
+True
+ 1
+ 0
+ 255
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 767
+ 510
+ 20
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 540
+ 231
+ 270
+ 205
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 328
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 336
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 344
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 352
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 360
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 368
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 376
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 384
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 392
+ 40
+ 320
+ 277
+False
+ 1
+ 0
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 602
+ 510
+ 40
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 643
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 664
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 685
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 706
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 727
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 748
+ 510
+ 20
+ 305
+ 330
+ 3289650
+ 
+ 1
+ 10485760
+ 16777215
+True
+ 1
+ 3289650
+ 255
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 5
+ 305
+ 20
+True
+ 1
+ 3289650
+ 65280
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 32
+ 305
+ 225
+True
+ 1
+ 3289650
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 259
+ 305
+ 20
+True
+ 1
+ 3289650
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 281
+ 305
+ 45
+ 337
+ 260
+ 3289650
+ 
+True
+ 1
+ 3289650
+ 255
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 32
+ 337
+ 20
+True
+ 1
+ 3289650
+ 65280
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 80
+ 337
+ 113
+True
+ 1
+ 3289650
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 200
+ 337
+ 40
+True
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 0
+ 1024
+ 720
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 524
+ 0
+ 500
+ 400
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 401
+ 1024
+ 87
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 30
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 40
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 50
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 60
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 70
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 80
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 90
+ 0
+ 640
+ 430
+True
+ 1
+ 0
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 726
+ 1024
+ 20
+True
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 748
+ 1024
+ 20
 
=== added file 'config.dist/layouts/simple_1024x768/main.png'
 Binary files config.dist/layouts/simple_1024x768/main.png	1970-01-01 00:00:00 +0000 and config.dist/layouts/simple_1024x768/main.png	2011-03-03 21:06:42 +0000 differ
=== added file 'config.dist/layouts/simple_1024x768/main.svg'
--- config.dist/layouts/simple_1024x768/main.svg	1970-01-01 00:00:00 +0000
+++ config.dist/layouts/simple_1024x768/main.svg	2011-03-03 21:06:42 +0000
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1024"
+   height="768"
+   id="svg2882"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="Simple List.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/richard/.wahcade/layouts/Simple_1024x768/Simple List.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs2884">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2890" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.55827438"
+     inkscape:cx="278.37028"
+     inkscape:cy="735.94033"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     borderlayer="true"
+     inkscape:window-width="1024"
+     inkscape:window-height="702"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     showguides="false"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="616.18447,386.90653"
+       id="guide3692" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid4014"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2887">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:0.99000001;stroke-miterlimit:4.4000001;stroke-dasharray:0.99, 5.94;stroke-dashoffset:0"
+       id="rect2898"
+       width="1314.2858"
+       height="1062.8572"
+       x="-149.10706"
+       y="-205.07777"
+       ry="21.73378" />
+    <text
+       xml:space="preserve"
+       style="font-size:100px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Technique BRK;-inkscape-font-specification:Technique BRK"
+       x="211.28438"
+       y="758"
+       id="text2892"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan2894"
+         x="211.28438"
+         y="758">Wah!Cade</tspan></text>
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1.70753038;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2398"
+       width="810"
+       height="48.292469"
+       x="107"
+       y="12.853765"
+       ry="10.747403" />
+  </g>
+</svg>
 
=== added directory 'config.dist/layouts/simple_640x480'
=== added file 'config.dist/layouts/simple_640x480/layout.lay'
--- config.dist/layouts/simple_640x480/layout.lay	1970-01-01 00:00:00 +0000
+++ config.dist/layouts/simple_640x480/layout.lay	2011-03-03 21:06:42 +0000
@@ -0,0 +1,551 @@
+ 640
+ 480
+ 0
+ main.png
+ 1
+ 5066061
+ 16777215
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 342
+ 0
+ 340
+ 36
+True
+ 1
+ 0
+ 16777215
+Arial
+True
+False
+ 16.0
+ 2
+ 30
+ 19
+ 280
+ 30
+True
+ 1
+ 0
+ 16777215
+Arial
+True
+False
+ 16.0
+ 2
+ 328
+ 19
+ 280
+ 30
+True
+ 1
+ 0
+ 16777215
+Arial
+True
+False
+ 16.0
+ 2
+ 24
+ 62
+ 589
+ 314
+True
+ 1
+ 0
+ 255
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 767
+ 510
+ 20
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 540
+ 231
+ 270
+ 205
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 328
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 336
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 344
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 352
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 360
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 368
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 376
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 384
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 392
+ 40
+ 320
+ 277
+False
+ 1
+ 0
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 602
+ 510
+ 40
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 643
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 664
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 685
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 706
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 727
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 748
+ 510
+ 20
+ 305
+ 330
+ 3289650
+ 
+ 1
+ 10485760
+ 16777215
+True
+ 1
+ 3289650
+ 255
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 5
+ 305
+ 20
+True
+ 1
+ 3289650
+ 65280
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 32
+ 305
+ 225
+True
+ 1
+ 3289650
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 259
+ 305
+ 20
+True
+ 1
+ 3289650
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 281
+ 305
+ 45
+ 337
+ 260
+ 3289650
+ 
+True
+ 1
+ 3289650
+ 255
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 32
+ 337
+ 20
+True
+ 1
+ 3289650
+ 65280
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 80
+ 337
+ 113
+True
+ 1
+ 3289650
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 200
+ 337
+ 40
+True
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 0
+ 1024
+ 720
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 524
+ 0
+ 500
+ 400
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 401
+ 1024
+ 87
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 30
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 40
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 50
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 60
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 70
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 80
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 90
+ 0
+ 640
+ 430
+True
+ 1
+ 0
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 726
+ 1024
+ 20
+True
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 748
+ 1024
+ 20
 
=== added file 'config.dist/layouts/simple_640x480/main.png'
 Binary files config.dist/layouts/simple_640x480/main.png	1970-01-01 00:00:00 +0000 and config.dist/layouts/simple_640x480/main.png	2011-03-03 21:06:42 +0000 differ
=== added file 'config.dist/layouts/simple_640x480/main.svg'
--- config.dist/layouts/simple_640x480/main.svg	1970-01-01 00:00:00 +0000
+++ config.dist/layouts/simple_640x480/main.svg	2011-03-03 21:06:42 +0000
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="640"
+   height="480"
+   id="svg2882"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="Simple List.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/richard/.wahcade/layouts/Simple_1024x768/Simple List.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs2884">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2890" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.45725805"
+     inkscape:cx="264.19102"
+     inkscape:cy="91.737357"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     borderlayer="true"
+     inkscape:window-width="1024"
+     inkscape:window-height="702"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     showguides="false"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="616.18447,386.90653"
+       id="guide3692" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid4014"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2887">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:0.99000001;stroke-miterlimit:4.4000001;stroke-dasharray:0.99, 5.94;stroke-dashoffset:0"
+       id="rect2898"
+       width="1314.2858"
+       height="1062.8572"
+       x="-337.14288"
+       y="-291.42859"
+       ry="21.73378" />
+    <text
+       xml:space="preserve"
+       style="font-size:100px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Technique BRK;-inkscape-font-specification:Technique BRK"
+       x="19.284374"
+       y="470"
+       id="text2892"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan2894"
+         x="19.284374"
+         y="470">Wah!Cade</tspan></text>
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1.70753038;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2398"
+       width="600"
+       height="48.292469"
+       x="20"
+       y="10"
+       ry="10.747403" />
+  </g>
+</svg>
 
=== added directory 'config.dist/layouts/simple_800x600'
=== added file 'config.dist/layouts/simple_800x600/layout.lay'
--- config.dist/layouts/simple_800x600/layout.lay	1970-01-01 00:00:00 +0000
+++ config.dist/layouts/simple_800x600/layout.lay	2011-03-03 21:06:42 +0000
@@ -0,0 +1,551 @@
+ 800
+ 600
+ 0
+ main.png
+ 1
+ 5066061
+ 16777215
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 342
+ 0
+ 340
+ 36
+True
+ 1
+ 0
+ 16777215
+Arial
+True
+False
+ 16.0
+ 2
+ 25
+ 19
+ 370
+ 30
+True
+ 1
+ 0
+ 16777215
+Arial
+True
+False
+ 16.0
+ 2
+ 404
+ 19
+ 370
+ 30
+True
+ 1
+ 0
+ 16777215
+Arial
+True
+False
+ 16.0
+ 2
+ 26
+ 65
+ 749
+ 424
+True
+ 1
+ 0
+ 255
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 767
+ 510
+ 20
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 540
+ 231
+ 270
+ 205
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 328
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 336
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 344
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 352
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 360
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 368
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 376
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 384
+ 40
+ 320
+ 277
+False
+ 1
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 392
+ 40
+ 320
+ 277
+False
+ 1
+ 0
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 602
+ 510
+ 40
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 643
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 664
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 685
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 706
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 727
+ 510
+ 20
+False
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 514
+ 748
+ 510
+ 20
+ 305
+ 330
+ 3289650
+ 
+ 1
+ 10485760
+ 16777215
+True
+ 1
+ 3289650
+ 255
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 5
+ 305
+ 20
+True
+ 1
+ 3289650
+ 65280
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 32
+ 305
+ 225
+True
+ 1
+ 3289650
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 259
+ 305
+ 20
+True
+ 1
+ 3289650
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 281
+ 305
+ 45
+ 337
+ 260
+ 3289650
+ 
+True
+ 1
+ 3289650
+ 255
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 32
+ 337
+ 20
+True
+ 1
+ 3289650
+ 65280
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 80
+ 337
+ 113
+True
+ 1
+ 3289650
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 200
+ 337
+ 40
+True
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 0
+ 1024
+ 720
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 524
+ 0
+ 500
+ 400
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 401
+ 1024
+ 87
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 30
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 40
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 50
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 60
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 70
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 80
+ 0
+ 640
+ 430
+False
+ 0
+ 8421504
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 90
+ 0
+ 640
+ 430
+True
+ 1
+ 0
+ 13408512
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 726
+ 1024
+ 20
+True
+ 1
+ 0
+ 16777215
+Sans
+True
+False
+ 9.75
+ 2
+ 0
+ 748
+ 1024
+ 20
 
=== added file 'config.dist/layouts/simple_800x600/main.png'
 Binary files config.dist/layouts/simple_800x600/main.png	1970-01-01 00:00:00 +0000 and config.dist/layouts/simple_800x600/main.png	2011-03-03 21:06:42 +0000 differ
=== added file 'config.dist/layouts/simple_800x600/main.svg'
--- config.dist/layouts/simple_800x600/main.svg	1970-01-01 00:00:00 +0000
+++ config.dist/layouts/simple_800x600/main.svg	2011-03-03 21:06:42 +0000
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="800"
+   height="600"
+   id="svg2882"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="Simple List.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/richard/.wahcade/layouts/Simple_1024x768/Simple List.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs2884">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2890" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.23758383"
+     inkscape:cx="-69.308041"
+     inkscape:cy="306.04419"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     borderlayer="true"
+     inkscape:window-width="1024"
+     inkscape:window-height="702"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     showguides="false"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="616.18447,386.90653"
+       id="guide3692" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid4014"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2887">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:0.99000001;stroke-miterlimit:4.4000001;stroke-dasharray:0.99, 5.94;stroke-dashoffset:0"
+       id="rect2898"
+       width="1314.2858"
+       height="1062.8572"
+       x="-257.14288"
+       y="-231.42859"
+       ry="21.73378" />
+    <text
+       xml:space="preserve"
+       style="font-size:100px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Technique BRK;-inkscape-font-specification:Technique BRK"
+       x="99.284378"
+       y="590"
+       id="text2892"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan2894"
+         x="99.284378"
+         y="590">Wah!Cade</tspan></text>
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1.70753038;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2398"
+       width="760"
+       height="48.292469"
+       x="20"
+       y="10"
+       ry="10.747403" />
+  </g>
+</svg>
 
=== modified file 'config.dist/wahcade.ini'
--- config.dist/wahcade.ini	2009-01-07 17:51:46 +0000
+++ config.dist/wahcade.ini	2011-03-03 21:06:42 +0000
@@ -1,9 +1,11 @@
 ### wahcade.ini (wahcade v0.99) ###
 
-### Addtionnal Wah!Cade Options ###
+### Addtional Wah!Cade Options (not used by MameWAH) ###
 fullscreen                  1
 setup_window_size           400x200
 layout_orientation          0
+show_list_arrows            0
+shuffle_music               0
 
 ### (Global) Screen-Saver Options ###
 delay                       300
@@ -12,13 +14,13 @@
 ### Audio Options ###
 enable_sounds               0
 sound_volume                100
-music_path                  
+music_path
 enable_music                0
 music_volume                70
 
 ### Movie Options ###
-intro_movie_file            
-exit_movie_file             
+intro_movie_file
+exit_movie_file
 keep_movie_preview_aspect   game_aspect
 delay_before_movie_preview  7
 music_movie_mix             mute_movies
@@ -35,14 +37,14 @@
 safe_mode                   0
 show_cursor                 0
 keyboard_led_states         -,-,-
-winipac_file                
-mamewah_ipc_file            
+winipac_file
+mamewah_ipc_file
 lcd_com_port                1
-lcd_settings                
+lcd_settings
 exit_action                 choice
-app_to_run_on_exit          
+app_to_run_on_exit
 
 ### Settings used by MAMEWAH ###
 current_emulator            mame
 locked                      0
-last_ipc                    
+last_ipc
 
=== modified file 'constants.py'
--- constants.py	2009-01-07 17:51:46 +0000
+++ constants.py	2011-03-03 21:06:42 +0000
@@ -4,7 +4,7 @@
 # Application: wah!cade
 # File:        constants.py
 # Description: constants file
-# Copyright (c) 2005-2009   Andy Balcombe <http://www.anti-particle.com>
+# Copyright (c) 2005-2010   Andy Balcombe <http://www.anti-particle.com>
 ###
 #
 # This program is free software; you can redistribute it and/or modify
@@ -30,8 +30,9 @@
 #application constants
 APP_NAME = 'wahcade'
 APP_PATH = os.path.abspath(os.getcwd())
-VERSION = '0.99pre5'
-VERSION_NAME = "Themed Indeed"
+CONFIG_DIR = os.path.expanduser('~/.wahcade')
+VERSION = '1.0pre1'
+VERSION_NAME = "Here we are"
 LAYOUT_GLADE_FILE = os.path.join(APP_PATH, 'glade', 'layout_editor.glade')
 SETUP_GLADE_FILE = os.path.join(APP_PATH, 'glade', 'wahcade_setup.glade')
 LOCALE_DIR = os.path.join(APP_PATH, 'locale')
@@ -49,9 +50,9 @@
 MAME_INI_FILES = ['mame', 'xmame', 'sdlmame', 'advmame', 'mame32', 'mameosx']
 
 #file types
-IMAGE_FILETYPES= ['png', 'jpg', 'jpeg', 'bmp', 'gif']
-MOVIE_FILETYPES= ['avi', 'mpg', 'ogg', 'ogv']
-MUSIC_FILESPEC = '*.ogg;*.oga;*.mp3;*.flac'
+IMAGE_FILETYPES= ['jpg', 'jpeg', 'png', 'bmp', 'gif']
+MOVIE_FILETYPES= ['avi', 'mpg', 'mpeg', 'ogg', 'ogv', 'mp4', 'mov', 'wmv', 'flv', 'mkv']
+MUSIC_FILESPEC = '*.ogg;*.oga;*.mp3;*.flac;*.mid'
 
 #maximum number of lists per emulator
 MAX_LISTS = 100
@@ -79,4 +80,3 @@
 FTR_CLONES_NO = 0
 FTR_CLONES_YES = 1
 FTR_CLONES_BETTER = 2
-
 
=== modified file 'doc/CHANGELOG'
--- doc/CHANGELOG	2009-01-11 16:29:58 +0000
+++ doc/CHANGELOG	2011-03-03 21:06:42 +0000
@@ -1,13 +1,93 @@
 Wah!Cade CHANGELOG
 ==================
+03.Mar.02011 - Movie fix done?  Maybe?
+07.Jan.02011 - Movie fix nearly completed.
+             - Fixed "updatetotalgames()" bug when adding game ot list manually.
+01.Oct.02010 - Added fix to remove_current_game. Thanks to Enrico Magrella.
+27.May.02010 - Tweaked scrolled list row calcs.  Thanks to sairuk for pointers.
+             - Tweaked start / stop timer code.
+09.May.02010 - Fixed #573073: setup crashes with sdlmame 0.137u3.  Added
+               "keyboard" to list of controller types. Thanks to iamlost.
+22.Apr.02010 - Merged Wahcade Setup list changes from Enrico Magrella.
+02.Apr.02010 - Made "scroll-fix" the default.  Use "--old-key-handler" option to
+               revert to old keyboard event handling method.
+01.Apr.02010 - Added extra movie file types.  Thanks to Vítor Baptista.
+03.Feb.02010 - Added "--scroll-fix" workaround option to try and improve
+               scrolling performance on systems that seem to have broken
+               key-press / key-release events (e.g. ubuntu 9.10).
+             - Requried minimum pygtk version is now 2.12.
+             - Fixed bug in history viewer (caused by #376142).
+01.Feb.02010 - Removed unneccessary gtk.glade dependency for most files.
+             - Made config dir easier to change (now in constants.py).
+21.Jan.02010 - Removed old gtk.Toolips() call.
+             - Increased default height of wahcade-setup to 400 pixels.
+             - Fixed video playback issue reported by alain40.
+11.Jan.02010 - Changed filters.py to fix #376142. Thanks to Jason Carter for
+               supplying the fix.
+24.Dec.02009 - Adding midi files to music filespec.
+19.Jul.02009 - Released 0.99pre8 "Could it be?".
+             - Fixed empty game description which could appear in lists.
+             - Fixed #400054: Missing games in filters.  Thanks to 3vi1 for
+               reporting this.
+06.Jul.02009 - Added Italian translation.  Thanks to Diego Pierotto.
+28.Jun.02009 - Stoped music playing during intro / exit movies (reported by
+               Pinball Wizard).
+             - Added shuffle option for music playlists.
+             - Use music_movie_mix in wahcade.ini (merge / mute_movie settings).
+15.Jun.02009 - Fixed problem with cpviewler layout images. Thanks to the Pinball
+               Wizard for spotting this.
+10.Jun.02009 - Hopefully fixed bug #382247.  Thanks to hamelg.
+09.Jun.02009 - Fixed background image bug reported in the forums by dirkomatic.
+               Please see the LAYOUT_EDITOR document for more information
+               on how background images are selected.
+19.May.02009 - Fixed small bug when writing ctrlr .ini file (missing " chars).
+             - Fixed #377827: Launching emulator with alternative command-line
+               options doesn't always work.  Thanks to Jason Carter.
+17.May.02009 - Added "no-pygame" option to disable all joystick use.
+               This can be used in combination with --no-gstreamer to definitely
+               stop Wah!Cade grabbing the sound device.
+             - Added "simple" layouts from battlecat.
+             - Fixed #318606: IndexError: list index out of range.
+14.Apr.02009 - Pressing Escape key should close Property dialogs on Layout
+               Editor.
+             - Added mednafen-pce-tg16.ini template from battlecat.
+             - Renamed mednafen.ini to madnafe-lynx.ini.
+30.Mar.02009 - Released 0.99pre7 "Dizzy".
+28.Mar.02009 - Fixed #350088: UnboundLocalError.
+             - Added some debug text to get some more info on #318921.
+27.Mar.02009 - Released 0.99pre6 "Flumped".
+26.Mar.02009 - Added "no-gstreamer" option to disable all music / video.
+16.Mar.02009 - Yet another attempt at fixing #318921 (joystick looping).
+15.Mar.02009 - Another attempt at fixing #318921 (joystick looping).
+02.Mar.02009 - Fix for #318877 (launch game with invalid external app).
+             - Added mednafen (Zombie) and Vectrex (battlecat) templates.
+             - Added new wahcade.ini option ("show_list_arrows").  Set to 1 to
+               show scroll up/down arrows in Games, Options and History Lists.
+             - Set delay_before_movie_preview to 0 to disable movie playback.
+26.Feb.02009 - Formatted code according to (most) PEP8 standards.
+             - Fixed bug that stopped Mame XML / Catver info from populating in
+               Setup Editor.
+05.Feb.02009 - Another tweak to scrolled_list.py (setattr).
+04.Feb.02009 - Fixed potential bug in Setup Editor where mame settings might not
+               get saved.
+             - Partially fixed #324750 (controls.ini error).
+03.Feb.02009 - New simpler version of Scrolled list - hopefully this will be
+               faster.
+27.Jan.02009 - Added functions to set busy / normal mouse cursor.
+             - Possible fix for #318921 (joystick looping).
+25.Jan.02009 - Fixed #318606 (bug when emulator exe does not exist).
+             - Message window can now wait for a key press to continue.
+19.Jan.02009 - Joystick test label now updates properly in Setup Editor.
+16.Jan.02009 - Fixes for #317750 and #316668 (crashes on startup).
+             - Released 0.99pre5.1 "Fixed Indeed".
 11.Jan.02009 - Released 0.99pre5 "Themed Indeed".
 10.Jan.02009 - Fixed a few problems with list editor.
              - List editor will now attempt to create a list if empty (#0 only).
              - Added Daphne template from Gabesword.
 04.Jan.02009 - Fixed Layout Editor screen sizing.
 24.Dec.02008 - More rotation / layout rework.
-23.Dec.02008 - Reworked rotation code. 
-22.Dec.02008 - Fixed default layouts in Layout Editor.  
+23.Dec.02008 - Reworked rotation code.
+22.Dec.02008 - Fixed default layouts in Layout Editor.
              - Disabled Layout Drop down in Layout Editor as it keeps getting
                the focus when it shouldn't.
              - Created a retro 90deg rotated theme.
@@ -21,7 +101,7 @@
              - Fixed #308973: History Viewer Traceback Crash.
                Thanks to battlecat for reporting this one.
 07.Dec.02008 - Finished "one window" changes.
-05.Dec.02008 - Started change to use just "one window".  Should fix lots of the 
+05.Dec.02008 - Started change to use just "one window".  Should fix lots of the
                focus problems.  This should also fix the message window display.
 30.Nov.02008 - Checked code into launchpad.
              - Fixed layout directory naming bug in setup.py.
@@ -30,7 +110,7 @@
                Thanks to blokeinlondon for reporting this.
 26.Nov.02008 - Fixed #301492: Screensaver - changes window type.
                Thanks to spudgunman for reporting this.
-25.Nov.02008 - Wah!Cade bugs now on launchpad. 
+25.Nov.02008 - Wah!Cade bugs now on launchpad.
 23.Nov.02008 - Started re-theming work.  Big thanks to everyone involved.
              - Added wahcade to launchpad (not the code yet).
              - Tried to fix "video / movie bug" reported by netfire.
@@ -39,7 +119,7 @@
                by spudgunman.
              - Updated default control panel viewer layout.
 28.Oct.02008 - Added various Exit... keyboard shortcuts.
-             - Added hugo, mess (atari 800) emulator templates by Zombie. 
+             - Added hugo, mess (atari 800) emulator templates by Zombie.
 19.Oct.02008 - Added per list background images.  See LAYOUT_EDITOR doc for more
                information.
              - Fixed permssions in config.dist dir.  This is probably causing
@@ -49,7 +129,7 @@
                [clone_of], [display_type], [screen_type], [category]).
              - Better search for logo image for mame emulators.
 15.Oct.02008 - Fixed current_list bug in mame .ini template files. Spotted by
-               bagleemo, msdin2002 and spudgunman. 
+               bagleemo, msdin2002 and spudgunman.
              - Fixed missing PIL library warning message.  Spotted by emarcellus.
 13.Oct.02008 - Fixed "play music" error reported by Dave Baer.
 17.Sep.02008 - Stop game video from playing before playing exit movie. Reported
@@ -58,10 +138,10 @@
              - Some fixes to keep the wahcade main window above desktop panels.
              - Added nestopia template from rbrohman.
              - Added sdlmame template.
-12.Sep.02008 - Added [autorotate] patches from Martin Kalitis.  
+12.Sep.02008 - Added [autorotate] patches from Martin Kalitis.
              - Command line options for external apps are now parsed properly.
                Thanks to zerojay for reporting this one.
-27.Aug.02008 - Sort key list in Setup Editor. 
+27.Aug.02008 - Sort key list in Setup Editor.
 26.Aug.02008 - More work on the rotation patch.
 24.Aug.02008 - Merged Martin Kalitis' excellent layout rotation patches.
              - Try and handle errors from gstreamer video object creation.
@@ -74,7 +154,7 @@
                and http://localarcade.com/screenshotarchive for letting us
                include these.
              - Background should now display on layout load in Layout Editor.
-27.Jun.02008 - Any new .ini config options should now be added to file 
+27.Jun.02008 - Any new .ini config options should now be added to file
                automatically.
 24.Jun.02008 - Remember window size in Setup Editor.
 22.Jun.02008 - Fixed typo in gstreamer version check. Should play stuff again.
@@ -82,8 +162,8 @@
 04.Jun.02008 - Added updated Spanish (es) translation from Nicolás Álvarez.
 26.May.02008 - Added Full Screen option for Layout Editor (battlecat).
              - Fixed volume sliders in Setup Editor (battlecat).
-25.May.02008 - "Add emulator" list (Setup Editor) now sorted in alphabetical 
-               order.  No longer prompted for a save filename unless one already   
+25.May.02008 - "Add emulator" list (Setup Editor) now sorted in alphabetical
+               order.  No longer prompted for a save filename unless one already
                exists (battlecat).
              - Fixed problem where wahcade woulnd't always pick a layout file
                to use.
@@ -91,27 +171,27 @@
 04.May.02008 - Released 0.27 "Fixed?".
              - Fixed deb build script.  Problem was caused by using "ar" to
                build deb files.
-08.Apr.02008 - Added histview files to setup.py.   Well spotted by battlecat. 
+08.Apr.02008 - Added histview files to setup.py.   Well spotted by battlecat.
 03.Apr.02008 - Added md5sum file to bdist_debian.py.
 31.Mar.02008 - Released 0.26 "Splat!".
 30.Mar.02008 - Added "save as" dialog to Add Emulator option in Setup Editor.
              - Check that current emulator exists when starting up.
-             - Added list of possible mame ini filenames to constants.py.   
+             - Added list of possible mame ini filenames to constants.py.
                Required because we treat the mame emulator differently to others.
              - Enable / disable mame only stuff as required in Setup Editor.
 29.Mar.02008 - Create an empty list file when it doesn't already exist.
              - Fixed empty options list bug.
 28.Mar.02008 - Added some more template ini files.  Thanks to battlecat,
                KillsTheWeak and robbforce.
-             - Now picks random artwork from dir matching rom names. Thanks to 
+             - Now picks random artwork from dir matching rom names. Thanks to
                Hioushi (http://www.anti-particle.com/forum/viewtopic.php?t=169).
-24.Mar.02008 - Rewrote deb package builder to use setup.py and deb script from 
+24.Mar.02008 - Rewrote deb package builder to use setup.py and deb script from
                http://home.cfl.rr.com/genecash/nokia/making_packages.html
 22.Mar.02008 - Fixed About dialog bug in deb package.  Thanks to battlecat.
-10.Mar.02008 - Fixed drwVideo bug where gstreamer import fails.  Thanks to 
+10.Mar.02008 - Fixed drwVideo bug where gstreamer import fails.  Thanks to
                stealth for reporting this.
              - Removed win32 checks for gstreamer.
-17.Feb.02008 - Released 0.25 "Yikes!". 
+17.Feb.02008 - Released 0.25 "Yikes!".
 13.Feb.02008 - Added better error handling for gstreamer music object creation.
                Thanks to bonzo for help with this one.
 03.Feb.02008 - Stopped game movies playing during intro / exit movies playback.
@@ -126,12 +206,12 @@
 13.Jan.02008 - Added a couple of bug fixes from nellistc (scroll and cpviewer).
              - Fixed movie player screen saver.
              - Added intro movie playback.
-27.Dec.02007 - Re-worked joystick support in the Setup Editor. 
+27.Dec.02007 - Re-worked joystick support in the Setup Editor.
 21.Dec.02007 - Added zerodiv's excellent joystick patch.  This requires pygame.
 16.Dec.02007 - Added better mouse support to Setup Editor keys dialog.
 10.Dec.02007 - Added Game List Editor.
 08.Dec.02007 - Improved mouse support.
-             - Tweaked shutdown stuff to be more like MameWAH.  Added reboot 
+             - Tweaked shutdown stuff to be more like MameWAH.  Added reboot
                option too.
 05.Dec.02007 - Added nellistc's shutdown patch.
 03.Dec.02007 - Got trackball / spinner scrolling roughly implemented.
@@ -140,10 +220,10 @@
                to "Most Played" or "Longest Played" types.
 19.Oct.02007 - Released 0.23 "Wet Your Whistle".
 14.Oct.02007 - Added some template .ini files for the MESS emulator - cheers to
-               SeTTleR.  The run_mess.sh script should be in the wahcade's 
+               SeTTleR.  The run_mess.sh script should be in the wahcade's
                doc/samples directory.
 13.Oct.02007 - Finished off music stuff.
-             - Added rotation for History Viewer. 
+             - Added rotation for History Viewer.
 10.Oct.02007 - Finished up the new template system in the Setup Editor.
              - Added next / previous music track keys.  More music tidy-up.
              - Added support for vertical layouts. (Text & Lists can be rotated).
@@ -154,11 +234,11 @@
              - Added drop-down list of layouts in the Layout Editor.
 18.Sep.02007 - Implemented Logo images in layouts.  And check for list specific
                background images too.  Thanks to captbaritone for spotting this.
-06.Sep.02007 - Added music config to Setup Editor. 
+06.Sep.02007 - Added music config to Setup Editor.
              - Added another patch (change to emulator dir) from Sylvain Faveau.
-04.Sep.02007 - Fixed bug in layout editor height props.  Cheers to 3NF for 
-               spotting this one. 
-22.Aug.02007 - Started to add music browsing / playback. 
+04.Sep.02007 - Fixed bug in layout editor height props.  Cheers to 3NF for
+               spotting this one.
+22.Aug.02007 - Started to add music browsing / playback.
 21.Aug.02007 - Lots of messing around with file encoding stuff in filters.py.
              - Fixed mameinfo.xml generation in Setup Editor.
 15.Aug.02007 - Impmenting new emulator tempate system in Setup Editor.
@@ -167,23 +247,23 @@
 08.Aug.02007 - Released 0.22 "Viva Viet Vegas".
              - Tidied up gst video initialisation.
 07.Aug.02007 - Updated a few of the docs / quick start guide.
-01.Aug.02007 - Added generate XML file button for mame in Setup Editor. 
+01.Aug.02007 - Added generate XML file button for mame in Setup Editor.
 30.Jul.02007 - Fixed start up bug (image not displayed) in Layout Editor.
              - Fixed missing image bug when emulators are switched. Cheers to
                SeTTleR and ztomiccomputers for spotting this one.
              - Added German (de) translation - huge thanks to SeTTleR.
 29.Jul.02007 - Finished off CPViewer bindings stuff.
-27.Jul.02007 - Store fullscreen setting in wahcade.ini file. Added fullscreen 
+27.Jul.02007 - Store fullscreen setting in wahcade.ini file. Added fullscreen
                option to Setup Editor.
-             - Cleaned up debian packing script.  
+             - Cleaned up debian packing script.
 25.Jul.02007 - Build proper debian / ubuntu package with dependencies.  RPM too.
 23.Jul.02007 - Expanded CPViewer bindings.
-15.Jul.02007 - Display correct menu headings in options dialog. 
+15.Jul.02007 - Display correct menu headings in options dialog.
 08.Jun.02007 - Optimized gstreamer video widget a bit.
 06.Jun.02007 - Replaced mplayer video widget with gstreamer one.
              - Changed Movie Volume checkbox in Setup Editor to a sliding scale.
 02.Jun.02007 - Released 0.21 "Ten Toes Hanging".
-01.Jun.02007 - Added progress bar to "please wait..." dialog on Setup Filters. 
+01.Jun.02007 - Added progress bar to "please wait..." dialog on Setup Filters.
 30.May.02007 - Added NMS file support (Thanks to lowlight for suggesting this).
 28.May.02007 - Added Delete Emulator & Delete Emu List options to Setup Editor.
 26.May.02007 - Fixed config file copying bug.  Should be able to delete files
@@ -210,7 +290,7 @@
 17.Apr.02007 - Big thanks for Sylvain Faveau for the French translation.
 08.Apr.02007 - Fixed screen saver bug in Setup Editor - it should now recognize
                the launch_scr option.
-29.Mar.02007 - Spanish translation - Huge thanks to Nicolás Álvarez. 
+29.Mar.02007 - Spanish translation - Huge thanks to Nicolás Álvarez.
 17.Mar.02007 - Released 0.19 "Nose Furnace".
 16.Mar.02007 - Fixed layout bug that left dots on the screen.
 13.Mar.02007 - Added external screen saver function (set "saver_type" in
@@ -223,25 +303,25 @@
 16.Feb.02007 - Fixed another filename matching bug.
 15.Feb.02007 - Changing Emulator List name in Setup Editor now updates the drop
                down list selection.
-24.Jan.02007 - Fixed bug which let a game be added to a list multiple times.  
+24.Jan.02007 - Fixed bug which let a game be added to a list multiple times.
              - Cleaned up rom filename detection code (Thanks to Relayer for
                reporting this bug).
-24.Jan.02007 - Added setup filters to Setup Editor (mame only). 
+24.Jan.02007 - Added setup filters to Setup Editor (mame only).
 20.Jan.02007 - Huge thanks to Daniel Nylander for providing the Swedish (sv)
-               translation. 
-18.Jan.02007 - Hopefully fixed multiple screensaver timer bug. 
+               translation.
+18.Jan.02007 - Hopefully fixed multiple screensaver timer bug.
 15.Jan.02007 - Added support for per-list layouts (<emu-name>-?.lay).
-             - Seemed to actually have fixed the "black video window" bug. 
+             - Seemed to actually have fixed the "black video window" bug.
 12.Jan.02007 - Released 0.17 "Jelly Result".
 09.Jan.02007 - Added a couple of reset options to the Setup Editor.
              - Made filters work with Mame versions > 0.106.
 08.Jan.02007 - Fixed "missing image" lookups - they should now work as advertised.
-             - Made sure Game List is "on top" of other widgets. 
+             - Made sure Game List is "on top" of other widgets.
                Cheers again to robbforce for reporting these out.
 21.Dec.02006 - Released 0.16 "Avalon".
 16.Dec.02006 - Added Auto Launch Apps option to Setup Editor (Emulator tab).
              - Added Wrap List option to Setup Editor (Wah!Cade tab).
-             - History Viewer heading now shows Game Title instead of Rom Name. 
+             - History Viewer heading now shows Game Title instead of Rom Name.
 14.Dec.02006 - Implemented background colours on Main & History Viewer layouts.
                You might need to tidy up your layouts in the editor!
 13.Dec.02006 - Fixed setting window width & height in the Setup Editor.
@@ -251,8 +331,8 @@
                updated with any missing files.
 10.Dec.02006 - Added label alignment to layouts.
              - History Viewer now has it's own layout file.
-06.Dec.02006 - Don't expand paths that start with "~/" when saving .ini files.  
-04.Dec.02006 - Default startup to fullscreen mode (this matches MameWAH). To 
+06.Dec.02006 - Don't expand paths that start with "~/" when saving .ini files.
+04.Dec.02006 - Default startup to fullscreen mode (this matches MameWAH). To
                start in windowed mode use the "-w" commandline option.
 30.Nov.02006 - The wahcade.ini "wrap_list" setting now works.
              - Rewrote scolled list row font size calcs.
@@ -270,11 +350,11 @@
 27.Nov.02006 - Values of spinner widgets should now save properly in the Setup
                Editor (Cheers to Buks again).
 26.Nov.02006 - File -> Quit show now work in Layout Editor (Cheers Buks).
-25.Nov.02006 - Updated setup.py (for building a windows version with py2exe). 
+25.Nov.02006 - Updated setup.py (for building a windows version with py2exe).
              - Fixed bug where the current game was not saved to ini file when
                using mouse.
-23.Nov.02006 - Fixed some bugs (some browse buttons not working) in the Setup 
-               Editor (cheers to Buks for spotting them). The "Keys" tab now 
+23.Nov.02006 - Fixed some bugs (some browse buttons not working) in the Setup
+               Editor (cheers to Buks for spotting them). The "Keys" tab now
                saves any changes made too!
 22.Nov.02006 - Improved locale settings a bit (improving non-ascii unicode text).
              - Fixed "IndexError: list index out of range bug" in scrolled_list.py.
@@ -284,34 +364,34 @@
                "remove game from list", "select emulator" and "select game list"
                now work.
 19.Nov.02006 - Currently selected game now saved again.
-             - When jumping to next / previous game list, check for "cycle_list" 
-               setting in relevant .ini files.  Also added this feature to 
+             - When jumping to next / previous game list, check for "cycle_list"
+               setting in relevant .ini files.  Also added this feature to
                Wahcade Setup.
              - Updated keyboard & mouse handling.
 18.Nov.02006 - Fixed warning error when elementtree package is missing.
 17.Nov.02006 - (Hopefully) modified Wah!Cade so it can be internationalized.
 15.Nov.02006 - Added Wah!Cade icon to windows.
-             - Closing About... Dialog now uses the Launch_Game & Exit keys as   
+             - Closing About... Dialog now uses the Launch_Game & Exit keys as
                they are defined in the ~/.wahcade/ctrl/default.ini file.
 14.Nov.02006 - Added multiple selection feature to Layout Editor.
-             - Added option to Layout Editor view menu to keep property dialogs 
+             - Added option to Layout Editor view menu to keep property dialogs
                "on top".
              - Fixed setup.py so it should now be possible to build a windows .exe
                using py2exe.
-13.Nov.02006 - Emulator output is now sent to ~/.wahcade/emulator.log unless  
+13.Nov.02006 - Emulator output is now sent to ~/.wahcade/emulator.log unless
                debug mode is on.
 09.Nov.02006 - Added check for python version on startup (must be at least 2.4.0).
-08.Nov.02006 - Reworked scrolling lists, so the mouse can now be used if "mouse = 1" 
-               in ~/.wahcade/ctrlr/default.ini file.  
-             - Mouse scroll wheel (up / down) is now detected - use MOUSE_SCROLLUP 
-               and MOUSE_SCROLLDOWN in the ~/.wahcade/ctrlr/default.ini file. 
+08.Nov.02006 - Reworked scrolling lists, so the mouse can now be used if "mouse = 1"
+               in ~/.wahcade/ctrlr/default.ini file.
+             - Mouse scroll wheel (up / down) is now detected - use MOUSE_SCROLLUP
+               and MOUSE_SCROLLDOWN in the ~/.wahcade/ctrlr/default.ini file.
 30.Oct.02006 - Released 0.14 "Dead Man".
              - Fixed Key Press Dialog display bug.
              - Fixed .deb package bug which stopped default layouts being included.
 25.Oct.02006 - Layout Editor now quits with a useful error message when no config
                files are found.
              - Better defaults for the CPViewer config.
-24.Oct.02006 - Fixed save on exit bug in Setup & Layout Editors.  
+24.Oct.02006 - Fixed save on exit bug in Setup & Layout Editors.
              - Fixed *huge* bug in mamewah_ini.py that meant no previously empty
                options could be updated.
              - Now makes seconds attempt to populate list with games if none
@@ -322,8 +402,8 @@
              - Released 0.13.2 "Oh Dear".
 17.Oct.02006 - Quit menu in wahcade-setup & save while quitting now work properly.
                Thanks to Aaron Greenspan for these.
-13.Oct.02006 - Ooops.  Added a doc file for wahcade-setup.  
-             - Included the templates directory in the tarball.  
+13.Oct.02006 - Ooops.  Added a doc file for wahcade-setup.
+             - Included the templates directory in the tarball.
              - Hopefully fixed the dreaded sys.path[0] error.
              - Released 0.13.1 "Errr".
 11.Oct.02006 - Released 0.13 "Gimme Danger".
 
=== modified file 'doc/INI_FILES'
--- doc/INI_FILES	2008-11-30 10:26:19 +0000
+++ doc/INI_FILES	2011-03-03 21:06:42 +0000
@@ -12,6 +12,8 @@
 fullscreen                  0                              #fullscreen display (0=no, 1=yes)
 setup_window_size           400x200                        #size of Setup Editor window (width x height)
 layout_orientation          0                              #orientation of current layout (0,90,180,270 degrees).
+show_list_arrows            0                              #show scroll up/down arrows in games, options and history lists (0=no, 1=yes)
+shuffle_music               0                              #shuffle music playlist when loaded (0=no, 1=yes)
 
 ### (Global) Screen-Saver Options ###
 delay                       300                            #screen saver delay in seconds (0 to disable)
@@ -28,8 +30,8 @@
 intro_movie_file                                           #intro movie filename
 exit_movie_file                                            #exit movie filename
 keep_movie_preview_aspect   game_aspect                    #N/A
-delay_before_movie_preview  7                              #movie delay in seconds
-music_movie_mix             mute_movies                    #mute_movies / merge / pause_music
+delay_before_movie_preview  7                              #movie delay in seconds (0 to disable ALL movie playback)
+music_movie_mix             mute_movies                    #mute_movies / merge
 movie_volume                100                            #movie volume (0-100%)
 
 ### Misc Options ###
@@ -146,7 +148,7 @@
 list_title                                Favourites       #title of your choice
 
 ### Games List Settings ###
-cycle_list                                1                #include this list when changing to next / previous lists 
+cycle_list                                1                #include this list when changing to next / previous lists
 list_type                                 normal           #the type of list:  normal / most_played / longest_played
 display_clone_info                        0                #N/A
 max_favorites                             0                #N/A
@@ -163,9 +165,9 @@
 Notes:
 ------
 * for information on configuring the keyboard, mouse & joystick see the KEYS document.
-* emu_name-0.ini does not have the list_type, display_clone_info or max_favorites 
+* emu_name-0.ini does not have the list_type, display_clone_info or max_favorites
   settings, as these properties for the main list are fixed.
-  
+
 * commandline_format flags:
   As well as regular switches etc., the following strings can be used, which Wah!Cade will replace
   with information on the currently selected game when the application is launched:
@@ -174,7 +176,7 @@
     [romext] is replaced by rom_extension (exluding the '.')
     [autorotate] will rotate the game to match the current layouts rotation (Mame only)
     [year] is replaced by rom year
-    [manufacturer] is replaced by rom manufacturer 
+    [manufacturer] is replaced by rom manufacturer
     [clone_of] is replaced by "parent" rom name
     [display_type] is replaced by display type
     [screen_type] is replaced by screen type
 
=== modified file 'doc/INSTALL'
--- doc/INSTALL	2009-01-07 17:51:46 +0000
+++ doc/INSTALL	2011-03-03 21:06:42 +0000
@@ -4,8 +4,8 @@
 Wah!Cade Requirements
 =====================
 To run wah!cade you'll need:
-* python >= 2.4  (http://www.python.org)
-* pygtk2 >= 2.8  (http://www.pygtk.org)
+* python >= 2.4 (http://www.python.org)
+* pygtk2 >= 2.12 (http://www.pygtk.org)
 * chardet >= 1.0 (http://chardet.feedparser.org)
 * elementtree / celementtree (http://effbot.org/zone/element-index.htm)
   elementree is not required for python >= 2.5 as it's included by default
@@ -20,11 +20,11 @@
 
 Installation Notes
 ==================
-Either download and install the Debian / RPM packages, or get the source code 
+Either download and install the Debian / RPM packages, or get the source code
 and:
 
 Method 1)
-   Extract the contents of the tarball into a suitable directory within 
+   Extract the contents of the tarball into a suitable directory within
    your home directory and then see the Quick Start Guide on the website and
    the README file for information on initial setup & configuration, etc.
 
@@ -34,12 +34,12 @@
        ./install
    this should install wahcade in the /usr/local/share/wahcade directory.
 
-The default config files are stored in wahcade/config.dist.   When Wah!Cade is 
+The default config files are stored in wahcade/config.dist.   When Wah!Cade is
 first run these are copied into the users ~/.wahcade directory.
 
 
 =================================================
-Wah!Cade is Copyright (c) 2005-2009 Andy Balcombe
+Wah!Cade is Copyright (c) 2005-2010 Andy Balcombe
   email: wahcade at anti-particle dot com
 =================================================
 
 
=== modified file 'doc/LAYOUT_EDITOR'
--- doc/LAYOUT_EDITOR	2009-01-07 17:51:46 +0000
+++ doc/LAYOUT_EDITOR	2011-03-03 21:06:42 +0000
@@ -1,6 +1,6 @@
 Wah!Cade Layout Editor
 ======================
-The layout editor supports modifying the Main, Options, Message, Screen Saver 
+The layout editor supports modifying the Main, Options, Message, Screen Saver
 and the Control Panel Viewer windows.
 
 
@@ -17,12 +17,12 @@
     The current layout files are loaded by default.
 
     The various settings for the currently selected item can be changed using
-    the Item Properties window (Ctrl + P).  
-    
-    
+    the Item Properties window (Ctrl + P).
+
+
 Keyboard:
 =========
-    Cursor Keys:         Change the position of selected items. 
+    Cursor Keys:         Change the position of selected items.
     Shift + Cursor Keys: Change the size of selected items.
 
 
@@ -37,7 +37,7 @@
 
 Layout Notes:
 =============
-Wah!Cade will check for the following layout and image files in the order 
+Wah!Cade will check for the following layout and image files in the order
 specified below.  If a given file does not exist, then Wah!Cade will check for
 the next one in the hierarchy.
 
@@ -55,23 +55,25 @@
     ~/.wahcade/layouts/
       classic_640x480/layout.lay    default Wah!Cade layout
 
-      
+
 Background Images
 -----------------
+    Note:  This will only work if no image is specified in the layout file.
+
     <emu_name>-?-main.???           emulator & custom list specific main backgound image
-    <emu_name>-main.???             emulator specific main backgound image 
-    main.???                        general layout main backgound image 
-                                    
+    <emu_name>-main.???             emulator specific main backgound image
+    main.???                        general layout main backgound image
+
     <emu_name>-?-options.???        emulator & custom list specific options menu backgound image
-    <emu_name>-options.???          emulator specific options menu backgound image 
-    options.???                     general layout options menu backgound image 
-                                    
+    <emu_name>-options.???          emulator specific options menu backgound image
+    options.???                     general layout options menu backgound image
+
     <emu_name>-?-message.???        emulator & custom list specific message box backgound image
-    <emu_name>-message.???          emulator specific message box backgound image 
-    message.???                     general layout message box backgound image 
-
-
-Artwork Images 
+    <emu_name>-message.???          emulator specific message box backgound image
+    message.???                     general layout message box backgound image
+
+
+Artwork Images
 --------------
     <game_rom_name>.???             game name
     <game_clone_name>.???           "clone of" game name
@@ -82,15 +84,15 @@
     art?.???                        artwork specific 'no pic' image
     art.???                         general layout 'no pic' image
     ~/.wahcade/pixmaps/empty.png    default 'no pic' image
-    
-    
+
+
 Main Logo Images
 ----------------
     <emu_name>-?-logo.???           emulator & custom list specific logo image
     <emu_name>-logo.???             emulator specific logo image
     <emu_name>logo.???              emulator specific logo image
     logo.???                        general layout logo image
-                                    (logo images must be in same dir as layout 
+                                    (logo images must be in same dir as layout
                                      files)
 
 Movie Files
@@ -105,15 +107,15 @@
     ### may be: avi or mpg
     <emu_name> is the emulator name, e.g. mame, zsnes, etc.
     <rotation> is layouts rotation angle (0, 90, 180, 270)
-    
-  
+
+
 Notes:
 ======
-* Any fonts that a layout requires should be installed first 
+* Any fonts that a layout requires should be installed first
   (e.g. copy the font files into your ~/.fonts directory).
 
 =================================================
-Wah!Cade is Copyright (c) 2005-2009 Andy Balcombe
+Wah!Cade is Copyright (c) 2005-2010 Andy Balcombe
   email: wahcade at anti-particle dot com
 =================================================
 
 
=== modified file 'doc/README'
--- doc/README	2009-01-07 17:51:46 +0000
+++ doc/README	2011-03-03 21:06:42 +0000
@@ -51,13 +51,13 @@
 ================
 to run Wah!Cade:
     wahcade
-    
+
 to run the Layout Editor:
     wahcade-layout-editor
-    
+
 to run the Setup Editor:
     wahcade-setup
-    
+
 or, if you're running from the source directory:
     cd /path/to/wahcade
     ./wahcade.py
@@ -70,7 +70,9 @@
   -w, --window       Set windowed mode
   -f, --full-screen  Set fullscreen mode
   -d, --debug        Set debug mode (disables pysco)
-
+  --no-gstreamer     Set to disable all gstreamer use (music / video playback)
+  --no-pygame        Set to disable all pygame use (joysticks)
+  --old-key-handler  Set to revert to old keyboard event handling
 * you need to change your desktop resolution to match your chosen layout if you
   want full-screen wah!cade to look right.
 
@@ -82,30 +84,32 @@
       and for letting me include some of the default MameWAH config files and layouts
       in the wah!cade package.
     * Buks & battlecat for artwork, testing & suggestions.
-    * Robbforce for the Arch-Linux port, FreeBSD news, bug reports and suggestions. 
-    * Sylvan Faveau, Settler, Mike Crawford, Mike Schwartz, nellistic, 3NF,   
+    * Robbforce for the Arch-Linux port, FreeBSD news, bug reports and suggestions.
+    * Sylvan Faveau, Settler, Mike Crawford, Mike Schwartz, nellistic, 3NF,
       Bob Clough, Jim Merullo, Jose Herran & more for patches, bug reports and patience.
     * The translators: SeTTleR, Nicolás Álvarez. Sylvan Faveau and Daniel Nylander.
     * all the M.A.M.E. developers (http://www.mame.net/)
     * all the x.mame developers (http://x.mame.net/)
+    * everyone from the forums who have helped out with bug reporting,
+      feature suggestions and more.
 
 
 Supported OS
 ============
-Wah!Cade has been tested on:
-* Ubuntu "Hardy Heron" 8.04 / xmame 0.106 / sdlmame 0.125
-I've also had reports of it working on Arch, Debian (etch), Gentoo, FreeBSD, 
-Mac OS X and Windows. YMMV.
+Wah!Cade is developed on:
+* Ubuntu "Karmic Koala" 9.10 / sdlmame 0.132
+I've also had reports of it working on Arch, Debian (etch), Gentoo, FreeBSD,
+Mac OS X, Windows and even the PS3. YMMV.
 
 Comments
 ========
-Check the Wah!Cade Forums:  
-    http://www.anti-particle.com/forum/index.php
+Check the Wah!Cade Forums:
+    http://www.anti-particle.com/forum
 If you have any bug reports, suggestions, features, patches or comments then
 please contact me at the address below...
 
 =================================================
-Wah!Cade is Copyright (c) 2005-2009 Andy Balcombe
+Wah!Cade is Copyright (c) 2005-2010 Andy Balcombe
   email: wahcade at anti-particle dot com
 =================================================
 
 
=== modified file 'doc/TODO'
--- doc/TODO	2009-01-07 17:51:46 +0000
+++ doc/TODO	2011-03-03 21:06:42 +0000
@@ -7,7 +7,7 @@
 ---------
 * Rotate video if necessary
 * Detect keyboard & mouse events when mouse pointer is over a video window
-* Add Nelistc's LIRC patch
+* Add Nelistc's LIRC patch (if I can find it!)
 * Add various EXIT..., OP_MENU_HIDE actions
 
 
@@ -26,7 +26,7 @@
     Postby spudgunman on 24 Oct 2008 07:01 am
     could I put in a feature request for recursive directory searching option for ROM directory
     for instance I have roms like:
-    
+
     SNES
     ../USA
     ../Japan
 
=== modified file 'filters.py'
--- filters.py	2009-01-07 17:51:46 +0000
+++ filters.py	2011-03-03 21:06:42 +0000
@@ -5,7 +5,7 @@
 # Application: wah!cade
 # File:        filters.py
 # Description: routines to read / write mamewah filters and lists
-# Copyright (c) 2005-2009   Andy Balcombe <http://www.anti-particle.com>
+# Copyright (c) 2005-2010   Andy Balcombe <http://www.anti-particle.com>
 ###
 #
 # This program is free software; you can redistribute it and/or modify
@@ -86,8 +86,8 @@
     'dial': u'Spinner (or 360\xb0 Wheel)',
     'trackball': u'Trackball',
     'pedal': u'Pedal',
-    '': u'None'
-}
+    'keyboard': u'Keyboard',
+    '': u'None'}
 
 
 def get_file_encoding(filename):
@@ -99,11 +99,12 @@
         detector.feed(line)
         i += 1
         #done or hit max lines (it takes ages to read a large file)
-        if detector.done or i >= 2000: 
+        if detector.done or i >= 2000:
             break
     detector.close()
     return detector.result
-    
+
+
 def open_file(filename, filemode='r'):
     """opens given filename, and autodetects the encoding"""
     #detect encoding
@@ -112,12 +113,13 @@
     except:
         file_enc = sys.getdefaultencoding()
     #use utf8 instead of ascii
-    if file_enc.lower() == 'ascii': 
+    if file_enc.lower() == 'ascii':
         file_enc = 'utf8'
     #open file using correct encoding
-    f = codecs.open(filename, mode=filemode, encoding=file_enc) 
+    f = codecs.open(filename, mode=filemode, encoding=file_enc)
     return f, file_enc
-    
+
+
 def get_dat_game_item(dat_filename):
     """read dat file"""
     #get category info
@@ -165,27 +167,27 @@
                         l = value[2:-2].split()
                         for i in range(0, len(l) - 1, 2):
                             vid[l[i]] = l[i+1]
-                        if vid.has_key('screen'):
+                        if 'screen' in vid:
                             d['display_type'] = vid['screen']
-                        if vid.has_key('orientation'):
+                        if 'orientation' in vid:
                             d['screen_type'] = vid['orientation']
                     elif key == '\tdriver':
                         driver = {}
                         l = value[2:-2].split()
                         for i in range(0, len(l) - 1, 2):
                             driver[l[i]] = l[i+1]
-                        if driver.has_key('status'):
+                        if 'status' in driver:
                             d['driver_status'] = driver['status']
-                        if driver.has_key('color'):
+                        if 'color' in driver:
                             d['colour_status'] = driver['color']
-                        if driver.has_key('sound'):
+                        if 'sound' in driver:
                             d['sound_status'] = driver['sound']
                     elif key == '\tinput':
                         ctrl = {}
                         l = value[2:-2].split()
                         for i in range(0, len(l) - 1, 2):
                             ctrl[l[i]] = l[i+1]
-                        if ctrl.has_key('control'):
+                        if 'control' in ctrl:
                             d['controller_type'] = _controllers[ctrl['control']]
                     #get category
                     try:
@@ -200,6 +202,7 @@
     #done
     f.close()
 
+
 def get_xml_game_item(xml_filename):
     """get game bits"""
     #get category info
@@ -208,7 +211,7 @@
     for event, mame_element in ET.iterparse(xml_filename, events=('start', 'end')):
         #get mame version element
         if mame_element.tag == 'mame':
-            if not mame_element.attrib.has_key('build'):
+            if 'build' not in mame_element.attrib:
                 mame_version = '0.000'
             else:
                 spc_pos = mame_element.attrib['build'].find(' ')
@@ -248,14 +251,14 @@
             manu = game_element.findtext('manufacturer') or ''
             desc = game_element.findtext('description') or ''
             #create dict
-            d['rom_name'] = game_element.attrib['name'].upper()
+            d['rom_name'] = game_element.attrib['name']#.upper()
             d['game_name'] = desc
             d['year'] = year
             d['manufacturer'] = manu.title()
             if 'cloneof' in game_element.keys():
-                d['clone_of'] = game_element.attrib['cloneof'].upper()
+                d['clone_of'] = game_element.attrib['cloneof']#.upper()
             if 'romof' in game_element.keys():
-                d['rom_of'] = game_element.attrib['romof'].upper()
+                d['rom_of'] = game_element.attrib['romof']#.upper()
             if vid is not None:
                 if mame_version > '0.106':
                     d['display_type'] = vid.attrib['type'].title()
@@ -279,9 +282,12 @@
             except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
                 d['category'] = 'Unknown'
             #done
+            #if d['rom_name'] == 'ASTEROID':
+            #    print "game=",d
             yield d
     game_element.clear() # won't need this any more
 
+
 def get_catver_ini(category_file):
     """load catver.ini file"""
     if not os.path.exists(category_file):
@@ -290,6 +296,7 @@
     catver.read(category_file)
     return catver
 
+
 def create_initial_filter(info_filename, filter_filename, list_filename, emu_ini, pgb_pulse=None):
     """create a new mamewah .ftr & .lst file"""
     pulse_cnt = 0
@@ -330,7 +337,7 @@
             'category': ''}
         for rom_filename in roms:
             rom_name = os.path.splitext(os.path.basename(rom_filename))[0]
-            if nms_entries.has_key(rom_name):
+            if rom_name in nms_entries:
                 game_name = nms_entries[rom_name]
             else:
                 game_name = rom_name
@@ -389,10 +396,10 @@
         except StopIteration:
             break
         #for each key in sections
-        for key in _sections[1:]:
-            if gd.has_key(key):
-                if gd[key] not in mwfilter[key]:
-                    mwfilter[key].append(gd[key])
+        for k in _sections[1:]:
+            if k in gd:
+                if gd[k] not in mwfilter[k]:
+                    mwfilter[k].append(gd[k])
     #done list file
     f.close()
     #write filter file
@@ -412,6 +419,7 @@
         f.write('\n')
     f.close()
 
+
 def read_filter(filter_file):
     """read a mamewah .ftr file"""
     #init
@@ -455,6 +463,7 @@
     f.close()
     return d
 
+
 def write_filter(filter_spec, filter_filename):
     """write a filter file from a given spec"""
     f, file_enc = open_file(filter_filename, 'w')
@@ -464,12 +473,13 @@
     for key in _sections[1:]:
         l = filter_spec[key].items()
         l.sort()
-        for item, value in l: 
+        for item, value in l:
             f.write('%s\n%s\n' % (item, str(value)))
         f.write('\n')
     #done
     f.close()
 
+
 def create_filtered_list(original_list_filename, filter_spec, list_filename):
     """create a mamewah .lst file from <emu>-0.lst and the given spec"""
     #open empty list file
@@ -480,6 +490,8 @@
     #for each item in iterator
     for game_item in all_games:
         gd = get_game_dict(game_item)
+        #if gd['rom_name'] == 'ASTEROID':
+        #    print "cfl: game=",gd
         #match filter conditions
         matched = True
         #check filter type section
@@ -500,20 +512,25 @@
         if matched:
             #for each section
             for section in _sections[1:]:
-                if filter_spec.has_key(section) and gd.has_key(section):
+                if section in filter_spec and section in gd:
                     #if spec and current game have same section
-                    if filter_spec[section].has_key(gd[section]):
+                    if gd[section] in filter_spec[section]:
                         if not filter_spec[section][gd[section]]:
                             #don't match if spec entry for game not set (i.e. False)
                             matched = False
-                    if gd[section] is None or gd[section] == '':
-                        matched = False
+                    #if gd[section] is None or gd[section] == '':
+                    #    if gd['rom_name'] == 'ASTEROID':
+                    #        print "cfl: not matched (is none)"
+                    #    matched = False
+        #if gd['rom_name'] == 'ASTEROID':
+        #    print "cfl: matched=",matched
         if matched:
             #write output
             add_game_to_filtered_list(gd, f)
     #done, close file
     f.close()
 
+
 def read_filtered_list(list_filename):
     """read a mamewah .lst file"""
     l = []
@@ -538,6 +555,7 @@
     #done
     return l, len(l)
 
+
 def add_game_to_filtered_list(gd, file_obj=None, list_filename=None):
     """add game info in given dictionary to specified file or .lst file"""
     if list_filename is not None:
@@ -557,13 +575,13 @@
         '%s\n' % gd['driver_status'],
         '%s\n' % gd['colour_status'],
         '%s\n' % gd['sound_status'],
-        '%s\n' % gd['category']
-    ])
+        '%s\n' % gd['category']])
     #done
     if list_filename is not None:
         file_obj.close()
 
-def write_filtered_list(list_filename , list_items):
+
+def write_filtered_list(list_filename, list_items):
     """write the given list items into the specified .lst file"""
     #f= codecs.open(list_filename, mode='w', encoding='utf-8')
     f, file_enc = open_file(list_filename, 'w')
@@ -581,11 +599,11 @@
             '%s\n' % game_info[GL_DRIVER_STATUS],
             '%s\n' % game_info[GL_COLOUR_STATUS],
             '%s\n' % game_info[GL_SOUND_STATUS],
-            '%s\n' % game_info[GL_CATEGORY]
-        ])
+            '%s\n' % game_info[GL_CATEGORY]])
     #done
     f.close()
 
+
 def read_fav_list(favlist_filename):
     """reads a .fav list"""
     d = {}
@@ -607,6 +625,7 @@
     #done
     return d
 
+
 def write_fav_list(favlist_filename, favs):
     """writes a .fav list"""
     f, file_enc = open_file(favlist_filename, 'w')
@@ -615,10 +634,10 @@
             '%s\n' % fav_key,
             '%s\n' % favs[fav_key][FAV_GAME_NAME],
             '%s\n' % favs[fav_key][FAV_TIMES_PLAYED],
-            '%s\n' % favs[fav_key][FAV_MINS_PLAYED]
-        ])
+            '%s\n' % favs[fav_key][FAV_MINS_PLAYED]])
     f.close()
 
+
 def get_game_dict(game_item):
     """return dictionary of info for given game item"""
     gd = {
@@ -634,15 +653,15 @@
         'driver_status': game_item[GL_DRIVER_STATUS],
         'colour_status': game_item[GL_COLOUR_STATUS],
         'sound_status': game_item[GL_SOUND_STATUS],
-        'category': game_item[GL_CATEGORY]
-    }
+        'category': game_item[GL_CATEGORY]}
     return gd
 
+
 def read_nms_file(nms_filename):
     """returns a dictionary created from a nms formatted file"""
     d = {}
     if nms_filename == '':
-        return d 
+        return d
     #read file
     try:
         f, file_enc = open_file(nms_filename, 'r')
@@ -659,7 +678,8 @@
             d[r[1]] = r[0]
     #done
     return d
-    
+
+
 def walk_dir(root, recurse=False, pattern='*', return_folders=False):
     # initialize
     result = []
@@ -696,18 +716,13 @@
     import time
     from mamewah_ini import MameWahIni
     #set vars
-    #CONFIG_DIR = os.path.join(sys.path[0], 'config')
-    CONFIG_DIR = os.path.expanduser('~/.wahcade')
     cdir = sys.path[0]
     #_mameinfo_file = os.path.join(cdir, 'mameinfo111.xml')
     _catver_ini = os.path.join(cdir, 'catver2.ini')
-
     #set to unicode encoding
     try:
         sys.setappdefaultencoding('utf-8')
     except AttributeError:
         pass
-    
     #test nms feed
     print read_nms_file(os.path.expanduser('~/emulators/pc/pc_games.nms'))
-
 
=== modified file 'glade/layout_editor.glade'
--- glade/layout_editor.glade	2009-01-11 16:29:58 +0000
+++ glade/layout_editor.glade	2011-03-03 21:06:42 +0000
@@ -729,6 +729,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <signal name="clicked" handler="on_btnClose_clicked" last_modification_time="Wed, 28 Jun 2006 09:06:53 GMT"/>
+	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
 	    </widget>
 	  </child>
 	</widget>
@@ -1595,6 +1596,7 @@
 	  <child>
 	    <widget class="GtkCheckButton" id="chkBackgroundImage">
 	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Leave unchecked for Wah!Cade to auto-detect background images.</property>
 	      <property name="can_focus">True</property>
 	      <property name="label" translatable="yes">Background Image</property>
 	      <property name="use_underline">True</property>
@@ -1789,6 +1791,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <signal name="clicked" handler="on_btnClose_clicked" last_modification_time="Tue, 04 Jul 2006 08:23:41 GMT"/>
+	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
 	    </widget>
 	  </child>
 	</widget>
 
=== modified file 'glade/layout_editor.glade.bak'
--- glade/layout_editor.glade.bak	2009-01-11 16:29:58 +0000
+++ glade/layout_editor.glade.bak	2011-03-03 21:06:42 +0000
@@ -729,6 +729,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <signal name="clicked" handler="on_btnClose_clicked" last_modification_time="Wed, 28 Jun 2006 09:06:53 GMT"/>
+	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
 	    </widget>
 	  </child>
 	</widget>
@@ -1789,6 +1790,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <signal name="clicked" handler="on_btnClose_clicked" last_modification_time="Tue, 04 Jul 2006 08:23:41 GMT"/>
+	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
 	    </widget>
 	  </child>
 	</widget>
 
=== modified file 'glade/layout_editor.glade.h'
--- glade/layout_editor.glade.h	2008-11-30 10:26:19 +0000
+++ glade/layout_editor.glade.h	2011-03-03 21:06:42 +0000
@@ -24,6 +24,7 @@
 char *s = N_("Item _Properties");
 char *s = N_("Layout");
 char *s = N_("Layout Properties");
+char *s = N_("Leave unchecked for Wah!Cade to auto-detect background images.");
 char *s = N_("Left");
 char *s = N_("M_essage Window");
 char *s = N_("Main Window");
 
=== modified file 'glade/wahcade_setup.glade'
--- glade/wahcade_setup.glade	2009-01-11 16:29:58 +0000
+++ glade/wahcade_setup.glade	2011-03-03 21:06:42 +0000
@@ -259,7 +259,7 @@
 		    <widget class="GtkTable" id="tblWCMovies">
 		      <property name="border_width">5</property>
 		      <property name="visible">True</property>
-		      <property name="n_rows">4</property>
+		      <property name="n_rows">5</property>
 		      <property name="n_columns">2</property>
 		      <property name="homogeneous">False</property>
 		      <property name="row_spacing">0</property>
@@ -299,7 +299,7 @@
 			  <property name="can_focus">True</property>
 			  <property name="climb_rate">1</property>
 			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
+			  <property name="numeric">True</property>
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
@@ -386,8 +386,8 @@
 			<packing>
 			  <property name="left_attach">0</property>
 			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
 			  <property name="x_options">fill</property>
 			  <property name="y_options"></property>
 			</packing>
@@ -414,8 +414,8 @@
 			<packing>
 			  <property name="left_attach">0</property>
 			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
+			  <property name="top_attach">4</property>
+			  <property name="bottom_attach">5</property>
 			  <property name="x_options">fill</property>
 			  <property name="y_options"></property>
 			</packing>
@@ -479,8 +479,8 @@
 			<packing>
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
 			  <property name="x_options">fill</property>
 			  <property name="y_options">fill</property>
 			</packing>
@@ -544,8 +544,54 @@
 			<packing>
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
+			  <property name="top_attach">4</property>
+			  <property name="bottom_attach">5</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options">fill</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label107">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Music / Movie Mix</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">1</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">4</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkComboBox" id="cboWCMovieMix">
+			  <property name="visible">True</property>
+			  <property name="items" translatable="yes"></property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="focus_on_click">True</property>
+			  <signal name="changed" handler="on_Setup_changed" last_modification_time="Sun, 28 Jun 2009 16:49:44 GMT"/>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
 			  <property name="x_options">fill</property>
 			  <property name="y_options">fill</property>
 			</packing>
@@ -597,7 +643,7 @@
 		    <widget class="GtkTable" id="tblWCMisc">
 		      <property name="border_width">5</property>
 		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
+		      <property name="n_rows">4</property>
 		      <property name="n_columns">2</property>
 		      <property name="homogeneous">False</property>
 		      <property name="row_spacing">0</property>
@@ -673,6 +719,30 @@
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="chkWCListArrows">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Show scroll up / down arrows in Games, Options and History Viewer lists.</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Display Scroll Arrows in Lists</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="toggled" handler="on_Setup_changed" last_modification_time="Tue, 24 Oct 2006 16:09:06 GMT"/>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
 		  </child>
 
@@ -761,7 +831,7 @@
 			  <property name="can_focus">True</property>
 			  <property name="climb_rate">1</property>
 			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
+			  <property name="numeric">True</property>
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
@@ -812,7 +882,7 @@
 			  <property name="can_focus">True</property>
 			  <property name="climb_rate">1</property>
 			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
+			  <property name="numeric">True</property>
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
@@ -898,7 +968,7 @@
 		    <widget class="GtkTable" id="tblWCMusic">
 		      <property name="border_width">5</property>
 		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
+		      <property name="n_rows">3</property>
 		      <property name="n_columns">2</property>
 		      <property name="homogeneous">False</property>
 		      <property name="row_spacing">0</property>
@@ -1039,6 +1109,29 @@
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="chkWCMusicShuffle">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Shuffle Playlist</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="toggled" handler="on_Setup_changed" last_modification_time="Mon, 01 Oct 2007 16:48:46 GMT"/>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
 		  </child>
 
 
=== modified file 'glade/wahcade_setup.glade.bak'
--- glade/wahcade_setup.glade.bak	2009-01-11 16:29:58 +0000
+++ glade/wahcade_setup.glade.bak	2011-03-03 21:06:42 +0000
@@ -259,7 +259,7 @@
 		    <widget class="GtkTable" id="tblWCMovies">
 		      <property name="border_width">5</property>
 		      <property name="visible">True</property>
-		      <property name="n_rows">4</property>
+		      <property name="n_rows">5</property>
 		      <property name="n_columns">2</property>
 		      <property name="homogeneous">False</property>
 		      <property name="row_spacing">0</property>
@@ -299,7 +299,7 @@
 			  <property name="can_focus">True</property>
 			  <property name="climb_rate">1</property>
 			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
+			  <property name="numeric">True</property>
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
@@ -386,8 +386,8 @@
 			<packing>
 			  <property name="left_attach">0</property>
 			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
 			  <property name="x_options">fill</property>
 			  <property name="y_options"></property>
 			</packing>
@@ -414,8 +414,8 @@
 			<packing>
 			  <property name="left_attach">0</property>
 			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
+			  <property name="top_attach">4</property>
+			  <property name="bottom_attach">5</property>
 			  <property name="x_options">fill</property>
 			  <property name="y_options"></property>
 			</packing>
@@ -479,8 +479,8 @@
 			<packing>
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
 			  <property name="x_options">fill</property>
 			  <property name="y_options">fill</property>
 			</packing>
@@ -544,8 +544,54 @@
 			<packing>
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
+			  <property name="top_attach">4</property>
+			  <property name="bottom_attach">5</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options">fill</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label107">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Music / Movie Mix</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">1</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">4</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkComboBox" id="cboWCMovieMix">
+			  <property name="visible">True</property>
+			  <property name="items" translatable="yes"></property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="focus_on_click">True</property>
+			  <signal name="changed" handler="on_setup_changed" last_modification_time="Sun, 28 Jun 2009 16:48:17 GMT"/>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
 			  <property name="x_options">fill</property>
 			  <property name="y_options">fill</property>
 			</packing>
@@ -597,7 +643,7 @@
 		    <widget class="GtkTable" id="tblWCMisc">
 		      <property name="border_width">5</property>
 		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
+		      <property name="n_rows">4</property>
 		      <property name="n_columns">2</property>
 		      <property name="homogeneous">False</property>
 		      <property name="row_spacing">0</property>
@@ -673,6 +719,30 @@
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="chkWCListArrows">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Show scroll up / down arrows in Games, Options and History Viewer lists.</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Display Scroll Arrows in Lists</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="toggled" handler="on_Setup_changed" last_modification_time="Tue, 24 Oct 2006 16:09:06 GMT"/>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
 		  </child>
 
@@ -761,7 +831,7 @@
 			  <property name="can_focus">True</property>
 			  <property name="climb_rate">1</property>
 			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
+			  <property name="numeric">True</property>
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
@@ -812,7 +882,7 @@
 			  <property name="can_focus">True</property>
 			  <property name="climb_rate">1</property>
 			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
+			  <property name="numeric">True</property>
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
@@ -898,7 +968,7 @@
 		    <widget class="GtkTable" id="tblWCMusic">
 		      <property name="border_width">5</property>
 		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
+		      <property name="n_rows">3</property>
 		      <property name="n_columns">2</property>
 		      <property name="homogeneous">False</property>
 		      <property name="row_spacing">0</property>
@@ -1039,6 +1109,29 @@
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="chkWCMusicShuffle">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Shuffle Playlist</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="toggled" handler="on_Setup_changed" last_modification_time="Mon, 01 Oct 2007 16:48:46 GMT"/>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
 		  </child>
 
@@ -6315,7 +6408,7 @@
 	  <property name="visible">True</property>
 	  <property name="add_tearoffs">False</property>
 	  <property name="focus_on_click">True</property>
-	  <signal name="changed" handler="on_cboLists_changed" last_modification_time="Wed, 24 Jan 2007 17:53:43 GMT"/>
+	  <signal name="changed" handler="on_cboList_changed" last_modification_time="Sat, 10 Jan 2009 16:07:36 GMT"/>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
 
=== modified file 'glade/wahcade_setup.glade.h'
--- glade/wahcade_setup.glade.h	2008-11-30 10:26:19 +0000
+++ glade/wahcade_setup.glade.h	2011-03-03 21:06:42 +0000
@@ -82,6 +82,7 @@
 char *s = N_("Directory for artwork that will be used in the layouts Artwork4 image.\n"
              "(also see Wah!Cade Layout Editor)");
 char *s = N_("Display Mouse Cursor");
+char *s = N_("Display Scroll Arrows in Lists");
 char *s = N_("Edit Game List");
 char *s = N_("Edit List");
 char *s = N_("Emulators");
@@ -121,6 +122,7 @@
 char *s = N_("Movie Directory");
 char *s = N_("Movies");
 char *s = N_("Music");
+char *s = N_("Music / Movie Mix");
 char *s = N_("NMS File");
 char *s = N_("Number of seconds before Screen Saver starts");
 char *s = N_("Number of seconds to display Screen Saver image / movie");
@@ -148,6 +150,8 @@
 char *s = N_("Set Intro Movie");
 char *s = N_("Set XML / Data File");
 char *s = N_("Setup Filters...");
+char *s = N_("Show scroll up / down arrows in Games, Options and History Viewer lists.");
+char *s = N_("Shuffle Playlist");
 char *s = N_("Start Wah!Cade in fullscreen mode");
 char *s = N_("The Control Panel Viewer layout file location (.lay)");
 char *s = N_("The background image (if any) for the history viewer window.");
 
=== modified file 'glade2.py'
--- glade2.py	2008-11-30 10:26:19 +0000
+++ glade2.py	2011-03-03 21:06:42 +0000
@@ -27,7 +27,7 @@
     #not win32, ensure version 2 of pygtk is imported
     pygtk.require('2.0')
 import gtk
-assert gtk.pygtk_version >= (2,6,0), 'pygtk should be >= 2.6.0'
+assert gtk.pygtk_version >= (2, 12, 0), 'pygtk should be >= 2.12.0'
 import gtk.glade
 import gobject
 import pango
@@ -39,6 +39,7 @@
         glade_filename : name of .glade filename
         window_name    : name of window / dialog / menu to be created
     """
+
     def __init__(self, glade_filename, window_name, app_name=None):
         #load glade file
         if app_name:
@@ -155,10 +156,6 @@
                 None
                 'text')
         """
-        #check gtk version
-        if gtk.pygtk_version < (2,5,0):
-            print "pygtk>=2.5.0 required for iconview"
-            return None, None
         #create the ListStore and IconView objects
         ls = gtk.ListStore(*column_types)
         ivw = gtk.IconView(ls)
@@ -217,7 +214,7 @@
         cboe.set_text_column(0)
         #populate with text?
         if initial_text:
-            ls.append((initial_text,))
+            ls.append((initial_text, ))
             cboe.child.set_text(initial_text)
 
     def setup_menu(self, mnu_items, mnu_pixmaps, activate_cb):
@@ -273,4 +270,3 @@
 
     #map getitem to getattr
     __getitem__ = __getattr__
-
 
=== modified file 'gst_media.py'
--- gst_media.py	2009-01-07 17:51:46 +0000
+++ gst_media.py	2011-03-03 21:06:42 +0000
@@ -5,7 +5,7 @@
 # Application: wah!cade
 # File:        gst_video.py
 # Description: gstreamer video widget
-# Copyright (c) 2005-2009   Andy Balcombe <http://www.anti-particle.com>
+# Copyright (c) 2005-2010   Andy Balcombe <http://www.anti-particle.com>
 #       Taken from gstreamer docs example code
 ###
 #
@@ -26,46 +26,46 @@
 import os
 import urllib
 import fnmatch
+import random
+import sys
 
 import pygtk
 pygtk.require('2.0')
-import gobject
+#import gobject
 import pygst
 pygst.require('0.10')
 import gst
-import gst.interfaces
 import gtk
 
+
 class GstPlayer:
+
     def __init__(self, videowidget):
         """initialise player class"""
+        print "GstPlayer.__init__"
         self.playing = False
-        self.player = gst.element_factory_make("playbin", "player")
-        self.videowidget = videowidget
+        self.player = gst.element_factory_make('playbin2')
+        #self.imagesink = gst.element_factory_make('xvimagesink')
+        #self.imagesink.set_property('force-aspect-ratio', False)
+        #self.player.set_property('video-sink', self.imagesink)
+        if videowidget:
+            self.media_type = 'video'
+            self.videowidget = videowidget
+        else:
+            self.media_type = 'music'
         self.on_eos = False
-        #
         bus = self.player.get_bus()
+        bus.add_signal_watch()
         bus.enable_sync_message_emission()
-        bus.add_signal_watch()
+        bus.connect('message', self.on_message)
         bus.connect('sync-message::element', self.on_sync_message)
-        bus.connect('message', self.on_message)
 
-    def on_sync_message(self, bus, message):
-        """message from player?"""
-        if message.structure is None:
-            return
-        if message.structure.get_name() == 'prepare-xwindow-id':
-            self.videowidget.set_sink(message.src)
-            #message.src.set_property('force-aspect-ratio', True)
-            #self.player.set_property('volume', 0)
-            #print "vol=", self.player.get_property('volume')
-            
     def on_message(self, bus, message):
         """message from player?"""
         t = message.type
         if t == gst.MESSAGE_ERROR:
             err, debug = message.parse_error()
-            print "Error: %s" % err, debug
+            #print "GST Error: %s" % err, debug
             if self.on_eos:
                 self.on_eos()
             self.playing = False
@@ -74,9 +74,26 @@
                 self.on_eos()
             self.playing = False
 
+    def on_sync_message(self, bus, message):
+        """ """
+        if message.structure is None:
+            return
+        message_name = message.structure.get_name()
+        #print "on_sync_message: ", message_name
+        if message_name == "prepare-xwindow-id":
+            # Assign the viewport
+            self.imagesink = message.src
+            self.imagesink.set_property('force-aspect-ratio', False)
+            self.imagesink.set_xwindow_id(self.videowidget.window.xid)
+            #self.imagesink = gst.element_factory_make('xvimagesink')
+            #self.imagesink.set_property('force-aspect-ratio', False)
+            self.player.set_property('video-sink', self.imagesink)
+
     def set_location(self, location):
         """set filename"""
         self.player.set_property('uri', location)
+        #if self.media_type == 'video':
+        #    self.imagesink.set_xwindow_id(self.videowidget.window_xid)
 
     def query_position(self):
         """Returns a (position, duration) tuple"""
@@ -120,7 +137,7 @@
         gst.info("playing player")
         self.player.set_state(gst.STATE_PLAYING)
         self.playing = True
-        
+
     def stop(self):
         """stop playing"""
         self.player.set_state(gst.STATE_NULL)
@@ -133,60 +150,35 @@
     def is_playing(self):
         """is file playing"""
         return self.playing
-    
+
     def set_volume(self, volume_level):
         """set the volume level"""
         self.player.set_property('volume', volume_level)
         gst.info("changed volume to [%s]" % volume_level)
 
-    
+
 class VideoWidget(gtk.DrawingArea):
+
     def __init__(self):
         """initialise video widget"""
+        print "VideoWidget.__init__"
         gtk.DrawingArea.__init__(self)
-        self.imagesink = None
-        self.unset_flags(gtk.DOUBLE_BUFFERED)
-        #print "events=", self.event
-        #self.add_events(
-        #    gtk.gdk.POINTER_MOTION_MASK |
-        #    gtk.gdk.SCROLL_MASK |
-        #    gtk.gdk.BUTTON_RELEASE_MASK |
-        #    gtk.gdk.KEY_PRESS |
-        #    gtk.gdk.KEY_RELEASE)
-        #self.set_flags(gtk.CAN_FOCUS)
-        #self.set_flags(gtk.HAS_FOCUS)
-        #self.set_flags(gtk.CAN_DEFAULT)
-        #self.set_flags(gtk.HAS_DEFAULT)
-        #self.connect('key-press-event', self.test_key)
-        #self.set_property('can-focus', True)
-        
-    #def test_key(self, widget, event, *args):
-    #    print "event=", event
-
-    def do_expose_event(self, event):
-        """expose"""
-        #print "gst event=",event
-        if self.imagesink:
-            self.imagesink.expose()
-            return False
-        else:
-            return True
-
-    def set_sink(self, sink):
-        """set sink"""
-        assert self.window.xid
-        self.imagesink = sink
-        self.imagesink.set_xwindow_id(self.window.xid)
-
-        
+        self.connect('realize', self.on_realize)
+
+    def on_realize(self, sender):
+        """video widget realized"""
+        print "VideoWidget.on_realize"
+        self.window_xid = self.window.xid
+
+
 class GstVideo:
+
     def __init__(self, videowidget):
         """initialise video widget"""
-        #self.vid_filename = ''
+        print "GstVideo.__init__"
         self.videowidget = videowidget
         self.player = GstPlayer(self.videowidget)
         self.player.on_eos = lambda *x: self.on_eos()
-        #self.loop_video = True
         self.vid_finished_cb = None
         self.update_id = -1
         self.changed_id = -1
@@ -203,7 +195,7 @@
         else:
             #finished
             self.vid_finished_cb()
-        
+
     def play(self, vid_filename, vid_finished_cb=None):
         """play given video file"""
         self.vid_finished_cb = vid_finished_cb
@@ -215,18 +207,20 @@
         self.player.stop()
         if self.vid_finished_cb:
             self.vid_finished_cb()
-        
+
     def close(self):
         """close"""
         pass
-    
+
     def set_volume(self, volume_level):
         """change volume level"""
         self.player.set_volume((volume_level / 100.0))
 
 
 class MusicPlayer:
+
     def __init__(self):
+        """initialise"""
         self.player = GstPlayer(None)
         self.player.on_eos = self.on_eos
         self.current_track = -1
@@ -234,16 +228,17 @@
         self.tracks = []
 
     def get_uris_from_pls(self, uri):
+        """return list of tracks from playlist"""
         uris = []
         lines = open(uri).readlines()
         # = content.splitlines()
         for line in lines:
             if line.lower().startswith("file") and line.find("=") != -1:
-               uris.append(line[line.find("=") + 1:].strip())
-        uris = [self.pls_rebuild_uri(uri,u) for u in uris]
+                uris.append(line[line.find("=") + 1:].strip())
+        uris = [self.pls_rebuild_uri(uri, u) for u in uris]
         return uris
-            
-    def pls_rebuild_uri(self, base_uri,uri):
+
+    def pls_rebuild_uri(self, base_uri, uri):
         base_uri = base_uri[:base_uri.rfind("/")]
         if uri.find("://") != -1:
             return uri
@@ -251,32 +246,34 @@
             return "file://%s" % urllib.quote(uri)
         else:
             return "%s/%s" % (base_uri, urllib.quote(uri))
-    
+
     def on_eos(self):
-        #print "end of track"
+        """end of track"""
         self.next_track()
-        
+
     def load_file(self, location, play=True):
         """load individual track"""
         self.tracks = [location]
         self.current_track = -1
         if play:
             self.next_track()
-                                  
-    def load_playlist(self, playlist, play=True):
+
+    def load_playlist(self, playlist, play=True, shuffle=False):
         """load playlist"""
         self.tracks = playlist
+        if shuffle:
+            random.shuffle(self.tracks)
         self.current_track = -1
         if play:
             self.next_track()
-        
+
     def load_playlist_file(self, playlist_file, play=True):
         """load playlist"""
         self.tracks = self.get_uris_from_pls(playlist_file)
         self.current_track = -1
         if play:
             self.next_track()
-        
+
     def next_track(self):
         """goto next track in playlist"""
         self.current_track += 1
@@ -285,11 +282,11 @@
         #print "self.current_track=", self.current_track + 1
         #print "setting track to: ", self.tracks[self.current_track]
         self.player.stop()
-        if len(self.tracks) > 0: 
+        if len(self.tracks) > 0:
             self.player.set_location('file://%s' % self.tracks[self.current_track])
             self.player.seek(0L)
             self.player.play()
-                                  
+
     def previous_track(self):
         """goto previous track in playlist"""
         self.current_track -= 1
@@ -302,15 +299,19 @@
             self.player.set_location('file://%s' % self.tracks[self.current_track])
             self.player.seek(0L)
             self.player.play()
-        
+
     def play(self):
         """pause"""
         self.player.play()
-        
+
     def pause(self):
         """pause"""
         self.player.pause()
-                                  
+
+    def stop(self):
+        """pause"""
+        self.player.stop()
+
     def play_toggle(self):
         """play / pause"""
         if self.player.is_playing():
@@ -321,7 +322,7 @@
     def set_volume(self, volume_level):
         """change volume level"""
         self.player.set_volume((volume_level / 100.0))
-        
+
     def set_directory(self, music_dir, filespec):
         """set player to given dir & load files in it"""
         self.current_dir = music_dir
@@ -329,13 +330,14 @@
         if os.path.exists(self.current_dir):
             self.first_dir_matched = False
             first_tracks = self.get_first_music_tracks(
-                root = self.current_dir, 
-                recurse = True, 
+                root = self.current_dir,
+                recurse = True,
                 pattern = filespec)
             first_tracks.sort()
         return first_tracks
-        
-    def get_first_music_tracks(self, root, recurse=False, pattern='*'): 
+
+    def get_first_music_tracks(self, root, recurse=False, pattern='*'):
+        """get list of music tracks"""
         #initialize
         result = []
         #must have at least root folder
@@ -362,4 +364,3 @@
                 if os.path.isdir(fullname) and not os.path.islink(fullname):
                     result += self.get_first_music_tracks(fullname, recurse, pattern)
         return result
-
 
=== modified file 'install'
--- install	2009-01-07 17:51:46 +0000
+++ install	2011-03-03 21:06:42 +0000
@@ -48,6 +48,9 @@
 install --directory $DESTDIR/config.dist/layouts/retro_white_1024x768
 install --directory $DESTDIR/config.dist/layouts/retro_cpviewer
 install --directory $DESTDIR/config.dist/layouts/retro_histview
+install --directory $DESTDIR/config.dist/layouts/simple_640x480
+install --directory $DESTDIR/config.dist/layouts/simple_800x600
+install --directory $DESTDIR/config.dist/layouts/simple_1024x768
 install --directory $DESTDIR/doc
 install --directory $DESTDIR/doc/file_formats
 install --directory $DESTDIR/doc/xmame
@@ -84,6 +87,9 @@
 install --mode=644 config.dist/layouts/retro_white_640x480/* $DESTDIR/config.dist/layouts/retro_white_640x480
 install --mode=644 config.dist/layouts/retro_white_800x600/* $DESTDIR/config.dist/layouts/retro_white_800x600
 install --mode=644 config.dist/layouts/retro_white_1024x768/* $DESTDIR/config.dist/layouts/retro_white_1024x768
+install --mode=644 config.dist/layouts/simple_640x480/* $DESTDIR/config.dist/layouts/simple_640x480
+install --mode=644 config.dist/layouts/simple_800x600/* $DESTDIR/config.dist/layouts/simple_800x600
+install --mode=644 config.dist/layouts/simple_1024x768/* $DESTDIR/config.dist/layouts/simple_1024x768
 install --mode=644 config.dist/layouts/retro_cpviewer/* $DESTDIR/config.dist/layouts/retro_cpviewer
 install --mode=644 config.dist/layouts/retro_histview/* $DESTDIR/config.dist/layouts/retro_histview
 install --mode=644 doc/* $DESTDIR/doc
 
=== modified file 'joystick.py'
--- joystick.py	2008-11-30 10:26:19 +0000
+++ joystick.py	2011-03-03 21:06:42 +0000
@@ -29,21 +29,24 @@
     import pygame
     pygame_imported = True
 except ImportError:
-    print _('Warning: pygame module not found.  Joysticks not supported') 
-
-class joystick:
+    print _('Warning: pygame module not found.  Joysticks not supported')
+
+
+class Joystick:
     """pygame joystick class"""
-    def __init__(self):
+
+    def __init__(self, debug=False):
         """initialise"""
+        self.debug = debug
         self.state = {}
         self.devices = {}
         self.ctrls = {}
         if pygame_imported:
             pygame.init()
-            pygame.joystick.init()
-   
+            pygame.mixer.quit()
+
     def use_ini_controls(self, ctrlr_ini):
-        """read controller ini file""" 
+        """read controller ini file"""
         if not pygame_imported:
             return
         for mw_keys in ctrlr_ini.ini_dict.itervalues():
@@ -52,7 +55,7 @@
                 if mw_key[:3] == "JOY":
                     self.state[mw_key] = 0
                     (dev_num, control) = mw_key.split("_", 1)
-                    dev_num = dev_num[3:] 
+                    dev_num = dev_num[3:]
                     self.devices[int(dev_num) - 1] = None
         #
         num_joysticks = pygame.joystick.get_count()
@@ -60,7 +63,7 @@
             if dev_num < num_joysticks:
                 self.devices[dev_num] = pygame.joystick.Joystick(dev_num)
                 self.devices[dev_num].init()
-       
+
     def use_all_controls(self):
         """which joysticks"""
         if not pygame_imported:
@@ -72,9 +75,10 @@
             num_buttons = self.devices[dev_num].get_numbuttons()
             for button_num in range(num_buttons):
                 mw_key = "JOY%s_BUTTON%s" % (dev_num + 1, button_num)
-                ctrl_name = _('Joystick %s Button %s') % (dev_num + 1, button_num)
+                ctrl_name = _('Joystick %s Button %s') % (
+                    dev_num + 1, button_num)
                 self.state[mw_key] = 0
-                self.ctrls[ctrl_name] = mw_key 
+                self.ctrls[ctrl_name] = mw_key
             if self.devices[dev_num].get_numaxes() > 2:
                 mw_key = "JOY%s_" % (dev_num + 1)
                 ctrl_name = _('Joystick %s ') % (dev_num + 1)
@@ -86,27 +90,27 @@
                 self.ctrls[ctrl_name + _('Down')] = mw_key + "DOWN"
                 self.ctrls[ctrl_name + _('Left')] = mw_key + "LEFT"
                 self.ctrls[ctrl_name + _('Right')] = mw_key + "RIGHT"
-                                                             
-    def poll(self, event_cb, initial_repeat_delay=40):
+
+    def poll(self, event_cb, initial_repeat_delay=10):
         """poll for joystick events"""
         if not pygame_imported:
-            return 0
-        repeat_delay = 4
+            return False
+        repeat_delay = 1
         # give pygame a chance to do its magic with the joystick
         pygame.event.pump()
         # end polling if no joysticks are found
         num_joysticks = pygame.joystick.get_count()
         if num_joysticks == 0:
-            return 0
+            return False
         # get the focused window or return
         active_window = None
         windows = gtk.window_list_toplevels()
         for window in windows:
             if window.is_active():
                 active_window = window
-        if active_window == None: 
-            return 1
-        # check if any of our defined controlls were pressed
+        if active_window == None:
+            return True
+        # check if any of our defined controls were pressed
         mw_key_events = []
         for mw_key in self.state.iterkeys():
             (dev_num, joy_type) = (mw_key.split("_", 1))
@@ -122,6 +126,7 @@
                 elif self.state[mw_key] > 0:
                     self.state[mw_key] = 0
                     mw_key_events.append(mw_key)
+                #break #one event should be enough
             elif joy_type in ["LEFT", "RIGHT", "UP", "DOWN"]:
                 if joy_type in ["LEFT", "RIGHT"]:
                     axis_num = 0
@@ -142,20 +147,31 @@
                     elif self.state[mw_key] > 0:
                         self.state[mw_key] = 0
                         mw_key_events.append(mw_key)
+                #break #one event should be enough
         # send fake key-press events
-        for mw_key in mw_key_events:
+        if len(mw_key_events) > 0:
+            #print "mw_key_events=",mw_key_events
+            mw_key = mw_key_events[0]
+            #print "mw_key=",mw_key, self.state[mw_key]
+        #for mw_key in mw_key_events:
+            #print "mw_key=",mw_key, self.state[mw_key]
             if self.state[mw_key] == 0:
                 e = gtk.gdk.Event(gtk.gdk.KEY_RELEASE)
                 if active_window.window:
                     e.window = active_window.window
+                    if self.debug:
+                        print "joystick: key-release: raising: ", mw_key
                     event_cb(active_window, e, "JOYSTICK", mw_key)
-            elif (self.state[mw_key] == 1 or 
+            elif (self.state[mw_key] == 1 or
               self.state[mw_key] == initial_repeat_delay or
-              (self.state[mw_key] > initial_repeat_delay and 
+              (self.state[mw_key] > initial_repeat_delay and
               (self.state[mw_key] - initial_repeat_delay) % repeat_delay == 0)):
                 e = gtk.gdk.Event(gtk.gdk.KEY_PRESS)
                 if active_window.window:
                     e.window = active_window.window
+                    if self.debug:
+                        print "joystick: key-press: raising: ", mw_key
                     event_cb(active_window, e, "JOYSTICK", mw_key)
-        return 1
-
+        #try clearing event queue
+        pygame.event.clear()
+        return True
 
=== modified file 'key_consts.py'
--- key_consts.py	2009-01-07 17:51:46 +0000
+++ key_consts.py	2011-03-03 21:06:42 +0000
@@ -4,7 +4,7 @@
 # Application: wah!cade
 # File:        key_consts.py
 # Description: keyboard constants file
-# Copyright (c) 2005-2009   Andy Balcombe <http://www.anti-particle.com>
+# Copyright (c) 2005-2010   Andy Balcombe <http://www.anti-particle.com>
 ###
 #
 # This program is free software; you can redistribute it and/or modify
@@ -80,7 +80,7 @@
     'delete': ['DIK_DELETE'],
     'end': ['DIK_END'],
     'pause': ['DIK_PAUSE'],
-    
+
     #function keys
     'f1': ['DIK_F1'],
     'f2': ['DIK_F2'],
@@ -120,7 +120,7 @@
     'kp_decimal': ['DIK_NUMPADPERIOD', 'DIK_DECIMAL'],
     'kp_enter': ['DIK_NUMPADENTER'],
 
-    #punctuation 
+    #punctuation
     'grave': ['DIK_GRAVE'],
     'backslash': ['DIK_BACKSLASH'],
     'minus': ['DIK_MINUS'],
@@ -133,7 +133,7 @@
     'period': ['DIK_PERIOD'],
     'slash': ['DIK_SLASH'],
     'space': ['DIK_SPACE'],
-    
+
     #modifier keys
     'escape': ['DIK_ESCAPE'],
     'shift_l': ['DIK_LSHIFT'],
@@ -148,10 +148,8 @@
     'caps_lock': ['DIK_CAPSLOCK'],
     'num_lock': ['DIK_NUMLOCK'],
     'scroll_lock': ['DIK_SCROLL'],
-    
+
     #keys not recognized in GTK
     'voidsymbol': ['DIK_CAPITOL'],
     'unknown': ['DIK_APPS'],
-    'unknown': ['DIK_SYSRQ']
-}
-
+    'unknown': ['DIK_SYSRQ']}
 
=== modified file 'layout_editor.py'
--- layout_editor.py	2009-01-11 16:29:58 +0000
+++ layout_editor.py	2011-03-03 21:06:42 +0000
@@ -5,7 +5,7 @@
 # Application: wah!cade
 # File:        layout_editor.py
 # Description: Wah!Cade Layout Editor
-# Copyright (c) 2005-2009   Andy Balcombe <http://www.anti-particle.com>
+# Copyright (c) 2005-2010   Andy Balcombe <http://www.anti-particle.com>
 ###
 #
 # This program is free software; you can redistribute it and/or modify
@@ -54,8 +54,10 @@
 from mamewah_ini import MameWahIni
 _ = gettext.gettext
 
+
 class WinLayout(GladeSupport, WahCade):
     """Layout Editor Main Window"""
+
     def __init__(self, glade_filename, window_name, config_opts, config_args):
         """build the window"""
         self.title = 'Wah!Cade Layout Editor'
@@ -71,7 +73,7 @@
             self.config_dir = os.path.join(APP_PATH, 'config')
         else:
             #got with the default config location
-            self.config_dir = os.path.expanduser('~/.wahcade')
+            self.config_dir = CONFIG_DIR
             if not os.path.exists(self.config_dir):
                 sys.exit(_('No Wah!Cade config files found.  Run wahcade or wahcade-setup first.'))
         self.fixdMain = gtk.Fixed()
@@ -143,7 +145,7 @@
             hist_widgets[widget_name] = evb
             self.fixdHist.put(evb, 100, 10 + (i * 30))
         #fixed pos widgets
-        self._fixed_widgets = [self.fixdMain, self.fixdOpt, self.fixdMsg,  
+        self._fixed_widgets = [self.fixdMain, self.fixdOpt, self.fixdMsg,
                 self.fixdScr, self.fixdCpv, self.fixdHist]
         for fixd in self._fixed_widgets:
             fixd.connect('expose-event', self.on_fixd_expose_event)
@@ -237,9 +239,9 @@
         self.hist_widgets = hist_widgets
         #setup view menu / toolbar
         self.view_updating = True
-        self.view_menu = [self.mnuVMain, self.mnuVOpt, self.mnuVMsg, self.mnuVScr, 
+        self.view_menu = [self.mnuVMain, self.mnuVOpt, self.mnuVMsg, self.mnuVScr,
             self.mnuVCpv, self.mnuVHist]
-        self.view_trb = [self.trbMain, self.trbOpt, self.trbMsg, self.trbScr, 
+        self.view_trb = [self.trbMain, self.trbOpt, self.trbMsg, self.trbScr,
             self.trbCpv, self.trbHist]
         for mnu in self.view_menu[1:]:
             mnu.set_active(False)
@@ -259,7 +261,7 @@
             cpviewer_ini = MameWahIni(os.path.join(self.config_dir, 'cpviewer.ini'), 'default', '0.10')
             histview_ini = MameWahIni(os.path.join(self.config_dir, 'histview.ini'), 'default', '0.16')
             #setup layout combo
-            self.layouts = [] 
+            self.layouts = []
             layout_files = glob.glob(os.path.join(self.config_dir, 'layouts', wahcade_ini.get('layout'), '*.lay'))
             for layout_file in layout_files:
                 self.layouts.append(
@@ -268,7 +270,7 @@
             self.layouts.sort()
             #setup layout combo
             l = ['%s.lay' % (l[0]) for l in self.layouts]
-            self.setup_combo_box(self.cboLayout, l)            
+            self.setup_combo_box(self.cboLayout, l)
             #load layout
             layout_file = os.path.join(self.config_dir, 'layouts', wahcade_ini.get('layout'), 'layout.lay')
             if not os.path.isfile(layout_file):
@@ -280,7 +282,7 @@
                         pass
                     if not os.path.exists(layout_file):
                         layout_file = os.path.join(self.config_dir, 'layouts', 'classic_640x480', 'layout.lay')
-            idx = [self.layouts.index(l) for l in self.layouts if l[1] == layout_file] 
+            idx = [self.layouts.index(l) for l in self.layouts if l[1] == layout_file]
             if idx != []:
                 self.cboLayout.set_active(idx[0])
             else:
@@ -329,7 +331,7 @@
         #exit gtk loop
         gtk.main_quit()
         return False
-        
+
     def on_winMain_key_press(self, widget, event, *args):
         """key pressed - move selected widget"""
         if self.selected_widgets == []:
@@ -423,7 +425,7 @@
             _('Save CP Viewer Layout'),
             self.save_cpviewer_file)
         self.set_window_title()
-            
+
     def on_mnuFSaveHistAs_activate(self, *args):
         """save history viewer layout file as"""
         self.save_layout_dialog(
@@ -431,24 +433,24 @@
             _('Save History Viewer Layout'),
             self.save_histview_file)
         self.set_window_title()
-            
+
     def on_mnuFQuit_activate(self, *args):
         """quit"""
         self.on_winMain_delete_event()
-        
+
     def on_mnuESelectAllVisible_activate(self, *args):
         """select all visible widgets"""
         for widget in self.fixd.get_children():
             if self.dLayout[widget]['visible']:
                 self.select_widget(widget)
                 self.selected_widgets.append(widget)
-    
+
     def on_mnuESelectAll_activate(self, *args):
         """select all widgets"""
         for widget in self.fixd.get_children():
             self.select_widget(widget)
             self.selected_widgets.append(widget)
-    
+
     def on_cboLayout_changed(self, cbo, *args):
         """change layout"""
         self.load_layout_file(self.layouts[cbo.get_active()][1])
@@ -668,7 +670,7 @@
         gc = fixed.style.light_gc[gtk.STATE_NORMAL]
         window.draw_rectangle(gc, False, 0, 0, w, h)
         return False
-        
+
     def _make_label(self, widget_name):
         """create a label (inside an event box)"""
         evb = gtk.EventBox()
@@ -726,7 +728,7 @@
         ftr.add_pattern('*.lay')
         dlg.add_filter(ftr)
         dlg.set_filter(ftr)
-        if gtk.check_version(2,8,0) is None:
+        if gtk.check_version(2, 8, 0) is None:
             try:
                 dlg.set_do_overwrite_confirmation(True)
             except AttributeError:
@@ -807,27 +809,27 @@
         main_bg_col = gtk.gdk.color_parse(self.get_colour(int(lines[3])))
         self.viewport.modify_bg(gtk.STATE_NORMAL, main_bg_col)
         self.dLayout[self.fixdMain]['image'] = lines[4]
-        img_path = self.get_path(lines[4])
-        if not os.path.dirname(img_path):
-            img_path = os.path.join(layout_path, img_path)
-        #print "img=",img_path, os.path.isfile(img_path)
-        self.dLayout[self.fixdMain]['use_image'] = os.path.isfile(img_path)
+        img_file = self.get_path(lines[4])
+        if not os.path.dirname(img_file):
+            img_file = os.path.join(layout_path, img_file)
+        #print "img=",img_file, os.path.isfile(img_file)
+        self.dLayout[self.fixdMain]['use_image'] = os.path.isfile(img_file)
         #options window
         self.dLayout[self.fixdOpt]['background-col'] = self.get_colour(int(lines[296]))
         opt_bg_col = gtk.gdk.color_parse(self.get_colour(int(lines[296])))
         self.dLayout[self.fixdOpt]['image'] = lines[297]
-        img_path = self.get_path(lines[297])
-        if not os.path.dirname(img_path):
-            img_path = os.path.join(layout_path, img_path)
-        self.dLayout[self.fixdOpt]['use_image'] = os.path.isfile(img_path)
+        img_file = self.get_path(lines[297])
+        if not os.path.dirname(img_file):
+            img_file = os.path.join(layout_path, img_file)
+        self.dLayout[self.fixdOpt]['use_image'] = os.path.isfile(img_file)
         #message window
         self.dLayout[self.fixdMsg]['background-col'] = self.get_colour(int(lines[355]))
         msg_bg_col = gtk.gdk.color_parse(self.get_colour(int(lines[355])))
         self.dLayout[self.fixdMsg]['image'] = lines[356]
-        img_path = self.get_path(lines[356])
-        if not os.path.dirname(img_path):
-            img_path = os.path.join(layout_path, img_path)
-        self.dLayout[self.fixdMsg]['use_image'] = os.path.isfile(img_path)
+        img_file = self.get_path(lines[356])
+        if not os.path.dirname(img_file):
+            img_file = os.path.join(layout_path, img_file)
+        self.dLayout[self.fixdMsg]['use_image'] = os.path.isfile(img_file)
         #screen saver window
         self.dLayout[self.fixdScr]['background-col'] = self.dLayout[self.fixdMain]['background-col']
         self.dLayout[self.fixdScr]['image'] = ''
@@ -933,7 +935,7 @@
             lines[offset + 7] = ' %s' % d['font-size']
             align_rot = '%s' % d['text-align']
             if d['text-rotation'] != 0:
-                align_rot = '%s;%s' % (align_rot, d['text-rotation']) 
+                align_rot = '%s;%s' % (align_rot, d['text-rotation'])
             lines[offset + 8] = ' %s' % align_rot
             lines[offset + 9] = ' %s' % d['x']
             lines[offset + 10] = ' %s' % d['y']
@@ -952,7 +954,7 @@
         open(fname, 'w').writelines(lines[1:])
         #reset altered flag
         self.layout_altered = False
-        
+
     def init_cpviewer_widgets(self):
         """set cpviewer widgets to sensible defaults"""
         for widget in self._cpv_widgets:
@@ -962,9 +964,9 @@
             d['font-bold'] = False
             d['font-italic'] = False
             d['font-size'] = 10
-            d['transparent'] = True  
+            d['transparent'] = True
             d['text-col'] = '#FF0000'
-            d['background-col'] = '#FFFFFF' 
+            d['background-col'] = '#FFFFFF'
             d['visible'] = False
             d['text-align'] = 2
             d['width'] = 100
@@ -1020,7 +1022,7 @@
                 #visible?
                 d['visible'] = (ctrl_element.find('Visible').text == 'True')
                 evb.set_property('visible', d['visible'])
-                #alignment                                  
+                #alignment
                 if ctrl_element.find('TextAlign').text == 'MiddleLeft':
                     align = 0.0
                     text_align = 0
@@ -1046,7 +1048,7 @@
                 self.fixdCpv.move(evb, d['x'], d['y'])
                 #save widget settings
                 self.dLayout[evb] = d
-            elif ctrl_element.tag  == 'MainForm':
+            elif ctrl_element.tag == 'MainForm':
                 #setup background, etc
                 cpv_width = int(ctrl_element.find('Width').text)
                 cpv_height = int(ctrl_element.find('Height').text)
@@ -1061,7 +1063,7 @@
         self.dLayout[self.fixdCpv] = {
             'name': 'C.P. Viewer',
             'width': cpv_width, 'height': cpv_height,
-            'background-col': back_col, 
+            'background-col': back_col,
             'image': cpv_img,
             'use_image': os.path.isfile(self.get_path(cpv_img))}
         #done
@@ -1083,7 +1085,7 @@
                 e.tail = i
         if level and (not elem.tail or not elem.tail.strip()):
             elem.tail = i
-                
+
     def save_cpviewer_file(self, cpviewer_filename=None):
         """save the cpviewer layout file"""
         xml_elements = {
@@ -1100,8 +1102,7 @@
             'background-col': 'BackColor',
             'text-align': 'TextAlign',
             'text-rotation': 'TextRotation',
-            'transparent': 'Transparent'
-        }
+            'transparent': 'Transparent'}
         #set filename
         if cpviewer_filename:
             self.cpviewer_filename = cpviewer_filename
@@ -1111,7 +1112,7 @@
         for cpv_widget in self._cpv_widgets:
             widget_ele = ET.SubElement(cpv_ele, cpv_widget)
             for k, v in self.dLayout[self.cpv_widgets[cpv_widget]].items():
-                if xml_elements.has_key(k):
+                if k in xml_elements:
                     sub_ele = ET.SubElement(widget_ele, xml_elements[k])
                     if k in ['text-col', 'background-col']:
                         sub_ele.text = str(self.reverse_get_colour(v))
@@ -1144,7 +1145,7 @@
         tree.write(self.cpviewer_filename)
         #reset altered flag
         self.cpviewer_altered = False
-        
+
     def load_histview_file(self, histview_filename):
         """load history viewer layout file"""
         #read file & strip any crap
@@ -1245,7 +1246,7 @@
             lines[offset + 7] = ' %s' % d['font-size']
             align_rot = '%s' % d['text-align']
             if d['text-rotation'] != 0:
-                align_rot = '%s;%s' % (align_rot, d['text-rotation']) 
+                align_rot = '%s;%s' % (align_rot, d['text-rotation'])
             lines[offset + 8] = ' %s' % align_rot
             lines[offset + 9] = ' %s' % d['x']
             lines[offset + 10] = ' %s' % d['y']
@@ -1270,4 +1271,3 @@
             self.winMain.set_title('%s - %s' % (self.title, self.histview_filename))
         else:
             self.winMain.set_title('%s -%s' % (self.title, self.layout_filename))
-
 
=== modified file 'layout_props.py'
--- layout_props.py	2009-01-07 17:51:46 +0000
+++ layout_props.py	2011-03-03 21:06:42 +0000
@@ -5,7 +5,7 @@
 # Application: wah!cade
 # File:        layout_props.py
 # Description: Wah!Cade Layout Properties Dialog
-# Copyright (c) 2005-2009   Andy Balcombe <http://www.anti-particle.com>
+# Copyright (c) 2005-2010   Andy Balcombe <http://www.anti-particle.com>
 ###
 #
 # This program is free software; you can redistribute it and/or modify
@@ -25,8 +25,10 @@
 from constants import *
 from glade2 import *
 
+
 class DlgProps(GladeSupport):
     """Layout Editor Item Properties Dialog"""
+
     def __init__(self, glade_filename, window_name, app):
         """build the window"""
         GladeSupport.__init__(self, glade_filename, window_name)
@@ -35,7 +37,7 @@
         self.widget_list = []
         self.name_idx = -1
         self.updating = False
-            
+
     def populate_names(self, widget_list):
         #pop names
         self.widget_list = widget_list
@@ -89,7 +91,7 @@
                 if self.chkTransparent.get_active():
                     clr = self.WinLayout.dLayout[self.WinLayout.fixd]['background-col']
                 else:
-                    clr = self.WinLayout.dLayout[widget]['background-col'] 
+                    clr = self.WinLayout.dLayout[widget]['background-col']
                 widget.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(clr))
                 self.WinLayout.set_layout_altered(widget)
 
@@ -101,7 +103,7 @@
                 self.WinLayout.dLayout[widget]['x'] = x
                 self.WinLayout.fixd.move(widget, x, self.WinLayout.dLayout[widget]['y'])
                 self.WinLayout.set_layout_altered(widget)
-                
+
     def on_spnY_changed(self, *args):
         """change widget Y pos"""
         if not self.updating:
@@ -181,7 +183,7 @@
                     self.WinLayout.dLayout[widget]['text-align'] = text_align
                     widget.child.set_property('xalign', xalign)
                     self.WinLayout.set_layout_altered(widget)
-                    
+
     def on_cboRotation_changed(self, cbo, *args):
         """text / image rotation"""
         if not self.updating:
@@ -203,27 +205,27 @@
                 self.WinLayout.dLayout[widget]['font-size'] = int(pfd.get_size() / pango.SCALE)
                 widget.child.modify_font(pfd)
                 self.WinLayout.set_layout_altered(widget)
-                
+
     def on_btnArtworkDir_clicked(self, *args):
         """select artwork dir dialog"""
         pass
-    
+
     def on_txeArtworkDir_changed(self, *args):
         """set artwork dir"""
         pass
-    
+
     def on_chkPlaysMovies_toggled(self, *args):
         """play movies"""
         pass
-    
+
     def on_btnMovieDir_clicked(self, *args):
         """select movie dir dialog"""
         pass
-    
+
     def on_txeMovieDir_changed(self, *args):
         """set movie dir"""
         pass
-    
+
     def set_properties(self, widget, widget_props):
         """set props for given widget"""
         self.name_idx = self.widget_list.index(widget.get_name())
@@ -261,4 +263,3 @@
             self.lblSelected.set_sensitive(False)
             self.clrSelected.set_sensitive(False)
         self.updating = False
-
 
=== modified file 'layout_scr_props.py'
--- layout_scr_props.py	2009-01-07 17:51:46 +0000
+++ layout_scr_props.py	2011-03-03 21:06:42 +0000
@@ -5,7 +5,7 @@
 # Application: wah!cade
 # File:        layout_scr_props.py
 # Description: Wah!Cade Layout Screen Properties Dialog
-# Copyright (c) 2005-2009   Andy Balcombe <http://www.anti-particle.com>
+# Copyright (c) 2005-2010   Andy Balcombe <http://www.anti-particle.com>
 ###
 #
 # This program is free software; you can redistribute it and/or modify
@@ -25,8 +25,10 @@
 from constants import *
 from glade2 import *
 
+
 class DlgScreenProps(GladeSupport):
     """Screen Properties Dialog"""
+
     def __init__(self, glade_filename, window_name, app):
         """build the window"""
         GladeSupport.__init__(self, glade_filename, window_name)
@@ -152,4 +154,3 @@
             self.txeBackgroundImage.set_sensitive(False)
             self.btnBackgroundImage.set_sensitive(False)
         self.updating = False
-
 
=== modified file 'locale/de/LC_MESSAGES/wahcade.mo'
 Binary files locale/de/LC_MESSAGES/wahcade.mo	2009-01-11 16:29:58 +0000 and locale/de/LC_MESSAGES/wahcade.mo	2011-03-03 21:06:42 +0000 differ
=== modified file 'locale/en_GB/LC_MESSAGES/wahcade.mo'
 Binary files locale/en_GB/LC_MESSAGES/wahcade.mo	2009-01-11 16:29:58 +0000 and locale/en_GB/LC_MESSAGES/wahcade.mo	2011-03-03 21:06:42 +0000 differ
=== modified file 'locale/es/LC_MESSAGES/wahcade.mo'
 Binary files locale/es/LC_MESSAGES/wahcade.mo	2009-01-11 16:29:58 +0000 and locale/es/LC_MESSAGES/wahcade.mo	2011-03-03 21:06:42 +0000 differ
=== modified file 'locale/fr/LC_MESSAGES/wahcade.mo'
 Binary files locale/fr/LC_MESSAGES/wahcade.mo	2009-01-11 16:29:58 +0000 and locale/fr/LC_MESSAGES/wahcade.mo	2011-03-03 21:06:42 +0000 differ
=== added directory 'locale/it'
=== added directory 'locale/it/LC_MESSAGES'
=== added file 'locale/it/LC_MESSAGES/wahcade.mo'
 Binary files locale/it/LC_MESSAGES/wahcade.mo	1970-01-01 00:00:00 +0000 and locale/it/LC_MESSAGES/wahcade.mo	2011-03-03 21:06:42 +0000 differ
=== modified file 'locale/sv/LC_MESSAGES/wahcade.mo'
 Binary files locale/sv/LC_MESSAGES/wahcade.mo	2009-01-11 16:29:58 +0000 and locale/sv/LC_MESSAGES/wahcade.mo	2011-03-03 21:06:42 +0000 differ
=== modified file 'make_all'
--- make_all	2008-11-30 10:26:19 +0000
+++ make_all	2011-03-03 21:06:42 +0000
@@ -1,7 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 #make get text, tarball & build deb
-
-./make_gettext
-./make_tarball
-./build_deb_package
+echo 'make wahcade' > make.log
+if [ -z "$1" ]; then
+    if [ "$1" = "--gettext" ]; then
+       ./make_gettext >> make.log
+    fi
+fi
+./make_tarball >> make.log
+./build_deb_package >> make.log
 
 
=== modified file 'make_gettext'
--- make_gettext	2008-11-30 10:26:19 +0000
+++ make_gettext	2011-03-03 21:06:42 +0000
@@ -17,6 +17,7 @@
 msgmerge -U en_GB.po messages.pot
 msgmerge -U es.po messages.pot
 msgmerge -U fr.po messages.pot
+msgmerge -U it.po messages.pot
 msgmerge -U sv.po messages.pot
 
 #compile into application format
@@ -25,6 +26,7 @@
 msgfmt en.po -o ../locale/en/LC_MESSAGES/wahcade.mo
 msgfmt es.po -o ../locale/es/LC_MESSAGES/wahcade.mo
 msgfmt fr.po -o ../locale/fr/LC_MESSAGES/wahcade.mo
+msgfmt it.po -o ../locale/fr/LC_MESSAGES/wahcade.mo
 msgfmt sv.po -o ../locale/sv/LC_MESSAGES/wahcade.mo
 
 #
 
=== modified file 'make_tarball'
--- make_tarball	2008-11-30 15:09:04 +0000
+++ make_tarball	2011-03-03 21:06:42 +0000
@@ -15,7 +15,7 @@
 tar -zhcf $TARBALL -T $NAME/wahcade_files
 
 #copy stuff to antiparticle dir
-cp -f $TARBALL /media/windows/downloads/temp
+cp -f $TARBALL /media/windows_data/downloads/temp
 cp -f $TARBALL $WWW/projects/$NAME
 cp -f $SOURCE/doc/[A-Z]* $WWW/projects/$NAME/
 cp -f $SOURCE/doc/xmame/xmamerc $WWW/projects/$NAME/
 
=== modified file 'mamewah_ini.py'
--- mamewah_ini.py	2009-01-07 17:51:46 +0000
+++ mamewah_ini.py	2011-03-03 21:06:42 +0000
@@ -5,7 +5,7 @@
 # Application: wah!cade
 # File:        mamewah_ini.py
 # Description: read mamewah formatted ini file
-# Copyright (c) 2005-2009   Andy Balcombe <http://www.anti-particle.com>
+# Copyright (c) 2005-2010   Andy Balcombe <http://www.anti-particle.com>
 ###
 #
 # This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,9 @@
 
 from constants import *
 
+
 class MameWahIni:
+
     def __init__(self, ini_filename, ini_type='default', min_version=None):
         """init ini class"""
         self.ini_filename = ini_filename
@@ -99,14 +101,14 @@
             if spc_pos == -1:
                 spc_pos = len(line)
             option = line[:spc_pos]
-            if self.ini_dict.has_key(option):
+            if option in self.ini_dict:
                 #build line
                 self.lines[i] = '%s%s' % (option.ljust(40), self.ini_dict[option])
         #add missing keys
         if missing_keys:
             #print "missing keys=",missing_keys
             self.lines.append('')
-            self.lines.append('### Added in v%s "%s" ###' % (VERSION, VERSION_NAME)) 
+            self.lines.append('### Added in v%s "%s" ###' % (VERSION, VERSION_NAME))
             for mk in missing_keys:
                 self.lines.append('%s%s' % (mk.ljust(40), self.ini_dict[mk]))
         #add correct line terminator
@@ -116,11 +118,11 @@
 
     def has_option(self, option):
         """does the option exist"""
-        return self.ini_dict.has_key(option)
+        return option in self.ini_dict
 
     def get(self, option, get_mode='default', default_value=''):
         """return value for given option"""
-        if self.ini_dict.has_key(option):
+        if option in self.ini_dict:
             value = self.ini_dict[option]
             #set default value if none found
             if value == '':
@@ -174,4 +176,3 @@
             if os.path.exists(os.path.expanduser(test_path)):
                 value = test_path
         self.ini_dict[option] = value
-
 
=== modified file 'po/de.po'