new images for linbook

Makefile.in

@@ -3,13 +3,12 @@ all:
 	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 -resize 800x600 -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' boot.jpg
-	convert images/boot.jpg -resize 800x600 -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@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
+	convert images/boot.jpg -resize 1024x600 -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' boot.jpg
+	convert images/boot.jpg -resize 1024x600 -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' boot-1024x600.jpg
+	cp -al boot-1024x600.jpg design-bootloader-source/data-boot/back.jpg
+	cp -al boot-1024x600.jpg design-bootloader-source/data-install/back.jpg
+	cp -al boot.jpg bootsplash/images/silent-1024x600.jpg
+	convert -resize '1024x600!' bootsplash/images/silent-1024x600.jpg bootsplash/images/silent-1024x600.jpg
 # background
 	convert images/background.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' background.png
 	convert graphics/backgrounds/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' prototype.png
@@ -18,10 +17,10 @@ all:
 	convert images/background.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' kde3-styles-splash/Background.jpg
 	convert -resize '400x320!' images/background.png kde3-styles-splash/Preview.png
 #	cp -al prototype.png kde3-styles-splash/Background.png
-	convert alterator/images/background.png -resize '800x600!' -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' alterator/design/bg.png
+	convert alterator/images/background.png -resize '1024x600!' -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' alterator/design/bg.png
 # console background
-	cp -al images/console.jpg bootsplash/images/bootsplash-800x600.jpg
-	convert -resize '640x480!' bootsplash/images/bootsplash-800x600.jpg bootsplash/images/bootsplash-640x480.jpg
+	cp -al images/console.jpg bootsplash/images/bootsplash-1024x600.jpg
+	convert -resize '1024x600!' bootsplash/images/bootsplash-1024x600.jpg bootsplash/images/bootsplash-640x480.jpg
 # logo for web alterator
 	convert images/logo.png -fill '#ffffff' -font /usr/share/fonts/ttf/dejavu/DejaVuSans-Bold.ttf -style Normal -weight Normal -pointsize 24 -gravity northwest -draw 'text 0,0 "@VERSION@ @NAME@"' alterator/images/logo.png
 #color scheme

bootloader/gfxboot.cfg.in

@@ -15,7 +15,7 @@
 ; theme name
 theme=ALTLinux
 ; other sections to read
-layout=800x600,install
+layout=1024x600,install
 ; penguin theme likelihood (in percent, -1 = auto)
 penguin=0
 ; activate speech output
@@ -69,9 +69,9 @@ panel.f-key.fg=0x@DARK_LABELS_HEX@
 ; default keymap (e.g. de_DE, czech)
 keymap=
 
-[800x600]
+[1024x600]
 ; screen size
-screen.size=800,600
+screen.size=1024,600
 ; upper left corner
 mainmenu.pos=253,170
 ; boot option input field position

bootsplash/config/bootsplash-1024x768.cfg.in → bootsplash/config/bootsplash-1024x600.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-1024x600.jpg
+silentjpeg=/etc/bootsplash/themes/@THEME@/images/silent-1024x600.jpg
 
 box silent noover 99 370 701 372 #69696760
 box silent noover 99 372 701 377 #CCCDCC60

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

-# 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=620
-th=430
-
-
-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
-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 #@LIGHT_COLOR_HEX@
-box silent       100 371 540 377 #@LIGHT_COLOR_HEX@
-box silent inter 100 377 100 387 #@DARK_COLOR_HEX@
-box silent       100 377 540 387 #@DARK_COLOR_HEX@
-
-
-trigger "isdown" quit
-trigger "rlreached 5" quit
-trigger "rlchange 0" tosilent
-trigger "rlchange 6" tosilent

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

-# 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 #@LIGHT_COLOR_HEX@
-box silent 100 371 700 377 #@LIGHT_COLOR_HEX@
-box silent inter 100 377 100 387 #@DARK_COLOR_HEX@ 
-box silent 100 377 700 387 #@DARK_COLOR_HEX@
-
-
-trigger "isdown" quit
-trigger "rlreached 5" quit
-trigger "rlchange 0" tosilent
-trigger "rlchange 6" tosilent

branding.spec

@@ -305,12 +305,12 @@ popd
 
 #gnome-settings
 pushd gnome-settings
-mkdir -p %buildroot/%_datadir/themes/theme-%brand-%theme
-mkdir -p %buildroot/%_datadir/themes/theme-%brand-%theme/gtk-2.0
-install -m 644 gtkrc %buildroot/%_datadir/themes/theme-%brand-%theme/gtk-2.0
-mkdir -p %buildroot/%_datadir/themes/theme-%brand-%theme/metacity-1
-install -m 644 metacity-theme-1.xml %buildroot/%_datadir/themes/theme-%brand-%theme/metacity-1/
-install -m 644 index.theme %buildroot/%_datadir/themes/theme-%brand-%theme/
+mkdir -p %buildroot/%_datadir/themes/%brand-%theme
+mkdir -p %buildroot/%_datadir/themes/%brand-%theme/gtk-2.0
+install -m 644 gtkrc %buildroot/%_datadir/themes/%brand-%theme/gtk-2.0
+mkdir -p %buildroot/%_datadir/themes/%brand-%theme/metacity-1
+install -m 644 metacity-theme-1.xml %buildroot/%_datadir/themes/%brand-%theme/metacity-1/
+install -m 644 index.theme %buildroot/%_datadir/themes/%brand-%theme/
 popd
 
 #slideshow
@@ -394,7 +394,7 @@ echo $lang > lang
 %_datadir/apps/ksplash/Themes/ALTLinux%Theme/*
 
 %files gnome-settings
-%_datadir/themes/theme-%brand-%theme/*
+%_datadir/themes/%brand-%theme/*
 
 %files slideshow
 /usr/share/install2/slideshow

configure.ac

@@ -5,8 +5,8 @@ PROGRESS_COLOR=`./fetch_color selectBackground` //MIDDLE_COLOR_DEC
 TITLE_COLOR=`./fetch_color handle`
 INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
 LIGHT_COLOR_HEX=DFDFE0
-MIDDLE_COLOR_HEX=C8C9CB
-DARK_COLOR_HEX=909195
+MIDDLE_COLOR_HEX=8DA6DA
+DARK_COLOR_HEX=7C99D6
 LIGHT_LABELS_HEX=FFFFFF
 DARK_LABELS_HEX=000000
 MIDDLE_LABELS_HEX=4d4d4f
@@ -16,6 +16,7 @@ DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
 
 AC_SUBST(THEME)
 AC_SUBST(NAME)
+AC_SUBST(BRAND)
 AC_SUBST(BRAND_FNAME)
 AC_SUBST(STATUS)
 AC_SUBST(STATUS_EN)
@@ -36,8 +37,7 @@ AC_SUBST(INACTIVE_COLOR)
 AC_CONFIG_FILES([
 		 Makefile
 		 bootloader/config
-		 bootsplash/config/bootsplash-640x480.cfg
-		 bootsplash/config/bootsplash-800x600.cfg
+		 bootsplash/config/bootsplash-1024x600.cfg
 		 alterator/design/design.ini
 		 alterator/design/design.qss
 		 bootloader/gfxboot.cfg

gnome-settings/gtkrc.in

 gtk-color-scheme =
-"bg_color:#eaeaea\nfg_color:#000\nbase_color:#fff\ntext_color:#000\nselected_fg_color:#fff\nselected_bg_color:@MIDDLE_COLOR_HEX@"
+"bg_color:#eaeaea\nfg_color:#000\nbase_color:#fff\ntext_color:#000\nselected_fg_color:#fff\nselected_bg_color:#@MIDDLE_COLOR_HEX@"
 
 style "default"
 {

gnome-settings/index.theme.in

@@ -3,6 +3,6 @@ Name=@BRAND@-@THEME@
 Type=X-GNOME-Metatheme
 Comment=Theme for @BRAND_FNAME@ @NAME@
 Encoding=UTF-8
-GtkTheme=@BRAND_FNAME@ @NAME@
+GtkTheme=@BRAND@-@THEME@
 MetacityTheme=@BRAND@-@THEME@
 IconTheme=Mist