Skip to content

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

misspells corrected

parent f07bc1d5
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 15 deletions
Makefile.in
View file @ 2433f7f2
...@@ -3,15 +3,15 @@ all: ...@@ -3,15 +3,15 @@ all:
cp -a bootloader/config 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-install/
cp -a bootloader/gfxboot.cfg design-bootloader-source/data-boot/ 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 27,27 "@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.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 27,27 "@STATUS@"' boot-800x600.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-boot/back.jpg
cp -al boot-800x600.jpg design-bootloader-source/data-install/back.jpg cp -al boot-800x600.jpg design-bootloader-source/data-install/back.jpg
cp -al boot.jpg bootsplash/images/silent-1024x768.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 '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 -resize '640x480!' bootsplash/images/silent-800x600.jpg bootsplash/images/silent-640x480.jpg
# background # 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 27,27 "@STATUS@"' background.png 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
cp -al background.png graphics/backgrounds/default.png cp -al background.png graphics/backgrounds/default.png
cp -al background.png graphics/backgrounds/xdm.png cp -al background.png graphics/backgrounds/xdm.png
convert -resize '800x600!' background.png alterator/design/bg.png convert -resize '800x600!' background.png alterator/design/bg.png
...@@ -23,4 +23,4 @@ all: ...@@ -23,4 +23,4 @@ all:
#color scheme #color scheme
mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc" mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
#wallpaper #wallpaper
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 27,27 "@STATUS@"' ALTLinux Desktop-4.0.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@"' graphics/backgrounds/ALTLinux\ Desktop-4.0.png
color_dec
View file @ 2433f7f2
#!/bin/bash #!/bin/bash
echo $(echo "ibase=16; ${1:0:2}" | bc)', '$(echo "ibase=16; ${1:2:2}" | bc)', '$(echo "ibase=16; ${1:4:2}" | bc) echo $(echo "ibase=16; ${1:0:2}" | bc)','$(echo "ibase=16; ${1:2:2}" | bc)','$(echo "ibase=16; ${1:4:2}" | bc)
\ No newline at end of file \ No newline at end of file
configure.ac
View file @ 2433f7f2
...@@ -4,14 +4,14 @@ AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] ) ...@@ -4,14 +4,14 @@ AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
PROGRESS_COLOR=`./fetch_color selectBackground` PROGRESS_COLOR=`./fetch_color selectBackground`
TITLE_COLOR=`./fetch_color handle` TITLE_COLOR=`./fetch_color handle`
INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg` INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
LIGHT_COLOR_HEX="DFDFFE0" LIGHT_COLOR_HEX=DFDFFE0
MIDDLE_COLOR_HEX="C8C9CB" MIDDLE_COLOR_HEX=C8C9CB
DARK_COLOR_HEX="909195" DARK_COLOR_HEX=909195
LIGHT_LABELS_HEX="FFFFFF" LIGHT_LABELS_HEX=FFFFFF
DARK_LABELS_HEX="000000" DARK_LABELS_HEX=000000
LIGHT_COLOR_DEC=`./color-dec $LIGHT_COLOR_HEX` LIGHT_COLOR_DEC=`./color_dec ${LIGHT_COLOR_HEX}`
MIDDLE_COLOR_DEC=`./color-dec $MIDDLE_COLOR_HEX` MIDDLE_COLOR_DEC=`./color_dec ${MIDDLE_COLOR_HEX}`
DARK_COLOR_DEC=`./color-dec $DARK_COLOR_HEX` DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
AC_SUBST(THEME) AC_SUBST(THEME)
AC_SUBST(NAME) AC_SUBST(NAME)
...@@ -19,6 +19,11 @@ AC_SUBST(BRAND_FNAME) ...@@ -19,6 +19,11 @@ AC_SUBST(BRAND_FNAME)
AC_SUBST(STATUS) AC_SUBST(STATUS)
AC_SUBST(VERSION) AC_SUBST(VERSION)
AC_SUBST(PROGRESS_COLOR) AC_SUBST(PROGRESS_COLOR)
AC_SUBST(LIGHT_COLOR_HEX)
AC_SUBST(MIDDLE_COLOR_HEX)
AC_SUBST(DARK_COLOR_HEX)
AC_SUBST(LIGHT_LABELS_HEX)
AC_SUBST(DARK_LABELS_HEX)
AC_SUBST(LIGHT_COLOR_DEC) AC_SUBST(LIGHT_COLOR_DEC)
AC_SUBST(MIDDLE_COLOR_DEC) AC_SUBST(MIDDLE_COLOR_DEC)
AC_SUBST(DARK_COLOR_DEC) AC_SUBST(DARK_COLOR_DEC)
...@@ -42,6 +47,6 @@ AC_CONFIG_FILES([ ...@@ -42,6 +47,6 @@ AC_CONFIG_FILES([
indexhtml/index-ru.html indexhtml/index-ru.html
indexhtml/index-uk.html indexhtml/index-uk.html
indexhtml/index-en.html indexhtml/index-en.html
indexhtml/index.css.in indexhtml/index.css
]) ])
AC_OUTPUT AC_OUTPUT
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