design consolidating

Makefile.in

+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
+# 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

bootloader/data-boot/gfxboot.cfg

+; 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
+

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

@@ -22,8 +22,8 @@ tw=620
 th=430
 
 
-jpeg=/etc/bootsplash/themes/desktop/images/bootsplash-640x480.jpg
-silentjpeg=/etc/bootsplash/themes/desktop/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-640x480.cfg~

-# 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/desktop/images/bootsplash-640x480.jpg
-silentjpeg=/etc/bootsplash/themes/desktop/images/silent-640x480.jpg
-
-box silent noover 99 370 541 372 #69696760
-box silent noover 99 372 541 377 #CCCDCC60
-box silent noover 99 377 541 387 #9A9A9A60 #9A9A9A60 #D7D7D760 #D7D7D760
-box silent noover 99 387 541 378 #CBCBCC60
-
-
-box silent inter 100 371 100 377 #3bb357
-box silent       100 371 540 377 #3bb357
-box silent inter 100 377 100 387 #009933
-box silent       100 377 540 387 #009933
-
-
-trigger "isdown" quit
-trigger "rlreached 5" quit
-trigger "rlchange 0" tosilent
-trigger "rlchange 6" tosilent

bootsplash/config/bootsplash-800x480.cfg~

-# 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/desktop/images/bootsplash-800x480.jpg
-silentjpeg=/etc/bootsplash/themes/desktop/images/silent-800x480.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 #66CC66
-box silent       100 371 700 377 #66CC66
-box silent inter 100 377 100 387 #66CC66
-box silent       100 377 700 387 #66CC66
-
-
-#mnganim silent_infotext /etc/bootsplash/themes/desktop/images/silent_infotext.mng initframe silent_infotext silent origin 6 0 590
-
-trigger "isdown" quit
-trigger "rlreached 5" quit
-trigger "rlchange 0" tosilent
-trigger "rlchange 6" tosilent

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

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

bootsplash/config/bootsplash-800x600.cfg~

-# 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/desktop/images/bootsplash-800x600.jpg
-silentjpeg=/etc/bootsplash/themes/desktop/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 #3bb35780
-box silent       100 371 700 377 #3bb35780
-box silent inter 100 377 100 387 #00993380
-box silent       100 377 700 387 #00993380
-
-
-trigger "isdown" quit
-trigger "rlreached 5" quit
-trigger "rlchange 0" tosilent
-trigger "rlchange 6" tosilent

branding-alt-desktop.spec

 %define theme desktop
 %define brand alt
+%define status alpha
 
 Name: branding-%brand-%theme
 Version: 5.0
 Release: alt1
 BuildArch: noarch
-PreReq: coreutils
+
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
 BuildRequires: design-bootloader-source >= 5.0-alt2
+
+BuildRequires(pre): libqt4-core 
+BuildRequires: libalternatives-devel
+BuildRequires: libqt4-devel
+
+BuildRequires: ImageMagick
+
 Packager: Anton V. Boyarshinov <boyarsh at altlinux dot org>
 
 Source: %name-%version.tar
@@ -24,6 +32,7 @@ Group: System/Configuration/Boot and Init
 Summary: Graphical boot logo for lilo and syslinux
 License: GPL
 
+PreReq: coreutils
 Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme
 
 Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme
@@ -42,6 +51,19 @@ Requires: bootsplash >= 3.3
 This package contains graphics for boot process
 (needs console splash screen enabled)
 
+%package browser-qt
+Summary: Design for QT alterator for Desktop version
+License: GPL
+Group: System/Configuration/Other
+Packager: Anton V. Boyarshiniv <boyarsh@altlinux.org>
+Provides: design-alterator-browser-%theme
+
+Requires: alterator-browser-qt
+PreReq(post,preun): alternatives >= 0.2
+
+%description browser-qt
+Design for QT alterator for Desktop version
+
 %prep
 %setup -q
 # bootloader
@@ -50,11 +72,20 @@ This package contains graphics for boot process
 
 
 %build
+autoconf
+./configure --with-distro=%theme --with-status=%status
+make
+
 #bootloader
     pushd design-bootloader-source/
     PATH=$PATH:/usr/sbin %make
     popd
 
+#browser-qt
+    pushd browser-qt
+    %make_build
+    popd
+
 %install
 #bootloader
     pushd design-bootloader-source
@@ -79,6 +110,19 @@ for i in 1; do \
 done
 popd
 
+#browser-qt
+pushd browser-qt
+mkdir -p %buildroot/usr/share/alterator-browser-qt/design
+
+install theme.rcc %buildroot/usr/share/alterator-browser-qt/design/%theme.rcc
+
+mkdir -p %buildroot/%_altdir
+cat >%buildroot/%_altdir/%name <<__EOF__
+/etc/alterator/design-browser-qt	/usr/share/alterator-browser-qt/design/desktop.rcc 50
+__EOF__
+popd
+
+
 #bootloader
 %pre bootloader
 [ -s /boot/splash/desktop ] && rm -fr  /boot/splash/desktop
@@ -107,6 +151,13 @@ popd
 [ "`readlink %_sysconfdir/bootsplash/themes/current`" != %theme ] ||
     %__rm -f %_sysconfdir/bootsplash/themes/current
 
+
+%files browser-qt
+%config %_altdir/%name
+/usr/share/alterator-browser-qt/design/desktop.rcc
+
+
+
 %files bootsplash
 %_sysconfdir/bootsplash/themes/%theme/
 

browser-qt/Makefile

 all:
-	rcc-qt4 -binary desktop.qrc -o desktop.rcc
+	rcc-qt4 -binary theme.qrc -o theme.rcc

browser-qt/desktop.qrc → browser-qt/theme.qrc

 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
    <file>design/bg.png</file>
-   <file>design/bg-center.png</file>
    <file>design/design.qss</file>
    <file>design/design.ini</file>
    <file>design/forward.png</file>

configure.ac

+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="$with_distro"
+				    THEME="$with_distro"
+			    fi
+			       ],
+				    [
+				     theme="theme"
+				     Theme="Theme"
+				     THEME="THEME"
+				     ]
+				    )
+			       ],
+				    [
+				     DESIGN=""
+				     ])
+
+AC_ARG_WITH(status,
+	    AC_HELP_STRING([--with-status=beta],
+			   [status, e.g '--with-status=beta']),
+			   [
+			    if test -n "$with_status"  ; then
+				    STATUS="$with_status"
+			    fi
+			       ],
+				    [
+				     STATUS=""
+				     ])
+
+
+AC_SUBST(theme)
+AC_SUBST(Theme)
+AC_SUBST(THEME)
+AC_SUBST(STATUS)
+
+
+AC_CONFIG_FILES([
+		 Makefile
+		 bootsplash/config/bootsplash-640x480.cfg
+		 bootsplash/config/bootsplash-800x600.cfg
+])
+AC_OUTPUT