Merge remote-tracking branch 'upstream/master' into zvision

Conflicts:
	engines/zvision/animation/rlf_animation.cpp
	engines/zvision/animation_control.h
	engines/zvision/core/console.cpp
	engines/zvision/core/events.cpp
	engines/zvision/cursors/cursor.cpp
	engines/zvision/cursors/cursor_manager.cpp
	engines/zvision/cursors/cursor_manager.h
	engines/zvision/fonts/truetype_font.cpp
	engines/zvision/graphics/render_manager.cpp
	engines/zvision/graphics/render_manager.h
	engines/zvision/inventory/inventory_manager.h
	engines/zvision/inventory_manager.h
	engines/zvision/meta_animation.h
	engines/zvision/module.mk
	engines/zvision/scripting/actions.cpp
	engines/zvision/scripting/control.h
	engines/zvision/scripting/controls/animation_control.cpp
	engines/zvision/scripting/controls/animation_control.h
	engines/zvision/scripting/controls/input_control.cpp
	engines/zvision/scripting/controls/lever_control.cpp
	engines/zvision/scripting/controls/timer_node.cpp
	engines/zvision/scripting/controls/timer_node.h
	engines/zvision/scripting/puzzle.h
	engines/zvision/scripting/scr_file_handling.cpp
	engines/zvision/scripting/script_manager.cpp
	engines/zvision/scripting/script_manager.h
	engines/zvision/sidefx.cpp
	engines/zvision/sound/zork_raw.cpp
	engines/zvision/sound/zork_raw.h
	engines/zvision/video/video.cpp
	engines/zvision/video/zork_avi_decoder.h
	engines/zvision/zvision.cpp
	engines/zvision/zvision.h

5 files changed, 50 insertions, 44 deletions

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 352cc86852..e881c2d4eb 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -2506,16 +2506,16 @@
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalMenu' overlays='screen_center'>"
-"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'>"
+"<layout type='vertical' padding='2,2,2,6' center='true' spacing='0'>"
 "<widget name='Title' "
 "width='160' "
-"height='4' "
+"height='12' "
 "/>"
 "<widget name='Version' "
 "width='160' "
-"height='4' "
+"height='14' "
 "/>"
-"<space size='1'/>"
+"<layout type='vertical' padding='0,0,3,0' center='true' spacing='6'>"
 "<widget name='Load' "
 "width='120' "
 "height='12' "
@@ -2551,6 +2551,7 @@
 "height='12' "
 "/>"
 "</layout>"
+"</layout>"
 "</dialog>"
 "<dialog name='GlobalConfig' overlays='screen_center'>"
 "<layout type='vertical' padding='8,8,8,8'>"
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 1085aa64a4..7115849aa0 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 802998df3c..506657ef31 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -687,50 +687,51 @@
 	</dialog>
 	
 	<dialog name = 'GlobalMenu' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '2, 2, 4, 6' center = 'true' spacing='6'>
+		<layout type = 'vertical' padding = '2, 2, 2, 6' center = 'true' spacing='0'>
 			<widget name = 'Title'
 					width = '160'
-					height = '4'
+					height = '12'
 			/>
 			<widget name = 'Version'
 					width = '160'
-					height = '4'
-			/>
-			<space size = '1'/>
-			<widget name = 'Load'
-					width = '120'
-					height = '12'
-			/>
-			<widget name = 'Save'
-					width = '120'
-					height = '12'
-			/>
-			<space size = '1'/>
-			<widget name = 'Options'
-					width = '120'
-					height = '12'
-			/>
-			<widget name = 'Help'
-					width = '120'
-					height = '12'
-			/>
-			<widget name = 'About'
-					width = '120'
-					height = '12'
-			/>
-			<space size = '1'/>
-			<widget name = 'Resume'
-					width = '120'
-					height = '12'
-			/>
-			<widget name = 'RTL'
-					width = '120'
-					height = '12'
-			/>
-			<widget name = 'Quit'
-					width = '120'
-					height = '12'
+					height = '14'
 			/>
+			<layout type = 'vertical' padding = '0, 0, 3, 0' center = 'true' spacing='6'>
+				<widget name = 'Load'
+						width = '120'
+						height = '12'
+				/>
+				<widget name = 'Save'
+						width = '120'
+						height = '12'
+				/>
+				<space size = '1'/>
+				<widget name = 'Options'
+						width = '120'
+						height = '12'
+				/>
+				<widget name = 'Help'
+						width = '120'
+						height = '12'
+				/>
+				<widget name = 'About'
+						width = '120'
+						height = '12'
+				/>
+				<space size = '1'/>
+				<widget name = 'Resume'
+						width = '120'
+						height = '12'
+				/>
+				<widget name = 'RTL'
+						width = '120'
+						height = '12'
+				/>
+				<widget name = 'Quit'
+						width = '120'
+						height = '12'
+				/>
+			</layout>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummtheme.py b/gui/themes/scummtheme.py
index 524e91468e..94dc08f1ef 100755
--- a/gui/themes/scummtheme.py
+++ b/gui/themes/scummtheme.py
@@ -19,7 +19,9 @@ def buildTheme(themeName):
 
 	zf.write('THEMERC', './THEMERC')
 
-	for filename in os.listdir('.'):
+	filenames = os.listdir('.')
+	filenames.sort()
+	for filename in filenames:
 		if os.path.isfile(filename) and not filename[0] == '.' and filename.endswith(THEME_FILE_EXTENSIONS):
 			zf.write(filename, './' + filename)
 			print ("    Adding file: " + filename)
@@ -65,7 +67,9 @@ def buildDefTheme(themeName):
 	def_file.write(""" "<?xml version = '1.0'?>"\n""")
 	strlitcount = 24
 
-	for filename in os.listdir(themeName):
+	filenames = os.listdir(themeName)
+	filenames.sort()
+	for filename in filenames:
 		filename = os.path.join(themeName, filename)
 		if os.path.isfile(filename) and filename.endswith(".stx"):
 			theme_file = open(filename, "r")
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 7bd1316208..1a7b49852d 100644
--- a/gui/themes/translations.dat
+++ b/gui/themes/translations.dat