Merge remote branch 'upstream/master' into pegasus

12 files changed, 19 insertions, 19 deletions

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 3236071055..2716e6ca72 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,5 +1,5 @@
  "<?xml version = '1.0'?>"
-"<layout_info resolution='-320xY,-256x240,-Xx272,-544x332,-Xx350'> "
+"<layout_info resolution='y>399'> "
 "<globals> "
 "<def var='Line.Height' value='16' /> "
 "<def var='Font.Height' value='16' /> "
@@ -789,7 +789,7 @@
 "</layout> "
 "</dialog> "
 "</layout_info> "
-"<layout_info resolution='320xY,256x240,Xx272,544x332,Xx350'> "
+"<layout_info resolution='y<400'> "
 "<globals> "
 "<def var='Line.Height' value='12' /> "
 "<def var='Font.Height' value='10' /> "
@@ -1602,21 +1602,21 @@
 "<font id='text_default' "
 "file='helvb12.bdf' "
 "/> "
-"<font resolution='320xY,256x240' "
+"<font resolution='y<400' "
 "id='text_default' "
 "file='clR6x12.bdf' "
 "/> "
 "<font id='text_button' "
 "file='helvb12.bdf' "
 "/> "
-"<font resolution='320xY,256x240' "
+"<font resolution='y<400' "
 "id='text_button' "
 "file='clR6x12.bdf' "
 "/> "
 "<font id='text_normal' "
 "file='helvb12.bdf' "
 "/> "
-"<font resolution='320xY,256x240' "
+"<font resolution='y<400' "
 "id='text_normal' "
 "file='clR6x12.bdf' "
 "/> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 9fd2c187fd..4dbedd4f14 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index f0276969fe..17e934d5ef 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.2:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.3:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx
index d672db2540..3fd00abbb9 100644
--- a/gui/themes/scummclassic/classic_gfx.stx
+++ b/gui/themes/scummclassic/classic_gfx.stx
@@ -46,21 +46,21 @@
 		<font	id = 'text_default'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_default'
 				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_button'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_button'
 				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_normal'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_normal'
 				file = 'clR6x12.bdf'
 		/>
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 416ffb30eb..f09c29e360 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -23,7 +23,7 @@
  - $Id$
  -
  -->
-<layout_info resolution = '-320xY, -256x240, -Xx272, -544x332, -Xx350'>
+<layout_info resolution = 'y>399'>
 	<globals>
 		<def var = 'Line.Height' value = '16' />
 		<def var = 'Font.Height' value = '16' />
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index fe0eb66b8d..a440be7694 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -23,7 +23,7 @@
  - $Id$
  -
  -->
-<layout_info resolution = "320xY, 256x240, Xx272, 544x332, Xx350">
+<layout_info resolution = 'y<400'>
 	<globals>
 		<def var = 'Line.Height' value = '12' />
 		<def var = 'Font.Height' value = '10' />
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index f4e18ef00c..1e44442933 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index b8f41fc207..f947a5685a 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.2:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.3:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index cfe00a7016..a325d4982b 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -108,21 +108,21 @@
 		<font	id = 'text_default'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_default'
 				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_button'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_button'
 				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_normal'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_normal'
 				file = 'clR6x12.bdf'
 		/>
@@ -178,7 +178,7 @@
 	<!-- <defaults fill = 'gradient' fg_color = 'white'/> -->
 
 	<cursor file = 'cursor.bmp' hotspot = '0, 0' scale = '3'/>
-	<cursor resolution = '320xY, 256x240' file = 'cursor_small.bmp' hotspot = '0, 0' scale = '3'/>
+	<cursor resolution = 'y<400' file = 'cursor_small.bmp' hotspot = '0, 0' scale = '3'/>
 
 	<!-- Selection (text or list items) -->
 	<drawdata id = 'text_selection' cache = 'false'>
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 879be2aafe..c0433ceb9a 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -23,7 +23,7 @@
  - $Id$
  -
  -->
-<layout_info resolution = '-320xY, -256x240, -Xx272, -544x332, -Xx350'>
+<layout_info resolution = 'y>399'>
 	<globals>
 		<def var = 'Line.Height' value = '16' />
 		<def var = 'Font.Height' value = '16' />
@@ -128,7 +128,7 @@
 				/>
 				<space />
 				<widget name = 'Version'
-						width = '247'
+						width = '310'
 						height = 'Globals.Line.Height'
 						textalign = 'center'
 				/>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 3a7a4b63b9..06916a80f1 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -23,7 +23,7 @@
  - $Id$
  -
  -->
-<layout_info resolution = "320xY, 256x240, Xx272, 544x332, Xx350">
+<layout_info resolution = 'y<400'>
 	<globals>
 		<def var = 'Line.Height' value = '12' />
 		<def var = 'Font.Height' value = '10' />
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 69e4c80804..86de121d1a 100644
--- a/gui/themes/translations.dat
+++ b/gui/themes/translations.dat