Skip to content

B
branding-etersoft-ximper
Commit 37c7b5f6 authored by Alexandra Panyukova's avatar Alexandra Panyukova
Browse files
Options

making branding more up to date

parent 67de683d
Hide whitespace changes
Inline Side-by-side
Showing with 341 additions and 101 deletions
branding-simply-linux/Makefile.in
View file @ 37c7b5f6
all:
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 -gravity northeast -pointsize 20 -annotate 0 '@STATUS@' boot.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
STATUS=@STATUS@
THEME=@THEME@
NAME=@NAME@
VERSION=@VERSION@
# 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
all:
# background
convert images/background.png -gravity northeast -pointsize 30 -annotate 0 '@STATUS@' background.png
cp -al background.png graphics/backgrounds/default.png
cp -al background.png graphics/backgrounds/xdm.png
convert -resize '800x600!' background.png 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
# logo for web alterator
cp images/logo.png alterator/images/
convert images/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@"' wallpaper.png
cp -al wallpaper.png graphics/backgrounds/default.png
cp -al wallpaper.png graphics/backgrounds/xdm.png
include components.mk
install: browser-qt ahttpd indexhtml
x86: boot
branding-simply-linux/components.mk 0 → 100644
View file @ 37c7b5f6
# browser-qt
components/browser-qt/design/bg.png: images/installer.png
convert $< -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)"' $@
browser-qt:components/browser-qt/design/bg.png
install -d $(datadir)/alterator-browser-qt/design
cd components/browser-qt; rcc-qt4 -binary theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc; cd -
install -d $(sysconfdir)/alternatives/packages.d
printf '/etc/alterator/design-browser-qt\t/usr/share/alterator-browser-qt/design/$(THEME).rcc\t50\n'>$(sysconfdir)/alternatives/packages.d/$(THEME).rcc
# ahttpd
ahttpd:
install -d $(datadir)/alterator/design/styles
cp -a components/ahttpd/images $(datadir)/alterator/design
install -Dpm644 images/product-logo.png $(datadir)/alterator/design/images/product-logo.png
cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles
# bootloader and bootsplash
boot:
cp -a /usr/src/design-bootloader-source ./
cp -a components/bootloader/config design-bootloader-source/
cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-install/
cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-boot/
for size in 1024x768 800x600 640x480; do \
convert images/boot.jpg -quality 97 -resize "$$size!" -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-$$size.jpg ;\
done
cp -al boot-800x600.jpg design-bootloader-source/data-boot/back.jpg
convert images/boot.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)"' design-bootloader-source/data-install/back.jpg
#bootsplash
mkdir -p $(datadir)/plymouth/themes/$(THEME)
cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
cp -al images/background*x*.png $(datadir)/plymouth/themes/$(THEME)/
cp -a components/bootsplash/* $(datadir)/plymouth/themes/$(THEME)
mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth
#bootloader
DEFAULT_LANG='--lang-to-subst--' PATH=$(PATH):/usr/sbin make -C design-bootloader-source
install -d -m 755 $(sysconfdir)/../boot/splash/$(THEME)
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
indexhtml:
for i in notes/index*.html components/indexhtml/*.css;do \
install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \
done
install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html
cp -a components/indexhtml/img $(INDEXHTML_DIR)
install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/img/product-logo.png
install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
branding-simply-linux/components/bootsplash/theme.plymouth.in 0 → 100644
View file @ 37c7b5f6
[Plymouth Theme]
Name=@NAME@
Description=Script for @BRAND_FNAME@ @NAME@
ModuleName=script
[script]
ImageDir=/usr/share/plymouth/themes/@THEME@
ScriptFile=/usr/share/plymouth/themes/@THEME@/theme.script
branding-simply-linux/components/bootsplash/theme.script 0 → 100644
View file @ 37c7b5f6
# Centaurus theme
fun imgscale( image, scale )
{
image.Scale( image.GetWidth() * scale, image.GetHeight() * scale );
}
fun imgscale2( image, scaleX, scaleY )
{
image.Scale( image.GetWidth() * scaleX, image.GetHeight() * scaleY );
}
# background
if( Window.GetWidth()/Window.GetHeight() > 1.5 )
{
logo.raw = Image("background16x9.png");
}
else
{
logo.raw = Image("background4x3.png");
}
logo.image = imgscale2( logo.raw,
Window.GetWidth()/logo.raw.GetWidth(),
Window.GetHeight()/logo.raw.GetHeight());
logo.sprite = Sprite(logo.image);
logo.sprite.SetPosition(0, 0, 0);
#----------------------------------------- Dialogue --------------------------------
status = "normal";
fun dialog_setup()
{
local.box;
local.lock;
local.entry;
box.image = Image("box.png");
lock.image = Image("lock.png");
entry.image = Image("entry.png");
box.sprite = Sprite(box.image);
box.x = Window.GetX() + Window.GetWidth() / 2 - box.image.GetWidth ()/2;
box.y = Window.GetY() + Window.GetHeight() / 2 - box.image.GetHeight()/2;
box.z = 10000;
box.sprite.SetPosition(box.x, box.y, box.z);
lock.sprite = Sprite(lock.image);
lock.x = box.x + box.image.GetWidth()/2 - (lock.image.GetWidth() + entry.image.GetWidth()) / 2;
lock.y = box.y + box.image.GetHeight()/2 - lock.image.GetHeight()/2;
lock.z = box.z + 1;
lock.sprite.SetPosition(lock.x, lock.y, lock.z);
entry.sprite = Sprite(entry.image);
entry.x = lock.x + lock.image.GetWidth();
entry.y = box.y + box.image.GetHeight()/2 - entry.image.GetHeight()/2;
entry.z = box.z + 1;
entry.sprite.SetPosition(entry.x, entry.y, entry.z);
global.dialog.box = box;
global.dialog.lock = lock;
global.dialog.entry = entry;
global.dialog.bullet_image = Image("bullet.png");
dialog_opacity (1);
}
fun dialog_opacity(opacity)
{
dialog.box.sprite.SetOpacity (opacity);
dialog.lock.sprite.SetOpacity (opacity);
dialog.entry.sprite.SetOpacity (opacity);
for (index = 0; dialog.bullet[index]; index++)
{
dialog.bullet[index].sprite.SetOpacity(opacity);
}
}
fun display_normal_callback ()
{
global.status = "normal";
if (global.dialog)
dialog_opacity (0);
}
fun display_password_callback (prompt, bullets)
{
global.status = "password";
if (!global.dialog)
dialog_setup();
else
dialog_opacity(1);
for (index = 0; dialog.bullet[index] || index < bullets; index++)
{
if (!dialog.bullet[index])
{
dialog.bullet[index].sprite = Sprite(dialog.bullet_image);
dialog.bullet[index].x = dialog.entry.x + index * dialog.bullet_image.GetWidth();
dialog.bullet[index].y = dialog.entry.y + dialog.entry.image.GetHeight() / 2 - dialog.bullet_image.GetHeight() / 2;
dialog.bullet[index].z = dialog.entry.z + 1;
dialog.bullet[index].sprite.SetPosition(dialog.bullet[index].x, dialog.bullet[index].y, dialog.bullet[index].z);
}
if (index < bullets)
dialog.bullet[index].sprite.SetOpacity(1);
else
dialog.bullet[index].sprite.SetOpacity(0);
}
}
Plymouth.SetDisplayNormalFunction(display_normal_callback);
Plymouth.SetDisplayPasswordFunction(display_password_callback);
#----------------------------------------- Progress Bar --------------------------------
progress_box.raw = Image("progress_box.png");
scale_factor = Window.GetWidth() / progress_box.raw.GetWidth() * 0.8;
progress_box.image = imgscale( progress_box.raw, scale_factor );
progress_box.sprite = Sprite(progress_box.image);
progress_box.x = Window.GetX() + Window.GetWidth() / 2 - progress_box.image.GetWidth() / 2;
progress_box.y = Window.GetY() + Window.GetHeight() / 2 - progress_box.image.GetHeight() / 2;
progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 0);
progress_bar.status.raw = Image("segment_status.png");
progress_bar.runner = Sprite();
progress_bar.runner.SetImage ( imgscale(progress_bar.status.raw, scale_factor));
progress_bar.x = Window.GetX() + Window.GetWidth() / 2 - progress_box.image.GetWidth() / 2;
progress_bar.y = Window.GetY() + Window.GetHeight() / 2 - progress_box.image.GetHeight() / 2 +
(progress_box.image.GetHeight() - progress_box.image.GetHeight()) / 2;
#Total steps
steps=33;
#left corner
progress_bar.l = imgscale( Image("segment_cornerL.png") , scale_factor );
progress_bar.spriteL = Sprite();
progress_bar.spriteL.SetImage (progress_bar.l);
progress_bar.spriteL.SetPosition(progress_bar.x,progress_bar.y, 2) ;
progress_bar.x += progress_bar.l.GetWidth()-1;
#middle
progress_bar.image = imgscale(Image("segment_middle.png"), scale_factor);
step = progress_bar.image.GetWidth()-1;
for( i=0; i<steps; i++ )
{
progress_bar.sprites[i] = Sprite();
progress_bar.sprites[i].SetImage (progress_bar.image);
progress_bar.sprites[i].SetPosition(progress_bar.x+i*step,progress_bar.y, -1000) ;
}
#right corner
progress_bar.r = imgscale( Image("segment_cornerR.png") , scale_factor );
progress_bar.sprites[steps+1] = Sprite();
progress_bar.sprites[steps+1].SetImage (progress_bar.r);
progress_bar.sprites[steps+1].SetPosition(progress_bar.x+step*steps,progress_bar.y, -1000) ;
fun progress_callback (duration, progress)
{
for( i=0; i< progress*steps; i++ )
progress_bar.sprites[i].SetZ(2);
if( progress > 0.99 )
progress_bar.sprites[i+1].SetZ(2);
if( progress < 0.96 )
progress_bar.runner.SetPosition(progress_bar.x+progress*step*steps, progress_bar.y, 1);
}
Plymouth.SetBootProgressFunction(progress_callback);
#----------------------------------------- Quit --------------------------------
fun quit_callback ()
{
logo.sprite.SetOpacity (1);
}
Plymouth.SetQuitFunction(quit_callback);
#----------------------------------------- Message --------------------------------
message_sprites = [];
message_sprite_count = 0;
message_sprite_y = 10;
fun display_message_callback (text)
{
my_image = Image.Text(text, 1, 1, 1);
message_sprites[message_sprite_count] = Sprite(my_image);
message_sprites[message_sprite_count].SetPosition(10, message_sprite_y, 10000);
message_sprites[message_sprite_count].text = text;
message_sprite_count++;
message_sprite_y += my_image.GetHeight();
}
fun hide_message_callback (text)
{
for (i = 0; i < message_sprite_count; i++)
{
if (message_sprites[i].text == text)
message_sprites[i] = NULL;
}
}
Plymouth.SetDisplayMessageFunction (display_message_callback);
Plymouth.SetHideMessageFunction (hide_message_callback);
branding-simply-linux/configure.ac
View file @ 37c7b5f6
......@@ -25,16 +25,16 @@ AC_SUBST(TITLE_COLOR)
AC_CONFIG_FILES([
Makefile
bootloader/config
components/bootloader/config
components/bootsplash/theme.plymouth
alterator/design/design.ini
bootloader/gfxboot.cfg
components/browser-qt/design/design.ini
components/bootloader/gfxboot.cfg
notes/release-notes.ru.html
notes/release-notes.all.html
notes/license.ru.html
notes/license.all.html
indexhtml.desktop
indexhtml/index-ru.html
indexhtml/index-en.html
components/indexhtml/indexhtml.desktop
components/indexhtml/index-ru.html
components/indexhtml/index-en.html
])
AC_OUTPUT
branding.spec
View file @ 37c7b5f6
......@@ -3,9 +3,10 @@
%define codename Billy
%define status %nil
%define variants altlinux-office-desktop altlinux-office-server altlinux-desktop
%define brand simply
Name: branding-simply-linux
Version: 5.0.2
Version: 6.0.0
Release: alt1
BuildArch: noarch
......@@ -16,7 +17,7 @@ BuildRequires(pre): libqt4-core
BuildRequires: libalternatives-devel
BuildRequires: libqt4-devel
BuildRequires: ImageMagick fontconfig
BuildRequires: ImageMagick fontconfig bc libGConf-devel
Packager: Denis Koryavov <dkoryavov@altlinux.org>
......@@ -34,7 +35,7 @@ Distro-specific packages with design and texts for Simply Linux distribution.
%package bootloader
Group: System/Configuration/Boot and Init
Summary: Graphical boot logo for lilo and syslinux
Summary: Graphical boot logo for grub2, lilo and syslinux
Summary(ru_RU.UTF-8): Тема для экрана выбора вариантов загрузки (lilo и syslinux)
License: GPL
......@@ -44,6 +45,9 @@ Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design
Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-bootloader ";done )
%define grub_normal white/black
%define grub_high black/white
%description bootloader
Here you find the graphical boot logo for Simply Linux distribution.
Suitable for both lilo and syslinux.
......@@ -57,9 +61,9 @@ Summary: Theme for splash animations during bootup
Summary(ru_RU.UTF-8): Тема для экрана загрузки для дистрибутива "Просто Линукс"
License: Distributable
Group: System/Configuration/Boot and Init
Provides: design-bootsplash design-bootsplash-%theme branding-alt-%theme-bootsplash
Requires: bootsplash >= 3.3
Obsoletes: branding-alt-%theme-bootsplash
Provides: plymouth-theme-%theme
Requires: plymouth-plugin-script
PreReq: plymouth
Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-bootsplash ";done )
......@@ -100,6 +104,8 @@ Group: Graphics
Provides: design-graphics-%theme branding-alt-%theme-graphics
Obsoletes: branding-alt-%theme-graphics design-graphics-%theme
Provides: design-graphics = 12.0.0
PreReq(post,preun): alternatives >= 0.2
Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-graphics ";done )
......@@ -217,55 +223,10 @@ autoconf
THEME=%theme NAME='%Name' STATUS=%status VERSION=%version ./configure
make
#bootloader
pushd design-bootloader-source/
DEFAULT_LANG='--lang-to-subst--' PATH=$PATH:/usr/sbin %make
popd
#altarator
pushd alterator
%make_build
popd
%install
#bootloader
pushd design-bootloader-source
install -d -m 755 %buildroot/boot/splash/%theme
install -d -m 755 %buildroot/%_datadir/gfxboot/%theme
install -m 644 message %buildroot/boot/splash/%theme
install -m 644 bootlogo %buildroot%_datadir/gfxboot/%theme
popd
#bootsplash
## create directory structure
mkdir -p $RPM_BUILD_ROOT/%_sysconfdir/bootsplash/themes/%theme
cp -a bootsplash/* $RPM_BUILD_ROOT%_sysconfdir/bootsplash/themes/%theme
pushd $RPM_BUILD_ROOT%_sysconfdir/bootsplash/themes/%theme/config
#for i in 1 2 3 4 5 11; do \
for i in 1; do \
for f in bootsplash-*.cfg; do \
res=`echo "$f"| sed 's|.*\-\(.*\)\.cfg|\1|'`
ln -s $f vt${i}-${res}.cfg
done
done
popd
#alterator
pushd alterator
mkdir -p %buildroot/usr/share/alterator-browser-qt/design
install theme.rcc %buildroot/usr/share/alterator-browser-qt/design/%theme.rcc
mkdir -p %buildroot/usr/share/alterator/design/
cp -a images %buildroot/usr/share/alterator/design/
cp -a styles %buildroot/usr/share/alterator/design/
popd
%makeinstall
make x86 DESTDIR=%buildroot datadir=%buildroot%_datadir sysconfdir=%buildroot%_sysconfdir
mkdir -p %buildroot/%_altdir
cat >%buildroot/%_altdir/%name-browser-qt <<__EOF__
/etc/alterator/design-browser-qt /usr/share/alterator-browser-qt/design/%theme.rcc 50
__EOF__
#graphics
mkdir -p %buildroot/%_datadir/design/{%theme,backgrounds}
......@@ -313,6 +274,12 @@ mkdir -p %buildroot/etc/skel/.gconf/desktop/gnome/session
mkdir -p %buildroot/etc/skel/.config/xfce4/desktop
mkdir -p %buildroot/etc/skel/.config/xfce4/notication-daemon-xfce
mkdir -p %buildroot/etc/skel/.config/xfce4/panel
mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-5
mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-6
mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-8
mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-9
mkdir -p %buildroot/etc/skel/.config/xfce4/xfconf
mkdir -p %buildroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
......@@ -349,13 +316,10 @@ install slideshow/* %buildroot/usr/share/install2/slideshow/
#indexhtml
%define _altdocsdir %_defaultdocdir/alt-docs
%define _indexhtmldir %_defaultdocdir/indexhtml
pushd indexhtml
mkdir -p %buildroot{%_indexhtmldir/,%_desktopdir/}
cp -r * %buildroot%_indexhtmldir/
rm -f %buildroot%_indexhtmldir/*.in
touch %buildroot%_indexhtmldir/index.html
popd
install -m644 indexhtml.desktop %buildroot%_desktopdir/
install components/indexhtml/*.html %buildroot%_defaultdocdir/indexhtml/
mkdir -p %buildroot%_defaultdocdir/indexhtml/img
install components/indexhtml/img/* %buildroot%_defaultdocdir/indexhtml/img/
#install -m644 components/indexhtml.desktop %buildroot%_desktopdir/
#bootloader
%pre bootloader
......@@ -368,6 +332,10 @@ lang=$(echo $LANG | cut -d. -f 1)
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_THEME /boot/grub/themes/%theme
shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal
shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
%preun bootloader
......@@ -381,20 +349,18 @@ echo $lang > lang
%files bootloader
%_datadir/gfxboot/%theme
/boot/splash/%theme
/boot/grub/themes/%theme
#bootsplash
%post bootsplash
%__ln_s -nf %theme %_sysconfdir/bootsplash/themes/current
%preun bootsplash
[ $1 = 0 ] || exit 0
[ "`readlink %_sysconfdir/bootsplash/themes/current`" != %theme ] ||
%__rm -f %_sysconfdir/bootsplash/themes/current
subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
[ -f /etc/sysconfig/grub2 ] && \
subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/theme/grub.jpg|" \
/etc/sysconfig/grub2 ||:
%files alterator
%config %_altdir/%name-browser-qt
/usr/share/alterator-browser-qt/design/%theme.rcc
%config %_altdir/*.rcc
/usr/share/alterator-browser-qt/design/*.rcc
/usr/share/alterator/design/*
%files graphics
......@@ -404,8 +370,7 @@ echo $lang > lang
%_iconsdir/altlinux.png
%files bootsplash
%_sysconfdir/bootsplash/themes/%theme/
%_datadir/plymouth/themes/%theme/*
%files release
%_sysconfdir/*-*
......@@ -428,12 +393,23 @@ echo $lang > lang
%files slideshow
/usr/share/install2/slideshow
%define indexhtmldir %_defaultdocdir/indexhtml
%files indexhtml
%ghost %_indexhtmldir/index.html
%_indexhtmldir/*
%_desktopdir/*
#%ghost %_indexhtmldir/index.html
#%_indexhtmldir/*
#%_desktopdir/*
%ghost %indexhtmldir/index.html
%indexhtmldir/index-*.html
%indexhtmldir/index.css
%indexhtmldir/img
%_desktopdir/indexhtml.desktop
%changelog
* Wed Apr 13 2011 Alexandra Panyukova <mex3@altlinux.ru> 6.0.0-alt1
- new version
* Fri Dec 17 2010 Alexandra Panyukova <mex3@altlinux.ru> 5.0.2-alt1
- version for 5.0.2:
-- new wallpapers
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment