Merge remote branch 'upstream/master' into pegasus

33 files changed, 142 insertions, 4 deletions

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index ce670b55f0..bd28c2e85d 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1364,6 +1364,26 @@
 "</layout> "
 "</layout> "
 "</dialog> "
+"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Description1' "
+"width='280' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='Description2' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='Standard' "
+"type='Button' "
+"/> "
+"<widget name='Practice' "
+"type='Button' "
+"/> "
+"<widget name='Expert' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
 "<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
 "<layout type='vertical' padding='4,4,16,4' center='true'> "
 "<widget name='DirProgressText' "
@@ -2174,6 +2194,26 @@
 "</layout> "
 "</layout> "
 "</dialog> "
+"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Description1' "
+"width='320' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='Description2' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='Standard' "
+"type='Button' "
+"/> "
+"<widget name='Practice' "
+"type='Button' "
+"/> "
+"<widget name='Expert' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
 "<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
 "<layout type='vertical' padding='8,8,32,8' center='true'> "
 "<widget name='DirProgressText' "
diff --git a/gui/themes/fonts/FreeMonoBold.ttf b/gui/themes/fonts/FreeMonoBold.ttf
new file mode 100644
index 0000000000..3bce6129ae
--- /dev/null
+++ b/gui/themes/fonts/FreeMonoBold.ttf
diff --git a/gui/themes/fonts/FreeSans.ttf b/gui/themes/fonts/FreeSans.ttf
new file mode 100644
index 0000000000..9db958532c
--- /dev/null
+++ b/gui/themes/fonts/FreeSans.ttf
diff --git a/gui/themes/fonts/FreeSansBold.ttf b/gui/themes/fonts/FreeSansBold.ttf
new file mode 100644
index 0000000000..63644e7437
--- /dev/null
+++ b/gui/themes/fonts/FreeSansBold.ttf
diff --git a/gui/themes/fonts/README b/gui/themes/fonts/README
index 594bfc3ea4..b36d89889c 100644
--- a/gui/themes/fonts/README
+++ b/gui/themes/fonts/README
@@ -1,3 +1,5 @@
 These are fonts used in ScummVM. Most of them come from Xorg.
 
+The GNU FreeFont files are distributed under the license in COPYING.FREEFONT.
+
 Also other potentially usable fonts are stored here as well.
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 54d1fc92b0..d4cfd0cba3 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index f6a46692a0..f3904cbb6d 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.5:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.8:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/clR6x12-iso-8859-2.fcc b/gui/themes/scummclassic/clR6x12-iso-8859-2.fcc
index 042bc5b24d..4d225ddc23 100644
--- a/gui/themes/scummclassic/clR6x12-iso-8859-2.fcc
+++ b/gui/themes/scummclassic/clR6x12-iso-8859-2.fcc
diff --git a/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc b/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc
index d8e614211d..37d4615ea0 100644
--- a/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc
+++ b/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 3d916e28e9..9da42635a7 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -818,6 +818,27 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Description1'
+					width = '320'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Description2'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Standard'
+					type = 'Button'
+			/>
+			<widget name = 'Practice'
+					type = 'Button'
+			/>
+			<widget name = 'Expert'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
+
 	<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
 		<layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'>
 			<widget name = 'DirProgressText'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 7d4077dbe2..dc528a4c00 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -820,6 +820,27 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Description1'
+					width = '280'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Description2'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Standard'
+					type = 'Button'
+			/>
+			<widget name = 'Practice'
+					type = 'Button'
+			/>
+			<widget name = 'Expert'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
+
 	<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
 		<layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'>
 			<widget name = 'DirProgressText'
diff --git a/gui/themes/scummclassic/fixed5x8-iso-8859-2.fcc b/gui/themes/scummclassic/fixed5x8-iso-8859-2.fcc
index 73bb5fff2d..37da61be00 100644
--- a/gui/themes/scummclassic/fixed5x8-iso-8859-2.fcc
+++ b/gui/themes/scummclassic/fixed5x8-iso-8859-2.fcc
diff --git a/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc b/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc
index e70388dd93..ee32a2041b 100644
--- a/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc
+++ b/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc
diff --git a/gui/themes/scummclassic/helvb12-iso-8859-2.fcc b/gui/themes/scummclassic/helvb12-iso-8859-2.fcc
index 2117b6b9e6..540d8c4f4c 100644
--- a/gui/themes/scummclassic/helvb12-iso-8859-2.fcc
+++ b/gui/themes/scummclassic/helvb12-iso-8859-2.fcc
diff --git a/gui/themes/scummclassic/helvb12-iso-8859-5.fcc b/gui/themes/scummclassic/helvb12-iso-8859-5.fcc
index 8ad8f0eb22..90df2b0df4 100644
--- a/gui/themes/scummclassic/helvb12-iso-8859-5.fcc
+++ b/gui/themes/scummclassic/helvb12-iso-8859-5.fcc
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 83229184ba..fc4c89cbcc 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/FreeMonoBold.ttf b/gui/themes/scummmodern/FreeMonoBold.ttf
new file mode 100644
index 0000000000..3bce6129ae
--- /dev/null
+++ b/gui/themes/scummmodern/FreeMonoBold.ttf
diff --git a/gui/themes/scummmodern/FreeSans.ttf b/gui/themes/scummmodern/FreeSans.ttf
new file mode 100644
index 0000000000..9db958532c
--- /dev/null
+++ b/gui/themes/scummmodern/FreeSans.ttf
diff --git a/gui/themes/scummmodern/FreeSansBold.ttf b/gui/themes/scummmodern/FreeSansBold.ttf
new file mode 100644
index 0000000000..63644e7437
--- /dev/null
+++ b/gui/themes/scummmodern/FreeSansBold.ttf
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index 1d288adffd..32bd36241e 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.5:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.8:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc b/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc
index 042bc5b24d..4d225ddc23 100644
--- a/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc
+++ b/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc
diff --git a/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc b/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc
index d8e614211d..37d4615ea0 100644
--- a/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc
+++ b/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc
diff --git a/gui/themes/scummmodern/eraser.bmp b/gui/themes/scummmodern/eraser.bmp
index 782b13dc62..b927a6384f 100644
--- a/gui/themes/scummmodern/eraser.bmp
+++ b/gui/themes/scummmodern/eraser.bmp
diff --git a/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc b/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc
index 73bb5fff2d..37da61be00 100644
--- a/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc
+++ b/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc
diff --git a/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc b/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc
index e70388dd93..ee32a2041b 100644
--- a/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc
+++ b/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc
diff --git a/gui/themes/scummmodern/helvb12-iso-8859-1.fcc b/gui/themes/scummmodern/helvb12-iso-8859-1.fcc
index 651a25934a..18af0bf870 100644
--- a/gui/themes/scummmodern/helvb12-iso-8859-1.fcc
+++ b/gui/themes/scummmodern/helvb12-iso-8859-1.fcc
diff --git a/gui/themes/scummmodern/helvb12-iso-8859-2.fcc b/gui/themes/scummmodern/helvb12-iso-8859-2.fcc
index 2117b6b9e6..540d8c4f4c 100644
--- a/gui/themes/scummmodern/helvb12-iso-8859-2.fcc
+++ b/gui/themes/scummmodern/helvb12-iso-8859-2.fcc
diff --git a/gui/themes/scummmodern/helvb12-iso-8859-5.fcc b/gui/themes/scummmodern/helvb12-iso-8859-5.fcc
index 8ad8f0eb22..90df2b0df4 100644
--- a/gui/themes/scummmodern/helvb12-iso-8859-5.fcc
+++ b/gui/themes/scummmodern/helvb12-iso-8859-5.fcc
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index cb9f9fd2a3..5f7cc69acd 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -105,27 +105,38 @@
 	<fonts>
 		<font	id = 'text_default'
 				file = 'helvb12.bdf'
+				scalable_file = 'FreeSansBold.ttf'
 		/>
 		<font	resolution = 'y<400'
 		   		id = 'text_default'
 				file = 'clR6x12.bdf'
+				scalable_file = 'FreeSans.ttf'
+				point_size = '11'
 		/>
 		<font	id = 'text_button'
 				file = 'helvb12.bdf'
+				scalable_file = 'FreeSansBold.ttf'
 		/>
 		<font	resolution = 'y<400'
 		   		id = 'text_button'
 				file = 'clR6x12.bdf'
+				scalable_file = 'FreeSans.ttf'
+				point_size = '11'
 		/>
 		<font	id = 'text_normal'
 				file = 'helvb12.bdf'
+				scalable_file = 'FreeSans.ttf'
 		/>
 		<font	resolution = 'y<400'
 		   		id = 'text_normal'
 				file = 'clR6x12.bdf'
+				scalable_file = 'FreeSans.ttf'
+				point_size = '11'
 		/>
 		<font	id = 'tooltip_normal'
 				file = 'fixed5x8.bdf'
+				scalable_file = 'FreeMonoBold.ttf'
+				point_size = '8'
 		/>
 
 		<text_color	id = 'color_normal'
@@ -387,7 +398,7 @@
 	<!-- Background of the slider widget -->
 	<drawdata id = 'widget_slider' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					stroke = '0'
+					stroke = '1'
 					radius = '5'
 					fill = 'foreground'
 					fg_color = 'paleyellow'
@@ -676,6 +687,7 @@
 					radius = '5'
 					fg_color = 'paleyellow'
 					shadow = '0'
+					stroke = '1'
 					bevel = '1'
 					bevel_color = 'shadowcolor'
 		/>
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index a3fc013a08..69ad9c79fa 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -833,6 +833,27 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Description1'
+					width = '320'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Description2'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Standard'
+					type = 'Button'
+			/>
+			<widget name = 'Practice'
+					type = 'Button'
+			/>
+			<widget name = 'Expert'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
+
 	<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
 		<layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'>
 			<widget name = 'DirProgressText'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 67a02dc2d5..0bfd16c1d9 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -819,6 +819,27 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Description1'
+					width = '280'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Description2'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Standard'
+					type = 'Button'
+			/>
+			<widget name = 'Practice'
+					type = 'Button'
+			/>
+			<widget name = 'Expert'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
+
 	<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
 		<layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'>
 			<widget name = 'DirProgressText'
diff --git a/gui/themes/scummtheme.py b/gui/themes/scummtheme.py
index e4e9549265..4c55fd79de 100755
--- a/gui/themes/scummtheme.py
+++ b/gui/themes/scummtheme.py
@@ -5,7 +5,7 @@ import re
 import os
 import zipfile
 
-THEME_FILE_EXTENSIONS = ('.stx', '.bmp', '.fcc')
+THEME_FILE_EXTENSIONS = ('.stx', '.bmp', '.fcc', '.ttf')
 
 def buildTheme(themeName):
 	if not os.path.isdir(themeName) or not os.path.isfile(os.path.join(themeName, "THEMERC")):
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 567df59b43..d3a384ef77 100644
--- a/gui/themes/translations.dat
+++ b/gui/themes/translations.dat