Merge branch 'alt-desktop' into altlinux-office-server

Makefile.in

+STATUS=@STATUS@
+THEME=@THEME@
+NAME=@NAME@
+VERSION=@VERSION@
+
 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 -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
+	for size in 1024x768 800x600 640x480; do \
+		convert images/boot.jpg -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 ;\
+		cp -al boot-$$size.jpg bootsplash/images/silent-$$size.jpg ;\
+		convert -resize "$$size!" images/console.jpg bootsplash/images/bootsplash-$$size.jpg;\
+	done
 	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
 # 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
-	cp -al prototype.png graphics/backgrounds/default.png
+	cp -al background.png graphics/backgrounds/default.png
 	cp -al background.png graphics/backgrounds/xdm.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
-# 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
-	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
+	convert background.png kde3-styles-splash/Background.jpg
+	cp -al background.png kde3-styles-splash/Background.png
+	convert -resize '400x320!' images/background.png kde3-styles-splash/Preview.png
 #color scheme
 	mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
+
+include components.mk
+install: browser-qt ahttpd

alterator/Makefile

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

alterator/styles/alterator.css

-body {
-	background-color: #cdcdcd;/*#92b2b8;/*#67999a;/*#c0dbdb;*/
-	color: #178093;
-	margin: 0px;
-	padding: 10px;
-	font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 9pt;
-}
-
-a {
-	color: #178093;
-	font-weight: bold;
-}
-
-table {
-	font-size: 9pt;
-	border-color: #178093;
-	border-collapse: collapse;
-}
-
-th {
-	padding: 0px 7px 3px 0px;
-}
-
-tr {
-	vertical-align: top;
-}
-
-hr {
-	border: none;
-	border-top: 1px solid #5ac;
-}
-
-h1 {
-	text-align: center;
-	margin: 0px;
-}
-
-textarea, select, input.text {
-	border: 1px solid #178093;
-	font-size: 8pt;
-	margin: 1px 3px 1px 0px;
-	padding: 1px 3px;
-}
-
-.btn {
-	background-color: #cdcdcd;
-	color: #178093;
-	border: 1px solid #178093;
-	cursor: pointer;
-	font-size: 9pt;
-	padding: 0px 3px;
-}
-
-.btn:hover {
-	background-color: #94c4cd;
-}
-
-.error-message {
-	background-color: #FFCACA;
-	border: 1px solid #FF6060;
-	padding-left:10px;
-	padding-right:10px;
-	margin-bottom:10px;
-}
-
-.info-name {
-	font-size: 18pt;
-	border-bottom: 2px solid #178093;
-}
-
-.info-description {
-	font-size: 12pt;
-	font-weight: bold;
-	padding-top: 10px;
-}
-
-
-.frame-table {
-	border-style:solid;
-	border-width:1px;
-	margin: 3px;
-}
-
-.frame-table td, .frame-table th {
-	border-style:solid;
-	border-width:1px;
-	padding: 1px 1px 3px 3px;
-}
-
-.disabled {
-	color: #6e6e6e;
-}
-
-.alterator-progress {
-	border: 1px solid #178093;
-	height: 20px;
-	width: 200px;
-	padding: 2px;
-	background-color: #FFFFFF;
-}
-
-.alterator-progress div {
-	background-color: #178093;
-	height: 20px;
-}
-
-.year {
-	font-weight: bold;
-	background-color: #baeaea;
-}
-
-.week {
-	border-style:solid;
-	border-width:1px;
-	background-color: white;
-}
-
-.today {
-	border-style:solid;
-	border-width:1px;
-	background-color: pink;
-	cursor: pointer;
-}
-
-.day {
-	border-style:solid;
-	border-width:1px;
-	background-color: #baeaea;
-	cursor: pointer;
-}
-
-.day:hover {
-	background-color: #178093;
-}
-
-.alterator-dateedit-calendar table {
-	width: 100%;
-	text-align: center;
-	background-color: #baeaea;
-	border-style: solid;
-	border-width: 1px;
-}
-
-.alterator-dateedit-calendar td {
-	padding: 3px;
-}
-
-.alterator-dateedit-button {
-	vertical-align:middle;
-	cursor:pointer;
-	background: url(/design/images/dateedit.png) no-repeat;
-	width: 15px;
-	height: 16px;
-}
-
-table.alterator-listbox {
-	border: solid 1px;
-}
-
-table.alterator-listbox th {
-	background-color:  #cdcdcd;
-	font-weight: bold;
-	border: solid 1px;
-	padding: 3px;
-}
-
-table.alterator-listbox td {
-	background: #ffffff;
-	border-left: solid 1px;
-	border-right: solid 1px;
-	padding: 3px;
-}

alterator/styles/card-index.css

-.selector-actions {
-	position: absolute;
-	right: 30px;
-}
-
-.selector-chooser {
-	width: 100%;
-}

alterator/styles/menu.css

-/* c0dbdb */
-
-#logo-td {
-	border-left: none;
-	padding-left: 10px;
-	padding-right: 10px;
-	text-align:left;
-/*	background: #fff;*/
-	padding-top: 10px;
-	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-	width: 275px;
-	-moz-border-radius-topleft: 1em;
-	-webkit-border-radius-topleft: 1em;
-	-khtml-border-radius-topleft: 1em;
-	border-radius-topleft: 1em;
-	-moz-border-radius-bottomleft: 1em;
-	-webkit-border-radius-bottomleft: 1em;
-	-khtml-border-radius-bottomleft: 1em;
-	border-radius-bottomleft: 1em;
-}
-
-#logo-td img {
-	background: url(/design/images/logo.png) no-repeat;
-	width: 275px; /*325*/
-	height: 30px;
-}
-
-#help-td {
-	/*border-left: none;*/
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 10px;
-	width: 20px;
-	text-align:left;
-	color: #fff;
-/*        border-bottom: 1px solid #056560;;*/
-	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-/*	-moz-border-radius-topleft: 1em;
-	-moz-border-radius-topright: 1em;
-        -webkit-border-radius-topleft: 1em;
-        -khtml-border-radius-topleft: 1em;
-        border-radius-topleft: 1em; */
-}
-
-#locale-td {
-/*	border-left: none; */
-	padding-left: 10px;
-	padding-top: 10px;
-	color: #fff;
-	padding-right: 10px;
-	text-align:center;
-	width: 100px;
-	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-/*	border-left: 1px solid #056560;;
-	border-right: 1px solid #056560;;
-	border-bottom: 1px solid #056560;; */
-	-moz-border-radius-topright: 1em;
-        -webkit-border-radius-topright: 1em;
-        -khtml-border-radius-topright: 1em;
-        border-radius-topright: 1em;
-}
-
-#hostinfo-td {
-/*	border-left:  1px solid #056560;;
-	border-top:  1px solid #056560;;
-	border-right:  1px solid #056560;; */
-	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-/*	-moz-border-radius-topleft: 1em;
-        -webkit-border-radius-topleft: 1em;
-        -khtml-border-radius-topleft: 1em;
-        border-radius-topleft: 1em;
-	*/
-	
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 10px;
-	text-align: left;
-
-	color: #fff; /*#0574B2;*/
-	font-weight: bold;
-	text-decoration: none;
-	font-size:large;
-}
-
-.expanded {
-/*	padding-left: 40px;*/
-    width: 100%;
-}
-
-
-
-/* main menu */
-
-#menu-td {
-	padding-right: 12px;
-}
-
-#main {
-	padding: 10px 20px;
-}
-
-
-#main-td {
-/*	padding: 10px 20px;*/
-/*	background-color: #baeaea;*/
-	background-color: #fff;
-	width: 100%;
-	/*border: 1px solid #056560;;*/
-	-moz-border-radius-bottomright: 1em;
-        -webkit-border-radius-bottomright: 1em;
-        -khtml-border-radius-bottomright: 1em;
-        border-radius-bottomright: 1em;
-	-moz-border-radius-bottomleft: 1em;
-        -webkit-border-radius-bottomleft: 1em;
-        -khtml-border-radius-bottomleft: 1em;
-        border-radius-bottomleft: 1em;
-}
-
-.menu-item-normal a {
-	font-weight: normal;
-	padding-left: 5px;
-	padding-right: 5px;
-	text-decoration: none;
-}
-
-.menu-item-selected a {
-	font-weight: bold;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.menu-group-name  {
-	padding-left: 5px;
-	padding-right: 5px;
-	color: #fff;
-	text-decoration: none;
-	/*background-color:#baeaea;*/
-	padding-top: 3px;
-	background: url(/design/images/gradient.png) 0% 0% repeat-x;
-	font-weight: bold;
-	-moz-border-radius-topright: 1em;
-	-webkit-border-radius-topright: 1em;
-	-khtml-border-radius-topright: 1em;
-	border-radius-topright: 1em;
-	-moz-border-radius-topleft: 1em;
-	-webkit-border-radius-topleft: 1em;
-	-khtml-border-radius-topleft: 1em;
-	border-radius-topleft: 1em;
-}
-
-.menu-group {
-	padding-bottom: 5px;
-	/*width:250px;*/
-/*	padding-right: 5px;*/
-	padding-top: 5px;
-	border-collapse: collapse;
-	background: url(/design/images/gradient-menu.png) 0% 0% repeat-x;
-/*	border-bottom: 1px solid #056560;;
-	border-left: 1px solid #056560;;
-	border-right: 1px solid #056560;; */
-	-moz-border-radius-bottomright: 1em;     /* mozilla 1.5 */
-	-webkit-border-radius-bottomright: 1em;  /* safari 3 */
-	-khtml-border-radius-bottomright: 1em;   /* Konqueror */
-	border-radius-bottomright: 1em;          /* CSS3 */
-	-moz-border-radius-bottomleft: 1em;     /* mozilla 1.5 */
-	-webkit-border-radius-bottomleft: 1em;  /* safari 3 */
-	-khtml-border-radius-bottomleft: 1em;   /* Konqueror */
-	border-radius-bottomleft: 1em;          /* CSS3 */
-}
-
-#help-popup {
-	padding-left: 10px;
-	width: 95%;
-	background-color: #EEF2F5;
-/*	padding-right: 5px;
-	padding-top: 10px;*/
-}
-
-.hresizeable {
-	width: 100%;
-	height: 7px;
-	background:#cdcdcd url(/design/images/hgrabber.gif) no-repeat scroll 45%;
-	cursor: s-resize;
-}
-
-.hresizeable:hover {
-	background-color: #178093;
-}

branding.spec

@@ -7,7 +7,7 @@
 
 Name: branding-%brand-%theme
 Version: 5.0.0
-Release: alt16
+Release: alt17
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@@ -130,6 +130,28 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi
 %description kde4-settings
 KDE4 settings for %Brand %version %Theme
 
+%package kde3-settings
+
+Summary: KDE3 settings for %Brand %version %Theme
+License: Distributable
+Group: Graphical desktop/KDE
+Requires: ksplash-engine-moodin
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde3-settings ";done )
+
+%description kde3-settings
+KDE3 settings for %Brand %version %Theme
+
+%package gnome-settings
+
+Summary: GNOME settings for %Brand %version %Theme
+License: Distributable
+Group: Graphical desktop/KDE
+Requires: gtk2-theme-mist
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde3-settings ";done )
+
+%description gnome-settings
+GNOME settings for %Brand %version %Theme
+
 %package slideshow
 
 Summary: Slideshow for %Brand %version %Theme installer
@@ -168,7 +190,7 @@ ALT Linux index.html welcome page.
 
 %build
 autoconf
-THEME=%theme NAME='%Theme' BRAND_FNAME='ALT Linux' STATUS_EN=%status_en STATUS=%status VERSION=%version ./configure 
+THEME=%theme NAME='%Theme' BRAND_FNAME='%Brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version ./configure 
 make
 
 #bootloader
@@ -176,12 +198,9 @@ make
     DEFAULT_LANG='--lang-to-subst--' PATH=$PATH:/usr/sbin %make
     popd
 
-#altarator
-    pushd alterator
-    %make_build
-    popd
-
 %install
+%makeinstall
+
 #bootloader
     pushd design-bootloader-source
     install -d -m 755 %buildroot/boot/splash/%theme
@@ -205,23 +224,6 @@ for i in 1; do \
 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
-
-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}
 cp -ar graphics/* %buildroot/%_datadir/design/%theme
@@ -259,6 +261,37 @@ mkdir -p %buildroot%_sysconfdir/skel/.kde4
 cp -a kde4/* %buildroot%_sysconfdir/skel/.kde4/
 popd
 
+#kde3-settings
+pushd kde3-settings
+mkdir -p %buildroot%_sysconfdir/skel/Desktop
+cp -a Desktop/* %buildroot%_sysconfdir/skel/Desktop/
+mkdir -p %buildroot%_sysconfdir/skel/.kde
+cp -a kde/* %buildroot%_sysconfdir/skel/.kde/
+mkdir -p %buildroot%_sysconfdir/skel/.kde/share
+mkdir -p %buildroot%_sysconfdir/skel/.kde/share/config
+mkdir -p %buildroot%_sysconfdir/skel/.kde/share/apps
+cp -a config/* %buildroot%_sysconfdir/skel/.kde/share/config/
+cp -a apps/* %buildroot%_sysconfdir/skel/.kde/share/apps/
+popd
+
+#kde3-splash
+pushd kde3-styles-splash
+mkdir -p %buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme
+install -m 644 *.jpg %buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/
+install -m 644 *.png %buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/
+install -m 644 *.rc %buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/
+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/
+popd
+
 #slideshow
 mkdir -p %buildroot/usr/share/install2/slideshow
 install slideshow/*  %buildroot/usr/share/install2/slideshow/
@@ -311,8 +344,8 @@ echo $lang > lang
 
 
 %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
@@ -334,6 +367,14 @@ echo $lang > lang
 %_sysconfdir/skel/Desktop
 %_sysconfdir/skel/.kde4
 
+%files kde3-settings
+%_sysconfdir/skel/Desktop
+%_sysconfdir/skel/.kde
+%_datadir/apps/ksplash/Themes/ALTLinux%Theme/*
+
+%files gnome-settings
+%_datadir/themes/theme-%brand-%theme/*
+
 %files slideshow
 /usr/share/install2/slideshow
 
@@ -343,6 +384,9 @@ echo $lang > lang
 %_desktopdir/*
 
 %changelog
+* Thu Jun 11 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt17
+- merge with desktop
+
 * Wed May 13 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt16
 - %setup fixed from boyarsh@
 - remove package name from .gear-rules from boyarsh@

components.mk

+# 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
+	[ ! -f images/logo.png ] || 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)"' $(datadir)/alterator/design/images/logo.png
+	cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles

alterator/styles/alterator.css.in → components/ahttpd/styles/alterator.css.in

+/* basic elements and widgets */
+
 body {
-	background-color: #@MIDDLE_COLOR_HEX@;/*#92b2b8;/*#67999a;/*#c0dbdb;*/
+	background-color: #@MIDDLE_COLOR_HEX@;
 	color: #@MIDDLE_LABELS_HEX@;
 	margin: 0px;
 	padding: 10px;
@@ -64,18 +66,6 @@ textarea, select, input.text {
 	margin-bottom:10px;
 }
 
-.info-name {
-	font-size: 18pt;
-	border-bottom: 2px solid #@MIDDLE_LABELS_HEX@;
-}
-
-.info-description {
-	font-size: 12pt;
-	font-weight: bold;
-	padding-top: 10px;
-}
-
-
 .frame-table {
 	border-style:solid;
 	border-width:1px;
@@ -105,6 +95,19 @@ textarea, select, input.text {
 	height: 20px;
 }
 
+.alterator-information-message {
+    font-style:italic;
+    font-size:small;
+    padding-top:3px;
+    padding-bottom:3px;
+}
+
+.alterator-information-message img {
+    vertical-align:middle;
+}
+
+/* calendar and dateedit */
+
 .year {
 	font-weight: bold;
 	background-color: #@LIGHT_COLOR_HEX@;
@@ -160,6 +163,8 @@ textarea, select, input.text {
         padding-top: 10px;
 }
 
+/* control center page */
+
 #logo-td {
 	border-left: none;
 	padding-left: 10px;
@@ -192,17 +197,10 @@ textarea, select, input.text {
 	width: 20px;
 	text-align:left;
 	color: #@LIGHT_LABELS_HEX@;
-/*        border-bottom: 1px solid #056560;;*/
 	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-/*	-moz-border-radius-topleft: 1em;
-	-moz-border-radius-topright: 1em;
-        -webkit-border-radius-topleft: 1em;
-        -khtml-border-radius-topleft: 1em;
-        border-radius-topleft: 1em; */
 }
 
 #locale-td {
-/*	border-left: none; */
 	padding-left: 10px;
 	padding-top: 10px;
 	color: #@LIGHT_LABELS_HEX@;
@@ -210,9 +208,6 @@ textarea, select, input.text {
 	text-align:center;
 	width: 100px;
 	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-/*	border-left: 1px solid #056560;;
-	border-right: 1px solid #@DARK_COLOR_HEX@;;
-	border-bottom: 1px solid #@DARK_COLOR_HEX@;; */
 	-moz-border-radius-topright: 1em;
         -webkit-border-radius-topright: 1em;
         -khtml-border-radius-topright: 1em;
@@ -220,15 +215,7 @@ textarea, select, input.text {
 }
 
 #hostinfo-td {
-/*	border-left:  1px solid #056560;;
-	border-top:  1px solid #@DARK_COLOR_HEX@;;
-	border-right:  1px solid #@DARK_COLOR_HEX@;; */
 	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-/*	-moz-border-radius-topleft: 1em;
-        -webkit-border-radius-topleft: 1em;
-        -khtml-border-radius-topleft: 1em;
-        border-radius-topleft: 1em;
-	*/
 
 	padding-left: 10px;
 	padding-right: 10px;
@@ -241,13 +228,6 @@ textarea, select, input.text {
 	font-size:large;
 }
 
-.expanded {
-/*	padding-left: 40px;*/
-    width: 100%;
-}
-
-
-
 /* main menu */
 
 #menu-td {
@@ -258,10 +238,7 @@ textarea, select, input.text {
 	padding: 10px 20px;
 }
 
-
 #main-td {
-/*	padding: 10px 20px;*/
-/*	background-color: #baeaea;*/
 	background-color: #ffffff;
 	width: 100%;
 	/*border: 1px solid #056560;;*/
@@ -310,13 +287,9 @@ textarea, select, input.text {
 .menu-group {
 	padding-bottom: 5px;
 	/*width:250px;*/
-/*	padding-right: 5px;*/
 	padding-top: 5px;
 	border-collapse: collapse;
 	background: url(/design/images/gradient-menu.png) 0% 0% repeat-x;
-/*	border-bottom: 1px solid #056560;;
-	border-left: 1px solid #@DARK_COLOR_HEX@;;
-	border-right: 1px solid #@DARK_COLOR_HEX@;; */
 	-moz-border-radius-bottomright: 1em;     /* mozilla 1.5 */
 	-webkit-border-radius-bottomright: 1em;  /* safari 3 */
 	-khtml-border-radius-bottomright: 1em;   /* Konqueror */
@@ -327,12 +300,12 @@ textarea, select, input.text {
 	border-radius-bottomleft: 1em;          /* CSS3 */
 }
 
+/* help popup */
+
 #help-popup {
 	padding-left: 10px;
 	width: 95%;
 	background-color: #@LIGHT_COLOR_HEX@;
-/*	padding-right: 5px;
-	padding-top: 10px;*/
 }
 
 .hresizeable {
@@ -395,3 +368,9 @@ table.alterator-listbox thead tr .headerSortDown {
 table.alterator-listbox thead tr .headerSortDown, table.alterator-listbox thead tr .headerSortUp {
 	background-color: #@LIGHT_COLOR_HEX@;
 }
+
+/* deprecated */
+
+.expanded {
+    width: 100%;
+}

configure.ac

@@ -38,8 +38,8 @@ AC_CONFIG_FILES([
 		 bootloader/config
 		 bootsplash/config/bootsplash-640x480.cfg
 		 bootsplash/config/bootsplash-800x600.cfg
-		 alterator/design/design.ini
-		 alterator/design/design.qss
+		 components/browser-qt/design/design.ini
+		 components/browser-qt/design/design.qss
 		 bootloader/gfxboot.cfg
 		 kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
 		 notes/release-notes.ru.html
@@ -51,6 +51,10 @@ AC_CONFIG_FILES([
 		 indexhtml/index-uk.html
 		 indexhtml/index-en.html
 		 indexhtml/index.css
-		 alterator/styles/alterator.css
+		 gnome-settings/gtkrc
+		 gnome-settings/index.theme
+		 gnome-settings/metacity-theme-1.xml
+		 components/ahttpd/styles/alterator.css
+		 kde3-styles-splash/Theme.rc
 ])
 AC_OUTPUT

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@"
+
+style "default"
+{
+        fg[NORMAL]              = @fg_color
+        fg[ACTIVE]              = @fg_color
+        fg[INSENSITIVE]         = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
+
+        fg[PRELIGHT]            = @fg_color
+        fg[SELECTED]            = @selected_fg_color
+        
+        bg[ACTIVE]              = shade (0.9, @bg_color)
+	bg[NORMAL]              = @bg_color
+        bg[INSENSITIVE]         = shade (0.95, @bg_color)
+        bg[PRELIGHT]            = shade (1.03, @bg_color)
+        bg[SELECTED]            = @selected_bg_color
+
+        base[NORMAL]            = @base_color
+        base[ACTIVE]            = shade (0.9, @selected_bg_color)
+        base[INSENSITIVE]       = @base_color
+        base[PRELIGHT]          = @bg_color
+	base[SELECTED]          = @selected_bg_color
+        
+        text[NORMAL]            = @text_color
+        text[ACTIVE]            = @text_color
+        text[PRELIGHT]          = @text_color
+        text[SELECTED]          = @selected_fg_color
+        text[INSENSITIVE]       = mix (0.5, @text_color, @base_color)
+	
+
+	GtkRange::trough_border = 0
+	GtkRange::slider_width = 15
+	GtkRange::stepper_size = 15
+
+	GtkEntry::progress-border = { 0, 0, 0, 0 }
+
+	GtkScrollbar::min_slider_length = 15
+	GtkCheckButton::indicator_size=10
+	GtkCheckMenuItem::indicator_size=10
+	GtkRadioButton::indicator_size=12
+
+	GtkNotebook::tab_vborder = 1
+	GtkNotebook::tab_hborder = 1
+	xthickness = 1
+	ythickness = 1
+
+	NautilusIconContainer::dark_info_color="#888888"
+	NautilusIconContainer::light_info_color="#bbbbbb"
+	NautilusIconContainer::highlight_alpha=200
+
+	GtkMenu::horizontal_padding=0
+	GtkMenu::vertical_padding=0
+
+	engine "mist"
+ 	{
+	}
+}
+
+style "menuitem"
+{
+	ythickness = 2
+	xthickness = 2
+
+        fg[PRELIGHT]          = @selected_fg_color
+}
+
+style "menu" 
+{
+	ythickness = 2
+	xthickness = 2
+} 
+
+style "entry"
+{
+	bg[SELECTED] = mix(0.35, @selected_bg_color, @base_color)
+	fg[SELECTED] = @text_color
+}
+
+class "GtkWidget" style "default"
+class "GtkMenu" style "menu"
+class "GtkEntry" style "entry"
+
+widget_class "*<GtkMenuItem>*" style "menuitem"
+
+
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that the work around assumes that the combobox is _not_ in
+# appears-as-list mode.
+# This style does not affect GtkComboBoxEntry, it does have an effect
+# on comboboxes in appears-as-list mode though.
+style "mist-text-is-fg-color-workaround"
+{
+        text[NORMAL]              = @fg_color
+        text[ACTIVE]              = @fg_color
+        text[INSENSITIVE]         = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
+        text[PRELIGHT]            = @fg_color
+        text[SELECTED]            = @selected_fg_color
+}
+widget_class "*.<GtkComboBox>.<GtkCellView>"   style "mist-text-is-fg-color-workaround"
+
+style "mist-menuitem-text-is-fg-color-workaround"
+{
+        text[NORMAL]              = @fg_color
+        text[ACTIVE]              = @fg_color
+        text[INSENSITIVE]         = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
+        text[PRELIGHT]            = @selected_fg_color
+        text[SELECTED]            = @selected_fg_color
+}
+widget "*.gtk-combobox-popup-menu.*"   style "mist-menuitem-text-is-fg-color-workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the
+# base color set.
+style "mist-fg-is-text-color-workaround"
+{
+        fg[NORMAL]            = @text_color
+        fg[ACTIVE]            = @text_color
+        fg[PRELIGHT]          = @text_color
+        fg[SELECTED]          = @selected_fg_color
+        fg[INSENSITIVE]       = mix (0.5, @text_color, @base_color)
+}
+widget_class "*<GtkListItem>*" style "mist-fg-is-text-color-workaround"
+# The same problem also exists for GtkCList and GtkCTree
+# Only match GtkCList and not the parent widgets, because that would also change the headers.
+widget_class "*<GtkCList>" style "mist-fg-is-text-color-workaround"
+
+

gnome-settings/index.theme.in

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

kde3-settings/Desktop/Home.desktop

+[Desktop Entry]
+Encoding=UTF-8
+Name=Home
+Name[af]=Tuiste
+Name[ar]=المنزل
+Name[as]=প্ৰথম পৃষ্ঠা
+Name[be]=Хатняя тэчка
+Name[be@latin]=Dom
+Name[bg]=Домашна директория
+Name[bn]=ব্যক্তিগত ফোল্ডার
+Name[bn_IN]=ব্যক্তিগত ফোল্ডার
+Name[br]=Er-gêr
+Name[ca]=Inici
+Name[cs]=Můj adresář
+Name[csb]=Dodóm
+Name[cy]=Cartref
+Name[da]=Hjem
+Name[de]=Persönlicher Ordner
+Name[el]=Σπίτι
+Name[eo]=Hejmo
+Name[es]=Carpeta personal
+Name[et]=Kodu
+Name[eu]=Etxea
+Name[fa]=آغازه
+Name[fi]=Koti
+Name[fr]=Dossier personnel
+Name[fy]=Thús
+Name[ga]=Baile
+Name[gl]=Persoal
+Name[gu]=ઘર
+Name[he]=בית
+Name[hi]=घर
+Name[hr]=Početak
+Name[hsb]=Domjacy zapisk
+Name[hu]=Saját könyvtár
+Name[is]=Heimasvæðið þitt
+Name[ja]=ホーム
+Name[ka]=სახლში
+Name[kk]=Мекен
+Name[km]=ផ្ទះ
+Name[kn]=ನೆಲೆ (ಹೋಮ್)
+Name[ko]=홈
+Name[ku]=Mal
+Name[lt]=Pradžia
+Name[lv]=Mājas
+Name[mk]=Дома
+Name[ml]=തട്ടകം
+Name[mr]=मुख्य
+Name[ms]=Laman Utama
+Name[nb]=Hjem
+Name[nds]=Tohuus
+Name[ne]=गृह
+Name[nn]=Heim
+Name[oc]=Repertòri personal
+Name[or]=ଘର
+Name[pa]=ਘਰ
+Name[pl]=Katalog domowy
+Name[pt]=Pasta Pessoal
+Name[pt_BR]=Pasta do usuário
+Name[ro]=Acasă
+Name[ru]=Домашняя папка
+Name[se]=Ruoktu
+Name[sk]=Domov
+Name[sl]=Dom
+Name[sr]=Домаће
+Name[sr@latin]=Domaće
+Name[sv]=Hem
+Name[ta]=அகம்
+Name[te]=ఇల్లు
+Name[tg]=Компютер
+Name[th]=พื้นที่ส่วนตัว
+Name[tr]=Ev Dizini
+Name[uk]=Домівка
+Name[uz]=Uy
+Name[uz@cyrillic]=Уй
+Name[vi]=Nhà
+Name[wa]=Måjhon
+Name[x-test]=xxHomexx
+Name[xh]=Ikhaya
+Name[zh_CN]=主文件夹
+Name[zh_TW]=家目錄
+GenericName=Personal Files
+GenericName[af]=Persoonlike Lêers
+GenericName[ar]=الملفات الشخصية
+GenericName[be]=Персанальныя файлы
+GenericName[be@latin]=Ułasnyja fajły
+GenericName[bg]=Лични файлове
+GenericName[bn]=ব্যক্তিগত ফাইলসমূহ
+GenericName[bn_IN]=ব্যক্তিগত ফাইল
+GenericName[br]=Restroù deoc'h
+GenericName[ca]=Fitxers personals
+GenericName[cs]=Osobní soubory
+GenericName[csb]=Swòje lopczi
+GenericName[cy]=Ffeiliau Personol
+GenericName[da]=Personlige filer
+GenericName[de]=Eigene Dateien
+GenericName[el]=Προσωπικά αρχεία
+GenericName[eo]=Personaj dosieroj
+GenericName[es]=Archivos personales
+GenericName[et]=Isiklikud failid
+GenericName[eu]=Fitxategi pertsonalak
+GenericName[fa]=پرونده‌های شخصی
+GenericName[fi]=Omat tiedostot
+GenericName[fr]=Fichiers personnels
+GenericName[fy]=Persoanlike map
+GenericName[ga]=Comhaid Phearsanta
+GenericName[gl]=Ficheiros persoais
+GenericName[gu]=અંગત ફાઇલો
+GenericName[he]=קבצים אישיים
+GenericName[hi]=निजी फ़ाइलें
+GenericName[hr]=Osobne datoteke
+GenericName[hsb]=Wosobinske dataje
+GenericName[hu]=Személyes fájlok
+GenericName[is]=Skrárnar þínar
+GenericName[it]=File personali
+GenericName[ja]=個人のファイル
+GenericName[ka]=პირადი საქაღალდეები
+GenericName[kk]=Дербес файлдар
+GenericName[km]=ឯកសារ​ផ្ទាល់​ខ្លួន
+GenericName[kn]=ವೈಯಕ್ತಿಕ ಕಡತಗಳು
+GenericName[ko]=개인적인 파일
+GenericName[ku]=Pelên takekesî
+GenericName[lt]=Asmeniniai failai
+GenericName[lv]=Personīgie faili
+GenericName[mk]=Лични датотеки
+GenericName[ml]=സ്വകാര്യ ഫയലുകള്‍
+GenericName[mr]=खाजगी फाइल
+GenericName[ms]=Fail Peribadi
+GenericName[nb]=Personlige filer
+GenericName[nds]=De egen Dateien
+GenericName[ne]=व्यक्तिगत फाइल
+GenericName[nl]=Persoonlijke map
+GenericName[nn]=Personlege filer
+GenericName[or]=ବ୍ୟକ୍ତିଗତ ଫାଇଲଗୁଡ଼ିକ
+GenericName[pa]=ਨਿੱਜੀ ਫਾਇਲਾਂ
+GenericName[pl]=Pliki osobiste
+GenericName[pt]=Ficheiros Pessoais
+GenericName[pt_BR]=Arquivos Ppessoais
+GenericName[ro]=Fișiere personale
+GenericName[ru]=Личные файлы
+GenericName[se]=Iežat fiillat
+GenericName[sk]=Osobné súbory
+GenericName[sl]=Osebne datoteke
+GenericName[sr]=Лични фајлови
+GenericName[sr@latin]=Lični fajlovi
+GenericName[sv]=Personliga filer
+GenericName[ta]=தனிப்பட்ட கோப்புகள்
+GenericName[te]=వ్యక్తిగత దస్త్రాలు
+GenericName[tg]=Файлҳои шахсӣ
+GenericName[th]=แฟ้มส่วนตัว
+GenericName[tr]=Kişisel Dosyalar
+GenericName[uk]=Особисті файли
+GenericName[uz]=Shaxsiy fayllar
+GenericName[uz@cyrillic]=Шахсий файллар
+GenericName[vi]=Tập tin Cá nhân
+GenericName[wa]=Fitchîs da vosse
+GenericName[x-test]=xxPersonal Filesxx
+GenericName[xh]=Iifayile Zobuqu
+GenericName[zh_CN]=个人文件
+GenericName[zh_TW]=個人檔案
+URL[$e]=$HOME
+Icon=user-home
+Type=Link
+

kde3-settings/Desktop/trash.desktop

+[Desktop Entry]
+Encoding=UTF-8
+Name=Trash
+Name[ar]=سلة المهملات
+Name[be@latin]=Śmietnica
+Name[bg]=Кошче
+Name[bn]=আবর্জনা
+Name[bn_IN]=আবর্জনা
+Name[ca]=Paperera
+Name[cs]=Koš
+Name[csb]=Kòsz
+Name[da]=Affald
+Name[de]=Mülleimer
+Name[el]=Κάδος απορριμάτων
+Name[es]=Papelera
+Name[et]=Prügikast
+Name[eu]=Zakarontzia
+Name[fa]=زباله
+Name[fi]=Roskakori
+Name[fr]=Corbeille
+Name[ga]=Bruscar
+Name[gl]=Lixo
+Name[gu]=કચરાપેટી
+Name[he]=אשפה
+Name[hi]=रद्दी
+Name[hsb]=Papjernik
+Name[is]=Rusl
+Name[it]=Cestino
+Name[ja]=ごみ箱
+Name[kk]=Өшірілгендер
+Name[km]=ធុង​សំរាម
+Name[kn]=ಕಸಬುಟ್ಟಿ
+Name[ko]=휴지통
+Name[ku]=Çop
+Name[lt]=Šiukšliadėžė
+Name[lv]=Miskaste
+Name[mk]=Корпа
+Name[ml]=ചവറു്‌
+Name[mr]=कचरापेटी
+Name[nb]=Søppelbøtte
+Name[nds]=Affalltünn
+Name[nl]=Prullenbak
+Name[or]=ଆବର୍ଜନା ପାତ୍ର
+Name[pa]=ਰੱਦੀ
+Name[pl]=Kosz
+Name[pt]=Lixo
+Name[pt_BR]=Lixo
+Name[ro]=Gunoi
+Name[ru]=Корзина
+Name[sk]=Kôš
+Name[sl]=Smeti
+Name[sr]=Смеће
+Name[sr@latin]=Smeće
+Name[sv]=Papperskorg
+Name[ta]=அகற்றிடம்
+Name[tg]=Сабад
+Name[th]=ถังขยะ
+Name[tr]=Çöp
+Name[uk]=Смітник
+Name[wa]=Batch
+Name[x-test]=xxTrashxx
+Name[zh_CN]=回收站
+Name[zh_TW]=資源回收筒
+Comment=Contains removed files
+Comment[ar]=تحوي الملفات المزالة
+Comment[be]=Утрымлівае выдаленыя файлы
+Comment[be@latin]=Zachoŭvaje vydalenyja fajły
+Comment[bn]=মুছে ফেলা ফাইল থাকে
+Comment[bn_IN]=মুছে ফেলা ফাইল থাকে
+Comment[ca]=Conté els fitxers suprimits
+Comment[cs]=Obsahuje odstraněné soubory
+Comment[cy]=Yn cynnwys ffeiliau sydd wedi eu gwaredu
+Comment[da]=Indeholder slettede filer
+Comment[de]=Enthält weggeworfene Dateien
+Comment[el]=Περιέχει τα αφαιρεμένα αρχεία
+Comment[es]=Contiene los archivos eliminados
+Comment[et]=Sisaldab eemaldatud faile
+Comment[eu]=Kendutako fitxategiak ditu
+Comment[fi]=Sisältää poistetut tiedostot
+Comment[fr]=Contiens les fichiers effacés
+Comment[gl]=Contén ficheiros eliminados
+Comment[gu]=દૂર કરેલ ફાઇલ ધરાવે છે
+Comment[he]=מכיל קבצים שהוסרו
+Comment[hi]=मिटाई गई फ़ाइलों को रखता है
+Comment[hr]=Sadrži izbrisane datoteke
+Comment[hsb]=Tu so namakaja zničene dataje
+Comment[is]=Inniheldur skrár sem hefur verið eytt
+Comment[it]=Contiene i file cancellati
+Comment[ja]=削除されたファイルを保管しています
+Comment[ka]=შეიცავს წაშლილ ფაილებს
+Comment[kk]=Өшірілген файлдар жататын орын
+Comment[km]=មាន​ឯកសារ​ដែល​បាន​យក​ចេញ
+Comment[ko]=삭제된 파일 및 폴더가 있습니다
+Comment[lt]=Čia yra ištrintos bylos
+Comment[lv]=Satur izmestos failus
+Comment[mk]=Содржи избришани датотеки
+Comment[ml]=നീക്കം ചെയ്യപെട്ട ഫയലുകള്‍ ഉല്പെടുന്നു
+Comment[mr]=काढूण टाकलेले फाइल समाविष्टीत आहे
+Comment[nb]=Inneholder filer som er fjernet
+Comment[nds]=Bargt wegmaakt Dateien
+Comment[nl]=Bevat de verwijderde bestanden
+Comment[or]=ଅପସାରିତ ଫାଇଲଗୁଡ଼ିକୁ ଧାରଣ କରିଥାଏ
+Comment[pa]=ਹਟਾਈਆਂ ਫਾਇਲਾਂ ਰੱਖਦਾ ਹੈ
+Comment[pl]=Zawiera usunięte pliki
+Comment[pt]=Contém os ficheiros removidos
+Comment[pt_BR]=Contém arquivos removidos
+Comment[ro]=Conține fișierele șterse
+Comment[sk]=Obsahuje vymazané súbory
+Comment[sl]=Vsebujejo odstranjene datoteke
+Comment[sr]=Садржи уклоњене фајлове
+Comment[sr@latin]=Sadrži uklonjene fajlove
+Comment[sv]=Innehåller borttagna filer
+Comment[ta]=அகற்றப்பட்ட கோப்புகள் இருக்கிறது
+Comment[tg]=Дорои файлҳои несткардашуда
+Comment[th]=บรรจุแฟ้มที่ถูกลบ
+Comment[tr]=Silinen dosyaları içerir
+Comment[uk]=Містить вилучені файли
+Comment[uz]=Olib tashlangan fayllardan iborat
+Comment[uz@cyrillic]=Олиб ташланган файллардан иборат
+Comment[vi]=Chứa tập tin bị gỡ bỏ
+Comment[wa]=I gn a dvins des fitchîs oistés
+Comment[x-test]=xxContains removed filesxx
+Comment[xh]=Iqulathe iifayile ezisusiweyo
+Comment[zh_CN]=储存已删除的文件
+Comment[zh_TW]=包含已移除的檔案
+Icon=user-trash-full
+EmptyIcon=user-trash
+Type=Link
+URL=trash:/
+OnlyShowIn=KDE;
+

kde3-styles-splash/Theme.rc.in

+[KSplash Theme: ALTLinux@NAME@]
+Name = @BRAND_FNAME@ @VERSION@ @NAME@
+Description = @BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@ Default KDE Splash Theme
+Description[ru] = Заставка KDE по умолчанию для @BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@
+Version = @VERSION@
+Author = Alexandra Panyukova <mex3@altlinux.ru>
+Author[ru] = Александра Панюкова <mex3@altlinux.ru>
+Homepage = http://www.altlinux.ru
+
+Engine = Moodin
+
+BeginOpacity = 0.1
+BaseResolution = 800,600
+
+UseIconSet = true
+IconSetSize = 48
+
+Image1 = kcmsystem
+Image2 = kcontrol
+Image3 = kcmpci
+Image7 = gohome
+Image8 = kmenu
+
+ImageCoords1 = 36,100
+ImageCoords2 = 140,100
+ImageCoords3 = 234,100
+ImageCoords4 = 328,100
+ImageCoords5 = 422,100
+ImageCoords6 = 516,100
+ImageCoords7 = 610,100
+ImageCoords8 = 704,100
+
+Labels = 1
+
+StatusCoords = -400,80
+
+ImageOffset1 = 0,20

kde4-settings/kde4/share/config/ksplashrc

+[KSplash]
+Engine=KSplashX
+Theme=Default