Merge branch 'kdesktop'

.gear-rules

-tar: . name=branding
+tar: . name=branding-informika-schoolmaster

Makefile.in

@@ -5,7 +5,7 @@ VERSION=@VERSION@
 
 all:
 # background
-	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' wallpaper.png
+	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -draw 'gravity SouthEast rotate -90 text -300,5 "$(STATUS)"' wallpaper.png
 	cp -al wallpaper.png graphics/backgrounds/default.png
 	cp -al wallpaper.png graphics/backgrounds/xdm.png
 	convert wallpaper.png kde3-styles-splash/Background.jpg
@@ -15,4 +15,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

 # 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)"' $@
+	convert $< -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -draw 'gravity SouthEast rotate -90 text -300,5 "$(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 -
+	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
 
@@ -23,35 +25,46 @@ 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.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 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
+	install -Dpm755 components/indexhtml/indexhtml.desktop $(datadir)/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop

components/ahttpd/images/steps/grub.png

+lilo.png
\ No newline at end of file

components/bootloader/gfxboot.cfg.in

@@ -25,33 +25,35 @@ 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@MIDDLE_COLOR_HEX@
 ; menu colors
-menu.normal.bg=0x798491
-menu.normal.fg=0x@DARK_LABELS_HEX@
+menu.normal.bg=0x799191
+menu.normal.fg=@DARK_LABELS_HEX@
 menu.selected.bg=0x@LIGHT_COLOR_HEX@
-menu.selected.fg=0x@DARK_LABELS_HEX@
+menu.selected.fg=@DARK_LABELS_HEX@
 ; window colors
-window.bg=0xd8deed
+window.bg=0xd6eced
 window.fg=0x000000
 window.title.bg=0x@TITLE_COLOR@
 window.title.fg=0x@DARK_LABELS_HEX@
@@ -63,9 +65,9 @@ help.link.selected.bg=0x@DARK_COLOR_HEX@
 help.highlight.fg=0x@DARK_COLOR_HEX@
 ; panel colors
 panel.fg=0x000000
-panel.title.fg=0x5c6570
-panel.normal.fg=0x5c6570
-panel.f-key.fg=0x@DARK_LABELS_HEX@
+panel.title.fg=0xffffff
+panel.normal.fg=0xffffff
+panel.f-key.fg=0xffffff
 ; default keymap (e.g. de_DE, czech)
 keymap=
 
@@ -73,9 +75,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, #@MIDDLE_COLOR_HEX@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312
-Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@MIDDLE_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/browser-qt/theme.qrc

@@ -5,5 +5,6 @@
    <file>design/design.ini</file>
    <file>design/forward.png</file>
    <file>design/backward.png</file>
+   <file>design/logo_48.png</file>
 </qresource>
 </RCC>

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: "Misc Fixed Bold 13"
+title-text: ""
+message-color: "#000000"
+message-bg-color: "#ffffff"
+desktop-image: "boot.png"
+terminal-font: "Misc Fixed Regular 13"
+
+#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 = "#000000"
+}
+
+#menu
++ boot_menu {
+	left = 21%
+	width = 58%
+	top = 30%
+	height = 40%
+	item_font = "Misc Fixed Bold 13"
+	selected_item_font = "Misc Fixed Bold 13"
+	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"
+
+}
+