new 1600x1200 image

6 files changed, 47 insertions, 3 deletions

diff --git a/bootsplash.spec b/bootsplash.spec
index 92eb99a..f3e1ca6 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -1,5 +1,5 @@
 %define name bootsplash
-%define version 1.3.15
+%define version 1.4.1
 %define release 1mdk
 %define _bootdir /boot
 
@@ -101,7 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 
 %changelog
-* Fri Jan 31 2003 Warly <warly@mandrakesoft.com> 1.3.15-2mdk
+* Fri Feb 14 2003 Warly <warly@mandrakesoft.com> 1.4.1-1mdk
+- new 1600x1200 image
+
+* Fri Jan 31 2003 Warly <warly@mandrakesoft.com> 1.3.15-1mdk
 - new images for 9.1
 
 * Thu Aug 08 2002 Warly <warly@mandrakesoft.com> 1.3.14-1mdk
diff --git a/scripts/bootsplash.sysconfig b/scripts/bootsplash.sysconfig
index 7fefdb8..0217535 100644
--- a/scripts/bootsplash.sysconfig
+++ b/scripts/bootsplash.sysconfig
@@ -6,7 +6,7 @@
 #
 # SPLASH=auto to make autodetect the splash screen
 # 
-# SPLASH=INT When Integer could be 800x600 1024x768 1280x1024
+# SPLASH=INT When Integer could be 800x600 1024x768 1280x1024 1600x1200
 #
 SPLASH=auto
 
diff --git a/scripts/detect-resolution b/scripts/detect-resolution
index 6b26e89..66a92bd 100755
--- a/scripts/detect-resolution
+++ b/scripts/detect-resolution
@@ -89,6 +89,8 @@ sub convert_vgamode {
 		    '1024x768x8'   => [ '773', '0x305' ],
 		    '1280xx8'      => [ '775', '0x307' ],
 		    '1280x1024x8'  => [ '775', '0x307' ],
+		    '1600xx8'      => [ '777', '0x309' ],
+		    '1600x1200x8'  => [ '777', '0x309' ],
 		    '640xx15'      => [ '784', '0x310' ],
 		    '640x480x15'   => [ '784', '0x310' ],
 		    '800xx15'      => [ '787', '0x313' ],
@@ -97,6 +99,8 @@ sub convert_vgamode {
 		    '1024x768x15'  => [ '790', '0x316' ],
 		    '1280xx15'     => [ '793', '0x319' ],
 		    '1280x1024x15' => [ '793', '0x319' ],
+		    '1600xx15'     => [ '796', '0x31C' ],
+		    '1600x1200x15' => [ '796', '0x31C' ],
 		    '640xx16'      => [ '785', '0x311' ],
 		    '640x480x16'   => [ '785', '0x311' ],
 		    '800xx16'      => [ '788', '0x314' ],
@@ -105,6 +109,8 @@ sub convert_vgamode {
 		    '1024x768x16'  => [ '791', '0x317' ],
 		    '1280xx16'     => [ '794', '0x31A' ],
 		    '1280x1024x16' => [ '794', '0x31A' ],
+		    '1600xx16'     => [ '797', '0x31D' ],
+		    '1600x1200x16' => [ '797', '0x31D' ],
 		    #-    '640xx24'      => 786, #- there is a problem with these resolutions since the BIOS may take 24 or 32 planes.
 		    #-    '640x480x24'   => 786,
 		    #-    '800xx24'      => 789,
diff --git a/scripts/make-boot-splash b/scripts/make-boot-splash
index ff899f3..d46a338 100755
--- a/scripts/make-boot-splash
+++ b/scripts/make-boot-splash
@@ -32,6 +32,8 @@ elif [[ $vgamode == 1024* ]];then
     resolution=1024x768
 elif [[ $vgamode == 1280* ]];then
     resolution=1280x1024
+elif [[ $vgamode == 1600* ]];then
+    resolution=1600x1200
 fi
 
 if [[ -f $splash_dir/themes/$THEME/images/bootsplash-$resolution.jpg && -f $splash_cfg/themes/$THEME/cfg/bootsplash-$resolution.cfg ]];then
diff --git a/themes/config/Mandrake/cfg/bootsplash-1600x1200.cfg b/themes/config/Mandrake/cfg/bootsplash-1600x1200.cfg
new file mode 100644
index 0000000..f8e868c
--- /dev/null
+++ b/themes/config/Mandrake/cfg/bootsplash-1600x1200.cfg
@@ -0,0 +1,33 @@
+# This is the configuration file for the 1600x1200 bootsplash picture.
+# This file is necessary to specify the coordinates of the text box on the
+# splash screen.
+
+# tx is the x coordinate of the text window in characters. default is 23
+# multiply width font width for coordinate in pixels.
+tx=60
+
+# ty is the y coordinate of the text window in characters. default is 20
+ty=59
+
+# tw is the width of the text window in characters. default is 80
+# NOTE: this should at least be 80 as on the standard linux text console
+tw=80
+
+# th is the height of the text window in characters. default is 18
+# NOTE: this should at least be 25 as on the standard linux text console
+th=22
+
+# px is the progress bar x coordinate of its upper left corner
+px=487
+
+# py is the progress bar y coordinate of its upper left corner
+py=783
+
+# pw is the with of the progress bar
+pw=626
+
+# ph is the heigth of the progress bar
+ph=10
+
+# pc is the color of the progress bar
+pc=0x21449c
diff --git a/themes/data/Mandrake/images/bootsplash-1600x1200.jpg b/themes/data/Mandrake/images/bootsplash-1600x1200.jpg
new file mode 100644
index 0000000..555b1b0
--- /dev/null
+++ b/themes/data/Mandrake/images/bootsplash-1600x1200.jpg