first version, seems to be usable

Makefile.in

@@ -1,10 +1,14 @@
 all:
-	mogrify images/boot.jpg -gravity northwest -pointsize 20  -annotate 0 '@STATUS@'
-	cp -al images/boot.jpg bootloader/data-boot/
-	cp -al images/boot.jpg bootloader/data-install/
-	cp -al images/boot.jpg bootsplash/images/bootsplash-800x600.jpg
-	convert -resize '640x480!' bootsplash/images/bootsplash-800x600.jpg bootsplash/images/bootsplash-640x480.jpg
+	cp -a  /usr/src/design-bootloader-source ./
+	cp -a bootloader/config design-bootloader-source/
+	cp -a bootloader/gfxboot.cfg design-bootloader-source/data-install/
+	cp -a bootloader/gfxboot.cfg design-bootloader-source/data-boot/
+	convert images/boot.jpg -font sans -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 -resize '640x480!' bootsplash/images/silent-800x600.jpg bootsplash/images/silent-640x480.jpg
 # background
-	mogrify images/background.png -gravity northwest -pointsize 30  -annotate 0 '@STATUS@'
-	cp -al images/background.png graphics/backgrounds/default.png
-	convert -resize '800x600!' images/background.png browser-qt/design/bg.png
+	convert images/background.png -gravity northeast -pointsize 30  -annotate 0 '@STATUS@' background.png
+	cp -al background.png graphics/backgrounds/default.png
+	convert -resize '800x600!' background.png browser-qt/design/bg.png

bootloader/config.in

@@ -1,2 +1,2 @@
-product=ALT Linux @VERSION@ @Theme@
+product=ALT Linux @VERSION@ @THEMEMC@
 based_on=ALT Linux Sisyphus

bootloader/data-install/gfxboot.cfg

@@ -1,152 +0,0 @@
-; Sections are read in the order given in base::layout, with section 'base'
-; implicitly added at the end. If a config value is given more than once,
-; the first entry wins.
-;
-; If a screen resolution can't be set, 640x480 is used as fallback (and
-; section '640x480' added to the layout list).
-;
-; If the penguin screen is active, section 'penguin' is automatically added
-; to the layout list.
-;
-; Color values: 24 bit RGB (e.g. 0xff0000 = red).
-;
-
-[base]
-; theme name
-theme=ALTLinux
-; other sections to read
-layout=800x600,install
-; penguin theme likelihood (in percent, -1 = auto)
-penguin=0
-; activate speech output
-talk=0
-; sound volume (0..100)
-volume=70
-; menu background transparency (0..255)
-menu.transparency=0x20
-; default font
-font.normal=16x16.fnt
-; main menu font
-font.large=16x16.fnt
-; background image
-background=back.jpg
-; max. visible main menu items
-mainmenu.entries=8
-; minimal main menu selection bar width
-mainmenu.bar.minwidth=300
-; main menu selection bar transparency (0..255)
-mainmenu.bar.transparency=100
-; main menu colors
-mainmenu.bar.color=0x000000
-mainmenu.normal.fg=0x000000
-mainmenu.selected.fg=0x000000
-; boot option colors
-bootopt.label.fg=0xffffff
-bootopt.text.fg=0xffffff
-; progress bar color
-progress.bar.color=0x295202
-; menu colors
-menu.normal.bg=0xd8deed
-menu.normal.fg=0x000000
-menu.selected.bg=0x6c6c6c
-menu.selected.fg=0xffffff
-; window colors
-window.bg=0xd8deed
-window.fg=0x000000
-window.title.bg=0x217b05
-window.title.fg=0xffffff
-window.title.error.bg=0xc00000
-; help system colors
-help.link.fg=0x0000a0
-help.link.selected.fg=0xffffff
-help.link.selected.bg=0x0000a0
-help.highlight.fg=0x009000
-; panel colors
-panel.fg=0xffffff
-panel.title.fg=0xffffff
-panel.f-key.fg=0xffe050
-; default keymap (e.g. de_DE, czech)
-keymap=
-
-[800x600]
-; screen size
-screen.size=800,600
-; upper left corner
-mainmenu.pos=253,170
-; boot option input field position
-bootopt.pos=263,480
-
-[640x480]
-; screen size
-screen.size=640,480
-; upper left corner
-mainmenu.pos=130,122
-; boot option input field position
-bootopt.pos=263,380
-
-
-[install]
-; show welcome animation
-welcome=0
-; beep when menu is ready
-beep=1
-; main menu item shown only if iso is tagged for media check
-mediacheck=mediachk
-; main menu items where user can't add boot options
-nobootoptions=harddisk,memtest
-; main menu items that are not passed an 'install' parameter
-noinstallopt=harddisk,firmware,memtest
-; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom)
-install=
-; default repo location
-install.http.server=
-install.http.path=
-install.nfs.server=
-install.nfs.path=
-install.ftp.server=
-install.ftp.path=
-install.ftp.user=
-install.ftp.password=
-install.smb.server=
-install.smb.share=
-install.smb.path=
-install.smb.domain=
-install.smb.user=
-install.smb.password=
-install.hd.device=
-install.hd.path=
-; default driver update (one of: yes, no, file, url; default: no)
-dud=
-; if 'dud=file': file name on DVD
-dud.file=
-; if 'dud=url': URL
-dud.url=
-; if 'dud=url': menu item name (default = 'URL')
-dud.url.name=
-; serial line setup (up to four lines)
-; format: port,baud,dev
-;   - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8)
-;   - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600)
-;   - dev: linux device name (e.g. ttyS0)
-; - all lines are set up with 8 bits, no parity, 1 stop bit
-; - if the bootloader also has a serial line setup, the port is
-;   automatically used
-serial.line0=0,0,ttyS0
-serial.line1=1,0,ttyS1
-serial.line2=
-serial.line3=
-; show keymap menu as submenu in lang dialog
-keymap.submenu=1
-; show keymap in main menu
-keymap.mainmenu=0
-
-[boot]
-; show welcome animation
-welcome=0
-; beep when menu is ready
-beep=1
-; show keymap menu as submenu in lang dialog
-keymap.submenu=0
-; show keymap in main menu
-keymap.mainmenu=1
-

bootloader/gfxboot.cfg

@@ -62,8 +62,8 @@ help.link.selected.fg=0xffffff
 help.link.selected.bg=0x0000a0
 help.highlight.fg=0x009000
 ; panel colors
-panel.fg=0xffffff
-panel.title.fg=0xffffff
+panel.fg=0x000000
+panel.title.fg=0x000000
 panel.f-key.fg=0xffe050
 ; default keymap (e.g. de_DE, czech)
 keymap=

bootsplash/config/bootsplash-640x480.cfg.in

@@ -22,8 +22,8 @@ tw=620
 th=430
 
 
-jpeg=/etc/bootsplash/themes/@theme@/images/bootsplash-640x480.jpg
-silentjpeg=/etc/bootsplash/themes/@theme@/images/silent-640x480.jpg
+jpeg=/etc/bootsplash/themes/@THEME@/images/bootsplash-640x480.jpg
+silentjpeg=/etc/bootsplash/themes/@THEME@/images/silent-640x480.jpg
 
 box silent noover 99 370 541 372 #69696760
 box silent noover 99 372 541 377 #CCCDCC60

bootsplash/config/bootsplash-800x600.cfg.in

@@ -22,8 +22,8 @@ tw=780
 th=550
 
 
-jpeg=/etc/bootsplash/themes/@theme@/images/bootsplash-800x600.jpg
-silentjpeg=/etc/bootsplash/themes/@theme@/images/silent-800x600.jpg
+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

branding-alt-desktop.spec

@@ -14,7 +14,7 @@ BuildRequires(pre): libqt4-core
 BuildRequires: libalternatives-devel
 BuildRequires: libqt4-devel
 
-BuildRequires: ImageMagick
+BuildRequires: ImageMagick fontconfig
 
 Packager: Anton V. Boyarshinov <boyarsh at altlinux dot org>
 
@@ -70,12 +70,10 @@ Design for QT alterator for Desktop version
 
 %build
 autoconf
-./configure --with-distro=%theme --with-status=%status
+./configure --with-distro=%theme --with-status=%status --with-verions=%version
 make
 
 #bootloader
-    cp -a  /usr/src/design-bootloader-source ./
-    cp -a bootloader/config  bootloader/data-boot/ bootloader/data-install/ design-bootloader-source/
     pushd design-bootloader-source/
     PATH=$PATH:/usr/sbin %make
     popd
@@ -124,7 +122,7 @@ popd
 
 #bootloader
 %pre bootloader
-[ -s /boot/splash/desktop ] && rm -fr  /boot/splash/desktop
+[ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
 
 %post bootloader
 %__ln_s -nf %theme/message /boot/splash/message

configure.ac

@@ -1,26 +1,21 @@
 AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
 
-AC_ARG_WITH(aptconf,
 AC_ARG_WITH(distro,
 	    AC_HELP_STRING([--with-distro=distro],
 			   [base distro, e.g '--with-distro=lite' ]),
 			   [
 			    if test -n "$with_distro"  ; then
-				    theme="$with_distro"
-				    Theme=`echo "$with_distro" | sed 's/^./\u&/'`
-				    THEME=`echo "$with_distro" | sed 's/./\u&/'`
+				    THEME="$with_distro"
+				    THEMEMC=`echo "$with_distro" | sed 's/^./\u&/'`
+				    THEMEUC=`echo "$with_distro" | sed 's/./\u&/'`
 			    fi
 			       ],
 				    [
-				     theme="theme"
-				     Theme="Theme"
-				     THEME="THEME"
+				     THEME="theme"
+				     THEMEMC="Theme"
+				     THEMEUC="THEME"
 				     ]
 				    )
-			       ],
-				    [
-				     DESIGN=""
-				     ])
 
 AC_ARG_WITH(status,
 	    AC_HELP_STRING([--with-status=beta],
@@ -34,11 +29,24 @@ AC_ARG_WITH(status,
 				     STATUS=""
 				     ])
 
+AC_ARG_WITH(version,
+	    AC_HELP_STRING([--with-version=5.0],
+			   [version, e.g '--with-version=5.0']),
+			   [
+			    if test -n "$with_version"  ; then
+				    VERSION="$with_version"
+			    fi
+			       ],
+				    [
+				     VERSION=""
+				     ])
 
-AC_SUBST(theme)
-AC_SUBST(Theme)
+
+AC_SUBST(THEMEMC)
+AC_SUBST(THEMELC)
 AC_SUBST(THEME)
 AC_SUBST(STATUS)
+AC_SUBST(VERSION)
 
 
 AC_CONFIG_FILES([