From 6385ca049c67284e7d71f5fa441067194f43bd16 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Tue, 26 Feb 2002 13:08:58 +0000
Subject: added progress bar coordinate for Mandrake theme

---
 Makefile                                     |  2 +-
 bootsplash.spec                              |  8 +++++++-
 themes/Mandrake/cfg/bootsplash-1024x768.cfg  | 22 ++++++++++++++++++----
 themes/Mandrake/cfg/bootsplash-1280x1024.cfg | 15 +++++++++++++++
 themes/Mandrake/cfg/bootsplash-800x600.cfg   | 15 +++++++++++++++
 5 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 25bd409..b13a2be 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ VERSION := $(shell sed -n 's/%define version //p' < $(NAME).spec)
 RELEASE := $(shell sed -n 's/%define release //p' < $(NAME).spec)
 RELTAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
 
-SUBDIRS=scripts
+SUBDIRS=scripts fb
 DATADIRS=themes
 
 prefix=/
diff --git a/bootsplash.spec b/bootsplash.spec
index a354fc1..b08d4a0 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -1,5 +1,5 @@
 %define name bootsplash
-%define version 1.3.3
+%define version 1.3.4
 %define release 1mdk
 
 Summary: The Boot Splash Images and scripts.
@@ -29,6 +29,7 @@ generated by mkinitrd.
 
 %build
 make check
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,9 +43,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc README ChangeLog
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %_datadir/%{name}/*
+/bin/*
 
 %changelog
 
+* Tue Feb 26 2002 Warly <warly@mandrakesoft.com> 1.3.4-1mdk
+- add new fb tools fbresolution and progress
+- add progress bar configuration in Mandrake theme
+
 * Fri Feb 22 2002 Warly <warly@mandrakesoft.com> 1.3.3-1mdk
 - new images for Mandrake theme
 - text in right position for Mandrake theme
diff --git a/themes/Mandrake/cfg/bootsplash-1024x768.cfg b/themes/Mandrake/cfg/bootsplash-1024x768.cfg
index 06ab987..c75bf71 100644
--- a/themes/Mandrake/cfg/bootsplash-1024x768.cfg
+++ b/themes/Mandrake/cfg/bootsplash-1024x768.cfg
@@ -2,18 +2,32 @@
 # 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 19
+# tx is the x coordinate of the text window in characters. default is 23
 # multiply width font width for coordinate in pixels.
 tx=23
 
-# ty is the y coordinate of the text window in characters. default is 10
+# ty is the y coordinate of the text window in characters. default is 20
 ty=20
 
-# tw is the width of the text window in characters. default is 104
+# 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 34
+# 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=18
 
+# px is the progress bar x coordinate of its upper left corner
+px=190
+
+# py is the progress bar y coordinate of its upper left corner
+py=280
+
+# pw is the with of the progress bar
+pw=630
+
+# ph is the heigth of the progress bar
+ph=20
+
+# pc is the color of the progress bar
+pc=0x21459d
diff --git a/themes/Mandrake/cfg/bootsplash-1280x1024.cfg b/themes/Mandrake/cfg/bootsplash-1280x1024.cfg
index 1b154c9..ee8ffa2 100644
--- a/themes/Mandrake/cfg/bootsplash-1280x1024.cfg
+++ b/themes/Mandrake/cfg/bootsplash-1280x1024.cfg
@@ -16,3 +16,18 @@ tw=82
 # th is the height of the text window in characters. default is 44
 # NOTE: this should at least be 25 as on the standard linux text console
 th=20
+
+# px is the progress bar x coordinate of its upper left corner
+px=190
+
+# py is the progress bar y coordinate of its upper left corner
+py=280
+
+# pw is the with of the progress bar
+pw=630
+
+# ph is the heigth of the progress bar
+ph=20
+
+# pc is the color of the progress bar
+pc=0x21459d
diff --git a/themes/Mandrake/cfg/bootsplash-800x600.cfg b/themes/Mandrake/cfg/bootsplash-800x600.cfg
index 7b386c6..82b4d46 100644
--- a/themes/Mandrake/cfg/bootsplash-800x600.cfg
+++ b/themes/Mandrake/cfg/bootsplash-800x600.cfg
@@ -16,3 +16,18 @@ tw=80
 # th is the height of the text window in characters. default is 26
 # NOTE: this should at least be 25 as on the standard linux text console
 th=18
+
+# px is the progress bar x coordinate of its upper left corner
+px=85
+
+# py is the progress bar y coordinate of its upper left corner
+py=200
+
+# pw is the with of the progress bar
+pw=630
+
+# ph is the heigth of the progress bar
+ph=20
+
+# pc is the color of the progress bar
+pc=0x21459d
-- 
cgit v1.2.1