[Scummvm-cvs-logs] SF.net SVN: scummvm:[34818] scummvm/trunk/gui/themes

[tanoku at users.sourceforge.net]

Revision: 34818
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34818&view=rev
Author:   tanoku
Date:     2008-10-18 10:06:33 +0000 (Sat, 18 Oct 2008)

Log Message:
-----------
Fixed: Default theme had several XML headers.

Modified Paths:
--------------
    scummvm/trunk/gui/themes/default.inc
    scummvm/trunk/gui/themes/scummtheme.py

Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc	2008-10-18 09:14:43 UTC (rev 34817)
+++ scummvm/trunk/gui/themes/default.inc	2008-10-18 10:06:33 UTC (rev 34818)
@@ -1,4 +1,4 @@
-"<?xml version = '1.0'?> "
+ "<?xml version = '1.0'?>"
 "<render_info> "
 "<palette> "
 "<color name = 'black' "
@@ -305,7 +305,6 @@
 "/> "
 "</drawdata> "
 "</render_info> "
-"<?xml version = '1.0'?> "
 "<layout_info resolution = '-320xY, -256x240'> "
 "<globals> "
 "<def var = 'Line.Height' value = '16' /> "
@@ -909,7 +908,6 @@
 "</layout> "
 "</dialog> "
 "</layout_info> "
-"<?xml version = '1.0'?> "
 "<layout_info resolution = '320xY, 256x240'> "
 "<globals> "
 "<def var = 'Line.Height' value = '12' /> "

Modified: scummvm/trunk/gui/themes/scummtheme.py
===================================================================
--- scummvm/trunk/gui/themes/scummtheme.py	2008-10-18 09:14:43 UTC (rev 34817)
+++ scummvm/trunk/gui/themes/scummtheme.py	2008-10-18 10:06:33 UTC (rev 34818)
@@ -35,13 +35,16 @@
 			
 def parseSTX(theme_file, def_file):
 	comm = re.compile("<!--(.*?)-->", re.DOTALL)
+	head = re.compile("<\?(.*?)\?>")
 
 	output = ""
 	for line in theme_file:
 		output +=  line.rstrip("\r\n\t ").lstrip() + " \n"
+	
+	output = re.sub(comm, "", output)
+	output = re.sub(head, "", output)
+	output = output.replace("\t", " ").replace("  ", " ").replace("\"", "'").splitlines()
 		
-	output = re.sub(comm, "", output).replace("\t", " ").replace("  ", " ").replace("\"", "'").splitlines()
-		
 	for line in output:
 		if line and not line.isspace():
 			def_file.write("\"" + line + "\"\n")
@@ -52,6 +55,8 @@
 	if not os.path.isdir(themeName):
 		print "Cannot open default theme dir."
 		
+	def_file.write(""" "<?xml version = '1.0'?>"\n""")
+		
 	for filename in os.listdir(themeName):
 		filename = os.path.join(themeName, filename)
 		if os.path.isfile(filename) and filename.endswith(".stx"):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.