Temporary commit by gear.

Makefile.in

@@ -4,9 +4,11 @@ all:
 	cp -a bootloader/gfxboot.cfg design-bootloader-source/data-install/
 	cp -a bootloader/gfxboot.cfg design-bootloader-source/data-boot/
 	convert images/boot.jpg -gravity northeast -pointsize 20  -annotate 0 '@STATUS@' boot.jpg
-	cp -al boot.jpg design-bootloader-source/data-boot/back.jpg
-	cp -al boot.jpg design-bootloader-source/data-install/back.jpg
-	cp -al boot.jpg bootsplash/images/silent-800x600.jpg
+	convert images/boot.jpg -resize 800x600 -gravity northeast -pointsize 20  -annotate 0 '@STATUS@' boot-800x600.jpg
+	cp -al boot-800x600.jpg design-bootloader-source/data-boot/back.jpg
+	cp -al boot-800x600.jpg design-bootloader-source/data-install/back.jpg
+	cp -al boot.jpg bootsplash/images/silent-1024x768.jpg
+	convert -resize '800x600!' bootsplash/images/silent-1024x768.jpg bootsplash/images/silent-800x600.jpg
 	convert -resize '640x480!' bootsplash/images/silent-800x600.jpg bootsplash/images/silent-640x480.jpg
 # background
 	convert images/background.png -gravity northeast -pointsize 30  -annotate 0 '@STATUS@' background.png

bootloader/gfxboot.cfg.in

@@ -35,11 +35,11 @@ mainmenu.entries=8
 ; minimal main menu selection bar width
 mainmenu.bar.minwidth=300
 ; main menu selection bar transparency (0..255)
-mainmenu.bar.transparency=100
+mainmenu.bar.transparency=200
 ; main menu colors
-mainmenu.bar.color=0x000000
-mainmenu.normal.fg=0x000000
-mainmenu.selected.fg=0x000000
+mainmenu.bar.color=0xffffff
+mainmenu.normal.fg=0xffffff
+mainmenu.selected.fg=0xffffff
 ; boot option colors
 bootopt.label.fg=0xffffff
 bootopt.text.fg=0xffffff
@@ -47,7 +47,7 @@ bootopt.text.fg=0xffffff
 progress.bar.color=0x@PROGRESS_COLOR@
 ; menu colors
 menu.normal.bg=0xd8deed
-menu.normal.fg=0x000000
+menu.normal.fg=0xffffff
 menu.selected.bg=0x6c6c6c
 menu.selected.fg=0xffffff
 ; window colors
@@ -63,7 +63,7 @@ help.link.selected.bg=0x0000a0
 help.highlight.fg=0x009000
 ; panel colors
 panel.fg=0x000000
-panel.title.fg=0x000000
+panel.title.fg=0xffffff
 panel.f-key.fg=0xffe050
 ; default keymap (e.g. de_DE, czech)
 keymap=
@@ -136,7 +136,7 @@ serial.line1=1,0,ttyS1
 serial.line2=
 serial.line3=
 ; show keymap menu as submenu in lang dialog
-keymap.submenu=1
+keymap.submenu=0
 ; show keymap in main menu
 keymap.mainmenu=0
 
@@ -148,5 +148,5 @@ beep=1
 ; show keymap menu as submenu in lang dialog
 keymap.submenu=0
 ; show keymap in main menu
-keymap.mainmenu=1
+keymap.mainmenu=0
 

bootsplash/config/bootsplash-1024x768.cfg.in

@@ -0,0 +1,44 @@
+# This is a bootsplash configuration file for
+# ALT Linux, resolution 800x600.
+#
+# See www.bootsplash.org for more information.
+# Written by Jakub Steiner <jimmac@novell.com>
+# modified by Sergey V Turchin <zerg@altlinux.org>
+# modified by Anton V. Boyarshinov <boyarsh@altlinux.org>
+# modified by Sergey Alembekov <rt@altlinux.org>
+#
+version=3
+state=1
+progress_enable=1
+overpaintok=1
+
+
+fgcolor=7
+bgcolor=0
+
+tx=10
+ty=50
+tw=780
+th=550
+
+
+jpeg=/etc/bootsplash/themes/@THEME@/images/bootsplash-800x600.jpg
+silentjpeg=/etc/bootsplash/themes/@THEME@/images/silent-800x600.jpg
+
+box silent noover 99 370 701 372 #69696760
+box silent noover 99 372 701 377 #CCCDCC60
+box silent noover 99 377 701 387 #9A9A9A60 #9A9A9A60 #D7D7D760 #D7D7D760
+box silent noover 99 387 701 378 #CBCBCC60
+
+
+
+box silent inter 100 371 100 377 #@INACTIVE_COLOR@
+box silent 100 371 700 377 #@INACTIVE_COLOR@
+box silent inter 100 377 100 387 #@PROGRESS_COLOR@ 
+box silent 100 377 700 387 #@PROGRESS_COLOR@
+
+
+trigger "isdown" quit
+trigger "rlreached 5" quit
+trigger "rlchange 0" tosilent
+trigger "rlchange 6" tosilent

branding.spec

@@ -7,7 +7,7 @@
 
 Name: branding-%brand-%theme
 Version: 5.0
-Release: alt8
+Release: alt9
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@@ -97,6 +97,16 @@ Conflicts: alt-notes-children alt-notes-desktop alt-notes-hpc alt-notes-junior a
 Distribution license and release notes
 
 
+%package slideshow
+
+Summary: Slideshow for %Brand %version %Theme installer
+License: Distributable
+Group: System/Configuration/Other 
+
+%description slideshow
+Slideshow for %Brand %version %Theme installer
+
+
 %prep
 %setup -q
 
@@ -164,6 +174,11 @@ pushd notes
 %makeinstall
 popd
 
+
+#slideshow
+mkdir -p %buildroot/usr/share/install2/slideshow
+install slideshow/*  %buildroot/usr/share/install2/slideshow/
+
 #bootloader
 %pre bootloader
 [ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
@@ -213,7 +228,13 @@ echo $lang > lang
 %_datadir/alt-notes/*
 
 
+%files slideshow
+/usr/share/install2/slideshow
+
 %changelog
+* Fri Feb 27 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt9
+- merge with desktop branch 
+
 * Tue Feb 24 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt8
 - merge desktop branch
 - added adderesses into notes