Merge remote-tracking branch 'school-server/sisyphus' into school-server

Makefile.in

@@ -16,4 +16,4 @@ all:
 	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 boot indexhtml
+install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml

components.mk

@@ -6,7 +6,9 @@ components/browser-qt/design/bg.png: images/installer.png
 
 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 -
+	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc;
+	subst 's/background-image.*//' components/browser-qt/design/design.qss
+	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc;
 	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
 
@@ -24,35 +26,45 @@ ahttpd:
 
 
 # bootloader and bootsplash
-boot:
+boot-images:
 	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.png -resize "$$size!" boot-$$size.jpg ;\
-		cp -al boot-$$size.jpg components/bootsplash/images/silent-$$size.jpg ;\
-		convert -resize "$$size!" images/console.jpg components/bootsplash/images/bootsplash-$$size.jpg;\
+		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
-	cp -al boot-800x600.jpg design-bootloader-source/data-install/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 $(sysconfdir)/bootsplash/themes/$(THEME)
-	cp -a components/bootsplash/* $(sysconfdir)/bootsplash/themes/$(THEME)
+boot-splash: boot-images
+	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
+boot: boot-images
 	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
+components/indexhtml/index.css:
+	sed 's|/design/|file:///usr/share/alterator/design/|g' components/ahttpd/styles/alterator.css > components/indexhtml/index.css
+
 INDEXHTML_DIR=$(datadir)/doc/indexhtml
-indexhtml:
-	for i in notes/index*.html components/indexhtml/*.css;do \
+indexhtml: components/indexhtml/index.css
+	for i in components/indexhtml/*.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
+	cp -a components/indexhtml/images $(INDEXHTML_DIR)
+	install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/images/product-logo.png
 	install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop

components/bootloader/gfxboot.cfg.in

@@ -25,31 +25,33 @@ volume=70
 ; menu background transparency (0..255)
 menu.transparency=0x20
 ; default font
-font.normal=16x16.fnt
+font.normal=drs16.fnt
 ; main menu font
-font.large=16x16.fnt
+font.large=drs16.fnt
+; bold main menu font
+font.large.bold=drs16b.fnt
 ; background image
 background=back.jpg
 ; max. visible main menu items
 mainmenu.entries=8
 ; minimal main menu selection bar width
-mainmenu.bar.minwidth=300
+mainmenu.bar.minwidth=294
 ; main menu selection bar transparency (0..255)
 mainmenu.bar.transparency=0
 ; main menu colors
-mainmenu.bar.color=0x798491
-mainmenu.normal.fg=0x000000
-mainmenu.selected.fg=0x@LIGHT_LABELS_HEX@
+mainmenu.bar.color=0x001056
+mainmenu.normal.fg=0x001056
+mainmenu.selected.fg=0xffffff
 ; boot option colors
-bootopt.label.fg=0x@DARK_LABELS_HEX@
-bootopt.text.fg=0x@DARK_LABELS_HEX@
+bootopt.label.fg=0xffffff
+bootopt.text.fg=0xffffff
 ; progress bar color
 progress.bar.color=0x@DARK_COLOR_HEX@
 ; menu colors
 menu.normal.bg=0x798491
-menu.normal.fg=0x@MIDDLE_LABELS_HEX@
+menu.normal.fg=@DARK_LABELS_HEX@
 menu.selected.bg=0x@LIGHT_COLOR_HEX@
-menu.selected.fg=0x@MIDDLE_LABELS_HEX@
+menu.selected.fg=@DARK_LABELS_HEX@
 ; window colors
 window.bg=0xd8deed
 window.fg=0x000000
@@ -63,9 +65,15 @@ help.link.selected.bg=0x@DARK_COLOR_HEX@
 help.highlight.fg=0x@DARK_COLOR_HEX@
 ; panel colors
 panel.fg=0x000000
+<<<<<<< HEAD
 panel.title.fg=0x5c6570
 panel.normal.fg=0x5c6570
 panel.f-key.fg=0x@MIDDLE_LABELS_HEX@
+=======
+panel.title.fg=0xffffff
+panel.normal.fg=0xffffff
+panel.f-key.fg=0xffffff
+>>>>>>> school-server/sisyphus
 ; default keymap (e.g. de_DE, czech)
 keymap=
 
@@ -73,9 +81,9 @@ keymap=
 ; screen size
 screen.size=800,600
 ; upper left corner
-mainmenu.pos=253,170
+mainmenu.pos=253,210
 ; boot option input field position
-bootopt.pos=263,480
+bootopt.pos=200,480
 
 [640x480]
 ; screen size

components/bootsplash/config/bootsplash-1024x768.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

components/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

components/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

components/bootsplash/theme.plymouth.in

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

components/bootsplash/theme.script

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

components/browser-qt/design/design.ini.in

-Palette\active=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@DARK_COLOR_HEX@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312
-Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@DARK_COLOR_HEX@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312
- Palette\disabled=#929190, #dedcdb, #ffffff, #e2e1e0, #686766, #b0aeac, #a5a4a4,  #ffffff, #979695, #f4f4f4, #d6d5d3, #3c3b3b, #d6d5d3, #929190, #97bcdf, #c1b6d7,  #eeece9, #000000, #aed4a1, #141312
+Palette\active=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@MIDDLE_COLOR_HEX@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #f8f7f6, #141312
+Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@MIDDLE_COLOR_HEX@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #f8f7f6, #141312
+Palette\disabled=#929190, #dedcdb, #ffffff, #e2e1e0, #686766, #b0aeac, #a5a4a4,  #ffffff, #979695, #f4f4f4, #d6d5d3, #3c3b3b, #d6d5d3, #929190, #97bcdf, #c1b6d7,  #eeece9, #000000, #f8f7f6, #141312
 
+Style=Cleanlooks

components/browser-qt/design/design.qss.in

@@ -19,16 +19,3 @@ QLineEdit[echoMode="2"] {
     lineedit-password-character: 9679;
 }
 
-
-/* Customize tooltips. */
-QToolTip {
-    background-color: rgb(@MIDDLE_COLOR_DEC@);
-    border-color: darkslategray;
-    border-width: 1px;
-    border-style: solid;
-    padding: 3px;
-    font: bold;
-    border-radius: 3px;
-    opacity: 200;
-}
-

components/grub2/theme.txt

+# Debian Lenny theme for GRUB2
+#
+# Copyright © 2010 Jo Shields
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+#general settings
+message-font: "DejaVu Sans Bold 14"
+title-text: ""
+message-color: "#000"
+message-bg-color: "#fff"
+desktop-image: "boot.png"
+terminal-font: "DejaVu Sans Regular 12"
+
+#help bar at the bottom
++ label {
+	top = 100%-25
+	left = 0
+	width = 100%
+	height = 20
+	text = "To boot the selected operating system using default settings, press return. For additional settings, press E"
+	align = "center"
+	font = "DejaVu Sans Regular 10"
+	color = "#000"
+}
+
+#menu
++ boot_menu {
+	left = 21%
+	width = 58%
+	top = 30%
+	height = 40%
+	item_font = "DejaVu Sans Regular 12"
+	selected_item_font = "DejaVu Sans Bold 14"
+	icon_height = 24
+	icon_width = 24
+	item_height = 26
+	item_padding = 0
+	item_icon_space = 0
+	item_spacing = 1
+	selected_item_pixmap_style = "selected_blob_*.png"
+	scrollbar = true
+	scrollbar_width = 20
+	scrollbar_thumb = "scrollbar_slider_*.png"
+	scrollbar_frame = "scrollbar_border_*.png"
+	item_color = "#001056"
+	selected_item_color = "#ffffff"
+}
+
++ circular_progress
+{
+   id = "__timeout__"
+   left = 52%
+   top = 13%
+   width = 36
+   height =36 
+   num_ticks = 12
+   ticks_disappear = false 
+   start_angle = -60
+   center_bitmap = "zero.png"
+   tick_bitmap = "tick.png"
+
+}
+

components/indexhtml/index-en.html.in

+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+<!-- Disto name in title -->
+<title>@NAME@ @VERSION@ @STATUS@</title>
+
+<link href="index.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+
+<div id="content">
+
+<!-- Language selection -->
+<div id="languages">
+    <a href="index-ru.html">Русский</a> 
+</div>
+
+<!-- Disto name -->
+<div id="title">@NAME@ @VERSION@ @STATUS@</div>
+
+<div id="main">
+<!-- Links columns -->
+<table border="0" width="100%">
+<tr>
+<th width="33%"><img src="images/documentation.png" alt="Documentation"></th>
+<th width="33%"><img src="images/altlinux-logo.png" alt="Company" class="icon_big"></th>
+<th width="34%"><img src="images/community.png" alt="Community" class="icon"></th>
+</tr>
+
+<tr>
+<td width="33%" class="column"> <!-- First column: documentation -->
+<ul>
+<li><a href="file:///usr/share/doc/documentation/index.html">User Manual</a></li>
+<li><a href="file:///usr/share/doc/alt-docs/modules/index.html">Local Documentation</a></li>
+<li><a href="http://docs.altlinux.org">Online Documentation</a></li>
+<li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Books</a></li>
+<li><a href="http://altlinux.org/">Wiki</a></li>
+<li><a href="http://altlinux.org/FAQ">FAQ</a></li>
+</ul>
+</td>
+
+<td width="33%" id="central_pane"> <!-- Second column: Company -->
+<ul>
+<li><a href="http://www.altlinux.com">ALT Linux Website</a></li>
+<li><a href="http://shop.altlinux.ru">Internet Shop</a></li>
+<li><a href="http://support.altlinux.ru">Technical Support</a></li>
+<li><a href="http://www.altlinux.com/en/go/about-company/contacts/">Contacts</a></li>
+<li><a href="http://www.altlinux.com/en/go/download/">Download</a></li>
+<li><a href="http://torrent.altlinux.org/">Torrents</a></li>
+</ul>
+</td>
+
+<td width="34%" class="column"> <!-- Third column: community -->
+<ul>
+<li><a href="http://lists.altlinux.org">Mailing Lists</a></li>
+<li><a href="http://forum.altlinux.org">User Forum</a></li>
+<li><a href="http://bugs.altlinux.org">Report a Bug</a></li>
+<li><a href="http://planet.altlinux.org">ALT Linux Planet</a></li>
+<li><a href="http://packages.altlinux.org">Software Repository</a></li>
+<li><a href="http://git.altlinux.org">Build environment</a></li>
+</ul>
+</td>
+
+</tr>
+
+<tr><td colspan="3" id="search">
+<!-- Search pane -->
+<form action="http://www.google.com/search" method="get">
+<img src="images/magnifier.png" alt="Search on online resources">
+<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
+<input id="search_string" type="text" name="q" size="35">
+<input id="search_button" type="submit" name="sa" value="Search in Internet">
+</form>
+</td></tr>
+
+<!-- Social networks -->
+<tr><td colspan="3" id="social">We will be glade to meet you on the following social networks:</td></tr>
+<tr>
+<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
+<th><a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
+<th><a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a></th>
+</tr>
+
+</table>
+
+<!-- Copyright information -->
+<div id="footer">
+<table border="0" width="100%">
+<tr>
+<td id="left_footer">&copy; 2011 ALT Linux. All rights reserved.</td>
+<td id="right_footer">
+Tel/fax: +7 (495) 662-3883<br>
+119334, Russian Federation, Moscow, 5-th Donskoy proezd, 15, build 6.
+</td>
+</tr></table>
+</div>
+
+</div>
+
+</div>
+</body>

components/indexhtml/index-ru.html.in

+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+<!-- Disto name in title -->
+<title>Альт Линукс 6.0 Кентавр</title>
+
+<link href="index.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+
+<div id="content">
+
+<!-- Language selection -->
+<div id="languages">
+    <a href="index-en.html">English</a> 
+</div>
+
+<!-- Disto name -->
+<div id="title">Альт Линукс 6.0 Кентавр</div>
+
+<div id="main">
+<!-- Links columns -->
+<table border="0" width="100%">
+<tr>
+<th width="33%"><img src="images/documentation.png" alt="Документация"></th>
+<th width="33%"><img src="images/altlinux-logo.png" alt="Компания" class="icon_big"></th>
+<th width="34%"><img src="images/community.png" alt="Сообщество" class="icon"></th>
+</tr>
+
+<tr>
+<td width="33%" class="column"> <!-- First column: documentation -->
+<ul>
+<li><a href="file:///usr/share/doc/documentation/index.html">Руководство пользователя</a></li>
+<li><a href="file:///usr/share/doc/alt-docs/modules/index.html">Локальная документация</a></li>
+<li><a href="http://docs.altlinux.org">Онлайновая документация</a></li>
+<li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Книги</a></li>
+<li><a href="http://altlinux.org/">Wiki</a></li>
+<li><a href="http://altlinux.org/FAQ">FAQ</a></li>
+</ul>
+</td>
+
+<td width="33%" id="central_pane"> <!-- Second column: Company -->
+<ul>
+<li><a href="http://www.altlinux.ru">Сайт компании</a></li>
+<li><a href="http://shop.altlinux.ru">Интернет-магазин</a></li>
+<li><a href="http://support.altlinux.ru">Техническая поддержка</a></li>
+<li><a href="http://www.altlinux.ru/go/about-company/contacts/">Контакты</a></li>
+<li><a href="http://www.altlinux.ru/products/downloads/">Загрузить</a></li>
+<li><a href="http://torrent.altlinux.org/">Торренты</a></li>
+</ul>
+</td>
+
+<td width="34%" class="column"> <!-- Third column: community -->
+<ul>
+<li><a href="http://lists.altlinux.org">Списки рассылки</a></li>
+<li><a href="http://forum.altlinux.org">Форум пользователей</a></li>
+<li><a href="http://bugs.altlinux.org">Сообщить об ошибке</a></li>
+<li><a href="http://planet.altlinux.org">Планета</a></li>
+<li><a href="http://packages.altlinux.org">Репозиторий</a></li>
+<li><a href="http://git.altlinux.org">Сборочная среда</a></li>
+</ul>
+</td>
+
+</tr>
+
+<tr><td colspan="3" id="search">
+<!-- Search pane -->
+<form action="http://www.google.com/search" method="get">
+<img src="images/magnifier.png" alt="Поиск по ресурсам ALT Linux">
+<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
+<input id="search_string" type="text" name="q" size="35">
+<input id="search_button" type="submit" name="sa" value="Поиск в Интернете">
+</form>
+</td></tr>
+
+<!-- Social networks -->
+<tr><td colspan="3" id="social">Мы рады встретиться с вами в социальных сетях:</td></tr>
+<tr>
+<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
+<th><a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
+<th><a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a></th>
+</tr>
+
+</table>
+
+<!-- Copyright information -->
+<div id="footer">
+<table border="0" width="100%">
+<tr>
+<td id="left_footer">&copy; ALT Linux, 2011. Все права защищены.</td>
+<td id="right_footer">
+Телефон/факс: +7 (495) 662-3883<br>
+Москва, 5-й Донской проезд, д. 15, стр. 6
+</td>
+</tr></table>
+</div>
+
+</div>
+
+</div>
+</body>

components/indexhtml/index.css

+/* CSS file for indexhtml page in ALT Linux distros */
+body {
+    font-family: Verdana,'DejaVu Sans',Helvetica,sans;
+    text-align: left;
+    font-size: 12px;
+    background: #f8f8f8;
+    background-image: url('images/dotted-background.png');
+}
+div#content {
+    background: white;
+    border: solid 6px #d0d0d0;
+    border-radius: 8px; 
+    -webkit-border-radius: 8px; 
+    -moz-border-radius: 7px; 
+    -khtml-border-radius: 12px;
+    padding: 0;
+    position: relative;
+    width: 780px;
+    margin: 40px auto;
+}
+div#languages {
+    text-align: right;
+    font-size: x-small;
+    padding: 12px;
+}
+div#title {
+    font-weight: normal;
+    font-size: 18pt;
+    font-family: Verdana, Helvetica;
+    text-align: center;
+    margin-top: 0;
+    margin-bottom: 12px;
+    background: #657fbe;
+    padding: 6px 0 6px 0;
+    border-top: solid 1px #657fbe;
+    border-bottom: solid 1px #657fbe;
+    background-image: url('images/lines.png');
+}
+div#top-site {
+    font-size: 120%;
+    font-weight: normal;
+    font-family: Verdana, Helvetica;
+    text-align: center;
+    padding: 4px;
+}
+div#main {
+    padding: 12px;
+}
+th {
+    vertical-align: bottom;
+    text-align: center;
+    padding-top: 5px;
+}
+img.icon {
+    width: 48px;
+    height: 48px;
+}
+img.icon_big {
+    width: 60px;
+    height: 60px;
+}
+img.banner {
+    width: 130px;
+    height: 30px;
+    margin: 6px;
+}
+li {
+    line-height: 1.35em;
+}
+td#central_pane {
+    border-left:  dotted 1px #ccc;
+    border-right: dotted 1px #ccc;
+    text-align: center;
+}
+.column {
+    text-align: center;
+}
+td#search {
+    text-align: center;
+    padding: 12px;
+}
+input#search_string {
+    position: relative;
+    vertical-align: top;
+    margin-top: 12px;
+    font-size: 130%;
+    background: white;
+    border: solid 1px #657fbe;
+    border-radius: 2px; 
+    -webkit-border-radius: 2px; 
+    -moz-border-radius: 2px; 
+    -khtml-border-radius: 2px;
+}
+input#search_button {
+    margin-top: 12px;
+    vertical-align: top;
+    font-size: 130%;
+}
+td#social {
+    text-align: center;
+    border-bottom: dotted 1px #ccc;
+    font-size: xx-small;
+    color: #999;
+}
+td#left_footer, td#right_footer {
+    font-size: xx-small;
+    color: #999;
+    vertical-align: bottom;
+    padding-top: 15px;
+}
+td#right_footer {
+    text-align: right;
+}
+ul li {
+    text-align: left;
+    list-style: square url('bullet.png');
+}
+a:link, a:visited {
+    text-decoration: none;
+    color: #2e7194;
+}
+a:hover {
+    text-decoration: none;
+    color: #f60;
+    border-bottom: 1px dotted #f60;
+}
+a.image:hover, a.image:link, a.image:visited {
+    text-decoration: none;
+    border: 0;
+}

components/indexhtml/indexhtml.desktop.in

@@ -4,8 +4,8 @@ Type=Application
 Exec=xdg-open /usr/share/doc/indexhtml/index.html
 StartupNotify=false
 Icon=altlinux
-Name=@BRAND_FNAME@ @VERSION@ @NAME@: start page
+Name=Information about @NAME@ @VERSION@ @STATUS@
 Categories=System;Documentation;
 
 # Translations
-Name[ru]=@BRAND_FNAME@ @VERSION@ @NAME@: cтартовая страница
+Name[ru]=Сведения о @NAME@ @VERSION@ @STATUS@

configure.ac

@@ -4,17 +4,13 @@ AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
 PROGRESS_COLOR=`./fetch_color selectBackground` #MIDDLE_COLOR_DEC
 TITLE_COLOR=`./fetch_color handle`
 INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
-
-LIGHT_COLOR_HEX=F4F8F9
-MIDDLE_COLOR_HEX=E2E6EB
-DARK_COLOR_HEX=1B3664
-LIGHT_LABELS_HEX=EAEDEF
-DARK_LABELS_HEX=B51F2D #selection
-MIDDLE_LABELS_HEX=415E6F
-
-DARK_ERROR_HEX=DARK_LABELS_HEX
-LIGHT_ERROR_HEX=FFCACA
-
+LIGHT_COLOR_HEX=F5F5F5 #new
+MIDDLE_COLOR_HEX=306ac4 #new
+DARK_COLOR_HEX=001056
+LIGHT_LABELS_HEX=FFFFFF #new
+DARK_LABELS_HEX=242a60  #mew
+MIDDLE_LABELS_HEX=666666 #new
+SHADOW_HEX=A6A6A6
 LIGHT_COLOR_DEC=`./color_dec ${LIGHT_COLOR_HEX}`
 MIDDLE_COLOR_DEC=`./color_dec ${MIDDLE_COLOR_HEX}`
 DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
@@ -41,16 +37,17 @@ AC_SUBST(MIDDLE_COLOR_DEC)
 AC_SUBST(DARK_COLOR_DEC)
 AC_SUBST(TITLE_COLOR)
 AC_SUBST(INACTIVE_COLOR)
+AC_SUBST(X86)
 
 AC_CONFIG_FILES([
 		 Makefile
 		 components/bootloader/config
-		 components/bootsplash/config/bootsplash-640x480.cfg
-		 components/bootsplash/config/bootsplash-800x600.cfg
-		 components/bootsplash/config/bootsplash-1024x768.cfg
+		 components/bootsplash/theme.plymouth
 		 components/browser-qt/design/design.ini
 		 components/browser-qt/design/design.qss
 		 components/bootloader/gfxboot.cfg
+		 components/indexhtml/index-ru.html
+		 components/indexhtml/index-en.html
 		 kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
 		 notes/release-notes.ru.html
 		 notes/release-notes.all.html
@@ -60,7 +57,6 @@ AC_CONFIG_FILES([
 		 notes/index-uk.html
 		 notes/index-en.html
 		 components/indexhtml/indexhtml.desktop
-		 components/indexhtml/index.css
 		 gnome-settings/gtkrc
 		 gnome-settings/index.theme
 		 gnome-settings/metacity-theme-1.xml

fvwm-settings/.fvwm2rc

+#
+Read "/etc/X11/fvwm/system.fvwm2rc" 
+Style "*"       BorderWidth 5, HandleWidth 6
+Style "*"       FvwmBorder, FirmBorder
+
+BorderStyle     Simple
+
+TitleStyle      LeftJustified
+TitleStyle      -- Raised
+
+ButtonStyle     All -- Raised
+
+# window title, inactive and active
+# #
+Colorset 1 fg black, bg rgb:DA/D4/CF, Plain, NoShape
+Colorset 2 fg white, bg rgb:4A/8D/D0, Plain, NoShape
+#
+# # window borders, inactive and active
+# #
+Colorset 3 fg black, bg rgb:DA/D4/CF, Plain, NoShape
+Colorset 4 fg black, bg rgb:4A/8D/D0, Plain, NoShape
+# inactive menu item fg+bg and menu face if any
+ #
+Colorset 5 fg black, bg rgb:C0/C0/C0, Plain, NoShape
+#
+# # active menu item fg+bg
+# #
+Colorset 6 fg black, bg rgb:80/98/B0, Plain, NoShape
+
+# # greyed menu item fg
+# #
+Colorset 7 fg grey48, bg grey48, Plain, NoShape
+
+
+DefaultColorset 0
+Style * Colorset 1
+Style * HilightColorset 2
+Style * BorderColorset 3
+Style * HilightBorderColorset 4
+
+MenuStyle * MenuFace, ActiveFore, HilightBack
+MenuStyle * MenuColorset 5, ActiveColorset 6, GreyedColorset 7
+
+
+
+FuncFvwmDecorBackground
+
+Style "*" Button 1, Button 2, Button 4, Button 6
+Style "*" MWMButtons  # button relief follows the state
+
+AddButtonStyle 1 Vector 5 25x40@1 25x60@1 75x60@0 75x40@0 25x40@1
+AddButtonStyle 2 Vector 16 20x20@1 30x20@1 50x40@1 70x20@1 80x20@1 80x30@0 60x50@0 80x80@0 70x80@0 50x60@0 30x80@0 20x80@0 20x70@0 40x50@1 20x30@0 20x20@1
+AddButtonStyle 4 Vector 4 50x25@1 75x75@0 25x75@0 50x25@1
+AddButtonStyle 6 Vector 4 50x75@1 25x25@1 75x25@1 50x75@0
+
+ButtonStyle 1 - Clear MWMDecorMenu
+ButtonStyle 2 - Clear
+ButtonStyle 4 - Clear MWMDecorMax
+ButtonStyle 6 - Clear MWMDecorMin
+
+TitleStyle Height MinHeight 18
+
+#     button	context	modifie	function
+Mouse 1 	1	A	FuncFvwmWindowOpsOrAction Delete
+MouseXX 2 3	1	A       Menu MenuFvwmWindowMove
+MouseXX 3 2	1	A	Menu MenuFvwmWindowGroupOps
+Mouse 0 	2	A	FuncFvwmDeleteOrDestroy
+Mouse 1 	2	A	Close
+Mouse 2 	2	A	Close
+Mouse 3 	2	A	Destroy
+Mouse 1 	4	A	Maximize 100 100
+Mouse 2 	4	A	Maximize 0 100
+Mouse 3 	4	A	Maximize 100 0
+Mouse 1 	4	S	Maximize grow grow
+Mouse 2 	4	S	Maximize    0 grow
+Mouse 3 	4	S	Maximize grow    0
+Mouse 1 	6	A	Iconify
+Mouse 2 	6	A	FuncFvwmIconifySameResource on
+Mouse 3 	6	A	FuncFvwmIconifySameResource toggle
+

gnome-settings/applications.menu

-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
-
-  <Name>Applications</Name>
-  <Directory>X-GNOME-Menu-Applications.directory</Directory>
-
-  <!-- Scan legacy dirs first, as later items take priority -->
-  <!-- <KDELegacyDirs/> -->
-  <LegacyDir>/etc/X11/applnk</LegacyDir>
-  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
-
-  <!-- Read standard .directory and .desktop file locations -->
-  <!-- <DefaultAppDirs/> -->
-  <!-- <DefaultDirectoryDirs/> -->
-
-  <!-- Read in overrides and child menus from applications-merged/ -->
-  <!-- <DefaultMergeDirs/> -->
-
-  <!-- Accessories submenu -->
-  <Menu>
-    <Name>Accessories</Name>
-    <Directory>Utility.directory</Directory>
-    <Include>
-      <And>
-        <Category>Utility</Category>
-	<!-- Accessibility spec must have either the Utility or Settings
-	     category, and we display an accessibility submenu already for
-	     the ones that do not have Settings, so don't display accessibility
-	     applications here -->
-        <Not><Category>Accessibility</Category></Not>
-        <Not><Category>System</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Accessories -->
-
-  <!-- Accessibility submenu -->
-  <Menu>
-    <Name>Universal Access</Name>
-    <Directory>Utility-Accessibility.directory</Directory>
-    <Include>
-      <And>
-        <Category>Accessibility</Category>
-        <Not><Category>Settings</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Accessibility -->
-
-  <!-- Development Tools -->
-  <Menu>
-    <Name>Development</Name>
-    <Directory>Development.directory</Directory>
-    <Include>
-      <And>
-        <Category>Development</Category>
-      </And>
-      <Filename>emacs.desktop</Filename>
-    </Include>
-  </Menu> <!-- End Development Tools -->
-
-  <!-- Education -->
-  <Menu>
-    <Name>Education</Name>
-    <Directory>Education.directory</Directory>
-    <Include>
-      <And>
-        <Category>Education</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Education -->
-
-  <!-- Games -->
-  <Menu>
-    <Name>Games</Name>
-    <Directory>Game.directory</Directory>
-    <Include>
-      <And>
-        <Category>Game</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Games -->
-
-  <!-- Graphics -->
-  <Menu>
-    <Name>Graphics</Name>
-    <Directory>Graphics.directory</Directory>
-    <Include>
-      <And>
-        <Category>Graphics</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Graphics -->
-
-  <!-- Internet -->
-  <Menu>
-    <Name>Internet</Name>
-    <Directory>Network.directory</Directory>
-    <Include>
-      <And>
-        <Category>Network</Category>
-      </And>
-    </Include>
-  </Menu>   <!-- End Internet -->
-
-  <!-- Multimedia -->
-  <Menu>
-    <Name>Multimedia</Name>
-    <Directory>AudioVideo.directory</Directory>
-    <Include>
-      <And>
-        <Category>AudioVideo</Category>
-      </And>
-    </Include>
-  </Menu>   <!-- End Multimedia -->
-
-  <!-- Office -->
-  <Menu>
-    <Name>Office</Name>
-    <Directory>Office.directory</Directory>
-    <Include>
-      <And>
-        <Category>Office</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Office -->
-
-  <!-- System Tools-->
-  <Menu>
-    <Name>System</Name>
-    <Directory>System-Tools.directory</Directory>
-    <Include>
-      <And>
-        <Category>System</Category>
-        <Not><Category>Settings</Category></Not>
-      </And>
-    </Include>
-  </Menu>   <!-- End System Tools -->
-
-  <!-- Other -->
-  <Menu>
-    <Name>Other</Name>
-    <Directory>X-GNOME-Other.directory</Directory>
-    <OnlyUnallocated/>
-    <Include>
-      <And>
-        <Not><Category>Core</Category></Not>
-        <Not><Category>Settings</Category></Not>
-        <Not><Category>Screensaver</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Other -->
-
-</Menu> <!-- End Applications -->

gnome-settings/gnome-applications.menu

+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
+
+<Menu>
+  <MergeFile>altlinux-applications.menu</MergeFile>
+  <Name>Applications</Name>
+  <Menu>
+    <Name>Multimedia</Name>
+    <Exclude>
+      <Filename>adobe_flash_player_eula.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>Internet</Name>
+    <Exclude>
+      <Filename>lftp.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>Development</Name>
+    <Exclude>
+      <Filename>gdb.desktop</Filename>
+    </Exclude>
+  </Menu>
+</Menu>

gnome-settings/index.theme.in

-[X-GNOME-Metatheme]
+[Desktop Entry]
 Name=@BRAND_FNAME@ @NAME@
 Type=X-GNOME-Metatheme
 Comment=Theme for @BRAND_FNAME@ @NAME@
+
+[X-GNOME-Metatheme]
 Encoding=UTF-8
-GtkTheme=@BRAND_FNAME@ @NAME@
-MetacityTheme=@BRAND_FNAME@ @NAME@
-IconTheme=Mist
+GtkTheme=Glossy
+MetacityTheme=Clearlooks
+IconTheme=gnome
+GtkColorScheme=base_color:#ffffff,fg_color:#000000,tooltip_fg_color:#000000,selected_fg_color:#5598d7,selected_fg_color:#ffffff,text_color:#000000,bg_color:#ede9e3,tooltip_bg_color:#FFFFBF
+CursorTheme=default
+CursorSize=18
+NotificationTheme=slider
+

gnome-settings/settings.menu

@@ -10,6 +10,8 @@
   <DefaultAppDirs/>
   <DefaultDirectoryDirs/>
 
+  <DirectoryDir>/usr/share/desktop-directories/gnome</DirectoryDir>
+
   <!-- Read in overrides and child menus from applications-merged/ -->
   <DefaultMergeDirs/>
 

gnome-settings/skel/.gconf/apps/panel/applets/applet_0/%gconf.xml

-<?xml version="1.0"?>
-<gconf>
-	<entry name="attached_toplevel_id" mtime="1247751374" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	<entry name="position" mtime="1247751374" schema="/schemas/apps/panel/objects/position" type="int" value="1088"/>
-	<entry name="use_menu_path" mtime="1247751374" schema="/schemas/apps/panel/objects/use_menu_path"/>
-	<entry name="action_type" mtime="1247751374" schema="/schemas/apps/panel/objects/action_type"/>
-	<entry name="toplevel_id" mtime="1247751374" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
-		<stringvalue>top_panel</stringvalue>
-	</entry>
-	<entry name="tooltip" mtime="1247751374" schema="/schemas/apps/panel/objects/tooltip"/>
-	<entry name="use_custom_icon" mtime="1247751374" schema="/schemas/apps/panel/objects/use_custom_icon"/>
-	<entry name="object_type" mtime="1247751374" schema="/schemas/apps/panel/objects/object_type" type="string">
-		<stringvalue>bonobo-applet</stringvalue>
-	</entry>
-	<entry name="panel_right_stick" mtime="1247751374" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="false"/>
-	<entry name="locked" mtime="1247751374" schema="/schemas/apps/panel/objects/locked"/>
-	<entry name="custom_icon" mtime="1247751374" schema="/schemas/apps/panel/objects/custom_icon"/>
-	<entry name="bonobo_iid" mtime="1247751374" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
-		<stringvalue>OAFIID:GNOME_KeyboardApplet</stringvalue>
-	</entry>
-	<entry name="launcher_location" mtime="1247751374" schema="/schemas/apps/panel/objects/launcher_location"/>
-	<entry name="menu_path" mtime="1247751374" schema="/schemas/apps/panel/objects/menu_path"/>
-</gconf>

kde4-settings/menu/desktop-remote-access.directory

+[Desktop Entry]
+Name=Remote Access
+Name[ru]=Удалённый доступ
+Icon=krdc
+
+

kde4-settings/menu/desktop.menu

 <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
 <Menu>
+   <Menu>
+   <Name>System</Name>
+    <Include>
+        <Filename>kde4-kdebluetooth4.desktop</Filename>
+    </Include>
+   </Menu>
+   <Menu>
+   <Name>Internet</Name>
+     <Exclude>
+	<Filename>bssh.desktop</Filename>
+	<Filename>bvnc.desktop</Filename>
+	<Filename>krb5-ticket-watcher.desktop</Filename>
+	<Filename>kde4-Kppp.desktop</Filename>
+	<Filename>nm-applet.desktop</Filename>
+        <Filename>kde4-kdebluetooth4.desktop</Filename>
+	  <Filename>nxclient.desktop</Filename>
+	  <Filename>nxclient-help.desktop</Filename>
+	  <Filename>nxclient-wizard.desktop</Filename>
+	  <Filename>nxclient-admin.desktop</Filename>
+	  <Filename>kde4-krdc.desktop</Filename>
+      </Exclude>
+      <Menu>
+        <Name>Remote Access</Name>
+	<Directory>desktop-remote-access.directory</Directory>
+        <Include>
+	  <Filename>nxclient.desktop</Filename>
+	  <Filename>nxclient-help.desktop</Filename>
+	  <Filename>nxclient-wizard.desktop</Filename>
+	  <Filename>nxclient-admin.desktop</Filename>
+	  <Filename>kde4-krdc.desktop</Filename>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>More</Name>
+        <Include>
+	  <Filename>bssh.desktop</Filename>
+	  <Filename>bvnc.desktop</Filename>
+	  <Filename>krb5-ticket-watcher.desktop</Filename>
+	  <Filename>kde4-Kppp.desktop</Filename>
+	<Filename>nm-applet.desktop</Filename>
+        </Include>
+      </Menu>
+   </Menu>
 </Menu>

notes/index-en.html.in

@@ -10,7 +10,7 @@
 <body onload="MakeLink()">
 <script type="text/javascript" src="makelink.js"></script>
 
-<div id="top">
+<div id="top" class="ui-corner-all">
 	<table>
 	    <tbody>
 		<tr>
@@ -21,22 +21,13 @@
 	</table>
 </div>
 
-<div class="box" id="lang">
- <a href="index-ru.html">Русский</a>
+<div class="box ui-corner-all" id="lang">
+ <a href="index-ru.html">Русский</a> |
+ <a href="index-uk.html">Українська</a>
 </div>
 
-<div class="box">
-  <p align="justify">Welcome to <nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr>. The distribution is set up and ready to use, you may proceed. We hope that results of our work will be of use to you.</p>
-
-  <h2>Server configuration</h2>
-  <ul>
-    <li id="smc_link">Web-interface for server configuration
-    <span class="linkemu">https://ip-address:8080/</span></li>
-  </ul>
-  <div class="warning">
-  Attention! For security reasons, it is recommended to log out after configuration.
-  </div>
-
+<div class="box ui-corner-all">
+  <p align="justify">Welcome to <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. The distribution is set up and ready to use, you may proceed. We hope that results of our work will be of use to you.</p>
 
   <h2>Documentation</h2>
   <ul>
@@ -46,8 +37,12 @@
 
   <h2>In the Internet</h2>
   <ul>
-   <li><a href="http://www.altlinux.ru/">Official ALT Linux website - http://www.altlinux.org</a></li>
-   <li><a href="http://shop.altlinux.ru/">Online shop - http://shop.altlinux.ru</a></li>
+   <li><a href="http://www.altlinux.ru/">Official ALT Linux website</a></li>
+   <li><a href="http://www.altlinux.ru/FAQ">Frequently Asked QUestion</a></li>
+   <li><a href="http://search.altlinux.ru/">Search on ALT Linux websites</a></li>
+   <li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Mailing lists</a></li>
+   <li><a href="http://forum.altlinux.org/">ALT Linux Forum</a></li>
+   <li><a href="http://support.altlinux.ru/">Technical support</a></li>
   </ul>
   
   <h2>Support</h2>
@@ -72,7 +67,7 @@
 
 </div>
 
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr> &copy; ALT Linux, 2010. All rights reserved.<br />
+<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr> &copy; ALT Linux, 2012. All rights reserved.<br />
   Address: 5th Donskoy proezd, 15/6, Moscow<br />
   Phone/Fax: +7 (495) 662-3883
 </p>

notes/index-ru.html.in

@@ -2,15 +2,14 @@
 <html>
 
 <head>
-  <title>Альт Линукс 5.0 Школьный Сервер</title>
+  <title>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <link rel="stylesheet" type="text/css" href="index.css">
 </head>
 
-<body onload="MakeLink()">
-<script type="text/javascript" src="makelink.js"></script>
+<body>
 
-<div id="top">
+<div id="top" class="ui-corner-all">
 	<table>
 	    <tbody>
 		<tr>
@@ -21,58 +20,40 @@
 	</table>
 </div>
 
-<div class="box" id="lang">
- <a href="index-en.html">English</a>
+<div class="box ui-corner-all" id="lang">
+ <a href="index-en.html">English</a> |
+ <a href="index-uk.html">Українська</a>
 </div>
 
-<div class="box">
-  <p>Добро пожаловать в <nobr>Альт Линукс 5.0 Школьный Сервер</nobr>. Дистрибутив настроен и готов к работе, можно приступать. Мы надеемся, что наша работа будет для Вас полезной.</p>
- 
-  <h2>Настройка сервера</h2>
-  <ul>
-    <li id="smc_link">Интерфейс администрирования сервера
-    <span class="linkemu">https://ip-address:8080/</span></li>
-  </ul>
-  <div class="warning">
-  Внимание! В целях безопасности после окончания настройки выходите из административного интерфейса.
-  </div>
+<div class="box ui-corner-all">
+  <p>Добро пожаловать в <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. Дистрибутив настроен и готов к работе, можно приступать. Мы надеемся, что наша работа будет для Вас полезной.</p>
 
   <h2>Документация</h2>
   <ul>
-    <li><a href="../@DOCDIR@/index.html">Локальная документация по дистрибутиву</a></li>
-    <li><a href="http://altlinux.org/">Онлайновая документация на http://altlinux.org</a></li>
-  </ul>
-
-  <h2>Веб-сайты</h2>
-  <ul>
-   <li><a href="http://www.altlinux.ru/">Официальный сайт компании ALT Linux - http://altlinux.ru</a></li>
-   <li><a href="http://shop.altlinux.ru/">Интернет-магазин - http://shop.altlinux.ru</a></li>
+    <li><a href="../@DOCDIR@/index.html">Руководство пользователя</a></li>
   </ul>
 
-  <h2>Техническая поддержка</h2>
-  
-  <h3>Платная официальная поддержка</h3>  
+  <h2>Информация в Интернете</h2>
   <ul>
-  <li><a href="http://altlinux.ru/support">http://altlinux.ru/support</a></li>
+ <li><a href="http://www.altlinux.ru/">Сайт компании ALT Linux</a></li>
+ <li><a href="http://www.altlinux.org/FAQ">Ответы на часто задаваемые вопросы</a></li>
+ <li><a href="http://www.altlinux.org/">Онлайновая документация</a></li>
+ <li><a href="http://search.altlinux.ru/">Поиск информации по ALT Linux</a></li>
+ <li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Списки рассылки</a></li>
+ <li><a href="http://forum.altlinux.org/">Форум пользователей ALT Linux</a></li>
+ <li><a href="http://support.altlinux.ru/">Техническая поддержка через веб-сайт</a></li>
   </ul>
-  <div class="warning">
-  Предоставляется только зарегистрированным пользователям (по купонам).
-  </div>
 
-  <h3>Неофициальная поддержка</h3>
+  <h2>ALT Linux Team</h2>
+  <p>Этот дистрибутив не появился бы без активного участия ALT Linux Team &mdash; сообщества разработчиков свободного программного обеспечения.</p>
   <ul>
-  <li><a href="http://lists.altlinux.org/">Списки рассылки</a></li>
-  <li><a href="http://forum.altlinux.org/">Форум</a></li>
-  <li><a href="http://bugzilla.altlinux.org/">Система сбора ошибок по дистрибутивам</a></li>
-  <li><a href="http://search.altlinux.org/">Поиск по ресурсам ALT Linux</a></li>
+    <li><a href="http://www.altlinux.org/">Wiki сообщества</a></li>
+    <li><a href="http://backports.altlinux.org/">Backports</a></li>
+    <li><a href="http://bugs.altlinux.org/">Сообщить об ошибке</a></li>
   </ul>
-  <div class="warning">
-  Общение с пользователями без гарантий разрешения проблем!
-  </div>
-  
 </div>
 
-<p class="footer"><nobr>Альт Линукс 5.0 Школьный Сервер</nobr> &copy; ALT Linux, 2010. Все права защищены.<br />
+<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2012. Все права защищены.<br />
    Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 6<br />
    Телефон/факс: +7 (495) 662-3883
 </p>

notes/index-uk.html.in

@@ -9,7 +9,7 @@
 
 <body>
 
-<div id="top">
+<div id="top" class="ui-corner-all">
 	<table>
 	    <tbody>
 		<tr>
@@ -20,12 +20,12 @@
 	</table>
 </div>
 
-<div class="box" id="lang">
+<div class="box ui-corner-all" id="lang">
  <a href="index-en.html">English</a> |
  <a href="index-ru.html">Русский</a>
 </div>
 
-<div class="box">
+<div class="box ui-corner-all">
   <p>Ласкаво просимо до <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. Дистрибутив налаштований та готовий до роботи, можна починати. Ми сподіваємось, що наша праця буде для Вас корисною.</p>
 
   <h2>Документація (рос.)</h2>
@@ -36,7 +36,7 @@
   <h2>Інформація в Інтернеті</h2>
   <ul>
    <li><a href="http://www.altlinux.ru/">Сайт компанії ALT Linux</a></li>
-   <li><a href="http://faq.altlinux.ru/">Відповіді на часті запитання</a></li>
+   <li><a href="http://www.altlinux.ru/FAQ">Відповіді на часті запитання</a></li>
    <li><a href="http://search.altlinux.ru/">Пошук інформації по ALT Linux</a></li>
    <li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Списки розсилання</a></li>
    <li><a href="http://forum.altlinux.org">Форум користувачів ALT Linux</a></li>

notes/license.ru.html.in

@@ -6,13 +6,13 @@
 <body>
 
 <h1>Лицензионный договор</h1>
-<h2>на программное обеспечение Альт Линукс 5.0 Школьный Сервер и включенные в него программы для ЭВМ</h2>
+<h2>на программное обеспечение Альт Линукс 6.0 Школьный Сервер и включенные в него программы для ЭВМ</h2>
 
 <p><b>1. Сведения о договоре</b></p>
 <p>1.1 Участники договора</p>
 
 <p>Настоящий лицензионный договор заключается между ООО «Альт Линукс», обладателем прав на программное обеспечение 
-<strong>Альт Линукс 5.0 Школьный Сервер</strong> 
+<strong>Альт Линукс 6.0 Школьный Сервер</strong> 
 (далее - ДИСТРИБУТИВ), и Вами, владельцем экземпляра ДИСТРИБУТИВА.</p>
 
 <p>1.2 Предмет договора</p>

notes/release-notes.all.html.in

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
-	<TITLE></TITLE>
-</HEAD>
-<BODY>
-    <H2>Thank you for choosing ALT Linux 5.0 School Server!</H2>
+<html>
+<head>
+    <meta http-equiv="content-type" value="text/html;charset=utf-8"/>
+</head>
+<body>
+    <H2>Thank you for choosing ALT Linux 6.0 School Server!</H2>
     <p>
-    For security reasons server has no graphical interface, but it could be configured from any other computer from same local network.
-    Find out server IP-address. List of IP-addresses for server configuration could be found on server screen.
-    Open browser and go to that address.
+    You can learn more about features of this product at our official site:
+    <a href="http://www.altlinux.ru">www.altlinux.ru</a>.
     </p>
-    <h3>Examples of IP-addresses (SERVER):<br>
-    192.168.0.1<br>
-    10.1.0.2</h3>
     <p>
-    Local documentation: <h2>http://SERVER/</h2>
-    Server configuration: <h2>https://SERVER:8080/</h2>
+    <em>Hint</em>: if you visit
+    <a href="http://shop.altlinux.ru">shop.altlinux.ru</a>, you'll find the
+    whole assortment of ALT Linux products and services, with useful,
+    interesting, and even exclusive items for IT professionals, users and
+    connosseurs of ALT Linux products.
     </p>
-    <hr>
-    <p>
-    Virtual machine profiles and technical support could be bought at ALT Linux online shop <a href="http://shop.altlinux.ru">shop.altlinux.ru</a>.
-    We hope our software products would be useful for you.
-    </p>
-    <p align="right">ALT Linux Developers</p>
-</BODY>
-</HTML>
+</body>
+</html>