Merge remote branch 'boyarsh/centaurus' into kdesktop

branding.spec

@@ -313,8 +313,7 @@ cd boot/splash/%theme/
 echo $lang > lang
 [ "$lang" = "C" ] || echo lang | cpio -o --append -F message
 . shell-config
-shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal
-shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
+shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme/theme.txt
 
 
 %preun bootloader
@@ -328,6 +327,7 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
 %files bootloader
 %_datadir/gfxboot/%theme
 /boot/splash/%theme
+/boot/grub/themes/%theme
 
 #bootsplash
 %post bootsplash
@@ -391,7 +391,14 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %_desktopdir/indexhtml.desktop
 
 %changelog
-#- fvwm settings added
+* Fri Jan 28 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt1
+- production slideshow
+- installer wallpaper changed
+- grub theme
+
+* Wed Dec 15 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt11
+- fvwm settings added
+
 * Fri Nov 19 2010 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt4
 - import last changes from centaurus:
   - gfxboot colors changed

components.mk

@@ -45,6 +45,10 @@ boot:
 	install -d -m 755 $(datadir)/gfxboot/$(THEME)
 	install -m 644 design-bootloader-source/message $(sysconfdir)/../boot/splash/$(THEME)
 	install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME)
+#grub2
+	install -d -m 755  $(sysconfdir)/../boot/grub/themes/$(THEME)
+	cp -a components/grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/
+	 install -m 644 images/grub.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
 
 # index html page, start page for all local browsers
 INDEXHTML_DIR=$(datadir)/doc/indexhtml

components/grub2/theme.txt

+# Debian Lenny theme for GRUB2
+#
+# Copyright © 2010 Jo Shields
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+#general settings
+message-font: "DejaVu Sans Bold 14"
+title-text: ""
+message-color: "#000"
+message-bg-color: "#fff"
+desktop-image: "boot.png"
+terminal-font: "DejaVu Sans Regular 12"
+
+#help bar at the bottom
++ label {
+	top = 100%-25
+	left = 0
+	width = 100%
+	height = 20
+	text = "To boot the selected operating system using default settings, press return. For additional settings, press E"
+	align = "center"
+	font = "DejaVu Sans Regular 10"
+	color = "#000"
+}
+
+#menu
++ boot_menu {
+	left = 21%
+	width = 58%
+	top = 30%
+	height = 40%
+	item_font = "DejaVu Sans Regular 12"
+	selected_item_font = "DejaVu Sans Bold 14"
+	icon_height = 24
+	icon_width = 24
+	item_height = 26
+	item_padding = 0
+	item_icon_space = 0
+	item_spacing = 1
+	selected_item_pixmap_style = "selected_blob_*.png"
+	scrollbar = true
+	scrollbar_width = 20
+	scrollbar_thumb = "scrollbar_slider_*.png"
+	scrollbar_frame = "scrollbar_border_*.png"
+	item_color = "#001056"
+	selected_item_color = "#ffffff"
+}
+
++ circular_progress
+{
+   id = "__timeout__"
+   left = 52%
+   top = 13%
+   width = 36
+   height =36 
+   num_ticks = 12
+   ticks_disappear = false 
+   start_angle = -60
+   center_bitmap = "zero.png"
+   tick_bitmap = "tick.png"
+
+}
+